diff --git a/.eslintrc.js b/.eslintrc.js
index 74e6acd32d4..147bbca7708 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,4 +1,136 @@
 /* eslint-disable import-x/no-commonjs */
+
+/**
+ * Files still allowed to import deprecated `app/util/number/index.js` during
+ * the BN.js → BigInt migration. Kept in one array so the default import-fence
+ * override can exclude them while the follow-up override below re-applies only
+ * the expo-haptics / perps restrictions (see comments on those overrides).
+ */
+const utilNumberImportBurndownFiles = [
+  'app/component-library/components-temp/CustomSpendCap/CustomInput/CustomInput.tsx',
+  'app/component-library/components-temp/CustomSpendCap/CustomSpendCap.tsx',
+  'app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.tsx',
+  'app/component-library/components-temp/Price/AggregatedPercentage/utils.ts',
+  'app/components/UI/AccountInfoCard/index.js',
+  'app/components/UI/AssetOverview/Price/Price.advanced.tsx',
+  'app/components/UI/AssetOverview/Price/Price.legacy.tsx',
+  'app/components/UI/AssetOverview/utils/marketDetails.ts',
+  'app/components/UI/Bridge/components/QuoteSelectorView/QuoteRow.tsx',
+  'app/components/UI/Bridge/components/QuoteSelectorView/index.tsx',
+  'app/components/UI/Bridge/hooks/useBridgeQuoteData/index.ts',
+  'app/components/UI/Bridge/hooks/useFormattedBalanceWithThreshold/index.ts',
+  'app/components/UI/Bridge/hooks/useHasSufficientGas/index.ts',
+  'app/components/UI/Bridge/hooks/useInsufficientBalance/index.ts',
+  'app/components/UI/Bridge/hooks/useTokenBalanceInUsd/index.ts',
+  'app/components/UI/Bridge/hooks/useTokensWithBalance/index.ts',
+  'app/components/UI/Bridge/utils/exchange-rates.ts',
+  'app/components/UI/Bridge/utils/formatNetworkFee.test.ts',
+  'app/components/UI/Bridge/utils/formatNetworkFee.ts',
+  'app/components/UI/Bridge/utils/transaction-history.ts',
+  'app/components/UI/Card/hooks/useAssetBalances.tsx',
+  'app/components/UI/Card/hooks/useCardDelegation.test.ts',
+  'app/components/UI/Card/hooks/useCardDelegation.ts',
+  'app/components/UI/Card/hooks/useNeedsGasFaucet.ts',
+  'app/components/UI/Card/sdk/CardSDK.ts',
+  'app/components/UI/CollectibleOverview/index.js',
+  'app/components/UI/Earn/Views/EarnInputView/EarnInputView.test.tsx',
+  'app/components/UI/Earn/Views/EarnLendingDepositConfirmationView/components/Erc20TokenHero/index.tsx',
+  'app/components/UI/Earn/Views/EarnLendingDepositConfirmationView/index.tsx',
+  'app/components/UI/Earn/Views/EarnLendingWithdrawalConfirmationView/index.tsx',
+  'app/components/UI/Earn/Views/EarnWithdrawInputView/EarnWithdrawInputView.tsx',
+  'app/components/UI/Earn/components/EarnLendingBalance/index.tsx',
+  'app/components/UI/Earn/components/Earnings/EarningsHistory/EarningsHistory.utils.ts',
+  'app/components/UI/Earn/components/InputDisplay/InputDisplay.test.tsx',
+  'app/components/UI/Earn/hooks/useEarnGasFee.ts',
+  'app/components/UI/Earn/hooks/useEarnInput.ts',
+  'app/components/UI/Earn/hooks/useEarnings.ts',
+  'app/components/UI/Earn/hooks/useInput.ts',
+  'app/components/UI/Earn/hooks/useMultichainInputHandlers.ts',
+  'app/components/UI/Earn/hooks/useMusdBalance.ts',
+  'app/components/UI/Earn/hooks/useMusdCtaVisibility.ts',
+  'app/components/UI/Earn/utils/number.ts',
+  'app/components/UI/Earn/utils/token/index.ts',
+  'app/components/UI/Earn/utils/tron.ts',
+  'app/components/UI/HardwareWallet/AccountDetails/index.tsx',
+  'app/components/UI/Money/constants/activityStyles.ts',
+  'app/components/UI/Money/hooks/useMoneyAccountBalance.ts',
+  'app/components/UI/Money/utils/moneyActivityFiat.ts',
+  'app/components/UI/MultichainBridgeTransactionListItem/MultichainBridgeTransactionListItem.tsx',
+  'app/components/UI/Notification/TransactionNotification/index.js',
+  'app/components/UI/Ramp/Aggregator/Views/BuildQuote/BuildQuote.test.tsx',
+  'app/components/UI/Ramp/Aggregator/Views/BuildQuote/BuildQuote.tsx',
+  'app/components/UI/Ramp/Aggregator/Views/OrdersList/OrdersList.tsx',
+  'app/components/UI/Ramp/Aggregator/Views/SendTransaction/SendTransaction.tsx',
+  'app/components/UI/Ramp/Aggregator/components/OrderDetails.tsx',
+  'app/components/UI/Ramp/Aggregator/components/OrderListItem/OrderListItem.tsx',
+  'app/components/UI/Ramp/Aggregator/components/Quote/Quote.tsx',
+  'app/components/UI/Ramp/Aggregator/hooks/useBalance.test.ts',
+  'app/components/UI/Ramp/Aggregator/hooks/useBalance.ts',
+  'app/components/UI/Ramp/Aggregator/hooks/useERC20GasLimitEstimation.ts',
+  'app/components/UI/Ramp/Aggregator/hooks/useHandleSuccessfulOrder.ts',
+  'app/components/UI/Ramp/Aggregator/hooks/useIntentAmount.ts',
+  'app/components/UI/Ramp/Aggregator/utils/index.ts',
+  'app/components/UI/Ramp/Deposit/utils/index.ts',
+  'app/components/UI/Ramp/utils/getOrderAmount.ts',
+  'app/components/UI/Ramp/utils/v2OrderToast.ts',
+  '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/Tokens/util/deriveBalanceFromAssetMarketDetails.test.ts',
+  'app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.ts',
+  'app/components/UI/TransactionElement/utils-gas.js',
+  'app/components/UI/TransactionElement/utils.js',
+  'app/components/UI/UrlAutocomplete/Result.tsx',
+  'app/components/Views/AssetDetails/index.tsx',
+  'app/components/Views/DetectedTokens/components/Token.tsx',
+  'app/components/Views/GasEducationCarousel/index.js',
+  'app/components/Views/NetworksManagement/NetworkDetailsView/hooks/useNetworkValidation.ts',
+  'app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuyBottomSheet/useQuickBuyBottomSheet.ts',
+  'app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuyBottomSheet/useQuickBuyQuotes.ts',
+  'app/components/Views/SocialLeaderboard/utils/formatters.ts',
+  'app/components/Views/UnifiedTransactionsView/useUnifiedTxActions.test.ts',
+  'app/components/Views/confirmations/components/gas/max-base-fee-input/max-base-fee-input.tsx',
+  'app/components/Views/confirmations/components/gas/priority-fee-input/priority-fee-input.tsx',
+  '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',
+  'app/components/Views/confirmations/hooks/send/usePercentageAmount.ts',
+  'app/components/Views/confirmations/hooks/useTokenAmount.ts',
+  'app/components/Views/confirmations/legacy/components/CustomNonceModal/index.js',
+  'app/components/Views/confirmations/legacy/components/WatchAssetRequest/index.js',
+  'app/components/Views/confirmations/utils/send.ts',
+  'app/components/hooks/useAddressBalance/useAddressBalance.ts',
+  'app/components/hooks/useGetFormattedTokensPerChain.tsx',
+  'app/components/hooks/useGetTotalFiatBalanceCrossChains.tsx',
+  'app/core/Engine/Engine.ts',
+  'app/core/Engine/controllers/gas-fee-controller/gas-fee-controller-init.test.ts',
+  'app/core/GasPolling/GasPolling.ts',
+  'app/core/NotificationManager.js',
+  'app/selectors/assets/assets-list.ts',
+  'app/selectors/earnController/earn/index.ts',
+  'app/selectors/multichain/evm.ts',
+  // `app/util/**` importers of `./number` or `../number` (resolves to `index.js`);
+  // same burndown contract as feature files — remove when migrated to
+  // `../number/bigint` (or `./number/bigint` from `app/util/`).
+  'app/util/confirm-tx.js',
+  'app/util/conversions.js',
+  'app/util/confirmation/gas.ts',
+  'app/util/confirmation/transactions.ts',
+  'app/util/custom-gas/index.js',
+  'app/util/networks/index.js',
+  'app/util/transactions/index.js',
+  'app/util/transactions/index.test.ts',
+];
+
 module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
@@ -42,6 +174,11 @@ module.exports = {
           'interface',
         ],
         '@typescript-eslint/no-explicit-any': 'error',
+        // Surface JSDoc @deprecated annotations at every use-site (warn for now;
+        // ratchet to 'error' once the BN.js → BigInt migration is complete).
+        // Pairs with the `import-x/no-restricted-paths` fence on
+        // `app/util/number/index.js` in the app import-fence override below.
+        '@typescript-eslint/no-deprecated': 'warn',
         // Under discussion
         '@typescript-eslint/no-duplicate-enum-values': 'off',
         '@typescript-eslint/no-shadow': [
@@ -248,6 +385,33 @@ module.exports = {
         ],
       },
     },
+    {
+      files: ['**/*.test.{js,ts,tsx,jsx}', '**/*.spec.{js,ts,tsx,jsx}'],
+      plugins: ['jest'],
+      rules: {
+        // Prevent new file-based snapshots. Inline snapshots (toMatchInlineSnapshot)
+        // are still allowed as they keep assertions co-located with the test.
+        'jest/no-restricted-matchers': [
+          'error',
+          {
+            toMatchSnapshot:
+              'Use toMatchInlineSnapshot() or an explicit assertion instead. File-based snapshots are being phased out.',
+          },
+        ],
+      },
+    },
+    {
+      // Matches CODEOWNERS `**/snaps/**` and `**/Snaps/**` (@MetaMask/core-platform).
+      // ESLint cannot read CODEOWNERS.
+      files: [
+        '**/snaps/**/*.{test,spec}.{js,ts,tsx,jsx}',
+        '**/Snaps/**/*.{test,spec}.{js,ts,tsx,jsx}',
+      ],
+      plugins: ['jest'],
+      rules: {
+        'jest/no-restricted-matchers': 'off',
+      },
+    },
     // ── Perps controller Core-alignment override ──
     // Enforces the same ESLint rules that Core's @metamask/eslint-config
     // applies to packages/perps-controller so that code written in mobile
@@ -466,11 +630,78 @@ module.exports = {
       },
     },
     {
-      files: ['app/**/*.{ts,tsx}'],
+      // Default app import fences (expo-haptics, perps, deprecated util/number/index.js).
+      // `excludedFiles` applies to the whole override — listing burn-down paths
+      // here would incorrectly skip expo/perps for those files, so burn-down is
+      // excluded from *this* block only and picked up by the next override.
+      files: ['app/**/*.{ts,tsx,js,jsx}'],
       excludedFiles: [
-        'app/controllers/perps/**/*.{ts,tsx}',
-        'app/util/haptics/**/*.{ts,tsx}',
+        // Perps controller is exempt from importing itself.
+        'app/controllers/perps/**/*.{ts,tsx,js,jsx}',
+        // Designated expo-haptics wrapper — only this tree may import expo-haptics.
+        'app/util/haptics/**/*.{ts,tsx,js,jsx}',
+        // Legacy number utils + parity tests.
+        'app/util/number/**',
+        // BN.js → BigInt burn-down: still allowed util/number imports; see next override.
+        ...utilNumberImportBurndownFiles,
       ],
+      rules: {
+        'no-restricted-imports': [
+          'error',
+          {
+            paths: [
+              {
+                name: 'expo-haptics',
+                message:
+                  'Import from app/util/haptics instead of expo-haptics directly.',
+              },
+            ],
+            patterns: [
+              {
+                group: ['**/controllers/perps', '**/controllers/perps/**'],
+                message:
+                  'Use @metamask/perps-controller instead of relative imports into app/controllers/perps/.',
+              },
+              {
+                group: ['expo-haptics/*'],
+                message:
+                  'Import from app/util/haptics instead of expo-haptics directly.',
+              },
+            ],
+          },
+        ],
+        // Fences the deprecated `app/util/number/index.js` module. We use
+        // `import-x/no-restricted-paths` (not `no-restricted-imports`) because
+        // it resolves each import to its absolute file, which means a single
+        // entry catches every spelling that lands on `index.js` — bare
+        // (`from '../util/number'`), explicit (`'../util/number/index'`),
+        // and explicit-with-extension. Sibling modules like `bigint`,
+        // `bignumber`, and `subscriptNotation` resolve to different files
+        // and are unaffected, so no negation list is needed. Inherits the
+        // burn-down allowlist from this override's `excludedFiles`; the
+        // burn-down override below intentionally does not re-declare this
+        // rule, so allow-listed files remain exempt.
+        'import-x/no-restricted-paths': [
+          'error',
+          {
+            zones: [
+              {
+                target: 'app',
+                from: 'app/util/number/index.js',
+                message:
+                  'app/util/number/index.js is deprecated. Import the BigInt-based replacement from app/util/number/bigint instead. See app/util/number/bigint-migration-reference.test.ts for migration patterns.',
+              },
+            ],
+          },
+        ],
+      },
+    },
+    {
+      // Re-apply expo-haptics + perps only for burn-down files. A second
+      // override is required because ESLint replaces `no-restricted-imports`
+      // when the same rule is set again — we cannot use one override with only
+      // `excludedFiles` for util/number without silently dropping other fences.
+      files: utilNumberImportBurndownFiles,
       rules: {
         'no-restricted-imports': [
           'error',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6eac88a5261..7f86f316cca 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -43,6 +43,10 @@ app/core/Engine/README.md                                   @MetaMask/mobile-pla
 app/core/Engine/types.ts                                    @MetaMask/mobile-platform
 app/core/Engine/controllers/remote-feature-flag-controller/ @MetaMask/mobile-platform
 app/core/DeeplinkManager                                    @MetaMask/mobile-platform
+# Deprecated BN.js helpers. Gated to discourage adding new exports; consumers
+# should migrate to app/util/number/bigint. See .eslintrc.js for the import
+# fence and bigint-migration-reference.test.ts for migration patterns.
+app/util/number/index.js                                    @MetaMask/mobile-platform
 scripts/build.sh                                            @MetaMask/mobile-platform
 fingerprint.config.js                                       @MetaMask/mobile-platform
 builds.yml                                                  @MetaMask/mobile-platform
@@ -154,7 +158,12 @@ app/components/UI/TemplateRenderer   @MetaMask/confirmations @MetaMask/core-plat
 app/components/UI/Stake              @MetaMask/earn
 app/core/Engine/controllers/earn-controller @MetaMask/earn
 app/core/Engine/messengers/earn-controller-messenger @MetaMask/earn
+app/core/Engine/controllers/chomp-api-service-init*                    @MetaMask/earn
+app/core/Engine/controllers/money-account-upgrade-controller-init*     @MetaMask/earn
+app/core/Engine/messengers/chomp-api-service-messenger*                @MetaMask/earn
+app/core/Engine/messengers/money-account-upgrade-controller-messenger* @MetaMask/earn
 app/selectors/earnController         @MetaMask/earn
+app/selectors/featureFlagController/chompApi/ @MetaMask/earn
 **/Earn/**                           @MetaMask/earn
 **/earn/**                           @MetaMask/earn
 **/Money/**                          @MetaMask/earn
@@ -334,6 +343,7 @@ tests/tools/                                                    @MetaMask/qa
 tests/websocket/                                                @MetaMask/qa
 
 # QA Team - CI
+.github/guidelines/E2E_DECISION_TREE.md                         @MetaMask/qa
 .github/actions/smart-e2e-selection/                            @MetaMask/qa
 .github/workflows/ai-pr-risk-analysis.yml                       @MetaMask/qa
 .github/workflows/auto-label-not-ready-for-e2e.yml              @MetaMask/qa
@@ -353,6 +363,7 @@ tests/websocket/                                                @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-system-tests.yml                          @MetaMask/qa
 .github/scripts/e2e-*.mjs                                       @MetaMask/qa
 .github/scripts/collect-qa-stats.mjs                            @MetaMask/qa
 .github/scripts/generate-regression-slack-summary.mjs           @MetaMask/qa
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index 39f1b05384f..d54ce5cb39b 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -15,6 +15,11 @@ self-hosted-runner:
     - "ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg"
     - "ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-xl"
     - "low-priority"
+    # Namespace runner profile labels (INFRA-3592). Format: namespace-profile-<profile-name>.
+    - "namespace-profile-metamask-ci-linux"
+    - "namespace-profile-metamask-android-build"
+    - "namespace-profile-metamask-ios-build"
+    - "namespace-profile-metamask-ios-e2e"
 
 # Configuration variables in array of strings defined in your repository or
 # organization. `null` means disabling configuration variables check.
diff --git a/.github/actions/ci-status-gate/action.yml b/.github/actions/ci-status-gate/action.yml
new file mode 100644
index 00000000000..5c5f1434875
--- /dev/null
+++ b/.github/actions/ci-status-gate/action.yml
@@ -0,0 +1,158 @@
+name: CI Status Gate
+description: Evaluate required CI job results and fail on unexpected skips or failed jobs.
+
+inputs:
+  needs-json:
+    description: JSON representation of the calling job's needs context.
+    required: true
+  requirement-context-json:
+    description: JSON representation of get-requirements outputs.
+    required: true
+  e2e-job-regex:
+    description: Regex matching E2E build/test jobs whose skipped result is allowed. Failed or cancelled E2E jobs still fail.
+    required: false
+    default: '^e2e-'
+  event-name:
+    description: GitHub event name for the current workflow run.
+    required: true
+  is-fork:
+    description: Whether the current pull request originates from a fork. When true, skipped jobs are treated as allowed skips.
+    required: false
+    default: 'false'
+
+runs:
+  using: composite
+  steps:
+    - name: Evaluate CI status
+      shell: bash
+      env:
+        NEEDS_JSON: ${{ inputs.needs-json }}
+        REQUIREMENT_CONTEXT_JSON: ${{ inputs.requirement-context-json }}
+        E2E_JOB_REGEX: ${{ inputs.e2e-job-regex }}
+        EVENT_NAME: ${{ inputs.event-name }}
+        IS_FORK: ${{ inputs.is-fork }}
+      run: |
+        set -euo pipefail
+
+        get_requirement() {
+          local key="$1"
+          jq -nr --arg key "$key" 'env.REQUIREMENT_CONTEXT_JSON | fromjson | .[$key] // "false"'
+        }
+
+        sanitize_markdown_cell() {
+          local value="$1"
+          value="${value//$'\n'/ }"
+          value="${value//|/\\|}"
+          printf '%s' "$value"
+        }
+
+        add_summary_row() {
+          local job_name result decision reason
+          job_name="$(sanitize_markdown_cell "$1")"
+          result="$(sanitize_markdown_cell "$2")"
+          decision="$(sanitize_markdown_cell "$3")"
+          reason="$(sanitize_markdown_cell "$4")"
+
+          printf '| `%s` | `%s` | %s | %s |\n' \
+            "$job_name" "$result" "$decision" "$reason" >> "$summary_file"
+        }
+
+        mark_failure() {
+          local message="$1"
+          failed="true"
+          echo "::error::$message"
+        }
+
+        validate_json_type() {
+          local variable_name="$1"
+          local expected_type="$2"
+
+          if ! jq -en --arg variable_name "$variable_name" --arg expected_type "$expected_type" \
+            '(env[$variable_name] | fromjson | type) == $expected_type' >/dev/null 2>&1; then
+            echo "::error::$variable_name is not a valid JSON $expected_type"
+            exit 1
+          fi
+        }
+
+        require_requirement_key() {
+          local key="$1"
+
+          if ! jq -en --arg key "$key" \
+            'env.REQUIREMENT_CONTEXT_JSON | fromjson | .[$key] != null' >/dev/null 2>&1; then
+            echo "::error::REQUIREMENT_CONTEXT_JSON is missing or null for required key: $key"
+            exit 1
+          fi
+        }
+
+        validate_json_type NEEDS_JSON object
+        validate_json_type REQUIREMENT_CONTEXT_JSON object
+
+        for required_key in skip_everything block_merge_for_e2e_readiness; do
+          require_requirement_key "$required_key"
+        done
+
+        skip_everything="$(get_requirement skip_everything)"
+        block_merge_for_e2e_readiness="$(get_requirement block_merge_for_e2e_readiness)"
+
+        if [[ "$block_merge_for_e2e_readiness" == "true" ]]; then
+          echo "::error::The 'pr-not-ready-for-e2e' label is still applied. Remove it to trigger E2E tests before merging."
+          exit 1
+        fi
+
+        if [[ "$skip_everything" == "true" ]]; then
+          echo "skip_everything=true; treating all jobs as passed"
+          exit 0
+        fi
+
+        failed="false"
+        summary_file="$(mktemp)"
+        trap 'if [[ -n "${GITHUB_STEP_SUMMARY:-}" && -f "$summary_file" ]]; then cat "$summary_file" >> "$GITHUB_STEP_SUMMARY"; fi; rm -f "$summary_file"' EXIT
+        job_count=0
+
+        {
+          echo "### CI Status Gate"
+          echo
+          echo "| Job | Result | Decision | Reason |"
+          echo "| --- | --- | --- | --- |"
+        } >> "$summary_file"
+
+        while IFS=$'\t' read -r job_name result; do
+          job_count=$((job_count + 1))
+
+          case "$result" in
+            success)
+              add_summary_row "$job_name" "$result" "pass" "job succeeded"
+              ;;
+            failure|cancelled)
+              mark_failure "$job_name finished with result: $result"
+              add_summary_row "$job_name" "$result" "fail" "job did not complete successfully"
+              ;;
+            skipped)
+              if [[ "$job_name" =~ $E2E_JOB_REGEX ]]; then
+                add_summary_row "$job_name" "$result" "pass" "skipped E2E jobs are allowed"
+              elif [[ "$EVENT_NAME" == "merge_group" ]]; then
+                add_summary_row "$job_name" "$result" "pass" "merge queue skip is allowed"
+              elif [[ "$IS_FORK" == "true" ]]; then
+                add_summary_row "$job_name" "$result" "pass" "fork-only skip is allowed"
+              else
+                mark_failure "$job_name was skipped unexpectedly"
+                add_summary_row "$job_name" "$result" "fail" "skip was not expected"
+              fi
+              ;;
+            *)
+              mark_failure "$job_name has unknown result: $result"
+              add_summary_row "$job_name" "$result" "fail" "job result is unknown"
+              ;;
+          esac
+        done < <(jq -nr 'env.NEEDS_JSON | fromjson | to_entries[] | [.key, (.value.result // "")] | @tsv')
+
+        if [[ "$job_count" -eq 0 ]]; then
+          echo "::error::NEEDS_JSON does not contain any jobs"
+          exit 1
+        fi
+
+        if [[ "$failed" == "true" ]]; then
+          exit 1
+        fi
+
+        echo "All required jobs passed"
diff --git a/.github/actions/setup-e2e-env/action.yml b/.github/actions/setup-e2e-env/action.yml
index 227deaba598..e84b7cdda72 100644
--- a/.github/actions/setup-e2e-env/action.yml
+++ b/.github/actions/setup-e2e-env/action.yml
@@ -116,9 +116,10 @@ runs:
       if: ${{ inputs.platform == 'android' && inputs.setup-simulator == 'true' && runner.os == 'Linux' }}
       uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
       with:
-        timeout_minutes: 3
+        timeout_minutes: 5
         max_attempts: 3
         retry_wait_seconds: 30
+        retry_on: error
         on_retry_command: sudo apt-get clean
         command: |
           set -euo pipefail
@@ -281,7 +282,11 @@ runs:
       with:
         path: |
           node_modules
+          .yarn/install-state.gz
         key: ${{ inputs.cache-prefix }}-yarn-${{ inputs.platform }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+        restore-keys: |
+          ${{ inputs.cache-prefix }}-yarn-${{ inputs.platform }}-${{ runner.os }}-
+      continue-on-error: true
 
     - name: Install JavaScript dependencies with retry
       id: yarn-install
@@ -386,19 +391,19 @@ runs:
           ${{ runner.os }}-cocoapods-specs-
       continue-on-error: true
 
-    - name: Clear CocoaPods trunk to prevent stale specs
-      if: ${{ inputs.platform == 'ios' }}
-      run: pod repo remove trunk || true
-      shell: bash
-
     - name: Install CocoaPods via bundler
       if: ${{ inputs.platform == 'ios'}}
       uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
       with:
         timeout_minutes: 15
-        max_attempts: 2
-        retry_wait_seconds: 30
+        max_attempts: 3
+        retry_wait_seconds: 60
+        on_retry_command: |
+          echo "::warning::CocoaPods install failed, retrying after trunk cleanup..."
+          pod repo remove trunk || true
         command: cd ios && bundle exec pod install --repo-update
+      env:
+        COCOAPODS_DISABLE_STATS: 'true'
 
     - name: Install applesimutils
       if: ${{ inputs.platform == 'ios' }}
diff --git a/.github/guidelines/E2E_DECISION_TREE.md b/.github/guidelines/E2E_DECISION_TREE.md
index 96441d8f46b..a9f6ce17e8d 100644
--- a/.github/guidelines/E2E_DECISION_TREE.md
+++ b/.github/guidelines/E2E_DECISION_TREE.md
@@ -10,7 +10,7 @@ flowchart TD
     GR -->|PR label: skip-e2e| HS[No E2E]
     GR -->|PR label: pr-not-ready-for-e2e| L2[No E2E]
     L2 -->|ignorable-only changes| NoBlock[No merge block]
-    L2 -->|non-ignorable changes| Skip2[Merge blocked]
+    L2 -->|non-ignorable changes| Skip2[⛔️ Merge blocked]
     GR -->|PR ignorable-only changes| Ignorable[No E2E]
     GR -->|PR has Android-only changes| Android[Android Build + Tests needed]
     GR -->|PR has iOS-only changes| iOS[iOS Build + Test needed]
@@ -33,7 +33,7 @@ To save infra resources while waiting for static analysis findings and potential
 - E2E tests are skipped and merge is blocked while the label is present, **unless** all changes are ignorable-only.
 - If E2E tests are needed, they should pass to be able to merge.
 
-## AI test selection
+## Smart AI E2E test selection
 
 Runs only when all of the following are true:
 
@@ -41,9 +41,22 @@ Runs only when all of the following are true:
 - No hard E2E skip signal (label `skip-e2e`)
 - No `skip-smart-e2e-selection` label
 
+## (Exceptional) skip builds and all E2E tests
+
+- Label `skip-e2e` can be added to the PR to skip E2E tests (and builds) in case of infra issues.
+- Using this label should be exceptional in case of CI friction and urgencies. Verify new changes and regressions manually before merging.
+
 ## E2E flakiness detection in PRs
 
 Flakiness detection is applied to modified E2E test files in PRs:
 
 - Modified E2E test files run twice
-- It applies to existing test files as well as new test files
+- It applies to existing test files as well as new test files added in the PR
+- It can be disabled by adding the label `skip-e2e-flakiness-detection`. Useful when making large refactors or when changes don't pose flakiness risk.
+
+## Release branches
+
+PRs to release branches (cherry-picked from main) are exempt from the following:
+
+- Label `pr-not-ready-for-e2e` is not applied
+- Smart AI E2E selection is skipped - all E2E suites are run (if changes are not ignorable-only, e.g. only docs)
diff --git a/.github/guidelines/LABELING_GUIDELINES.md b/.github/guidelines/LABELING_GUIDELINES.md
index c93d7d4d976..4819b24e8f7 100644
--- a/.github/guidelines/LABELING_GUIDELINES.md
+++ b/.github/guidelines/LABELING_GUIDELINES.md
@@ -33,7 +33,7 @@ Using any of these labels should be exceptional in case of CI friction and urgen
 
 - **skip-sonar-cloud**: The PR will be merged without running SonarCloud checks.
 - **skip-e2e**: The PR will be merged without running E2E tests.
-- **skip-e2e-quality-gate**: This label will disable the default test retries for E2E test files modified in a PR. Useful when making large refactors or when changes don't pose flakiness risk.
+- **skip-e2e-flakiness-detection**: This label will disable the default test retries for E2E test files modified in a PR. Useful when making large refactors or when changes don't pose flakiness risk.
 
 ### Skip Smart E2E Selection
 
diff --git a/.github/rules/filter-rules.yml b/.github/rules/filter-rules.yml
index d1928e2df4f..b3e9d129805 100644
--- a/.github/rules/filter-rules.yml
+++ b/.github/rules/filter-rules.yml
@@ -24,6 +24,10 @@ low_level_test_files: &low_level_test_files
   - '**/*.stories.*'
   - '**/*.snap'
 
+# LOCALE TRANSLATION FILES
+locale_translation_files: &locale_translation_files
+  - 'locales/languages/**/*.json'
+
 # CONFIG FILES
 config_files: &config_files
   - '.eslint*'
@@ -47,6 +51,7 @@ e2e_ignorable:
   - *documentation_files
   - *asset_files
   - *low_level_test_files
+  - *locale_translation_files
   - *config_files
   - *ci_files
 
@@ -74,6 +79,7 @@ android_or_ignorable:
   - *documentation_files
   - *asset_files
   - *low_level_test_files
+  - *locale_translation_files
   - *config_files
   - *ci_files
 
@@ -82,6 +88,7 @@ ios_or_ignorable:
   - *documentation_files
   - *asset_files
   - *low_level_test_files
+  - *locale_translation_files
   - *config_files
   - *ci_files
 
diff --git a/.github/scripts/e2e-split-tags-shards.mjs b/.github/scripts/e2e-split-tags-shards.mjs
index 590fcb28af0..b178e0f5b28 100644
--- a/.github/scripts/e2e-split-tags-shards.mjs
+++ b/.github/scripts/e2e-split-tags-shards.mjs
@@ -108,9 +108,9 @@ async function shouldSkipFlakinessDetection() {
     );
 
     const labels = data?.repository?.pullRequest?.labels?.nodes || [];
-    const labelFound = labels.some((l) => String(l?.name).toLowerCase() === 'skip-e2e-quality-gate');
+    const labelFound = labels.some((l) => String(l?.name).toLowerCase() === 'skip-e2e-flakiness-detection');
     if (labelFound) {
-      console.log('⏭️  Found "skip-e2e-quality-gate" label → SKIPPING flakiness detection');
+      console.log('⏭️  Found "skip-e2e-flakiness-detection" label → SKIPPING flakiness detection');
     }
     return labelFound;
   } catch (e) {
diff --git a/.github/workflows/auto-label-not-ready-for-e2e.yml b/.github/workflows/auto-label-not-ready-for-e2e.yml
index 58ea09f5dd3..fa74926389e 100644
--- a/.github/workflows/auto-label-not-ready-for-e2e.yml
+++ b/.github/workflows/auto-label-not-ready-for-e2e.yml
@@ -1,13 +1,12 @@
+# Automatically applies the 'pr-not-ready-for-e2e' label to newly opened PRs,
+# but only if the PR is opened between 13:00 and 17:00 UTC (15:00–19:00 CEST).
 name: Auto-apply pr-not-ready-for-e2e label
 
 on:
   pull_request:
     types: [opened]
-    # temporary scoped to these branches to test the whole approach
-    branches:
-      - 'test-e2e-readiness-label-**'
-    # branches-ignore:
-    #   - 'release/**'
+    branches-ignore:
+      - 'release/**'
 
 jobs:
   add-label:
@@ -16,7 +15,18 @@ jobs:
     permissions:
       pull-requests: write
     steps:
+      - name: Check current UTC hour
+        id: time-check
+        run: |
+          HOUR=$(date -u +%H)
+          echo "Current UTC hour: $HOUR"
+          if [[ $HOUR -ge 13 && $HOUR -lt 17 ]]; then
+            echo "in_window=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "in_window=false" >> "$GITHUB_OUTPUT"
+          fi
       - name: Add pr-not-ready-for-e2e label
+        if: steps.time-check.outputs.in_window == 'true'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_REPO: ${{ github.repository }}
diff --git a/.github/workflows/auto-rc-ota-build-core.yml b/.github/workflows/auto-rc-ota-build-core.yml
new file mode 100644
index 00000000000..c847996c55a
--- /dev/null
+++ b/.github/workflows/auto-rc-ota-build-core.yml
@@ -0,0 +1,145 @@
+##############################################################################################
+#
+# Auto RC OTA / build core (reusable)
+#
+# Shared logic for the Auto RC flow (build-rc-auto.yml): detect an OTA_VERSION bump and either
+# dispatch push-eas-update.yml, or fall through to build.yml.
+#
+# Runway's manual entry workflows no longer use this file — they call the dedicated OTA-only or
+# build-only workflows (runway-ota-*.yml, runway-*-builds.yml) directly. Kept here to preserve
+# automatic OTA-vs-build detection on every push to a release branch.
+#
+##############################################################################################
+name: Auto RC OTA Build Core
+
+on:
+  workflow_call:
+    inputs:
+      platform:
+        description: 'Target platform passed to push-eas-update and build.yml (android or ios)'
+        required: true
+        type: string
+      source_branch:
+        description: >-
+          Optional branch, tag, or SHA (Build workflow source_branch).
+          Empty uses the branch selected in the caller workflow_dispatch "Use workflow from" UI.
+        required: false
+        type: string
+        default: ''
+      ota_channel:
+        description: 'push-eas-update channel input (e.g. rc, production)'
+        required: false
+        type: string
+        default: rc
+      build_name:
+        description: 'build.yml build_name (e.g. main-rc, main-prod)'
+        required: false
+        type: string
+        default: main-rc
+      create_production_ota_tag:
+        description: 'If true, create OTA release tag after production trigger-ota (callers: *production* only)'
+        required: false
+        type: boolean
+        default: false
+      environment:
+        description: 'Build environment / track passed to upload-to-testflight (e.g. rc, prod)'
+        required: false
+        type: string
+        default: 'rc'
+      skip_version_bump:
+        description: >-
+          If true, build.yml skips update-latest-build-version. Auto-RC callers set true since the
+          bump is performed once upstream.
+        required: false
+        type: boolean
+        default: false
+    outputs:
+      semantic_version:
+        description: 'package.json version at the built commit (empty when OTA path taken)'
+        value: ${{ jobs.trigger-build.outputs.semantic_version }}
+      ios_version_code:
+        description: 'iOS CURRENT_PROJECT_VERSION at the built commit (empty when OTA path taken)'
+        value: ${{ jobs.trigger-build.outputs.ios_version_code }}
+      android_version_code:
+        description: 'Android versionCode at the built commit (empty when OTA path taken)'
+        value: ${{ jobs.trigger-build.outputs.android_version_code }}
+
+permissions:
+  contents: write # required by build.yml (update-build-version job)
+  pull-requests: read
+  actions: write
+  id-token: write # required by build.yml
+
+jobs:
+  resolve-context:
+    name: Resolve OTA context
+    uses: ./.github/workflows/runway-ota-resolve-context.yml
+    with:
+      source_branch: ${{ inputs.source_branch }}
+    secrets: inherit
+
+  validate-ota-pr:
+    name: Validate PR for OTA
+    needs: resolve-context
+    if: needs.resolve-context.outputs.ota_bump == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate PR number
+        run: |
+          if [[ -z "${{ needs.resolve-context.outputs.pr_number }}" ]]; then
+            echo "::error::No PR found for this branch. OTA update requires a PR number."
+            echo "::error::If you ran the workflow manually (workflow_dispatch), select your release branch in the 'Use workflow from' dropdown (e.g. release/7.71.0), not main."
+            exit 1
+          fi
+          echo "Using PR #${{ needs.resolve-context.outputs.pr_number }}"
+
+  trigger-ota:
+    name: Trigger OTA update
+    needs: [resolve-context, validate-ota-pr]
+    if: needs.resolve-context.outputs.ota_bump == 'true'
+    uses: ./.github/workflows/push-eas-update.yml
+    with:
+      pr_number: ${{ needs.resolve-context.outputs.pr_number }}
+      base_branch: ${{ needs.resolve-context.outputs.base_ref }}
+      message: ${{ needs.resolve-context.outputs.ota_version }}
+      channel: ${{ inputs.ota_channel }}
+      platform: ${{ inputs.platform }}
+    secrets: inherit
+
+  trigger-build:
+    name: Trigger build mobile app
+    needs: resolve-context
+    if: needs.resolve-context.outputs.ota_bump != 'true'
+    uses: ./.github/workflows/build.yml
+    with:
+      build_name: ${{ inputs.build_name }}
+      platform: ${{ inputs.platform }}
+      skip_version_bump: ${{ inputs.skip_version_bump }}
+      source_branch: ${{ inputs.source_branch || github.ref_name }}
+      upload_to_sentry: true
+    secrets: inherit
+
+  create-ota-production-tag:
+    name: Create OTA production release tag
+    needs: [resolve-context, trigger-ota]
+    if: ${{ inputs.create_production_ota_tag == true }}
+    uses: ./.github/workflows/runway-create-ota-production-tag.yml
+    with:
+      tag_name: ${{ needs.resolve-context.outputs.ota_version }}
+      checkout_ref: ${{ inputs.source_branch || github.ref_name }}
+    secrets: inherit
+
+  upload-ios-testflight:
+    name: Upload iOS to TestFlight
+    needs: [trigger-build]
+    if: ${{ inputs.platform == 'ios' }}
+    uses: ./.github/workflows/upload-to-testflight.yml
+    with:
+      environment: ${{ inputs.environment }}
+      source_branch: ${{ inputs.source_branch || github.ref_name }}
+      build_branch: ${{ inputs.source_branch || github.ref_name }}
+      build_name: ${{ inputs.build_name }}
+      build_commit_sha: ${{ needs.trigger-build.outputs.built_commit_sha }}
+      build_version: ${{ needs.trigger-build.outputs.semantic_version }}
+      build_number: ${{ needs.trigger-build.outputs.ios_version_code }}
+    secrets: inherit
diff --git a/.github/workflows/build-android-e2e.yml b/.github/workflows/build-android-e2e.yml
index 85de7d34ce5..f4d636656fa 100644
--- a/.github/workflows/build-android-e2e.yml
+++ b/.github/workflows/build-android-e2e.yml
@@ -25,14 +25,19 @@ on:
         required: false
         default: 'qa'
         type: string
+      runner_provider:
+        description: Runner provider forwarded from the caller
+        required: false
+        type: string
+        default: current
 
 jobs:
   build-android-apks:
     name: Build Android E2E APKs
-    runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg # Optimized for lg runner (48GB) with conservative memory settings
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-android-build' || 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg' }} # Optimized for lg runner (48GB) with conservative memory settings
     timeout-minutes: 40
     env:
-      GRADLE_USER_HOME: /home/admin/_work/.gradle
+      GRADLE_USER_HOME: ${{ inputs.runner_provider == 'namespace' && '/home/runner/_work/.gradle' || '/home/admin/_work/.gradle' }}
       CACHE_GENERATION: v1 # Increment this to bust the cache (v1, v2, v3, etc.)
       YARN_ENABLE_GLOBAL_CACHE: 'true' # Enable Yarn global cache for faster installs
     outputs:
@@ -45,7 +50,20 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v6
 
+      - name: Configure Namespace cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          path: |
+            ~/.cache/yarn
+            .metamask
+            node_modules
+            .yarn/cache
+            ${{ env.GRADLE_USER_HOME }}/caches
+            ${{ env.GRADLE_USER_HOME }}/wrapper
+
       - name: Restore .metamask folder (Foundry download cache for install:foundryup)
+        if: ${{ inputs.runner_provider != 'namespace' }}
         uses: actions/cache@v4
         with:
           path: .metamask
@@ -100,6 +118,7 @@ jobs:
           fi
 
       - name: Restore APKs matching fingerprint from branch cache
+        if: ${{ inputs.runner_provider != 'namespace' }}
         id: apk-cache-restore
         # This action automatically updates the cache at the end of the workflow
         uses: cirruslabs/cache@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
@@ -116,7 +135,7 @@ jobs:
           key: android-apk-${{ github.ref_name }}-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-${{ steps.generate-fingerprint.outputs.fingerprint }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
 
       - name: Restore APKs matching fingerprint from main cache
-        if: ${{ steps.apk-cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
+        if: ${{ inputs.runner_provider != 'namespace' && steps.apk-cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
         id: apk-cache-restore-main
         # This will only restore the cache, not update it
         uses: cirruslabs/cache/restore@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
@@ -136,7 +155,7 @@ jobs:
         id: gradle-cache-restore
         # This action automatically updates the cache at the end of the workflow
         uses: cirruslabs/cache@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
-        if: ${{ steps.apk-cache-restore.outputs.cache-hit != 'true' && steps.apk-cache-restore-main.outputs.cache-hit != 'true' }}
+        if: ${{ inputs.runner_provider != 'namespace' && steps.apk-cache-restore.outputs.cache-hit != 'true' && steps.apk-cache-restore-main.outputs.cache-hit != 'true' }}
         env:
           GRADLE_CACHE_VERSION: 1
         with:
@@ -154,7 +173,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: ${{ steps.apk-cache-restore.outputs.cache-hit != 'true' && steps.apk-cache-restore-main.outputs.cache-hit != 'true' && steps.gradle-cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
+        if: ${{ inputs.runner_provider != 'namespace' && steps.apk-cache-restore.outputs.cache-hit != 'true' && steps.apk-cache-restore-main.outputs.cache-hit != 'true' && steps.gradle-cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
         env:
           GRADLE_CACHE_VERSION: 1
         with:
@@ -170,7 +189,7 @@ jobs:
           key: gradle-main-${{ env.GRADLE_CACHE_VERSION }}-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
 
       - name: Build Android E2E APKs
-        if: ${{ steps.apk-cache-restore.outputs.cache-hit != 'true' && steps.apk-cache-restore-main.outputs.cache-hit != 'true' }}
+        if: ${{ inputs.runner_provider == 'namespace' || (steps.apk-cache-restore.outputs.cache-hit != 'true' && steps.apk-cache-restore-main.outputs.cache-hit != 'true') }}
         run: |
           echo "🏗 Building Android E2E APKs..."
           export NODE_OPTIONS="--max-old-space-size=4096"
@@ -207,23 +226,13 @@ jobs:
           SEGMENT_REGULATIONS_ENDPOINT_FLASK: ${{ secrets.SEGMENT_REGULATIONS_ENDPOINT_FLASK }}
           MM_SENTRY_DSN_TEST: ${{ secrets.MM_SENTRY_DSN_TEST }}
           MM_SENTRY_AUTH_TOKEN: ${{ secrets.MM_SENTRY_AUTH_TOKEN }}
-          MAIN_IOS_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_IOS_GOOGLE_CLIENT_ID_UAT }}
-          FLASK_IOS_GOOGLE_CLIENT_ID_PROD: ${{ secrets.FLASK_IOS_GOOGLE_CLIENT_ID_PROD }}
-          MAIN_IOS_GOOGLE_REDIRECT_URI_UAT: ${{ secrets.MAIN_IOS_GOOGLE_REDIRECT_URI_UAT }}
-          FLASK_IOS_GOOGLE_REDIRECT_URI_PROD: ${{ secrets.FLASK_IOS_GOOGLE_REDIRECT_URI_PROD }}
-          MAIN_ANDROID_APPLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_APPLE_CLIENT_ID_UAT }}
-          FLASK_ANDROID_APPLE_CLIENT_ID_PROD: ${{ secrets.FLASK_ANDROID_APPLE_CLIENT_ID_PROD }}
-          MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT }}
-          FLASK_ANDROID_GOOGLE_CLIENT_ID_PROD: ${{ secrets.FLASK_ANDROID_GOOGLE_CLIENT_ID_PROD }}
-          MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT }}
-          FLASK_ANDROID_GOOGLE_SERVER_CLIENT_ID_PROD: ${{ secrets.FLASK_ANDROID_GOOGLE_SERVER_CLIENT_ID_PROD }}
           GOOGLE_SERVICES_B64_IOS: ${{ secrets.GOOGLE_SERVICES_B64_IOS }}
           GOOGLE_SERVICES_B64_ANDROID: ${{ secrets.GOOGLE_SERVICES_B64_ANDROID }}
           MM_INFURA_PROJECT_ID: ${{ secrets.MM_INFURA_PROJECT_ID }}
           MM_PREDICT_GTM_MODAL_ENABLED: 'false'
 
       - name: Repack APK with JS updates using @expo/repack-app
-        if: ${{ steps.apk-cache-restore.outputs.cache-hit == 'true' || steps.apk-cache-restore-main.outputs.cache-hit == 'true' }}
+        if: ${{ inputs.runner_provider != 'namespace' && (steps.apk-cache-restore.outputs.cache-hit == 'true' || steps.apk-cache-restore-main.outputs.cache-hit == 'true') }}
         run: |
           echo "📦 Repacking APK with updated JavaScript bundle using @expo/repack-app..."
           # Use the optimized repack script which uses @expo/repack-app
@@ -258,16 +267,6 @@ jobs:
           SEGMENT_REGULATIONS_ENDPOINT_FLASK: ${{ secrets.SEGMENT_REGULATIONS_ENDPOINT_FLASK }}
           MM_SENTRY_DSN_TEST: ${{ secrets.MM_SENTRY_DSN_TEST }}
           MM_SENTRY_AUTH_TOKEN: ${{ secrets.MM_SENTRY_AUTH_TOKEN }}
-          MAIN_IOS_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_IOS_GOOGLE_CLIENT_ID_UAT }}
-          FLASK_IOS_GOOGLE_CLIENT_ID_PROD: ${{ secrets.FLASK_IOS_GOOGLE_CLIENT_ID_PROD }}
-          MAIN_IOS_GOOGLE_REDIRECT_URI_UAT: ${{ secrets.MAIN_IOS_GOOGLE_REDIRECT_URI_UAT }}
-          FLASK_IOS_GOOGLE_REDIRECT_URI_PROD: ${{ secrets.FLASK_IOS_GOOGLE_REDIRECT_URI_PROD }}
-          MAIN_ANDROID_APPLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_APPLE_CLIENT_ID_UAT }}
-          FLASK_ANDROID_APPLE_CLIENT_ID_PROD: ${{ secrets.FLASK_ANDROID_APPLE_CLIENT_ID_PROD }}
-          MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT }}
-          FLASK_ANDROID_GOOGLE_CLIENT_ID_PROD: ${{ secrets.FLASK_ANDROID_GOOGLE_CLIENT_ID_PROD }}
-          MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT }}
-          FLASK_ANDROID_GOOGLE_SERVER_CLIENT_ID_PROD: ${{ secrets.FLASK_ANDROID_GOOGLE_SERVER_CLIENT_ID_PROD }}
           GOOGLE_SERVICES_B64_IOS: ${{ secrets.GOOGLE_SERVICES_B64_IOS }}
           GOOGLE_SERVICES_B64_ANDROID: ${{ secrets.GOOGLE_SERVICES_B64_ANDROID }}
           MM_INFURA_PROJECT_ID: ${{ secrets.MM_INFURA_PROJECT_ID }}
diff --git a/.github/workflows/build-ios-e2e.yml b/.github/workflows/build-ios-e2e.yml
index 8c233861ff7..c3fd9f4420a 100644
--- a/.github/workflows/build-ios-e2e.yml
+++ b/.github/workflows/build-ios-e2e.yml
@@ -17,6 +17,11 @@ on:
         required: false
         default: 'qa'
         type: string
+      runner_provider:
+        description: Runner provider forwarded from the caller
+        required: false
+        type: string
+        default: current
 
 permissions:
   contents: read
@@ -25,7 +30,7 @@ permissions:
 jobs:
   build-ios-apps:
     name: Build iOS E2E Apps
-    runs-on: ghcr.io/cirruslabs/macos-runner:tahoe-xl
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ios-build' || 'ghcr.io/cirruslabs/macos-runner:tahoe-xl' }}
     outputs:
       artifacts-url: ${{ steps.set-artifacts-url.outputs.artifacts-url }}
       app-uploaded: ${{ steps.upload-app.outcome == 'success' }}
@@ -60,11 +65,6 @@ jobs:
       SEGMENT_REGULATIONS_ENDPOINT_QA: ${{ secrets.SEGMENT_REGULATIONS_ENDPOINT_QA }}
       MM_SENTRY_DSN_TEST: ${{ secrets.MM_SENTRY_DSN_TEST }}
       MM_SENTRY_AUTH_TOKEN: ${{ secrets.MM_SENTRY_AUTH_TOKEN }}
-      MAIN_IOS_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_IOS_GOOGLE_CLIENT_ID_UAT }}
-      MAIN_IOS_GOOGLE_REDIRECT_URI_UAT: ${{ secrets.MAIN_IOS_GOOGLE_REDIRECT_URI_UAT }}
-      MAIN_ANDROID_APPLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_APPLE_CLIENT_ID_UAT }}
-      MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT }}
-      MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT }}
       GOOGLE_SERVICES_B64_IOS: ${{ secrets.GOOGLE_SERVICES_B64_IOS }}
       GOOGLE_SERVICES_B64_ANDROID: ${{ secrets.GOOGLE_SERVICES_B64_ANDROID }}
       MM_INFURA_PROJECT_ID: ${{ secrets.MM_INFURA_PROJECT_ID }}
@@ -194,11 +194,6 @@ jobs:
           MM_SENTRY_DSN_TEST: ${{ secrets.MM_SENTRY_DSN_TEST }}
           MM_SENTRY_AUTH_TOKEN: ${{ secrets.MM_SENTRY_AUTH_TOKEN }}
 
-          MAIN_IOS_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_IOS_GOOGLE_CLIENT_ID_UAT }}
-          MAIN_IOS_GOOGLE_REDIRECT_URI_UAT: ${{ secrets.MAIN_IOS_GOOGLE_REDIRECT_URI_UAT }}
-          MAIN_ANDROID_APPLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_APPLE_CLIENT_ID_UAT }}
-          MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT }}
-          MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT }}
           GOOGLE_SERVICES_B64_IOS: ${{ secrets.GOOGLE_SERVICES_B64_IOS }}
           GOOGLE_SERVICES_B64_ANDROID: ${{ secrets.GOOGLE_SERVICES_B64_ANDROID }}
 
@@ -232,11 +227,6 @@ jobs:
           SEGMENT_REGULATIONS_ENDPOINT_QA: ${{ secrets.SEGMENT_REGULATIONS_ENDPOINT_QA }}
           MM_SENTRY_DSN_TEST: ${{ secrets.MM_SENTRY_DSN_TEST }}
           MM_SENTRY_AUTH_TOKEN: ${{ secrets.MM_SENTRY_AUTH_TOKEN }}
-          MAIN_IOS_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_IOS_GOOGLE_CLIENT_ID_UAT }}
-          MAIN_IOS_GOOGLE_REDIRECT_URI_UAT: ${{ secrets.MAIN_IOS_GOOGLE_REDIRECT_URI_UAT }}
-          MAIN_ANDROID_APPLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_APPLE_CLIENT_ID_UAT }}
-          MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT }}
-          MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT }}
           GOOGLE_SERVICES_B64_IOS: ${{ secrets.GOOGLE_SERVICES_B64_IOS }}
           GOOGLE_SERVICES_B64_ANDROID: ${{ secrets.GOOGLE_SERVICES_B64_ANDROID }}
           MM_INFURA_PROJECT_ID: ${{ secrets.MM_INFURA_PROJECT_ID }}
diff --git a/.github/workflows/build-rc-auto.yml b/.github/workflows/build-rc-auto.yml
index 95a6dba90f1..4d79f0bb1c1 100644
--- a/.github/workflows/build-rc-auto.yml
+++ b/.github/workflows/build-rc-auto.yml
@@ -8,7 +8,7 @@
 # Bitrise "Rolling builds" / "Abort running builds" for one branch + one workflow).
 #
 # Version bump runs once (update-latest-build-version.yml), then iOS and Android
-# builds are triggered in parallel via runway-ota-build-core.yml (skip_version_bump).
+# builds are triggered in parallel via auto-rc-ota-build-core.yml (skip_version_bump).
 #
 # The RC build comment includes an AI-generated test plan (inline with collapsible sections).
 #
@@ -104,7 +104,7 @@ jobs:
 
   trigger-ios-rc-build:
     name: Trigger iOS RC Build
-    uses: ./.github/workflows/runway-ota-build-core.yml
+    uses: ./.github/workflows/auto-rc-ota-build-core.yml
     needs:
       - validate-and-find-pr
       - update_rc_build_version
@@ -117,7 +117,7 @@ jobs:
 
   trigger-android-rc-build:
     name: Trigger Android RC Build
-    uses: ./.github/workflows/runway-ota-build-core.yml
+    uses: ./.github/workflows/auto-rc-ota-build-core.yml
     needs:
       - validate-and-find-pr
       - update_rc_build_version
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fdf959acbb5..b779012fce1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,11 @@ on:
         required: false
         type: boolean
         default: false
+      runner_provider:
+        description: Runner provider forwarded from the caller
+        required: false
+        type: string
+        default: current
     outputs:
       build_name:
         description: 'build_name input passed to this workflow'
@@ -63,12 +68,11 @@ on:
           - main-e2e
           - main-exp
           - main-dev
+          - main-dev-expo
           - flask-prod
           - flask-test
           - flask-e2e
           - flask-dev
-          - qa-prod
-          - qa-dev
       platform:
         required: true
         type: choice
@@ -82,6 +86,14 @@ on:
         required: false
         type: boolean
         default: false
+      runner_provider:
+        description: Runner provider for this manual trial run
+        required: true
+        type: choice
+        options:
+          - current
+          - namespace
+        default: current
 
 permissions:
   contents: read
@@ -105,7 +117,7 @@ jobs:
   prepare:
     needs: [update-build-version]
     if: ${{ always() && !failure() && !cancelled() }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     outputs:
       github_environment: ${{ steps.config.outputs.github_environment }}
       secrets_json: ${{ steps.config.outputs.secrets_json }}
@@ -113,16 +125,17 @@ jobs:
       signing_aws_role: ${{ steps.config.outputs.signing_aws_role }}
       signing_aws_secret: ${{ steps.config.outputs.signing_aws_secret }}
       signing_android_keystore_path: ${{ steps.config.outputs.signing_android_keystore_path }}
+      script_name: ${{ steps.config.outputs.script_name }}
       checkout_ref_for_setup: ${{ !inputs.skip_version_bump && needs.update-build-version.outputs.commit-hash || (inputs.source_branch || github.ref_name) }}
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0
           ref: ${{ !inputs.skip_version_bump && needs.update-build-version.outputs.commit-hash || (inputs.source_branch || github.ref_name) }}
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
+          cache: 'yarn'
       - run: yarn install --immutable
       - run: node scripts/validate-build-config.js
 
@@ -142,6 +155,7 @@ jobs:
           fs.appendFileSync(process.env.GITHUB_OUTPUT, 'signing_aws_role=' + (signing ? signing.aws_role || '' : '') + '\n');
           fs.appendFileSync(process.env.GITHUB_OUTPUT, 'signing_aws_secret=' + (signing ? signing.aws_secret || '' : '') + '\n');
           fs.appendFileSync(process.env.GITHUB_OUTPUT, 'signing_android_keystore_path=' + (signing && signing.android_keystore_path ? signing.android_keystore_path : '') + '\n');
+          fs.appendFileSync(process.env.GITHUB_OUTPUT, 'script_name=' + (build.script_name || '${{ inputs.build_name }}') + '\n');
           "
 
   # Setup dependencies (no secrets) - uses reusable workflow on platform-specific runner
@@ -163,6 +177,7 @@ jobs:
       upload-artifact: true
       artifact-name: node-modules-${{ inputs.build_name }}-${{ matrix.platform }}
       artifact-retention-days: 1
+      runner_provider: ${{ inputs.runner_provider }}
 
   # Build
   build:
@@ -173,7 +188,7 @@ jobs:
       matrix:
         platform: ${{ inputs.platform == 'both' && fromJSON('["android", "ios"]') || fromJSON(format('["{0}"]', inputs.platform)) }}
     # Android: Cirrus lg (large) runner for 8GB Gradle heap; iOS: Cirrus macOS Tahoe (has Xcode 26.x)
-    runs-on: ${{ matrix.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:tahoe-xl' || 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg' }}
+    runs-on: ${{ inputs.runner_provider == 'namespace' && (matrix.platform == 'ios' && 'namespace-profile-metamask-ios-build' || 'namespace-profile-metamask-android-build') || (matrix.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:tahoe-xl' || 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg') }}
     environment: ${{ needs.prepare.outputs.github_environment }}
     steps:
       - name: Validate version-bump commit
@@ -314,6 +329,16 @@ jobs:
           SECRETS_JSON: ${{ toJSON(secrets) }}
         run: node scripts/validate-secrets-from-config.js
 
+      - name: Restore CocoaPods specs cache (iOS)
+        if: matrix.platform == 'ios'
+        uses: actions/cache@v4
+        with:
+          path: ~/.cocoapods/repos
+          key: ${{ runner.os }}-cocoapods-specs-${{ hashFiles('ios/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cocoapods-specs-
+        continue-on-error: true
+
       # iOS: Install Pods here so generated paths match this runner (setup-node-modules skips pod install with --no-install-pods).
       - name: Install CocoaPods dependencies (iOS)
         if: matrix.platform == 'ios'
@@ -408,8 +433,8 @@ jobs:
           command: |
             export NODE_OPTIONS='--max-old-space-size=4096'
             export METRO_MAX_WORKERS='4'
-            BUILD_NAME="${{ inputs.build_name }}"
-            SCRIPT_NAME="build:${{ matrix.platform }}:${BUILD_NAME//-/:}"
+            SCRIPT_BASE="${{ needs.prepare.outputs.script_name }}"
+            SCRIPT_NAME="build:${{ matrix.platform }}:${SCRIPT_BASE//-/:}"
             yarn "$SCRIPT_NAME"
 
       # Rename build artifacts (ios_simulator_path / ios_ipa_path / ios_archive_path / android_*_path outputs)
@@ -419,20 +444,14 @@ jobs:
         run: node scripts/rename-artifacts.js ${{ matrix.platform }}
 
       # Upload build artifacts (only if build succeeded)
-      # ios_simulator_path is set by scripts/rename-artifacts.js (staged under ios-simulator-upload/
-      # in CI so upload-artifact uploads a .zip file, not a .app directory).
       - name: Upload iOS simulator app
-        if: success() && matrix.platform == 'ios' && env.IS_SIM_BUILD == 'true'
+        if: matrix.platform == 'ios' && env.IS_SIM_BUILD == 'true'
         uses: actions/upload-artifact@v4
         with:
           name: ios-app-${{ inputs.build_name }}
           path: ${{ steps.rename.outputs.ios_simulator_path }}
           if-no-files-found: error
 
-      - name: Remove iOS simulator staging directory
-        if: success() && matrix.platform == 'ios' && env.IS_SIM_BUILD == 'true'
-        run: rm -rf ios-simulator-upload
-
       - name: Upload iOS IPA
         if: matrix.platform == 'ios' && (env.IS_SIM_BUILD != 'true' || env.IS_DEVICE_BUILD == 'true')
         uses: actions/upload-artifact@v4
@@ -512,7 +531,7 @@ jobs:
     name: Emit build metadata
     needs: [prepare, build]
     if: ${{ !failure() && !cancelled() && needs.prepare.result == 'success' && needs.build.result == 'success' }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     outputs:
       checkout_ref: ${{ steps.meta.outputs.checkout_ref }}
       built_commit_sha: ${{ steps.meta.outputs.built_commit_sha }}
@@ -522,7 +541,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0
           ref: ${{ needs.prepare.outputs.checkout_ref_for_setup }}
 
       - name: Setup Node.js
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 47658969fb5..f6c370b2365 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,16 @@ on:
     # Run the full suite "overnight," once every hour from 2:00am UTC until 6:00am UTC.
     # This helps to identy the flaky and failed tests on main branch
     - cron: '0 2-6 * * *'
+  workflow_dispatch:
+    inputs:
+      runner_provider:
+        description: Runner provider for this manual trial run
+        required: true
+        type: choice
+        options:
+          - current
+          - namespace
+        default: current
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.sha || github.ref }}
@@ -25,7 +35,7 @@ jobs:
 
   check-diff:
     name: Check diff
-    runs-on: macos-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ios-build' || 'macos-latest' }}
     if: ${{ needs.get_requirements.outputs.skip_everything != 'true' }}
     needs:
       - get_requirements
@@ -76,16 +86,25 @@ jobs:
 
   dedupe:
     name: Dedupe
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ needs.get_requirements.outputs.skip_everything != 'true' }}
     needs:
       - get_requirements
     steps:
       - uses: actions/checkout@v6
+      - name: Configure Namespace cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          path: |
+            ~/.cache/yarn
+            .metamask
+            node_modules
+            .yarn/cache
       - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
-          cache: yarn
+          cache: ${{ inputs.runner_provider != 'namespace' && 'yarn' || '' }}
       - name: Install Yarn dependencies with retry
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
         with:
@@ -112,16 +131,25 @@ jobs:
 
   git-safe-dependencies:
     name: Run `@lavamoat/git-safe-dependencies`
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ needs.get_requirements.outputs.skip_everything != 'true' }}
     needs:
       - get_requirements
     steps:
       - uses: actions/checkout@v6
+      - name: Configure Namespace cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          path: |
+            ~/.cache/yarn
+            .metamask
+            node_modules
+            .yarn/cache
       - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
-          cache: yarn
+          cache: ${{ inputs.runner_provider != 'namespace' && 'yarn' || '' }}
       - name: Install Yarn dependencies with retry
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
         with:
@@ -141,7 +169,7 @@ jobs:
 
   scripts:
     name: Run `${{ matrix.scripts }}`
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ needs.get_requirements.outputs.skip_everything != 'true' }}
     needs:
       - get_requirements
@@ -158,10 +186,19 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 2
+      - name: Configure Namespace cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          path: |
+            ~/.cache/yarn
+            .metamask
+            node_modules
+            .yarn/cache
       - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
-          cache: yarn
+          cache: ${{ inputs.runner_provider != 'namespace' && 'yarn' || '' }}
       - name: Install Yarn dependencies with retry
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
         with:
@@ -184,7 +221,7 @@ jobs:
 
   js-bundle-size-check:
     name: JS bundle size check
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ needs.get_requirements.outputs.skip_everything != 'true' }}
     needs:
       - get_requirements
@@ -193,10 +230,19 @@ jobs:
       statuses: write
     steps:
       - uses: actions/checkout@v6
+      - name: Configure Namespace cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          path: |
+            ~/.cache/yarn
+            .metamask
+            node_modules
+            .yarn/cache
       - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
-          cache: yarn
+          cache: ${{ inputs.runner_provider != 'namespace' && 'yarn' || '' }}
       - name: Install Yarn dependencies with retry
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
         with:
@@ -394,7 +440,7 @@ jobs:
 
   ship-js-bundle-size-check:
     name: Ship JS bundle size check
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     needs: [js-bundle-size-check]
     if: ${{ github.ref == 'refs/heads/main' }}
     steps:
@@ -432,7 +478,7 @@ jobs:
 
   check-workflows:
     name: Check workflows
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ needs.get_requirements.outputs.skip_everything != 'true' }}
     needs:
       - get_requirements
@@ -448,7 +494,7 @@ jobs:
 
   unit-tests:
     name: Unit tests (${{ matrix.shard }})
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ needs.get_requirements.outputs.skip_everything != 'true' }}
     needs:
       - get_requirements
@@ -457,10 +503,19 @@ jobs:
         shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     steps:
       - uses: actions/checkout@v6
+      - name: Configure Namespace cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          path: |
+            ~/.cache/yarn
+            .metamask
+            node_modules
+            .yarn/cache
       - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
-          cache: yarn
+          cache: ${{ inputs.runner_provider != 'namespace' && 'yarn' || '' }}
       - name: Install Yarn dependencies with retry
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
         with:
@@ -476,7 +531,7 @@ jobs:
       # in sync with the length of matrix.shard
       - run: yarn test:unit --shard=${{ matrix.shard }}/10 --forceExit --silent --coverageReporters=json --json --outputFile=tests/results/unit-test-results-${{ matrix.shard }}.json
         env:
-          NODE_OPTIONS: --max_old_space_size=20480
+          NODE_OPTIONS: ${{ inputs.runner_provider == 'namespace' && '--max_old_space_size=12288' || '--max_old_space_size=20480' }}
       - name: Rename coverage report and extract test count for this shard
         shell: bash
         run: |
@@ -503,16 +558,35 @@ jobs:
   # We need to merge both unit and component view tests into a single coverage report so the PR coverage
   # threshold calculation is accurate.
   merge-unit-and-component-view-tests:
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     needs: [unit-tests, component-view-tests]
     if: ${{ !cancelled() && github.event_name != 'merge_group' }}
     steps:
       - uses: actions/checkout@v6
+      - name: Configure Namespace cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          path: |
+            ~/.cache/yarn
+            .metamask
+            node_modules
+            .yarn/cache
+      - name: Restore node_modules cache
+        if: ${{ inputs.runner_provider != 'namespace' }}
+        id: cache-node-modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules
+            .yarn/install-state.gz
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
       - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
-          cache: yarn
+          cache: ${{ inputs.runner_provider != 'namespace' && 'yarn' || '' }}
       - name: Install Yarn dependencies with retry
+        if: ${{ inputs.runner_provider == 'namespace' || steps.cache-node-modules.outputs.cache-hit != 'true' }}
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
         with:
           timeout_minutes: 10
@@ -611,7 +685,7 @@ jobs:
 
   component-view-tests:
     name: Component view tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ needs.get_requirements.outputs.skip_everything != 'true' }}
     needs:
       - get_requirements
@@ -620,11 +694,30 @@ jobs:
         shard: [1, 2]
     steps:
       - uses: actions/checkout@v6
+      - name: Configure Namespace cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          path: |
+            ~/.cache/yarn
+            .metamask
+            node_modules
+            .yarn/cache
+      - name: Restore node_modules cache
+        if: ${{ inputs.runner_provider != 'namespace' }}
+        id: cache-node-modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules
+            .yarn/install-state.gz
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
       - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
-          cache: yarn
+          cache: ${{ inputs.runner_provider != 'namespace' && 'yarn' || '' }}
       - name: Install Yarn dependencies with retry
+        if: ${{ inputs.runner_provider == 'namespace' || steps.cache-node-modules.outputs.cache-hit != 'true' }}
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
         with:
           timeout_minutes: 10
@@ -641,7 +734,7 @@ jobs:
             --json \
             --outputFile=tests/results/cv-test-results-${{ matrix.shard }}.json
         env:
-          NODE_OPTIONS: --max-old-space-size=20480
+          NODE_OPTIONS: ${{ inputs.runner_provider == 'namespace' && '--max-old-space-size=12288' || '--max-old-space-size=20480' }}
       - name: Rename coverage report and extract test count for this shard
         shell: bash
         run: |
@@ -658,7 +751,7 @@ jobs:
 
   smart-e2e-selection:
     name: 'Smart E2E Selection'
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ needs.get_requirements.outputs.run_smart_e2e_selection == 'true' }}
     needs:
       - get_requirements
@@ -709,6 +802,7 @@ jobs:
       build_type: 'main'
       metamask_environment: 'e2e'
       keystore_target: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   e2e-smoke-tests-android:
@@ -726,6 +820,7 @@ jobs:
           (fromJSON(needs.smart-e2e-selection.outputs.ai_confidence || '0') >= 80 && needs.smart-e2e-selection.outputs.ai_e2e_test_tags) ||
           '["ALL"]'
         }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   build-ios-apps:
@@ -741,11 +836,13 @@ jobs:
       id-token: write
     needs: [get_requirements, smart-e2e-selection]
     uses: ./.github/workflows/build-ios-e2e.yml
+    with:
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   ios-tests-ready:
     name: 'iOS Tests Ready'
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ !cancelled() && needs.build-ios-apps.result == 'success' }}
     needs: [build-ios-apps]
     steps:
@@ -767,6 +864,7 @@ jobs:
           (fromJSON(needs.smart-e2e-selection.outputs.ai_confidence || '0') >= 80 && needs.smart-e2e-selection.outputs.ai_e2e_test_tags) ||
           '["ALL"]'
         }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   # Fixture validation — ensures committed E2E fixtures match the live app state schema
@@ -786,11 +884,12 @@ jobs:
       total_splits: 1
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   report-fixture-validation:
     name: 'Report Fixture Validation'
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ !cancelled() && needs.validate-e2e-fixtures.result != 'skipped' }}
     needs: [validate-e2e-fixtures]
     permissions:
@@ -817,13 +916,22 @@ jobs:
 
   sonar-cloud:
     name: SonarCloud analysis
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     needs: merge-unit-and-component-view-tests
     if: ${{ !cancelled() && github.event_name != 'merge_group' && !github.event.pull_request.head.repo.fork }}
     steps:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # SonarCloud needs a full checkout to perform necessary analysis
+      - name: Configure Namespace cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          path: |
+            ~/.cache/yarn
+            .metamask
+            node_modules
+            .yarn/cache
       - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
@@ -862,7 +970,7 @@ jobs:
 
   sonar-cloud-quality-gate-status:
     name: SonarCloud quality gate status
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     needs: sonar-cloud
     if: ${{ !cancelled() && github.event_name != 'merge_group' && !github.event.pull_request.head.repo.fork }}
     steps:
@@ -917,114 +1025,45 @@ jobs:
             fi
           fi
 
-  all-jobs-pass:
-    name: All jobs pass
-    runs-on: ubuntu-latest
-    if: ${{ !cancelled() }}
-    needs:
-      [
-        check-diff,
-        dedupe,
-        scripts,
-        unit-tests,
-        component-view-tests,
-        check-workflows,
-        js-bundle-size-check,
-        sonar-cloud-quality-gate-status,
-      ]
-    outputs:
-      ALL_JOBS_PASSED: ${{ steps.jobs-passed-status.outputs.ALL_JOBS_PASSED }}
-    steps:
-      - name: Set jobs passed status
-        id: jobs-passed-status
-        env:
-          NEEDS_CONTEXT: ${{ toJSON(needs) }}
-          EVENT_NAME: ${{ github.event_name }}
-          IS_FORK: ${{ github.event.pull_request.head.repo.fork }}
-        run: |
-          # Check results of all required jobs dynamically
-          # On merge_group events, "skipped" is acceptable (some jobs intentionally skip)
-          # On fork PRs, "skipped" is acceptable (secret-dependent jobs are intentionally skipped)
-          # On other events (push to main), all jobs must succeed
-
-          FAILED="false"
-
-          while read -r job_name result; do
-            if [[ "$result" == "failure" ]] || [[ "$result" == "cancelled" ]]; then
-              echo "::error::Job '$job_name' failed with result: $result"
-              FAILED="true"
-            elif [[ "$result" == "skipped" ]]; then
-              if [[ "$EVENT_NAME" == "merge_group" ]] || [[ "$IS_FORK" == "true" ]]; then
-                echo "Job '$job_name' was skipped (OK for merge_group events and fork PRs)"
-              else
-                echo "::error::Job '$job_name' was unexpectedly skipped on $EVENT_NAME event"
-                FAILED="true"
-              fi
-            else
-              echo "Job '$job_name' passed"
-            fi
-          done < <(echo "$NEEDS_CONTEXT" | jq -r 'to_entries[] | "\(.key) \(.value.result)"')
-
-          if [[ "$FAILED" == "true" ]]; then
-            echo "Some required jobs failed"
-            exit 1
-          fi
-
-          echo "ALL_JOBS_PASSED=true" >> "$GITHUB_OUTPUT"
-
   check-all-jobs-pass:
     name: Check all jobs pass
-    if: ${{ !cancelled() }}
-    runs-on: ubuntu-latest
+    # Run the aggregate gate even when optional dependencies are skipped.
+    # The composite action decides which skipped jobs are acceptable.
+    if: ${{ always() && !cancelled() }}
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     needs:
       - get_requirements
-      - all-jobs-pass
+      - check-diff
+      - dedupe
+      - scripts
+      - unit-tests
+      - component-view-tests
+      - check-workflows
+      - js-bundle-size-check
+      - sonar-cloud-quality-gate-status
+      - build-android-apks
+      - build-ios-apps
       - e2e-smoke-tests-android
       - e2e-smoke-tests-ios
-    env:
-      SKIPPED: ${{ needs.get_requirements.outputs.skip_everything == 'true' }}
     steps:
-      - name: Block merge while pr-not-ready-for-e2e label is applied
-        if: ${{ needs.get_requirements.outputs.block_merge_for_e2e_readiness == 'true' }}
-        run: |
-          echo "::error::The 'pr-not-ready-for-e2e' label is still applied. Remove it to trigger E2E tests before merging."
-          exit 1
-      - run: |
-          # If the merge queue was skipped, consider all jobs as passed
-          if [[ "$SKIPPED" == "true" ]]; then
-            echo "Merge queue skipped, considering all jobs as passed"
-            exit 0
-          fi
-
-          # Check if all non-E2E jobs passed
-          if [[ "${{ needs.all-jobs-pass.outputs.ALL_JOBS_PASSED }}" != "true" ]]; then
-            echo "Non-E2E jobs failed"
-            exit 1
-          fi
-
-          # Check E2E jobs only if they should have run
-          if [[ "${{ needs.get_requirements.outputs.skip_e2e }}" != "true" ]]; then
-            # Accept both 'success' and 'skipped' as valid results
-            # 'skipped' occurs during merge_group events or when jobs are intentionally skipped
-            # Only fail on 'failure' or 'cancelled'
-            ANDROID_RESULT="${{ needs.e2e-smoke-tests-android.result }}"
-            if [[ "$ANDROID_RESULT" == "failure" ]] || [[ "$ANDROID_RESULT" == "cancelled" ]]; then
-              echo "Android E2E tests failed (result: $ANDROID_RESULT)"
-              exit 1
-            fi
-
-            IOS_RESULT="${{ needs.e2e-smoke-tests-ios.result }}"
-            if [[ "$IOS_RESULT" == "failure" ]] || [[ "$IOS_RESULT" == "cancelled" ]]; then
-              echo "iOS E2E tests failed (result: $IOS_RESULT)"
-              exit 1
-            fi
-          fi
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
+          sparse-checkout: |
+            .github/actions/ci-status-gate
 
-          echo "All required jobs passed"
+      - name: Evaluate CI status
+        uses: ./.github/actions/ci-status-gate
+        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)$'
+          event-name: ${{ github.event_name }}
+          is-fork: ${{ github.event.pull_request.head.repo.fork == true }}
 
   log-merge-group-failure:
     name: Log merge group failure
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     # Only run this job if the merge group event fails, skip on forks
     if: ${{ github.event_name == 'merge_group' && failure() }}
     needs:
diff --git a/.github/workflows/crowdin-rc-download-translations.yml b/.github/workflows/crowdin-rc-download-translations.yml
new file mode 100644
index 00000000000..cef063ccb79
--- /dev/null
+++ b/.github/workflows/crowdin-rc-download-translations.yml
@@ -0,0 +1,88 @@
+name: Crowdin Download Approved RC Translations
+
+on:
+  workflow_dispatch:
+
+jobs:
+  find-rc-branches:
+    name: Find release candidate branches
+    if: ${{ github.ref_name == 'main' }}
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    outputs:
+      branches: ${{ steps.find-branches.outputs.branches }}
+    steps:
+      - name: Find release candidate branches
+        id: find-branches
+        uses: actions/github-script@v9
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { data: prs } = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              base: 'stable',
+              state: 'open',
+            });
+
+            const releaseBranchRegex = /^release\/[0-9]+\.[0-9]+\.[0-9]+$/;
+
+            const branches = prs
+              .map((pr) => pr.head.ref)
+              .filter((branchName) => releaseBranchRegex.test(branchName));
+
+            core.info(`Found release branches: ${branches.join(',')}`);
+            core.setOutput('branches', JSON.stringify(branches));
+
+
+  download-translations:
+    name: Download translations
+    # Use `!cancelled()` to ensure this runs even when `find-rc-branches` is skipped
+    if: ${{ !cancelled() }}
+    needs: [find-rc-branches]
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+
+    strategy:
+      matrix:
+        # If run on `main`, we download translations for all RCs
+        # If run on a non-default branch, we just download translations for that individual branch
+        branch: >-
+          ${{
+            github.ref_name == 'main' &&
+            fromJson(needs.find-rc-branches.outputs.branches) ||
+            fromJson(format('[{0}]', github.ref_name))
+          }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ matrix.branch }}
+          # Use PAT to ensure that the commit later can trigger status check workflows
+          token: ${{ secrets.METAMASKBOT_CROWDIN_TOKEN }}
+
+      - name: crowdin download approved translations
+        uses: crowdin/github-action@a3160b9e5a9e00739392c23da5e580c6cabe526d
+        with:
+          upload_sources: false
+          upload_translations: false # disabled to prevent translations overwriting Blends translations
+          download_translations: true # created separate action to pull down completed translations
+          export_only_approved: true
+
+          crowdin_branch_name: ${{ matrix.branch }}
+          pull_request_base_branch_name: ${{ matrix.branch }}
+          localization_branch_name: l10n_crowdin_translations_${{ matrix.branch }}
+          pull_request_title: 'chore: New Crowdin Translations for ${{ matrix.branch }}'
+          skip_ref_checkout: true
+          # This will be in dry-run mode until after we've tested this on `main`
+          dryrun_action: true
+
+          github_user_name: metamaskbot
+          github_user_email: metamaskbot@users.noreply.github.com
+        env:
+          GITHUB_TOKEN: ${{ secrets.METAMASKBOT_CROWDIN_TOKEN }}
+          GITHUB_ACTOR: metamaskbot
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
diff --git a/.github/workflows/crowdin-rc-upload-sources.yml b/.github/workflows/crowdin-rc-upload-sources.yml
new file mode 100644
index 00000000000..837d91dd863
--- /dev/null
+++ b/.github/workflows/crowdin-rc-upload-sources.yml
@@ -0,0 +1,33 @@
+name: Crowdin Upload RC Sources
+
+on:
+  workflow_dispatch:
+
+jobs:
+  upload-sources:
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          # Use PAT to ensure that the commit later can trigger status check workflows
+          token: ${{ secrets.METAMASKBOT_CROWDIN_TOKEN }}
+
+      - name: crowdin upload sources
+        uses: crowdin/github-action@a3160b9e5a9e00739392c23da5e580c6cabe526d
+        with:
+          crowdin_branch_name: ${{ github.ref_name }}
+          upload_sources: true
+          upload_translations: false # disabled to prevent translations overwriting Blends translations
+          download_translations: false # created separate action to pull down completed translations
+          # This will be in dry-run mode until after we've tested this on `main`
+          dryrun_action: true
+          github_user_name: metamaskbot
+          github_user_email: metamaskbot@users.noreply.github.com
+        env:
+          GITHUB_TOKEN: ${{ secrets.METAMASKBOT_CROWDIN_TOKEN }}
+          GITHUB_ACTOR: metamaskbot
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
diff --git a/.github/workflows/expo-dev-build.yml b/.github/workflows/expo-dev-build.yml
index 0c818c4a479..1c078efa825 100644
--- a/.github/workflows/expo-dev-build.yml
+++ b/.github/workflows/expo-dev-build.yml
@@ -2,11 +2,12 @@
 #
 # Expo Dev Build — replaces the Bitrise expo_dev_pipeline.
 #
-# Triggered on every push to main. Builds the main-dev configuration (Debug, simulator)
+# Triggered on every push to main. Builds the main-dev-expo configuration (Debug)
 # for both iOS and Android using the reusable build.yml workflow.
 #
-# No version bump or TestFlight upload — this is a dev/simulator build only.
-# Artifacts (iOS .app zip + Android APK) are uploaded as GitHub Actions artifacts.
+# Produces simulator .app + device IPA (iOS) and APK + test APK (Android).
+# No version bump or TestFlight upload.
+# Artifacts are uploaded as GitHub Actions artifacts.
 #
 # [skip ci] commits (e.g. version bumps) are automatically skipped by GitHub Actions.
 #
@@ -18,6 +19,15 @@ on:
     branches:
       - main
   workflow_dispatch:
+    inputs:
+      runner_provider:
+        description: Runner provider for this manual trial run
+        required: true
+        type: choice
+        options:
+          - current
+          - namespace
+        default: current
 
 permissions:
   contents: write
@@ -25,10 +35,11 @@ permissions:
 
 jobs:
   build-dev:
-    name: Expo dev build (main-dev)
+    name: Expo dev build (main-dev-expo)
     uses: ./.github/workflows/build.yml
     with:
-      build_name: main-dev
+      build_name: main-dev-expo
       platform: both
       skip_version_bump: true
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 2204203dbf8..26b1fbac786 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -81,6 +81,92 @@ jobs:
       source_branch: ${{ needs.android-rc-branch.outputs.build_branch }}
     secrets: inherit
 
+  # ── Sentry Size Analysis: upload RC builds ────────────────────────────
+  # Runs in parallel with cleanup/downstream jobs so it never blocks the
+  # critical path. Uploads nightly RC artifacts so Sentry can track binary
+  # size over time, surface actionable insights, and auto-compare nightlies.
+  size-analysis-ios:
+    name: Sentry Size Analysis (iOS)
+    needs: [ios-rc]
+    if: success()
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.sha }}
+          fetch-depth: 2
+
+      - name: Resolve base SHA
+        id: base
+        run: echo "sha=$(git rev-parse ${{ github.sha }}~1)" >> "$GITHUB_OUTPUT"
+
+      - name: Install sentry-cli
+        run: curl -sL https://sentry.io/get-cli/ | bash
+
+      - name: Download iOS xcarchive
+        uses: actions/download-artifact@v4
+        with:
+          name: ios-xcarchive-main-rc
+          path: ./build-artifacts/
+
+      - name: Unzip xcarchive
+        run: |
+          cd ./build-artifacts
+          unzip -q ./*.xcarchive.zip
+          rm -f ./*.xcarchive.zip
+
+      - name: Upload to Sentry Size Analysis
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.MM_SENTRY_AUTH_TOKEN }}
+        run: |
+          sentry-cli build upload ./build-artifacts/*.xcarchive \
+            --org metamask \
+            --project metamask-mobile \
+            --build-configuration Release-iOS \
+            --head-sha "${{ github.sha }}" \
+            --base-sha "${{ steps.base.outputs.sha }}" \
+            --head-ref main \
+            --vcs-provider github \
+            --head-repo-name MetaMask/metamask-mobile
+
+  size-analysis-android:
+    name: Sentry Size Analysis (Android)
+    needs: [android-rc]
+    if: success()
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.sha }}
+          fetch-depth: 2
+
+      - name: Resolve base SHA
+        id: base
+        run: echo "sha=$(git rev-parse ${{ github.sha }}~1)" >> "$GITHUB_OUTPUT"
+
+      - name: Install sentry-cli
+        run: curl -sL https://sentry.io/get-cli/ | bash
+
+      - name: Download Android AAB
+        uses: actions/download-artifact@v4
+        with:
+          name: android-aab-main-rc
+          path: ./build-artifacts/
+
+      - name: Upload to Sentry Size Analysis
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.MM_SENTRY_AUTH_TOKEN }}
+        run: |
+          sentry-cli build upload ./build-artifacts/*.aab \
+            --org metamask \
+            --project metamask-mobile \
+            --build-configuration Release-Android \
+            --head-sha "${{ github.sha }}" \
+            --base-sha "${{ steps.base.outputs.sha }}" \
+            --head-ref main \
+            --vcs-provider github \
+            --head-repo-name MetaMask/metamask-mobile
+
   # ── Cleanup Android ephemeral branches ─────────────────────────────────
   # iOS ephemeral branches are cleaned up by build-and-upload-to-testflight.yml.
   cleanup:
diff --git a/.github/workflows/rerun-ci-on-skipped-e2e-labels.yml b/.github/workflows/rerun-ci-on-skipped-e2e-labels.yml
index 2986f7fae76..24cea0920f3 100644
--- a/.github/workflows/rerun-ci-on-skipped-e2e-labels.yml
+++ b/.github/workflows/rerun-ci-on-skipped-e2e-labels.yml
@@ -14,7 +14,7 @@ jobs:
     if: >-
       github.event.label.name == 'skip-smart-e2e-selection' ||
       github.event.label.name == 'skip-e2e' ||
-      github.event.label.name == 'skip-e2e-quality-gate' ||
+      github.event.label.name == 'skip-e2e-flakiness-detection' ||
       github.event.label.name == 'pr-not-ready-for-e2e'
     runs-on: ubuntu-latest
     permissions:
@@ -92,5 +92,8 @@ jobs:
         run: |
           RUN_ID="${{ steps.find.outputs.run_id }}"
           echo "Re-running workflow $RUN_ID..."
-          gh run rerun "$RUN_ID" --repo "$REPO"
-          echo "CI workflow re-triggered successfully"
+          if gh run rerun "$RUN_ID" --repo "$REPO"; then
+            echo "CI workflow re-triggered successfully"
+          else
+            echo "Rerun not possible (run may not be in a retriable state)"
+          fi
diff --git a/.github/workflows/run-e2e-api-specs.yml b/.github/workflows/run-e2e-api-specs.yml
index 94c5edfbb81..f90fa6ad24b 100644
--- a/.github/workflows/run-e2e-api-specs.yml
+++ b/.github/workflows/run-e2e-api-specs.yml
@@ -23,8 +23,6 @@ jobs:
       SEGMENT_WRITE_KEY_QA: ${{ secrets.SEGMENT_WRITE_KEY_QA }}
       SEGMENT_PROXY_URL_QA: ${{ secrets.SEGMENT_PROXY_URL_QA }}
       SEGMENT_DELETE_API_SOURCE_ID_QA: ${{ secrets.SEGMENT_DELETE_API_SOURCE_ID_QA }}
-      MAIN_IOS_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_IOS_GOOGLE_CLIENT_ID_UAT }}
-      MAIN_IOS_GOOGLE_REDIRECT_URI_UAT: ${{ secrets.MAIN_IOS_GOOGLE_REDIRECT_URI_UAT }}
       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 }}
diff --git a/.github/workflows/run-e2e-regression-tests-android.yml b/.github/workflows/run-e2e-regression-tests-android.yml
index fb0a2a7b7b9..a39a83f7a68 100644
--- a/.github/workflows/run-e2e-regression-tests-android.yml
+++ b/.github/workflows/run-e2e-regression-tests-android.yml
@@ -7,6 +7,14 @@ on:
         description: 'Send Slack notification even when all tests pass'
         type: boolean
         default: false
+      runner_provider:
+        description: Runner provider for this manual trial run
+        required: true
+        type: choice
+        options:
+          - current
+          - namespace
+        default: current
 
 permissions:
   contents: read
@@ -25,6 +33,7 @@ jobs:
       build_type: 'main'
       metamask_environment: 'e2e'
       keystore_target: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-confirmations-android:
@@ -41,6 +50,7 @@ jobs:
       test_suite_tag: 'RegressionConfirmations'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-trade-android:
@@ -57,6 +67,7 @@ jobs:
       test_suite_tag: 'RegressionTrade'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-wallet-platform-android:
@@ -73,6 +84,7 @@ jobs:
       test_suite_tag: 'RegressionWalletPlatform'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-accounts-android:
@@ -89,6 +101,7 @@ jobs:
       test_suite_tag: 'RegressionAccounts'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-network-abstraction-android:
@@ -105,6 +118,7 @@ jobs:
       test_suite_tag: 'RegressionNetworkAbstractions'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-network-expansion-android:
@@ -121,6 +135,7 @@ jobs:
       test_suite_tag: 'RegressionNetworkExpansion'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-assets-android:
@@ -137,6 +152,7 @@ jobs:
       test_suite_tag: 'RegressionAssets'
       split_number: ${{ matrix.split }}
       total_splits: 2
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-ux-android:
@@ -153,11 +169,12 @@ jobs:
       test_suite_tag: 'RegressionWalletUX'
       split_number: ${{ matrix.split }}
       total_splits: 1
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   report-android-regression-tests:
     name: Report Android Regression Tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: always()
     needs:
       - build-android-apks
diff --git a/.github/workflows/run-e2e-regression-tests-ios.yml b/.github/workflows/run-e2e-regression-tests-ios.yml
index 29343a469b7..295069cc952 100644
--- a/.github/workflows/run-e2e-regression-tests-ios.yml
+++ b/.github/workflows/run-e2e-regression-tests-ios.yml
@@ -9,6 +9,14 @@ on:
         description: 'Send Slack notification even when all tests pass'
         type: boolean
         default: false
+      runner_provider:
+        description: Runner provider for this manual trial run
+        required: true
+        type: choice
+        options:
+          - current
+          - namespace
+        default: current
 
 permissions:
   contents: read
@@ -23,6 +31,8 @@ jobs:
       contents: read
       id-token: write
     uses: ./.github/workflows/build-ios-e2e.yml
+    with:
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-confirmations-ios:
@@ -39,6 +49,7 @@ jobs:
       test_suite_tag: 'RegressionConfirmations'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-trade-ios:
@@ -55,6 +66,7 @@ jobs:
       test_suite_tag: 'RegressionTrade'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-wallet-platform-ios:
@@ -71,6 +83,7 @@ jobs:
       test_suite_tag: 'RegressionWalletPlatform'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-accounts-ios:
@@ -87,6 +100,7 @@ jobs:
       test_suite_tag: 'RegressionAccounts'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-network-abstraction-ios:
@@ -103,6 +117,7 @@ jobs:
       test_suite_tag: 'RegressionNetworkAbstractions'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-network-expansion-ios:
@@ -119,6 +134,7 @@ jobs:
       test_suite_tag: 'RegressionNetworkExpansion'
       split_number: ${{ matrix.split }}
       total_splits: 4
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-assets-ios:
@@ -135,6 +151,7 @@ jobs:
       test_suite_tag: 'RegressionAssets'
       split_number: ${{ matrix.split }}
       total_splits: 2
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   regression-ux-ios:
@@ -151,11 +168,12 @@ jobs:
       test_suite_tag: 'RegressionWalletUX'
       split_number: ${{ matrix.split }}
       total_splits: 1
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   report-ios-regression-tests:
     name: Report iOS Regression Tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: always()
     needs:
       - regression-confirmations-ios
diff --git a/.github/workflows/run-e2e-smoke-tests-android.yml b/.github/workflows/run-e2e-smoke-tests-android.yml
index a8dc3575fbc..f40ccf3d1e9 100644
--- a/.github/workflows/run-e2e-smoke-tests-android.yml
+++ b/.github/workflows/run-e2e-smoke-tests-android.yml
@@ -13,6 +13,11 @@ on:
         required: false
         type: string
         default: ''
+      runner_provider:
+        description: Runner provider forwarded from the caller
+        required: false
+        type: string
+        default: current
 
 permissions:
   contents: read
@@ -33,6 +38,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 2
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   stake-android-smoke:
@@ -49,6 +55,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 1
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   perps-android-smoke:
@@ -65,6 +72,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 1
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   wallet-platform-android-smoke:
@@ -81,6 +89,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 3
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   identity-android-smoke:
@@ -97,6 +106,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 2
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   accounts-android-smoke:
@@ -113,6 +123,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 1
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   network-abstraction-android-smoke:
@@ -129,6 +140,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 2
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   network-expansion-android-smoke:
@@ -145,6 +157,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 2
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   confirmations-android-smoke:
@@ -161,6 +174,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 4
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   prediction-market-android-smoke:
@@ -177,6 +191,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 1
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   money-android-smoke:
@@ -193,6 +208,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 1
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   multichain-api-android-smoke:
@@ -209,6 +225,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 1
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   seedless-onboarding-android-smoke:
@@ -225,6 +242,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 1
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   browser-android-smoke:
@@ -241,6 +259,7 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 1
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   snaps-android-smoke:
@@ -257,11 +276,12 @@ jobs:
       split_number: ${{ matrix.split }}
       total_splits: 4
       changed_files: ${{ inputs.changed_files }}
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   report-android-smoke-tests:
     name: Report Android Smoke Tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ !cancelled() && inputs.selected_tags != '[]' && inputs.selected_tags != '["FlaskBuildTests"]' }}
     needs:
       - swap-android-smoke
diff --git a/.github/workflows/run-e2e-smoke-tests-ios.yml b/.github/workflows/run-e2e-smoke-tests-ios.yml
index 05b82e8bf05..19fb3ee5d7c 100644
--- a/.github/workflows/run-e2e-smoke-tests-ios.yml
+++ b/.github/workflows/run-e2e-smoke-tests-ios.yml
@@ -13,6 +13,11 @@ on:
         required: false
         type: string
         default: ''
+      runner_provider:
+        description: Runner provider forwarded from the caller
+        required: false
+        type: string
+        default: current
 
 permissions:
   contents: read
@@ -35,6 +40,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   swap-ios-smoke:
@@ -53,6 +59,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   stake-ios-smoke:
@@ -71,6 +78,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   perps-ios-smoke:
@@ -89,6 +97,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   wallet-platform-ios-smoke:
@@ -107,6 +116,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   identity-ios-smoke:
@@ -125,6 +135,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   accounts-ios-smoke:
@@ -143,6 +154,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   network-abstraction-ios-smoke:
@@ -161,6 +173,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   network-expansion-ios-smoke:
@@ -179,6 +192,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   prediction-market-ios-smoke:
@@ -197,6 +211,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   money-ios-smoke:
@@ -215,6 +230,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   multichain-api-ios-smoke:
@@ -233,6 +249,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   seedless-onboarding-ios-smoke:
@@ -251,6 +268,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   browser-ios-smoke:
@@ -269,6 +287,7 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   snaps-ios-smoke:
@@ -287,11 +306,12 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
       build_type: 'main'
       metamask_environment: 'qa'
+      runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
 
   report-ios-smoke-tests:
     name: Report iOS Smoke Tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
     if: ${{ !cancelled() && inputs.selected_tags != '[]' && inputs.selected_tags != '["FlaskBuildTests"]' }}
     needs:
       - confirmations-ios-smoke
diff --git a/.github/workflows/run-e2e-workflow.yml b/.github/workflows/run-e2e-workflow.yml
index cf7e218be2a..efea199b9dd 100644
--- a/.github/workflows/run-e2e-workflow.yml
+++ b/.github/workflows/run-e2e-workflow.yml
@@ -53,11 +53,16 @@ on:
         required: false
         type: string
         default: 'main-'
+      runner_provider:
+        description: Runner provider forwarded from the caller
+        required: false
+        type: string
+        default: current
 
 jobs:
   test-e2e-mobile:
     name: ${{ inputs.test-suite-name }}
-    runs-on: ${{ inputs.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:tahoe' || 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg' }}
+    runs-on: ${{ inputs.runner_provider == 'namespace' && (inputs.platform == 'ios' && 'namespace-profile-metamask-ios-e2e' || 'namespace-profile-metamask-android-build') || (inputs.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:tahoe' || 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg') }}
     outputs:
       apk-target-path: ${{ steps.determine-target-paths.outputs.apk-target-path }}
       test-apk-target-path: ${{ steps.determine-target-paths.outputs.test-apk-target-path }}
@@ -84,11 +89,6 @@ jobs:
       SEGMENT_WRITE_KEY_QA: ${{ secrets.SEGMENT_WRITE_KEY_QA }}
       SEGMENT_PROXY_URL_QA: ${{ secrets.SEGMENT_PROXY_URL_QA }}
       SEGMENT_DELETE_API_SOURCE_ID_QA: ${{ secrets.SEGMENT_DELETE_API_SOURCE_ID_QA }}
-      MAIN_IOS_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_IOS_GOOGLE_CLIENT_ID_UAT }}
-      MAIN_IOS_GOOGLE_REDIRECT_URI_UAT: ${{ secrets.MAIN_IOS_GOOGLE_REDIRECT_URI_UAT }}
-      MAIN_ANDROID_APPLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_APPLE_CLIENT_ID_UAT }}
-      MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT }}
-      MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT }}
       SEGMENT_REGULATIONS_ENDPOINT_QA: ${{ secrets.SEGMENT_REGULATIONS_ENDPOINT_QA }}
       MM_SENTRY_DSN_TEST: ${{ secrets.MM_SENTRY_DSN_TEST }}
       MM_SENTRY_AUTH_TOKEN: ${{ secrets.MM_SENTRY_AUTH_TOKEN }}
diff --git a/.github/workflows/run-performance-e2e.yml b/.github/workflows/run-performance-e2e.yml
index a8aef5ffc6b..114bff17c87 100644
--- a/.github/workflows/run-performance-e2e.yml
+++ b/.github/workflows/run-performance-e2e.yml
@@ -142,6 +142,7 @@ jobs:
     needs: [determine-branch-name]
     outputs:
       android_matrix: ${{ steps.read-matrix.outputs.android_matrix }}
+      android_mm_connect_matrix: ${{ steps.read-matrix.outputs.android_mm_connect_matrix }}
       ios_matrix: ${{ steps.read-matrix.outputs.ios_matrix }}
     steps:
       - name: Checkout code
@@ -165,18 +166,23 @@ jobs:
           fi
 
           ANDROID_MATRIX=$(jq ".android_devices | $FILTER" "$FILE")
+          ANDROID_MM_CONNECT_MATRIX=$(jq '[.android_devices[] | select(.name | contains("Samsung"))]' "$FILE")
           IOS_MATRIX=$(jq ".ios_devices | $FILTER" "$FILE")
 
           {
             echo "android_matrix<<EOF"
             echo "$ANDROID_MATRIX"
             echo "EOF"
+            echo "android_mm_connect_matrix<<EOF"
+            echo "$ANDROID_MM_CONNECT_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"
+          echo "Selected for Android MM-Connect: $(echo "$ANDROID_MM_CONNECT_MATRIX" | jq length)"
 
   set-build-names:
     name: Set Unified BrowserStack Build Names
@@ -333,7 +339,7 @@ jobs:
     name: Fetch RN Playground APK and Upload to BrowserStack
     runs-on: ubuntu-latest
     needs: [wait-for-onboarding-completion]
-    if: always() && !cancelled()
+    if: always() && !cancelled() && (inputs.build_variant || 'rc') == 'rc'
     outputs:
       browserstack-playground-url: ${{ steps.upload-playground.outputs.browserstack-url }}
     steps:
@@ -376,13 +382,13 @@ jobs:
         set-build-names,
         determine-branch-name,
       ]
-    if: always() && !cancelled() && (needs.trigger-android-dual-versions.result == 'skipped' || needs.trigger-android-dual-versions.result == 'success') && (inputs.browserstack_app_url_android_imported_wallet != '' || needs.trigger-android-dual-versions.outputs.with-srp-browserstack-url != '')
+    if: always() && !cancelled() && (inputs.build_variant || 'rc') == 'rc' && (needs.trigger-android-dual-versions.result == 'skipped' || needs.trigger-android-dual-versions.result == 'success') && (inputs.browserstack_app_url_android_imported_wallet != '' || needs.trigger-android-dual-versions.outputs.with-srp-browserstack-url != '')
     with:
       platform: android
       build_type: mm-connect
       sentry_target: ${{ inputs.sentry_target || 'test' }}
       build_variant: ${{ inputs.build_variant || 'rc' }}
-      device_matrix: ${{ needs.read-device-matrix.outputs.android_matrix }}
+      device_matrix: ${{ needs.read-device-matrix.outputs.android_mm_connect_matrix }}
       browserstack_app_url: ${{ needs.trigger-android-dual-versions.outputs.with-srp-browserstack-url || inputs.browserstack_app_url_android_imported_wallet }}
       app_version: ${{ needs.trigger-android-dual-versions.outputs.with-srp-version || 'Manual-Input' }}
       branch_name: ${{ needs.determine-branch-name.outputs.branch_name }}
diff --git a/.github/workflows/run-system-tests.yml b/.github/workflows/run-system-tests.yml
new file mode 100644
index 00000000000..9e037e8ac72
--- /dev/null
+++ b/.github/workflows/run-system-tests.yml
@@ -0,0 +1,638 @@
+# Nightly System Tests
+#
+# Runs the 18 performance test specs as functional system tests (no quality gates,
+# no Sentry, no performance metrics). Validates that core user flows (login,
+# onboarding, swaps, etc.) work on real devices via BrowserStack.
+#
+# Triggers:
+#   - Daily at 5 AM UTC (1 hour after nightly build starts)
+#   - Manually via workflow_dispatch (optionally with pre-built BrowserStack URLs)
+
+name: Nightly System Tests
+
+on:
+  schedule:
+    - cron: '0 5 * * *' # 5 AM UTC daily
+  workflow_dispatch:
+    inputs:
+      browserstack_app_url_android:
+        description: 'BrowserStack Android App URL for login tests — with-SRP build (bs://...)'
+        required: false
+        type: string
+      browserstack_app_url_ios:
+        description: 'BrowserStack iOS App URL for login tests — with-SRP build (bs://...)'
+        required: false
+        type: string
+      browserstack_clean_app_url_android:
+        description: 'BrowserStack Android Clean App URL for onboarding tests (bs://...)'
+        required: false
+        type: string
+      browserstack_clean_app_url_ios:
+        description: 'BrowserStack iOS Clean App URL for onboarding tests (bs://...)'
+        required: false
+        type: string
+
+permissions:
+  contents: write
+  id-token: write
+
+concurrency:
+  group: system-tests-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  build-with-srp:
+    name: Build with-SRP (login tests)
+    if: >-
+      github.event_name != 'workflow_dispatch'
+        || (!inputs.browserstack_app_url_android
+            && !inputs.browserstack_app_url_ios
+            && !inputs.browserstack_clean_app_url_android
+            && !inputs.browserstack_clean_app_url_ios)
+    uses: ./.github/workflows/build.yml
+    with:
+      build_name: main-rc-with-srp
+      platform: both
+      skip_version_bump: true
+      source_branch: ${{ github.ref_name }}
+    secrets: inherit
+
+  build-clean:
+    name: Build clean RC (onboarding tests)
+    if: >-
+      github.event_name != 'workflow_dispatch'
+        || (!inputs.browserstack_app_url_android
+            && !inputs.browserstack_app_url_ios
+            && !inputs.browserstack_clean_app_url_android
+            && !inputs.browserstack_clean_app_url_ios)
+    uses: ./.github/workflows/build.yml
+    with:
+      build_name: main-rc
+      platform: both
+      skip_version_bump: true
+      source_branch: ${{ github.ref_name }}
+    secrets: inherit
+
+  upload-to-browserstack:
+    name: Upload builds to BrowserStack
+    needs: [build-with-srp, build-clean]
+    if: always() && !cancelled()
+    runs-on: ubuntu-latest
+    outputs:
+      android-login-url: ${{ steps.resolve.outputs.android-login-url }}
+      ios-login-url: ${{ steps.resolve.outputs.ios-login-url }}
+      android-onboarding-url: ${{ steps.resolve.outputs.android-onboarding-url }}
+      ios-onboarding-url: ${{ steps.resolve.outputs.ios-onboarding-url }}
+    env:
+      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+    steps:
+      - name: Download Android APK (with-SRP)
+        if: needs.build-with-srp.result == 'success'
+        uses: actions/download-artifact@v8
+        with:
+          name: android-apk-main-rc-with-srp
+          path: artifacts/android-with-srp
+
+      - name: Download iOS IPA (with-SRP)
+        if: needs.build-with-srp.result == 'success'
+        uses: actions/download-artifact@v8
+        with:
+          name: ios-ipa-main-rc-with-srp
+          path: artifacts/ios-with-srp
+
+      - name: Download Android APK (clean)
+        if: needs.build-clean.result == 'success'
+        uses: actions/download-artifact@v8
+        with:
+          name: android-apk-main-rc
+          path: artifacts/android-clean
+
+      - name: Download iOS IPA (clean)
+        if: needs.build-clean.result == 'success'
+        uses: actions/download-artifact@v8
+        with:
+          name: ios-ipa-main-rc
+          path: artifacts/ios-clean
+
+      - name: Upload artifacts to BrowserStack and resolve URLs
+        id: resolve
+        run: |
+          # Helper: resolve a single URL from manual input or build artifact.
+          # Outputs the URL to GITHUB_OUTPUT, or empty string if unavailable.
+          # Upload failures are logged but do not abort other resolutions.
+          resolve_url() {
+            local output_key="$1"
+            local manual_url="$2"
+            local artifact_dir="$3"
+            local extension="$4"
+            local custom_id="$5"
+
+            if [[ -n "$manual_url" ]]; then
+              echo "${output_key}=${manual_url}" >> "$GITHUB_OUTPUT"
+              echo "Using manual URL for ${output_key}: ${manual_url}"
+              return 0
+            fi
+
+            if [[ ! -d "$artifact_dir" ]]; then
+              echo "No build artifact for ${output_key} and no manual URL — test will be skipped"
+              echo "${output_key}=" >> "$GITHUB_OUTPUT"
+              return 0
+            fi
+
+            local file
+            file=$(find "$artifact_dir" -name "*.${extension}" | head -1)
+            if [[ -z "$file" ]]; then
+              echo "::warning::No .${extension} found in ${artifact_dir} — ${output_key} will be empty"
+              echo "${output_key}=" >> "$GITHUB_OUTPUT"
+              return 0
+            fi
+
+            echo "Uploading ${file} to BrowserStack..."
+            local response
+            response=$(curl -s -u "$BROWSERSTACK_USERNAME:$BROWSERSTACK_ACCESS_KEY" \
+              -X POST "https://api-cloud.browserstack.com/app-automate/upload" \
+              -F "file=@${file}" \
+              -F "custom_id=${custom_id}")
+
+            local app_url
+            app_url=$(echo "$response" | jq -r '.app_url')
+
+            if [[ -z "$app_url" || "$app_url" == "null" ]]; then
+              echo "::error::BrowserStack upload failed for ${output_key} (${file}): ${response}"
+              echo "${output_key}=" >> "$GITHUB_OUTPUT"
+              return 0
+            fi
+
+            echo "${output_key}=${app_url}" >> "$GITHUB_OUTPUT"
+            echo "${output_key}: ${app_url}"
+          }
+
+          resolve_url "android-login-url" \
+            "${{ inputs.browserstack_app_url_android }}" \
+            "artifacts/android-with-srp" "apk" \
+            "system-test-android-login-${{ github.run_id }}"
+
+          resolve_url "ios-login-url" \
+            "${{ inputs.browserstack_app_url_ios }}" \
+            "artifacts/ios-with-srp" "ipa" \
+            "system-test-ios-login-${{ github.run_id }}"
+
+          resolve_url "android-onboarding-url" \
+            "${{ inputs.browserstack_clean_app_url_android }}" \
+            "artifacts/android-clean" "apk" \
+            "system-test-android-onboarding-${{ github.run_id }}"
+
+          resolve_url "ios-onboarding-url" \
+            "${{ inputs.browserstack_clean_app_url_ios }}" \
+            "artifacts/ios-clean" "ipa" \
+            "system-test-ios-onboarding-${{ github.run_id }}"
+
+          echo "URL resolution complete"
+
+  run-android-login-tests:
+    name: Android Login Tests
+    needs: [upload-to-browserstack]
+    if: >-
+      always() && !cancelled()
+        && needs.upload-to-browserstack.outputs.android-login-url != ''
+    runs-on: ubuntu-latest
+    env:
+      BROWSERSTACK_ANDROID_APP_URL: ${{ needs.upload-to-browserstack.outputs.android-login-url }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Restore node_modules cache
+        uses: actions/cache@v6
+        with:
+          path: |
+            node_modules
+            .yarn/cache
+            .yarn/install-state.gz
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+
+      - name: Install dependencies
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          retry_wait_seconds: 30
+          command: yarn --immutable
+
+      - name: Restore .metamask folder
+        id: restore-metamask
+        uses: actions/cache@v6
+        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
+
+      - name: BrowserStack Env Setup
+        uses: browserstack/github-actions/setup-env@4478e16186f38e5be07721931642e65a028713c3
+        with:
+          username: ${{ secrets.BROWSERSTACK_USERNAME }}
+          access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+          project-name: ${{ github.repository }}
+
+      - name: Compute BrowserStack Local Identifier
+        id: bs-local-id
+        run: echo "value=${{ github.run_id }}-android-login" >> "$GITHUB_OUTPUT"
+
+      - name: Setup BrowserStack Local
+        uses: browserstack/github-actions/setup-local@4478e16186f38e5be07721931642e65a028713c3
+        with:
+          local-testing: start
+          local-identifier: ${{ steps.bs-local-id.outputs.value }}
+          local-args: '--force-local --verbose'
+
+      - name: Wait for BrowserStack Local
+        run: sleep 10
+
+      - name: Set test environment
+        run: |
+          {
+            echo "BROWSERSTACK_LOCAL=true"
+            echo "BROWSERSTACK_LOCAL_IDENTIFIER=${{ steps.bs-local-id.outputs.value }}"
+            echo "BROWSERSTACK_BUILD_NAME=system-test-android-login-${{ github.run_id }}"
+            echo "MM_TEST_ACCOUNT_SRP=${{ secrets.MM_TEST_ACCOUNT_SRP }}"
+            echo "TEST_SRP_1=${{ secrets.TEST_SRP_1 }}"
+            echo "TEST_SRP_2=${{ secrets.TEST_SRP_2 }}"
+            echo "TEST_SRP_3=${{ secrets.TEST_SRP_3 }}"
+            echo "E2E_PASSWORD=${{ secrets.E2E_PASSWORD }}"
+          } >> "$GITHUB_ENV"
+
+      - name: Run Android login system tests
+        run: yarn run-system-tests:android-login
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v8
+        if: always()
+        with:
+          name: system-test-report-android-login
+          path: tests/test-reports/system-test-report/
+          if-no-files-found: ignore
+          retention-days: 7
+
+  run-android-onboarding-tests:
+    name: Android Onboarding Tests
+    needs: [upload-to-browserstack]
+    if: >-
+      always() && !cancelled()
+        && needs.upload-to-browserstack.outputs.android-onboarding-url != ''
+    runs-on: ubuntu-latest
+    env:
+      BROWSERSTACK_ANDROID_CLEAN_APP_URL: ${{ needs.upload-to-browserstack.outputs.android-onboarding-url }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Restore node_modules cache
+        uses: actions/cache@v6
+        with:
+          path: |
+            node_modules
+            .yarn/cache
+            .yarn/install-state.gz
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+
+      - name: Install dependencies
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          retry_wait_seconds: 30
+          command: yarn --immutable
+
+      - name: Restore .metamask folder
+        id: restore-metamask
+        uses: actions/cache@v6
+        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
+
+      - name: BrowserStack Env Setup
+        uses: browserstack/github-actions/setup-env@4478e16186f38e5be07721931642e65a028713c3
+        with:
+          username: ${{ secrets.BROWSERSTACK_USERNAME }}
+          access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+          project-name: ${{ github.repository }}
+
+      - name: Compute BrowserStack Local Identifier
+        id: bs-local-id
+        run: echo "value=${{ github.run_id }}-android-onboarding" >> "$GITHUB_OUTPUT"
+
+      - name: Setup BrowserStack Local
+        uses: browserstack/github-actions/setup-local@4478e16186f38e5be07721931642e65a028713c3
+        with:
+          local-testing: start
+          local-identifier: ${{ steps.bs-local-id.outputs.value }}
+          local-args: '--force-local --verbose'
+
+      - name: Wait for BrowserStack Local
+        run: sleep 10
+
+      - name: Set test environment
+        run: |
+          {
+            echo "BROWSERSTACK_LOCAL=true"
+            echo "BROWSERSTACK_LOCAL_IDENTIFIER=${{ steps.bs-local-id.outputs.value }}"
+            echo "BROWSERSTACK_BUILD_NAME=system-test-android-onboarding-${{ github.run_id }}"
+            echo "MM_TEST_ACCOUNT_SRP=${{ secrets.MM_TEST_ACCOUNT_SRP }}"
+            echo "TEST_SRP_1=${{ secrets.TEST_SRP_1 }}"
+            echo "TEST_SRP_2=${{ secrets.TEST_SRP_2 }}"
+            echo "TEST_SRP_3=${{ secrets.TEST_SRP_3 }}"
+            echo "E2E_PASSWORD=${{ secrets.E2E_PASSWORD }}"
+          } >> "$GITHUB_ENV"
+
+      - name: Run Android onboarding system tests
+        run: yarn run-system-tests:android-onboarding
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v8
+        if: always()
+        with:
+          name: system-test-report-android-onboarding
+          path: tests/test-reports/system-test-report/
+          if-no-files-found: ignore
+          retention-days: 7
+
+  run-ios-login-tests:
+    name: iOS Login Tests
+    needs: [upload-to-browserstack]
+    if: >-
+      always() && !cancelled()
+        && needs.upload-to-browserstack.outputs.ios-login-url != ''
+    runs-on: ubuntu-latest
+    env:
+      BROWSERSTACK_IOS_APP_URL: ${{ needs.upload-to-browserstack.outputs.ios-login-url }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Restore node_modules cache
+        uses: actions/cache@v6
+        with:
+          path: |
+            node_modules
+            .yarn/cache
+            .yarn/install-state.gz
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+
+      - name: Install dependencies
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          retry_wait_seconds: 30
+          command: yarn --immutable
+
+      - name: Restore .metamask folder
+        id: restore-metamask
+        uses: actions/cache@v6
+        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
+
+      - name: BrowserStack Env Setup
+        uses: browserstack/github-actions/setup-env@4478e16186f38e5be07721931642e65a028713c3
+        with:
+          username: ${{ secrets.BROWSERSTACK_USERNAME }}
+          access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+          project-name: ${{ github.repository }}
+
+      - name: Compute BrowserStack Local Identifier
+        id: bs-local-id
+        run: echo "value=${{ github.run_id }}-ios-login" >> "$GITHUB_OUTPUT"
+
+      - name: Setup BrowserStack Local
+        uses: browserstack/github-actions/setup-local@4478e16186f38e5be07721931642e65a028713c3
+        with:
+          local-testing: start
+          local-identifier: ${{ steps.bs-local-id.outputs.value }}
+          local-args: '--force-local --verbose'
+
+      - name: Wait for BrowserStack Local
+        run: sleep 10
+
+      - name: Set test environment
+        run: |
+          {
+            echo "BROWSERSTACK_LOCAL=true"
+            echo "BROWSERSTACK_LOCAL_IDENTIFIER=${{ steps.bs-local-id.outputs.value }}"
+            echo "BROWSERSTACK_BUILD_NAME=system-test-ios-login-${{ github.run_id }}"
+            echo "MM_TEST_ACCOUNT_SRP=${{ secrets.MM_TEST_ACCOUNT_SRP }}"
+            echo "TEST_SRP_1=${{ secrets.TEST_SRP_1 }}"
+            echo "TEST_SRP_2=${{ secrets.TEST_SRP_2 }}"
+            echo "TEST_SRP_3=${{ secrets.TEST_SRP_3 }}"
+            echo "E2E_PASSWORD=${{ secrets.E2E_PASSWORD }}"
+          } >> "$GITHUB_ENV"
+
+      - name: Run iOS login system tests
+        run: yarn run-system-tests:ios-login
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v8
+        if: always()
+        with:
+          name: system-test-report-ios-login
+          path: tests/test-reports/system-test-report/
+          if-no-files-found: ignore
+          retention-days: 7
+
+  run-ios-onboarding-tests:
+    name: iOS Onboarding Tests
+    needs: [upload-to-browserstack]
+    if: >-
+      always() && !cancelled()
+        && needs.upload-to-browserstack.outputs.ios-onboarding-url != ''
+    runs-on: ubuntu-latest
+    env:
+      BROWSERSTACK_IOS_CLEAN_APP_URL: ${{ needs.upload-to-browserstack.outputs.ios-onboarding-url }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Restore node_modules cache
+        uses: actions/cache@v6
+        with:
+          path: |
+            node_modules
+            .yarn/cache
+            .yarn/install-state.gz
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+
+      - name: Install dependencies
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          retry_wait_seconds: 30
+          command: yarn --immutable
+
+      - name: Restore .metamask folder
+        id: restore-metamask
+        uses: actions/cache@v6
+        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
+
+      - name: BrowserStack Env Setup
+        uses: browserstack/github-actions/setup-env@4478e16186f38e5be07721931642e65a028713c3
+        with:
+          username: ${{ secrets.BROWSERSTACK_USERNAME }}
+          access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+          project-name: ${{ github.repository }}
+
+      - name: Compute BrowserStack Local Identifier
+        id: bs-local-id
+        run: echo "value=${{ github.run_id }}-ios-onboarding" >> "$GITHUB_OUTPUT"
+
+      - name: Setup BrowserStack Local
+        uses: browserstack/github-actions/setup-local@4478e16186f38e5be07721931642e65a028713c3
+        with:
+          local-testing: start
+          local-identifier: ${{ steps.bs-local-id.outputs.value }}
+          local-args: '--force-local --verbose'
+
+      - name: Wait for BrowserStack Local
+        run: sleep 10
+
+      - name: Set test environment
+        run: |
+          {
+            echo "BROWSERSTACK_LOCAL=true"
+            echo "BROWSERSTACK_LOCAL_IDENTIFIER=${{ steps.bs-local-id.outputs.value }}"
+            echo "BROWSERSTACK_BUILD_NAME=system-test-ios-onboarding-${{ github.run_id }}"
+            echo "MM_TEST_ACCOUNT_SRP=${{ secrets.MM_TEST_ACCOUNT_SRP }}"
+            echo "TEST_SRP_1=${{ secrets.TEST_SRP_1 }}"
+            echo "TEST_SRP_2=${{ secrets.TEST_SRP_2 }}"
+            echo "TEST_SRP_3=${{ secrets.TEST_SRP_3 }}"
+            echo "E2E_PASSWORD=${{ secrets.E2E_PASSWORD }}"
+          } >> "$GITHUB_ENV"
+
+      - name: Run iOS onboarding system tests
+        run: yarn run-system-tests:ios-onboarding
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v8
+        if: always()
+        with:
+          name: system-test-report-ios-onboarding
+          path: tests/test-reports/system-test-report/
+          if-no-files-found: ignore
+          retention-days: 7
+
+  report:
+    name: System Test Summary
+    needs:
+      - run-android-login-tests
+      - run-android-onboarding-tests
+      - run-ios-login-tests
+      - run-ios-onboarding-tests
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all test reports
+        uses: actions/download-artifact@v8
+        with:
+          pattern: system-test-report-*
+          path: all-reports
+          merge-multiple: false
+
+      - name: Generate summary
+        run: |
+          STATUS_ANDROID_LOGIN="${{ needs.run-android-login-tests.result }}"
+          STATUS_ANDROID_ONBOARDING="${{ needs.run-android-onboarding-tests.result }}"
+          STATUS_IOS_LOGIN="${{ needs.run-ios-login-tests.result }}"
+          STATUS_IOS_ONBOARDING="${{ needs.run-ios-onboarding-tests.result }}"
+
+          format_status() {
+            case "$1" in
+              success)  echo "passed" ;;
+              failure)  echo "FAILED" ;;
+              skipped)  echo "skipped" ;;
+              cancelled) echo "cancelled" ;;
+              *)        echo "$1" ;;
+            esac
+          }
+
+          {
+            echo "## Nightly System Test Results"
+            echo ""
+            echo "| Project | Status |"
+            echo "|---------|--------|"
+            echo "| Android Login | $(format_status "$STATUS_ANDROID_LOGIN") |"
+            echo "| Android Onboarding | $(format_status "$STATUS_ANDROID_ONBOARDING") |"
+            echo "| iOS Login | $(format_status "$STATUS_IOS_LOGIN") |"
+            echo "| iOS Onboarding | $(format_status "$STATUS_IOS_ONBOARDING") |"
+            echo ""
+            echo "**Trigger:** ${{ github.event_name }}"
+            echo "**Branch:** ${{ github.ref_name }}"
+            echo "**Run:** [#${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
+          } >> "$GITHUB_STEP_SUMMARY"
+
+          # Fail the report job if any test job failed
+          if [[ "$STATUS_ANDROID_LOGIN" == "failure" || "$STATUS_ANDROID_ONBOARDING" == "failure" || "$STATUS_IOS_LOGIN" == "failure" || "$STATUS_IOS_ONBOARDING" == "failure" ]]; then
+            echo ""
+            echo "::error::One or more system test projects failed"
+            exit 1
+          fi
diff --git a/.github/workflows/runway-android-production-workflow.yml b/.github/workflows/runway-android-production-workflow.yml
deleted file mode 100644
index fdac5745de2..00000000000
--- a/.github/workflows/runway-android-production-workflow.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################################################################
-#
-# Runway Android Production Workflow
-#
-# Triggered from Runway to either:
-# - Push an OTA update to the production channel (when OTA_VERSION is bumped), or
-# - Build the production mobile app (when there is no OTA version bump).
-#
-# When triggering workflow_dispatch, select the correct branch (e.g. main or release).
-# Version bump: skipped — run Runway iOS Production first on the same branch for the bump.
-#
-##############################################################################################
-name: Runway Android Production
-
-on:
-  workflow_dispatch:
-    inputs:
-      source_branch:
-        description: >-
-          Optional branch, tag, or SHA (Build workflow source_branch).
-          Empty uses the branch selected in the "Use workflow from" UI.
-        required: false
-        type: string
-
-permissions:
-  contents: write # required by build.yml (update-build-version job)
-  pull-requests: read
-  actions: write
-  id-token: write # required by build.yml
-
-jobs:
-  runway-production:
-    uses: ./.github/workflows/runway-ota-build-core.yml
-    with:
-      platform: android
-      source_branch: ${{ inputs.source_branch }}
-      ota_channel: production
-      build_name: main-prod
-      create_production_ota_tag: true
-      skip_version_bump: true
-    secrets: inherit
diff --git a/.github/workflows/runway-android-rc-workflow.yml b/.github/workflows/runway-android-rc-workflow.yml
deleted file mode 100644
index b30426089e1..00000000000
--- a/.github/workflows/runway-android-rc-workflow.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-##############################################################################################
-#
-# Runway Android RC Workflow
-#
-# Triggered from Runway to either:
-# - Push an OTA update (when OTA_VERSION in app/constants/ota.ts is bumped), or
-# - Build the mobile app (when there is no OTA version bump).
-#
-# When triggering workflow_dispatch, select the release branch (e.g. release/7.71.0).
-# Version bump: skipped here — run Runway iOS RC first on the same branch so it performs the bump.
-#
-##############################################################################################
-name: Runway Android RC
-
-on:
-  workflow_dispatch:
-    inputs:
-      source_branch:
-        description: >-
-          Optional branch, tag, or SHA (Build workflow source_branch).
-          Empty uses the branch selected in the "Use workflow from" UI.
-        required: false
-        type: string
-
-permissions:
-  contents: write # required by build.yml (update-build-version job)
-  pull-requests: read
-  actions: write
-  id-token: write # required by build.yml
-
-jobs:
-  runway-rc:
-    uses: ./.github/workflows/runway-ota-build-core.yml
-    with:
-      platform: android
-      source_branch: ${{ inputs.source_branch }}
-      skip_version_bump: true
-    secrets: inherit
-
-  slack-notification:
-    name: Slack RC Notification
-    needs: runway-rc
-    if: success()
-    uses: ./.github/workflows/slack-rc-notification.yml
-    with:
-      source_branch: ${{ inputs.source_branch || github.ref_name }}
-      semver: ${{ needs.runway-rc.outputs.semantic_version }}
-      ios_build_number: ${{ needs.runway-rc.outputs.ios_version_code }}
-      android_build_number: ${{ needs.runway-rc.outputs.android_version_code }}
-    secrets: inherit
diff --git a/.github/workflows/runway-ios-production-workflow.yml b/.github/workflows/runway-ios-production-workflow.yml
deleted file mode 100644
index 118b768fe0d..00000000000
--- a/.github/workflows/runway-ios-production-workflow.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################################################################
-#
-# Runway iOS Production Workflow
-#
-# Triggered from Runway to either:
-# - Push an OTA update to the production channel (when OTA_VERSION is bumped), or
-# - Build the production app and upload the IPA to TestFlight (when there is no OTA bump).
-#
-# When triggering workflow_dispatch, select the correct branch (e.g. main or release).
-# Version bump: this workflow bumps; run Android production after on the same branch.
-#
-##############################################################################################
-name: Runway iOS Production
-
-on:
-  workflow_dispatch:
-    inputs:
-      source_branch:
-        description: >-
-          Optional branch, tag, or SHA (Build workflow source_branch).
-          Empty uses the branch selected in the "Use workflow from" UI.
-        required: false
-        type: string
-
-permissions:
-  contents: write # required by build.yml (update-build-version job)
-  pull-requests: read
-  actions: write
-  id-token: write # required by build.yml
-
-jobs:
-  runway-production:
-    uses: ./.github/workflows/runway-ota-build-core.yml
-    with:
-      platform: ios
-      source_branch: ${{ inputs.source_branch }}
-      ota_channel: production
-      build_name: main-prod
-      create_production_ota_tag: true
-      environment: prod
-    secrets: inherit
diff --git a/.github/workflows/runway-ios-rc-workflow.yml b/.github/workflows/runway-ios-rc-workflow.yml
deleted file mode 100644
index 6f3dfab2e1d..00000000000
--- a/.github/workflows/runway-ios-rc-workflow.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-##############################################################################################
-#
-# Runway iOS RC Workflow
-#
-# Triggered from Runway to either:
-# - Push an OTA update (when OTA_VERSION in app/constants/ota.ts is bumped), or
-# - Build the mobile app and upload the IPA to TestFlight (when there is no OTA version bump).
-#
-# When triggering workflow_dispatch, select the release branch (e.g. release/7.71.0).
-# Version bump: this workflow bumps the repo build number; run Android RC after so it can skip bump.
-#
-##############################################################################################
-name: Runway iOS RC
-
-on:
-  workflow_dispatch:
-    inputs:
-      source_branch:
-        description: >-
-          Optional branch, tag, or SHA (Build workflow source_branch).
-          Empty uses the branch selected in the "Use workflow from" UI.
-        required: false
-        type: string
-
-permissions:
-  contents: write # required by build.yml (update-build-version job)
-  pull-requests: read
-  actions: write
-  id-token: write # required by build.yml
-
-jobs:
-  runway-rc:
-    uses: ./.github/workflows/runway-ota-build-core.yml
-    with:
-      platform: ios
-      source_branch: ${{ inputs.source_branch }}
-    secrets: inherit
-
-  slack-notification:
-    name: Slack RC Notification
-    needs: runway-rc
-    if: success()
-    uses: ./.github/workflows/slack-rc-notification.yml
-    with:
-      source_branch: ${{ inputs.source_branch || github.ref_name }}
-      semver: ${{ needs.runway-rc.outputs.semantic_version }}
-      ios_build_number: ${{ needs.runway-rc.outputs.ios_version_code }}
-      android_build_number: ${{ needs.runway-rc.outputs.android_version_code }}
-    secrets: inherit
diff --git a/.github/workflows/runway-ota-build-core.yml b/.github/workflows/runway-ota-build-core.yml
deleted file mode 100644
index 43d23d6a92c..00000000000
--- a/.github/workflows/runway-ota-build-core.yml
+++ /dev/null
@@ -1,225 +0,0 @@
-##############################################################################################
-#
-# Runway OTA / build core (reusable)
-#
-# Shared logic for Runway: OTA bump detection, push-eas-update dispatch, or build.yml.
-# Callers: iOS Runway workflows bump once (skip_version_bump false); Android pass skip_version_bump true.
-#
-##############################################################################################
-name: Runway OTA Build Core
-
-on:
-  workflow_call:
-    inputs:
-      platform:
-        description: 'Target platform passed to push-eas-update and build.yml (android or ios)'
-        required: true
-        type: string
-      source_branch:
-        description: >-
-          Optional branch, tag, or SHA (Build workflow source_branch).
-          Empty uses the branch selected in the caller workflow_dispatch "Use workflow from" UI.
-        required: false
-        type: string
-        default: ''
-      ota_channel:
-        description: 'push-eas-update channel input (e.g. rc, production)'
-        required: false
-        type: string
-        default: rc
-      build_name:
-        description: 'build.yml build_name (e.g. main-rc, main-prod)'
-        required: false
-        type: string
-        default: main-rc
-      create_production_ota_tag:
-        description: 'If true, create OTA release tag after production trigger-ota (callers: *production* only)'
-        required: false
-        type: boolean
-        default: false
-      environment:
-        description: 'Build environment / track passed to upload-to-testflight (e.g. rc, prod)'
-        required: false
-        type: string
-        default: 'rc'
-      skip_version_bump:
-        description: >-
-          If true, build.yml skips update-latest-build-version. Android Runway entry workflows set
-          true (iOS bumps first); iOS uses default false.
-        required: false
-        type: boolean
-        default: false
-    outputs:
-      semantic_version:
-        description: 'package.json version at the built commit (empty when OTA path taken)'
-        value: ${{ jobs.trigger-build.outputs.semantic_version }}
-      ios_version_code:
-        description: 'iOS CURRENT_PROJECT_VERSION at the built commit (empty when OTA path taken)'
-        value: ${{ jobs.trigger-build.outputs.ios_version_code }}
-      android_version_code:
-        description: 'Android versionCode at the built commit (empty when OTA path taken)'
-        value: ${{ jobs.trigger-build.outputs.android_version_code }}
-
-permissions:
-  contents: write # required by build.yml (update-build-version job)
-  pull-requests: read
-  actions: write
-  id-token: write # required by build.yml
-
-jobs:
-  decide:
-    name: Check OTA version and resolve inputs
-    runs-on: ubuntu-latest
-    outputs:
-      ota_bump: ${{ steps.decide.outputs.ota_bump }}
-      base_ref: ${{ steps.decide.outputs.base_ref }}
-      ota_version: ${{ steps.decide.outputs.ota_version }}
-      pr_number: ${{ steps.resolve-pr.outputs.pr_number }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: ${{ inputs.source_branch || github.ref }}
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Resolve PR number for current branch
-        id: resolve-pr
-        run: |
-          BRANCH="${{ inputs.source_branch || github.ref_name }}"
-          # Strip refs/heads/ if present
-          BRANCH="${BRANCH#refs/heads/}"
-          echo "Resolving PR for branch: $BRANCH (repo: $GITHUB_REPOSITORY)"
-
-          # Try same-repo head first, then owner:branch (required by API when listing pulls)
-          # jq '.[0].number' on an empty array outputs the literal string "null", so normalise to empty
-          PR_NUMBER=$(gh pr list --repo "$GITHUB_REPOSITORY" --head "$BRANCH" --json number --jq '.[0].number // empty' 2>/dev/null || echo "")
-          if [[ -z "$PR_NUMBER" ]]; then
-            PR_NUMBER=$(gh pr list --repo "$GITHUB_REPOSITORY" --head "$GITHUB_REPOSITORY_OWNER:$BRANCH" --json number --jq '.[0].number // empty' 2>/dev/null || echo "")
-          fi
-
-          echo "pr_number=${PR_NUMBER}" >> "$GITHUB_OUTPUT"
-          echo "Branch: $BRANCH, PR number: ${PR_NUMBER:-none}"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Decide OTA vs build
-        id: decide
-        run: |
-          set -e
-          # Version from package.json (e.g. 7.70.0) → base ref for OTA workflow is always v{VERSION}
-          VERSION=$(node -p "require('./package.json').version")
-          RELEASE_TAG="v${VERSION}"
-          echo "base_ref=${RELEASE_TAG}" >> "$GITHUB_OUTPUT"
-
-          # Parse OTA_VERSION from the export line (do not use a fixed line number — comment block length changes).
-          extract_ota() { grep -E '^export const OTA_VERSION' "$1" | sed -n "s/^export const OTA_VERSION: string = '\\([^']*\\)'.*/\\1/p"; }
-          extract_ota_from_git_show() { grep -E '^export const OTA_VERSION' | sed -n "s/^export const OTA_VERSION: string = '\\([^']*\\)'.*/\\1/p"; }
-
-          # OTA_VERSION from current ref
-          CURRENT_OTA=$(extract_ota app/constants/ota.ts)
-          echo "ota_version=${CURRENT_OTA}" >> "$GITHUB_OUTPUT"
-
-          # Early exit 1: sentinel means no OTA has been configured for this release
-          if [[ "$CURRENT_OTA" == "vX.XX.X" ]]; then
-            echo "ota_bump=false" >> "$GITHUB_OUTPUT"
-            echo "OTA_VERSION is sentinel ($CURRENT_OTA) → will trigger build"
-            exit 0
-          fi
-
-          # Early exit 2: if a tag for this OTA_VERSION already exists, the OTA was
-          # already shipped (e.g. merged from a prior release branch) — treat as stale.
-          if git rev-parse "refs/tags/${CURRENT_OTA}" >/dev/null 2>&1; then
-            echo "ota_bump=false" >> "$GITHUB_OUTPUT"
-            echo "OTA tag ${CURRENT_OTA} already exists (already shipped) → stale, will trigger build"
-            exit 0
-          fi
-
-          # Ref to compare against for detecting bump: use release tag if it exists, else main
-          if git rev-parse "$RELEASE_TAG" >/dev/null 2>&1; then
-            COMPARE_REF="$RELEASE_TAG"
-            BASE_OTA=$(git show "${COMPARE_REF}:app/constants/ota.ts" 2>/dev/null | extract_ota_from_git_show || echo "")
-          else
-            COMPARE_REF="main"
-            BASE_OTA=$(git show "origin/main:app/constants/ota.ts" 2>/dev/null | extract_ota_from_git_show || echo "")
-            echo "Release tag ${RELEASE_TAG} not found; comparing OTA_VERSION to ${COMPARE_REF} to detect bump"
-          fi
-
-          if [[ -n "$BASE_OTA" && "$CURRENT_OTA" != "$BASE_OTA" ]]; then
-            echo "ota_bump=true" >> "$GITHUB_OUTPUT"
-            echo "OTA_VERSION changed: $BASE_OTA -> $CURRENT_OTA → will trigger OTA update"
-          else
-            echo "ota_bump=false" >> "$GITHUB_OUTPUT"
-            echo "No OTA version bump (base: $BASE_OTA, current: $CURRENT_OTA) → will trigger build"
-          fi
-
-  # Reusable workflows must be job-level `uses:` (not a step). Steps only support actions (action.yml).
-  validate-ota-pr:
-    name: Validate PR for OTA
-    needs: decide
-    if: needs.decide.outputs.ota_bump == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Validate PR number
-        run: |
-          if [[ -z "${{ needs.decide.outputs.pr_number }}" ]]; then
-            echo "::error::No PR found for this branch. OTA update requires a PR number."
-            echo "::error::If you ran the workflow manually (workflow_dispatch), select your release branch in the 'Use workflow from' dropdown (e.g. release/7.71.0), not main."
-            exit 1
-          fi
-          echo "Using PR #${{ needs.decide.outputs.pr_number }}"
-
-  trigger-ota:
-    name: Trigger OTA update
-    needs: [decide, validate-ota-pr]
-    if: needs.decide.outputs.ota_bump == 'true'
-    uses: ./.github/workflows/push-eas-update.yml
-    with:
-      pr_number: ${{ needs.decide.outputs.pr_number }}
-      base_branch: ${{ needs.decide.outputs.base_ref }}
-      message: ${{ needs.decide.outputs.ota_version }}
-      channel: ${{ inputs.ota_channel }}
-      platform: ${{ inputs.platform }}
-    secrets: inherit
-
-  trigger-build:
-    name: Trigger build mobile app
-    needs: decide
-    if: needs.decide.outputs.ota_bump != 'true'
-    uses: ./.github/workflows/build.yml
-    with:
-      build_name: ${{ inputs.build_name }}
-      platform: ${{ inputs.platform }}
-      skip_version_bump: ${{ inputs.skip_version_bump }}
-      source_branch: ${{ inputs.source_branch || github.ref_name }}
-      upload_to_sentry: true
-    secrets: inherit
-
-  create-ota-production-tag:
-    name: Create OTA production release tag
-    needs: [decide, trigger-ota]
-    if: ${{ inputs.create_production_ota_tag == true }}
-    uses: ./.github/workflows/runway-create-ota-production-tag.yml
-    with:
-      tag_name: ${{ needs.decide.outputs.ota_version }}
-      checkout_ref: ${{ inputs.source_branch || github.ref_name }}
-    secrets: inherit
-
-  upload-ios-testflight:
-    name: Upload iOS to TestFlight
-    needs: [decide, trigger-build]
-    if: ${{ inputs.platform == 'ios' }}
-    uses: ./.github/workflows/upload-to-testflight.yml
-    with:
-      environment: ${{ inputs.environment }}
-      source_branch: ${{ inputs.source_branch || github.ref_name }}
-      build_branch: ${{ inputs.source_branch || github.ref_name }}
-      build_name: ${{ inputs.build_name }}
-      build_commit_sha: ${{ needs.trigger-build.outputs.built_commit_sha }}
-      build_version: ${{ needs.trigger-build.outputs.semantic_version }}
-      build_number: ${{ needs.trigger-build.outputs.ios_version_code }}
-    secrets: inherit
diff --git a/.github/workflows/setup-node-modules.yml b/.github/workflows/setup-node-modules.yml
index f87f6145ee4..7773f5cf12e 100644
--- a/.github/workflows/setup-node-modules.yml
+++ b/.github/workflows/setup-node-modules.yml
@@ -58,6 +58,11 @@ on:
         required: false
         type: number
         default: 1
+      runner_provider:
+        description: Runner provider forwarded from the caller
+        required: false
+        type: string
+        default: current
     outputs:
       artifact-name:
         description: 'The actual artifact name used'
@@ -71,7 +76,7 @@ jobs:
   setup:
     name: Setup Node Modules ${{ inputs.platform && format('({0})', inputs.platform) || '' }}
     # Platform-specific runner to match consumer (build needs same OS for native deps/symlinks)
-    runs-on: ${{ inputs.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:tahoe-xl' || (inputs.platform == 'android' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg' || 'ubuntu-latest') }}
+    runs-on: ${{ inputs.runner_provider == 'namespace' && (inputs.platform == 'ios' && 'namespace-profile-metamask-ios-build' || (inputs.platform == 'android' && 'namespace-profile-metamask-android-build' || 'namespace-profile-metamask-ci-linux')) || (inputs.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:tahoe-xl' || (inputs.platform == 'android' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg' || 'ubuntu-latest')) }}
     permissions:
       contents: read
       id-token: write
@@ -85,12 +90,22 @@ jobs:
           fetch-depth: ${{ inputs.fetch-depth }}
           submodules: ${{ inputs.checkout-submodules && 'recursive' || false }}
 
+      - name: Configure Namespace cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          path: |
+            ~/.cache/yarn
+            .metamask
+            node_modules
+            .yarn/cache
+
       # iOS: Only Node + Ruby needed (setup runs gem/bundle install, no pods/Xcode). Full iOS env is in build job.
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: ${{ inputs.platform == 'android' && 'yarn' || (inputs.platform == 'ios' && 'yarn') || '' }}
+          cache: ${{ inputs.runner_provider == 'namespace' && '' || (inputs.platform == 'android' && 'yarn' || (inputs.platform == 'ios' && 'yarn') || '') }}
 
       - name: Setup Ruby (iOS)
         if: inputs.platform == 'ios'
@@ -126,14 +141,14 @@ jobs:
 
       - name: Restore .metamask folder
         id: restore-metamask
-        if: inputs.platform != ''
+        if: ${{ inputs.runner_provider != 'namespace' && inputs.platform != '' }}
         uses: actions/cache@v4
         with:
           path: .metamask
           key: .metamask-${{ hashFiles('package.json', 'yarn.lock') }}
 
       - name: Install Foundry if cache missed
-        if: inputs.platform != '' && steps.restore-metamask.outputs.cache-hit != 'true'
+        if: ${{ inputs.platform != '' && (inputs.runner_provider == 'namespace' || steps.restore-metamask.outputs.cache-hit != 'true') }}
         run: yarn install:foundryup
 
       - name: Setup project
diff --git a/.github/workflows/update-e2e-fixtures.yml b/.github/workflows/update-e2e-fixtures.yml
index 63f5db43701..a9c652ff3d6 100644
--- a/.github/workflows/update-e2e-fixtures.yml
+++ b/.github/workflows/update-e2e-fixtures.yml
@@ -199,11 +199,6 @@ jobs:
       SEGMENT_WRITE_KEY_QA: ${{ secrets.SEGMENT_WRITE_KEY_QA }}
       SEGMENT_PROXY_URL_QA: ${{ secrets.SEGMENT_PROXY_URL_QA }}
       SEGMENT_DELETE_API_SOURCE_ID_QA: ${{ secrets.SEGMENT_DELETE_API_SOURCE_ID_QA }}
-      MAIN_IOS_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_IOS_GOOGLE_CLIENT_ID_UAT }}
-      MAIN_IOS_GOOGLE_REDIRECT_URI_UAT: ${{ secrets.MAIN_IOS_GOOGLE_REDIRECT_URI_UAT }}
-      MAIN_ANDROID_APPLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_APPLE_CLIENT_ID_UAT }}
-      MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT }}
-      MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT }}
       SEGMENT_REGULATIONS_ENDPOINT_QA: ${{ secrets.SEGMENT_REGULATIONS_ENDPOINT_QA }}
       MM_SENTRY_DSN_TEST: ${{ secrets.MM_SENTRY_DSN_TEST }}
       MM_SENTRY_AUTH_TOKEN: ${{ secrets.MM_SENTRY_AUTH_TOKEN }}
@@ -255,7 +250,7 @@ jobs:
         run: |
           IS_TEST='true' NODE_OPTIONS='--experimental-vm-modules' \
             yarn detox test -c ios.sim.main.ci --headless \
-            tests/regression/fixtures/fixture-validation.spec.ts
+            tests/smoke/fixtures/fixture-validation.spec.ts
         env:
           PREBUILT_IOS_APP_PATH: artifacts/main-qa-MetaMask.app
 
diff --git a/.js.env.example b/.js.env.example
index d5c27ab408c..67940dfec48 100644
--- a/.js.env.example
+++ b/.js.env.example
@@ -100,9 +100,6 @@ export MM_SAMPLE_FEATURE_COUNTER_ENABLED="true"
 # The endpoint used to submit errors and tracing data to Sentry for dev environment.
 # export MM_SENTRY_DSN_DEV=
 
-# Permissions Settings feature flag specific to UI changes
-export MM_PERMISSIONS_SETTINGS_V1_ENABLED=""
-
 # Earn Variables
 ## Stablecoin Lending
 export MM_STABLECOIN_LENDING_UI_ENABLED="true"
@@ -114,7 +111,6 @@ export MM_POOLED_STAKING_ENABLED="true"
 export MM_POOLED_STAKING_SERVICE_INTERRUPTION_BANNER_ENABLED="true"
 # mUSD
 export MM_MUSD_CONVERSION_FLOW_ENABLED="false"
-export MM_MUSD_QUICK_CONVERT_ENABLED="false"
 # See app/components/UI/Earn/docs/wildcard-token-list.md for more information.
 export MM_MUSD_CONVERTIBLE_TOKENS_BLOCKLIST=''
 export MM_MUSD_CONVERTIBLE_TOKENS_ALLOWLIST=''
@@ -158,20 +154,6 @@ export E2E_MOCK_OAUTH='false'
 export E2E_BYOA_AUTH_SECRET=''
 export E2E_MOCK_OAUTH_EMAIL=''
 
-# env for seedless onboarding main-dev
-export ANDROID_APPLE_CLIENT_ID='io.metamask.appleloginclient.dev'
-export ANDROID_GOOGLE_CLIENT_ID='8615965109465-i8oeh9kuvl1n6lk1ffkobpvth27bmi41.apps.googleusercontent.com'
-export ANDROID_GOOGLE_SERVER_CLIENT_ID='615965109465-i8oeh9kuvl1n6lk1ffkobpvth27bmi41.apps.googleusercontent.com'
-export IOS_GOOGLE_CLIENT_ID='615965109465-h6tp2h3crls6hbggispcgovbvk4vabu3.apps.googleusercontent.com'
-export IOS_GOOGLE_REDIRECT_URI='com.googleusercontent.apps.615965109465-h6tp2h3crls6hbggispcgovbvk4vabu3:/oauth2redirect/google'
-
-# env for seedless onboarding flask-dev
-#export ANDROID_APPLE_CLIENT_ID="io.metamask.appleloginclient.flask.dev"
-#export ANDROID_GOOGLE_CLIENT_ID="615965109465-ab20kuqbls6fj5s50fvmvbnket8nv1sh.apps.googleusercontent.com"
-#export ANDROID_GOOGLE_SERVER_CLIENT_ID="615965109465-ab20kuqbls6fj5s50fvmvbnket8nv1sh.apps.googleusercontent.com"
-#export IOS_GOOGLE_CLIENT_ID="615965109465-89b2lmqgm5ka8j8t403qhooouv57id9b.apps.googleusercontent.com"
-#export IOS_GOOGLE_REDIRECT_URI="com.googleusercontent.apps.615965109465-89b2lmqgm5ka8j8t403qhooouv57id9b:/oauth2redirect/google"
-
 # Enable send re-designs locally
 export MM_SEND_REDESIGN_ENABLED="true"
 
diff --git a/.yarn/patches/@metamask-assets-controllers-npm-104.2.0-c375051533.patch b/.yarn/patches/@metamask-assets-controllers-npm-104.2.0-c375051533.patch
deleted file mode 100644
index 7929d27693d..00000000000
--- a/.yarn/patches/@metamask-assets-controllers-npm-104.2.0-c375051533.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/dist/MultichainAssetsController/MultichainAssetsController.cjs b/dist/MultichainAssetsController/MultichainAssetsController.cjs
-index 0f74ce9c3200043c7c8fd121218e41790c55cc0e..ee449c44281ae3dd37e73ea0e9cc0b8ee18dea0e 100644
---- a/dist/MultichainAssetsController/MultichainAssetsController.cjs
-+++ b/dist/MultichainAssetsController/MultichainAssetsController.cjs
-@@ -493,7 +493,7 @@ async function _MultichainAssetsController_getAssetsMetadataFrom(assets, snapId)
-     });
- }, _MultichainAssetsController_filterBlockaidSpamTokensOnAdd = 
- /**
-- * Fail-closed Blockaid filter for newly detected `token:` assets (native/other namespaces unchanged).
-+ * Fail-open Blockaid filter for newly detected `token:` assets (native/other namespaces unchanged).
-  *
-  * @param assets - CAIP assets to filter.
-  * @returns Filtered list, original order preserved.
-@@ -503,33 +503,25 @@ async function _MultichainAssetsController_filterBlockaidSpamTokensOnAdd(assets)
-     if (Object.keys(tokensByChain).length === 0) {
-         return [...assets];
-     }
--    const keptTokenAssets = new Set();
-+    const rejectedAssets = new Set();
-     for (const [chainName, tokenEntries] of Object.entries(tokensByChain)) {
-         const batchOutcomes = await __classPrivateFieldGet(this, _MultichainAssetsController_instances, "m", _MultichainAssetsController_runBatchedBulkTokenScans).call(this, chainName, tokenEntries);
-         for (const outcome of batchOutcomes) {
-             if (outcome.status === 'rejected') {
-+                // Fail-open: if API fails, allow all tokens in this batch through
-                 continue;
-             }
-             for (const entry of outcome.entries) {
-                 const scanned = outcome.response[entry.address];
-+                // Reject only if we have a definitive malicious result
-                 if (scanned?.result_type &&
-                     scanned.result_type !== phishing_controller_1.TokenScanResultType.Malicious) {
--                    keptTokenAssets.add(entry.asset);
-+                    rejectedAssets.add(entry.asset);
-                 }
-             }
-         }
-     }
--    return assets.filter((asset) => {
--        try {
--            if ((0, utils_1.parseCaipAssetType)(asset).assetNamespace === 'token') {
--                return keptTokenAssets.has(asset);
--            }
--        }
--        catch {
--            return false;
--        }
--        return true;
--    });
-+    return assets.filter((asset) => !rejectedAssets.has(asset));
- }, _MultichainAssetsController_findMaliciousTokensAmong = 
- /**
-  * SPL `token:` assets in state that Blockaid marks malicious (failed batches skipped).
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99671269b08..d50c5227be7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,65 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [7.77.0]
+
+### Added
+
+- Added the Rewards Perps Trading Campaign with a details page, stats page, leaderboard, prize pool, tour, and opt-in flow. (#29323)
+- Added a Money balance card to the wallet home screen showing the user's Money Account balance, vault APY, and a quick action to add funds. (#29724)
+- Added an explore page v2 behind a feature flag. (#29473)
+- Added an A/B test for the hub page discovery tabs. (#29193)
+- Added Send flow warnings for first-time recipient interaction. (#28650)
+- Added FIFA World Cup support to live sports predictions. (#29740)
+- Added a rewards toast to enable notifications. (#29531)
+- Added back access to SDK connections management. (#29685)
+- Added a compact spending limit indicator on Card Home for limited Solana card funding tokens, showing remaining allowance when the original cap is not available. (#29662)
+- Added a Swap/Bridge warning when the native balance would go below a minimum threshold. (#29712)
+- Added transactions in token details for gas-fee-sponsored transactions. (#28977)
+- Added sort icons on the filter bar in the trending list. (#29809)
+- Added custom sorting in Perps from the Explore screen. (#29929)
+- Disabled tx management on the Tempo testnet (Moderato). (#29425)
+
+### Changed
+
+- Removed the sites arrow column from the sites tab. (#29861)
+- Updated the Card feature to display "mUSD back" instead of "cashback" in all user-facing text. (#29683)
+- Improved the Money home experience behind the feature flag by wiring real navigation (sheets, Card flows, potential earnings, and conversion), replacing the Activity tab when the flag is enabled, and showing projected earnings using live APY and balance data. (#29454)
+- Improved retry behavior when QR hardware wallet signing scans fail. (#29737)
+- Improved QR hardware wallet scan error messages and retry handling. (#29388)
+- Removed deprecated quick-convert feature code paths. (#29351)
+- Updated the font for the token details label. (#29710)
+- Aligned the data fetch on stocks. (#29795)
+
+### Fixed
+
+- Fixed a bug where the "Your balance" heading on the Money Hub stayed pinned to the top of the screen instead of scrolling with the content. (#29863)
+- Fixed open order trigger/limit prices showing only 2 decimals instead of market-appropriate precision. (#29799)
+- Fixed NFT details not showing the collection name. (#29551)
+- Fixed token list items to use a fallback icon when token image URLs are missing. (#29827)
+- Fixed Turkish strings that showed broken i18n placeholders when a percent sign appeared before an interpolated value. (#29779)
+- Fixed the DeFi empty-state Explore button to open the in-app Explore sites screen instead of an external portfolio page. (#29552)
+- Fixed Activity showing incorrect Sent/Received labels and "Not available" amounts after switching from a non-EVM network filter back to all popular networks. (#29794)
+- Fixed a regression where Earn redirects to the activity view for successful pooled-staking or lending deposits left users stranded without a way to exit. (#29763)
+- Fixed live prediction position values so they stay updated across the home screen and market details views. (#29527)
+- Fixed Sei Mainnet to use Seiscan (`https://seiscan.io`) in place of the deprecated Seitrace explorer; existing installs are migrated via migration 134. (#29221)
+- Fixed a regression that prevented flipping a Perps position. (#29691)
+- Fixed the Activity Perps tab not reappearing after switching the transaction network filter back to popular networks from Solana, without forcing Ethereum as the selected chain. (#29676)
+- Fixed token details opening Etherscan instead of the correct block explorer for tokens on custom or non-PopularList networks when another EVM network was selected. (#29686)
+- Fixed an iOS bug where the back button in the in-app webview (e.g. "View on block explorer") was rendered behind the status bar and could not be tapped. (#29693)
+- Fixed QR code scanned recipient addresses not being forwarded through the send flow. (#29668)
+- Fixed a crash in Perps when a Bitcoin, Solana, or Tron account was selected. (#29420)
+- Fixed a subscription leak in `BackgroundBridge` where disconnected SDK and WalletConnect sessions could continue to receive network, account, permission, and lock/unlock notifications. (#29040)
+- Fixed advanced chart timestamps to display in the user's local timezone instead of UTC. (#29654)
+- Fixed EVM activity to align with the active account group and network filter. (#29994)
+- Fixed the trending label display. (#30031)
+- Fixed titles on Explore search. (#30026)
+- Fixed a graceful fallback for assets missing images. (#30156)
+- Skipped Blockaid validation for gas-included swaps. (#30150)
+- Hid the gas sponsorship banner for hardware wallets. (#30091)
+- Skipped `useInsufficientNativeReserveError` for non-EVM accounts to prevent spurious native-reserve errors. (#30048)
+- Cleared the gas sponsorship flag for hardware wallet transactions. (#30023)
+
 ## [7.76.3]
 
 ### Added
@@ -11435,7 +11494,8 @@ 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/v7.76.3...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v7.77.0...HEAD
+[7.77.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.76.3...v7.77.0
 [7.76.3]: https://github.com/MetaMask/metamask-mobile/compare/v7.76.0...v7.76.3
 [7.76.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.75.1...v7.76.0
 [7.75.1]: https://github.com/MetaMask/metamask-mobile/compare/v7.75.0...v7.75.1
diff --git a/README.md b/README.md
index 8d63bfd09c8..902fd35aa0a 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ To learn how to contribute to the MetaMask codebase, visit our [Contributor Docs
 ## Documentation
 
 - [Architecture](./docs/readme/architecture.md)
+- [BigInt number migration](./docs/bigint-migration-guide.md) (deprecated `app/util/number/index.js` burndown and ESLint allowlist)
 - [Expo Development Environment Setup](./docs/readme/expo-environment.md)
 - [Native Development Environment Setup](./docs/readme/environment.md)
 - [Build Troubleshooting](./docs/readme/troubleshooting.md)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e2a750ef915..66077b09617 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -187,8 +187,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionName "7.76.0"
-        versionCode 4866
+        versionName "7.77.0"
+        versionCode 5017
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders.MM_BRANCH_KEY_TEST = "$System.env.MM_BRANCH_KEY_TEST"
diff --git a/app/actions/money/index.test.ts b/app/actions/money/index.test.ts
new file mode 100644
index 00000000000..c5051da621d
--- /dev/null
+++ b/app/actions/money/index.test.ts
@@ -0,0 +1,161 @@
+import {
+  __resetUpgradesInFlightForTesting,
+  upgradeMoneyAccount,
+} from './index';
+import Engine from '../../core/Engine';
+import Logger from '../../util/Logger';
+import { selectPrimaryMoneyAccount } from '../../selectors/moneyAccountController';
+import type { RootState } from '../../reducers';
+
+jest.mock('../../core/Engine', () => ({
+  __esModule: true,
+  default: {
+    context: {
+      MoneyAccountUpgradeController: {
+        upgradeAccount: jest.fn(),
+      },
+    },
+  },
+}));
+
+jest.mock('../../util/Logger', () => ({
+  __esModule: true,
+  default: {
+    log: jest.fn(),
+    error: jest.fn(),
+  },
+}));
+
+jest.mock('../../selectors/moneyAccountController', () => ({
+  selectPrimaryMoneyAccount: jest.fn(),
+}));
+
+jest.mock(
+  '../../core/Engine/controllers/money-account-upgrade-controller-init',
+  () => ({
+    whenMoneyAccountUpgradeReady: jest.fn(() => Promise.resolve()),
+  }),
+);
+
+const mockUpgradeAccount = Engine.context.MoneyAccountUpgradeController
+  .upgradeAccount as jest.Mock;
+const mockSelectPrimaryMoneyAccount =
+  selectPrimaryMoneyAccount as unknown as jest.Mock;
+const mockLogError = Logger.error as jest.Mock;
+const mockLogLog = Logger.log as jest.Mock;
+
+const ADDRESS = '0x1111111111111111111111111111111111111111' as const;
+const OTHER_ADDRESS = '0x2222222222222222222222222222222222222222' as const;
+
+const flushPromises = () => new Promise((resolve) => setImmediate(resolve));
+
+describe('upgradeMoneyAccount', () => {
+  let dispatch: jest.Mock;
+  let getState: jest.Mock<RootState>;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    __resetUpgradesInFlightForTesting();
+    dispatch = jest.fn();
+    getState = jest.fn().mockReturnValue({} as RootState);
+    mockUpgradeAccount.mockResolvedValue(undefined);
+  });
+
+  it('calls MoneyAccountUpgradeController.upgradeAccount with the primary money account address', async () => {
+    mockSelectPrimaryMoneyAccount.mockReturnValue({ address: ADDRESS });
+
+    upgradeMoneyAccount()(dispatch, getState, undefined);
+    await flushPromises();
+
+    expect(mockUpgradeAccount).toHaveBeenCalledWith(ADDRESS);
+  });
+
+  it('skips the call and logs when there is no primary money account', () => {
+    mockSelectPrimaryMoneyAccount.mockReturnValue(undefined);
+
+    upgradeMoneyAccount()(dispatch, getState, undefined);
+
+    expect(mockUpgradeAccount).not.toHaveBeenCalled();
+    expect(mockLogLog).toHaveBeenCalled();
+  });
+
+  it('skips the call when the primary money account address is not a strict hex string', () => {
+    mockSelectPrimaryMoneyAccount.mockReturnValue({ address: 'not-hex' });
+
+    upgradeMoneyAccount()(dispatch, getState, undefined);
+
+    expect(mockUpgradeAccount).not.toHaveBeenCalled();
+    expect(mockLogLog).toHaveBeenCalledWith(
+      expect.stringContaining('upgradeMoneyAccount'),
+      expect.stringContaining('no valid primary money account'),
+      expect.objectContaining({ address: 'not-hex' }),
+    );
+  });
+
+  it('catches rejected upgradeAccount promises and logs', async () => {
+    mockSelectPrimaryMoneyAccount.mockReturnValue({ address: ADDRESS });
+    const error = new Error('boom');
+    mockUpgradeAccount.mockRejectedValueOnce(error);
+
+    upgradeMoneyAccount()(dispatch, getState, undefined);
+    await flushPromises();
+
+    expect(mockLogError).toHaveBeenCalledWith(error, expect.any(String));
+  });
+
+  it('wraps non-Error rejections', async () => {
+    mockSelectPrimaryMoneyAccount.mockReturnValue({ address: ADDRESS });
+    mockUpgradeAccount.mockRejectedValueOnce('string rejection');
+
+    upgradeMoneyAccount()(dispatch, getState, undefined);
+    await flushPromises();
+
+    expect(mockLogError).toHaveBeenCalledWith(
+      expect.any(Error),
+      expect.any(String),
+    );
+  });
+
+  it('deduplicates concurrent upgrades for the same address', async () => {
+    mockSelectPrimaryMoneyAccount.mockReturnValue({ address: ADDRESS });
+    mockUpgradeAccount.mockReturnValueOnce(new Promise(() => undefined));
+
+    upgradeMoneyAccount()(dispatch, getState, undefined);
+    upgradeMoneyAccount()(dispatch, getState, undefined);
+    await flushPromises();
+
+    expect(mockUpgradeAccount).toHaveBeenCalledTimes(1);
+    expect(mockLogLog).toHaveBeenCalledWith(
+      expect.stringContaining('upgradeMoneyAccount'),
+      'upgrade already in flight; skipping',
+      { address: ADDRESS },
+    );
+  });
+
+  it('allows a subsequent upgrade after a previous one resolves', async () => {
+    mockSelectPrimaryMoneyAccount.mockReturnValue({ address: ADDRESS });
+
+    upgradeMoneyAccount()(dispatch, getState, undefined);
+    await flushPromises();
+    upgradeMoneyAccount()(dispatch, getState, undefined);
+    await flushPromises();
+
+    expect(mockUpgradeAccount).toHaveBeenCalledTimes(2);
+  });
+
+  it('does not deduplicate upgrades for different addresses', async () => {
+    mockUpgradeAccount.mockReturnValue(new Promise(() => undefined));
+
+    mockSelectPrimaryMoneyAccount.mockReturnValueOnce({ address: ADDRESS });
+    upgradeMoneyAccount()(dispatch, getState, undefined);
+    mockSelectPrimaryMoneyAccount.mockReturnValueOnce({
+      address: OTHER_ADDRESS,
+    });
+    upgradeMoneyAccount()(dispatch, getState, undefined);
+    await flushPromises();
+
+    expect(mockUpgradeAccount).toHaveBeenCalledTimes(2);
+    expect(mockUpgradeAccount).toHaveBeenNthCalledWith(1, ADDRESS);
+    expect(mockUpgradeAccount).toHaveBeenNthCalledWith(2, OTHER_ADDRESS);
+  });
+});
diff --git a/app/actions/money/index.ts b/app/actions/money/index.ts
new file mode 100644
index 00000000000..cc73292a345
--- /dev/null
+++ b/app/actions/money/index.ts
@@ -0,0 +1,50 @@
+import type { AnyAction } from 'redux';
+import type { ThunkAction } from 'redux-thunk';
+import { type Hex, isStrictHexString } from '@metamask/utils';
+import type { RootState } from '../../reducers';
+import { selectPrimaryMoneyAccount } from '../../selectors/moneyAccountController';
+import Engine from '../../core/Engine';
+import Logger from '../../util/Logger';
+import { whenMoneyAccountUpgradeReady } from '../../core/Engine/controllers/money-account-upgrade-controller-init';
+
+const LOG_PREFIX = '[upgradeMoneyAccount]';
+
+const upgradesInFlight = new Set<Hex>();
+
+/** @internal For test use only. */
+export const __resetUpgradesInFlightForTesting = () => {
+  upgradesInFlight.clear();
+};
+
+export const upgradeMoneyAccount =
+  (): ThunkAction<void, RootState, unknown, AnyAction> =>
+  (_dispatch, getState) => {
+    const address = selectPrimaryMoneyAccount(getState())?.address;
+    if (!address || !isStrictHexString(address)) {
+      Logger.log(LOG_PREFIX, 'no valid primary money account; skipping', {
+        address,
+      });
+      return;
+    }
+
+    if (upgradesInFlight.has(address)) {
+      Logger.log(LOG_PREFIX, 'upgrade already in flight; skipping', {
+        address,
+      });
+      return;
+    }
+
+    upgradesInFlight.add(address);
+    whenMoneyAccountUpgradeReady()
+      .then(() =>
+        Engine.context.MoneyAccountUpgradeController.upgradeAccount(address),
+      )
+      .catch((error: unknown) => {
+        const wrapped =
+          error instanceof Error ? error : new Error(String(error));
+        Logger.error(wrapped, `${LOG_PREFIX} failed`);
+      })
+      .finally(() => {
+        upgradesInFlight.delete(address);
+      });
+  };
diff --git a/app/component-library/components-temp/Contracts/ContractBox/ContractBox.constants.ts b/app/component-library/components-temp/Contracts/ContractBox/ContractBox.constants.ts
deleted file mode 100644
index 2aadf982816..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBox/ContractBox.constants.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/* eslint-disable no-console */
-import { ImageSourcePropType } from 'react-native';
-
-const imageSource =
-  'https://assets.coingecko.com/coins/images/279/small/ethereum.png?1595348880';
-
-export const CONTRACT_PET_NAME = 'DAI';
-export const CONTRACT_BOX_TEST_ID = 'contract-box';
-export const CONTRACT_LOCAL_IMAGE: ImageSourcePropType = {
-  uri: imageSource,
-};
-
-export const CONTRACT_COPY_ADDRESS = () => {
-  console.log('copy address');
-};
-
-export const CONTRACT_EXPORT_ADDRESS = () => {
-  console.log('export address');
-};
-
-export const CONTRACT_ON_PRESS = () => {
-  console.log('contract pressed');
-};
-
-export const HAS_BLOCK_EXPLORER = true;
-export const TOKEN_SYMBOL = 'D';
diff --git a/app/component-library/components-temp/Contracts/ContractBox/ContractBox.styles.ts b/app/component-library/components-temp/Contracts/ContractBox/ContractBox.styles.ts
deleted file mode 100644
index 46ff512773f..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBox/ContractBox.styles.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Third party dependencies.
-import { StyleSheet } from 'react-native';
-
-/**
- * Style sheet for Account Balance component.
- *
- * @returns StyleSheet object.
- */
-const styleSheet = StyleSheet.create({
-  container: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-  },
-});
-
-export default styleSheet;
diff --git a/app/component-library/components-temp/Contracts/ContractBox/ContractBox.test.tsx b/app/component-library/components-temp/Contracts/ContractBox/ContractBox.test.tsx
deleted file mode 100644
index d4acbe3aea9..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBox/ContractBox.test.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import { screen } from '@testing-library/react-native';
-import TEST_ADDRESS from '../../../../constants/address';
-import ContractBox from './ContractBox';
-import {
-  CONTRACT_BOX_TEST_ID,
-  CONTRACT_PET_NAME,
-  CONTRACT_LOCAL_IMAGE,
-  CONTRACT_COPY_ADDRESS,
-  CONTRACT_EXPORT_ADDRESS,
-  CONTRACT_ON_PRESS,
-} from './ContractBox.constants';
-import renderWithProvider from '../../../../util/test/renderWithProvider';
-
-describe('ContractBox', () => {
-  it('should render ContractBox', () => {
-    renderWithProvider(
-      <ContractBox
-        contractAddress={TEST_ADDRESS}
-        contractPetName={CONTRACT_PET_NAME}
-        contractLocalImage={CONTRACT_LOCAL_IMAGE}
-        onCopyAddress={CONTRACT_COPY_ADDRESS}
-        onExportAddress={CONTRACT_EXPORT_ADDRESS}
-        onContractPress={CONTRACT_ON_PRESS}
-      />,
-      {
-        state: {
-          engine: {
-            backgroundState: {
-              PreferencesController: { isIpfsGatewayEnabled: true },
-            },
-          },
-        },
-      },
-    );
-    expect(screen.getAllByTestId(CONTRACT_BOX_TEST_ID).length).toBeGreaterThan(
-      0,
-    );
-  });
-});
diff --git a/app/component-library/components-temp/Contracts/ContractBox/ContractBox.tsx b/app/component-library/components-temp/Contracts/ContractBox/ContractBox.tsx
deleted file mode 100644
index f06f4e6a176..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBox/ContractBox.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import Card from '../../../components/Cards/Card';
-import ContractBoxBase from '../ContractBoxBase';
-import styles from './ContractBox.styles';
-import { View } from 'react-native';
-import { ContractBoxProps } from './ContractBox.types';
-import { CONTRACT_BOX_TEST_ID } from './ContractBox.constants';
-
-const ContractBox = ({
-  contractAddress,
-  contractPetName,
-  contractLocalImage,
-  onExportAddress,
-  onCopyAddress,
-  onContractPress,
-  hasBlockExplorer,
-}: ContractBoxProps) => (
-  <View testID={CONTRACT_BOX_TEST_ID}>
-    <Card style={styles.container}>
-      <ContractBoxBase
-        contractAddress={contractAddress}
-        contractPetName={contractPetName}
-        contractLocalImage={contractLocalImage}
-        onExportAddress={onExportAddress}
-        onCopyAddress={onCopyAddress}
-        onContractPress={onContractPress}
-        hasBlockExplorer={hasBlockExplorer}
-      />
-    </Card>
-  </View>
-);
-
-export default ContractBox;
diff --git a/app/component-library/components-temp/Contracts/ContractBox/ContractBox.types.ts b/app/component-library/components-temp/Contracts/ContractBox/ContractBox.types.ts
deleted file mode 100644
index c7e39064c39..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBox/ContractBox.types.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { ContractBoxBaseProps } from '../ContractBoxBase/ContractBoxBase.types';
-
-export type ContractBoxProps = ContractBoxBaseProps;
diff --git a/app/component-library/components-temp/Contracts/ContractBox/index.ts b/app/component-library/components-temp/Contracts/ContractBox/index.ts
deleted file mode 100644
index bd87bb9fbfb..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBox/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './ContractBox';
diff --git a/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.constants.ts b/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.constants.ts
deleted file mode 100644
index 23a62de58a3..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.constants.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const EXPORT_ICON_TEST_ID = 'export-icon';
-export const COPY_ICON_TEST_ID = 'copy-icon';
-export const CONTRACT_BOX_TEST_ID = 'contract-box';
-export const CONTRACT_BOX_NO_PET_NAME_TEST_ID = 'contract-box-no-pet-name';
diff --git a/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.styles.ts b/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.styles.ts
deleted file mode 100644
index 8d164eb6a7a..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.styles.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Third party dependencies.
-import { StyleSheet } from 'react-native';
-import { Theme } from '../../../../util/theme/models';
-/**
- * Style sheet for Account Balance component.
- *
- * @returns StyleSheet object.
- */
-const styleSheet = (params: { theme: Theme }) => {
-  const { theme } = params;
-  return StyleSheet.create({
-    container: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      flex: 1,
-    },
-    rowContainer: {
-      flexDirection: 'row',
-      alignItems: 'center',
-    },
-    imageContainer: {
-      marginRight: 16,
-    },
-    icon: {
-      paddingHorizontal: 6,
-    },
-    iconContainer: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      justifyContent: 'space-between',
-    },
-    header: {
-      color: theme.colors.info.default,
-    },
-  });
-};
-
-export default styleSheet;
diff --git a/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.test.tsx b/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.test.tsx
deleted file mode 100644
index 58e1e9532d3..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.test.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-import { screen } from '@testing-library/react-native';
-import ContractBoxBase from './ContractBoxBase';
-import TEST_ADDRESS from '../../../../constants/address';
-import {
-  CONTRACT_PET_NAME,
-  CONTRACT_LOCAL_IMAGE,
-  CONTRACT_COPY_ADDRESS,
-  CONTRACT_ON_PRESS,
-} from '../ContractBox/ContractBox.constants';
-import { CONTRACT_BOX_NO_PET_NAME_TEST_ID } from './ContractBoxBase.constants';
-import { ContractBoxBaseProps } from './ContractBoxBase.types';
-import renderWithProvider from '../../../../util/test/renderWithProvider';
-
-describe('Component ContractBoxBase', () => {
-  let props: ContractBoxBaseProps;
-
-  beforeEach(() => {
-    props = {
-      contractAddress: TEST_ADDRESS,
-      contractPetName: CONTRACT_PET_NAME,
-      contractLocalImage: CONTRACT_LOCAL_IMAGE,
-      onCopyAddress: CONTRACT_COPY_ADDRESS,
-      onContractPress: CONTRACT_ON_PRESS,
-    };
-  });
-
-  const renderComponent = () =>
-    renderWithProvider(<ContractBoxBase {...props} />, {
-      state: {
-        engine: {
-          backgroundState: {
-            PreferencesController: { isIpfsGatewayEnabled: true },
-          },
-        },
-      },
-    });
-
-  it('should render correctly', () => {
-    const { toJSON } = renderComponent();
-    expect(toJSON()).toBeDefined();
-  });
-
-  it('renders the no-pet-name element when contractPetName is undefined', () => {
-    props.contractPetName = undefined;
-    renderComponent();
-    expect(screen.getByTestId(CONTRACT_BOX_NO_PET_NAME_TEST_ID)).toBeTruthy();
-  });
-});
diff --git a/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.tsx b/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.tsx
deleted file mode 100644
index 5ba78777e38..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-// Third party depencies
-import React from 'react';
-import { View, Pressable } from 'react-native';
-
-// External dependencies.
-import Avatar, {
-  AvatarSize,
-  AvatarVariant,
-} from '../../../components/Avatars/Avatar';
-import Text, { TextVariant } from '../../../components/Texts/Text';
-import { formatAddress } from '../../../../util/address';
-import Icon, { IconName, IconSize } from '../../../components/Icons/Icon';
-import { useStyles } from '../../../hooks';
-import Button, { ButtonVariants } from '../../../components/Buttons/Button';
-import Identicon from '../../../../components/UI/Identicon';
-
-// Internal dependencies.
-import { ContractBoxBaseProps, IconViewProps } from './ContractBoxBase.types';
-import styleSheet from './ContractBoxBase.styles';
-import {
-  EXPORT_ICON_TEST_ID,
-  COPY_ICON_TEST_ID,
-  CONTRACT_BOX_TEST_ID,
-  CONTRACT_BOX_NO_PET_NAME_TEST_ID,
-} from './ContractBoxBase.constants';
-
-const ContractBoxBase = ({
-  contractAddress,
-  contractLocalImage,
-  contractPetName,
-  onCopyAddress,
-  onExportAddress,
-  onContractPress,
-  hasBlockExplorer,
-}: ContractBoxBaseProps) => {
-  const formattedAddress = formatAddress(contractAddress, 'short');
-  const {
-    styles,
-    theme: { colors },
-  } = useStyles(styleSheet, {});
-
-  const renderIconView = ({ onPress, name, size, testID }: IconViewProps) => (
-    <Pressable style={styles.icon} onPress={onPress} testID={testID}>
-      <Icon color={colors.icon.alternative} name={name} size={size} />
-    </Pressable>
-  );
-
-  return (
-    <View style={styles.container} testID={CONTRACT_BOX_TEST_ID}>
-      <View style={styles.rowContainer}>
-        <View style={styles.imageContainer}>
-          {contractLocalImage ? (
-            <Avatar
-              variant={AvatarVariant.Token}
-              size={AvatarSize.Md}
-              imageSource={contractLocalImage}
-            />
-          ) : (
-            <Identicon address={contractAddress} diameter={25} />
-          )}
-        </View>
-        {contractPetName ? (
-          <Pressable onPress={onContractPress}>
-            <Text style={styles.header} variant={TextVariant.HeadingMD}>
-              {contractPetName}
-            </Text>
-            <Text variant={TextVariant.BodyMD}>{formattedAddress}</Text>
-          </Pressable>
-        ) : (
-          <View testID={CONTRACT_BOX_NO_PET_NAME_TEST_ID}>
-            <Button
-              variant={ButtonVariants.Link}
-              labelTextVariant={TextVariant.HeadingMD}
-              label={formattedAddress}
-              onPress={onContractPress}
-            />
-          </View>
-        )}
-      </View>
-      <View style={styles.iconContainer}>
-        {renderIconView({
-          onPress: onCopyAddress,
-          name: IconName.Copy,
-          size: IconSize.Lg,
-          testID: COPY_ICON_TEST_ID,
-        })}
-        {hasBlockExplorer &&
-          renderIconView({
-            onPress: onExportAddress,
-            name: IconName.Export,
-            size: IconSize.Md,
-            testID: EXPORT_ICON_TEST_ID,
-          })}
-      </View>
-    </View>
-  );
-};
-
-export default ContractBoxBase;
diff --git a/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.types.ts b/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.types.ts
deleted file mode 100644
index 95bc771d4a0..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.types.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { ImageSourcePropType } from 'react-native';
-import { IconName, IconSize } from '../../../components/Icons/Icon';
-
-export interface ContractBoxBaseProps {
-  contractAddress: string;
-  contractPetName?: string;
-  contractLocalImage?: ImageSourcePropType;
-  /**
-   * function that copies the contract address to the clipboard
-   */
-  onCopyAddress: () => void;
-  /**
-   * function that opens contract in block explorer if present
-   */
-  onExportAddress?: () => void;
-  /**
-   * functions that called when the user clicks on the contract name
-   */
-  onContractPress: () => void;
-  /**
-   * Boolean that determines if the contract has a block explorer
-   */
-  hasBlockExplorer?: boolean;
-}
-
-export interface IconViewProps {
-  size: IconSize;
-  name: IconName;
-  onPress?: () => void;
-  testID?: string;
-  color?: string;
-}
diff --git a/app/component-library/components-temp/Contracts/ContractBoxBase/index.ts b/app/component-library/components-temp/Contracts/ContractBoxBase/index.ts
deleted file mode 100644
index 4f0d4c78bec..00000000000
--- a/app/component-library/components-temp/Contracts/ContractBoxBase/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './ContractBoxBase';
diff --git a/app/component-library/components-temp/SheetActions/SheetActions.tsx b/app/component-library/components-temp/SheetActions/SheetActions.tsx
index 6a6d0874b35..d99130d42c9 100644
--- a/app/component-library/components-temp/SheetActions/SheetActions.tsx
+++ b/app/component-library/components-temp/SheetActions/SheetActions.tsx
@@ -1,6 +1,6 @@
 // Third party dependencies.
 import React, { useCallback } from 'react';
-import { Platform, View } from 'react-native';
+import { View } from 'react-native';
 
 // External dependencies.
 import { useStyles } from '../../hooks';
@@ -10,7 +10,6 @@ import Button, {
   ButtonWidthTypes,
 } from '../../components/Buttons/Button';
 import Loader from '../Loader';
-import generateTestId from '../../../../wdio/utils/generateTestId';
 
 // Internal dependencies.
 import { SheetActionsProps } from './SheetActions.types';
@@ -46,7 +45,7 @@ const SheetActions = ({ actions }: SheetActionsProps) => {
                   disabled={disabled || isLoading}
                   style={buttonStyle}
                   isDanger={isDanger}
-                  {...generateTestId(Platform, testID)}
+                  testID={testID}
                 />
                 {isLoading && <Loader size={'small'} />}
               </View>
diff --git a/app/component-library/components-temp/Tabs/TabsBar/TabsBar.tsx b/app/component-library/components-temp/Tabs/TabsBar/TabsBar.tsx
index a5f62dac165..259298a1db2 100644
--- a/app/component-library/components-temp/Tabs/TabsBar/TabsBar.tsx
+++ b/app/component-library/components-temp/Tabs/TabsBar/TabsBar.tsx
@@ -281,7 +281,7 @@ const TabsBar: React.FC<TabsBarProps> = ({
 
   return (
     <Box
-      twClassName={`relative overflow-hidden px-4 ${twClassName || ''}`}
+      twClassName={`relative overflow-hidden ${twClassName || ''}`}
       testID={testID}
       onLayout={handleContainerLayout as (layoutEvent: unknown) => void}
       {...boxProps}
@@ -292,7 +292,7 @@ const TabsBar: React.FC<TabsBarProps> = ({
           horizontal
           showsHorizontalScrollIndicator={false}
           style={tw.style('flex-grow-0')}
-          contentContainerStyle={tw.style('flex-row')}
+          contentContainerStyle={tw.style('flex-row px-4')}
           scrollsToTop={false}
         >
           <Box
@@ -324,32 +324,34 @@ const TabsBar: React.FC<TabsBarProps> = ({
           </Box>
         </ScrollView>
       ) : (
-        <Box
-          flexDirection={BoxFlexDirection.Row}
-          alignItems={BoxAlignItems.Center}
-          twClassName="relative gap-6"
-        >
-          {tabs.map((tab, index) => (
-            <Tab
-              key={tab.key}
-              label={tab.label}
-              isActive={index === activeIndex}
-              isDisabled={tab.isDisabled}
-              onPress={() => handleTabPress(index)}
-              onLayout={(layoutEvent) => handleTabLayout(index, layoutEvent)}
-              testID={tab.testID ?? `${testID}-tab-${index}`}
-            />
-          ))}
-
-          {/* Animated underline for non-scrollable tabs */}
-          {activeIndex >= 0 && isInitialized && (
-            <Animated.View
-              style={tw.style('absolute bottom-0 h-0.5 bg-icon-default', {
-                width: underlineWidthAnimated,
-                transform: [{ translateX: underlineAnimated }],
-              })}
-            />
-          )}
+        <Box twClassName="px-4">
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="relative gap-6"
+          >
+            {tabs.map((tab, index) => (
+              <Tab
+                key={tab.key}
+                label={tab.label}
+                isActive={index === activeIndex}
+                isDisabled={tab.isDisabled}
+                onPress={() => handleTabPress(index)}
+                onLayout={(layoutEvent) => handleTabLayout(index, layoutEvent)}
+                testID={tab.testID ?? `${testID}-tab-${index}`}
+              />
+            ))}
+
+            {/* Animated underline for non-scrollable tabs */}
+            {activeIndex >= 0 && isInitialized && (
+              <Animated.View
+                style={tw.style('absolute bottom-0 h-0.5 bg-icon-default', {
+                  width: underlineWidthAnimated,
+                  transform: [{ translateX: underlineAnimated }],
+                })}
+              />
+            )}
+          </Box>
         </Box>
       )}
     </Box>
diff --git a/app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.test.tsx b/app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.test.tsx
new file mode 100644
index 00000000000..b029977a3b7
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.test.tsx
@@ -0,0 +1,535 @@
+// Third party dependencies.
+import React from 'react';
+import { Animated } from 'react-native';
+import { render, fireEvent, act } from '@testing-library/react-native';
+
+// Internal dependencies.
+import TabsIconBar from './TabsIconBar';
+import { TabsIconItem } from './TabsIconBar.types';
+import { IconName } from '../../../components/Icons/Icon/Icon.types';
+
+const mockLayoutEvent = (width: number) => ({
+  nativeEvent: { layout: { x: 0, y: 0, width, height: 60 } },
+});
+
+const tabLayout = (x: number, width: number) => ({
+  nativeEvent: { layout: { x, y: 0, width, height: 60 } },
+});
+
+describe('TabsIconBar', () => {
+  const mockTabs: TabsIconItem[] = [
+    {
+      key: 'tab1',
+      label: 'Portfolio',
+      iconName: IconName.PieChart,
+      content: null,
+    },
+    {
+      key: 'tab2',
+      label: 'Perpetuals',
+      iconName: IconName.Candlestick,
+      content: null,
+    },
+    {
+      key: 'tab3',
+      label: 'Predictions',
+      iconName: IconName.Predictions,
+      content: null,
+    },
+  ];
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('Rendering', () => {
+    it('displays all tab labels', () => {
+      const { getByText } = render(
+        <TabsIconBar tabs={mockTabs} activeIndex={0} onTabPress={jest.fn()} />,
+      );
+      mockTabs.forEach((tab) => expect(getByText(tab.label)).toBeOnTheScreen());
+    });
+
+    it('renders with testID', () => {
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={jest.fn()}
+          testID="icon-bar"
+        />,
+      );
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+
+    it('handles empty tabs array', () => {
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={[]}
+          activeIndex={0}
+          onTabPress={jest.fn()}
+          testID="icon-bar"
+        />,
+      );
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+
+    it('hides underline when activeIndex is -1', () => {
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={-1}
+          onTabPress={jest.fn()}
+          testID="icon-bar"
+        />,
+      );
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(400));
+        mockTabs.forEach((_, i) =>
+          fireEvent(
+            getByTestId(`icon-bar-tab-${i}`),
+            'onLayout',
+            tabLayout(i * 120, 100),
+          ),
+        );
+      });
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+  });
+
+  describe('Tab Interaction', () => {
+    it('calls onTabPress with correct index', () => {
+      const mockOnTabPress = jest.fn();
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={mockOnTabPress}
+          testID="icon-bar"
+        />,
+      );
+      fireEvent.press(getByTestId('icon-bar-tab-1'));
+      expect(mockOnTabPress).toHaveBeenCalledWith(1);
+    });
+
+    it('does not call onTabPress for disabled tabs', () => {
+      const mockOnTabPress = jest.fn();
+      const tabsWithDisabled: TabsIconItem[] = [
+        {
+          key: 'tab1',
+          label: 'Portfolio',
+          iconName: IconName.PieChart,
+          content: null,
+        },
+        {
+          key: 'tab2',
+          label: 'Perpetuals',
+          iconName: IconName.Candlestick,
+          content: null,
+          isDisabled: true,
+        },
+      ];
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={tabsWithDisabled}
+          activeIndex={0}
+          onTabPress={mockOnTabPress}
+          testID="icon-bar"
+        />,
+      );
+      fireEvent.press(getByTestId('icon-bar-tab-1'));
+      expect(mockOnTabPress).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('Fill Width', () => {
+    it('renders with fillWidth without throwing', () => {
+      expect(() =>
+        render(
+          <TabsIconBar
+            tabs={mockTabs}
+            activeIndex={0}
+            onTabPress={jest.fn()}
+            fillWidth
+          />,
+        ),
+      ).not.toThrow();
+    });
+
+    it('skips scroll overflow detection when fillWidth is true', () => {
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={jest.fn()}
+          fillWidth
+          testID="icon-bar"
+        />,
+      );
+      // With fillWidth, even a tiny container should never trigger scroll mode
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(50));
+        mockTabs.forEach((_, i) =>
+          fireEvent(
+            getByTestId(`icon-bar-tab-${i}`),
+            'onLayout',
+            tabLayout(i * 100, 90),
+          ),
+        );
+      });
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+  });
+
+  describe('Scroll Mode', () => {
+    it('activates scroll mode when tabs overflow the container', () => {
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={jest.fn()}
+          testID="icon-bar"
+        />,
+      );
+      act(() => {
+        // Container too narrow to fit all tabs
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(100));
+        mockTabs.forEach((_, i) =>
+          fireEvent(
+            getByTestId(`icon-bar-tab-${i}`),
+            'onLayout',
+            tabLayout(i * 150, 140),
+          ),
+        );
+      });
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+
+    it('calls onTabPress in scroll mode', () => {
+      const mockOnTabPress = jest.fn();
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={mockOnTabPress}
+          testID="icon-bar"
+        />,
+      );
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(100));
+        mockTabs.forEach((_, i) =>
+          fireEvent(
+            getByTestId(`icon-bar-tab-${i}`),
+            'onLayout',
+            tabLayout(i * 150, 140),
+          ),
+        );
+      });
+      fireEvent.press(getByTestId('icon-bar-tab-2'));
+      expect(mockOnTabPress).toHaveBeenCalledWith(2);
+    });
+  });
+
+  describe('Underline Animation', () => {
+    it('initializes underline when all tab layouts are measured', () => {
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={jest.fn()}
+          testID="icon-bar"
+        />,
+      );
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(400));
+        mockTabs.forEach((_, i) =>
+          fireEvent(
+            getByTestId(`icon-bar-tab-${i}`),
+            'onLayout',
+            tabLayout(i * 120, 100),
+          ),
+        );
+      });
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+
+    it('animates underline on subsequent tab switches (non-first-time path)', () => {
+      const mockOnTabPress = jest.fn();
+      const { getByTestId, rerender } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={mockOnTabPress}
+          testID="icon-bar"
+        />,
+      );
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(400));
+        mockTabs.forEach((_, i) =>
+          fireEvent(
+            getByTestId(`icon-bar-tab-${i}`),
+            'onLayout',
+            tabLayout(i * 120, 100),
+          ),
+        );
+      });
+      // Second switch — triggers the animated timing path, not setValue
+      rerender(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={1}
+          onTabPress={mockOnTabPress}
+          testID="icon-bar"
+        />,
+      );
+      rerender(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={2}
+          onTabPress={mockOnTabPress}
+          testID="icon-bar"
+        />,
+      );
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+
+    it('re-animates underline on significant layout change after initialization', () => {
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={1}
+          onTabPress={jest.fn()}
+          testID="icon-bar"
+        />,
+      );
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(400));
+        mockTabs.forEach((_, i) =>
+          fireEvent(
+            getByTestId(`icon-bar-tab-${i}`),
+            'onLayout',
+            tabLayout(i * 120, 100),
+          ),
+        );
+      });
+      // Significant change after already initialized — triggers RAF path
+      act(() => {
+        mockTabs.forEach((_, i) =>
+          fireEvent(
+            getByTestId(`icon-bar-tab-${i}`),
+            'onLayout',
+            tabLayout(i * 140, 120),
+          ),
+        );
+      });
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+
+    it('does not animate when tab layout has zero width', () => {
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={jest.fn()}
+          testID="icon-bar"
+        />,
+      );
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(400));
+        // Only fire one tab layout with width=0 — should be ignored
+        fireEvent(getByTestId('icon-bar-tab-0'), 'onLayout', {
+          nativeEvent: { layout: { x: 0, y: 0, width: 0, height: 60 } },
+        });
+      });
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+  });
+
+  describe('Collapse Animation', () => {
+    it('applies collapseAnim height interpolation after tab row is measured', () => {
+      const collapseAnim = new Animated.Value(0);
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={jest.fn()}
+          collapseAnim={collapseAnim}
+          testID="icon-bar"
+        />,
+      );
+      // Trigger onLayout to set tabRowHeight > 0
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(400));
+        // Fire the inner Animated.View layout
+        fireEvent(getByTestId('icon-bar-tab-0'), 'onLayout', tabLayout(0, 100));
+      });
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+
+    it('renders without throwing when collapseBy is provided', () => {
+      const collapseAnim = new Animated.Value(0);
+      expect(() =>
+        render(
+          <TabsIconBar
+            tabs={mockTabs}
+            activeIndex={0}
+            onTabPress={jest.fn()}
+            collapseAnim={collapseAnim}
+            collapseBy={28}
+            testID="icon-bar"
+          />,
+        ),
+      ).not.toThrow();
+    });
+
+    it('renders without throwing when collapseBy exceeds tabRowHeight', () => {
+      const collapseAnim = new Animated.Value(0);
+      const { getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={jest.fn()}
+          collapseAnim={collapseAnim}
+          collapseBy={9999}
+          testID="icon-bar"
+        />,
+      );
+      // Tab row height is clamped to 0 (no negative height); should not crash.
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(400));
+      });
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+  });
+
+  describe('Tab Array Changes', () => {
+    it('resets layout state when tabs array changes', () => {
+      const mockOnTabPress = jest.fn();
+      const { getByTestId, rerender } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={mockOnTabPress}
+          testID="icon-bar"
+        />,
+      );
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(400));
+        mockTabs.forEach((_, i) =>
+          fireEvent(
+            getByTestId(`icon-bar-tab-${i}`),
+            'onLayout',
+            tabLayout(i * 120, 100),
+          ),
+        );
+      });
+
+      const newTabs: TabsIconItem[] = [
+        {
+          key: 'new1',
+          label: 'New A',
+          iconName: IconName.PieChart,
+          content: null,
+        },
+        {
+          key: 'new2',
+          label: 'New B',
+          iconName: IconName.Candlestick,
+          content: null,
+        },
+      ];
+      rerender(
+        <TabsIconBar
+          tabs={newTabs}
+          activeIndex={0}
+          onTabPress={mockOnTabPress}
+          testID="icon-bar"
+        />,
+      );
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+
+    it('resets layout state when tab keys change', () => {
+      const mockOnTabPress = jest.fn();
+      const { getByTestId, rerender } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={mockOnTabPress}
+          testID="icon-bar"
+        />,
+      );
+
+      const renamedTabs: TabsIconItem[] = mockTabs.map((t, i) => ({
+        ...t,
+        key: `renamed-${i}`,
+      }));
+      rerender(
+        <TabsIconBar
+          tabs={renamedTabs}
+          activeIndex={0}
+          onTabPress={mockOnTabPress}
+          testID="icon-bar"
+        />,
+      );
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+  });
+
+  describe('Performance', () => {
+    it('cleans up animations and RAF on unmount', () => {
+      const { unmount, getByTestId } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={jest.fn()}
+          testID="icon-bar"
+        />,
+      );
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(400));
+        mockTabs.forEach((_, i) =>
+          fireEvent(
+            getByTestId(`icon-bar-tab-${i}`),
+            'onLayout',
+            tabLayout(i * 120, 100),
+          ),
+        );
+      });
+      expect(() => unmount()).not.toThrow();
+    });
+
+    it('handles rapid active index changes without crashing', () => {
+      const mockOnTabPress = jest.fn();
+      const { getByTestId, rerender } = render(
+        <TabsIconBar
+          tabs={mockTabs}
+          activeIndex={0}
+          onTabPress={mockOnTabPress}
+          testID="icon-bar"
+        />,
+      );
+      act(() => {
+        fireEvent(getByTestId('icon-bar'), 'onLayout', mockLayoutEvent(400));
+        mockTabs.forEach((_, i) =>
+          fireEvent(
+            getByTestId(`icon-bar-tab-${i}`),
+            'onLayout',
+            tabLayout(i * 120, 100),
+          ),
+        );
+      });
+      [1, 2, 0, 1, 0, 2].forEach((i) =>
+        rerender(
+          <TabsIconBar
+            tabs={mockTabs}
+            activeIndex={i}
+            onTabPress={mockOnTabPress}
+            testID="icon-bar"
+          />,
+        ),
+      );
+      expect(getByTestId('icon-bar')).toBeOnTheScreen();
+    });
+  });
+});
diff --git a/app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.tsx b/app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.tsx
new file mode 100644
index 00000000000..2546e18ae21
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.tsx
@@ -0,0 +1,181 @@
+// Third party dependencies.
+import React, { useRef, useState } from 'react';
+import { Animated, ScrollView, LayoutChangeEvent } from 'react-native';
+
+// External dependencies.
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  Box,
+  BoxFlexDirection,
+  BoxAlignItems,
+} from '@metamask/design-system-react-native';
+
+// Internal dependencies.
+import TabsIconTab from '../TabsIconTab/TabsIconTab';
+import { TabsIconBarProps } from './TabsIconBar.types';
+import { useTabsBarLayout } from '../hooks/useTabsBarLayout';
+
+const TabsIconBar: React.FC<TabsIconBarProps> = ({
+  tabs,
+  activeIndex,
+  onTabPress,
+  testID,
+  twClassName,
+  fillWidth = false,
+  collapseAnim,
+  collapseBy,
+  ...boxProps
+}) => {
+  const tw = useTailwind();
+
+  const scrollViewRef = useRef<ScrollView>(null);
+  const underlineAnimated = useRef(new Animated.Value(0)).current;
+  const [underlineWidth, setUnderlineWidth] = useState(0);
+
+  // Height collapse animation — icon tabs always have a border-b row
+  const [tabRowHeight, setTabRowHeight] = useState(0);
+  const collapsedHeight =
+    collapseBy !== undefined ? Math.max(0, tabRowHeight - collapseBy) : 0;
+  const animatedHeight =
+    collapseAnim && tabRowHeight > 0
+      ? collapseAnim.interpolate({
+          inputRange: [0, 1],
+          outputRange: [tabRowHeight, collapsedHeight],
+        })
+      : undefined;
+
+  const {
+    isInitialized,
+    scrollEnabled,
+    handleContainerLayout,
+    handleTabLayout,
+  } = useTabsBarLayout({
+    tabs,
+    activeIndex,
+    fillWidth,
+    scrollAnimated: false,
+    scrollViewRef,
+    onAnimateToTab: (layout, isFirstTime) => {
+      // Icon tabs: underline is 75% of the tab width, centered
+      const targetWidth = layout.width * 0.75;
+      const targetX = layout.x + layout.width * 0.125;
+
+      setUnderlineWidth(targetWidth);
+
+      if (isFirstTime) {
+        underlineAnimated.setValue(targetX);
+        return null;
+      }
+
+      return Animated.timing(underlineAnimated, {
+        toValue: targetX,
+        duration: 200,
+        useNativeDriver: true,
+      });
+    },
+  });
+
+  const handleTabPress = (index: number) => {
+    const tab = tabs[index];
+    if (!tab?.isDisabled) {
+      onTabPress(index);
+    }
+  };
+
+  return (
+    <Box
+      twClassName={`relative overflow-hidden border-b border-border-muted ${twClassName || ''}`}
+      testID={testID}
+      onLayout={handleContainerLayout as (layoutEvent: unknown) => void}
+      {...boxProps}
+    >
+      {scrollEnabled ? (
+        <ScrollView
+          ref={scrollViewRef}
+          horizontal
+          showsHorizontalScrollIndicator={false}
+          style={tw.style('flex-grow-0')}
+          contentContainerStyle={tw.style('flex-row px-4')}
+          scrollsToTop={false}
+        >
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="relative gap-6"
+          >
+            {tabs.map((tab, index) => (
+              <TabsIconTab
+                key={tab.key}
+                label={tab.label}
+                iconName={tab.iconName}
+                isActive={index === activeIndex}
+                isDisabled={tab.isDisabled}
+                onPress={() => handleTabPress(index)}
+                onLayout={(layoutEvent) => handleTabLayout(index, layoutEvent)}
+                testID={tab.testID ?? `${testID}-tab-${index}`}
+                style={tw.style('py-2')}
+              />
+            ))}
+
+            {activeIndex >= 0 && isInitialized && (
+              <Animated.View
+                style={tw.style(
+                  'absolute -bottom-2px h-1 bg-icon-default z-1',
+                  {
+                    width: underlineWidth,
+                    transform: [{ translateX: underlineAnimated }],
+                  },
+                )}
+              />
+            )}
+          </Box>
+        </ScrollView>
+      ) : (
+        <Animated.View
+          onLayout={({
+            nativeEvent,
+          }: {
+            nativeEvent: LayoutChangeEvent['nativeEvent'];
+          }) => {
+            if (tabRowHeight === 0 && nativeEvent.layout.height > 0) {
+              setTabRowHeight(nativeEvent.layout.height);
+            }
+          }}
+          style={[
+            tw.style(
+              `relative ${fillWidth ? 'flex-row items-center' : 'px-4 gap-6 flex-row items-center relative'} ${animatedHeight !== undefined ? 'overflow-hidden' : ''}`,
+            ),
+            animatedHeight !== undefined
+              ? { height: animatedHeight }
+              : undefined,
+          ]}
+        >
+          {tabs.map((tab, index) => (
+            <TabsIconTab
+              key={tab.key}
+              label={tab.label}
+              iconName={tab.iconName}
+              isActive={index === activeIndex}
+              isDisabled={tab.isDisabled}
+              onPress={() => handleTabPress(index)}
+              onLayout={(layoutEvent) => handleTabLayout(index, layoutEvent)}
+              testID={tab.testID ?? `${testID}-tab-${index}`}
+              shouldFillWidth={fillWidth}
+            />
+          ))}
+
+          {activeIndex >= 0 && isInitialized && (
+            <Animated.View
+              style={tw.style('absolute -bottom-2px h-1 bg-icon-default z-1', {
+                width: underlineWidth,
+                transform: [{ translateX: underlineAnimated }],
+              })}
+            />
+          )}
+        </Animated.View>
+      )}
+    </Box>
+  );
+};
+
+export default TabsIconBar;
diff --git a/app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.types.ts b/app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.types.ts
new file mode 100644
index 00000000000..003de6c1558
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.types.ts
@@ -0,0 +1,69 @@
+// Third party dependencies.
+import React from 'react';
+import { Animated } from 'react-native';
+
+// External dependencies.
+import { Box } from '@metamask/design-system-react-native';
+
+// TODO: @MetaMask/design-system-engineers
+// Use the concrete Box component props here instead of BoxProps.
+// https://github.com/MetaMask/metamask-design-system/issues/1115
+type BoxComponentProps = React.ComponentProps<typeof Box>;
+
+// Internal dependencies.
+import { IconName } from '../../../components/Icons/Icon/Icon.types';
+
+/**
+ * Individual tab item data interface for the icon tab bar.
+ * Icon is required — use the base TabsBar for text-only tabs.
+ */
+export interface TabsIconItem {
+  key: string;
+  label: string;
+  content: React.ReactNode;
+  iconName: IconName;
+  isDisabled?: boolean;
+  testID?: string;
+}
+
+/**
+ * TabsIconBar component props
+ */
+export interface TabsIconBarProps extends BoxComponentProps {
+  /**
+   * Array of tab items — each must include an iconName
+   */
+  tabs: TabsIconItem[];
+  /**
+   * Current active tab index
+   */
+  activeIndex: number;
+  /**
+   * Callback when a tab is selected
+   */
+  onTabPress: (index: number) => void;
+  /**
+   * Test ID for the component
+   */
+  testID?: string;
+  /**
+   * Tailwind CSS classes to apply to the main container
+   */
+  twClassName?: string;
+  /**
+   * When true, each tab stretches equally to fill the full container width.
+   * Disables horizontal scrolling and gap spacing. Defaults to false.
+   */
+  fillWidth?: boolean;
+  /**
+   * Optional Animated.Value (0=visible, 1=hidden) that collapses the tab row height to zero.
+   * Requires useNativeDriver: false on the driving animation.
+   */
+  collapseAnim?: Animated.Value;
+  /**
+   * When provided alongside `collapseAnim`, the tab row collapses BY this many pixels at the
+   * fully-hidden state (1.0) instead of collapsing all the way to 0. Use this to shrink the
+   * row by just the icon area (for example) while keeping labels visible.
+   */
+  collapseBy?: number;
+}
diff --git a/app/component-library/components-temp/Tabs/TabsIconList/TabsIconList.test.tsx b/app/component-library/components-temp/Tabs/TabsIconList/TabsIconList.test.tsx
new file mode 100644
index 00000000000..64b781dfcad
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/TabsIconList/TabsIconList.test.tsx
@@ -0,0 +1,568 @@
+// Third party dependencies.
+import React from 'react';
+import { render, fireEvent, act } from '@testing-library/react-native';
+import { View, InteractionManager } from 'react-native';
+
+// External dependencies.
+import { Text } from '@metamask/design-system-react-native';
+
+// Internal dependencies.
+import TabsIconList from './TabsIconList';
+import { TabsIconViewProps, TabsIconListRef } from './TabsIconList.types';
+import { IconName } from '../../../components/Icons/Icon/Icon.types';
+
+jest.mock('react-native/Libraries/Interaction/InteractionManager', () => {
+  const interactionManager = {
+    runAfterInteractions: jest.fn((callback) => {
+      callback();
+      return { cancel: jest.fn() };
+    }),
+  };
+  return {
+    __esModule: true,
+    default: interactionManager,
+    ...interactionManager,
+  };
+});
+
+const tabViewProps = (label: string, icon: IconName): TabsIconViewProps => ({
+  tabLabel: label,
+  tabIcon: icon,
+});
+
+describe('TabsIconList', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (InteractionManager.runAfterInteractions as jest.Mock).mockImplementation(
+      (callback) => {
+        callback();
+        return { cancel: jest.fn() };
+      },
+    );
+  });
+
+  describe('Initial Rendering', () => {
+    it('renders the first tab as active by default', () => {
+      const { getByText, queryByText } = render(
+        <TabsIconList>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Portfolio Content</Text>
+          </View>
+          <View
+            key="t2"
+            {...(tabViewProps('Perpetuals', IconName.Candlestick) as object)}
+          >
+            <Text>Perpetuals Content</Text>
+          </View>
+        </TabsIconList>,
+      );
+      expect(getByText('Portfolio Content')).toBeOnTheScreen();
+      expect(queryByText('Perpetuals Content')).toBeNull();
+    });
+
+    it('renders with initialActiveIndex pointing to a non-zero tab', () => {
+      const { getByText } = render(
+        <TabsIconList initialActiveIndex={1}>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...(tabViewProps('Perpetuals', IconName.Candlestick) as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+        </TabsIconList>,
+      );
+      expect(getByText('Content 2')).toBeOnTheScreen();
+    });
+
+    it('falls back to first enabled tab when initialActiveIndex points to a disabled tab', () => {
+      const ref = React.createRef<TabsIconListRef>();
+      const { getByText } = render(
+        <TabsIconList ref={ref} initialActiveIndex={0}>
+          <View
+            key="t1"
+            {...({
+              ...tabViewProps('Portfolio', IconName.PieChart),
+              isDisabled: true,
+            } as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...(tabViewProps('Perpetuals', IconName.Candlestick) as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+        </TabsIconList>,
+      );
+      expect(ref.current?.getCurrentIndex()).toBe(1);
+      expect(getByText('Content 2')).toBeOnTheScreen();
+    });
+
+    it('sets activeIndex to -1 when all tabs are disabled', () => {
+      const ref = React.createRef<TabsIconListRef>();
+      render(
+        <TabsIconList ref={ref}>
+          <View
+            key="t1"
+            {...({
+              ...tabViewProps('Portfolio', IconName.PieChart),
+              isDisabled: true,
+            } as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...({
+              ...tabViewProps('Perpetuals', IconName.Candlestick),
+              isDisabled: true,
+            } as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+        </TabsIconList>,
+      );
+      expect(ref.current?.getCurrentIndex()).toBe(-1);
+    });
+
+    it('applies tabsListContentTwClassName to the content container', () => {
+      const { getByTestId } = render(
+        <TabsIconList testID="list" tabsListContentTwClassName="bg-red-500">
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+        </TabsIconList>,
+      );
+      expect(getByTestId('list-content')).toBeOnTheScreen();
+    });
+  });
+
+  describe('Tab Switching', () => {
+    it('switches tab content when a tab is pressed', async () => {
+      const { getByText, getAllByText } = render(
+        <TabsIconList>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Portfolio Content</Text>
+          </View>
+          <View
+            key="t2"
+            {...(tabViewProps('Perpetuals', IconName.Candlestick) as object)}
+          >
+            <Text>Perpetuals Content</Text>
+          </View>
+        </TabsIconList>,
+      );
+      await act(async () => {
+        fireEvent.press(getAllByText('Perpetuals')[0]);
+      });
+      expect(getByText('Perpetuals Content')).toBeOnTheScreen();
+    });
+
+    it('calls onChangeTab when active tab changes', async () => {
+      const mockOnChangeTab = jest.fn();
+      const { getAllByText } = render(
+        <TabsIconList onChangeTab={mockOnChangeTab}>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...(tabViewProps('Perpetuals', IconName.Candlestick) as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+        </TabsIconList>,
+      );
+      await act(async () => {
+        fireEvent.press(getAllByText('Perpetuals')[0]);
+      });
+      expect(mockOnChangeTab).toHaveBeenCalledWith({
+        i: 1,
+        ref: expect.any(Object),
+      });
+    });
+
+    it('does not call onChangeTab when the same tab is pressed again', async () => {
+      const mockOnChangeTab = jest.fn();
+      const { getAllByText } = render(
+        <TabsIconList onChangeTab={mockOnChangeTab}>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...(tabViewProps('Perpetuals', IconName.Candlestick) as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+        </TabsIconList>,
+      );
+      // First press — should fire
+      await act(async () => {
+        fireEvent.press(getAllByText('Perpetuals')[0]);
+      });
+      expect(mockOnChangeTab).toHaveBeenCalledTimes(1);
+      // Second press on the already-active tab — should NOT fire
+      await act(async () => {
+        fireEvent.press(getAllByText('Perpetuals')[0]);
+      });
+      expect(mockOnChangeTab).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not switch to a disabled tab', () => {
+      const mockOnChangeTab = jest.fn();
+      const { getAllByText, getByText } = render(
+        <TabsIconList onChangeTab={mockOnChangeTab}>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...({
+              ...tabViewProps('Perpetuals', IconName.Candlestick),
+              isDisabled: true,
+            } as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+        </TabsIconList>,
+      );
+      fireEvent.press(getAllByText('Perpetuals')[0]);
+      expect(mockOnChangeTab).not.toHaveBeenCalled();
+      expect(getByText('Content 1')).toBeOnTheScreen();
+    });
+  });
+
+  describe('Ref API', () => {
+    it('exposes goToTabIndex and getCurrentIndex', async () => {
+      const ref = React.createRef<TabsIconListRef>();
+      const { getByText } = render(
+        <TabsIconList ref={ref}>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...(tabViewProps('Perpetuals', IconName.Candlestick) as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+          <View
+            key="t3"
+            {...(tabViewProps('Predictions', IconName.Predictions) as object)}
+          >
+            <Text>Content 3</Text>
+          </View>
+        </TabsIconList>,
+      );
+      await act(async () => {
+        ref.current?.goToTabIndex(2);
+      });
+      expect(getByText('Content 3')).toBeOnTheScreen();
+      expect(ref.current?.getCurrentIndex()).toBe(2);
+    });
+
+    it('goToTabIndex does not switch to a disabled tab', async () => {
+      const ref = React.createRef<TabsIconListRef>();
+      const { getByText } = render(
+        <TabsIconList ref={ref} initialActiveIndex={0}>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...({
+              ...tabViewProps('Perpetuals', IconName.Candlestick),
+              isDisabled: true,
+            } as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+        </TabsIconList>,
+      );
+      await act(async () => {
+        ref.current?.goToTabIndex(1);
+      });
+      expect(getByText('Content 1')).toBeOnTheScreen();
+      expect(ref.current?.getCurrentIndex()).toBe(0);
+    });
+  });
+
+  describe('keepMounted', () => {
+    it('does not trigger a new InteractionManager load when switching back to a keepMounted tab', async () => {
+      const mockRunAfter = InteractionManager.runAfterInteractions as jest.Mock;
+      const { getAllByText } = render(
+        <TabsIconList>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...(tabViewProps('Perpetuals', IconName.Candlestick) as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+        </TabsIconList>,
+      );
+      // Load tab 2
+      await act(async () => {
+        fireEvent.press(getAllByText('Perpetuals')[0]);
+      });
+      // Switch back to tab 1
+      await act(async () => {
+        fireEvent.press(getAllByText('Portfolio')[0]);
+      });
+      const countAfterRoundTrip = mockRunAfter.mock.calls.length;
+      // Switch to tab 2 again — keepMounted=true means no new load needed
+      await act(async () => {
+        fireEvent.press(getAllByText('Perpetuals')[0]);
+      });
+      expect(mockRunAfter).toHaveBeenCalledTimes(countAfterRoundTrip);
+    });
+
+    it('unmounts inactive tab content when keepMounted is false', async () => {
+      const { getAllByText, queryByText } = render(
+        <TabsIconList>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...({
+              ...tabViewProps('Perpetuals', IconName.Candlestick),
+              keepMounted: false,
+            } as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+        </TabsIconList>,
+      );
+      await act(async () => {
+        fireEvent.press(getAllByText('Perpetuals')[0]);
+      });
+      await act(async () => {
+        fireEvent.press(getAllByText('Portfolio')[0]);
+      });
+      expect(queryByText('Content 2')).toBeNull();
+    });
+  });
+
+  describe('Content Loading', () => {
+    it('uses fallback timeout when InteractionManager callback does not run', async () => {
+      jest.useFakeTimers();
+      (InteractionManager.runAfterInteractions as jest.Mock).mockImplementation(
+        () => ({ cancel: jest.fn() }),
+      );
+      try {
+        const { queryByText, getByText } = render(
+          <TabsIconList initialActiveIndex={0}>
+            <View
+              key="t1"
+              {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+            >
+              <Text>Content 1</Text>
+            </View>
+          </TabsIconList>,
+        );
+        expect(queryByText('Content 1')).toBeNull();
+        await act(async () => {
+          jest.advanceTimersByTime(250);
+        });
+        expect(getByText('Content 1')).toBeOnTheScreen();
+      } finally {
+        jest.useRealTimers();
+      }
+    });
+
+    it('cancels pending InteractionManager handle when switching tabs quickly', async () => {
+      const mockCancel = jest.fn();
+      (InteractionManager.runAfterInteractions as jest.Mock).mockImplementation(
+        () => ({ cancel: mockCancel }),
+      );
+      const { getAllByText } = render(
+        <TabsIconList>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...(tabViewProps('Perpetuals', IconName.Candlestick) as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+        </TabsIconList>,
+      );
+      await act(async () => {
+        fireEvent.press(getAllByText('Perpetuals')[0]);
+      });
+      expect(mockCancel).toHaveBeenCalled();
+    });
+
+    it('does not reschedule loading for an already-loaded tab', async () => {
+      const mockRunAfter = InteractionManager.runAfterInteractions as jest.Mock;
+      const { getAllByText } = render(
+        <TabsIconList>
+          <View
+            key="t1"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Content 1</Text>
+          </View>
+          <View
+            key="t2"
+            {...(tabViewProps('Perpetuals', IconName.Candlestick) as object)}
+          >
+            <Text>Content 2</Text>
+          </View>
+        </TabsIconList>,
+      );
+      await act(async () => {
+        fireEvent.press(getAllByText('Perpetuals')[0]);
+      });
+      const countAfterFirstLoad = mockRunAfter.mock.calls.length;
+      await act(async () => {
+        fireEvent.press(getAllByText('Portfolio')[0]);
+      });
+      // Tab 1 already loaded — no new InteractionManager call
+      expect(mockRunAfter).toHaveBeenCalledTimes(countAfterFirstLoad);
+    });
+  });
+
+  describe('Dynamic Tabs', () => {
+    it('preserves active tab by key when tabs array changes', async () => {
+      const initialTabs = [
+        {
+          key: 'p-tab',
+          label: 'Portfolio',
+          icon: IconName.PieChart,
+          content: 'Portfolio Content',
+        },
+        {
+          key: 'perp-tab',
+          label: 'Perpetuals',
+          icon: IconName.Candlestick,
+          content: 'Perps Content',
+        },
+      ];
+
+      const { rerender, getByText, getAllByText } = render(
+        <TabsIconList>
+          {initialTabs.map((t) => (
+            <View key={t.key} {...(tabViewProps(t.label, t.icon) as object)}>
+              <Text>{t.content}</Text>
+            </View>
+          ))}
+        </TabsIconList>,
+      );
+      await act(async () => {
+        fireEvent.press(getAllByText('Perpetuals')[0]);
+      });
+      expect(getByText('Perps Content')).toBeOnTheScreen();
+
+      // Add a new tab — Perpetuals should stay active (preserved by key)
+      const updatedTabs = [
+        ...initialTabs,
+        {
+          key: 'pred-tab',
+          label: 'Predictions',
+          icon: IconName.Predictions,
+          content: 'Predictions Content',
+        },
+      ];
+      rerender(
+        <TabsIconList>
+          {updatedTabs.map((t) => (
+            <View key={t.key} {...(tabViewProps(t.label, t.icon) as object)}>
+              <Text>{t.content}</Text>
+            </View>
+          ))}
+        </TabsIconList>,
+      );
+      expect(getByText('Perps Content')).toBeOnTheScreen();
+    });
+
+    it('falls back to initialActiveIndex when active tab key is removed', async () => {
+      const initialTabs = [
+        {
+          key: 'p-tab',
+          label: 'Portfolio',
+          icon: IconName.PieChart,
+          content: 'Portfolio Content',
+        },
+        {
+          key: 'perp-tab',
+          label: 'Perpetuals',
+          icon: IconName.Candlestick,
+          content: 'Perps Content',
+        },
+      ];
+
+      const { rerender, getByText, getAllByText, queryByText } = render(
+        <TabsIconList>
+          {initialTabs.map((t) => (
+            <View key={t.key} {...(tabViewProps(t.label, t.icon) as object)}>
+              <Text>{t.content}</Text>
+            </View>
+          ))}
+        </TabsIconList>,
+      );
+      await act(async () => {
+        fireEvent.press(getAllByText('Perpetuals')[0]);
+      });
+
+      // Remove Perpetuals — should fall back to Portfolio
+      rerender(
+        <TabsIconList>
+          <View
+            key="p-tab"
+            {...(tabViewProps('Portfolio', IconName.PieChart) as object)}
+          >
+            <Text>Portfolio Content</Text>
+          </View>
+        </TabsIconList>,
+      );
+      expect(queryByText('Perps Content')).toBeNull();
+      expect(getByText('Portfolio Content')).toBeOnTheScreen();
+    });
+  });
+});
diff --git a/app/component-library/components-temp/Tabs/TabsIconList/TabsIconList.tsx b/app/component-library/components-temp/Tabs/TabsIconList/TabsIconList.tsx
new file mode 100644
index 00000000000..3f1efdbca80
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/TabsIconList/TabsIconList.tsx
@@ -0,0 +1,117 @@
+import React, { useImperativeHandle, forwardRef, useMemo } from 'react';
+
+import { Box } from '@metamask/design-system-react-native';
+import { GestureDetector } from 'react-native-gesture-handler';
+
+import TabsIconBar from '../TabsIconBar/TabsIconBar';
+import type { IconName } from '../../../components/Icons/Icon/Icon.types';
+import {
+  TabsIconListProps,
+  TabsIconListRef,
+  TabsIconItem,
+} from './TabsIconList.types';
+import { useTabsList } from '../hooks/useTabsList';
+
+const TabsIconList = forwardRef<TabsIconListRef, TabsIconListProps>(
+  (
+    {
+      children,
+      initialActiveIndex = 0,
+      onChangeTab,
+      testID,
+      tabsBarProps,
+      tabsListContentTwClassName,
+      ...boxProps
+    },
+    ref,
+  ) => {
+    const tabs: TabsIconItem[] = useMemo(
+      () =>
+        React.Children.toArray(children)
+          .filter((child) => React.isValidElement(child))
+          .map((child, index) => {
+            const props = (child as React.ReactElement).props as {
+              tabLabel?: string;
+              tabIcon?: IconName;
+              isDisabled?: boolean;
+              testID?: string;
+              keepMounted?: boolean;
+            };
+            const tabLabel = props.tabLabel || `Tab ${index + 1}`;
+            const isDisabled = props.isDisabled || false;
+            return {
+              key:
+                (child as React.ReactElement).key?.toString() || `tab-${index}`,
+              label: tabLabel,
+              iconName: props.tabIcon as IconName,
+              content: child,
+              isDisabled,
+              isLoaded: false,
+              testID: props.testID,
+              keepMounted: props.keepMounted ?? true,
+            };
+          }),
+      [children],
+    );
+
+    const { activeIndex, loadedTabs, handleTabPress, swipeGesture } =
+      useTabsList({ tabs, initialActiveIndex, onChangeTab });
+
+    useImperativeHandle(
+      ref,
+      () => ({
+        goToTabIndex: (tabIndex: number) => {
+          handleTabPress(tabIndex);
+        },
+        getCurrentIndex: () => activeIndex,
+      }),
+      [activeIndex, handleTabPress],
+    );
+
+    const tabBarPropsComputed = useMemo(
+      () => ({
+        tabs,
+        activeIndex,
+        onTabPress: handleTabPress,
+        testID: testID ? `${testID}-bar` : undefined,
+        ...tabsBarProps,
+      }),
+      [tabs, activeIndex, handleTabPress, testID, tabsBarProps],
+    );
+
+    return (
+      <Box twClassName="flex-1" testID={testID} {...boxProps}>
+        <TabsIconBar {...tabBarPropsComputed} />
+
+        <GestureDetector gesture={swipeGesture}>
+          <Box
+            twClassName={`flex-1 ${tabsListContentTwClassName || ''}`}
+            testID={testID ? `${testID}-content` : undefined}
+          >
+            {tabs.map((tab, index) => {
+              const isActive = index === activeIndex;
+              const isLoaded = loadedTabs.has(index);
+
+              if (!isLoaded) return null;
+              if (!isActive && !tab.keepMounted) return null;
+
+              return (
+                <Box
+                  key={tab.key}
+                  twClassName={isActive ? 'flex-1' : 'hidden'}
+                  pointerEvents={!isActive ? 'none' : 'auto'}
+                >
+                  {tab.content}
+                </Box>
+              );
+            })}
+          </Box>
+        </GestureDetector>
+      </Box>
+    );
+  },
+);
+
+TabsIconList.displayName = 'TabsIconList';
+
+export default TabsIconList;
diff --git a/app/component-library/components-temp/Tabs/TabsIconList/TabsIconList.types.ts b/app/component-library/components-temp/Tabs/TabsIconList/TabsIconList.types.ts
new file mode 100644
index 00000000000..8f0a4a23c2c
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/TabsIconList/TabsIconList.types.ts
@@ -0,0 +1,79 @@
+// Third party dependencies.
+import React from 'react';
+
+// External dependencies.
+import { Box } from '@metamask/design-system-react-native';
+
+type BoxComponentProps = React.ComponentProps<typeof Box>;
+
+// Internal dependencies.
+import { TabsIconBarProps } from '../TabsIconBar/TabsIconBar.types';
+import { IconName } from '../../../components/Icons/Icon/Icon.types';
+
+/**
+ * Individual tab item data used internally by TabsIconList
+ */
+export interface TabsIconItem {
+  key: string;
+  label: string;
+  content: React.ReactNode;
+  iconName: IconName;
+  isDisabled?: boolean;
+  testID?: string;
+  keepMounted?: boolean;
+}
+
+/**
+ * Props that a child tab view should declare so TabsIconList can read them
+ */
+export interface TabsIconViewProps {
+  tabLabel: string;
+  tabIcon: IconName;
+  key?: string;
+  isDisabled?: boolean;
+  keepMounted?: boolean;
+  testID?: string;
+}
+
+/**
+ * TabsIconList component props
+ */
+export interface TabsIconListProps extends BoxComponentProps {
+  /**
+   * Tab content — each child must have tabLabel and tabIcon props
+   */
+  children: React.ReactElement | React.ReactElement[];
+  /**
+   * Initial active tab index
+   */
+  initialActiveIndex?: number;
+  /**
+   * Callback when the active tab changes
+   */
+  onChangeTab?: (changeTabProperties: {
+    i: number;
+    ref: React.ReactNode;
+  }) => void;
+  /**
+   * Props forwarded to the inner TabsIconBar (tabs, activeIndex, onTabPress are managed internally)
+   */
+  tabsBarProps?: Omit<TabsIconBarProps, 'tabs' | 'activeIndex' | 'onTabPress'>;
+  /**
+   * Extra Tailwind classes applied to the content container
+   */
+  tabsListContentTwClassName?: string;
+}
+
+/**
+ * Ref interface for external control of TabsIconList
+ */
+export interface TabsIconListRef {
+  /**
+   * Navigate to a specific tab by index
+   */
+  goToTabIndex: (tabIndex: number) => void;
+  /**
+   * Get the current active tab index
+   */
+  getCurrentIndex: () => number;
+}
diff --git a/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconAnimationContext.ts b/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconAnimationContext.ts
new file mode 100644
index 00000000000..06383383657
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconAnimationContext.ts
@@ -0,0 +1,18 @@
+import { createContext } from 'react';
+import type { SharedValue } from 'react-native-reanimated';
+
+/**
+ * Provides an optional Reanimated SharedValue (0 = icons expanded, 1 = icons collapsed)
+ * to Tab components without threading props through TabsList / TabsBar. The value drives
+ * the icon's height / marginBottom / opacity via useAnimatedStyle on the UI thread —
+ * no per-frame JS work, no layout reflow on the JS thread.
+ *
+ * Consumers that don't provide this context get the default (undefined), which means
+ * icons render at full size — preserving existing behaviour.
+ */
+export interface TabIconAnimationContextValue {
+  iconCollapseProgress?: SharedValue<number>;
+}
+
+export const TabIconAnimationContext =
+  createContext<TabIconAnimationContextValue>({});
diff --git a/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconTab.test.tsx b/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconTab.test.tsx
new file mode 100644
index 00000000000..02938877e1b
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconTab.test.tsx
@@ -0,0 +1,160 @@
+// Third party dependencies.
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+
+// Internal dependencies.
+import TabsIconTab from './TabsIconTab';
+import { TabIconAnimationContext } from './TabsIconAnimationContext';
+import { IconName } from '../../../components/Icons/Icon/Icon.types';
+
+describe('TabsIconTab', () => {
+  const defaultProps = {
+    label: 'Portfolio',
+    iconName: IconName.PieChart,
+    isActive: false,
+    onPress: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('Rendering', () => {
+    it('renders with testID', () => {
+      const { getByTestId } = render(
+        <TabsIconTab {...defaultProps} testID="tab" />,
+      );
+      expect(getByTestId('tab')).toBeOnTheScreen();
+    });
+
+    it('displays the label text', () => {
+      const { getByText } = render(<TabsIconTab {...defaultProps} />);
+      expect(getByText('Portfolio')).toBeOnTheScreen();
+    });
+  });
+
+  describe('Active State', () => {
+    it('renders enabled when isActive is true', () => {
+      const { getByTestId } = render(
+        <TabsIconTab {...defaultProps} isActive testID="active-tab" />,
+      );
+      expect(
+        getByTestId('active-tab').props.accessibilityState?.disabled,
+      ).toBeFalsy();
+    });
+
+    it('renders enabled when isActive is false', () => {
+      const { getByTestId } = render(
+        <TabsIconTab
+          {...defaultProps}
+          isActive={false}
+          testID="inactive-tab"
+        />,
+      );
+      expect(
+        getByTestId('inactive-tab').props.accessibilityState?.disabled,
+      ).toBeFalsy();
+    });
+  });
+
+  describe('Disabled State', () => {
+    it('sets disabled accessibility state when isDisabled is true', () => {
+      const { getByTestId } = render(
+        <TabsIconTab {...defaultProps} isDisabled testID="disabled-tab" />,
+      );
+      expect(
+        getByTestId('disabled-tab').props.accessibilityState?.disabled,
+      ).toBe(true);
+    });
+
+    it('does not call onPress when disabled', () => {
+      const mockOnPress = jest.fn();
+      const { getByText } = render(
+        <TabsIconTab {...defaultProps} onPress={mockOnPress} isDisabled />,
+      );
+      fireEvent.press(getByText('Portfolio'));
+      expect(mockOnPress).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('Interaction', () => {
+    it('calls onPress when pressed and not disabled', () => {
+      const mockOnPress = jest.fn();
+      const { getByTestId } = render(
+        <TabsIconTab {...defaultProps} onPress={mockOnPress} testID="tab" />,
+      );
+      fireEvent.press(getByTestId('tab'));
+      expect(mockOnPress).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('Layout and Callbacks', () => {
+    it('calls onLayout callback when layout changes', () => {
+      const mockOnLayout = jest.fn();
+      const layoutEvent = {
+        nativeEvent: { layout: { x: 0, y: 0, width: 100, height: 60 } },
+      };
+      const { getByTestId } = render(
+        <TabsIconTab
+          {...defaultProps}
+          onLayout={mockOnLayout}
+          testID="layout-tab"
+        />,
+      );
+      fireEvent(getByTestId('layout-tab'), 'onLayout', layoutEvent);
+      expect(mockOnLayout).toHaveBeenCalledWith(layoutEvent);
+    });
+  });
+
+  describe('Icon', () => {
+    it('renders all supported icon names without throwing', () => {
+      const icons: IconName[] = [
+        IconName.PieChart,
+        IconName.Candlestick,
+        IconName.Predictions,
+      ];
+      icons.forEach((icon) => {
+        expect(() =>
+          render(
+            <TabsIconTab {...defaultProps} iconName={icon} testID="icon-tab" />,
+          ),
+        ).not.toThrow();
+      });
+    });
+  });
+
+  describe('Icon collapse animation context', () => {
+    it('renders without throwing when iconCollapseProgress SharedValue is provided', () => {
+      const iconCollapseProgress = { value: 0 } as never;
+      expect(() =>
+        render(
+          <TabIconAnimationContext.Provider value={{ iconCollapseProgress }}>
+            <TabsIconTab {...defaultProps} testID="tab" />
+          </TabIconAnimationContext.Provider>,
+        ),
+      ).not.toThrow();
+    });
+
+    it('renders without throwing when no SharedValue is provided (icons full size)', () => {
+      expect(() =>
+        render(
+          <TabIconAnimationContext.Provider value={{}}>
+            <TabsIconTab {...defaultProps} testID="tab" />
+          </TabIconAnimationContext.Provider>,
+        ),
+      ).not.toThrow();
+    });
+
+    it('renders the label text regardless of collapse progress value', () => {
+      const fullyCollapsed = { value: 1 } as never;
+      const { getByText } = render(
+        <TabIconAnimationContext.Provider
+          value={{ iconCollapseProgress: fullyCollapsed }}
+        >
+          <TabsIconTab {...defaultProps} />
+        </TabIconAnimationContext.Provider>,
+      );
+      expect(getByText('Portfolio')).toBeOnTheScreen();
+    });
+  });
+});
diff --git a/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconTab.tsx b/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconTab.tsx
new file mode 100644
index 00000000000..32be71f360c
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconTab.tsx
@@ -0,0 +1,140 @@
+// Third party dependencies.
+import React, { useContext, useRef, useCallback } from 'react';
+import { Pressable, StyleProp, View, ViewStyle } from 'react-native';
+import Reanimated, {
+  useAnimatedStyle,
+  interpolate,
+  Extrapolation,
+} from 'react-native-reanimated';
+
+// External dependencies.
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  Text,
+  TextVariant,
+  FontWeight,
+  Box,
+  BoxFlexDirection,
+  BoxAlignItems,
+  BoxJustifyContent,
+} from '@metamask/design-system-react-native';
+import Icon, { IconSize, IconColor } from '../../../components/Icons/Icon';
+
+// Internal dependencies.
+import { TabsIconTabProps } from './TabsIconTab.types';
+import { TabIconAnimationContext } from './TabsIconAnimationContext';
+
+const ICON_SIZE_LG = 24;
+const ICON_MARGIN_BOTTOM = 4;
+
+const TabsIconTab: React.FC<TabsIconTabProps> = ({
+  label,
+  iconName,
+  isActive,
+  isDisabled = false,
+  onPress,
+  testID,
+  onLayout,
+  shouldFillWidth = false,
+  iconProps,
+  style: externalStyle,
+  ...pressableProps
+}) => {
+  const tw = useTailwind();
+  const viewRef = useRef<View>(null);
+  const { iconCollapseProgress } = useContext(TabIconAnimationContext);
+
+  // Drive icon's layout box (height + marginBottom) and opacity from a Reanimated
+  // SharedValue so the entire transition runs on the UI thread — no per-frame JS work,
+  // no layout reflow on the JS thread.
+  const iconAnimatedStyle = useAnimatedStyle(() => {
+    if (!iconCollapseProgress) {
+      return {
+        height: ICON_SIZE_LG,
+        marginBottom: ICON_MARGIN_BOTTOM,
+        opacity: 1,
+      };
+    }
+    const p = iconCollapseProgress.value;
+    return {
+      height: interpolate(p, [0, 1], [ICON_SIZE_LG, 0], Extrapolation.CLAMP),
+      marginBottom: interpolate(
+        p,
+        [0, 1],
+        [ICON_MARGIN_BOTTOM, 0],
+        Extrapolation.CLAMP,
+      ),
+      opacity: interpolate(p, [0, 1], [1, 0], Extrapolation.CLAMP),
+    };
+  });
+
+  const handleOnLayout = useCallback(
+    (layoutEvent: Parameters<NonNullable<typeof onLayout>>[0]) => {
+      if (onLayout) {
+        onLayout(layoutEvent);
+      }
+    },
+    [onLayout],
+  );
+
+  return (
+    <View
+      ref={viewRef}
+      onLayout={handleOnLayout}
+      style={[shouldFillWidth ? tw.style('flex-1') : tw.style('flex-shrink-0')]}
+    >
+      <Pressable
+        style={[
+          tw.style(
+            'px-0 pt-1 pb-2 flex-col items-center justify-center relative',
+            isDisabled && 'opacity-50',
+          ),
+          externalStyle as StyleProp<ViewStyle>,
+        ]}
+        onPress={isDisabled ? undefined : onPress}
+        disabled={isDisabled}
+        testID={testID}
+        {...pressableProps}
+      >
+        <Box
+          flexDirection={BoxFlexDirection.Column}
+          alignItems={BoxAlignItems.Center}
+          justifyContent={BoxJustifyContent.Center}
+        >
+          <Reanimated.View style={iconAnimatedStyle}>
+            <Icon
+              name={iconName}
+              size={IconSize.Lg}
+              color={
+                isDisabled
+                  ? IconColor.Muted
+                  : isActive
+                    ? IconColor.Default
+                    : IconColor.Alternative
+              }
+              {...iconProps}
+            />
+          </Reanimated.View>
+          <Text
+            variant={TextVariant.BodySm}
+            fontWeight={
+              isActive && !isDisabled ? FontWeight.Bold : FontWeight.Regular
+            }
+            twClassName={
+              isDisabled
+                ? 'text-muted'
+                : isActive
+                  ? 'text-default'
+                  : 'text-alternative'
+            }
+            numberOfLines={1}
+          >
+            {label}
+          </Text>
+        </Box>
+      </Pressable>
+    </View>
+  );
+};
+
+export default TabsIconTab;
diff --git a/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconTab.types.ts b/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconTab.types.ts
new file mode 100644
index 00000000000..f532c2326f6
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/TabsIconTab/TabsIconTab.types.ts
@@ -0,0 +1,44 @@
+// Third party dependencies.
+import { PressableProps, LayoutChangeEvent } from 'react-native';
+
+// Internal dependencies.
+import { IconName, IconProps } from '../../../components/Icons/Icon/Icon.types';
+
+/**
+ * TabsIconTab component props.
+ * Unlike the base Tab component, an icon is always required.
+ */
+export interface TabsIconTabProps extends PressableProps {
+  /**
+   * The label text rendered below the icon
+   */
+  label: string;
+  /**
+   * Icon rendered above the label — required for this variant
+   */
+  iconName: IconName;
+  /**
+   * Whether the tab is currently active
+   */
+  isActive: boolean;
+  /**
+   * Whether the tab is disabled
+   */
+  isDisabled?: boolean;
+  /**
+   * Callback when tab is pressed
+   */
+  onPress: () => void;
+  /**
+   * Callback when tab layout changes
+   */
+  onLayout?: (event: LayoutChangeEvent) => void;
+  /**
+   * When true the tab stretches to fill equal width inside a fill-width bar
+   */
+  shouldFillWidth?: boolean;
+  /**
+   * Extra props spread onto the Icon component — useful for overriding size, color, or style
+   */
+  iconProps?: Partial<Omit<IconProps, 'name'>>;
+}
diff --git a/app/component-library/components-temp/Tabs/hooks/useTabsBarLayout.test.ts b/app/component-library/components-temp/Tabs/hooks/useTabsBarLayout.test.ts
new file mode 100644
index 00000000000..9b58c2094b9
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/hooks/useTabsBarLayout.test.ts
@@ -0,0 +1,343 @@
+// Third party dependencies.
+import { renderHook, act } from '@testing-library/react-hooks';
+import { Animated } from 'react-native';
+
+// Internal dependencies.
+import { useTabsBarLayout } from './useTabsBarLayout';
+
+const makeTabs = (count: number) =>
+  Array.from({ length: count }, (_, i) => ({ key: `tab-${i}` }));
+
+const layoutEvent = (x: number, width: number) => ({
+  nativeEvent: { layout: { x, y: 0, width, height: 60 } },
+});
+
+const containerEvent = (width: number) => ({
+  nativeEvent: { layout: { x: 0, y: 0, width, height: 60 } },
+});
+
+describe('useTabsBarLayout', () => {
+  let scrollViewRef: { current: { scrollTo: jest.Mock } | null };
+  let onAnimateToTab: jest.Mock;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    scrollViewRef = { current: { scrollTo: jest.fn() } };
+    onAnimateToTab = jest.fn().mockReturnValue(null);
+  });
+
+  const renderLayout = (
+    tabs = makeTabs(2),
+    activeIndex = 0,
+    overrides: Record<string, unknown> = {},
+  ) =>
+    renderHook(
+      ({ t, ai }: { t: typeof tabs; ai: number }) =>
+        useTabsBarLayout({
+          tabs: t,
+          activeIndex: ai,
+          scrollViewRef: scrollViewRef as never,
+          onAnimateToTab,
+          ...overrides,
+        }),
+      { initialProps: { t: tabs, ai: activeIndex } },
+    );
+
+  describe('initial state', () => {
+    it('starts with isInitialized=false and scrollEnabled=false', () => {
+      const { result } = renderLayout();
+      expect(result.current.isInitialized).toBe(false);
+      expect(result.current.scrollEnabled).toBe(false);
+    });
+
+    it('exposes handleContainerLayout and handleTabLayout', () => {
+      const { result } = renderLayout();
+      expect(typeof result.current.handleContainerLayout).toBe('function');
+      expect(typeof result.current.handleTabLayout).toBe('function');
+    });
+  });
+
+  describe('initialization', () => {
+    it('calls onAnimateToTab with isFirstTime=true after all layouts are measured', () => {
+      const tabs = makeTabs(2);
+      const { result } = renderLayout(tabs);
+      act(() => {
+        result.current.handleContainerLayout(containerEvent(400) as never);
+        result.current.handleTabLayout(0, layoutEvent(0, 100) as never);
+        result.current.handleTabLayout(1, layoutEvent(120, 100) as never);
+      });
+      expect(onAnimateToTab).toHaveBeenCalledWith({ x: 0, width: 100 }, true);
+      expect(result.current.isInitialized).toBe(true);
+    });
+
+    it('does not call onAnimateToTab when a tab layout has zero width', () => {
+      const tabs = makeTabs(2);
+      const { result } = renderLayout(tabs);
+      act(() => {
+        result.current.handleContainerLayout(containerEvent(400) as never);
+        result.current.handleTabLayout(0, layoutEvent(0, 0) as never);
+      });
+      expect(onAnimateToTab).not.toHaveBeenCalled();
+      expect(result.current.isInitialized).toBe(false);
+    });
+
+    it('ignores out-of-range tab layout index', () => {
+      const tabs = makeTabs(2);
+      const { result } = renderLayout(tabs);
+      act(() => {
+        result.current.handleTabLayout(99, layoutEvent(0, 100) as never);
+      });
+      expect(onAnimateToTab).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('subsequent animation', () => {
+    const setupInitialized = (tabs = makeTabs(3)) => {
+      const hook = renderLayout(tabs);
+      act(() => {
+        hook.result.current.handleContainerLayout(containerEvent(400) as never);
+        tabs.forEach((_, i) =>
+          hook.result.current.handleTabLayout(
+            i,
+            layoutEvent(i * 120, 100) as never,
+          ),
+        );
+      });
+      return hook;
+    };
+
+    it('calls onAnimateToTab with isFirstTime=false on activeIndex change', () => {
+      const tabs = makeTabs(3);
+      const hook = renderLayout(tabs, 0);
+      act(() => {
+        hook.result.current.handleContainerLayout(containerEvent(400) as never);
+        tabs.forEach((_, i) =>
+          hook.result.current.handleTabLayout(
+            i,
+            layoutEvent(i * 120, 100) as never,
+          ),
+        );
+      });
+      onAnimateToTab.mockClear();
+      const animation = {
+        start: jest.fn((cb) => cb({ finished: true })),
+        stop: jest.fn(),
+      };
+      onAnimateToTab.mockReturnValue(animation);
+      hook.rerender({ t: tabs, ai: 2 });
+      expect(onAnimateToTab).toHaveBeenCalledWith(
+        { x: 240, width: 100 },
+        false,
+      );
+    });
+
+    it('starts the returned animation on subsequent tab switch', () => {
+      const tabs = makeTabs(2);
+      const mockAnimation = {
+        start: jest.fn((cb) => cb({ finished: true })),
+        stop: jest.fn(),
+      };
+      onAnimateToTab.mockReturnValue(mockAnimation);
+      const hook = renderLayout(tabs, 0);
+      act(() => {
+        hook.result.current.handleContainerLayout(containerEvent(400) as never);
+        tabs.forEach((_, i) =>
+          hook.result.current.handleTabLayout(
+            i,
+            layoutEvent(i * 120, 100) as never,
+          ),
+        );
+      });
+      // First call is isFirstTime=true — animation is null; now switch tab
+      onAnimateToTab.mockClear();
+      hook.rerender({ t: tabs, ai: 1 });
+      expect(mockAnimation.start).toHaveBeenCalled();
+    });
+
+    it('re-animates when a significant layout change occurs after initialization', () => {
+      jest.useFakeTimers();
+      try {
+        const hook = setupInitialized();
+        onAnimateToTab.mockClear();
+        act(() => {
+          // Trigger a significant change (> 1px) — schedules a RAF
+          hook.result.current.handleTabLayout(0, layoutEvent(0, 130) as never);
+          jest.runAllTimers();
+        });
+        expect(onAnimateToTab).toHaveBeenCalled();
+      } finally {
+        jest.useRealTimers();
+      }
+    });
+
+    it('does not re-animate for insignificant layout changes', () => {
+      const hook = setupInitialized();
+      onAnimateToTab.mockClear();
+      act(() => {
+        // Less than 1px change — should be ignored
+        hook.result.current.handleTabLayout(0, layoutEvent(0, 100.5) as never);
+      });
+      expect(onAnimateToTab).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('scroll mode', () => {
+    it('enables scroll when total tab width exceeds container width', () => {
+      const tabs = makeTabs(3);
+      const { result } = renderLayout(tabs);
+      act(() => {
+        // Container: 200px; tabs: 3 × 150px + 2 × 24px gaps = 498px > 200-32=168
+        result.current.handleContainerLayout(containerEvent(200) as never);
+        tabs.forEach((_, i) =>
+          result.current.handleTabLayout(i, layoutEvent(i * 160, 150) as never),
+        );
+      });
+      expect(result.current.scrollEnabled).toBe(true);
+    });
+
+    it('does not enable scroll when fillWidth is true', () => {
+      const tabs = makeTabs(3);
+      const { result } = renderHook(() =>
+        useTabsBarLayout({
+          tabs,
+          activeIndex: 0,
+          fillWidth: true,
+          scrollViewRef: scrollViewRef as never,
+          onAnimateToTab,
+        }),
+      );
+      act(() => {
+        result.current.handleContainerLayout(containerEvent(50) as never);
+        tabs.forEach((_, i) =>
+          result.current.handleTabLayout(i, layoutEvent(i * 100, 90) as never),
+        );
+      });
+      expect(result.current.scrollEnabled).toBe(false);
+    });
+
+    it('calls scrollTo during initialization in scroll mode', () => {
+      const tabs = makeTabs(3);
+      const hook = renderLayout(tabs, 0);
+      // Round 1: all layouts measured → scroll mode activates, which synchronously
+      // clears tabLayouts via the prevScrollEnabled effect (real-world behavior:
+      // the component re-renders in scroll mode and re-fires onLayout callbacks).
+      act(() => {
+        hook.result.current.handleContainerLayout(containerEvent(200) as never);
+        tabs.forEach((_, i) =>
+          hook.result.current.handleTabLayout(
+            i,
+            layoutEvent(i * 160, 150) as never,
+          ),
+        );
+      });
+      // Round 2: re-measure in scroll mode → initialization runs with scrollEnabled=true
+      act(() => {
+        tabs.forEach((_, i) =>
+          hook.result.current.handleTabLayout(
+            i,
+            layoutEvent(i * 160, 150) as never,
+          ),
+        );
+      });
+      expect(scrollViewRef.current?.scrollTo).toHaveBeenCalled();
+    });
+  });
+
+  describe('tabs array changes', () => {
+    it('resets initialized state when tab count changes', () => {
+      const initialTabs = makeTabs(2);
+      const hook = renderLayout(initialTabs, 0);
+      act(() => {
+        hook.result.current.handleContainerLayout(containerEvent(400) as never);
+        initialTabs.forEach((_, i) =>
+          hook.result.current.handleTabLayout(
+            i,
+            layoutEvent(i * 120, 100) as never,
+          ),
+        );
+      });
+      expect(hook.result.current.isInitialized).toBe(true);
+
+      const newTabs = makeTabs(3);
+      hook.rerender({ t: newTabs, ai: 0 });
+      expect(hook.result.current.isInitialized).toBe(false);
+    });
+
+    it('resets initialized state when tab keys change', () => {
+      const initialTabs = makeTabs(2);
+      const hook = renderLayout(initialTabs, 0);
+      act(() => {
+        hook.result.current.handleContainerLayout(containerEvent(400) as never);
+        initialTabs.forEach((_, i) =>
+          hook.result.current.handleTabLayout(
+            i,
+            layoutEvent(i * 120, 100) as never,
+          ),
+        );
+      });
+      const renamedTabs = initialTabs.map((t, i) => ({ key: `renamed-${i}` }));
+      hook.rerender({ t: renamedTabs, ai: 0 });
+      expect(hook.result.current.isInitialized).toBe(false);
+    });
+  });
+
+  describe('activeIndex=-1', () => {
+    it('does not call onAnimateToTab when activeIndex is -1', () => {
+      const tabs = makeTabs(2);
+      const { result } = renderHook(() =>
+        useTabsBarLayout({
+          tabs,
+          activeIndex: -1,
+          scrollViewRef: scrollViewRef as never,
+          onAnimateToTab,
+        }),
+      );
+      act(() => {
+        result.current.handleContainerLayout(containerEvent(400) as never);
+        tabs.forEach((_, i) =>
+          result.current.handleTabLayout(i, layoutEvent(i * 120, 100) as never),
+        );
+      });
+      expect(onAnimateToTab).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('cleanup', () => {
+    it('stops animation on unmount without throwing', () => {
+      const mockAnimation = {
+        start: jest.fn(),
+        stop: jest.fn(),
+      };
+      onAnimateToTab.mockReturnValue(mockAnimation);
+      const tabs = makeTabs(2);
+      const hook = renderLayout(tabs, 0);
+      act(() => {
+        hook.result.current.handleContainerLayout(containerEvent(400) as never);
+        tabs.forEach((_, i) =>
+          hook.result.current.handleTabLayout(
+            i,
+            layoutEvent(i * 120, 100) as never,
+          ),
+        );
+      });
+      expect(() => hook.unmount()).not.toThrow();
+    });
+  });
+
+  describe('Animated.Value integration', () => {
+    it('passes correct layout to onAnimateToTab for the active tab', () => {
+      const tabs = makeTabs(3);
+      const hook = renderLayout(tabs, 1);
+      act(() => {
+        hook.result.current.handleContainerLayout(containerEvent(400) as never);
+        tabs.forEach((_, i) =>
+          hook.result.current.handleTabLayout(
+            i,
+            layoutEvent(i * 120, 100) as never,
+          ),
+        );
+      });
+      expect(onAnimateToTab).toHaveBeenCalledWith({ x: 120, width: 100 }, true);
+    });
+  });
+});
diff --git a/app/component-library/components-temp/Tabs/hooks/useTabsBarLayout.ts b/app/component-library/components-temp/Tabs/hooks/useTabsBarLayout.ts
new file mode 100644
index 00000000000..45f4950f6b8
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/hooks/useTabsBarLayout.ts
@@ -0,0 +1,254 @@
+// Third party dependencies.
+import {
+  useRef,
+  useState,
+  useEffect,
+  useCallback,
+  useMemo,
+  RefObject,
+} from 'react';
+import { Animated, ScrollView, LayoutChangeEvent } from 'react-native';
+
+export interface TabLayoutRect {
+  x: number;
+  width: number;
+}
+
+/**
+ * Callback invoked when the underline needs to move.
+ * - `isFirstTime` true: snap values immediately (call setValue), return null.
+ * - `isFirstTime` false: create and return an animation; the hook will start it.
+ */
+export type OnAnimateToTab = (
+  layout: TabLayoutRect,
+  isFirstTime: boolean,
+) => Animated.CompositeAnimation | null;
+
+interface UseTabsBarLayoutOptions {
+  tabs: { key: string }[];
+  activeIndex: number;
+  fillWidth?: boolean;
+  /** When true, scroll snaps animated after first init (TabsBar). When false, always instant (TabsIconBar). */
+  scrollAnimated?: boolean;
+  scrollViewRef: RefObject<ScrollView>;
+  onAnimateToTab: OnAnimateToTab;
+}
+
+interface UseTabsBarLayoutResult {
+  isInitialized: boolean;
+  scrollEnabled: boolean;
+  handleContainerLayout: (event: LayoutChangeEvent) => void;
+  handleTabLayout: (index: number, event: LayoutChangeEvent) => void;
+}
+
+export function useTabsBarLayout({
+  tabs,
+  activeIndex,
+  fillWidth = false,
+  scrollAnimated = true,
+  scrollViewRef,
+  onAnimateToTab,
+}: UseTabsBarLayoutOptions): UseTabsBarLayoutResult {
+  const tabLayouts = useRef<TabLayoutRect[]>([]);
+  const currentAnimation = useRef<Animated.CompositeAnimation | null>(null);
+  const rafCallbackId = useRef<number | null>(null);
+  const [isInitialized, setIsInitialized] = useState(false);
+  const [layoutsReady, setLayoutsReady] = useState(false);
+  const activeIndexRef = useRef(activeIndex);
+  const onAnimateToTabRef = useRef(onAnimateToTab);
+
+  const [scrollEnabled, setScrollEnabled] = useState(false);
+  const [containerWidth, setContainerWidth] = useState(0);
+
+  useEffect(() => {
+    activeIndexRef.current = activeIndex;
+  }, [activeIndex]);
+
+  // Always keep the callback ref current without triggering re-renders
+  useEffect(() => {
+    onAnimateToTabRef.current = onAnimateToTab;
+  });
+
+  const tabKeys = useMemo(() => tabs.map((tab) => tab.key).join(','), [tabs]);
+  const prevTabKeys = useRef('');
+  const isInitialMount = useRef(true);
+
+  useEffect(() => {
+    if (isInitialMount.current) {
+      prevTabKeys.current = tabKeys;
+      isInitialMount.current = false;
+      return;
+    }
+
+    const shouldReset =
+      tabLayouts.current.length !== tabs.length ||
+      prevTabKeys.current !== tabKeys;
+
+    if (shouldReset) {
+      prevTabKeys.current = tabKeys;
+      tabLayouts.current = Array.from({ length: tabs.length });
+      setIsInitialized(false);
+      setLayoutsReady(false);
+      setScrollEnabled(false);
+
+      if (currentAnimation.current) {
+        currentAnimation.current.stop();
+        currentAnimation.current = null;
+      }
+
+      setContainerWidth(0);
+    }
+  }, [tabKeys, tabs.length]);
+
+  // Invalidate stored layouts when rendering mode switches (scroll ↔ non-scroll)
+  // so stale x-offsets don't drive the underline before fresh measurements arrive.
+  const prevScrollEnabled = useRef(scrollEnabled);
+  useEffect(() => {
+    if (prevScrollEnabled.current !== scrollEnabled) {
+      prevScrollEnabled.current = scrollEnabled;
+      tabLayouts.current = Array.from({ length: tabs.length });
+      setIsInitialized(false);
+      setLayoutsReady(false);
+      if (currentAnimation.current) {
+        currentAnimation.current.stop();
+        currentAnimation.current = null;
+      }
+    }
+  }, [scrollEnabled, tabs.length]);
+
+  const animateToTab = useCallback(
+    (targetIndex: number) => {
+      if (currentAnimation.current) {
+        currentAnimation.current.stop();
+        currentAnimation.current = null;
+      }
+
+      if (targetIndex < 0 || targetIndex >= tabs.length) return;
+
+      const layout = tabLayouts.current[targetIndex];
+      if (!layout || layout.width <= 0) return;
+
+      const isFirstTime = !isInitialized;
+
+      const animation = onAnimateToTabRef.current(layout, isFirstTime);
+
+      if (isFirstTime) {
+        setIsInitialized(true);
+      } else if (animation) {
+        currentAnimation.current = animation;
+        animation.start((result) => {
+          if (result.finished && currentAnimation.current === animation) {
+            currentAnimation.current = null;
+          }
+        });
+      }
+
+      if (scrollEnabled && scrollViewRef.current) {
+        scrollViewRef.current.scrollTo({
+          x: Math.max(0, layout.x - 50),
+          animated: scrollAnimated && !isFirstTime,
+        });
+      }
+    },
+    [scrollEnabled, scrollAnimated, tabs.length, isInitialized, scrollViewRef],
+  );
+
+  useEffect(() => {
+    if (activeIndex >= 0 && layoutsReady) {
+      animateToTab(activeIndex);
+    }
+  }, [activeIndex, layoutsReady, animateToTab]);
+
+  useEffect(() => {
+    if (fillWidth) return;
+    if (containerWidth > 0 && tabLayouts.current.length === tabs.length) {
+      const allLayoutsDefined = tabLayouts.current.every(
+        (layout) => layout && typeof layout.width === 'number',
+      );
+
+      if (allLayoutsDefined) {
+        const totalTabsWidth = tabLayouts.current.reduce(
+          (sum, l) => sum + l.width,
+          0,
+        );
+        const gapsWidth = (tabs.length - 1) * 24;
+        const shouldScroll = totalTabsWidth + gapsWidth > containerWidth - 32;
+        setScrollEnabled(shouldScroll);
+      }
+    }
+  }, [fillWidth, containerWidth, tabs.length]);
+
+  const handleContainerLayout = (event: LayoutChangeEvent) => {
+    setContainerWidth(event.nativeEvent.layout.width);
+  };
+
+  const handleTabLayout = useCallback(
+    (index: number, event: LayoutChangeEvent) => {
+      const { x, width } = event.nativeEvent.layout;
+
+      if (index < 0 || index >= tabs.length || width <= 0) return;
+
+      const previous = tabLayouts.current[index];
+      const hasSignificantChange =
+        !previous ||
+        Math.abs(previous.width - width) > 1 ||
+        Math.abs(previous.x - x) > 1;
+
+      tabLayouts.current[index] = { x, width };
+
+      const allLayoutsReady = tabLayouts.current.every(
+        (layout, i) => i >= tabs.length || (layout && layout.width > 0),
+      );
+
+      if (allLayoutsReady) {
+        if (!layoutsReady || hasSignificantChange) {
+          if (!layoutsReady) {
+            setLayoutsReady(true);
+          }
+
+          if (layoutsReady && hasSignificantChange) {
+            if (rafCallbackId.current !== null) {
+              cancelAnimationFrame(rafCallbackId.current);
+            }
+            rafCallbackId.current = requestAnimationFrame(() => {
+              rafCallbackId.current = null;
+              animateToTab(activeIndexRef.current);
+            });
+          }
+
+          if (!fillWidth && containerWidth > 0) {
+            const totalWidth = tabLayouts.current.reduce(
+              (sum, l) => sum + (l?.width || 0),
+              0,
+            );
+            const gapsWidth = (tabs.length - 1) * 24;
+            const shouldScroll = totalWidth + gapsWidth > containerWidth - 32;
+            setScrollEnabled(shouldScroll);
+          }
+        }
+      }
+    },
+    [fillWidth, tabs.length, layoutsReady, containerWidth, animateToTab],
+  );
+
+  useEffect(
+    () => () => {
+      if (currentAnimation.current) {
+        currentAnimation.current.stop();
+        currentAnimation.current = null;
+      }
+      if (rafCallbackId.current !== null) {
+        cancelAnimationFrame(rafCallbackId.current);
+        rafCallbackId.current = null;
+      }
+    },
+    [],
+  );
+
+  return {
+    isInitialized,
+    scrollEnabled,
+    handleContainerLayout,
+    handleTabLayout,
+  };
+}
diff --git a/app/component-library/components-temp/Tabs/hooks/useTabsList.test.ts b/app/component-library/components-temp/Tabs/hooks/useTabsList.test.ts
new file mode 100644
index 00000000000..43bb288a4e6
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/hooks/useTabsList.test.ts
@@ -0,0 +1,270 @@
+// Third party dependencies.
+import { renderHook, act } from '@testing-library/react-hooks';
+import { InteractionManager } from 'react-native';
+
+// Internal dependencies.
+import { useTabsList, BaseTabItem } from './useTabsList';
+
+jest.mock('react-native/Libraries/Interaction/InteractionManager', () => {
+  const interactionManager = {
+    runAfterInteractions: jest.fn((callback) => {
+      callback();
+      return { cancel: jest.fn() };
+    }),
+  };
+  return {
+    __esModule: true,
+    default: interactionManager,
+    ...interactionManager,
+  };
+});
+
+jest.mock('react-native-gesture-handler', () => ({
+  Gesture: {
+    Pan: jest.fn(() => ({
+      activeOffsetX: jest.fn().mockReturnThis(),
+      failOffsetY: jest.fn().mockReturnThis(),
+      maxPointers: jest.fn().mockReturnThis(),
+      onEnd: jest.fn().mockReturnThis(),
+    })),
+  },
+}));
+
+jest.mock('react-native-reanimated', () => ({
+  runOnJS: jest.fn((fn) => fn),
+}));
+
+const makeTabs = (
+  count: number,
+  overrides: Partial<BaseTabItem>[] = [],
+): BaseTabItem[] =>
+  Array.from({ length: count }, (_, i) => ({
+    key: `tab-${i}`,
+    content: null,
+    isDisabled: false,
+    ...overrides[i],
+  }));
+
+describe('useTabsList', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (InteractionManager.runAfterInteractions as jest.Mock).mockImplementation(
+      (callback) => {
+        callback();
+        return { cancel: jest.fn() };
+      },
+    );
+  });
+
+  describe('initialActiveIndex', () => {
+    it('defaults to index 0 when initialActiveIndex is 0', () => {
+      const tabs = makeTabs(3);
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      expect(result.current.activeIndex).toBe(0);
+    });
+
+    it('respects a non-zero initialActiveIndex', () => {
+      const tabs = makeTabs(3);
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 2, onChangeTab: undefined }),
+      );
+      expect(result.current.activeIndex).toBe(2);
+    });
+
+    it('falls back to first enabled tab when initialActiveIndex is disabled', () => {
+      const tabs = makeTabs(3, [{ isDisabled: true }]);
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      expect(result.current.activeIndex).toBe(1);
+    });
+
+    it('returns -1 when all tabs are disabled', () => {
+      const tabs = makeTabs(2, [{ isDisabled: true }, { isDisabled: true }]);
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      expect(result.current.activeIndex).toBe(-1);
+    });
+  });
+
+  describe('handleTabPress', () => {
+    it('changes activeIndex when a valid tab is pressed', () => {
+      const tabs = makeTabs(3);
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      act(() => {
+        result.current.handleTabPress(2);
+      });
+      expect(result.current.activeIndex).toBe(2);
+    });
+
+    it('calls onChangeTab with index and content ref when tab changes', () => {
+      const tabs = makeTabs(3);
+      const onChangeTab = jest.fn();
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab }),
+      );
+      act(() => {
+        result.current.handleTabPress(1);
+      });
+      expect(onChangeTab).toHaveBeenCalledWith({ i: 1, ref: null });
+    });
+
+    it('does not call onChangeTab when pressing the already-active tab', () => {
+      const tabs = makeTabs(3);
+      const onChangeTab = jest.fn();
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab }),
+      );
+      act(() => {
+        result.current.handleTabPress(0);
+      });
+      expect(onChangeTab).not.toHaveBeenCalled();
+    });
+
+    it('ignores press on a disabled tab', () => {
+      const tabs = makeTabs(3, [{}, { isDisabled: true }]);
+      const onChangeTab = jest.fn();
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab }),
+      );
+      act(() => {
+        result.current.handleTabPress(1);
+      });
+      expect(result.current.activeIndex).toBe(0);
+      expect(onChangeTab).not.toHaveBeenCalled();
+    });
+
+    it('ignores out-of-range index', () => {
+      const tabs = makeTabs(2);
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      act(() => {
+        result.current.handleTabPress(99);
+      });
+      expect(result.current.activeIndex).toBe(0);
+    });
+  });
+
+  describe('loadedTabs', () => {
+    it('marks the initial tab as loaded via InteractionManager', () => {
+      const tabs = makeTabs(2);
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      expect(result.current.loadedTabs.has(0)).toBe(true);
+    });
+
+    it('marks a newly selected tab as loaded', () => {
+      const tabs = makeTabs(3);
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      act(() => {
+        result.current.handleTabPress(2);
+      });
+      expect(result.current.loadedTabs.has(2)).toBe(true);
+    });
+
+    it('does not re-schedule InteractionManager for an already-loaded tab', () => {
+      const mockRunAfter = InteractionManager.runAfterInteractions as jest.Mock;
+      const tabs = makeTabs(2);
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      // Tab 0 already loaded during mount
+      const callsAfterMount = mockRunAfter.mock.calls.length;
+      act(() => {
+        result.current.handleTabPress(1);
+      });
+      act(() => {
+        result.current.handleTabPress(0);
+      });
+      // Switching back to tab 0 should NOT trigger another runAfterInteractions
+      expect(mockRunAfter.mock.calls.length).toBe(callsAfterMount + 1);
+    });
+
+    it('uses fallback timeout when InteractionManager does not fire', async () => {
+      jest.useFakeTimers();
+      (InteractionManager.runAfterInteractions as jest.Mock).mockImplementation(
+        () => ({ cancel: jest.fn() }),
+      );
+      try {
+        const tabs = makeTabs(2);
+        const { result } = renderHook(() =>
+          useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+        );
+        expect(result.current.loadedTabs.has(0)).toBe(false);
+        act(() => {
+          jest.advanceTimersByTime(250);
+        });
+        expect(result.current.loadedTabs.has(0)).toBe(true);
+      } finally {
+        jest.useRealTimers();
+      }
+    });
+
+    it('cancels pending InteractionManager handle when switching tabs', () => {
+      const mockCancel = jest.fn();
+      (InteractionManager.runAfterInteractions as jest.Mock).mockImplementation(
+        () => ({ cancel: mockCancel }),
+      );
+      const tabs = makeTabs(3);
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      act(() => {
+        result.current.handleTabPress(2);
+      });
+      expect(mockCancel).toHaveBeenCalled();
+    });
+  });
+
+  describe('key preservation on tabs change', () => {
+    it('preserves active tab by key when tabs array grows', () => {
+      const initialTabs = makeTabs(2);
+      let tabs = initialTabs;
+      const { result, rerender } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      act(() => {
+        result.current.handleTabPress(1);
+      });
+      expect(result.current.activeIndex).toBe(1);
+
+      tabs = [...initialTabs, { key: 'tab-2', content: null }];
+      rerender();
+      expect(result.current.activeIndex).toBe(1);
+    });
+
+    it('falls back to initialActiveIndex when active tab key is removed', () => {
+      const initialTabs = makeTabs(2);
+      let tabs = initialTabs;
+      const { result, rerender } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      act(() => {
+        result.current.handleTabPress(1);
+      });
+      // Remove the second tab
+      tabs = [initialTabs[0]];
+      rerender();
+      expect(result.current.activeIndex).toBe(0);
+    });
+  });
+
+  describe('swipeGesture', () => {
+    it('returns a gesture object', () => {
+      const tabs = makeTabs(3);
+      const { result } = renderHook(() =>
+        useTabsList({ tabs, initialActiveIndex: 0, onChangeTab: undefined }),
+      );
+      expect(result.current.swipeGesture).toBeDefined();
+    });
+  });
+});
diff --git a/app/component-library/components-temp/Tabs/hooks/useTabsList.ts b/app/component-library/components-temp/Tabs/hooks/useTabsList.ts
new file mode 100644
index 00000000000..5fc3c9e71f9
--- /dev/null
+++ b/app/component-library/components-temp/Tabs/hooks/useTabsList.ts
@@ -0,0 +1,192 @@
+// Third party dependencies.
+import React, {
+  useState,
+  useEffect,
+  useCallback,
+  useMemo,
+  useRef,
+} from 'react';
+import { InteractionManager } from 'react-native';
+import { Gesture } from 'react-native-gesture-handler';
+import { runOnJS } from 'react-native-reanimated';
+
+const TAB_LOAD_FALLBACK_TIMEOUT_MS = 250;
+
+export interface BaseTabItem {
+  key: string;
+  isDisabled?: boolean;
+  content: React.ReactNode;
+}
+
+interface UseTabsListOptions<T extends BaseTabItem> {
+  tabs: T[];
+  initialActiveIndex: number;
+  onChangeTab?: (props: { i: number; ref: React.ReactNode }) => void;
+}
+
+interface UseTabsListResult {
+  activeIndex: number;
+  loadedTabs: Set<number>;
+  handleTabPress: (index: number) => void;
+  swipeGesture: ReturnType<typeof Gesture.Pan>;
+}
+
+export function useTabsList<T extends BaseTabItem>({
+  tabs,
+  initialActiveIndex,
+  onChangeTab,
+}: UseTabsListOptions<T>): UseTabsListResult {
+  const normalizeTabIndex = useCallback(
+    (tabIndex: number) => {
+      if (
+        tabIndex >= 0 &&
+        tabIndex < tabs.length &&
+        !tabs[tabIndex]?.isDisabled
+      ) {
+        return tabIndex;
+      }
+      const firstEnabled = tabs.findIndex((tab) => !tab.isDisabled);
+      return firstEnabled >= 0 ? firstEnabled : -1;
+    },
+    [tabs],
+  );
+
+  const [activeIndex, setActiveIndex] = useState(() =>
+    normalizeTabIndex(initialActiveIndex),
+  );
+  const [loadedTabs, setLoadedTabs] = useState<Set<number>>(new Set());
+  const interactionHandleRef = useRef<{ cancel?: () => void } | null>(null);
+  const fallbackTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  const cancelPendingLoad = useCallback(() => {
+    if (interactionHandleRef.current) {
+      interactionHandleRef.current.cancel?.();
+      interactionHandleRef.current = null;
+    }
+    if (fallbackTimeoutRef.current) {
+      clearTimeout(fallbackTimeoutRef.current);
+      fallbackTimeoutRef.current = null;
+    }
+  }, []);
+
+  useEffect(() => {
+    if (activeIndex >= 0 && activeIndex < tabs.length) {
+      cancelPendingLoad();
+
+      if (loadedTabs.has(activeIndex)) {
+        return;
+      }
+
+      const markLoaded = () => {
+        setLoadedTabs((prev) => {
+          if (prev.has(activeIndex)) return prev;
+          const next = new Set(prev);
+          next.add(activeIndex);
+          return next;
+        });
+      };
+
+      interactionHandleRef.current =
+        InteractionManager.runAfterInteractions(markLoaded);
+      fallbackTimeoutRef.current = setTimeout(
+        markLoaded,
+        TAB_LOAD_FALLBACK_TIMEOUT_MS,
+      );
+    }
+
+    return () => {
+      cancelPendingLoad();
+    };
+  }, [activeIndex, tabs.length, loadedTabs, cancelPendingLoad]);
+
+  // Preserve active tab by key when the tabs array changes.
+  // Falls back to initialActiveIndex if the active key disappears.
+  useEffect(() => {
+    const currentActiveTabKey =
+      activeIndex >= 0 && activeIndex < tabs.length
+        ? tabs[activeIndex]?.key
+        : undefined;
+
+    let nextIndex = -1;
+
+    if (currentActiveTabKey && tabs.length > 0) {
+      const newIndexForCurrentTab = tabs.findIndex(
+        (tab) => tab.key === currentActiveTabKey,
+      );
+      if (
+        newIndexForCurrentTab >= 0 &&
+        !tabs[newIndexForCurrentTab].isDisabled
+      ) {
+        nextIndex = newIndexForCurrentTab;
+      }
+    }
+
+    if (nextIndex === -1) {
+      nextIndex = normalizeTabIndex(initialActiveIndex);
+    }
+
+    if (nextIndex !== activeIndex) {
+      setActiveIndex(nextIndex);
+    }
+  }, [activeIndex, initialActiveIndex, normalizeTabIndex, tabs]);
+
+  const handleTabPress = useCallback(
+    (tabIndex: number) => {
+      if (
+        tabIndex < 0 ||
+        tabIndex >= tabs.length ||
+        tabs[tabIndex]?.isDisabled
+      ) {
+        return;
+      }
+
+      const tabChanged = tabIndex !== activeIndex;
+      setActiveIndex(tabIndex);
+
+      if (onChangeTab && tabChanged) {
+        onChangeTab({ i: tabIndex, ref: tabs[tabIndex]?.content || null });
+      }
+    },
+    [activeIndex, tabs, onChangeTab],
+  );
+
+  const goToPreviousTab = useCallback(() => {
+    for (let i = activeIndex - 1; i >= 0; i--) {
+      if (!tabs[i]?.isDisabled) {
+        handleTabPress(i);
+        return;
+      }
+    }
+  }, [activeIndex, tabs, handleTabPress]);
+
+  const goToNextTab = useCallback(() => {
+    for (let i = activeIndex + 1; i < tabs.length; i++) {
+      if (!tabs[i]?.isDisabled) {
+        handleTabPress(i);
+        return;
+      }
+    }
+  }, [activeIndex, tabs, handleTabPress]);
+
+  const swipeGesture = useMemo(
+    () =>
+      Gesture.Pan()
+        .activeOffsetX([-50, 50])
+        .failOffsetY([-15, 15])
+        .maxPointers(1)
+        .onEnd((gestureEvent) => {
+          'worklet';
+          const { translationX, velocityX } = gestureEvent;
+          if (Math.abs(translationX) > 50 || Math.abs(velocityX) > 500) {
+            if (translationX > 0) {
+              runOnJS(goToPreviousTab)();
+            } else if (translationX < 0) {
+              runOnJS(goToNextTab)();
+            }
+          }
+        }),
+    [goToPreviousTab, goToNextTab],
+  );
+
+  return { activeIndex, loadedTabs, handleTabPress, swipeGesture };
+}
diff --git a/app/component-library/components/Avatars/Avatar/variants/AvatarNetwork/AvatarNetwork.constants.ts b/app/component-library/components/Avatars/Avatar/variants/AvatarNetwork/AvatarNetwork.constants.ts
index 271a41f7349..ad2719b501a 100644
--- a/app/component-library/components/Avatars/Avatar/variants/AvatarNetwork/AvatarNetwork.constants.ts
+++ b/app/component-library/components/Avatars/Avatar/variants/AvatarNetwork/AvatarNetwork.constants.ts
@@ -1,12 +1,11 @@
 /* eslint-disable import-x/prefer-default-export */
 
 // Third party dependencies.
-import { ImageSourcePropType, Platform } from 'react-native';
+import { ImageSourcePropType } from 'react-native';
 
 // External dependencies.
 import { AvatarSize } from '../../Avatar.types';
 import { BrowserViewSelectorsIDs } from '../../../../../../components/Views/BrowserTab/BrowserView.testIds';
-import generateTestId from '../../../../../../../wdio/utils/generateTestId';
 
 // Internal dependencies.
 import { AvatarNetworkProps } from './AvatarNetwork.types';
@@ -16,10 +15,7 @@ export const DEFAULT_AVATARNETWORK_SIZE = AvatarSize.Md;
 export const DEFAULT_AVATARNETWORK_ERROR_TEXT = '?';
 
 // Test IDs
-export const AVATARNETWORK_IMAGE_TESTID = generateTestId(
-  Platform,
-  BrowserViewSelectorsIDs.AVATAR_IMAGE,
-).testID;
+export const AVATARNETWORK_IMAGE_TESTID = BrowserViewSelectorsIDs.AVATAR_IMAGE;
 
 // Sample consts
 const SAMPLE_AVATARNETWORK_IMAGESOURCE_REMOTE: ImageSourcePropType = {
diff --git a/app/component-library/components/Badges/BadgeWrapper/BadgeWrapper.test.tsx b/app/component-library/components/Badges/BadgeWrapper/BadgeWrapper.test.tsx
index 2477b22bc19..a75ce002b06 100644
--- a/app/component-library/components/Badges/BadgeWrapper/BadgeWrapper.test.tsx
+++ b/app/component-library/components/Badges/BadgeWrapper/BadgeWrapper.test.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { render, screen } from '@testing-library/react-native';
 
 // Internal dependencies.
+import { BADGENETWORK_TEST_ID } from '../Badge/variants/BadgeNetwork/BadgeNetwork.constants';
 import BadgeWrapper from './BadgeWrapper';
 import {
   SAMPLE_BADGEWRAPPER_PROPS,
@@ -10,9 +11,12 @@ import {
 } from './BadgeWrapper.constants';
 
 describe('BadgeWrapper', () => {
-  it('should render BadgeWrapper correctly', () => {
-    const { toJSON } = render(<BadgeWrapper {...SAMPLE_BADGEWRAPPER_PROPS} />);
-    expect(toJSON()).toMatchSnapshot();
-    expect(screen.getByTestId(BADGE_WRAPPER_BADGE_TEST_ID)).toBeDefined();
+  it('renders anchor content, network badge, and wrapper test id', () => {
+    render(<BadgeWrapper {...SAMPLE_BADGEWRAPPER_PROPS} />);
+
+    expect(screen.getByTestId(BADGE_WRAPPER_BADGE_TEST_ID)).toBeOnTheScreen();
+    expect(screen.getByText('C')).toBeOnTheScreen();
+    expect(screen.getByTestId(BADGENETWORK_TEST_ID)).toBeOnTheScreen();
+    expect(screen.getByTestId('network-avatar-image')).toBeOnTheScreen();
   });
 });
diff --git a/app/component-library/components/Badges/BadgeWrapper/__snapshots__/BadgeWrapper.test.tsx.snap b/app/component-library/components/Badges/BadgeWrapper/__snapshots__/BadgeWrapper.test.tsx.snap
deleted file mode 100644
index d17f51349a5..00000000000
--- a/app/component-library/components/Badges/BadgeWrapper/__snapshots__/BadgeWrapper.test.tsx.snap
+++ /dev/null
@@ -1,122 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BadgeWrapper should render BadgeWrapper correctly 1`] = `
-<View
-  onLayout={[Function]}
-  style={
-    {
-      "alignSelf": "flex-start",
-      "position": "relative",
-    }
-  }
-  testID="badge-wrapper-badge"
->
-  <View>
-    <View
-      style={
-        {
-          "alignItems": "center",
-          "backgroundColor": "#ffffff",
-          "borderRadius": 12,
-          "height": 24,
-          "justifyContent": "center",
-          "width": 24,
-        }
-      }
-    >
-      <Text
-        accessibilityRole="text"
-        style={
-          {
-            "color": "#131416",
-            "fontFamily": "Geist-Regular",
-            "fontSize": 14,
-            "letterSpacing": 0,
-            "lineHeight": 22,
-          }
-        }
-      >
-        C
-      </Text>
-    </View>
-  </View>
-  <View
-    style={
-      {
-        "alignItems": "center",
-        "aspectRatio": 1,
-        "height": 0,
-        "justifyContent": "center",
-        "position": "absolute",
-        "right": 0,
-        "top": 0,
-        "transform": [
-          {
-            "translateX": 0,
-          },
-          {
-            "translateY": -0,
-          },
-        ],
-      }
-    }
-  >
-    <View
-      onLayout={[Function]}
-      style={
-        {
-          "alignItems": "center",
-          "aspectRatio": 1,
-          "height": "50%",
-          "justifyContent": "center",
-          "maxHeight": 24,
-          "minHeight": 8,
-          "opacity": 0,
-        }
-      }
-      testID="badgenetwork"
-    >
-      <View
-        style={
-          {
-            "alignItems": "center",
-            "backgroundColor": "#ffffff",
-            "borderColor": "#ffffff",
-            "borderRadius": 8,
-            "borderWidth": 2,
-            "height": 32,
-            "justifyContent": "center",
-            "overflow": "hidden",
-            "shadowColor": "#0000001a",
-            "shadowOffset": {
-              "height": 2,
-              "width": 0,
-            },
-            "shadowOpacity": 1,
-            "shadowRadius": 4,
-            "transform": [
-              {
-                "scale": 1,
-              },
-            ],
-            "width": 32,
-          }
-        }
-      >
-        <Image
-          onError={[Function]}
-          resizeMode="contain"
-          source={1}
-          style={
-            {
-              "height": 32,
-              "width": 32,
-            }
-          }
-          testID="network-avatar-image"
-        />
-      </View>
-    </View>
-  </View>
-</View>
-`;
diff --git a/app/component-library/components/Icons/Icon/Icon.assets.ts b/app/component-library/components/Icons/Icon/Icon.assets.ts
index a98c8a0efec..97625ce0070 100644
--- a/app/component-library/components/Icons/Icon/Icon.assets.ts
+++ b/app/component-library/components/Icons/Icon/Icon.assets.ts
@@ -123,6 +123,7 @@ import giftSVG from './assets/gift.svg';
 import globalsearchSVG from './assets/global-search.svg';
 import globalSVG from './assets/global.svg';
 import graphSVG from './assets/graph.svg';
+import groupSVG from './assets/group.svg';
 import hardwareSVG from './assets/hardware.svg';
 import hashtagSVG from './assets/hash-tag.svg';
 import heartfilledSVG from './assets/heart-filled.svg';
@@ -166,6 +167,8 @@ import monitorSVG from './assets/monitor.svg';
 import morehorizontalSVG from './assets/more-horizontal.svg';
 import moreverticalSVG from './assets/more-vertical.svg';
 import mountainflagSVG from './assets/mountain-flag.svg';
+import musdfilledSVG from './assets/musd-filled.svg';
+import musdSVG from './assets/musd.svg';
 import musicnoteSVG from './assets/music-note.svg';
 import nophotographySVG from './assets/no-photography.svg';
 import notificationSVG from './assets/notification.svg';
@@ -175,11 +178,13 @@ import passwordcheckSVG from './assets/password-check.svg';
 import pendingSVG from './assets/pending.svg';
 import peopleSVG from './assets/people.svg';
 import personcancelSVG from './assets/person-cancel.svg';
+import piechartSVG from './assets/pie-chart.svg';
 import pinSVG from './assets/pin.svg';
 import plantSVG from './assets/plant.svg';
 import plugSVG from './assets/plug.svg';
 import plusandminusSVG from './assets/plus-and-minus.svg';
 import policyalertSVG from './assets/policy-alert.svg';
+import predictionsSVG from './assets/predictions.svg';
 import printSVG from './assets/print.svg';
 import priorityhighSVG from './assets/priority-high.svg';
 import privacytipSVG from './assets/privacy-tip.svg';
@@ -407,6 +412,7 @@ export const assetByIconName: AssetByIconName = {
   [IconName.GlobalSearch]: globalsearchSVG,
   [IconName.Global]: globalSVG,
   [IconName.Graph]: graphSVG,
+  [IconName.Group]: groupSVG,
   [IconName.Hardware]: hardwareSVG,
   [IconName.HashTag]: hashtagSVG,
   [IconName.HeartFilled]: heartfilledSVG,
@@ -450,6 +456,8 @@ export const assetByIconName: AssetByIconName = {
   [IconName.MoreHorizontal]: morehorizontalSVG,
   [IconName.MoreVertical]: moreverticalSVG,
   [IconName.MountainFlag]: mountainflagSVG,
+  [IconName.MusdFilled]: musdfilledSVG,
+  [IconName.Musd]: musdSVG,
   [IconName.MusicNote]: musicnoteSVG,
   [IconName.NoPhotography]: nophotographySVG,
   [IconName.Notification]: notificationSVG,
@@ -459,11 +467,13 @@ export const assetByIconName: AssetByIconName = {
   [IconName.Pending]: pendingSVG,
   [IconName.People]: peopleSVG,
   [IconName.PersonCancel]: personcancelSVG,
+  [IconName.PieChart]: piechartSVG,
   [IconName.Pin]: pinSVG,
   [IconName.Plant]: plantSVG,
   [IconName.Plug]: plugSVG,
   [IconName.PlusAndMinus]: plusandminusSVG,
   [IconName.PolicyAlert]: policyalertSVG,
+  [IconName.Predictions]: predictionsSVG,
   [IconName.Print]: printSVG,
   [IconName.PriorityHigh]: priorityhighSVG,
   [IconName.PrivacyTip]: privacytipSVG,
diff --git a/app/component-library/components/Icons/Icon/Icon.types.ts b/app/component-library/components/Icons/Icon/Icon.types.ts
index aa0daaf3fa9..649011ddab5 100644
--- a/app/component-library/components/Icons/Icon/Icon.types.ts
+++ b/app/component-library/components/Icons/Icon/Icon.types.ts
@@ -193,6 +193,7 @@ export enum IconName {
   GlobalSearch = 'GlobalSearch',
   Global = 'Global',
   Graph = 'Graph',
+  Group = 'Group',
   Hardware = 'Hardware',
   HashTag = 'HashTag',
   HeartFilled = 'HeartFilled',
@@ -236,6 +237,8 @@ export enum IconName {
   MoreHorizontal = 'MoreHorizontal',
   MoreVertical = 'MoreVertical',
   MountainFlag = 'MountainFlag',
+  MusdFilled = 'MusdFilled',
+  Musd = 'Musd',
   MusicNote = 'MusicNote',
   NoPhotography = 'NoPhotography',
   Notification = 'Notification',
@@ -245,11 +248,13 @@ export enum IconName {
   Pending = 'Pending',
   People = 'People',
   PersonCancel = 'PersonCancel',
+  PieChart = 'PieChart',
   Pin = 'Pin',
   Plant = 'Plant',
   Plug = 'Plug',
   PlusAndMinus = 'PlusAndMinus',
   PolicyAlert = 'PolicyAlert',
+  Predictions = 'Predictions',
   Print = 'Print',
   PriorityHigh = 'PriorityHigh',
   PrivacyTip = 'PrivacyTip',
diff --git a/app/component-library/components/Icons/Icon/assets/candlestick.svg b/app/component-library/components/Icons/Icon/assets/candlestick.svg
index 2f304740783..d010d907cd9 100644
--- a/app/component-library/components/Icons/Icon/assets/candlestick.svg
+++ b/app/component-library/components/Icons/Icon/assets/candlestick.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g><path d="m9.49932 5.33142h-1.66714v1.66714h-1.66714v10.00284h1.66714v1.6672h1.66714v-1.6672h1.66718v-10.00284h-1.66718zm0 10.00288h-1.66714v-6.66859h1.66714z"/><path d="m17.835 8.66571h-1.6671v-3.33429h-1.6671v3.33429h-1.6672v5.83499h1.6672v4.1679h1.6671v-4.1679h1.6671zm-1.6671 4.16789h-1.6671v-2.5008h1.6671z"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(0.025 0 0 0.025 0 24)"><path d="M280-160v-80h-80v-480h80v-80h80v80h80v480h-80v80h-80Zm0-160h80v-320h-80v320Zm320 160v-200h-80v-280h80v-160h80v160h80v280h-80v200h-80Zm0-280h80v-120h-80v120Zm-280-40Zm320-20Z"/></g></svg>
diff --git a/app/component-library/components/Icons/Icon/assets/group.svg b/app/component-library/components/Icons/Icon/assets/group.svg
new file mode 100644
index 00000000000..bfabd991d36
--- /dev/null
+++ b/app/component-library/components/Icons/Icon/assets/group.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m40-160v-112q0-34 17.5-62.5t46.5-43.5q62-31 126-46.5t130-15.5q66 0 130 15.5t126 46.5q29 15 46.5 43.5t17.5 62.5v112zm720 0v-120q0-44-24.5-84.5t-69.5-69.5q51 6 96 20.5t84 35.5q36 20 55 44.5t19 53.5v120zm-513-367q-47-47-47-113t47-113q47-47 113-47t113 47q47 47 47 113t-47 113q-47 47-113 47t-113-47zm466 0q-47 47-113 47-11 0-28-2.5t-28-5.5q27-32 41.5-71t14.5-81q0-42-14.5-81t-41.5-71q14-5 28-6.5t28-1.5q66 0 113 47t47 113q0 66-47 113zm-593 287h480v-32q0-11-5.5-20t-14.5-14q-54-27-109-40.5t-111-13.5q-56 0-111 13.5t-109 40.5q-9 5-14.5 14t-5.5 20zm296.5-343.5q23.5-23.5 23.5-56.5t-23.5-56.5q-23.5-23.5-56.5-23.5t-56.5 23.5q-23.5 23.5-23.5 56.5t23.5 56.5q23.5 23.5 56.5 23.5t56.5-23.5z" transform="matrix(.025 0 0 .025 0 24)"/></svg>
\ No newline at end of file
diff --git a/app/component-library/components/Icons/Icon/assets/musd-filled.svg b/app/component-library/components/Icons/Icon/assets/musd-filled.svg
new file mode 100644
index 00000000000..d960542501c
--- /dev/null
+++ b/app/component-library/components/Icons/Icon/assets/musd-filled.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m12 2c5.5228 0 9.9999 4.47726 10 10 0 5.5228-4.4772 10-10 10-5.52285 0-10-4.4772-10-10 .00013-5.52274 4.47723-10 10-10zm-.9844 3.85742v1.81153h-1.61521l-.29004.28027-1.22656 1.18262v2.55666l.34961.2988.91992.7891.28125.2402h4.36133l.3213.3193v.6621l-.3301.3379h-5.4453v2h2.6738v1.8067h2v-1.8067h1.6133l1.4883-1.5214v-2.3086l-.2949-.294-1.2022-1.1953h-4.4463l-.29001-.249v-.78713l.32421-.31152h5.4815v-2h-2.6739v-1.81153z" fill-rule="evenodd"/></svg>
diff --git a/app/component-library/components/Icons/Icon/assets/musd.svg b/app/component-library/components/Icons/Icon/assets/musd.svg
new file mode 100644
index 00000000000..f65d9cc79cd
--- /dev/null
+++ b/app/component-library/components/Icons/Icon/assets/musd.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m12.7656 7.91699h2.9239v1.5h-5.5821l-.47361.45703v1.00688l.44731.3837h4.4365l.2187.2188.9102.9043.2207.2197v2.1026l-1.3438 1.374h-1.7578v1.4385h-1.5v-1.4385h-2.9238v-1.5h5.5508l.4746-.4863v-.8663l-.4697-.4668h-4.37113l-.20996-.1806-1.18262-1.0127v-2.33497l1.36719-1.31934h1.76462v-1.43945h1.5z M12 2c5.5228 0 10 4.47715 10 10 0 5.5228-4.4772 10-10 10-5.52285 0-10-4.4772-10-10 0-5.52285 4.47715-10 10-10zm0 2c-4.41828 0-8 3.58172-8 8 0 4.4183 3.58172 8 8 8 4.4183 0 8-3.5817 8-8 0-4.41828-3.5817-8-8-8z" fill-rule="evenodd"/></svg>
diff --git a/app/component-library/components/Icons/Icon/assets/pie-chart.svg b/app/component-library/components/Icons/Icon/assets/pie-chart.svg
new file mode 100644
index 00000000000..7d08bde9b40
--- /dev/null
+++ b/app/component-library/components/Icons/Icon/assets/pie-chart.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(0.025 0 0 0.025 0 24)"><path d="M520-520h278q-15-110-91.5-186.5T520-798v278Zm-80 358v-636q-121 15-200.5 105.5T160-480q0 122 79.5 212.5T440-162Zm80 0q110-14 187-91t91-187H520v278Zm-40-318Zm0 400q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 155.5 31.5t127 86q54.5 54.5 86 127T880-480q0 82-31.5 155T763-197.5q-54 54.5-127 86T480-80Z"/></g></svg>
diff --git a/app/component-library/components/Icons/Icon/assets/predictions.svg b/app/component-library/components/Icons/Icon/assets/predictions.svg
new file mode 100644
index 00000000000..b0ae95f26d0
--- /dev/null
+++ b/app/component-library/components/Icons/Icon/assets/predictions.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m12 1.75c5.3744 0 9.7498 4.31261 9.75 9.6553 0 2.944-1.3319 5.5763-3.4229 7.3447l.8516 2.1289.5479 1.3711h-15.45316l.54785-1.3711.85059-2.1289c-2.09058-1.7684-3.42188-4.4009-3.42188-7.3447.00023-5.34269 4.37561-9.6553 9.75-9.6553zm-4.77246 18.5h9.54496l-.1993-.5h-9.14644zm4.77246-16.5c-4.2903 0-7.74977 3.43755-7.75 7.6553 0 2.5903 1.30183 4.8843 3.30469 6.2724l.10449.0723h8.68162l.1045-.0723c2.0029-1.3881 3.3047-3.682 3.3047-6.2724-.0002-4.21775-3.4597-7.6553-7.75-7.6553zm3.5 5.25s.2355 1.173.7812 1.7188c.5458.5456 1.7187.7812 1.7188.7812-.0001 0-1.173.2356-1.7188.7812-.5456.5458-.7812 1.7187-.7812 1.7188 0-.0001-.2356-1.173-.7812-1.7188-.5458-.5457-1.7188-.7812-1.7188-.7812s1.173-.2356 1.7188-.7812c.5456-.5458.7812-1.71877.7812-1.7188zm-2.5-3s.1884.93838.625 1.375c.4365.43655 1.3747.62494 1.375.625-.0003.00005-.9385.18844-1.375.625s-.6249 1.37474-.625 1.375c-.0001-.00029-.1885-.93845-.625-1.375-.4366-.43662-1.375-.625-1.375-.625.0001-.00002.9384-.1884 1.375-.625s.625-1.37491.625-1.375z"/></svg>
\ No newline at end of file
diff --git a/app/component-library/components/Navigation/TabBar/TabBar.constants.ts b/app/component-library/components/Navigation/TabBar/TabBar.constants.ts
index 596f860e929..6faa1e92b11 100644
--- a/app/component-library/components/Navigation/TabBar/TabBar.constants.ts
+++ b/app/component-library/components/Navigation/TabBar/TabBar.constants.ts
@@ -14,6 +14,7 @@ export const ICON_BY_TAB_BAR_ICON_KEY: IconByTabBarIconKey = {
   [TabBarIconKey.Setting]: IconName.Setting,
   [TabBarIconKey.Rewards]: IconName.MetamaskFoxOutline,
   [TabBarIconKey.Trending]: IconName.Search,
+  [TabBarIconKey.Money]: IconName.Musd,
 };
 
 export const LABEL_BY_TAB_BAR_ICON_KEY = {
@@ -25,6 +26,7 @@ export const LABEL_BY_TAB_BAR_ICON_KEY = {
   [TabBarIconKey.Activity]: 'bottom_nav.activity',
   [TabBarIconKey.Setting]: 'bottom_nav.settings',
   [TabBarIconKey.Rewards]: 'bottom_nav.rewards',
+  [TabBarIconKey.Money]: 'bottom_nav.money',
 } as const;
 
 export const TAB_BAR_HEIGHT = 54; // 22px text line height + 20px icon height + 12px padding top
diff --git a/app/component-library/components/Navigation/TabBar/TabBar.tsx b/app/component-library/components/Navigation/TabBar/TabBar.tsx
index 5e3daf843d3..10ccc18c8c2 100644
--- a/app/component-library/components/Navigation/TabBar/TabBar.tsx
+++ b/app/component-library/components/Navigation/TabBar/TabBar.tsx
@@ -34,6 +34,7 @@ const FILLED_ICONS: Partial<Record<TabBarIconKey, IconName>> = {
   [TabBarIconKey.Activity]: IconName.ClockFilled,
   [TabBarIconKey.Trending]: IconName.Search,
   [TabBarIconKey.Rewards]: IconName.MetamaskFoxFilled,
+  [TabBarIconKey.Money]: IconName.MusdFilled,
 };
 
 const TabBar = ({ state, descriptors, navigation }: TabBarProps) => {
@@ -110,6 +111,11 @@ const TabBar = ({ state, descriptors, navigation }: TabBarProps) => {
           case Routes.TRENDING_VIEW:
             navigation.navigate(Routes.TRENDING_VIEW);
             break;
+          case Routes.MONEY.HOME:
+            navigation.navigate(Routes.MONEY.ROOT, {
+              screen: Routes.MONEY.HOME,
+            });
+            break;
         }
       };
 
diff --git a/app/component-library/components/Navigation/TabBar/TabBar.types.ts b/app/component-library/components/Navigation/TabBar/TabBar.types.ts
index 3c986b1a587..d9b441b78a2 100644
--- a/app/component-library/components/Navigation/TabBar/TabBar.types.ts
+++ b/app/component-library/components/Navigation/TabBar/TabBar.types.ts
@@ -18,6 +18,7 @@ export enum TabBarIconKey {
   Setting = 'Setting',
   Rewards = 'Rewards',
   Trending = 'Trending',
+  Money = 'Money',
 }
 
 /**
diff --git a/app/component-library/components/Toast/Toast.styles.ts b/app/component-library/components/Toast/Toast.styles.ts
index ca5172d145e..0ad737cb36a 100644
--- a/app/component-library/components/Toast/Toast.styles.ts
+++ b/app/component-library/components/Toast/Toast.styles.ts
@@ -26,14 +26,15 @@ const styleSheet = (params: { theme: Theme }) => {
       borderRadius: 12,
       padding,
       flexDirection: 'row',
-      alignItems: 'center',
+      alignItems: 'flex-start',
     },
     avatar: {
+      marginTop: -4,
       marginRight: 16,
     },
     labelsContainer: {
       flex: 1,
-      justifyContent: 'center',
+      justifyContent: 'flex-start',
     },
     label: {
       color: colors.text.default,
diff --git a/app/component-library/components/Toast/Toast.test.tsx b/app/component-library/components/Toast/Toast.test.tsx
index 40a45907683..dbbb64292d5 100644
--- a/app/component-library/components/Toast/Toast.test.tsx
+++ b/app/component-library/components/Toast/Toast.test.tsx
@@ -1,10 +1,12 @@
 // Third party dependencies.
 import React, { createRef } from 'react';
+import { StyleSheet } from 'react-native';
 import { render, screen, act } from '@testing-library/react-native';
 
 // Internal dependencies.
 import Toast from './Toast';
 import { ToastRef, ToastVariants, ToastOptions } from './Toast.types';
+import { ToastSelectorsIDs } from './ToastModal.testIds';
 
 // react-native-reanimated is already mocked globally via setUpTests() in testSetup.js
 
@@ -163,4 +165,24 @@ describe('Toast', () => {
     expect(screen.queryByText('In Progress')).toBeNull();
     expect(screen.getByText('Success')).toBeOnTheScreen();
   });
+
+  it('uses flex-start justifyContent on labels container by default', async () => {
+    const toastOptions: ToastOptions = {
+      variant: ToastVariants.Plain,
+      labelOptions: [{ label: 'Aligned label' }],
+      hasNoTimeout: true,
+    };
+
+    render(<Toast ref={toastRef} />);
+
+    await act(async () => {
+      toastRef.current?.showToast(toastOptions);
+      jest.runAllTimers();
+    });
+
+    const labelsContainer = screen.getByTestId(ToastSelectorsIDs.CONTAINER);
+    const flat = StyleSheet.flatten(labelsContainer.props.style);
+
+    expect(flat.justifyContent).toBe('flex-start');
+  });
 });
diff --git a/app/components/Nav/App/App.tsx b/app/components/Nav/App/App.tsx
index 078cd8edac7..a3010a6719b 100644
--- a/app/components/Nav/App/App.tsx
+++ b/app/components/Nav/App/App.tsx
@@ -318,7 +318,7 @@ const OnboardingNav = () => {
  * child OnboardingNav navigator to push modals on top of it
  */
 const SimpleWebviewScreen = () => (
-  <Stack.Navigator>
+  <Stack.Navigator screenOptions={{ headerShown: false }}>
     <Stack.Screen name={Routes.WEBVIEW.SIMPLE} component={SimpleWebview} />
   </Stack.Navigator>
 );
diff --git a/app/components/Nav/Main/MainNavigator.js b/app/components/Nav/Main/MainNavigator.js
index 6c379de4859..56de0cabe91 100644
--- a/app/components/Nav/Main/MainNavigator.js
+++ b/app/components/Nav/Main/MainNavigator.js
@@ -51,6 +51,7 @@ import ContactForm from '../../Views/Settings/Contacts/ContactForm';
 import ActivityView from '../../Views/ActivityView';
 import RewardsNavigator from '../../UI/Rewards/RewardsNavigator';
 import { ExploreFeed } from '../../Views/TrendingView/TrendingView';
+import WhatsHappeningDetailView from '../../Views/WhatsHappeningDetailView';
 import ExploreSearchScreen from '../../Views/TrendingView/Views/ExploreSearchScreen/ExploreSearchScreen';
 import ExploreSectionResultsFullView from '../../Views/TrendingView/Views/ExploreSectionResultsFullView/ExploreSectionResultsFullView';
 import TrendingFeedSessionManager from '../../UI/Trending/services/TrendingFeedSessionManager';
@@ -101,7 +102,7 @@ import { AccountPermissionsScreens } from '../../../components/Views/AccountPerm
 import { StakeModalStack, StakeScreenStack } from '../../UI/Stake/routes';
 import { AssetLoader } from '../../Views/AssetLoader';
 import { EarnScreenStack, EarnModalStack } from '../../UI/Earn/routes';
-import { MoneyScreenStack, MoneyModalStack } from '../../UI/Money/routes';
+import { MoneyAccountStackGate, MoneyModalStack } from '../../UI/Money/routes';
 import { selectMoneyHomeScreenEnabledFlag } from '../../UI/Money/selectors/featureFlags';
 import { BridgeTransactionDetails } from '../../UI/Bridge/components/TransactionDetails/TransactionDetails';
 import { BridgeModalStack, BridgeScreenStack } from '../../UI/Bridge/routes';
@@ -642,6 +643,10 @@ const HomeTabs = () => {
   const { trackEvent, createEventBuilder } = useAnalytics();
   const [isKeyboardHidden, setIsKeyboardHidden] = useState(true);
 
+  const isMoneyHomeScreenEnabled = useSelector(
+    selectMoneyHomeScreenEnabledFlag,
+  );
+
   const accountsLength = useSelector(selectAccountsLength);
 
   const chainId = useSelector((state) => {
@@ -701,6 +706,10 @@ const HomeTabs = () => {
       rootScreenName: Routes.TRANSACTIONS_VIEW,
       unmountOnBlur: true,
     },
+    money: {
+      tabBarIconKey: TabBarIconKey.Money,
+      rootScreenName: Routes.MONEY.HOME,
+    },
     rewards: {
       tabBarIconKey: TabBarIconKey.Rewards,
       callback: () => {
@@ -855,13 +864,21 @@ const HomeTabs = () => {
         component={WalletTabModalFlow}
       />
 
-      {/* Activity Tab */}
-      <Tab.Screen
-        name={Routes.TRANSACTIONS_VIEW}
-        options={options.activity}
-        component={TransactionsHome}
-        layout={({ children }) => <UnmountOnBlur>{children}</UnmountOnBlur>}
-      />
+      {/* Activity Tab (replaced by Money when feature flag is on) */}
+      {isMoneyHomeScreenEnabled ? (
+        <Tab.Screen
+          name={Routes.MONEY.ROOT}
+          options={options.money}
+          component={MoneyAccountStackGate}
+        />
+      ) : (
+        <Tab.Screen
+          name={Routes.TRANSACTIONS_VIEW}
+          options={options.activity}
+          component={TransactionsHome}
+          layout={({ children }) => <UnmountOnBlur>{children}</UnmountOnBlur>}
+        />
+      )}
 
       {/* Rewards Tab */}
       <Tab.Screen
@@ -875,7 +892,7 @@ const HomeTabs = () => {
 };
 
 const Webview = () => (
-  <Stack.Navigator>
+  <Stack.Navigator screenOptions={{ headerShown: false }}>
     <Stack.Screen name="SimpleWebview" component={SimpleWebview} />
   </Stack.Navigator>
 );
@@ -1208,7 +1225,7 @@ const MainNavigator = () => {
         <>
           <Stack.Screen
             name={Routes.MONEY.ROOT}
-            component={MoneyScreenStack}
+            component={MoneyAccountStackGate}
             options={{ headerShown: false, ...slideFromRightAnimation }}
           />
           <Stack.Screen
@@ -1219,6 +1236,11 @@ const MainNavigator = () => {
               presentation: 'transparentModal',
             }}
           />
+          <Stack.Screen
+            name={Routes.TRANSACTIONS_VIEW}
+            component={TransactionsHome}
+            options={{ headerShown: false, ...slideFromRightAnimation }}
+          />
         </>
       )}
       <Stack.Screen
@@ -1347,6 +1369,11 @@ const MainNavigator = () => {
           component={SitesFullView}
           options={{ headerShown: false, ...slideFromRightAnimation }}
         />
+        <Stack.Screen
+          name={Routes.WHATS_HAPPENING_DETAIL}
+          component={WhatsHappeningDetailView}
+          options={{ headerShown: false, ...slideFromRightAnimation }}
+        />
         <Stack.Screen
           name={Routes.EXPLORE_SECTION_RESULTS_FULL_VIEW}
           component={ExploreSectionResultsFullView}
diff --git a/app/components/Nav/Main/MainNavigator.test.tsx b/app/components/Nav/Main/MainNavigator.test.tsx
index 61ca386d293..0422c5378d4 100644
--- a/app/components/Nav/Main/MainNavigator.test.tsx
+++ b/app/components/Nav/Main/MainNavigator.test.tsx
@@ -1045,6 +1045,19 @@ describe('MainNavigator', () => {
       expect(screen).toBeDefined();
     });
 
+    it('includes WhatsHappeningDetailView screen', () => {
+      const container = renderWithProvider(<MainNavigator />, {
+        state: initialRootState,
+      });
+
+      const screenProps = getScreenProps(container);
+      const screen = screenProps?.find(
+        (s) => s?.name === Routes.WHATS_HAPPENING_DETAIL,
+      );
+
+      expect(screen).toBeDefined();
+    });
+
     it('includes Browser home screen in main navigator', () => {
       const container = renderWithProvider(<MainNavigator />, {
         state: initialRootState,
@@ -1433,45 +1446,50 @@ describe('MainNavigator', () => {
     });
 
     describe('Money home screen conditional rendering', () => {
-      it('includes Money route when feature flag is enabled', () => {
-        mockSelectMoneyHomeScreenEnabledFlag.mockReturnValue(true);
-
-        const container = renderWithProvider(<MainNavigator />, {
+      const getHomeTabsScreenNames = (): string[] => {
+        const { root: mainRoot } = renderWithProvider(<MainNavigator />, {
           state: initialRootState,
         });
-
-        const screenProps = container.root.children
+        const homeScreen = mainRoot.findAll(
+          (node: ReactTestInstance) =>
+            node.type?.toString?.() === 'Screen' && node.props?.name === 'Home',
+        )[0];
+        const HomeTabs = homeScreen?.props?.component as React.ComponentType<
+          Record<string, unknown>
+        >;
+        const { root: homeRoot } = renderWithProvider(
+          <HomeTabs route={{ params: {} }} />,
+          { state: initialRootState },
+        );
+        const tabNavigatorNode = homeRoot.findAll(
+          (node: ReactTestInstance) =>
+            node.type?.toString?.() === 'TabNavigator',
+        )[0];
+        return (tabNavigatorNode?.children ?? [])
           .filter(
             (child): child is ReactTestInstance =>
               typeof child === 'object' &&
-              'type' in child &&
               'props' in child &&
-              child.type?.toString() === 'Screen',
+              typeof child.props?.name === 'string',
           )
-          .map((child) => child.props.name);
+          .map((child) => child.props.name as string);
+      };
 
-        expect(screenProps).toContain(Routes.MONEY.ROOT);
+      it('includes Money route when feature flag is enabled', () => {
+        mockSelectMoneyHomeScreenEnabledFlag.mockReturnValue(true);
+
+        const tabScreenNames = getHomeTabsScreenNames();
+
+        expect(tabScreenNames).toContain(Routes.MONEY.ROOT);
         mockSelectMoneyHomeScreenEnabledFlag.mockReturnValue(false);
       });
 
       it('excludes Money route when feature flag is disabled', () => {
         mockSelectMoneyHomeScreenEnabledFlag.mockReturnValue(false);
 
-        const container = renderWithProvider(<MainNavigator />, {
-          state: initialRootState,
-        });
-
-        const screenProps = container.root.children
-          .filter(
-            (child): child is ReactTestInstance =>
-              typeof child === 'object' &&
-              'type' in child &&
-              'props' in child &&
-              child.type?.toString() === 'Screen',
-          )
-          .map((child) => child.props.name);
+        const tabScreenNames = getHomeTabsScreenNames();
 
-        expect(screenProps).not.toContain(Routes.MONEY.ROOT);
+        expect(tabScreenNames).not.toContain(Routes.MONEY.ROOT);
       });
     });
   });
diff --git a/app/components/Nav/Main/__snapshots__/index.test.tsx.snap b/app/components/Nav/Main/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index c55aac0b41c..00000000000
--- a/app/components/Nav/Main/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,481 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Main should render correctly 1`] = `
-<View
-  style={
-    {
-      "flex": 1,
-    }
-  }
->
-  <RNCSafeAreaProvider
-    onInsetsChange={[Function]}
-    style={
-      [
-        {
-          "flex": 1,
-        },
-        undefined,
-      ]
-    }
-  >
-    <View
-      style={
-        [
-          {
-            "backgroundColor": "rgb(242, 242, 242)",
-            "flex": 1,
-          },
-          undefined,
-        ]
-      }
-    >
-      <RNSScreenContainer
-        onLayout={[Function]}
-        style={
-          {
-            "flex": 1,
-          }
-        }
-      >
-        <RNSScreen
-          activityState={2}
-          collapsable={false}
-          gestureResponseDistance={
-            {
-              "bottom": -1,
-              "end": -1,
-              "start": -1,
-              "top": -1,
-            }
-          }
-          onGestureCancel={[Function]}
-          pointerEvents="box-none"
-          sheetAllowedDetents="large"
-          sheetCornerRadius={-1}
-          sheetExpandsWhenScrolledToEdge={true}
-          sheetGrabberVisible={false}
-          sheetLargestUndimmedDetent="all"
-          style={
-            {
-              "bottom": 0,
-              "left": 0,
-              "position": "absolute",
-              "right": 0,
-              "top": 0,
-              "zIndex": undefined,
-            }
-          }
-        >
-          <View
-            collapsable={false}
-            style={
-              {
-                "opacity": 1,
-              }
-            }
-          />
-          <View
-            accessibilityElementsHidden={false}
-            closing={false}
-            collapsable={false}
-            gestureVelocityImpact={0.3}
-            importantForAccessibility="auto"
-            onClose={[Function]}
-            onGestureBegin={[Function]}
-            onGestureCanceled={[Function]}
-            onGestureEnd={[Function]}
-            onOpen={[Function]}
-            onTransition={[Function]}
-            pointerEvents="box-none"
-            style={
-              [
-                {
-                  "display": "flex",
-                  "overflow": undefined,
-                },
-                {
-                  "bottom": 0,
-                  "left": 0,
-                  "position": "absolute",
-                  "right": 0,
-                  "top": 0,
-                },
-              ]
-            }
-            transitionSpec={
-              {
-                "close": {
-                  "animation": "spring",
-                  "config": {
-                    "damping": 500,
-                    "mass": 3,
-                    "overshootClamping": true,
-                    "restDisplacementThreshold": 10,
-                    "restSpeedThreshold": 10,
-                    "stiffness": 1000,
-                  },
-                },
-                "open": {
-                  "animation": "spring",
-                  "config": {
-                    "damping": 500,
-                    "mass": 3,
-                    "overshootClamping": true,
-                    "restDisplacementThreshold": 10,
-                    "restSpeedThreshold": 10,
-                    "stiffness": 1000,
-                  },
-                },
-              }
-            }
-          >
-            <View
-              collapsable={false}
-              pointerEvents="box-none"
-              style={
-                {
-                  "flex": 1,
-                  "marginTop": 0,
-                }
-              }
-            >
-              <View
-                collapsable={false}
-                enabled={false}
-                handlerTag={-1}
-                handlerType="PanGestureHandler"
-                needsOffscreenAlphaCompositing={false}
-                onGestureHandlerEvent={[Function]}
-                onGestureHandlerStateChange={[Function]}
-                style={
-                  {
-                    "flex": 1,
-                    "transform": [
-                      {
-                        "translateX": 0,
-                      },
-                      {
-                        "translateX": 0,
-                      },
-                    ],
-                  }
-                }
-              >
-                <View
-                  pointerEvents="box-none"
-                  style={
-                    [
-                      {
-                        "flex": 1,
-                        "overflow": "hidden",
-                      },
-                      [
-                        {
-                          "backgroundColor": "rgb(242, 242, 242)",
-                        },
-                        {
-                          "backgroundColor": "#ffffff",
-                        },
-                      ],
-                    ]
-                  }
-                >
-                  <View
-                    style={
-                      {
-                        "flex": 1,
-                        "flexDirection": "column-reverse",
-                      }
-                    }
-                  >
-                    <View
-                      style={
-                        {
-                          "flex": 1,
-                        }
-                      }
-                    >
-                      <View
-                        style={
-                          {
-                            "flex": 1,
-                          }
-                        }
-                      >
-                        <MainNavigatorMock />
-                        <GlobalAlertMock />
-                        <FadeOutOverlayMock />
-                        <NotificationMock />
-                        <RampOrdersMock />
-                        <EarnTransactionMonitorMock />
-                        <ProtectYourWalletModalMock />
-                        <RootRPCMethodsUIMock />
-                        <ProtectWalletMandatoryModalMock />
-                      </View>
-                    </View>
-                  </View>
-                </View>
-              </View>
-            </View>
-          </View>
-        </RNSScreen>
-      </RNSScreenContainer>
-      <View
-        collapsable={false}
-        pointerEvents="box-none"
-        style={
-          {
-            "height": 44,
-            "left": 0,
-            "position": "absolute",
-            "right": 0,
-            "top": 0,
-            "zIndex": 1,
-          }
-        }
-      />
-    </View>
-  </RNCSafeAreaProvider>
-</View>
-`;
-
-exports[`Main should render correctly with isConnectionRemoved true 1`] = `
-<View
-  style={
-    {
-      "flex": 1,
-    }
-  }
->
-  <RNCSafeAreaProvider
-    onInsetsChange={[Function]}
-    style={
-      [
-        {
-          "flex": 1,
-        },
-        undefined,
-      ]
-    }
-  >
-    <View
-      style={
-        [
-          {
-            "backgroundColor": "rgb(242, 242, 242)",
-            "flex": 1,
-          },
-          undefined,
-        ]
-      }
-    >
-      <RNSScreenContainer
-        onLayout={[Function]}
-        style={
-          {
-            "flex": 1,
-          }
-        }
-      >
-        <RNSScreen
-          activityState={2}
-          collapsable={false}
-          gestureResponseDistance={
-            {
-              "bottom": -1,
-              "end": -1,
-              "start": -1,
-              "top": -1,
-            }
-          }
-          onGestureCancel={[Function]}
-          pointerEvents="box-none"
-          sheetAllowedDetents="large"
-          sheetCornerRadius={-1}
-          sheetExpandsWhenScrolledToEdge={true}
-          sheetGrabberVisible={false}
-          sheetLargestUndimmedDetent="all"
-          style={
-            {
-              "bottom": 0,
-              "left": 0,
-              "position": "absolute",
-              "right": 0,
-              "top": 0,
-              "zIndex": undefined,
-            }
-          }
-        >
-          <View
-            collapsable={false}
-            style={
-              {
-                "opacity": 1,
-              }
-            }
-          />
-          <View
-            accessibilityElementsHidden={false}
-            closing={false}
-            collapsable={false}
-            gestureVelocityImpact={0.3}
-            importantForAccessibility="auto"
-            onClose={[Function]}
-            onGestureBegin={[Function]}
-            onGestureCanceled={[Function]}
-            onGestureEnd={[Function]}
-            onOpen={[Function]}
-            onTransition={[Function]}
-            pointerEvents="box-none"
-            style={
-              [
-                {
-                  "display": "flex",
-                  "overflow": undefined,
-                },
-                {
-                  "bottom": 0,
-                  "left": 0,
-                  "position": "absolute",
-                  "right": 0,
-                  "top": 0,
-                },
-              ]
-            }
-            transitionSpec={
-              {
-                "close": {
-                  "animation": "spring",
-                  "config": {
-                    "damping": 500,
-                    "mass": 3,
-                    "overshootClamping": true,
-                    "restDisplacementThreshold": 10,
-                    "restSpeedThreshold": 10,
-                    "stiffness": 1000,
-                  },
-                },
-                "open": {
-                  "animation": "spring",
-                  "config": {
-                    "damping": 500,
-                    "mass": 3,
-                    "overshootClamping": true,
-                    "restDisplacementThreshold": 10,
-                    "restSpeedThreshold": 10,
-                    "stiffness": 1000,
-                  },
-                },
-              }
-            }
-          >
-            <View
-              collapsable={false}
-              pointerEvents="box-none"
-              style={
-                {
-                  "flex": 1,
-                  "marginTop": 0,
-                }
-              }
-            >
-              <View
-                collapsable={false}
-                enabled={false}
-                handlerTag={-1}
-                handlerType="PanGestureHandler"
-                needsOffscreenAlphaCompositing={false}
-                onGestureHandlerEvent={[Function]}
-                onGestureHandlerStateChange={[Function]}
-                style={
-                  {
-                    "flex": 1,
-                    "transform": [
-                      {
-                        "translateX": 0,
-                      },
-                      {
-                        "translateX": 0,
-                      },
-                    ],
-                  }
-                }
-              >
-                <View
-                  pointerEvents="box-none"
-                  style={
-                    [
-                      {
-                        "flex": 1,
-                        "overflow": "hidden",
-                      },
-                      [
-                        {
-                          "backgroundColor": "rgb(242, 242, 242)",
-                        },
-                        {
-                          "backgroundColor": "#ffffff",
-                        },
-                      ],
-                    ]
-                  }
-                >
-                  <View
-                    style={
-                      {
-                        "flex": 1,
-                        "flexDirection": "column-reverse",
-                      }
-                    }
-                  >
-                    <View
-                      style={
-                        {
-                          "flex": 1,
-                        }
-                      }
-                    >
-                      <View
-                        style={
-                          {
-                            "flex": 1,
-                          }
-                        }
-                      >
-                        <MainNavigatorMock />
-                        <GlobalAlertMock />
-                        <FadeOutOverlayMock />
-                        <NotificationMock />
-                        <RampOrdersMock />
-                        <EarnTransactionMonitorMock />
-                        <ProtectYourWalletModalMock />
-                        <RootRPCMethodsUIMock />
-                        <ProtectWalletMandatoryModalMock />
-                      </View>
-                    </View>
-                  </View>
-                </View>
-              </View>
-            </View>
-          </View>
-        </RNSScreen>
-      </RNSScreenContainer>
-      <View
-        collapsable={false}
-        pointerEvents="box-none"
-        style={
-          {
-            "height": 44,
-            "left": 0,
-            "position": "absolute",
-            "right": 0,
-            "top": 0,
-            "zIndex": 1,
-          }
-        }
-      />
-    </View>
-  </RNCSafeAreaProvider>
-</View>
-`;
diff --git a/app/components/Nav/Main/index.test.tsx b/app/components/Nav/Main/index.test.tsx
index dde617be43f..642344d59be 100644
--- a/app/components/Nav/Main/index.test.tsx
+++ b/app/components/Nav/Main/index.test.tsx
@@ -1,10 +1,12 @@
 /* eslint-disable import-x/no-nodejs-modules */
 import React from 'react';
+import { View } from 'react-native';
 import Main from './';
 import renderWithProvider from '../../../util/test/renderWithProvider';
 import initialRootState from '../../../util/test/initial-root-state';
 
 const mockReact = React;
+const mockView = View;
 
 // Mock Ramp SDK dependencies to prevent SdkEnvironment.Production errors
 jest.mock('../../../components/UI/Ramp', () => ({
@@ -30,7 +32,8 @@ jest.mock('react-native-device-info', () => ({
 
 // Mock heavy child components to avoid deep dependency issues
 jest.mock('./MainNavigator', () => {
-  const MockMainNavigator = () => mockReact.createElement('MainNavigatorMock');
+  const MockMainNavigator = () =>
+    mockReact.createElement(mockView, { testID: 'mocked-main-navigator' });
   MockMainNavigator.router = {};
   return {
     __esModule: true,
@@ -113,8 +116,8 @@ describe('Main', () => {
     jest.clearAllMocks();
   });
 
-  it('should render correctly', () => {
-    const { toJSON } = renderWithProvider(<Main />, {
+  it('mounts the main flow with mocked navigator and shell components', () => {
+    const { getByTestId } = renderWithProvider(<Main />, {
       state: {
         ...initialRootState,
         user: {
@@ -123,19 +126,7 @@ describe('Main', () => {
         },
       },
     });
-    expect(toJSON()).toMatchSnapshot();
-  });
 
-  it('should render correctly with isConnectionRemoved true', () => {
-    const { toJSON } = renderWithProvider(<Main />, {
-      state: {
-        ...initialRootState,
-        user: {
-          ...initialRootState.user,
-          isConnectionRemoved: true,
-        },
-      },
-    });
-    expect(toJSON()).toMatchSnapshot();
+    expect(getByTestId('mocked-main-navigator')).toBeOnTheScreen();
   });
 });
diff --git a/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.test.tsx b/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.test.tsx
index c949d1f692e..bbd6049d191 100644
--- a/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.test.tsx
+++ b/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.test.tsx
@@ -1,7 +1,4 @@
 import React from 'react';
-import { Provider } from 'react-redux';
-import { render } from '@testing-library/react-native';
-import configureMockStore from 'redux-mock-store';
 
 import renderWithProvider, {
   DeepPartial,
@@ -133,9 +130,6 @@ jest.mock('../../../util/address', () => ({
   isQRHardwareAccount: jest.fn(),
 }));
 
-const mockStore = configureMockStore();
-const store = mockStore(mockInitialState);
-
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
   useSelector: jest
@@ -163,25 +157,6 @@ describe('AccountFromToInfoCard', () => {
     require('../../../store')._updateMockState(mockInitialState);
   });
 
-  it('should render correctly', () => {
-    const { toJSON } = render(
-      <Provider store={store}>
-        {/* @ts-expect-error: Rest props are ignored for testing purposes */}
-        <AccountFromToInfoCard transactionState={transactionState} />
-      </Provider>,
-    );
-    expect(toJSON()).toMatchSnapshot();
-  });
-
-  it('should match snapshot', () => {
-    const { toJSON } = renderWithProvider(
-      //@ts-expect-error - Rest props are ignored for testing purposes
-      <AccountFromToInfoCard transactionState={transactionState} />,
-      { state: mockInitialState },
-    );
-    expect(toJSON()).not.toBeNull();
-  });
-
   it('should render to account name', async () => {
     const { findByText } = renderWithProvider(
       //@ts-expect-error - Rest props are ignored for testing purposes
diff --git a/app/components/UI/AccountFromToInfoCard/__snapshots__/AccountFromToInfoCard.test.tsx.snap b/app/components/UI/AccountFromToInfoCard/__snapshots__/AccountFromToInfoCard.test.tsx.snap
deleted file mode 100644
index 688c7d24c30..00000000000
--- a/app/components/UI/AccountFromToInfoCard/__snapshots__/AccountFromToInfoCard.test.tsx.snap
+++ /dev/null
@@ -1,662 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AccountFromToInfoCard should render correctly 1`] = `
-<View
-  style={
-    {
-      "marginHorizontal": 16,
-    }
-  }
->
-  <View
-    style={{}}
-  >
-    <View
-      style={
-        {
-          "marginHorizontal": 8,
-          "marginVertical": 8,
-        }
-      }
-    >
-      <Text
-        accessibilityRole="text"
-        style={
-          {
-            "color": "#131416",
-            "fontFamily": "Geist-Regular",
-            "fontSize": 16,
-            "letterSpacing": 0,
-            "lineHeight": 24,
-          }
-        }
-      >
-        From:
-      </Text>
-    </View>
-    <View
-      accessibilityState={
-        {
-          "busy": undefined,
-          "checked": undefined,
-          "disabled": undefined,
-          "expanded": undefined,
-          "selected": undefined,
-        }
-      }
-      accessibilityValue={
-        {
-          "max": undefined,
-          "min": undefined,
-          "now": undefined,
-          "text": undefined,
-        }
-      }
-      accessible={true}
-      collapsable={false}
-      focusable={false}
-      onClick={[Function]}
-      onResponderGrant={[Function]}
-      onResponderMove={[Function]}
-      onResponderRelease={[Function]}
-      onResponderTerminate={[Function]}
-      onResponderTerminationRequest={[Function]}
-      onStartShouldSetResponder={[Function]}
-      style={
-        {
-          "backgroundColor": "#ffffff",
-          "borderColor": "#949596",
-          "borderRadius": 4,
-          "borderWidth": 1,
-          "flexDirection": "row",
-          "justifyContent": "space-between",
-          "marginHorizontal": 10,
-          "opacity": 1,
-          "padding": 16,
-        }
-      }
-      testID="account-balance"
-    >
-      <View
-        style={
-          {
-            "flex": 1,
-            "flexDirection": "row",
-            "justifyContent": "space-between",
-          }
-        }
-        testID="account-base"
-      >
-        <View
-          style={
-            {
-              "alignItems": "center",
-              "flexDirection": "row",
-            }
-          }
-        >
-          <View
-            onLayout={[Function]}
-            style={
-              {
-                "alignSelf": "center",
-                "marginRight": 8,
-                "position": "relative",
-              }
-            }
-            testID="badge-wrapper-badge"
-          >
-            <View>
-              <View
-                style={
-                  {
-                    "backgroundColor": "#ffffff",
-                    "borderRadius": 8,
-                    "height": 32,
-                    "overflow": "hidden",
-                    "width": 32,
-                  }
-                }
-                testID="account-avatar"
-              >
-                <View
-                  style={
-                    {
-                      "height": 32,
-                      "width": 32,
-                    }
-                  }
-                />
-              </View>
-            </View>
-            <View
-              style={
-                {
-                  "alignItems": "center",
-                  "aspectRatio": 1,
-                  "height": 0,
-                  "justifyContent": "center",
-                  "position": "absolute",
-                  "right": 0,
-                  "top": 0,
-                  "transform": [
-                    {
-                      "translateX": 0,
-                    },
-                    {
-                      "translateY": -0,
-                    },
-                  ],
-                }
-              }
-            >
-              <View
-                onLayout={[Function]}
-                style={
-                  {
-                    "alignItems": "center",
-                    "aspectRatio": 1,
-                    "height": "50%",
-                    "justifyContent": "center",
-                    "maxHeight": 24,
-                    "minHeight": 8,
-                    "opacity": 0,
-                  }
-                }
-                testID="badgenetwork"
-              >
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "backgroundColor": "#ffffff",
-                      "borderColor": "#ffffff",
-                      "borderRadius": 8,
-                      "borderWidth": 2,
-                      "height": 32,
-                      "justifyContent": "center",
-                      "overflow": "hidden",
-                      "shadowColor": "#0000001a",
-                      "shadowOffset": {
-                        "height": 2,
-                        "width": 0,
-                      },
-                      "shadowOpacity": 1,
-                      "shadowRadius": 4,
-                      "transform": [
-                        {
-                          "scale": 1,
-                        },
-                      ],
-                      "width": 32,
-                    }
-                  }
-                >
-                  <Image
-                    onError={[Function]}
-                    resizeMode="contain"
-                    source={10}
-                    style={
-                      {
-                        "height": 32,
-                        "width": 32,
-                      }
-                    }
-                    testID="network-avatar-image"
-                  />
-                </View>
-              </View>
-            </View>
-          </View>
-          <View>
-            <Text
-              accessibilityRole="text"
-              style={
-                {
-                  "color": "#131416",
-                  "fontFamily": "Geist-Regular",
-                  "fontSize": 14,
-                  "letterSpacing": 0,
-                  "lineHeight": 22,
-                }
-              }
-            >
-              Ethereum Main Network
-            </Text>
-            <View
-              style={
-                {
-                  "alignItems": "center",
-                  "flexDirection": "row",
-                  "justifyContent": "flex-start",
-                }
-              }
-            >
-              <Text
-                accessibilityRole="text"
-                style={
-                  {
-                    "color": "#131416",
-                    "fontFamily": "Geist-SemiBold",
-                    "fontSize": 16,
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                  }
-                }
-              >
-                Account 1
-              </Text>
-            </View>
-          </View>
-        </View>
-        <View>
-          <Text
-            accessibilityRole="text"
-            style={
-              {
-                "color": "#131416",
-                "fontFamily": "Geist-Regular",
-                "fontSize": 14,
-                "letterSpacing": 0,
-                "lineHeight": 22,
-                "marginLeft": "auto",
-              }
-            }
-          >
-            Balance
-          </Text>
-          <Text
-            accessibilityRole="text"
-            style={
-              {
-                "color": "#131416",
-                "fontFamily": "Geist-SemiBold",
-                "fontSize": 16,
-                "letterSpacing": 0,
-                "lineHeight": 24,
-              }
-            }
-          >
-            &lt; 0.00001 ETH
-          </Text>
-        </View>
-      </View>
-    </View>
-  </View>
-  <View
-    style={
-      [
-        {
-          "flexDirection": "column",
-          "marginHorizontal": 8,
-          "minHeight": 82,
-        },
-        {
-          "marginTop": 8,
-        },
-      ]
-    }
-  >
-    <View
-      style={
-        {
-          "alignItems": "center",
-          "flexDirection": "row",
-          "width": "15%",
-        }
-      }
-    >
-      <Text
-        accessibilityRole="text"
-        style={
-          {
-            "color": "#131416",
-            "fontFamily": "Geist-Regular",
-            "fontSize": 16,
-            "letterSpacing": 0,
-            "lineHeight": 24,
-          }
-        }
-      >
-        To:
-      </Text>
-    </View>
-    <View
-      style={
-        [
-          {
-            "borderRadius": 8,
-            "borderWidth": 1,
-            "flex": 1,
-            "flexDirection": "row",
-            "marginLeft": 0,
-            "marginVertical": 8,
-            "minHeight": 52,
-            "paddingHorizontal": 10,
-          },
-          {
-            "borderColor": "#949596",
-          },
-        ]
-      }
-    >
-      <View
-        style={
-          {
-            "alignItems": "center",
-            "flex": 1,
-            "flexDirection": "row",
-            "position": "relative",
-          }
-        }
-      >
-        <View
-          placeholderStyle={
-            {
-              "backgroundColor": "#f3f3f4",
-            }
-          }
-          useNativeDriver={true}
-        >
-          <View
-            onLoadEnd={[Function]}
-            style={
-              {
-                "backgroundColor": "#ffffff",
-                "borderRadius": 8,
-                "height": 32,
-                "overflow": "hidden",
-                "width": 32,
-              }
-            }
-          >
-            <View
-              style={
-                {
-                  "height": 32,
-                  "width": 32,
-                }
-              }
-            />
-          </View>
-          <View
-            collapsable={false}
-            style={
-              {
-                "bottom": 0,
-                "left": 0,
-                "opacity": 1,
-                "position": "absolute",
-                "right": 0,
-                "top": 0,
-              }
-            }
-          >
-            <View
-              style={
-                [
-                  {},
-                  {
-                    "backgroundColor": "#eee",
-                  },
-                  {
-                    "backgroundColor": "#f3f3f4",
-                  },
-                ]
-              }
-            />
-          </View>
-        </View>
-        <View
-          style={
-            {
-              "flexDirection": "row",
-            }
-          }
-        >
-          <View
-            style={
-              [
-                {
-                  "alignItems": "flex-start",
-                  "flexDirection": "column",
-                  "marginHorizontal": 8,
-                },
-                {
-                  "flex": 0.9,
-                },
-              ]
-            }
-          >
-            <View
-              style={
-                {
-                  "alignItems": "center",
-                  "flexDirection": "row",
-                  "justifyContent": "center",
-                }
-              }
-            >
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#131416",
-                    "fontFamily": "Geist-Regular",
-                    "fontSize": 14,
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                  }
-                }
-              >
-                Account 2
-              </Text>
-            </View>
-            <View
-              style={
-                {
-                  "flexDirection": "row",
-                }
-              }
-            >
-              <Text
-                accessibilityRole="text"
-                numberOfLines={1}
-                style={
-                  {
-                    "color": "#66676a",
-                    "fontFamily": "Geist-Regular",
-                    "fontSize": 12,
-                    "letterSpacing": 0,
-                    "lineHeight": 24,
-                  }
-                }
-              >
-                0x519d2...c9CC7
-              </Text>
-              <View
-                style={
-                  {
-                    "paddingTop": 2,
-                  }
-                }
-              >
-                <Text
-                  allowFontScaling={false}
-                  selectable={false}
-                  style={
-                    [
-                      {
-                        "color": "#457a39",
-                        "fontSize": 15,
-                      },
-                      undefined,
-                      {
-                        "fontFamily": "anticon",
-                        "fontStyle": "normal",
-                        "fontWeight": "normal",
-                      },
-                      {},
-                    ]
-                  }
-                >
-                  
-                </Text>
-              </View>
-            </View>
-          </View>
-        </View>
-      </View>
-    </View>
-  </View>
-  <View
-    testID="modal-mock"
-  >
-    <RNCSafeAreaView
-      edges={
-        {
-          "bottom": "additive",
-          "left": "additive",
-          "right": "additive",
-          "top": "additive",
-        }
-      }
-      style={
-        {
-          "alignItems": "center",
-          "backgroundColor": "#ffffff",
-          "borderRadius": 10,
-          "elevation": 11,
-          "justifyContent": "center",
-          "marginVertical": 50,
-          "shadowColor": "#0000001a",
-          "shadowOffset": {
-            "height": 2,
-            "width": 0,
-          },
-          "shadowOpacity": 1,
-          "shadowRadius": 8,
-        }
-      }
-    >
-      <View
-        style={
-          {
-            "alignItems": "center",
-            "color": "#131416",
-            "flexDirection": "row",
-            "justifyContent": "space-between",
-            "paddingHorizontal": 20,
-            "paddingVertical": 15,
-            "width": "100%",
-          }
-        }
-      >
-        <Text
-          accessibilityRole="text"
-          style={
-            {
-              "color": "#131416",
-              "fontFamily": "Geist-SemiBold",
-              "fontSize": 18,
-              "letterSpacing": 0,
-              "lineHeight": 24,
-              "marginVertical": 3,
-            }
-          }
-        >
-          Check the recipient address
-        </Text>
-        <View
-          accessibilityState={
-            {
-              "busy": undefined,
-              "checked": undefined,
-              "disabled": undefined,
-              "expanded": undefined,
-              "selected": undefined,
-            }
-          }
-          accessibilityValue={
-            {
-              "max": undefined,
-              "min": undefined,
-              "now": undefined,
-              "text": undefined,
-            }
-          }
-          accessible={true}
-          collapsable={false}
-          focusable={true}
-          hitSlop={
-            {
-              "bottom": 20,
-              "left": 20,
-              "right": 20,
-              "top": 20,
-            }
-          }
-          onClick={[Function]}
-          onResponderGrant={[Function]}
-          onResponderMove={[Function]}
-          onResponderRelease={[Function]}
-          onResponderTerminate={[Function]}
-          onResponderTerminationRequest={[Function]}
-          onStartShouldSetResponder={[Function]}
-          style={
-            {
-              "opacity": 1,
-            }
-          }
-        >
-          <Text
-            allowFontScaling={false}
-            selectable={false}
-            style={
-              [
-                {
-                  "color": undefined,
-                  "fontSize": 30,
-                },
-                {
-                  "color": "#131416",
-                },
-                {
-                  "fontFamily": "Ionicons",
-                  "fontStyle": "normal",
-                  "fontWeight": "normal",
-                },
-                {},
-              ]
-            }
-          >
-            
-          </Text>
-        </View>
-      </View>
-      <View
-        style={
-          {
-            "marginBottom": 15,
-            "paddingBottom": 5,
-            "paddingHorizontal": 20,
-            "width": "100%",
-          }
-        }
-      >
-        <Text
-          style={
-            {
-              "color": "#131416",
-              "lineHeight": 20,
-            }
-          }
-        >
-          We have detected a confusable character in the ENS name. Check the ENS name to avoid a potential scam.
-        </Text>
-      </View>
-    </RNCSafeAreaView>
-  </View>
-</View>
-`;
diff --git a/app/components/UI/AddToAddressBookWrapper/AddToAddressBookWrapper.tsx b/app/components/UI/AddToAddressBookWrapper/AddToAddressBookWrapper.tsx
index 46cfc943afc..42136583e36 100644
--- a/app/components/UI/AddToAddressBookWrapper/AddToAddressBookWrapper.tsx
+++ b/app/components/UI/AddToAddressBookWrapper/AddToAddressBookWrapper.tsx
@@ -1,8 +1,7 @@
 import React, { ReactElement, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { View, Platform, TextInput, TouchableOpacity } from 'react-native';
+import { View, TextInput, TouchableOpacity } from 'react-native';
 
-import generateTestId from '../../../../wdio/utils/generateTestId';
 import { AddAddressModalSelectorsIDs } from './AddAddressModal.testIds';
 import { strings } from '../../../../locales/i18n';
 import Engine from '../../../core/Engine';
@@ -91,10 +90,7 @@ export const AddToAddressBookWrapper = ({
               <View style={baseStyles.flexGrow}>
                 <Text
                   style={styles.addTextTitle}
-                  {...generateTestId(
-                    Platform,
-                    AddAddressModalSelectorsIDs.TITLE,
-                  )}
+                  testID={AddAddressModalSelectorsIDs.TITLE}
                 >
                   {strings('address_book.add_to_address_book')}
                 </Text>
@@ -117,10 +113,7 @@ export const AddToAddressBookWrapper = ({
                       numberOfLines={1}
                       value={alias}
                       keyboardAppearance={themeAppearance}
-                      {...generateTestId(
-                        Platform,
-                        AddAddressModalSelectorsIDs.ENTER_ALIAS_INPUT,
-                      )}
+                      testID={AddAddressModalSelectorsIDs.ENTER_ALIAS_INPUT}
                     />
                   </View>
                 </View>
diff --git a/app/components/UI/AssetElement/__snapshots__/index.test.tsx.snap b/app/components/UI/AssetElement/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 1fea4f67819..00000000000
--- a/app/components/UI/AssetElement/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,51 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AssetElement renders correctly 1`] = `
-<View
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": false,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={true}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "alignItems": "center",
-      "flexDirection": "row",
-      "height": 64,
-      "opacity": 1,
-    }
-  }
-  testID="asset-DAI"
->
-  <View
-    style={
-      {
-        "alignItems": "flex-end",
-        "flexShrink": 0,
-      }
-    }
-  />
-</View>
-`;
diff --git a/app/components/UI/AssetElement/index.test.tsx b/app/components/UI/AssetElement/index.test.tsx
index 13554043ea6..fe6fe281b40 100644
--- a/app/components/UI/AssetElement/index.test.tsx
+++ b/app/components/UI/AssetElement/index.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, fireEvent } from '@testing-library/react-native';
 import AssetElement from './';
-import { getAssetTestId } from '../../../../wdio/screen-objects/testIDs/Screens/WalletView.testIds';
+import { getAssetTestId } from '../../../../tests/selectors/Wallet/WalletView.selectors';
 import {
   BALANCE_TEST_ID,
   SECONDARY_BALANCE_BUTTON_TEST_ID,
@@ -34,9 +34,10 @@ describe('AssetElement', () => {
     jest.clearAllMocks();
   });
 
-  it('renders correctly', () => {
-    const { toJSON } = render(<AssetElement asset={erc20Token} />);
-    expect(toJSON()).toMatchSnapshot();
+  it('renders the asset row with the expected test id when no balance is shown', () => {
+    const { getByTestId } = render(<AssetElement asset={erc20Token} />);
+
+    expect(getByTestId(getAssetTestId(erc20Token.symbol))).toBeOnTheScreen();
   });
 
   it('renders the main balance if provided', () => {
diff --git a/app/components/UI/AssetElement/index.tsx b/app/components/UI/AssetElement/index.tsx
index 02fab95a07b..200ae2946db 100644
--- a/app/components/UI/AssetElement/index.tsx
+++ b/app/components/UI/AssetElement/index.tsx
@@ -1,14 +1,13 @@
 /* eslint-disable react/prop-types */
 import React from 'react';
-import { TouchableOpacity, StyleSheet, Platform, View } from 'react-native';
+import { TouchableOpacity, StyleSheet, View } from 'react-native';
 import {
   TextVariant,
   TextColor,
 } from '../../../component-library/components/Texts/Text';
 import SkeletonText from '../Ramp/Aggregator/components/SkeletonText';
 import { TokenI } from '../Tokens/types';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import { getAssetTestId } from '../../../../wdio/screen-objects/testIDs/Screens/WalletView.testIds';
+import { getAssetTestId } from '../../../../tests/selectors/Wallet/WalletView.selectors';
 import SensitiveText, {
   SensitiveTextLength,
 } from '../../../component-library/components/Texts/SensitiveText';
@@ -113,7 +112,7 @@ const AssetElement: React.FC<AssetElementProps> = ({
       onPress={handleOnPress}
       onLongPress={handleOnLongPress}
       style={styles.itemWrapper}
-      {...generateTestId(Platform, getAssetTestId(asset.symbol))}
+      testID={getAssetTestId(asset.symbol)}
     >
       {children}
       <View style={styles.arrow}>
diff --git a/app/components/UI/AssetOverview/AssetActionButton/AssetActionButton.tsx b/app/components/UI/AssetOverview/AssetActionButton/AssetActionButton.tsx
index a7808efba37..eae80152f57 100644
--- a/app/components/UI/AssetOverview/AssetActionButton/AssetActionButton.tsx
+++ b/app/components/UI/AssetOverview/AssetActionButton/AssetActionButton.tsx
@@ -1,9 +1,8 @@
 import React from 'react';
-import { Platform, TouchableOpacity, View } from 'react-native';
+import { TouchableOpacity, View } from 'react-native';
 import FeatherIcon from 'react-native-vector-icons/Feather';
 import Ionicon from 'react-native-vector-icons/Ionicons';
 import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons';
-import generateTestId from '../../../../../wdio/utils/generateTestId';
 import { useTheme } from '../../../../util/theme';
 import Text from '../../../Base/Text';
 import styleSheet from './AssetActionButton.styles';
@@ -84,7 +83,7 @@ const AssetActionButton = ({
 
   return (
     <TouchableOpacity
-      {...generateTestId(Platform, testID)}
+      testID={testID}
       onPress={onPress}
       style={[styles.button, disabled && styles.disabledButton]}
       disabled={disabled}
diff --git a/app/components/UI/AssetOverview/Balance/Balance.tsx b/app/components/UI/AssetOverview/Balance/Balance.tsx
index 9c50c194368..5764221ac31 100644
--- a/app/components/UI/AssetOverview/Balance/Balance.tsx
+++ b/app/components/UI/AssetOverview/Balance/Balance.tsx
@@ -23,8 +23,6 @@ import BadgeWrapper, {
 } from '../../../../component-library/components/Badges/BadgeWrapper';
 import { BadgeVariant } from '../../../../component-library/components/Badges/Badge/Badge.types';
 import Badge from '../../../../component-library/components/Badges/Badge/Badge';
-import AvatarToken from '../../../../component-library/components/Avatars/Avatar/variants/AvatarToken';
-import { AvatarSize } from '../../../../component-library/components/Avatars/Avatar';
 import NetworkAssetLogo from '../../NetworkAssetLogo';
 import Text, {
   TextColor,
@@ -53,6 +51,7 @@ import { ACCOUNT_TYPE_LABELS } from '../../../../constants/account-type-labels';
 import { useRWAToken } from '../../Bridge/hooks/useRWAToken';
 import { BridgeToken } from '../../Bridge/types';
 import StockBadge from '../../shared/StockBadge';
+import AssetLogo from '../../Assets/components/AssetLogo/AssetLogo';
 
 export const ACCOUNT_TYPE_LABEL_TEST_ID = 'account-type-label';
 
@@ -186,13 +185,7 @@ const Balance = ({
       );
     }
 
-    return (
-      <AvatarToken
-        name={asset.symbol}
-        imageSource={{ uri: asset.image }}
-        size={AvatarSize.Lg}
-      />
-    );
+    return <AssetLogo asset={asset} />;
   }, [asset, styles.ethLogo]);
 
   const isDisabled = useMemo(
diff --git a/app/components/UI/Assets/components/AssetLogo/AssetLogo.test.tsx b/app/components/UI/Assets/components/AssetLogo/AssetLogo.test.tsx
index d0005df6b91..fd0b6752538 100644
--- a/app/components/UI/Assets/components/AssetLogo/AssetLogo.test.tsx
+++ b/app/components/UI/Assets/components/AssetLogo/AssetLogo.test.tsx
@@ -4,8 +4,15 @@ import AssetLogo from './AssetLogo';
 import AvatarToken from '../../../../../component-library/components/Avatars/Avatar/variants/AvatarToken';
 import { AvatarSize } from '../../../../../component-library/components/Avatars/Avatar';
 import NetworkAssetLogo from '../../../NetworkAssetLogo';
+import { getAssetImageUrl } from '../../../Bridge/hooks/useAssetMetadata/utils';
+
+jest.mock('../../../Bridge/hooks/useAssetMetadata/utils', () => ({
+  getAssetImageUrl: jest.fn(),
+}));
 
 describe('AssetLogo', () => {
+  const mockedGetAssetImageUrl = jest.mocked(getAssetImageUrl);
+
   const mockState = {
     engine: {
       backgroundState: {
@@ -19,6 +26,10 @@ describe('AssetLogo', () => {
     },
   };
 
+  beforeEach(() => {
+    mockedGetAssetImageUrl.mockReset();
+  });
+
   it('renders asset logo for non-native assets', () => {
     const asset = {
       decimals: 18,
@@ -87,4 +98,77 @@ describe('AssetLogo', () => {
       }),
     );
   });
+
+  it('uses fallback image URL when image is an empty string', () => {
+    const fallbackImageUrl = 'https://example.com/fallback.png';
+    mockedGetAssetImageUrl.mockReturnValue(fallbackImageUrl);
+
+    const asset = {
+      decimals: 18,
+      address: '0x456',
+      chainId: '0x1',
+      symbol: 'TEST',
+      name: 'Test Token',
+      balance: '1.23',
+      balanceFiat: '$123.00',
+      isNative: false,
+      isETH: false,
+      image: '',
+      logo: 'https://example.com/logo.png',
+      aggregators: [],
+    };
+
+    const { UNSAFE_getByType } = renderWithProvider(
+      <AssetLogo asset={asset} />,
+      {
+        state: mockState,
+      },
+    );
+
+    expect(mockedGetAssetImageUrl).toHaveBeenCalledWith('0x456', '0x1');
+
+    const assetAvatar = UNSAFE_getByType(AvatarToken);
+    expect(assetAvatar.props).toStrictEqual({
+      name: 'TEST',
+      imageSource: {
+        uri: fallbackImageUrl,
+      },
+      size: AvatarSize.Lg,
+    });
+  });
+
+  it('does not call fallback image utility for unsupported chainId', () => {
+    const asset = {
+      decimals: 18,
+      address: '0x456',
+      chainId: '1',
+      symbol: 'TEST',
+      name: 'Test Token',
+      balance: '1.23',
+      balanceFiat: '$123.00',
+      isNative: false,
+      isETH: false,
+      image: '',
+      logo: 'https://example.com/logo.png',
+      aggregators: [],
+    };
+
+    const { UNSAFE_getByType } = renderWithProvider(
+      <AssetLogo asset={asset} />,
+      {
+        state: mockState,
+      },
+    );
+
+    expect(mockedGetAssetImageUrl).not.toHaveBeenCalled();
+
+    const assetAvatar = UNSAFE_getByType(AvatarToken);
+    expect(assetAvatar.props).toStrictEqual({
+      name: 'TEST',
+      imageSource: {
+        uri: undefined,
+      },
+      size: AvatarSize.Lg,
+    });
+  });
 });
diff --git a/app/components/UI/Assets/components/AssetLogo/AssetLogo.tsx b/app/components/UI/Assets/components/AssetLogo/AssetLogo.tsx
index 09a82712f0f..20f1078c604 100644
--- a/app/components/UI/Assets/components/AssetLogo/AssetLogo.tsx
+++ b/app/components/UI/Assets/components/AssetLogo/AssetLogo.tsx
@@ -1,11 +1,25 @@
 import React from 'react';
+import { isCaipChainId, isStrictHexString } from '@metamask/utils';
 import { AvatarSize } from '../../../../../component-library/components/Avatars/Avatar';
 import NetworkAssetLogo from '../../../NetworkAssetLogo';
 import AvatarToken from '../../../../../component-library/components/Avatars/Avatar/variants/AvatarToken';
 import { TokenI } from '../../../Tokens/types';
 import { useStyles } from '../../../../../component-library/hooks/useStyles';
+import { getAssetImageUrl } from '../../../Bridge/hooks/useAssetMetadata/utils';
 import styleSheet from './AssetLogo.styles';
 
+const getFallbackAssetImageUrl = (asset: TokenI): string | undefined => {
+  if (!asset.chainId) {
+    return undefined;
+  }
+
+  if (!isCaipChainId(asset.chainId) && !isStrictHexString(asset.chainId)) {
+    return undefined;
+  }
+
+  return getAssetImageUrl(asset.address, asset.chainId);
+};
+
 const AssetLogo = ({ asset }: { asset: TokenI }) => {
   const { styles } = useStyles(styleSheet, {});
 
@@ -22,10 +36,12 @@ const AssetLogo = ({ asset }: { asset: TokenI }) => {
     );
   }
 
+  const imageUri = asset.image || getFallbackAssetImageUrl(asset);
+
   return (
     <AvatarToken
       name={asset.symbol}
-      imageSource={{ uri: asset.image }}
+      imageSource={{ uri: imageUri }}
       size={AvatarSize.Lg}
     />
   );
diff --git a/app/components/UI/Bridge/Views/BridgeView/BridgeView.test.tsx b/app/components/UI/Bridge/Views/BridgeView/BridgeView.test.tsx
index 61d6e2fba30..c65868bf7f4 100644
--- a/app/components/UI/Bridge/Views/BridgeView/BridgeView.test.tsx
+++ b/app/components/UI/Bridge/Views/BridgeView/BridgeView.test.tsx
@@ -273,6 +273,16 @@ jest.mock('../../hooks/useBridgeQuoteData', () => ({
     .mockImplementation(() => mockUseBridgeQuoteData),
 }));
 
+jest.mock('../../hooks/useBridgeQuoteData/BridgeQuoteDataContext', () => {
+  const { useBridgeQuoteData } = jest.requireMock(
+    '../../hooks/useBridgeQuoteData',
+  );
+  return {
+    BridgeQuoteDataProvider: ({ children }: { children: unknown }) => children,
+    useBridgeQuoteDataContext: jest.fn(() => useBridgeQuoteData()),
+  };
+});
+
 jest.mock('../../../../../util/address', () => ({
   ...jest.requireActual('../../../../../util/address'),
   isHardwareAccount: jest.fn(),
@@ -807,6 +817,53 @@ describe('BridgeView', () => {
   });
 
   describe('Solana Swap', () => {
+    it('renders non-EVM source token without native reserve warning', () => {
+      const testState = createBridgeTestState({
+        bridgeControllerOverrides: {
+          quoteRequest: {
+            insufficientBal: false,
+          },
+          quotesLoadingStatus: RequestStatus.FETCHED,
+          quotes: [mockQuoteWithMetadata as unknown as QuoteResponse],
+        },
+        bridgeReducerOverrides: {
+          sourceAmount: '1.0',
+          sourceToken: {
+            address: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
+            chainId: SolScope.Mainnet,
+            decimals: 9,
+            image: '',
+            name: 'Solana',
+            symbol: 'SOL',
+          },
+          destToken: {
+            address: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
+            chainId: SolScope.Mainnet,
+            decimals: 9,
+            image: '',
+            name: 'Solana',
+            symbol: 'SOL',
+          },
+        },
+      });
+
+      const { queryByText } = renderScreen(
+        BridgeView,
+        {
+          name: Routes.BRIDGE.ROOT,
+        },
+        { state: testState },
+      );
+
+      expect(
+        queryByText(
+          strings('bridge.insufficient_native_reserve_title', {
+            ticker: 'SOL',
+          }),
+        ),
+      ).toBeNull();
+    });
+
     it('should set slippage to undefined when isSolanaSwap is true', async () => {
       const mockQuote = mockQuoteWithMetadata;
       const testState = createBridgeTestState({
diff --git a/app/components/UI/Bridge/Views/BridgeView/BridgeViewFooter.test.tsx b/app/components/UI/Bridge/Views/BridgeView/BridgeViewFooter.test.tsx
index b77cc01db33..076f5ac3cb4 100644
--- a/app/components/UI/Bridge/Views/BridgeView/BridgeViewFooter.test.tsx
+++ b/app/components/UI/Bridge/Views/BridgeView/BridgeViewFooter.test.tsx
@@ -37,6 +37,15 @@ jest.mock('../../hooks/useBridgeQuoteData', () => ({
     .mockImplementation(() => mockUseBridgeQuoteData),
 }));
 
+jest.mock('../../hooks/useBridgeQuoteData/BridgeQuoteDataContext', () => {
+  const { useBridgeQuoteData } = jest.requireMock(
+    '../../hooks/useBridgeQuoteData',
+  );
+  return {
+    useBridgeQuoteDataContext: jest.fn(() => useBridgeQuoteData()),
+  };
+});
+
 jest.mock('../../../../../util/address', () => ({
   ...jest.requireActual('../../../../../util/address'),
   isHardwareAccount: jest.fn(),
diff --git a/app/components/UI/Bridge/Views/BridgeView/BridgeViewFooter.tsx b/app/components/UI/Bridge/Views/BridgeView/BridgeViewFooter.tsx
index 90aa0aff8a4..061bb74f742 100644
--- a/app/components/UI/Bridge/Views/BridgeView/BridgeViewFooter.tsx
+++ b/app/components/UI/Bridge/Views/BridgeView/BridgeViewFooter.tsx
@@ -11,7 +11,7 @@ import {
   selectIsSolanaSourced,
 } from '../../../../../core/redux/slices/bridge';
 import { strings } from '../../../../../../locales/i18n';
-import { useBridgeQuoteData } from '../../hooks/useBridgeQuoteData';
+import { useBridgeQuoteDataContext } from '../../hooks/useBridgeQuoteData/BridgeQuoteDataContext';
 import BannerAlert from '../../../../../component-library/components/Banners/Banner/variants/BannerAlert';
 import { BannerAlertSeverity } from '../../../../../component-library/components/Banners/Banner/variants/BannerAlert/BannerAlert.types';
 import { selectSelectedInternalAccountFormattedAddress } from '../../../../../selectors/accountsController';
@@ -55,9 +55,7 @@ export const BridgeViewFooter = ({
   const isSolanaSourced = useSelector(selectIsSolanaSourced);
 
   const { activeQuote, isLoading, blockaidError, needsNewQuote } =
-    useBridgeQuoteData({
-      latestSourceAtomicBalance: latestSourceBalance?.atomicBalance,
-    });
+    useBridgeQuoteDataContext();
 
   const isValidSourceAmount =
     sourceAmount !== undefined && sourceAmount !== '.' && sourceToken?.decimals;
diff --git a/app/components/UI/Bridge/Views/BridgeView/index.tsx b/app/components/UI/Bridge/Views/BridgeView/index.tsx
index 962bff20bc9..0483c61094e 100644
--- a/app/components/UI/Bridge/Views/BridgeView/index.tsx
+++ b/app/components/UI/Bridge/Views/BridgeView/index.tsx
@@ -64,7 +64,10 @@ import Routes from '../../../../../constants/navigation/Routes';
 import QuoteDetailsCard from '../../components/QuoteDetailsCard';
 import QuoteDetailsCardSkeleton from '../../components/QuoteDetailsCard/QuoteDetailsCardSkeleton';
 import { useBridgeQuoteRequest } from '../../hooks/useBridgeQuoteRequest';
-import { useBridgeQuoteData } from '../../hooks/useBridgeQuoteData';
+import {
+  BridgeQuoteDataProvider,
+  useBridgeQuoteDataContext,
+} from '../../hooks/useBridgeQuoteData/BridgeQuoteDataContext';
 import { createStyles } from './BridgeView.styles';
 import { useInitialSourceToken } from '../../hooks/useInitialSourceToken';
 import { useInitialDestToken } from '../../hooks/useInitialDestToken';
@@ -109,10 +112,19 @@ import { useSourceAmountCursor } from '../../hooks/useSourceAmountCursor.ts';
 import { BridgeViewFooter } from './BridgeViewFooter.tsx';
 import { getQuoteStreamReasonString } from './BridgeView.utils';
 import { hasMissingPriceData } from '../../utils/hasMissingPriceData';
+import { useInsufficientNativeReserveError } from '../../hooks/useInsufficientNativeReserveError/index.ts';
+import {
+  ButtonSize,
+  ButtonVariants,
+} from '../../../../../component-library/components/Buttons/Button/Button.types.ts';
 
 const SCROLL_NEAR_BOTTOM_PX = 160;
 
-const BridgeView = () => {
+interface BridgeViewContentProps {
+  latestSourceBalance: ReturnType<typeof useLatestBalance>;
+}
+
+const BridgeViewContent = ({ latestSourceBalance }: BridgeViewContentProps) => {
   const [isNearBottom, setIsNearBottom] = useState(false);
   const isSubmittingTx = useSelector(selectIsSubmittingTx);
 
@@ -150,7 +162,6 @@ const BridgeView = () => {
     : false;
 
   const walletAddress = useSelector(selectSourceWalletAddress);
-
   const isEvmNonEvmBridge = useSelector(selectIsEvmNonEvmBridge);
   const isNonEvmNonEvmBridge = useSelector(selectIsNonEvmNonEvmBridge);
   const isSolanaSourced = useSelector(selectIsSolanaSourced);
@@ -233,13 +244,6 @@ const BridgeView = () => {
 
   const hasDestinationPicker = isEvmNonEvmBridge || isNonEvmNonEvmBridge;
 
-  const latestSourceBalance = useLatestBalance({
-    address: sourceToken?.address,
-    decimals: sourceToken?.decimals,
-    chainId: sourceToken?.chainId,
-    balance: sourceToken?.balance,
-  });
-
   const updateQuoteParams = useBridgeQuoteRequest({
     latestSourceAtomicBalance: latestSourceBalance?.atomicBalance,
   });
@@ -253,9 +257,7 @@ const BridgeView = () => {
     quoteFetchError,
     shouldShowPriceImpactWarning,
     needsNewQuote,
-  } = useBridgeQuoteData({
-    latestSourceAtomicBalance: latestSourceBalance?.atomicBalance,
-  });
+  } = useBridgeQuoteDataContext();
 
   const isValidSourceAmount =
     sourceAmount !== undefined && sourceAmount !== '.' && sourceToken?.decimals;
@@ -275,6 +277,13 @@ const BridgeView = () => {
     latestAtomicBalance: latestSourceBalance?.atomicBalance,
   });
 
+  const insufficientNativeReserveError = useInsufficientNativeReserveError({
+    amount: sourceAmount,
+    token: sourceToken,
+    latestAtomicBalance: latestSourceBalance?.atomicBalance,
+    walletAddress,
+  });
+
   const isGasFeesSponsoredNetworkEnabled = useSelector(
     getGasFeesSponsoredNetworkEnabled,
   );
@@ -292,9 +301,14 @@ const BridgeView = () => {
     isGasFeesSponsoredNetworkEnabled,
   ]);
 
+  const hasInsufficientNativeReserveError = Boolean(
+    insufficientNativeReserveError,
+  );
+
   const isSubmitDisabled =
     (isLoading && !activeQuote) ||
     hasInsufficientBalance ||
+    hasInsufficientNativeReserveError ||
     isSubmittingTx ||
     (isHardwareAddress && isSolanaSourced) ||
     !!blockaidError ||
@@ -303,6 +317,7 @@ const BridgeView = () => {
 
   useBridgeQuoteEvents({
     hasInsufficientBalance,
+    hasInsufficientNativeReserveError,
     hasNoQuotesAvailable: isNoQuotesAvailable,
     hasInsufficientGas: !hasSufficientGas,
     hasTxAlert: Boolean(blockaidError),
@@ -312,6 +327,8 @@ const BridgeView = () => {
 
   const isZeroState = !sourceAmount || !(Number(sourceAmount) > 0);
 
+  const ticker = sourceToken?.symbol;
+
   // Update quote parameters when relevant state changes
   useEffect(() => {
     if (hasValidBridgeInputs) {
@@ -564,6 +581,57 @@ const BridgeView = () => {
                 })()
               : null}
 
+            {insufficientNativeReserveError && !hasInsufficientBalance
+              ? (() => {
+                  const bannerStyle = {
+                    borderLeftWidth: 4,
+                    borderColor: colors.warning.default,
+                    backgroundColor: colors.warning.muted,
+                    paddingLeft: 8,
+                  };
+                  return (
+                    <BannerBase
+                      startAccessory={
+                        <Icon
+                          name={IconName.Warning}
+                          color={IconColor.WarningDefault}
+                          size={IconSize.Lg}
+                        />
+                      }
+                      title={strings(
+                        'bridge.insufficient_native_reserve_title',
+                        { ticker },
+                      )}
+                      style={bannerStyle}
+                      actionButtonProps={{
+                        label: strings(
+                          'bridge.insufficient_native_reserve_cta',
+                        ),
+                        onPress: () =>
+                          handleSourcePresetAmountSelect(
+                            insufficientNativeReserveError.maxSwappableNativeBalance,
+                          ),
+                        variant: ButtonVariants.Primary,
+                        size: ButtonSize.Sm,
+                        style: {
+                          marginTop: 6,
+                        },
+                      }}
+                      description={strings(
+                        'bridge.insufficient_native_reserve_message',
+                        {
+                          ticker,
+                          minimumReserve:
+                            insufficientNativeReserveError.minimumNativeBalanceToBeKeptInAccount,
+                          maxSwappable:
+                            insufficientNativeReserveError.maxSwappableNativeBalance,
+                        },
+                      )}
+                    />
+                  );
+                })()
+              : null}
+
             {contentMode === 'quote' &&
             activeQuote &&
             hasMissingPriceData(activeQuote) ? (
@@ -635,4 +703,22 @@ const BridgeView = () => {
   );
 };
 
+const BridgeView = () => {
+  const sourceToken = useSelector(selectSourceToken);
+  const latestSourceBalance = useLatestBalance({
+    address: sourceToken?.address,
+    decimals: sourceToken?.decimals,
+    chainId: sourceToken?.chainId,
+    balance: sourceToken?.balance,
+  });
+
+  return (
+    <BridgeQuoteDataProvider
+      latestSourceAtomicBalance={latestSourceBalance?.atomicBalance}
+    >
+      <BridgeViewContent latestSourceBalance={latestSourceBalance} />
+    </BridgeQuoteDataProvider>
+  );
+};
+
 export default BridgeView;
diff --git a/app/components/UI/Bridge/components/MissingPriceModal/MissingPriceModal.test.tsx b/app/components/UI/Bridge/components/MissingPriceModal/MissingPriceModal.test.tsx
index b0bfd3ace81..358b87f80ec 100644
--- a/app/components/UI/Bridge/components/MissingPriceModal/MissingPriceModal.test.tsx
+++ b/app/components/UI/Bridge/components/MissingPriceModal/MissingPriceModal.test.tsx
@@ -5,11 +5,13 @@ import { MissingPriceModal } from './index';
 import { useParams } from '../../../../../util/navigation/navUtils';
 import { useLatestBalance } from '../../hooks/useLatestBalance';
 import { useBridgeConfirm } from '../../hooks/useBridgeConfirm';
+import { useBridgeQuoteData } from '../../hooks/useBridgeQuoteData';
 import { useSelector } from 'react-redux';
 import { selectSourceToken } from '../../../../../core/redux/slices/bridge';
 import { MetaMetricsSwapsEventSource } from '@metamask/bridge-controller';
 import { strings } from '../../../../../../locales/i18n';
 import { Hex } from '@metamask/utils';
+import { mockQuoteWithMetadata } from '../../_mocks_/bridgeQuoteWithMetadata';
 
 jest.mock('@metamask/design-system-react-native', () => {
   const ReactModule = jest.requireActual('react');
@@ -56,6 +58,10 @@ jest.mock('../../hooks/useBridgeConfirm', () => ({
   useBridgeConfirm: jest.fn(),
 }));
 
+jest.mock('../../hooks/useBridgeQuoteData', () => ({
+  useBridgeQuoteData: jest.fn(),
+}));
+
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
   useSelector: jest.fn(),
@@ -73,6 +79,9 @@ const mockUseLatestBalance = useLatestBalance as jest.MockedFunction<
 const mockUseBridgeConfirm = useBridgeConfirm as jest.MockedFunction<
   typeof useBridgeConfirm
 >;
+const mockUseBridgeQuoteData = useBridgeQuoteData as jest.MockedFunction<
+  typeof useBridgeQuoteData
+>;
 const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
 
 const mockConfirmBridge = jest.fn();
@@ -98,6 +107,9 @@ describe('MissingPriceModal', () => {
       location: MetaMetricsSwapsEventSource.MainView,
     });
     mockUseLatestBalance.mockReturnValue(undefined);
+    mockUseBridgeQuoteData.mockReturnValue({
+      activeQuote: mockQuoteWithMetadata,
+    } as ReturnType<typeof useBridgeQuoteData>);
     mockUseBridgeConfirm.mockReturnValue(mockConfirmBridge);
     mockUseSelector.mockImplementation((selector) => {
       if (selector === selectSourceToken) {
diff --git a/app/components/UI/Bridge/components/MissingPriceModal/index.tsx b/app/components/UI/Bridge/components/MissingPriceModal/index.tsx
index 6c14e2b2e0e..db8dcf6f163 100644
--- a/app/components/UI/Bridge/components/MissingPriceModal/index.tsx
+++ b/app/components/UI/Bridge/components/MissingPriceModal/index.tsx
@@ -7,6 +7,7 @@ import { strings } from '../../../../../../locales/i18n';
 import { useParams } from '../../../../../util/navigation/navUtils';
 import { useLatestBalance } from '../../hooks/useLatestBalance';
 import { useBridgeConfirm } from '../../hooks/useBridgeConfirm';
+import { useBridgeQuoteData } from '../../hooks/useBridgeQuoteData';
 import { selectSourceToken } from '../../../../../core/redux/slices/bridge';
 import {
   BottomSheet,
@@ -42,9 +43,12 @@ export const MissingPriceModal = () => {
     decimals: sourceToken?.decimals,
     chainId: sourceToken?.chainId,
   });
+  const { activeQuote } = useBridgeQuoteData({
+    latestSourceAtomicBalance: tokenBalance?.atomicBalance,
+  });
 
   const confirmBridge = useBridgeConfirm({
-    latestSourceBalance: tokenBalance,
+    activeQuote,
     location,
   });
 
diff --git a/app/components/UI/Bridge/components/PriceImpactModal/index.tsx b/app/components/UI/Bridge/components/PriceImpactModal/index.tsx
index d6cb8ef03db..a4eca5a9a75 100644
--- a/app/components/UI/Bridge/components/PriceImpactModal/index.tsx
+++ b/app/components/UI/Bridge/components/PriceImpactModal/index.tsx
@@ -32,12 +32,13 @@ export const PriceImpactModal = () => {
     chainId: token?.chainId,
   });
 
+  const { formattedQuoteData, activeQuote } = useBridgeQuoteData({
+    latestSourceAtomicBalance: tokenBalance?.atomicBalance,
+  });
   const confirmBridge = useBridgeConfirm({
-    latestSourceBalance: tokenBalance,
+    activeQuote,
     location,
   });
-
-  const { formattedQuoteData, activeQuote } = useBridgeQuoteData();
   const priceImpactViewData = usePriceImpactViewData(
     activeQuote?.quote.priceData?.priceImpact,
   );
diff --git a/app/components/UI/Bridge/components/QuoteDetailsCard/QuoteDetailsCard.test.tsx b/app/components/UI/Bridge/components/QuoteDetailsCard/QuoteDetailsCard.test.tsx
index 8b208004f5d..df80e2ce416 100644
--- a/app/components/UI/Bridge/components/QuoteDetailsCard/QuoteDetailsCard.test.tsx
+++ b/app/components/UI/Bridge/components/QuoteDetailsCard/QuoteDetailsCard.test.tsx
@@ -83,6 +83,15 @@ jest.mock('../../hooks/useBridgeQuoteData', () => ({
   })),
 }));
 
+jest.mock('../../hooks/useBridgeQuoteData/BridgeQuoteDataContext', () => {
+  const { useBridgeQuoteData } = jest.requireMock(
+    '../../hooks/useBridgeQuoteData',
+  );
+  return {
+    useBridgeQuoteDataContext: jest.fn(() => useBridgeQuoteData()),
+  };
+});
+
 // Mock useRewards hook
 jest.mock('../../hooks/useRewards', () => ({
   useRewards: jest.fn().mockImplementation(() => ({
diff --git a/app/components/UI/Bridge/components/QuoteDetailsCard/QuoteDetailsCard.tsx b/app/components/UI/Bridge/components/QuoteDetailsCard/QuoteDetailsCard.tsx
index f4adbc1a901..230bebff30d 100644
--- a/app/components/UI/Bridge/components/QuoteDetailsCard/QuoteDetailsCard.tsx
+++ b/app/components/UI/Bridge/components/QuoteDetailsCard/QuoteDetailsCard.tsx
@@ -20,7 +20,7 @@ import {
   IconColor,
 } from '@metamask/design-system-react-native';
 import Routes from '../../../../../constants/navigation/Routes';
-import { useBridgeQuoteData } from '../../hooks/useBridgeQuoteData';
+import { useBridgeQuoteDataContext } from '../../hooks/useBridgeQuoteData/BridgeQuoteDataContext';
 import { useSelector } from 'react-redux';
 import {
   selectSourceAmount,
@@ -77,7 +77,7 @@ const QuoteDetailsCard: React.FC<QuoteDetailsCardProps> = ({
     formattedQuoteData,
     activeQuote,
     isLoading: isQuoteLoading,
-  } = useBridgeQuoteData();
+  } = useBridgeQuoteDataContext();
   const sourceToken = useSelector(selectSourceToken);
   const destToken = useSelector(selectDestToken);
   const sourceAmount = useSelector(selectSourceAmount);
diff --git a/app/components/UI/Bridge/components/SwapsConfirmButton/SwapsConfirmButton.test.tsx b/app/components/UI/Bridge/components/SwapsConfirmButton/SwapsConfirmButton.test.tsx
index 959a62db499..fbea42c5935 100644
--- a/app/components/UI/Bridge/components/SwapsConfirmButton/SwapsConfirmButton.test.tsx
+++ b/app/components/UI/Bridge/components/SwapsConfirmButton/SwapsConfirmButton.test.tsx
@@ -25,6 +25,7 @@ import { MetaMetricsSwapsEventSource } from '@metamask/bridge-controller';
 import { PriceImpactModalType } from '../PriceImpactModal/constants';
 import { TokenWarningModalMode } from '../TokenWarningModal/constants';
 import { SecurityDataType } from '../../hooks/usePopularTokens';
+import { useInsufficientNativeReserveError } from '../../hooks/useInsufficientNativeReserveError';
 
 // Mock the account-tree-controller file that imports the problematic module
 jest.mock(
@@ -139,12 +140,27 @@ jest.mock('../../hooks/useBridgeQuoteData', () => ({
     .mockImplementation(() => mockUseBridgeQuoteData),
 }));
 
+jest.mock('../../hooks/useBridgeQuoteData/BridgeQuoteDataContext', () => {
+  const { useBridgeQuoteData } = jest.requireMock(
+    '../../hooks/useBridgeQuoteData',
+  );
+  return {
+    useBridgeQuoteDataContext: jest.fn(() => useBridgeQuoteData()),
+  };
+});
+
 // Mock useIsInsufficientBalance
 jest.mock('../../hooks/useInsufficientBalance', () => ({
   __esModule: true,
   default: jest.fn().mockReturnValue(false),
 }));
 
+// Mock useInsufficientNativeReserveError
+jest.mock('../../hooks/useInsufficientNativeReserveError', () => ({
+  __esModule: true,
+  useInsufficientNativeReserveError: jest.fn().mockReturnValue(undefined),
+}));
+
 // Mock useHasSufficientGas
 jest.mock('../../hooks/useHasSufficientGas', () => ({
   useHasSufficientGas: jest.fn().mockReturnValue(true),
@@ -269,6 +285,7 @@ describe('SwapsConfirmButton', () => {
         activeQuote: mockActiveQuote,
       }));
     jest.mocked(useIsInsufficientBalance).mockReturnValue(false);
+    jest.mocked(useInsufficientNativeReserveError).mockReturnValue(undefined);
     jest.mocked(useHasSufficientGas).mockReturnValue(true);
     mockSubmitBridgeTx.mockResolvedValue({ success: true });
   });
@@ -714,6 +731,30 @@ describe('SwapsConfirmButton', () => {
       expect(getByText(strings('bridge.insufficient_funds'))).toBeTruthy();
     });
 
+    it('does not show loading when disabled due to insufficientNativeReserveError', () => {
+      jest.mocked(useInsufficientNativeReserveError).mockReturnValue({
+        minimumNativeBalanceToBeKeptInAccount: '10',
+        maxSwappableNativeBalance: '40',
+      });
+
+      const { getByText, getByTestId } = renderWithProvider(
+        <SwapsConfirmButton
+          latestSourceBalance={mockLatestSourceBalance}
+          location={MetaMetricsSwapsEventSource.MainView}
+        />,
+        {
+          state: mockState,
+        },
+      );
+
+      const button = getByTestId(BridgeViewSelectorsIDs.CONFIRM_BUTTON);
+      // Button is disabled
+      expect(button.props.accessibilityState?.disabled).toBe(true);
+      // But not in loading state (isLoading=false, isSubmittingTx=false)
+      // so the label is visible
+      expect(getByText(strings('bridge.insufficient_funds'))).toBeTruthy();
+    });
+
     it('does not show loading when disabled due to insufficient gas', () => {
       jest.mocked(useHasSufficientGas).mockReturnValue(false);
 
diff --git a/app/components/UI/Bridge/components/SwapsConfirmButton/index.tsx b/app/components/UI/Bridge/components/SwapsConfirmButton/index.tsx
index c794bc35849..337f24c09a4 100644
--- a/app/components/UI/Bridge/components/SwapsConfirmButton/index.tsx
+++ b/app/components/UI/Bridge/components/SwapsConfirmButton/index.tsx
@@ -19,7 +19,7 @@ import { isNegativeSecurityType } from '../../utils/tokenSecurityUtils';
 import useIsInsufficientBalance from '../../hooks/useInsufficientBalance';
 import { useLatestBalance } from '../../hooks/useLatestBalance';
 import { useHasSufficientGas } from '../../hooks/useHasSufficientGas';
-import { useBridgeQuoteData } from '../../hooks/useBridgeQuoteData';
+import { useBridgeQuoteDataContext } from '../../hooks/useBridgeQuoteData/BridgeQuoteDataContext';
 import { useBridgeQuoteRequest } from '../../hooks/useBridgeQuoteRequest';
 import { selectSourceWalletAddress } from '../../../../../selectors/bridge';
 import { selectSelectedInternalAccountFormattedAddress } from '../../../../../selectors/accountsController';
@@ -39,6 +39,7 @@ import { hasMissingPriceData } from '../../utils/hasMissingPriceData';
 import type { TokenWarningModalParams } from '../TokenWarningModal';
 import { TokenWarningModalMode } from '../TokenWarningModal/constants';
 import type { TransactionActiveAbTestEntry } from '../../../../../util/transactions/transaction-active-ab-test-attribution-registry';
+import { useInsufficientNativeReserveError } from '../../hooks/useInsufficientNativeReserveError';
 
 interface Props {
   latestSourceBalance: ReturnType<typeof useLatestBalance>;
@@ -55,11 +56,6 @@ export const SwapsConfirmButton = ({
   transactionActiveAbTests,
 }: Props) => {
   const navigation = useNavigation();
-  const handleConfirm = useBridgeConfirm({
-    latestSourceBalance,
-    location,
-    transactionActiveAbTests,
-  });
 
   const bridgeFeatureFlags = useSelector(selectBridgeFeatureFlags);
   const destToken = useSelector(selectDestToken);
@@ -82,6 +78,17 @@ export const SwapsConfirmButton = ({
     latestAtomicBalance: latestSourceBalance?.atomicBalance,
   });
 
+  const insufficientNativeReserveError = useInsufficientNativeReserveError({
+    amount: sourceAmount,
+    token: sourceToken,
+    latestAtomicBalance: latestSourceBalance?.atomicBalance,
+    walletAddress,
+  });
+
+  const hasInsufficientNativeReserveError = Boolean(
+    insufficientNativeReserveError,
+  );
+
   const {
     activeQuote,
     isLoading,
@@ -90,8 +97,12 @@ export const SwapsConfirmButton = ({
     quoteFetchError,
     isNoQuotesAvailable,
     isActiveQuoteForCurrentTokenPair,
-  } = useBridgeQuoteData({
-    latestSourceAtomicBalance: latestSourceBalance?.atomicBalance,
+  } = useBridgeQuoteDataContext();
+
+  const handleConfirm = useBridgeConfirm({
+    activeQuote,
+    location,
+    transactionActiveAbTests,
   });
 
   const hasSufficientGas = useHasSufficientGas({ quote: activeQuote });
@@ -154,6 +165,7 @@ export const SwapsConfirmButton = ({
     isPendingQuoteRefresh ||
     (isLoading && !activeQuote) ||
     hasInsufficientBalance ||
+    hasInsufficientNativeReserveError ||
     isSubmittingTx ||
     (isHardwareAddress && isSolanaSourced) ||
     hasError ||
@@ -236,7 +248,8 @@ export const SwapsConfirmButton = ({
       return strings('bridge.confirm_swap');
     }
 
-    if (hasInsufficientBalance) return strings('bridge.insufficient_funds');
+    if (hasInsufficientBalance || hasInsufficientNativeReserveError)
+      return strings('bridge.insufficient_funds');
     if (!hasSufficientGas) return strings('bridge.insufficient_gas');
     if (isSubmittingTx) return strings('bridge.submitting_transaction');
 
@@ -246,6 +259,7 @@ export const SwapsConfirmButton = ({
     isLoading,
     sourceAmount,
     hasInsufficientBalance,
+    hasInsufficientNativeReserveError,
     hasSufficientGas,
     isSubmittingTx,
     needsNewQuote,
diff --git a/app/components/UI/Bridge/components/TokenSelectorItem.config.ts b/app/components/UI/Bridge/components/TokenSelectorItem.config.ts
deleted file mode 100644
index 08bfe40d702..00000000000
--- a/app/components/UI/Bridge/components/TokenSelectorItem.config.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const SHOW_TOKEN_WARNINGS = false;
diff --git a/app/components/UI/Bridge/components/TokenSelectorItem.test.tsx b/app/components/UI/Bridge/components/TokenSelectorItem.test.tsx
index 0c5fbdfc5f0..8289969d1a4 100644
--- a/app/components/UI/Bridge/components/TokenSelectorItem.test.tsx
+++ b/app/components/UI/Bridge/components/TokenSelectorItem.test.tsx
@@ -50,11 +50,6 @@ jest.mock('../../../../component-library/hooks', () => ({
   }),
 }));
 
-jest.mock('../../../../../wdio/utils/generateTestId', () => ({
-  __esModule: true,
-  default: () => ({}),
-}));
-
 jest.mock(
   '../../../../component-library/components/Badges/BadgeWrapper',
   () => ({
diff --git a/app/components/UI/Bridge/components/TokenSelectorItem.tsx b/app/components/UI/Bridge/components/TokenSelectorItem.tsx
index d63e7412d6d..b38b68dff98 100644
--- a/app/components/UI/Bridge/components/TokenSelectorItem.tsx
+++ b/app/components/UI/Bridge/components/TokenSelectorItem.tsx
@@ -4,14 +4,12 @@ import {
   ImageSourcePropType,
   View,
   TouchableOpacity,
-  Platform,
   StyleProp,
   TextStyle,
 } from 'react-native';
 import { useSelector } from 'react-redux';
 import { strings } from '../../../../../locales/i18n';
-import { getAssetTestId } from '../../../../../wdio/screen-objects/testIDs/Screens/WalletView.testIds';
-import generateTestId from '../../../../../wdio/utils/generateTestId';
+import { getAssetTestId } from '../../../../../tests/selectors/Wallet/WalletView.selectors';
 import TagBase, {
   TagSeverity,
   TagShape,
@@ -334,10 +332,7 @@ export const TokenSelectorItem: React.FC<TokenSelectorItemProps> = ({
         key={token.address}
         onPress={() => onPress(token)}
         style={styles.itemWrapper}
-        {...generateTestId(
-          Platform,
-          getAssetTestId(`${token.chainId}-${token.symbol}`),
-        )}
+        testID={getAssetTestId(`${token.chainId}-${token.symbol}`)}
       >
         <Box
           flexDirection={FlexDirection.Row}
diff --git a/app/components/UI/Bridge/components/TokenWarningModal/index.tsx b/app/components/UI/Bridge/components/TokenWarningModal/index.tsx
index 88c50f39fef..876932d773e 100644
--- a/app/components/UI/Bridge/components/TokenWarningModal/index.tsx
+++ b/app/components/UI/Bridge/components/TokenWarningModal/index.tsx
@@ -108,16 +108,18 @@ export const TokenWarningModal = () => {
   const sourceToken = useSelector(selectSourceToken);
   const destToken = useSelector(selectDestToken);
   const bridgeFeatureFlags = useSelector(selectBridgeFeatureFlags);
-  const { activeQuote } = useBridgeQuoteData();
 
   const tokenBalance = useLatestBalance({
     address: sourceToken?.address,
     decimals: sourceToken?.decimals,
     chainId: sourceToken?.chainId,
   });
+  const { activeQuote } = useBridgeQuoteData({
+    latestSourceAtomicBalance: tokenBalance?.atomicBalance,
+  });
 
   const confirmBridge = useBridgeConfirm({
-    latestSourceBalance: tokenBalance,
+    activeQuote,
     location,
   });
 
diff --git a/app/components/UI/Bridge/hooks/useBridgeConfirm/index.ts b/app/components/UI/Bridge/hooks/useBridgeConfirm/index.ts
index abdffb4d3aa..b8e708c1a90 100644
--- a/app/components/UI/Bridge/hooks/useBridgeConfirm/index.ts
+++ b/app/components/UI/Bridge/hooks/useBridgeConfirm/index.ts
@@ -1,22 +1,21 @@
 import { useDispatch, useSelector } from 'react-redux';
-import { useBridgeQuoteData } from '../useBridgeQuoteData';
+import type { useBridgeQuoteData } from '../useBridgeQuoteData';
 import { useNavigation } from '@react-navigation/native';
 import { setIsSubmittingTx } from '../../../../../core/redux/slices/bridge';
 import Routes from '../../../../../constants/navigation/Routes';
 import useSubmitBridgeTx from '../../../../../util/bridge/hooks/useSubmitBridgeTx';
 import { selectSourceWalletAddress } from '../../../../../selectors/bridge';
 import { MetaMetricsSwapsEventSource } from '@metamask/bridge-controller';
-import { useLatestBalance } from '../useLatestBalance';
 import type { TransactionActiveAbTestEntry } from '../../../../../util/transactions/transaction-active-ab-test-attribution-registry';
 
 interface Params {
+  activeQuote: ReturnType<typeof useBridgeQuoteData>['activeQuote'] | null;
   location: MetaMetricsSwapsEventSource;
-  latestSourceBalance: ReturnType<typeof useLatestBalance>;
   transactionActiveAbTests?: TransactionActiveAbTestEntry[];
 }
 
 export const useBridgeConfirm = ({
-  latestSourceBalance,
+  activeQuote,
   location,
   transactionActiveAbTests,
 }: Params) => {
@@ -24,9 +23,6 @@ export const useBridgeConfirm = ({
   const navigation = useNavigation();
   const { submitBridgeTx } = useSubmitBridgeTx();
   const walletAddress = useSelector(selectSourceWalletAddress);
-  const { activeQuote } = useBridgeQuoteData({
-    latestSourceAtomicBalance: latestSourceBalance?.atomicBalance,
-  });
 
   const handleConfirm = async () => {
     try {
diff --git a/app/components/UI/Bridge/hooks/useBridgeConfirm/useBridgeConfirm.test.ts b/app/components/UI/Bridge/hooks/useBridgeConfirm/useBridgeConfirm.test.ts
index 68a79a83574..97e77ca44a1 100644
--- a/app/components/UI/Bridge/hooks/useBridgeConfirm/useBridgeConfirm.test.ts
+++ b/app/components/UI/Bridge/hooks/useBridgeConfirm/useBridgeConfirm.test.ts
@@ -1,24 +1,16 @@
 import { act, waitFor } from '@testing-library/react-native';
 import { renderHookWithProvider } from '../../../../../util/test/renderWithProvider';
 import { useBridgeConfirm } from './index';
-import { useBridgeQuoteData } from '../useBridgeQuoteData';
 import { selectSourceWalletAddress } from '../../../../../selectors/bridge';
 import { MetaMetricsSwapsEventSource } from '@metamask/bridge-controller';
 import { mockQuoteWithMetadata } from '../../_mocks_/bridgeQuoteWithMetadata';
-import { mockUseBridgeQuoteData } from '../../_mocks_/useBridgeQuoteData.mock';
 import Routes from '../../../../../constants/navigation/Routes';
-import { BigNumber } from 'ethers';
 
 const WALLET_ADDRESS = '0x1234567890123456789012345678901234567890';
 
-const mockLatestSourceBalance = {
-  displayBalance: '2.0',
-  atomicBalance: BigNumber.from('2000000000000000000'),
-};
-
 const defaultParams = {
+  activeQuote: mockQuoteWithMetadata,
   location: MetaMetricsSwapsEventSource.MainView,
-  latestSourceBalance: mockLatestSourceBalance,
 };
 
 // Navigation
@@ -28,11 +20,6 @@ jest.mock('@react-navigation/native', () => ({
   useNavigation: () => ({ navigate: mockNavigate }),
 }));
 
-// useBridgeQuoteData
-jest.mock('../useBridgeQuoteData', () => ({
-  useBridgeQuoteData: jest.fn(),
-}));
-
 // selectSourceWalletAddress
 jest.mock('../../../../../selectors/bridge', () => ({
   ...jest.requireActual('../../../../../selectors/bridge'),
@@ -79,10 +66,6 @@ function renderHook(
 describe('useBridgeConfirm', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    jest.mocked(useBridgeQuoteData).mockReturnValue({
-      ...mockUseBridgeQuoteData,
-      activeQuote: mockQuoteWithMetadata,
-    } as ReturnType<typeof useBridgeQuoteData>);
     jest.mocked(selectSourceWalletAddress).mockReturnValue(WALLET_ADDRESS);
     mockSubmitBridgeTx.mockResolvedValue({ success: true });
   });
@@ -148,38 +131,11 @@ describe('useBridgeConfirm', () => {
         ).toBe(false);
       });
     });
-
-    it('passes latestSourceAtomicBalance to useBridgeQuoteData', () => {
-      renderHook();
-
-      expect(jest.mocked(useBridgeQuoteData)).toHaveBeenCalledWith(
-        expect.objectContaining({
-          latestSourceAtomicBalance: mockLatestSourceBalance.atomicBalance,
-        }),
-      );
-    });
-
-    it('passes undefined atomicBalance when latestSourceBalance is undefined', () => {
-      renderHook({ ...defaultParams, latestSourceBalance: undefined });
-
-      expect(jest.mocked(useBridgeQuoteData)).toHaveBeenCalledWith(
-        expect.objectContaining({
-          latestSourceAtomicBalance: undefined,
-        }),
-      );
-    });
   });
 
   describe('when activeQuote is null', () => {
-    beforeEach(() => {
-      jest.mocked(useBridgeQuoteData).mockReturnValue({
-        ...mockUseBridgeQuoteData,
-        activeQuote: null,
-      } as ReturnType<typeof useBridgeQuoteData>);
-    });
-
     it('does not call submitBridgeTx', async () => {
-      const { result } = renderHook();
+      const { result } = renderHook({ ...defaultParams, activeQuote: null });
 
       await act(async () => {
         await result.current();
@@ -189,7 +145,7 @@ describe('useBridgeConfirm', () => {
     });
 
     it('still navigates to TRANSACTIONS_VIEW', async () => {
-      const { result } = renderHook();
+      const { result } = renderHook({ ...defaultParams, activeQuote: null });
 
       await act(async () => {
         await result.current();
diff --git a/app/components/UI/Bridge/hooks/useBridgeQuoteData/BridgeQuoteDataContext.test.tsx b/app/components/UI/Bridge/hooks/useBridgeQuoteData/BridgeQuoteDataContext.test.tsx
new file mode 100644
index 00000000000..a8b5ade2500
--- /dev/null
+++ b/app/components/UI/Bridge/hooks/useBridgeQuoteData/BridgeQuoteDataContext.test.tsx
@@ -0,0 +1,169 @@
+import React from 'react';
+import { waitFor } from '@testing-library/react-native';
+import { BigNumber } from 'ethers';
+import { SolScope } from '@metamask/keyring-api';
+import {
+  selectBridgeQuotes,
+  selectBridgeFeatureFlags,
+} from '@metamask/bridge-controller';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import {
+  BridgeQuoteDataProvider,
+  useBridgeQuoteDataContext,
+} from './BridgeQuoteDataContext';
+import { createBridgeTestState } from '../../testUtils';
+import { mockQuoteWithMetadata } from '../../_mocks_/bridgeQuoteWithMetadata';
+import {
+  getQuoteRefreshRate,
+  isQuoteExpired,
+  shouldRefreshQuote,
+} from '../../utils/quoteUtils';
+
+jest.mock('../../utils/quoteUtils', () => ({
+  isQuoteExpired: jest.fn(),
+  getQuoteRefreshRate: jest.fn(),
+  shouldRefreshQuote: jest.fn(),
+}));
+
+jest.mock(
+  '../../../../../core/redux/slices/bridge/utils/hasMinimumRequiredVersion',
+  () => ({
+    hasMinimumRequiredVersion: jest.fn(() => true),
+  }),
+);
+
+jest.mock('@metamask/bridge-controller', () => {
+  const actual = jest.requireActual('@metamask/bridge-controller');
+  return {
+    ...actual,
+    selectBridgeQuotes: jest.fn(),
+    selectBridgeFeatureFlags: jest.fn().mockImplementation(() => ({
+      minimumVersion: '7.58.0',
+      priceImpactThreshold: {
+        gasless: 0.4,
+        normal: 0.19,
+        warning: 0.05,
+        error: 0.25,
+      },
+    })),
+  };
+});
+
+const mockValidateBridgeTx = jest.fn();
+jest.mock('../../../../../util/bridge/hooks/useValidateBridgeTx', () => ({
+  __esModule: true,
+  default: () => ({
+    validateBridgeTx: mockValidateBridgeTx,
+  }),
+}));
+
+const mockUseIsInsufficientBalance = jest.fn();
+jest.mock('../useInsufficientBalance', () => ({
+  __esModule: true,
+  default: (params: unknown) => mockUseIsInsufficientBalance(params),
+}));
+
+jest.mock('../../../../../core/Engine', () => ({
+  context: {
+    NetworkController: {
+      findNetworkClientIdByChainId: jest.fn(() => 'mainnet'),
+      getNetworkClientById: jest.fn(() => ({
+        configuration: {
+          chainId: '0x1',
+        },
+      })),
+    },
+  },
+}));
+
+jest.mock('../../../../../util/notifications/methods/common', () => ({
+  getProviderByChainId: jest.fn(() => ({
+    getBalance: jest.fn().mockResolvedValue('1000000000000000000'),
+  })),
+}));
+
+function Consumer() {
+  useBridgeQuoteDataContext();
+  return null;
+}
+
+describe('BridgeQuoteDataContext', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (isQuoteExpired as jest.Mock).mockReturnValue(false);
+    (getQuoteRefreshRate as jest.Mock).mockReturnValue(5000);
+    (shouldRefreshQuote as jest.Mock).mockReturnValue(false);
+    mockUseIsInsufficientBalance.mockReturnValue(false);
+    mockValidateBridgeTx.mockResolvedValue({ status: 'SUCCESS' });
+    (selectBridgeQuotes as unknown as jest.Mock).mockImplementation(() => ({
+      recommendedQuote: mockQuoteWithMetadata,
+      sortedQuotes: [mockQuoteWithMetadata],
+    }));
+    (selectBridgeFeatureFlags as unknown as jest.Mock).mockImplementation(
+      () => ({
+        minimumVersion: '7.58.0',
+        priceImpactThreshold: {
+          gasless: 0.4,
+          normal: 0.19,
+          warning: 0.05,
+          error: 0.25,
+        },
+      }),
+    );
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('shares one bridge quote data instance across multiple consumers', async () => {
+    jest.spyOn(console, 'warn').mockImplementation();
+
+    const testState = createBridgeTestState({
+      bridgeReducerOverrides: {
+        sourceAmount: '0.5',
+        sourceToken: {
+          symbol: 'SOL',
+          chainId: SolScope.Mainnet,
+          address:
+            'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:11111111111111111111111111111111',
+          decimals: 9,
+        },
+        destToken: {
+          symbol: 'USDC',
+          chainId: SolScope.Mainnet,
+          address:
+            'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+          decimals: 6,
+        },
+      },
+    });
+
+    renderWithProvider(
+      <BridgeQuoteDataProvider
+        latestSourceAtomicBalance={BigNumber.from('1000000000')}
+      >
+        <Consumer />
+        <Consumer />
+        <Consumer />
+        <Consumer />
+        <Consumer />
+      </BridgeQuoteDataProvider>,
+      { state: testState },
+    );
+
+    await waitFor(() => {
+      expect(mockValidateBridgeTx).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  it('throws when used outside BridgeQuoteDataProvider', () => {
+    jest.spyOn(console, 'error').mockImplementation();
+
+    expect(() => {
+      renderWithProvider(<Consumer />);
+    }).toThrow(
+      'useBridgeQuoteDataContext must be used within BridgeQuoteDataProvider',
+    );
+  });
+});
diff --git a/app/components/UI/Bridge/hooks/useBridgeQuoteData/BridgeQuoteDataContext.tsx b/app/components/UI/Bridge/hooks/useBridgeQuoteData/BridgeQuoteDataContext.tsx
new file mode 100644
index 00000000000..517ffaf5e41
--- /dev/null
+++ b/app/components/UI/Bridge/hooks/useBridgeQuoteData/BridgeQuoteDataContext.tsx
@@ -0,0 +1,40 @@
+import React, { createContext, useContext } from 'react';
+import { BigNumber as EthersBigNumber } from 'ethers';
+import { useBridgeQuoteData } from './index';
+
+type BridgeQuoteDataContextValue = ReturnType<typeof useBridgeQuoteData>;
+
+const BridgeQuoteDataContext =
+  createContext<BridgeQuoteDataContextValue | null>(null);
+
+interface BridgeQuoteDataProviderProps {
+  children: React.ReactNode;
+  latestSourceAtomicBalance?: EthersBigNumber;
+}
+
+export function BridgeQuoteDataProvider({
+  children,
+  latestSourceAtomicBalance,
+}: BridgeQuoteDataProviderProps) {
+  const value = useBridgeQuoteData({
+    latestSourceAtomicBalance,
+  });
+
+  return (
+    <BridgeQuoteDataContext.Provider value={value}>
+      {children}
+    </BridgeQuoteDataContext.Provider>
+  );
+}
+
+export function useBridgeQuoteDataContext(): BridgeQuoteDataContextValue {
+  const context = useContext(BridgeQuoteDataContext);
+
+  if (!context) {
+    throw new Error(
+      'useBridgeQuoteDataContext must be used within BridgeQuoteDataProvider',
+    );
+  }
+
+  return context;
+}
diff --git a/app/components/UI/Bridge/hooks/useBridgeQuoteData/index.ts b/app/components/UI/Bridge/hooks/useBridgeQuoteData/index.ts
index 230f1b924c6..b7e9c1a0099 100644
--- a/app/components/UI/Bridge/hooks/useBridgeQuoteData/index.ts
+++ b/app/components/UI/Bridge/hooks/useBridgeQuoteData/index.ts
@@ -61,6 +61,10 @@ export const useBridgeQuoteData = ({
   const [blockaidError, setBlockaidError] = useState<string | null>(null);
   // Ref to track the current validation ID to prevent race conditions
   const currentValidationIdRef = useRef<number>(0);
+  const lastValidatedQuoteRef = useRef<{
+    requestId: string;
+    validateBridgeTx: typeof validateBridgeTx;
+  } | null>(null);
 
   const {
     quoteFetchError,
@@ -279,49 +283,76 @@ export const useBridgeQuoteData = ({
   );
 
   const validateQuote = useCallback(async () => {
+    if (
+      !activeQuote ||
+      (!isSolanaSwap && !isSolanaToNonSolana) ||
+      // Skip validation for gas-included quotes on Solana
+      activeQuote?.quote?.gasIncluded === true
+    ) {
+      lastValidatedQuoteRef.current = null;
+      setBlockaidError(null);
+      return;
+    }
+
+    const activeQuoteRequestId = activeQuote.quote.requestId;
+    const hasValidatedCurrentQuote =
+      lastValidatedQuoteRef.current?.requestId === activeQuoteRequestId &&
+      lastValidatedQuoteRef.current?.validateBridgeTx === validateBridgeTx;
+
+    if (hasValidatedCurrentQuote) {
+      return;
+    }
+
+    lastValidatedQuoteRef.current = {
+      requestId: activeQuoteRequestId,
+      validateBridgeTx,
+    };
+
     // Increment validation ID for this request
     const validationId = ++currentValidationIdRef.current;
     // Cancel any ongoing request
     abortController.current?.abort();
     abortController.current = new AbortController();
 
-    if (activeQuote && (isSolanaSwap || isSolanaToNonSolana)) {
-      try {
-        const validationResult = await validateBridgeTx({
-          quoteResponse: activeQuote,
-          signal: abortController.current?.signal,
-        });
-
-        // Check if this is still the current validation after async operation
-        if (validationId !== currentValidationIdRef.current) {
-          // This validation is outdated, ignore the result
-          return;
-        }
-
-        if (validationResult.status === 'ERROR') {
-          const isValidationError = !!validationResult.result.validation.reason;
-          const { error_details } = validationResult;
-          const fallbackErrorMessage = isValidationError
-            ? validationResult.result.validation.reason
-            : validationResult.error;
-          const error = error_details?.message
-            ? `The ${error_details.message}.`
-            : fallbackErrorMessage;
-          setBlockaidError(error);
-        } else {
-          setBlockaidError(null);
-        }
-      } catch (error) {
-        // Check if this is still the current validation after async operation
-        if (validationId !== currentValidationIdRef.current) {
-          // This validation is outdated, ignore the result
-          return;
-        }
-
-        console.error('Swaps Quote Data Validation error:', error);
+    try {
+      const validationResult = await validateBridgeTx({
+        quoteResponse: activeQuote,
+        signal: abortController.current?.signal,
+      });
+
+      // Check if this is still the current validation after async operation
+      if (validationId !== currentValidationIdRef.current) {
+        // This validation is outdated, ignore the result
+        return;
+      }
+
+      if (validationResult.status === 'ERROR') {
+        const isValidationError = !!validationResult.result.validation.reason;
+        const { error_details } = validationResult;
+        const fallbackErrorMessage = isValidationError
+          ? validationResult.result.validation.reason
+          : validationResult.error;
+        const error = error_details?.message
+          ? `The ${error_details.message}.`
+          : fallbackErrorMessage;
+        setBlockaidError(error);
+      } else {
         setBlockaidError(null);
       }
-    } else {
+    } catch (error) {
+      // Check if this is still the current validation after async operation
+      if (validationId !== currentValidationIdRef.current) {
+        // This validation is outdated, ignore the result
+        return;
+      }
+
+      console.error('Swaps Quote Data Validation error:', error);
+      if (
+        lastValidatedQuoteRef.current?.requestId === activeQuoteRequestId &&
+        lastValidatedQuoteRef.current?.validateBridgeTx === validateBridgeTx
+      ) {
+        lastValidatedQuoteRef.current = null;
+      }
       setBlockaidError(null);
     }
   }, [activeQuote, isSolanaSwap, isSolanaToNonSolana, validateBridgeTx]);
@@ -336,7 +367,7 @@ export const useBridgeQuoteData = ({
     }
   }, [manuallySelectedQuote, dispatch]);
 
-  return {
+  const returnValue = {
     bestQuote,
     quoteFetchError,
     activeQuote,
@@ -354,4 +385,6 @@ export const useBridgeQuoteData = ({
     isActiveQuoteForCurrentTokenPair:
       isQuoteSourceTokenMatch && isQuoteDestTokenMatch,
   };
+
+  return returnValue;
 };
diff --git a/app/components/UI/Bridge/hooks/useBridgeQuoteData/useBridgeQuoteData.test.ts b/app/components/UI/Bridge/hooks/useBridgeQuoteData/useBridgeQuoteData.test.ts
index cbd5b789bd8..b5d66ad913c 100644
--- a/app/components/UI/Bridge/hooks/useBridgeQuoteData/useBridgeQuoteData.test.ts
+++ b/app/components/UI/Bridge/hooks/useBridgeQuoteData/useBridgeQuoteData.test.ts
@@ -16,10 +16,11 @@ import {
 import AppConstants from '../../../../../core/AppConstants';
 import { useBridgeQuoteData } from '.';
 import { mockQuoteWithMetadata } from '../../_mocks_/bridgeQuoteWithMetadata';
-import { waitFor } from '@testing-library/react-native';
+import { act, waitFor } from '@testing-library/react-native';
 import { BigNumber } from 'ethers';
 import { SolScope } from '@metamask/keyring-api';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
+import { setSourceAmount } from '../../../../../core/redux/slices/bridge';
 
 jest.mock('../../utils/quoteUtils', () => ({
   isQuoteExpired: jest.fn(),
@@ -1023,6 +1024,132 @@ describe('useBridgeQuoteData', () => {
     });
   });
 
+  it('retries validation for the same requestId after validation throws', async () => {
+    const consoleErrorSpy = jest
+      .spyOn(console, 'error')
+      .mockImplementation(jest.fn());
+    const requestId = 'same-request-id';
+    const firstMockQuote = {
+      ...mockQuoteWithMetadata,
+      quote: {
+        ...mockQuoteWithMetadata.quote,
+        requestId,
+      },
+    };
+    const secondMockQuote = {
+      ...mockQuoteWithMetadata,
+      quote: {
+        ...mockQuoteWithMetadata.quote,
+        requestId,
+      },
+    };
+    let recommendedQuote = firstMockQuote;
+
+    (selectBridgeQuotes as unknown as jest.Mock).mockImplementation(() => ({
+      recommendedQuote,
+      alternativeQuotes: [],
+    }));
+
+    mockValidateBridgeTx
+      .mockRejectedValueOnce(new Error('Network timeout'))
+      .mockResolvedValueOnce({ status: 'SUCCESS' });
+
+    const bridgeReducerOverrides = {
+      sourceToken: {
+        symbol: 'SOL',
+        chainId: SolScope.Mainnet,
+        address: '11111111111111111111111111111112',
+        decimals: 9,
+      },
+      destToken: {
+        symbol: 'USDC',
+        chainId: SolScope.Mainnet,
+        address:
+          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+        decimals: 6,
+      },
+    };
+
+    const testState = createBridgeTestState({
+      bridgeReducerOverrides,
+    });
+
+    const { store } = renderHookWithProvider(() => useBridgeQuoteData(), {
+      state: testState,
+    });
+
+    await waitFor(() => {
+      expect(mockValidateBridgeTx).toHaveBeenCalledTimes(1);
+    });
+    await waitFor(() => {
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        'Swaps Quote Data Validation error:',
+        expect.any(Error),
+      );
+    });
+
+    recommendedQuote = secondMockQuote;
+    act(() => {
+      store.dispatch(setSourceAmount('2'));
+    });
+
+    await waitFor(() => {
+      expect(mockValidateBridgeTx).toHaveBeenCalledTimes(2);
+    });
+
+    consoleErrorSpy.mockRestore();
+  });
+
+  it('skips validation for gas-included quotes on Solana', async () => {
+    const mockQuoteWithGasIncluded = {
+      ...mockQuoteWithMetadata,
+      quote: {
+        ...mockQuoteWithMetadata.quote,
+        gasIncluded: true,
+      },
+    };
+
+    (selectBridgeQuotes as unknown as jest.Mock).mockImplementation(() => ({
+      recommendedQuote: mockQuoteWithGasIncluded,
+      alternativeQuotes: [],
+    }));
+
+    const bridgeReducerOverrides = {
+      sourceToken: {
+        symbol: 'SOL',
+        chainId: SolScope.Mainnet,
+        address: '11111111111111111111111111111112',
+        decimals: 9,
+      },
+      destToken: {
+        symbol: 'USDC',
+        chainId: SolScope.Mainnet,
+        address:
+          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+        decimals: 6,
+      },
+    };
+
+    const testState = createBridgeTestState({
+      bridgeReducerOverrides,
+    });
+
+    const { result } = renderHookWithProvider(() => useBridgeQuoteData(), {
+      state: testState,
+    });
+
+    // Wait for the hook to stabilize
+    await waitFor(() => {
+      expect(result.current.activeQuote).toEqual(mockQuoteWithGasIncluded);
+    });
+
+    // Verify that validateBridgeTx was never called for gas-included quotes
+    expect(mockValidateBridgeTx).not.toHaveBeenCalled();
+
+    // Verify that no blockaid error is set
+    expect(result.current.blockaidError).toBe(null);
+  });
+
   // Test validQuotes filtering
   describe('validQuotes filtering', () => {
     it('returns filtered validQuotes that match destination token', () => {
diff --git a/app/components/UI/Bridge/hooks/useBridgeQuoteEvents/index.ts b/app/components/UI/Bridge/hooks/useBridgeQuoteEvents/index.ts
index cdc359d4eea..2ce324d172b 100644
--- a/app/components/UI/Bridge/hooks/useBridgeQuoteEvents/index.ts
+++ b/app/components/UI/Bridge/hooks/useBridgeQuoteEvents/index.ts
@@ -19,6 +19,7 @@ import { useTokenBalanceInUsd } from '../useTokenBalanceInUsd';
  */
 export const useBridgeQuoteEvents = ({
   hasInsufficientBalance,
+  hasInsufficientNativeReserveError,
   hasNoQuotesAvailable,
   hasInsufficientGas,
   hasTxAlert,
@@ -26,6 +27,7 @@ export const useBridgeQuoteEvents = ({
   isPriceImpactWarningVisible,
 }: {
   hasInsufficientBalance: boolean;
+  hasInsufficientNativeReserveError: boolean;
   hasNoQuotesAvailable: boolean;
   hasInsufficientGas: boolean;
   hasTxAlert: boolean;
@@ -48,6 +50,9 @@ export const useBridgeQuoteEvents = ({
     hasInsufficientGas &&
       latestWarnings.push('insufficient_gas_for_selected_quote');
     hasInsufficientBalance && latestWarnings.push('insufficient_balance');
+    hasInsufficientNativeReserveError &&
+      // @ts-expect-error - 'insufficient_native_reserve' is a valid QuoteWarning
+      latestWarnings.push('insufficient_native_reserve');
     hasTxAlert && latestWarnings.push('tx_alert');
     isPriceImpactWarningVisible && latestWarnings.push('price_impact');
 
@@ -56,6 +61,7 @@ export const useBridgeQuoteEvents = ({
     hasNoQuotesAvailable,
     hasInsufficientGas,
     hasInsufficientBalance,
+    hasInsufficientNativeReserveError,
     hasTxAlert,
     isPriceImpactWarningVisible,
   ]);
diff --git a/app/components/UI/Bridge/hooks/useBridgeQuoteEvents/useBridgeQuoteEvents.test.tsx b/app/components/UI/Bridge/hooks/useBridgeQuoteEvents/useBridgeQuoteEvents.test.tsx
index 166df39027c..43c622b8985 100644
--- a/app/components/UI/Bridge/hooks/useBridgeQuoteEvents/useBridgeQuoteEvents.test.tsx
+++ b/app/components/UI/Bridge/hooks/useBridgeQuoteEvents/useBridgeQuoteEvents.test.tsx
@@ -45,6 +45,7 @@ describe('useBridgeQuoteEvents', () => {
             hasTxAlert: false,
             isSubmitDisabled: false,
             isPriceImpactWarningVisible: false,
+            hasInsufficientNativeReserveError: false,
           }),
         { state: testState },
       );
@@ -86,6 +87,7 @@ describe('useBridgeQuoteEvents', () => {
             hasTxAlert: false,
             isSubmitDisabled: false,
             isPriceImpactWarningVisible: false,
+            hasInsufficientNativeReserveError: false,
             ...hookArgs,
           }),
         { state: testState },
diff --git a/app/components/UI/Bridge/hooks/useBridgeQuoteRequest/index.ts b/app/components/UI/Bridge/hooks/useBridgeQuoteRequest/index.ts
index f5e80d65838..4c4a294865b 100644
--- a/app/components/UI/Bridge/hooks/useBridgeQuoteRequest/index.ts
+++ b/app/components/UI/Bridge/hooks/useBridgeQuoteRequest/index.ts
@@ -24,6 +24,7 @@ import { useUnifiedSwapBridgeContext } from '../useUnifiedSwapBridgeContext';
 import useIsInsufficientBalance from '../useInsufficientBalance';
 import { useLatestBalance } from '../useLatestBalance';
 import { BigNumber } from 'ethers';
+import { useInsufficientNativeReserveError } from '../useInsufficientNativeReserveError';
 
 export const DEBOUNCE_WAIT = 300;
 
@@ -68,7 +69,7 @@ export const useBridgeQuoteRequest = (
   // The full balance check with gas fees is used separately within the BridgeView to block user from executing
   // the swap in insufficient balance.
   // This prevents the infinite loop: quote request → gas data changes → insufficientBal changes → new quote request
-  const insufficientBal = useIsInsufficientBalance({
+  const insufficientBalance = useIsInsufficientBalance({
     amount: sourceAmount,
     token: sourceToken,
     latestAtomicBalance: sourceAtomicBalance,
@@ -79,6 +80,16 @@ export const useBridgeQuoteRequest = (
     selectGasIncludedQuoteParams,
   );
 
+  const insufficientNativeReserveError = useInsufficientNativeReserveError({
+    amount: sourceAmount,
+    token: sourceToken,
+    latestAtomicBalance: sourceAtomicBalance,
+    walletAddress,
+  });
+
+  const insufficientBal =
+    insufficientBalance || Boolean(insufficientNativeReserveError);
+
   /**
    * Updates quote parameters in the bridge controller
    */
diff --git a/app/components/UI/Bridge/hooks/useBridgeQuoteRequest/useBridgeQuoteRequest.test.ts b/app/components/UI/Bridge/hooks/useBridgeQuoteRequest/useBridgeQuoteRequest.test.ts
index eb9c0b82cfd..4ff41034b46 100644
--- a/app/components/UI/Bridge/hooks/useBridgeQuoteRequest/useBridgeQuoteRequest.test.ts
+++ b/app/components/UI/Bridge/hooks/useBridgeQuoteRequest/useBridgeQuoteRequest.test.ts
@@ -1,14 +1,17 @@
+import { BigNumber } from 'ethers';
+import { act } from '@testing-library/react-native';
+
+import { isSolanaChainId } from '@metamask/bridge-controller';
+
 import '../../_mocks_/initialState';
 import { DEBOUNCE_WAIT, useBridgeQuoteRequest } from './';
 import { renderHookWithProvider } from '../../../../../util/test/renderWithProvider';
 import { createBridgeTestState } from '../../testUtils';
 import Engine from '../../../../../core/Engine';
-import { act } from '@testing-library/react-native';
-import { isSolanaChainId } from '@metamask/bridge-controller';
 import { selectSourceWalletAddress } from '../../../../../selectors/bridge';
 import useIsInsufficientBalance from '../useInsufficientBalance';
 import { useLatestBalance } from '../useLatestBalance';
-import { BigNumber } from 'ethers';
+import { useInsufficientNativeReserveError } from '../useInsufficientNativeReserveError';
 
 // Mock isSolanaChainId
 jest.mock('@metamask/bridge-controller', () => ({
@@ -66,6 +69,12 @@ jest.mock('../useInsufficientBalance', () => ({
   default: jest.fn(),
 }));
 
+// Mock the useInsufficientNativeReserveError hook
+jest.mock('../useInsufficientNativeReserveError', () => ({
+  __esModule: true,
+  useInsufficientNativeReserveError: jest.fn(),
+}));
+
 jest.mock('../useLatestBalance', () => ({
   useLatestBalance: jest.fn(),
 }));
@@ -90,6 +99,11 @@ const mockUseLatestBalance = useLatestBalance as jest.MockedFunction<
   typeof useLatestBalance
 >;
 
+const mockUseInsufficientNativeReserveError =
+  useInsufficientNativeReserveError as jest.MockedFunction<
+    typeof useInsufficientNativeReserveError
+  >;
+
 describe('useBridgeQuoteRequest', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -107,6 +121,7 @@ describe('useBridgeQuoteRequest', () => {
     });
 
     mockUseIsInsufficientBalance.mockReturnValue(false);
+    mockUseInsufficientNativeReserveError.mockReturnValue(undefined);
   });
 
   afterEach(() => {
@@ -584,6 +599,36 @@ describe('useBridgeQuoteRequest', () => {
       );
     });
 
+    it('includes insufficientBal true when balance is sufficient but insufficientNativeReserveError is set', async () => {
+      mockUseIsInsufficientBalance.mockReturnValue(false);
+      const testState = createBridgeTestState({
+        bridgeReducerOverrides: {
+          sourceAmount: '1.0',
+        },
+      });
+
+      mockUseInsufficientNativeReserveError.mockReturnValue({
+        minimumNativeBalanceToBeKeptInAccount: '10',
+        maxSwappableNativeBalance: '40',
+      });
+
+      const { result } = renderHookWithProvider(() => useBridgeQuoteRequest(), {
+        state: testState,
+      });
+
+      await act(async () => {
+        await result.current();
+        jest.advanceTimersByTime(DEBOUNCE_WAIT);
+      });
+
+      expect(spyUpdateBridgeQuoteRequestParams).toHaveBeenCalledWith(
+        expect.objectContaining({
+          insufficientBal: true,
+        }),
+        undefined,
+      );
+    });
+
     it('passes correct parameters to useIsInsufficientBalance hook', async () => {
       mockUseIsInsufficientBalance.mockReturnValue(false);
       const testState = createBridgeTestState({
diff --git a/app/components/UI/Bridge/hooks/useInsufficientNativeReserveError/index.ts b/app/components/UI/Bridge/hooks/useInsufficientNativeReserveError/index.ts
new file mode 100644
index 00000000000..df6780f63b1
--- /dev/null
+++ b/app/components/UI/Bridge/hooks/useInsufficientNativeReserveError/index.ts
@@ -0,0 +1,103 @@
+import {
+  formatChainIdToHex,
+  isNativeAddress,
+  isNonEvmChainId,
+} from '@metamask/bridge-controller';
+import { Hex } from '@metamask/utils';
+import { BridgeToken } from '../../types';
+import { useSelector } from 'react-redux';
+import { getGasFeesSponsoredNetworkEnabled } from '../../../../../selectors/featureFlagController/gasFeesSponsored';
+import { BigNumber } from 'ethers';
+import { BigNumber as BigNumberJS } from 'bignumber.js';
+import { formatUnits, parseUnits } from 'ethers/lib/utils';
+import { isHardwareAccount } from '../../../../../util/address';
+
+const MINIMUM_NATIVE_RESERVE_BALANCE_PER_CHAIN: { [key: Hex]: string } = {
+  '0x8f': '10',
+};
+
+const getMinimumReserveBalanceForTokenChainAndAddress = ({
+  chainIdHex,
+  tokenAddress,
+}: {
+  chainIdHex: Hex;
+  tokenAddress: Hex;
+}): string => {
+  if (!tokenAddress || !isNativeAddress(tokenAddress)) {
+    return '0';
+  }
+  return MINIMUM_NATIVE_RESERVE_BALANCE_PER_CHAIN[chainIdHex] ?? '0';
+};
+
+interface UseInsufficientNativeReserveErrorParams {
+  amount?: string;
+  token?: BridgeToken;
+  latestAtomicBalance?: BigNumber;
+  walletAddress?: string;
+}
+
+/**
+ * Initially for gas-sponsored networks with a native reserve balance
+ * logic, such as for Monad that needs 10 MON at all times.
+ */
+export const useInsufficientNativeReserveError = ({
+  amount,
+  token,
+  latestAtomicBalance,
+  walletAddress,
+}: UseInsufficientNativeReserveErrorParams) => {
+  const isGasFeesSponsoredNetworkEnabled = useSelector(
+    getGasFeesSponsoredNetworkEnabled,
+  );
+
+  if (
+    !amount ||
+    !token?.address ||
+    !token?.chainId ||
+    !latestAtomicBalance ||
+    !walletAddress ||
+    isNonEvmChainId(token.chainId)
+  ) {
+    return undefined;
+  }
+
+  const isHardwareWalletAccount = Boolean(
+    walletAddress && isHardwareAccount(walletAddress),
+  );
+
+  const chainIdHex = formatChainIdToHex(token.chainId);
+  const isNetworkGasSponsored = isNonEvmChainId(token.chainId)
+    ? false
+    : !isHardwareWalletAccount && isGasFeesSponsoredNetworkEnabled(chainIdHex);
+
+  const minimumNativeBalanceToBeKeptInAccount = isNetworkGasSponsored
+    ? getMinimumReserveBalanceForTokenChainAndAddress({
+        chainIdHex,
+        tokenAddress: token.address as Hex,
+      })
+    : '0';
+
+  const maxSwappableNativeBalanceBaseUnits = BigNumberJS.max(
+    new BigNumberJS(latestAtomicBalance.toString() ?? '0').minus(
+      BigNumberJS(
+        parseUnits(
+          minimumNativeBalanceToBeKeptInAccount,
+          token.decimals,
+        ).toString(),
+      ),
+    ),
+    0,
+  );
+
+  const maxSwappableNativeBalance = BigNumberJS(
+    formatUnits(maxSwappableNativeBalanceBaseUnits.toFixed(0), token.decimals),
+  );
+
+  return minimumNativeBalanceToBeKeptInAccount !== '0' &&
+    maxSwappableNativeBalance.lt(amount)
+    ? {
+        minimumNativeBalanceToBeKeptInAccount,
+        maxSwappableNativeBalance: maxSwappableNativeBalance.toString(),
+      }
+    : undefined;
+};
diff --git a/app/components/UI/Bridge/hooks/useInsufficientNativeReserveError/useInsufficientNativeReserveError.test.tsx b/app/components/UI/Bridge/hooks/useInsufficientNativeReserveError/useInsufficientNativeReserveError.test.tsx
new file mode 100644
index 00000000000..8093ca6f33d
--- /dev/null
+++ b/app/components/UI/Bridge/hooks/useInsufficientNativeReserveError/useInsufficientNativeReserveError.test.tsx
@@ -0,0 +1,223 @@
+import React from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+import { Provider } from 'react-redux';
+import { legacy_createStore as createStore, Store } from 'redux';
+
+import { BridgeToken } from '../../types';
+import { BigNumber } from 'ethers';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import { initialState } from '../../_mocks_/initialState';
+import { useInsufficientNativeReserveError } from './index';
+import { ZERO_ADDRESS } from '../../../../Views/confirmations/constants/address';
+import { getGasFeesSponsoredNetworkEnabled } from '../../../../../selectors/featureFlagController/gasFeesSponsored';
+
+jest.mock('../../../../../selectors/featureFlagController/gasFeesSponsored');
+jest.mock('../../../../../util/address', () => ({
+  ...jest.requireActual('../../../../../util/address'),
+  isHardwareAccount: jest.fn(),
+}));
+import { isHardwareAccount } from '../../../../../util/address';
+
+const mockGetGasFeesSponsoredNetworkEnabled = jest.mocked(
+  getGasFeesSponsoredNetworkEnabled,
+);
+const mockIsHardwareAccount = jest.mocked(isHardwareAccount);
+
+// Helper to create a mock store with proper state structure
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const createMockStore = (): Store => {
+  const rootReducer = (state = initialState) => state;
+  return createStore(rootReducer, initialState);
+};
+
+// Helper to wrap hook with provider
+const wrapper =
+  (store: Store) =>
+  ({ children }: { children: React.ReactNode }) => (
+    <Provider store={store}>{children}</Provider>
+  );
+
+const wmonTokenOnMonad: BridgeToken = {
+  address: '0x3bd359c1119da7da1d913d1c4d2b7c461115433a', // USDC
+  symbol: 'WMON',
+  decimals: 18,
+  chainId: CHAIN_IDS.MONAD as `0x${string}`,
+};
+
+const monTokenOnMonad: BridgeToken = {
+  address: ZERO_ADDRESS,
+  symbol: 'MON',
+  decimals: 18,
+  chainId: CHAIN_IDS.MONAD as `0x${string}`,
+};
+
+const ethTokenOnMainnet: BridgeToken = {
+  address: ZERO_ADDRESS,
+  symbol: 'ETH',
+  decimals: 18,
+  chainId: CHAIN_IDS.MAINNET as `0x${string}`,
+};
+
+const nonEvmNativeTokens: BridgeToken[] = [
+  {
+    address: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
+    symbol: 'SOL',
+    decimals: 9,
+    chainId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+  },
+  {
+    address: 'bip122:000000000019d6689c085ae165831e93/slip44:0',
+    symbol: 'BTC',
+    decimals: 8,
+    chainId: 'bip122:000000000019d6689c085ae165831e93',
+  },
+  {
+    address: 'tron:728126428/slip44:195',
+    symbol: 'TRX',
+    decimals: 6,
+    chainId: 'tron:728126428',
+  },
+];
+
+type RenderHookCallback<TProps, TResult> = (props: TProps) => TResult;
+
+function renderHookWithWrapper<
+  TProps extends { children: React.ReactNode },
+  TResult,
+>(callback: RenderHookCallback<TProps, TResult>) {
+  return renderHook(callback, { wrapper: wrapper(createMockStore()) });
+}
+
+describe('useInsufficientNativeReserveError', () => {
+  beforeEach(() => {
+    mockGetGasFeesSponsoredNetworkEnabled.mockReturnValue(() => true);
+    mockIsHardwareAccount.mockReturnValue(false);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns a insufficientNativeReserveError when amount goes beyond reserve', () => {
+    const { result } = renderHookWithWrapper(() =>
+      useInsufficientNativeReserveError({
+        amount: '45',
+        token: monTokenOnMonad,
+        latestAtomicBalance: BigNumber.from('50000000000000000000'), // 50
+        walletAddress: '0x13b7e6EBcd40777099E4c45d407745aB2de1D1F8',
+      }),
+    );
+    expect(result.current).toStrictEqual({
+      maxSwappableNativeBalance: '40',
+      minimumNativeBalanceToBeKeptInAccount: '10',
+    });
+  });
+
+  it('returns a insufficientNativeReserveError when amount goes beyond reserve with bigger amounts', () => {
+    const { result } = renderHookWithWrapper(() =>
+      useInsufficientNativeReserveError({
+        amount: '499999999995',
+        token: monTokenOnMonad,
+        latestAtomicBalance: BigNumber.from('500000000000000000000000000000'), // 500000000000
+        walletAddress: '0x13b7e6EBcd40777099E4c45d407745aB2de1D1F8',
+      }),
+    );
+    expect(result.current).toStrictEqual({
+      maxSwappableNativeBalance: '499999999990',
+      minimumNativeBalanceToBeKeptInAccount: '10',
+    });
+  });
+
+  it('returns a insufficientNativeReserveError even when amount goes beyond balance', () => {
+    const { result } = renderHookWithWrapper(() =>
+      useInsufficientNativeReserveError({
+        amount: '55',
+        token: monTokenOnMonad,
+        latestAtomicBalance: BigNumber.from('50000000000000000000'), // 50
+        walletAddress: '0x13b7e6EBcd40777099E4c45d407745aB2de1D1F8',
+      }),
+    );
+    expect(result.current).toStrictEqual({
+      maxSwappableNativeBalance: '40',
+      minimumNativeBalanceToBeKeptInAccount: '10',
+    });
+  });
+
+  it('returns insufficientNativeReserveError=undefined when amount goes beyond reserve but account is hardware wallet', () => {
+    mockIsHardwareAccount.mockReturnValue(true);
+    const { result } = renderHookWithWrapper(() =>
+      useInsufficientNativeReserveError({
+        amount: '45',
+        token: monTokenOnMonad,
+        latestAtomicBalance: BigNumber.from('50000000000000000000'), // 50
+        walletAddress: '0x13b7e6EBcd40777099E4c45d407745aB2de1D1F8',
+      }),
+    );
+    expect(result.current).toStrictEqual(undefined);
+  });
+
+  it('returns insufficientNativeReserveError=undefined when amount goes beyond reserve but no sponsorship', () => {
+    mockGetGasFeesSponsoredNetworkEnabled.mockReturnValue(() => false);
+    const { result } = renderHookWithWrapper(() =>
+      useInsufficientNativeReserveError({
+        amount: '45',
+        token: monTokenOnMonad,
+        latestAtomicBalance: BigNumber.from('50000000000000000000'), // 50
+        walletAddress: '0x13b7e6EBcd40777099E4c45d407745aB2de1D1F8',
+      }),
+    );
+    expect(result.current).toStrictEqual(undefined);
+  });
+
+  it('returns insufficientNativeReserveError=undefined when amount covers exactly the reserve', () => {
+    const { result } = renderHookWithWrapper(() =>
+      useInsufficientNativeReserveError({
+        amount: '40',
+        token: monTokenOnMonad,
+        latestAtomicBalance: BigNumber.from('50000000000000000000'), // 50
+        walletAddress: '0x13b7e6EBcd40777099E4c45d407745aB2de1D1F8',
+      }),
+    );
+    expect(result.current).toStrictEqual(undefined);
+  });
+
+  it('returns insufficientNativeReserveError=undefined when token is not the native one', () => {
+    const { result } = renderHookWithWrapper(() =>
+      useInsufficientNativeReserveError({
+        amount: '45',
+        token: wmonTokenOnMonad,
+        latestAtomicBalance: BigNumber.from('50000000000000000000'), // 50
+        walletAddress: '0x13b7e6EBcd40777099E4c45d407745aB2de1D1F8',
+      }),
+    );
+    expect(result.current).toStrictEqual(undefined);
+  });
+
+  it.each(nonEvmNativeTokens)(
+    'returns insufficientNativeReserveError=undefined for non-EVM native token $symbol',
+    (token) => {
+      const { result } = renderHookWithWrapper(() =>
+        useInsufficientNativeReserveError({
+          amount: '45',
+          token,
+          latestAtomicBalance: BigNumber.from('50000000000000000000'), // 50
+          walletAddress: '0x13b7e6EBcd40777099E4c45d407745aB2de1D1F8',
+        }),
+      );
+
+      expect(result.current).toStrictEqual(undefined);
+    },
+  );
+
+  it('returns insufficientNativeReserveError=undefined when token is the native one but on a chain not concered with reserve', () => {
+    const { result } = renderHookWithWrapper(() =>
+      useInsufficientNativeReserveError({
+        amount: '45',
+        token: ethTokenOnMainnet,
+        latestAtomicBalance: BigNumber.from('50000000000000000000'), // 50
+        walletAddress: '0x13b7e6EBcd40777099E4c45d407745aB2de1D1F8',
+      }),
+    );
+    expect(result.current).toStrictEqual(undefined);
+  });
+});
diff --git a/app/components/UI/Bridge/hooks/useLatestBalance/index.ts b/app/components/UI/Bridge/hooks/useLatestBalance/index.ts
index f55e07f8e1c..525d4346065 100644
--- a/app/components/UI/Bridge/hooks/useLatestBalance/index.ts
+++ b/app/components/UI/Bridge/hooks/useLatestBalance/index.ts
@@ -243,16 +243,26 @@ export const useLatestBalance = (token: {
     return { displayBalance, atomicBalance };
   }, [token.balance, token.decimals]);
 
-  if (!token.address || !token.decimals) {
-    return undefined;
-  }
+  const latestBalance = useMemo(() => {
+    if (!token.address || !token.decimals) {
+      return undefined;
+    }
 
-  // If the token identity has changed, return cached balance of new token
-  // so we have time to fetch the new balance.
-  if (tokenIdentityChanged) {
-    return cachedBalance;
-  }
+    // If the token identity has changed, return cached balance of new token
+    // so we have time to fetch the new balance.
+    if (tokenIdentityChanged) {
+      return cachedBalance;
+    }
+
+    // Return balance if it exists, otherwise return cached balance of new token
+    return balance ?? cachedBalance;
+  }, [
+    balance,
+    cachedBalance,
+    token.address,
+    token.decimals,
+    tokenIdentityChanged,
+  ]);
 
-  // Return balance if it exists, otherwise return cached balance of new token
-  return balance ?? cachedBalance;
+  return latestBalance;
 };
diff --git a/app/components/UI/Bridge/hooks/useShouldRenderGasSponsoredBanner/index.test.ts b/app/components/UI/Bridge/hooks/useShouldRenderGasSponsoredBanner/index.test.ts
index 721ac9c9b24..19cc16ebca2 100644
--- a/app/components/UI/Bridge/hooks/useShouldRenderGasSponsoredBanner/index.test.ts
+++ b/app/components/UI/Bridge/hooks/useShouldRenderGasSponsoredBanner/index.test.ts
@@ -1,6 +1,7 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { useShouldRenderGasSponsoredBanner } from './index';
 import { useIsNetworkGasSponsored } from '../useIsNetworkGasSponsored';
+import { useIsHardwareWalletForBridge } from '../useIsHardwareWalletForBridge';
 import { useSelector } from 'react-redux';
 import {
   selectSourceToken,
@@ -8,6 +9,7 @@ import {
 } from '../../../../../core/redux/slices/bridge';
 
 jest.mock('../useIsNetworkGasSponsored');
+jest.mock('../useIsHardwareWalletForBridge');
 jest.mock('react-redux', () => ({
   useSelector: jest.fn(),
 }));
@@ -16,6 +18,10 @@ const mockUseIsNetworkGasSponsored =
   useIsNetworkGasSponsored as jest.MockedFunction<
     typeof useIsNetworkGasSponsored
   >;
+const mockUseIsHardwareWalletForBridge =
+  useIsHardwareWalletForBridge as jest.MockedFunction<
+    typeof useIsHardwareWalletForBridge
+  >;
 const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
 
 const SOURCE_CHAIN_ID = '0x1';
@@ -51,6 +57,7 @@ describe('useShouldRenderGasSponsoredBanner', () => {
     jest.clearAllMocks();
     mockTokens({});
     mockUseIsNetworkGasSponsored.mockReturnValue(false);
+    mockUseIsHardwareWalletForBridge.mockReturnValue(false);
   });
 
   describe('returns true when quoteGasSponsored is true', () => {
@@ -146,6 +153,43 @@ describe('useShouldRenderGasSponsoredBanner', () => {
   });
 
   describe('returns false', () => {
+    it('returns false when quote is sponsored but source account is a hardware wallet', () => {
+      // Arrange
+      mockUseIsHardwareWalletForBridge.mockReturnValue(true);
+
+      // Act
+      const { result } = renderHook(() =>
+        useShouldRenderGasSponsoredBanner({
+          quoteGasSponsored: true,
+          hasInsufficientBalance: false,
+        }),
+      );
+
+      // Assert
+      expect(result.current).toBe(false);
+    });
+
+    it('returns false when insufficient balance and network is sponsored but source account is a hardware wallet', () => {
+      // Arrange
+      mockTokens({
+        sourceChainId: SOURCE_CHAIN_ID,
+        destChainId: SAME_CHAIN_DEST_CHAIN_ID,
+      });
+      mockUseIsNetworkGasSponsored.mockReturnValue(true);
+      mockUseIsHardwareWalletForBridge.mockReturnValue(true);
+
+      // Act
+      const { result } = renderHook(() =>
+        useShouldRenderGasSponsoredBanner({
+          quoteGasSponsored: false,
+          hasInsufficientBalance: true,
+        }),
+      );
+
+      // Assert
+      expect(result.current).toBe(false);
+    });
+
     it('returns false when quoteGasSponsored is false and balance is sufficient', () => {
       // Arrange
       mockUseIsNetworkGasSponsored.mockReturnValue(false);
diff --git a/app/components/UI/Bridge/hooks/useShouldRenderGasSponsoredBanner/index.ts b/app/components/UI/Bridge/hooks/useShouldRenderGasSponsoredBanner/index.ts
index 340a63e55ee..399d3183d73 100644
--- a/app/components/UI/Bridge/hooks/useShouldRenderGasSponsoredBanner/index.ts
+++ b/app/components/UI/Bridge/hooks/useShouldRenderGasSponsoredBanner/index.ts
@@ -4,6 +4,7 @@ import {
   selectSourceToken,
   selectDestToken,
 } from '../../../../../core/redux/slices/bridge';
+import { useIsHardwareWalletForBridge } from '../useIsHardwareWalletForBridge';
 
 interface Props {
   quoteGasSponsored?: boolean;
@@ -16,6 +17,7 @@ export const useShouldRenderGasSponsoredBanner = ({
 }: Props) => {
   const sourceToken = useSelector(selectSourceToken);
   const destToken = useSelector(selectDestToken);
+  const isHardwareWallet = useIsHardwareWalletForBridge();
   const isNetworkGasSponsored = useIsNetworkGasSponsored(sourceToken?.chainId);
 
   // Sponsorship only applies to same-chain (swap) flows; cross-chain bridges
@@ -27,8 +29,9 @@ export const useShouldRenderGasSponsoredBanner = ({
   );
 
   const shouldShowGasSponsored =
-    quoteGasSponsored ||
-    (hasInsufficientBalance && isNetworkGasSponsored && isSameChain);
+    !isHardwareWallet &&
+    (quoteGasSponsored ||
+      (hasInsufficientBalance && isNetworkGasSponsored && isSameChain));
 
   return shouldShowGasSponsored;
 };
diff --git a/app/components/UI/Bridge/hooks/useShouldRenderMaxOption/index.ts b/app/components/UI/Bridge/hooks/useShouldRenderMaxOption/index.ts
index 19daf1603a3..6873a2bd327 100644
--- a/app/components/UI/Bridge/hooks/useShouldRenderMaxOption/index.ts
+++ b/app/components/UI/Bridge/hooks/useShouldRenderMaxOption/index.ts
@@ -2,7 +2,7 @@ import { useSelector } from 'react-redux';
 import { selectGasIncludedQuoteParams } from '../../../../../selectors/bridge';
 import { BridgeToken } from '../../types';
 import { useTokenAddress } from '../useTokenAddress';
-import { isNativeAddress } from '@metamask/bridge-controller';
+import { isNativeAddress, isSolanaChainId } from '@metamask/bridge-controller';
 import { BigNumber } from 'bignumber.js';
 
 export const useShouldRenderMaxOption = (
@@ -27,5 +27,9 @@ export const useShouldRenderMaxOption = (
     return true;
   }
 
+  if (isSolanaChainId(token.chainId)) {
+    return false;
+  }
+
   return gasIncluded || gasIncluded7702;
 };
diff --git a/app/components/UI/Bridge/hooks/useShouldRenderMaxOption/useShouldRenderMaxOption.test.ts b/app/components/UI/Bridge/hooks/useShouldRenderMaxOption/useShouldRenderMaxOption.test.ts
index 33510af815a..44a5c7d249e 100644
--- a/app/components/UI/Bridge/hooks/useShouldRenderMaxOption/useShouldRenderMaxOption.test.ts
+++ b/app/components/UI/Bridge/hooks/useShouldRenderMaxOption/useShouldRenderMaxOption.test.ts
@@ -1,6 +1,6 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
-import { isNativeAddress } from '@metamask/bridge-controller';
+import { isNativeAddress, isSolanaChainId } from '@metamask/bridge-controller';
 import { useSelector } from 'react-redux';
 import { useShouldRenderMaxOption } from '.';
 import { BridgeToken } from '../../types';
@@ -19,6 +19,7 @@ jest.mock('@metamask/bridge-controller', () => {
   return {
     ...actual,
     isNativeAddress: jest.fn(),
+    isSolanaChainId: jest.fn(),
   };
 });
 
@@ -29,6 +30,9 @@ const mockUseTokenAddress = useTokenAddress as jest.MockedFunction<
 const mockIsNativeAddress = isNativeAddress as jest.MockedFunction<
   typeof isNativeAddress
 >;
+const mockIsSolanaChainId = isSolanaChainId as jest.MockedFunction<
+  typeof isSolanaChainId
+>;
 
 const mockToken: BridgeToken = {
   address: '0x1234567890123456789012345678901234567890',
@@ -61,6 +65,7 @@ describe('useShouldRenderMaxOption', () => {
     setSelectorValues();
     mockUseTokenAddress.mockReturnValue(mockToken.address);
     mockIsNativeAddress.mockReturnValue(false);
+    mockIsSolanaChainId.mockReturnValue(false);
   });
 
   it('returns false when token is undefined', () => {
@@ -173,6 +178,25 @@ describe('useShouldRenderMaxOption', () => {
     });
     mockUseTokenAddress.mockReturnValue(solanaToken.address);
     mockIsNativeAddress.mockReturnValue(true);
+    mockIsSolanaChainId.mockReturnValue(true);
+
+    const { result } = renderHook(() =>
+      useShouldRenderMaxOption(solanaToken, '3'),
+    );
+
+    expect(result.current).toBe(false);
+  });
+
+  it('returns false for Solana native token even when gasIncluded is true', () => {
+    const solanaToken: BridgeToken = {
+      ...nativeToken,
+      chainId:
+        'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' as `${string}:${string}`,
+    };
+    setSelectorValues({ gasIncluded: true });
+    mockUseTokenAddress.mockReturnValue(solanaToken.address);
+    mockIsNativeAddress.mockReturnValue(true);
+    mockIsSolanaChainId.mockReturnValue(true);
 
     const { result } = renderHook(() =>
       useShouldRenderMaxOption(solanaToken, '3'),
diff --git a/app/components/UI/Bridge/utils/tokenUtils.ts b/app/components/UI/Bridge/utils/tokenUtils.ts
index 8dde8c5da67..b4f0269e78c 100644
--- a/app/components/UI/Bridge/utils/tokenUtils.ts
+++ b/app/components/UI/Bridge/utils/tokenUtils.ts
@@ -12,15 +12,6 @@ import { DefaultSwapDestTokens } from '../constants/default-swap-dest-tokens';
 import { IncludeAsset } from '../hooks/usePopularTokens';
 import { POLYGON_NATIVE_TOKEN } from '../constants/assets';
 
-/**
- * Extracts security warning descriptions from a token's securityData metadata features.
- * Returns an empty array when the token has no security warnings.
- */
-export const getSecurityWarnings = (
-  token: BridgeToken | undefined | null,
-): string[] =>
-  token?.securityData?.metadata?.features?.map((f) => f.description) ?? [];
-
 /**
  * Normalizes chain-specific native token addresses to the zero address for the bridge flow.
  *
diff --git a/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.test.tsx b/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.test.tsx
index 51c64e2cbc3..96c0b28e4a8 100644
--- a/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.test.tsx
+++ b/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.test.tsx
@@ -1,12 +1,5 @@
 import React from 'react';
-import { TextInput } from 'react-native';
-import {
-  fireEvent,
-  screen,
-  waitFor,
-  act,
-  within,
-} from '@testing-library/react-native';
+import { fireEvent, screen, waitFor, act } from '@testing-library/react-native';
 import { renderScreen } from '../../../../../util/test/renderWithProvider';
 import CardAuthentication from './CardAuthentication';
 import Routes from '../../../../../constants/navigation/Routes';
@@ -66,9 +59,9 @@ const mockGetErrorMessage = jest.fn(
   (err: unknown) => (err as Error)?.message ?? 'Unknown error',
 );
 
-/** TextField puts testID on the outer Pressable; props sit on the inner TextInput. */
+/** DS TextField forwards `inputProps.testID` to the inner TextInput. */
 function getLoginTextInput(fieldTestId: string) {
-  return within(screen.getByTestId(fieldTestId)).UNSAFE_getByType(TextInput);
+  return screen.getByTestId(fieldTestId);
 }
 
 function makeDefaultHookReturn(
@@ -257,9 +250,7 @@ describe('CardAuthentication Component', () => {
 
       fireEvent.changeText(emailField, 'test@example.com');
 
-      expect(
-        within(emailField).getByDisplayValue('test@example.com'),
-      ).toBeOnTheScreen();
+      expect(emailField).toHaveDisplayValue('test@example.com');
     });
 
     it('updates password field when user types', () => {
@@ -268,9 +259,7 @@ describe('CardAuthentication Component', () => {
 
       fireEvent.changeText(passwordField, 'password123');
 
-      expect(
-        within(passwordField).getByDisplayValue('password123'),
-      ).toBeOnTheScreen();
+      expect(passwordField).toHaveDisplayValue('password123');
     });
 
     it('resets submit error when user types in email field', () => {
diff --git a/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx b/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx
index 69bd6c0bad5..5b35b0ade93 100644
--- a/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx
+++ b/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx
@@ -1,6 +1,6 @@
 import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Platform, TouchableOpacity } from 'react-native';
+import { Platform, TouchableOpacity, TextInputProps } from 'react-native';
 import {
   Box,
   FontWeight,
@@ -34,7 +34,7 @@ import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { countryCodeToFlag } from '../../util/countryCodeToFlag';
 
 const CODE_LENGTH = 6;
-const autoComplete = Platform.select({
+const autoComplete = Platform.select<TextInputProps['autoComplete']>({
   android: 'sms-otp',
   default: 'one-time-code',
 });
@@ -293,21 +293,22 @@ const CardAuthentication = () => {
         <>
           <Box>
             <TextField
-              autoCapitalize={'none'}
               onChangeText={handleOtpValueChange}
-              numberOfLines={1}
               value={confirmCode}
-              keyboardType="number-pad"
-              textContentType="oneTimeCode"
-              // @ts-expect-error - autoComplete is not typed correctly
-              autoComplete={autoComplete}
-              maxLength={CODE_LENGTH}
-              accessibilityLabel={strings(
-                'card.card_otp_authentication.confirm_code_label',
-              )}
               isError={!!error}
-              testID="otp-code-field"
               autoFocus
+              inputProps={{
+                autoCapitalize: 'none',
+                numberOfLines: 1,
+                keyboardType: 'number-pad',
+                textContentType: 'oneTimeCode',
+                autoComplete,
+                maxLength: CODE_LENGTH,
+                accessibilityLabel: strings(
+                  'card.card_otp_authentication.confirm_code_label',
+                ),
+                testID: 'otp-code-field',
+              }}
             />
             {error && (
               <Text
@@ -407,36 +408,27 @@ const CardAuthentication = () => {
           <Box>
             <Label>{strings('card.card_authentication.email_label')}</Label>
             <TextField
-              autoCapitalize={'none'}
-              autoComplete="username"
               onChangeText={handleEmailChange}
-              numberOfLines={1}
               value={email}
-              returnKeyType={'next'}
-              keyboardType="email-address"
-              maxLength={255}
-              accessibilityLabel={strings(
-                'card.card_authentication.email_label',
-              )}
-              testID="email-field"
+              inputProps={{
+                autoCapitalize: 'none',
+                autoComplete: 'username',
+                numberOfLines: 1,
+                returnKeyType: 'next',
+                keyboardType: 'email-address',
+                maxLength: 255,
+                accessibilityLabel: strings(
+                  'card.card_authentication.email_label',
+                ),
+                testID: 'email-field',
+              }}
             />
           </Box>
           <Box>
             <Label>{strings('card.card_authentication.password_label')}</Label>
             <TextField
-              autoCapitalize={'none'}
               onChangeText={handlePasswordChange}
-              autoComplete="password"
-              numberOfLines={1}
               value={password}
-              maxLength={255}
-              returnKeyType={'done'}
-              onSubmitEditing={() => performLogin()}
-              secureTextEntry={!isPasswordVisible}
-              accessibilityLabel={strings(
-                'card.card_authentication.password_label',
-              )}
-              testID="password-field"
               endAccessory={
                 <TouchableOpacity
                   onPress={() => setIsPasswordVisible(!isPasswordVisible)}
@@ -448,6 +440,19 @@ const CardAuthentication = () => {
                   />
                 </TouchableOpacity>
               }
+              inputProps={{
+                autoCapitalize: 'none',
+                autoComplete: 'password',
+                numberOfLines: 1,
+                maxLength: 255,
+                returnKeyType: 'done',
+                onSubmitEditing: () => performLogin(),
+                secureTextEntry: !isPasswordVisible,
+                accessibilityLabel: strings(
+                  'card.card_authentication.password_label',
+                ),
+                testID: 'password-field',
+              }}
             />
           </Box>
         </>
diff --git a/app/components/UI/Card/Views/CardHome/CardHome.test.tsx b/app/components/UI/Card/Views/CardHome/CardHome.test.tsx
index 42b7f87e10d..bec350ef54d 100644
--- a/app/components/UI/Card/Views/CardHome/CardHome.test.tsx
+++ b/app/components/UI/Card/Views/CardHome/CardHome.test.tsx
@@ -517,6 +517,7 @@ jest.mock('../../../../../../locales/i18n', () => ({
       'card.card_home.spending_with': 'Spending with',
       'card.card_home.add_funds': 'Add funds',
       'card.card_home.limited_spending_warning': 'Limited spending allowance',
+      'card.card_home.spending_limit_available': 'available',
       'card.card': 'Card',
       'card.card_home.error_title': 'Unable to load card',
       'card.card_home.error_description': 'Please try again later',
@@ -2678,8 +2679,7 @@ describe('CardHome Component', () => {
       expect(screen.queryByText('Spending Limit')).not.toBeOnTheScreen();
     });
 
-    it('does not render for Solana chain assets', () => {
-      // Given: authenticated with limited allowance on Solana chain
+    it('renders compact "available" indicator for Solana chain assets without originalSpendingCap', () => {
       setupMockSelectors({ isAuthenticated: true });
       const limitedSolanaToken = {
         ...mockPriorityToken,
@@ -2698,8 +2698,10 @@ describe('CardHome Component', () => {
       // When: component renders
       render();
 
-      // Then: should not display spending limit progress bar (Solana not supported)
-      expect(screen.queryByText('Spending Limit')).not.toBeOnTheScreen();
+      // Then: should display compact spending-limit indicator
+      expect(screen.getByText('Spending Limit')).toBeOnTheScreen();
+      expect(screen.getByText('500 USDC available')).toBeOnTheScreen();
+      expect(screen.queryByText('0/500 USDC')).not.toBeOnTheScreen();
     });
 
     it('does not render for unsupported tokens (AUSDC, AMUSD)', () => {
@@ -2782,7 +2784,6 @@ describe('CardHome Component', () => {
     });
 
     it('handles undefined allowance values', () => {
-      // Given: authenticated with undefined allowance values
       setupMockSelectors({ isAuthenticated: true });
       const limitedAllowanceToken = {
         ...mockPriorityToken,
@@ -2801,8 +2802,9 @@ describe('CardHome Component', () => {
       // When: component renders
       render();
 
-      // Then: should display zero values as fallback
-      expect(screen.getByText('0/0 USDC')).toBeOnTheScreen();
+      // Then: should display compact zero-fallback indicator
+      expect(screen.getByText('0 USDC available')).toBeOnTheScreen();
+      expect(screen.queryByText('0/0 USDC')).not.toBeOnTheScreen();
     });
   });
 
diff --git a/app/components/UI/Card/Views/CardHome/CardHome.tsx b/app/components/UI/Card/Views/CardHome/CardHome.tsx
index 730ddb30278..00891ee0243 100644
--- a/app/components/UI/Card/Views/CardHome/CardHome.tsx
+++ b/app/components/UI/Card/Views/CardHome/CardHome.tsx
@@ -55,7 +55,7 @@ import { CardScreenshotDeterrent } from '../../components/CardScreenshotDeterren
 import AnimatedSpinner from '../../../AnimatedSpinner';
 import Routes from '../../../../../constants/navigation/Routes';
 import { TOKEN_RATE_UNDEFINED } from '../../../Tokens/constants';
-import { isEvmChain, isSpendingLimitSupportedToken } from '../../constants';
+import { isSpendingLimitSupportedToken } from '../../constants';
 import { CardHomeSelectors } from './CardHome.testIds';
 import CardAlertSection from './components/CardAlertSection';
 import CardActionsButtons from './components/CardActionsButtons';
@@ -213,7 +213,6 @@ const CardHome = () => {
   const showSpendingLimitProgress =
     isAuthenticated &&
     data?.primaryFundingAsset?.status === FundingAssetStatus.Limited &&
-    isEvmChain(data?.primaryFundingAsset?.chainId) &&
     isSpendingLimitSupportedToken(data?.primaryFundingAsset?.symbol) &&
     !hasSetupActions;
 
@@ -335,6 +334,9 @@ const CardHome = () => {
             remainingAllowance={data.primaryFundingAsset.spendingCap ?? '0'}
             symbol={data.primaryFundingAsset.symbol ?? ''}
             privacyMode={privacyMode}
+            hasOriginalAllowance={
+              !!data.primaryFundingAsset.originalSpendingCap
+            }
           />
         )}
 
diff --git a/app/components/UI/Card/Views/Cashback/Cashback.test.tsx b/app/components/UI/Card/Views/Cashback/Cashback.test.tsx
index ee0c465ba45..eda6842fcd9 100644
--- a/app/components/UI/Card/Views/Cashback/Cashback.test.tsx
+++ b/app/components/UI/Card/Views/Cashback/Cashback.test.tsx
@@ -60,7 +60,7 @@ jest.mock('../../../../../util/theme', () => {
 jest.mock('../../../../../../locales/i18n', () => ({
   strings: (key: string) => {
     const translations: Record<string, string> = {
-      'card.cashback_screen.available_cashback': 'Available cashback',
+      'card.cashback_screen.available_cashback': 'Available mUSD',
       'card.cashback_screen.network_fee': 'Network fee',
       'card.cashback_screen.expected_to_receive': 'Expected to receive',
       'card.cashback_screen.withdraw': 'Withdraw',
@@ -221,7 +221,7 @@ describe('Cashback Component', () => {
       render();
 
       expect(screen.getByTestId(CashbackSelectors.CONTAINER)).toBeOnTheScreen();
-      expect(screen.queryByText('Available cashback')).toBeOnTheScreen();
+      expect(screen.queryByText('Available mUSD')).toBeOnTheScreen();
     });
   });
 
diff --git a/app/components/UI/Card/components/ManageCardListItem/ManageCardListItem.tsx b/app/components/UI/Card/components/ManageCardListItem/ManageCardListItem.tsx
index a7271cf3db1..b53f84bf51d 100644
--- a/app/components/UI/Card/components/ManageCardListItem/ManageCardListItem.tsx
+++ b/app/components/UI/Card/components/ManageCardListItem/ManageCardListItem.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
-import { TouchableOpacity, Platform, ActivityIndicator } from 'react-native';
+import { TouchableOpacity, ActivityIndicator } from 'react-native';
 import { useTheme } from '../../../../../util/theme';
-import generateTestId from '../../../../../../wdio/utils/generateTestId';
 import Icon, {
   IconName,
   IconSize,
@@ -43,7 +42,7 @@ const ManageCardListItem: React.FC<ManageCardListItemProps> = ({
   const styles = createStyles(colors, descriptionOrientation);
 
   return (
-    <TouchableOpacity onPress={onPress} {...generateTestId(Platform, testID)}>
+    <TouchableOpacity onPress={onPress} testID={testID}>
       <ListItem style={styles.root}>
         <ListItemColumn widthType={WidthType.Fill} style={styles.description}>
           <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
diff --git a/app/components/UI/Card/components/SpendingLimitProgressBar/SpendingLimitProgressBar.test.tsx b/app/components/UI/Card/components/SpendingLimitProgressBar/SpendingLimitProgressBar.test.tsx
index b0ee2d53951..2c7166ffb9a 100644
--- a/app/components/UI/Card/components/SpendingLimitProgressBar/SpendingLimitProgressBar.test.tsx
+++ b/app/components/UI/Card/components/SpendingLimitProgressBar/SpendingLimitProgressBar.test.tsx
@@ -264,4 +264,90 @@ describe('SpendingLimitProgressBar', () => {
     expect(getByText(`50/200 ${USDC}`)).toBeOnTheScreen();
     expect(queryByText('••••••')).not.toBeOnTheScreen();
   });
+
+  describe('compact mode (hasOriginalAllowance=false)', () => {
+    it('renders remaining-only label without progress bar', () => {
+      const { getByText, queryByText } = renderWithProvider(() => (
+        <SpendingLimitProgressBar
+          isLoading={false}
+          decimals={6}
+          totalAllowance="150"
+          remainingAllowance="150"
+          symbol={USDC}
+          hasOriginalAllowance={false}
+        />
+      ));
+
+      expect(getByText('Spending Limit')).toBeOnTheScreen();
+      expect(getByText(`150 ${USDC} available`)).toBeOnTheScreen();
+      expect(queryByText(`0/150 ${USDC}`)).not.toBeOnTheScreen();
+    });
+
+    it('shows the actual remaining amount, ignoring totalAllowance', () => {
+      const { getByText, queryByText } = renderWithProvider(() => (
+        <SpendingLimitProgressBar
+          isLoading={false}
+          decimals={6}
+          totalAllowance="9999"
+          remainingAllowance="42.5"
+          symbol="mUSD"
+          hasOriginalAllowance={false}
+        />
+      ));
+
+      expect(getByText('Spending Limit')).toBeOnTheScreen();
+      expect(getByText('42.5 mUSD available')).toBeOnTheScreen();
+      expect(queryByText('9956.5/9999 mUSD')).not.toBeOnTheScreen();
+    });
+
+    it('hides remaining amount when privacy mode is enabled', () => {
+      const { getByText, queryByText } = renderWithProvider(() => (
+        <SpendingLimitProgressBar
+          isLoading={false}
+          decimals={6}
+          totalAllowance="100"
+          remainingAllowance="100"
+          symbol={USDC}
+          hasOriginalAllowance={false}
+          privacyMode
+        />
+      ));
+
+      expect(getByText('Spending Limit')).toBeOnTheScreen();
+      expect(getByText('••••••')).toBeOnTheScreen();
+      expect(queryByText(`100 ${USDC} available`)).not.toBeOnTheScreen();
+    });
+
+    it('falls back to "0 SYM available" when remainingAllowance is undefined', () => {
+      const { getByText } = renderWithProvider(() => (
+        <SpendingLimitProgressBar
+          isLoading={false}
+          decimals={6}
+          totalAllowance={undefined as unknown as string}
+          remainingAllowance={undefined as unknown as string}
+          symbol={USDC}
+          hasOriginalAllowance={false}
+        />
+      ));
+
+      expect(getByText(`0 ${USDC} available`)).toBeOnTheScreen();
+    });
+
+    it('renders skeleton while loading regardless of hasOriginalAllowance', () => {
+      const { getByTestId } = renderWithProvider(() => (
+        <SpendingLimitProgressBar
+          isLoading
+          decimals={6}
+          totalAllowance="100"
+          remainingAllowance="100"
+          symbol={USDC}
+          hasOriginalAllowance={false}
+        />
+      ));
+
+      expect(
+        getByTestId('spending-limit-progress-bar-skeleton'),
+      ).toBeOnTheScreen();
+    });
+  });
 });
diff --git a/app/components/UI/Card/components/SpendingLimitProgressBar/SpendingLimitProgressBar.tsx b/app/components/UI/Card/components/SpendingLimitProgressBar/SpendingLimitProgressBar.tsx
index a2c2d67d61d..0d8c3db6b3c 100644
--- a/app/components/UI/Card/components/SpendingLimitProgressBar/SpendingLimitProgressBar.tsx
+++ b/app/components/UI/Card/components/SpendingLimitProgressBar/SpendingLimitProgressBar.tsx
@@ -12,6 +12,7 @@ import { useTheme } from '../../../../../util/theme';
 import ProgressBar from 'react-native-progress/Bar';
 import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
 import { CardHomeSelectors } from '../../Views/CardHome/CardHome.testIds';
+import { strings } from '../../../../../../locales/i18n';
 
 interface SpendingLimitProgressBarProps {
   decimals: number;
@@ -20,6 +21,7 @@ interface SpendingLimitProgressBarProps {
   symbol: string;
   isLoading: boolean;
   privacyMode?: boolean;
+  hasOriginalAllowance?: boolean;
 }
 
 const SpendingLimitProgressBar = ({
@@ -29,18 +31,16 @@ const SpendingLimitProgressBar = ({
   symbol,
   isLoading,
   privacyMode = false,
+  hasOriginalAllowance = true,
 }: SpendingLimitProgressBarProps) => {
   const theme = useTheme();
   const styles = createStyles(theme);
 
-  // Parse values as floats
   const totalAllowanceFloat = parseFloat(totalAllowance) || 0;
   const remainingAllowanceFloat = parseFloat(remainingAllowance) || 0;
 
-  // Calculate consumed amount
   const consumedAmount = totalAllowanceFloat - remainingAllowanceFloat;
 
-  // Calculate progress (0 to 1)
   const calculateProgress = () => {
     if (totalAllowanceFloat === 0) {
       return 0;
@@ -51,7 +51,7 @@ const SpendingLimitProgressBar = ({
     }
 
     const progress = consumedAmount / totalAllowanceFloat;
-    return Math.min(1, Math.max(0, progress)); // Clamp between 0 and 1
+    return Math.min(1, Math.max(0, progress));
   };
 
   const progress = calculateProgress();
@@ -64,7 +64,6 @@ const SpendingLimitProgressBar = ({
     [progress, theme],
   );
 
-  // Format display values with appropriate precision
   const formatDisplayValue = (value: number) => {
     const precision = value < 1 ? 6 : 2;
     const formatted = value.toFixed(precision);
@@ -73,6 +72,7 @@ const SpendingLimitProgressBar = ({
 
   const totalAllowanceDisplay = formatDisplayValue(totalAllowanceFloat);
   const consumedAmountDisplay = formatDisplayValue(consumedAmount);
+  const remainingAllowanceDisplay = formatDisplayValue(remainingAllowanceFloat);
 
   if (isLoading) {
     return (
@@ -87,6 +87,28 @@ const SpendingLimitProgressBar = ({
     );
   }
 
+  if (!hasOriginalAllowance) {
+    return (
+      <View style={styles.container}>
+        <View style={styles.divider} />
+        <View style={styles.textContainer}>
+          <Text variant={TextVariant.BodySm} fontWeight={FontWeight.Medium}>
+            Spending Limit
+          </Text>
+          <SensitiveText
+            isHidden={privacyMode}
+            length={SensitiveTextLength.Short}
+            variant={TextVariant.BodySm}
+          >
+            {`${remainingAllowanceDisplay} ${symbol} ${strings(
+              'card.card_home.spending_limit_available',
+            )}`}
+          </SensitiveText>
+        </View>
+      </View>
+    );
+  }
+
   return (
     <View style={styles.container}>
       <View style={styles.divider} />
diff --git a/app/components/UI/Card/hooks/useAssetBalances.test.ts b/app/components/UI/Card/hooks/useAssetBalances.test.ts
index 2ea641c0053..746196afb20 100644
--- a/app/components/UI/Card/hooks/useAssetBalances.test.ts
+++ b/app/components/UI/Card/hooks/useAssetBalances.test.ts
@@ -60,7 +60,7 @@ jest.mock('../../Ramp/Deposit/constants/networks', () => ({
     chainId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
   },
 }));
-jest.mock('../../../../util/number', () => ({
+jest.mock('../../../../util/number/bigint', () => ({
   balanceToFiatNumber: jest.fn((balance: string, rate: number) => {
     const bal = parseFloat(balance);
     return (bal * rate).toString();
@@ -126,6 +126,31 @@ describe('useAssetBalances', () => {
     walletAddress: '0xwallet1',
   };
 
+  const defaultSelectorMockState = {
+    engine: {
+      backgroundState: {
+        TokensController: {
+          allTokens: {},
+          allDetectedTokens: {},
+        },
+        NetworkController: {
+          networkConfigurationsByChainId: {
+            '0xe708': {
+              nativeCurrency: 'ETH',
+            },
+          },
+        },
+        CurrencyRateController: {
+          currencyRates: {
+            ETH: {
+              conversionRate: 2000,
+            },
+          },
+        },
+      },
+    },
+  };
+
   beforeEach(() => {
     jest.clearAllMocks();
 
@@ -133,31 +158,7 @@ describe('useAssetBalances', () => {
     mockUseSelector.mockImplementation((selector: any) => {
       if (typeof selector === 'function') {
         // Mock state structure - includes TokensController for the refactored useAssetBalances
-        const state = {
-          engine: {
-            backgroundState: {
-              TokensController: {
-                allTokens: {},
-                allDetectedTokens: {},
-              },
-              NetworkController: {
-                networkConfigurationsByChainId: {
-                  '0xe708': {
-                    nativeCurrency: 'ETH',
-                  },
-                },
-              },
-              CurrencyRateController: {
-                currencyRates: {
-                  ETH: {
-                    conversionRate: 2000,
-                  },
-                },
-              },
-            },
-          },
-        };
-        return selector(state);
+        return selector(defaultSelectorMockState);
       }
       return 'USD';
     });
@@ -264,14 +265,29 @@ describe('useAssetBalances', () => {
     });
 
     it('returns balance info for single Solana token with conversion rate', () => {
-      (
-        Engine.context.MultichainAssetsRatesController as any
-      ).state.conversionRates = {
-        'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v':
-          {
-            rate: '1.0',
-          },
-      };
+      mockUseSelector.mockImplementation((selector: any) => {
+        if (typeof selector === 'function') {
+          const state = {
+            ...defaultSelectorMockState,
+            engine: {
+              ...defaultSelectorMockState.engine,
+              backgroundState: {
+                ...defaultSelectorMockState.engine.backgroundState,
+                MultichainAssetsRatesController: {
+                  conversionRates: {
+                    'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v':
+                      {
+                        rate: '1.0',
+                      },
+                  },
+                },
+              },
+            },
+          };
+          return selector(state);
+        }
+        return 'USD';
+      });
 
       mockFormatWithThreshold.mockReturnValue('$250.25');
 
diff --git a/app/components/UI/Card/hooks/useAssetBalances.tsx b/app/components/UI/Card/hooks/useAssetBalances.tsx
index a1faa094285..208f5e886ce 100644
--- a/app/components/UI/Card/hooks/useAssetBalances.tsx
+++ b/app/components/UI/Card/hooks/useAssetBalances.tsx
@@ -7,8 +7,6 @@ import { getAssetBalanceKey } from '../util/getAssetBalanceKey';
 import { useTokensWithBalance } from '../../Bridge/hooks/useTokensWithBalance';
 import { isSolanaChainId } from '@metamask/bridge-controller';
 import { selectCurrentCurrency } from '../../../../selectors/currencyRateController';
-import Engine from '../../../../core/Engine';
-import { balanceToFiatNumber } from '../../../../util/number';
 import { safeFormatChainIdToHex } from '../util/safeFormatChainIdToHex';
 import { TokenI } from '../../Tokens/types';
 import { MarketDataDetails } from '@metamask/assets-controllers';
@@ -16,7 +14,14 @@ import { formatWithThreshold } from '../../../../util/assets';
 import I18n from '../../../../../locales/i18n';
 import { deriveBalanceFromAssetMarketDetails } from '../../Tokens/util';
 import { buildTokenIconUrl } from '../util/buildTokenIconUrl';
+import {
+  getCurrencyRateControllerCurrencyRates,
+  getMultichainAssetsRatesControllerConversionRates,
+  getTokenRatesControllerMarketData,
+  getTokensControllerAllTokens,
+} from '../../../../selectors/assets/assets-migration';
 import { CARD_CHAIN_IDS } from '../constants';
+import { balanceToFiatNumber } from '../../../../util/number/bigint';
 
 const extractTrailingCurrencyCode = (value: string): string | undefined => {
   const match = value.trim().match(/([A-Za-z]{3})$/);
@@ -84,17 +89,12 @@ export interface AssetBalanceInfo {
 export const useAssetBalances = (
   tokens: CardFundingToken[],
 ): Map<string, AssetBalanceInfo> => {
-  const { MultichainAssetsRatesController, TokenRatesController } =
-    Engine.context;
   const tokensWithBalance = useTokensWithBalance({
     chainIds: CARD_CHAIN_IDS,
   });
 
   // Get raw state needed for asset lookups - these are stable references from Redux
-  const allAssets = useSelector(
-    (state: RootState) =>
-      state.engine.backgroundState.TokensController.allTokens,
-  );
+  const allAssets = useSelector(getTokensControllerAllTokens);
   const allDetectedTokens = useSelector(
     (state: RootState) =>
       state.engine.backgroundState.TokensController.allDetectedTokens,
@@ -104,9 +104,10 @@ export const useAssetBalances = (
       state.engine.backgroundState.NetworkController
         .networkConfigurationsByChainId,
   );
-  const currencyRates = useSelector(
-    (state: RootState) =>
-      state.engine.backgroundState.CurrencyRateController.currencyRates,
+  const currencyRates = useSelector(getCurrencyRateControllerCurrencyRates);
+  const marketData = useSelector(getTokenRatesControllerMarketData);
+  const conversionRates = useSelector(
+    getMultichainAssetsRatesControllerConversionRates,
   );
 
   // Build the walletAssetsMap in useMemo using raw state
@@ -182,28 +183,21 @@ export const useAssetBalances = (
 
         const conversionRate = currencyRateEntry?.conversionRate;
 
-        const marketData =
-          TokenRatesController?.state?.marketData?.[chainId]?.[
-            token.address?.toLowerCase() as Hex
-          ];
+        const tokenMarketData =
+          marketData?.[chainId]?.[token.address?.toLowerCase() as Hex];
 
         // Only require conversionRate to be present (marketData is optional)
         if (conversionRate !== undefined && conversionRate !== null) {
           map.set(`${chainId}-${token.address?.toLowerCase()}`, {
             conversionRate,
-            marketData,
+            marketData: tokenMarketData,
           });
         }
       }
     });
 
     return map;
-  }, [
-    tokens,
-    networkConfigs,
-    currencyRates,
-    TokenRatesController?.state?.marketData,
-  ]);
+  }, [tokens, networkConfigs, currencyRates, marketData]);
 
   const currentCurrency = useSelector(selectCurrentCurrency);
 
@@ -256,8 +250,6 @@ export const useAssetBalances = (
       token: CardFundingToken,
       balanceToUse: string,
     ): { balanceFiat: string; rawFiatNumber: number | undefined } => {
-      const conversionRates =
-        MultichainAssetsRatesController?.state?.conversionRates;
       const assetKey =
         `${token.caipChainId}/token:${token.address}` as `${string}:${string}/${string}:${string}`;
       const assetConversionRate = conversionRates?.[assetKey];
@@ -307,7 +299,7 @@ export const useAssetBalances = (
         rawFiatNumber: undefined,
       };
     },
-    [MultichainAssetsRatesController?.state?.conversionRates, currentCurrency],
+    [conversionRates, currentCurrency],
   );
 
   // Helper: Calculate fiat with market data
@@ -534,8 +526,7 @@ export const useAssetBalances = (
               logo: buildTokenIconUrl(_token.caipChainId, _token.address ?? ''),
             } as TokenI);
 
-        const allMarketDataForChain =
-          TokenRatesController?.state?.marketData?.[chainId] || {};
+        const allMarketDataForChain = marketData?.[chainId] || {};
 
         const derivedBalance = deriveBalanceFromAssetMarketDetails(
           mockAsset,
@@ -605,7 +596,7 @@ export const useAssetBalances = (
     [
       calculateFiatFromMarketData,
       calculateProportionalFiat,
-      TokenRatesController?.state?.marketData,
+      marketData,
       currentCurrency,
     ],
   );
diff --git a/app/components/UI/Card/hooks/useCardDelegation.test.ts b/app/components/UI/Card/hooks/useCardDelegation.test.ts
index 2938dfa99a1..787a02b5dba 100644
--- a/app/components/UI/Card/hooks/useCardDelegation.test.ts
+++ b/app/components/UI/Card/hooks/useCardDelegation.test.ts
@@ -9,7 +9,7 @@ import Logger from '../../../../util/Logger';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
 import { createMockUseAnalyticsHook } from '../../../../util/test/analyticsMock';
-import { toTokenMinimalUnit } from '../../../../util/number';
+import { toTokenMinimalUnit } from '../../../../util/number/bigint';
 import { safeToChecksumAddress } from '../../../../util/address';
 import { ARBITRARY_ALLOWANCE } from '../constants';
 import {
@@ -42,7 +42,7 @@ jest.mock('../../../../util/Logger', () => ({
   error: jest.fn(),
 }));
 
-jest.mock('../../../../util/number', () => ({
+jest.mock('../../../../util/number/bigint', () => ({
   toTokenMinimalUnit: jest.fn(),
 }));
 
@@ -223,7 +223,7 @@ describe('useCardDelegation', () => {
       });
 
     // Setup utility mocks
-    mockToTokenMinimalUnit.mockReturnValue('100000000000000000000');
+    mockToTokenMinimalUnit.mockReturnValue(100000000000000000000n);
     mockSafeToChecksumAddress.mockImplementation(
       (address?: string) => (address as `0x${string}`) || undefined,
     );
@@ -401,7 +401,7 @@ describe('useCardDelegation', () => {
       const mockToken = createMockToken({ decimals: 6 });
       const params = createMockDelegationParams();
 
-      mockToTokenMinimalUnit.mockReturnValue('100000000');
+      mockToTokenMinimalUnit.mockReturnValue(100000000n);
 
       const { result } = renderHook(() => useCardDelegation(mockToken));
 
@@ -1356,7 +1356,7 @@ describe('useCardDelegation', () => {
       };
 
       mockToTokenMinimalUnit.mockReturnValue(
-        '999999999999999999999999999000000000000000000',
+        999999999999999999999999999000000000000000000n,
       );
 
       const { result } = renderHook(() => useCardDelegation(mockToken));
diff --git a/app/components/UI/Card/hooks/useCardDelegation.ts b/app/components/UI/Card/hooks/useCardDelegation.ts
index 79d8c2af663..47424972027 100644
--- a/app/components/UI/Card/hooks/useCardDelegation.ts
+++ b/app/components/UI/Card/hooks/useCardDelegation.ts
@@ -20,7 +20,7 @@ import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
 import { useEnsureCardNetworkExists } from './useEnsureCardNetworkExists';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { ARBITRARY_ALLOWANCE } from '../constants';
-import { toTokenMinimalUnit } from '../../../../util/number';
+import { toTokenMinimalUnit } from '../../../../util/number/bigint';
 import AppConstants from '../../../../core/AppConstants';
 import { safeToChecksumAddress } from '../../../../util/address';
 import { handleSnapRequest } from '../../../../core/Snaps/utils';
diff --git a/app/components/UI/Card/hooks/useNeedsGasFaucet.ts b/app/components/UI/Card/hooks/useNeedsGasFaucet.ts
index 25f7046497b..7126bec78db 100644
--- a/app/components/UI/Card/hooks/useNeedsGasFaucet.ts
+++ b/app/components/UI/Card/hooks/useNeedsGasFaucet.ts
@@ -4,13 +4,12 @@ import { GAS_ESTIMATE_TYPES } from '@metamask/gas-fee-controller';
 import { isNonEvmChainId, isSolanaChainId } from '@metamask/bridge-controller';
 import { Hex, CaipChainId } from '@metamask/utils';
 import { BigNumber } from 'bignumber.js';
-import BN from 'bnjs4';
 import Engine from '../../../../core/Engine';
 import { useAccountNativeBalance } from '../../../Views/confirmations/hooks/useAccountNativeBalance';
 import { selectMinSolBalance } from '../../../../selectors/bridgeController';
 import { selectSelectedInternalAccountFormattedAddress } from '../../../../selectors/accountsController';
 import { decGWEIToHexWEI } from '../../../../util/conversions';
-import { hexToBN } from '../../../../util/number';
+import { hexToBigInt } from '../../../../util/number/bigint';
 import { safeFormatChainIdToHex } from '../util/safeFormatChainIdToHex';
 import { CardFundingToken } from '../types';
 import { useLatestBalance } from '../../Bridge/hooks/useLatestBalance';
@@ -93,7 +92,7 @@ export const useNeedsGasFaucet = (
   /**
    * Estimate gas fee for EVM chains
    */
-  const estimateEvmGasFee = useCallback(async (): Promise<BN> => {
+  const estimateEvmGasFee = useCallback(async (): Promise<bigint> => {
     try {
       const { GasFeeController } = Engine.context;
       const result = await GasFeeController.fetchGasFeeEstimates();
@@ -120,16 +119,16 @@ export const useNeedsGasFaucet = (
           break;
       }
 
-      const weiGasPrice = hexToBN(decGWEIToHexWEI(gasPrice));
-      return weiGasPrice.muln(gasLimitWithBuffer);
+      const weiGasPrice = hexToBigInt(decGWEIToHexWEI(gasPrice) as string);
+      return weiGasPrice * BigInt(gasLimitWithBuffer);
     } catch (err) {
       // Return a conservative fallback estimate if gas estimation fails
       // Assume ~20 Gwei gas price as fallback
-      const fallbackGasPrice = new BN('20000000000'); // 20 Gwei in Wei
+      const fallbackGasPrice = 20000000000n; // 20 Gwei in Wei
       const gasLimitWithBuffer = Math.ceil(
         ERC20_APPROVE_GAS_LIMIT * GAS_LIMIT_BUFFER,
       );
-      return fallbackGasPrice.muln(gasLimitWithBuffer);
+      return fallbackGasPrice * BigInt(gasLimitWithBuffer);
     }
   }, []);
 
@@ -144,10 +143,10 @@ export const useNeedsGasFaucet = (
 
     try {
       const estimatedGasFee = await estimateEvmGasFee();
-      const balanceBN = new BN(balanceWeiInHex.replace('0x', ''), 'hex');
+      const balance = hexToBigInt(balanceWeiInHex);
 
       // User needs faucet if balance is less than estimated gas fee
-      return balanceBN.lt(estimatedGasFee);
+      return balance < estimatedGasFee;
     } catch (err) {
       console.error('Error checking EVM faucet need:', err);
       // Assume needs faucet on error
diff --git a/app/components/UI/Charts/AdvancedChart/webview/chartLogic.js b/app/components/UI/Charts/AdvancedChart/webview/chartLogic.js
index ebaa8adf185..f509ddc036e 100644
--- a/app/components/UI/Charts/AdvancedChart/webview/chartLogic.js
+++ b/app/components/UI/Charts/AdvancedChart/webview/chartLogic.js
@@ -3579,6 +3579,125 @@ function initChart() {
           }
         : undefined;
 
+    // TradingView only supports a fixed set of IANA timezone IDs.
+    // If the device returns an unsupported ID we fall back to Etc/UTC.
+    // List of supported timezones:  https://www.tradingview.com/charting-library-docs/latest/ui_elements/timezones#supported-time-zones
+    var TV_SUPPORTED_TIMEZONES = [
+      'Etc/UTC',
+      'Africa/Cairo',
+      'Africa/Casablanca',
+      'Africa/Johannesburg',
+      'Africa/Lagos',
+      'Africa/Nairobi',
+      'Africa/Tunis',
+      'America/Anchorage',
+      'America/Argentina/Buenos_Aires',
+      'America/Bogota',
+      'America/Caracas',
+      'America/Chicago',
+      'America/El_Salvador',
+      'America/Halifax',
+      'America/Juneau',
+      'America/Lima',
+      'America/Los_Angeles',
+      'America/Mexico_City',
+      'America/New_York',
+      'America/Phoenix',
+      'America/Santiago',
+      'America/Sao_Paulo',
+      'America/Toronto',
+      'America/Vancouver',
+      'Asia/Astana',
+      'Asia/Ashkhabad',
+      'Asia/Bahrain',
+      'Asia/Bangkok',
+      'Asia/Chongqing',
+      'Asia/Colombo',
+      'Asia/Dhaka',
+      'Asia/Dubai',
+      'Asia/Ho_Chi_Minh',
+      'Asia/Hong_Kong',
+      'Asia/Jakarta',
+      'Asia/Jerusalem',
+      'Asia/Karachi',
+      'Asia/Kabul',
+      'Asia/Kathmandu',
+      'Asia/Kolkata',
+      'Asia/Kuala_Lumpur',
+      'Asia/Kuwait',
+      'Asia/Manila',
+      'Asia/Muscat',
+      'Asia/Nicosia',
+      'Asia/Qatar',
+      'Asia/Riyadh',
+      'Asia/Seoul',
+      'Asia/Shanghai',
+      'Asia/Singapore',
+      'Asia/Taipei',
+      'Asia/Tehran',
+      'Asia/Tokyo',
+      'Asia/Yangon',
+      'Atlantic/Azores',
+      'Atlantic/Reykjavik',
+      'Australia/Adelaide',
+      'Australia/Brisbane',
+      'Australia/Perth',
+      'Australia/Sydney',
+      'Europe/Amsterdam',
+      'Europe/Athens',
+      'Europe/Belgrade',
+      'Europe/Berlin',
+      'Europe/Bratislava',
+      'Europe/Brussels',
+      'Europe/Bucharest',
+      'Europe/Budapest',
+      'Europe/Copenhagen',
+      'Europe/Dublin',
+      'Europe/Helsinki',
+      'Europe/Istanbul',
+      'Europe/Lisbon',
+      'Europe/London',
+      'Europe/Luxembourg',
+      'Europe/Madrid',
+      'Europe/Malta',
+      'Europe/Moscow',
+      'Europe/Oslo',
+      'Europe/Paris',
+      'Europe/Prague',
+      'Europe/Riga',
+      'Europe/Rome',
+      'Europe/Stockholm',
+      'Europe/Tallinn',
+      'Europe/Vienna',
+      'Europe/Vilnius',
+      'Europe/Warsaw',
+      'Europe/Zurich',
+      'Pacific/Auckland',
+      'Pacific/Chatham',
+      'Pacific/Fakaofo',
+      'Pacific/Honolulu',
+      'Pacific/Norfolk',
+      'US/Mountain',
+    ];
+
+    // Intl returns canonical IANA names, but TradingView uses some legacy aliases.
+    var CANONICAL_TO_TV = {
+      'America/Denver': 'US/Mountain',
+      'Asia/Ashgabat': 'Asia/Ashkhabad',
+      'Asia/Almaty': 'Asia/Astana',
+    };
+
+    var userTimezone = (function () {
+      try {
+        var tz = Intl.DateTimeFormat().resolvedOptions().timeZone || 'Etc/UTC';
+        var mapped = CANONICAL_TO_TV[tz] || tz;
+        return TV_SUPPORTED_TIMEZONES.indexOf(mapped) !== -1
+          ? mapped
+          : 'Etc/UTC';
+      } catch (_e) {
+        return 'Etc/UTC';
+      }
+    })();
     window.chartWidget = new TradingView.widget({
       symbol: window.currentSymbol,
       interval: window.currentResolution || '5',
@@ -3587,6 +3706,7 @@ function initChart() {
       datafeed: customDatafeed,
       library_path: window.CONFIG.libraryUrl,
       locale: 'en',
+      timezone: userTimezone,
       fullscreen: false,
       autosize: true,
       theme: 'Dark',
diff --git a/app/components/UI/Charts/AdvancedChart/webview/chartLogicString.ts b/app/components/UI/Charts/AdvancedChart/webview/chartLogicString.ts
index 6404ea28b61..b73a59124d7 100644
--- a/app/components/UI/Charts/AdvancedChart/webview/chartLogicString.ts
+++ b/app/components/UI/Charts/AdvancedChart/webview/chartLogicString.ts
@@ -3588,6 +3588,125 @@ function initChart() {
           }
         : undefined;
 
+    // TradingView only supports a fixed set of IANA timezone IDs.
+    // If the device returns an unsupported ID we fall back to Etc/UTC.
+    // List of supported timezones:  https://www.tradingview.com/charting-library-docs/latest/ui_elements/timezones#supported-time-zones
+    var TV_SUPPORTED_TIMEZONES = [
+      'Etc/UTC',
+      'Africa/Cairo',
+      'Africa/Casablanca',
+      'Africa/Johannesburg',
+      'Africa/Lagos',
+      'Africa/Nairobi',
+      'Africa/Tunis',
+      'America/Anchorage',
+      'America/Argentina/Buenos_Aires',
+      'America/Bogota',
+      'America/Caracas',
+      'America/Chicago',
+      'America/El_Salvador',
+      'America/Halifax',
+      'America/Juneau',
+      'America/Lima',
+      'America/Los_Angeles',
+      'America/Mexico_City',
+      'America/New_York',
+      'America/Phoenix',
+      'America/Santiago',
+      'America/Sao_Paulo',
+      'America/Toronto',
+      'America/Vancouver',
+      'Asia/Astana',
+      'Asia/Ashkhabad',
+      'Asia/Bahrain',
+      'Asia/Bangkok',
+      'Asia/Chongqing',
+      'Asia/Colombo',
+      'Asia/Dhaka',
+      'Asia/Dubai',
+      'Asia/Ho_Chi_Minh',
+      'Asia/Hong_Kong',
+      'Asia/Jakarta',
+      'Asia/Jerusalem',
+      'Asia/Karachi',
+      'Asia/Kabul',
+      'Asia/Kathmandu',
+      'Asia/Kolkata',
+      'Asia/Kuala_Lumpur',
+      'Asia/Kuwait',
+      'Asia/Manila',
+      'Asia/Muscat',
+      'Asia/Nicosia',
+      'Asia/Qatar',
+      'Asia/Riyadh',
+      'Asia/Seoul',
+      'Asia/Shanghai',
+      'Asia/Singapore',
+      'Asia/Taipei',
+      'Asia/Tehran',
+      'Asia/Tokyo',
+      'Asia/Yangon',
+      'Atlantic/Azores',
+      'Atlantic/Reykjavik',
+      'Australia/Adelaide',
+      'Australia/Brisbane',
+      'Australia/Perth',
+      'Australia/Sydney',
+      'Europe/Amsterdam',
+      'Europe/Athens',
+      'Europe/Belgrade',
+      'Europe/Berlin',
+      'Europe/Bratislava',
+      'Europe/Brussels',
+      'Europe/Bucharest',
+      'Europe/Budapest',
+      'Europe/Copenhagen',
+      'Europe/Dublin',
+      'Europe/Helsinki',
+      'Europe/Istanbul',
+      'Europe/Lisbon',
+      'Europe/London',
+      'Europe/Luxembourg',
+      'Europe/Madrid',
+      'Europe/Malta',
+      'Europe/Moscow',
+      'Europe/Oslo',
+      'Europe/Paris',
+      'Europe/Prague',
+      'Europe/Riga',
+      'Europe/Rome',
+      'Europe/Stockholm',
+      'Europe/Tallinn',
+      'Europe/Vienna',
+      'Europe/Vilnius',
+      'Europe/Warsaw',
+      'Europe/Zurich',
+      'Pacific/Auckland',
+      'Pacific/Chatham',
+      'Pacific/Fakaofo',
+      'Pacific/Honolulu',
+      'Pacific/Norfolk',
+      'US/Mountain',
+    ];
+
+    // Intl returns canonical IANA names, but TradingView uses some legacy aliases.
+    var CANONICAL_TO_TV = {
+      'America/Denver': 'US/Mountain',
+      'Asia/Ashgabat': 'Asia/Ashkhabad',
+      'Asia/Almaty': 'Asia/Astana',
+    };
+
+    var userTimezone = (function () {
+      try {
+        var tz = Intl.DateTimeFormat().resolvedOptions().timeZone || 'Etc/UTC';
+        var mapped = CANONICAL_TO_TV[tz] || tz;
+        return TV_SUPPORTED_TIMEZONES.indexOf(mapped) !== -1
+          ? mapped
+          : 'Etc/UTC';
+      } catch (_e) {
+        return 'Etc/UTC';
+      }
+    })();
     window.chartWidget = new TradingView.widget({
       symbol: window.currentSymbol,
       interval: window.currentResolution || '5',
@@ -3596,6 +3715,7 @@ function initChart() {
       datafeed: customDatafeed,
       library_path: window.CONFIG.libraryUrl,
       locale: 'en',
+      timezone: userTimezone,
       fullscreen: false,
       autosize: true,
       theme: 'Dark',
diff --git a/app/components/UI/DeFiPositions/DeFiProtocolPositionDetails.view.test.tsx b/app/components/UI/DeFiPositions/DeFiProtocolPositionDetails.view.test.tsx
new file mode 100644
index 00000000000..b0c917f077b
--- /dev/null
+++ b/app/components/UI/DeFiPositions/DeFiProtocolPositionDetails.view.test.tsx
@@ -0,0 +1,139 @@
+import '../../../../tests/component-view/mocks';
+import React from 'react';
+import { FlatList } from 'react-native';
+import { act, fireEvent } from '@testing-library/react-native';
+import type { GroupedDeFiPositions } from '@metamask/assets-controllers';
+
+import DeFiProtocolPositionDetails, {
+  DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID,
+} from './DeFiProtocolPositionDetails';
+import { WalletViewSelectorsIDs } from '../../Views/Wallet/WalletView.testIds';
+import { renderComponentViewScreen } from '../../../../tests/component-view/render';
+import { describeForPlatforms } from '../../../../tests/component-view/platform';
+import { backgroundState } from '../../../util/test/initial-root-state';
+
+/**
+ * Mirrors smoke `view-defi-details`: tap Aave V3 → read-only position details with
+ * Supplied tokens and fiat balances (no transaction).
+ */
+const aaveV3PositionAggregate: GroupedDeFiPositions['protocols'][number] = {
+  protocolDetails: {
+    name: 'Aave V3',
+    iconUrl: '',
+  },
+  aggregatedMarketValue: 14.74,
+  positionTypes: {
+    supply: {
+      aggregatedMarketValue: 14.74,
+      positions: [
+        [
+          {
+            address: '0x23878914efe38d27c4d67ab83ed1b93a74d4086a',
+            name: 'Aave Ethereum USDT',
+            symbol: 'aEthUSDT',
+            decimals: 6,
+            balance: 0.300112,
+            balanceRaw: '300112',
+            marketValue: 14.74,
+            type: 'protocol',
+            tokens: [
+              {
+                address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
+                name: 'Tether USD',
+                symbol: 'USDT',
+                decimals: 6,
+                balance: 0.300112,
+                balanceRaw: '300112',
+                marketValue: 14.74,
+                price: 0.99994,
+                type: 'underlying',
+                iconUrl: '',
+              },
+            ],
+          },
+        ],
+        [
+          {
+            address: '0xfa1fdbbd71b0aa16162d76914d69cd8cb3ef92da',
+            name: 'Aave Ethereum Lido WETH',
+            symbol: 'aEthLidoWETH',
+            decimals: 18,
+            balance: 1e-5,
+            balanceRaw: '9030902767263172',
+            marketValue: 0.3,
+            type: 'protocol',
+            tokens: [
+              {
+                address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                name: 'Wrapped Ether',
+                symbol: 'WETH',
+                decimals: 18,
+                balance: 1e-5,
+                balanceRaw: '10000000000000',
+                marketValue: 0.3,
+                price: 1599.45,
+                type: 'underlying',
+                iconUrl: '',
+              },
+            ],
+          },
+        ],
+      ],
+    },
+  },
+};
+
+const defiDetailsState = {
+  engine: {
+    backgroundState: {
+      ...backgroundState,
+      PreferencesController: {
+        ...backgroundState.PreferencesController,
+        privacyMode: false,
+      },
+    },
+  },
+};
+
+describeForPlatforms('DeFi position details (read-only)', () => {
+  it('shows Aave V3 supplied assets with token symbols and fiat amounts', () => {
+    const { getByTestId, getByText, getAllByText, UNSAFE_getByType } =
+      renderComponentViewScreen(
+        DeFiProtocolPositionDetails,
+        { name: 'DeFiProtocolPositionDetails' },
+        { state: defiDetailsState },
+        {
+          protocolAggregate: aaveV3PositionAggregate,
+          networkIconAvatar: undefined,
+        },
+      );
+
+    expect(
+      getByTestId(WalletViewSelectorsIDs.DEFI_POSITIONS_DETAILS_CONTAINER),
+    ).toBeOnTheScreen();
+
+    expect(getByText('Aave V3')).toBeOnTheScreen();
+    expect(
+      getByTestId(DEFI_PROTOCOL_POSITION_DETAILS_BALANCE_TEST_ID),
+    ).toHaveTextContent('$14.74');
+
+    // Smoke parity for details checks: Supplied + USDT + WETH + $14.74 + $0.30.
+    expect(getAllByText('Supplied')).toHaveLength(2);
+    expect(getAllByText('USDT')).toHaveLength(1);
+    expect(getAllByText('$14.74').length).toBeGreaterThanOrEqual(2);
+
+    const list = UNSAFE_getByType(FlatList);
+    act(() => {
+      fireEvent.scroll(list, {
+        nativeEvent: {
+          contentOffset: { y: 150 },
+          contentSize: { height: 500, width: 400 },
+          layoutMeasurement: { height: 400, width: 400 },
+        },
+      });
+    });
+
+    expect(getByText('WETH')).toBeOnTheScreen();
+    expect(getByText('$0.30')).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/DefiEmptyState/DefiEmptyState.test.tsx b/app/components/UI/DefiEmptyState/DefiEmptyState.test.tsx
index 09f9905a74d..24d7ccf0a67 100644
--- a/app/components/UI/DefiEmptyState/DefiEmptyState.test.tsx
+++ b/app/components/UI/DefiEmptyState/DefiEmptyState.test.tsx
@@ -23,19 +23,15 @@ describe('DefiEmptyState', () => {
     expect(getByText('Explore DeFi')).toBeDefined();
   });
 
-  it('should navigate to explore tokens page in in-app browser', () => {
+  it('opens Explore on the main feed then Sites full view', () => {
     const { getByText } = renderWithProvider(<DefiEmptyState />);
 
     const button = getByText('Explore DeFi');
     fireEvent.press(button);
 
-    expect(mockNavigate).toHaveBeenCalledWith('BrowserTabHome', {
-      screen: 'BrowserView',
-      params: {
-        newTabUrl:
-          'https://portfolio.metamask.io/explore/tokens?MetaMaskEntry=mobile',
-        timestamp: expect.any(Number),
-      },
+    expect(mockNavigate).toHaveBeenNthCalledWith(1, 'TrendingView', {
+      screen: 'TrendingFeed',
     });
+    expect(mockNavigate).toHaveBeenNthCalledWith(2, 'SitesFullView');
   });
 });
diff --git a/app/components/UI/DefiEmptyState/DefiEmptyState.tsx b/app/components/UI/DefiEmptyState/DefiEmptyState.tsx
index bda81cd0698..dedcb0f4035 100644
--- a/app/components/UI/DefiEmptyState/DefiEmptyState.tsx
+++ b/app/components/UI/DefiEmptyState/DefiEmptyState.tsx
@@ -8,7 +8,6 @@ import {
   type TabEmptyStateProps,
 } from '../../../component-library/components-temp/TabEmptyState';
 import { strings } from '../../../../locales/i18n';
-import AppConstants from '../../../core/AppConstants';
 import Routes from '../../../constants/navigation/Routes';
 
 import emptyStateDefiLight from '../../../images/empty-state-defi-light.png';
@@ -22,14 +21,11 @@ export const DefiEmptyState: React.FC<DefiEmptyStateProps> = (props) => {
   const tw = useTailwind();
 
   const handleExploreDefi = () => {
-    // Navigate to explore tokens page in the in-app browser
-    navigate(Routes.BROWSER.HOME, {
-      screen: Routes.BROWSER.VIEW,
-      params: {
-        newTabUrl: AppConstants.EXPLORE_TOKENS.URL,
-        timestamp: Date.now(),
-      },
+    // Open the Explore tab on the main feed, then push Sites (root stack).
+    navigate(Routes.TRENDING_VIEW, {
+      screen: Routes.TRENDING_FEED,
     });
+    navigate(Routes.SITES_FULL_VIEW);
   };
 
   return (
diff --git a/app/components/UI/Earn/LendingLearnMoreModal/index.tsx b/app/components/UI/Earn/LendingLearnMoreModal/index.tsx
index 3ae740b0811..7c1721a2395 100644
--- a/app/components/UI/Earn/LendingLearnMoreModal/index.tsx
+++ b/app/components/UI/Earn/LendingLearnMoreModal/index.tsx
@@ -1,10 +1,10 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { HeaderStandard } from '@metamask/design-system-react-native';
 import styleSheet from './LendingLearnMoreModal.styles';
 import { useStyles } from '../../../hooks/useStyles';
 import BottomSheet, {
   BottomSheetRef,
 } from '../../../../component-library/components/BottomSheets/BottomSheet';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import Text, {
   TextColor,
   TextVariant,
@@ -288,7 +288,7 @@ export const LendingLearnMoreModal = () => {
 
   return (
     <BottomSheet ref={sheetRef} isInteractable={false}>
-      <HeaderCompactStandard
+      <HeaderStandard
         title={strings('earn.how_it_works')}
         onClose={handleClose}
       />
diff --git a/app/components/UI/Earn/Views/EarnInputView/EarnInputView.test.tsx b/app/components/UI/Earn/Views/EarnInputView/EarnInputView.test.tsx
index ec43515a31d..915f564c71a 100644
--- a/app/components/UI/Earn/Views/EarnInputView/EarnInputView.test.tsx
+++ b/app/components/UI/Earn/Views/EarnInputView/EarnInputView.test.tsx
@@ -527,7 +527,7 @@ describe('EarnInputView', () => {
         name: 'params',
       });
 
-      // Verify the title is rendered in the HeaderCompactStandard component
+      // Verify the title is rendered in the HeaderStandard component
       expect(getByText('Supply USDC')).toBeOnTheScreen();
 
       // "0" in the input display and on the keypad
@@ -1202,7 +1202,7 @@ describe('EarnInputView', () => {
       // Default mock returns ETH with POOLED_STAKING experience
       const { getByText } = renderComponent();
 
-      // Verify the title is rendered in the HeaderCompactStandard component
+      // Verify the title is rendered in the HeaderStandard component
       expect(getByText('Stake ETH')).toBeOnTheScreen();
     });
   });
@@ -1845,7 +1845,7 @@ describe('EarnInputView', () => {
     });
   });
 
-  describe('HeaderCompactStandard interactions', () => {
+  describe('HeaderStandard interactions', () => {
     it('tracks STAKE_CANCEL_CLICKED event with token property when back button is pressed for staking', async () => {
       selectStablecoinLendingEnabledFlagMock.mockReturnValue(false);
 
diff --git a/app/components/UI/Earn/Views/EarnInputView/EarnInputView.tsx b/app/components/UI/Earn/Views/EarnInputView/EarnInputView.tsx
index 0329aefbb38..230950da973 100644
--- a/app/components/UI/Earn/Views/EarnInputView/EarnInputView.tsx
+++ b/app/components/UI/Earn/Views/EarnInputView/EarnInputView.tsx
@@ -45,8 +45,7 @@ import Keypad from '../../../../Base/Keypad';
 import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
 import { useStyles } from '../../../../hooks/useStyles';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
-import { IconName } from '@metamask/design-system-react-native';
+import { HeaderStandard, IconName } from '@metamask/design-system-react-native';
 import ScreenLayout from '../../../Ramp/Aggregator/components/ScreenLayout';
 import QuickAmounts from '../../../Stake/components/QuickAmounts';
 import { EVENT_PROVIDERS } from '../../../Stake/constants/events';
@@ -1005,7 +1004,7 @@ const EarnInputView = () => {
 
   return (
     <ScreenLayout style={styles.container}>
-      <HeaderCompactStandard
+      <HeaderStandard
         title={headerTitle}
         onBack={handleBackPress}
         endButtonIconProps={
diff --git a/app/components/UI/Earn/Views/EarnMusdConversionEducationView/EarnMusdConversionEducationView.styles.ts b/app/components/UI/Earn/Views/EarnMusdConversionEducationView/EarnMusdConversionEducationView.styles.ts
deleted file mode 100644
index 7f2e09bb02f..00000000000
--- a/app/components/UI/Earn/Views/EarnMusdConversionEducationView/EarnMusdConversionEducationView.styles.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { StyleSheet } from 'react-native';
-import type { Theme } from '../../../../../util/theme/models';
-
-export const styleSheet = (_params: { theme: Theme }) =>
-  StyleSheet.create({
-    container: {
-      flex: 1,
-      paddingTop: 40,
-    },
-    imageContainer: {
-      flex: 1,
-      minHeight: 100,
-    },
-    backgroundImage: {
-      width: '100%',
-      height: '100%',
-      resizeMode: 'contain',
-    },
-    content: {
-      paddingHorizontal: 16,
-      alignItems: 'center',
-    },
-    heading: {
-      fontFamily: 'MMPoly-Regular',
-      fontSize: 40,
-      lineHeight: 40,
-      paddingVertical: 16,
-      textAlign: 'center',
-    },
-    bodyText: {
-      textAlign: 'center',
-      paddingHorizontal: 30,
-    },
-    buttonsContainer: {
-      marginHorizontal: 32,
-      gap: 8,
-      marginBottom: 16,
-    },
-    termsText: {
-      textDecorationLine: 'underline',
-    },
-  });
diff --git a/app/components/UI/Earn/Views/EarnMusdConversionEducationView/EarnMusdConversionEducationView.view.test.tsx b/app/components/UI/Earn/Views/EarnMusdConversionEducationView/EarnMusdConversionEducationView.view.test.tsx
index d8e7e8dde15..be374a26e69 100644
--- a/app/components/UI/Earn/Views/EarnMusdConversionEducationView/EarnMusdConversionEducationView.view.test.tsx
+++ b/app/components/UI/Earn/Views/EarnMusdConversionEducationView/EarnMusdConversionEducationView.view.test.tsx
@@ -58,7 +58,7 @@ describeForPlatforms('EarnMusdConversionEducationView', () => {
     ).toBeOnTheScreen();
     expect(
       getByText(
-        /Convert your stablecoins to mUSD.*earn up to a \d+% annualized bonus/,
+        /Convert your stablecoins to mUSD.*earn a \d+%.+annualized bonus/,
       ),
     ).toBeOnTheScreen();
     expect(
@@ -391,10 +391,10 @@ describeForPlatforms('EarnMusdConversionEducationView', () => {
 
     // Assert
     const description = getByText(
-      /Convert your stablecoins to mUSD.*earn up to a \d+% annualized bonus/,
+      /Convert your stablecoins to mUSD.*earn a \d+%.+annualized bonus/,
     );
     expect(description).toBeOnTheScreen();
-    expect(description.props.children[0]).toContain(`${MUSD_CONVERSION_APY}%`);
+    expect(description.props.children).toContain(`${MUSD_CONVERSION_APY}%`);
   });
 
   it('renders education screen when education has been seen', () => {
diff --git a/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.test.tsx b/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.test.tsx
index 2d53ea2c7a0..08673adcde8 100644
--- a/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.test.tsx
+++ b/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.test.tsx
@@ -3,7 +3,6 @@ import { fireEvent, waitFor, act } from '@testing-library/react-native';
 import { useNavigation, useFocusEffect } from '@react-navigation/native';
 import { useDispatch } from 'react-redux';
 import { Hex } from '@metamask/utils';
-import { Linking } from 'react-native';
 import EarnMusdConversionEducationView from './index';
 import {
   setMusdConversionEducationSeen,
@@ -20,9 +19,6 @@ import { EARN_TEST_IDS } from '../../constants/testIds';
 import { useMusdConversionFlowData } from '../../hooks/useMusdConversionFlowData';
 import { useRampNavigation } from '../../../Ramp/hooks/useRampNavigation';
 import Routes from '../../../../../constants/navigation/Routes';
-import AppConstants from '../../../../../core/AppConstants';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../../types/musd.types';
-import { selectMusdQuickConvertEnabledFlag } from '../../selectors/featureFlags';
 import { selectMoneyHubEnabledFlag } from '../../../Money/selectors/featureFlags';
 import { MUSD_EVENTS_CONSTANTS } from '../../constants/events';
 import { MONEY_EVENTS_CONSTANTS } from '../../../Money/constants/moneyEvents';
@@ -74,10 +70,6 @@ jest.mock('../../../Ramp/hooks/useRampNavigation', () => ({
   useRampNavigation: jest.fn(),
 }));
 
-jest.mock('../../selectors/featureFlags', () => ({
-  selectMusdQuickConvertEnabledFlag: jest.fn(() => false),
-}));
-
 jest.mock('../../../Money/selectors/featureFlags', () => ({
   selectMoneyHubEnabledFlag: jest.fn(() => false),
 }));
@@ -123,10 +115,6 @@ const mockUseMusdConversionFlowData =
 const mockUseRampNavigation = useRampNavigation as jest.MockedFunction<
   typeof useRampNavigation
 >;
-const mockSelectMusdQuickConvertEnabledFlag =
-  selectMusdQuickConvertEnabledFlag as jest.MockedFunction<
-    typeof selectMusdQuickConvertEnabledFlag
-  >;
 const mockSelectMoneyHubEnabledFlag =
   selectMoneyHubEnabledFlag as jest.MockedFunction<
     typeof selectMoneyHubEnabledFlag
@@ -236,7 +224,6 @@ describe('EarnMusdConversionEducationView', () => {
       goToSell: jest.fn(),
       goToDeposit: jest.fn(),
     });
-    mockSelectMusdQuickConvertEnabledFlag.mockReturnValue(false);
     mockSelectMoneyHubEnabledFlag.mockReturnValue(false);
 
     mockBuild.mockReturnValue({ name: 'mock-built-event' });
@@ -273,9 +260,6 @@ describe('EarnMusdConversionEducationView', () => {
         ),
       ).toBeOnTheScreen();
       expect(getByText(descriptionText, { exact: false })).toBeOnTheScreen();
-      expect(
-        getByText(strings('earn.musd_conversion.education.terms_apply')),
-      ).toBeOnTheScreen();
       expect(
         getByText(strings('earn.musd_conversion.education.primary_button')),
       ).toBeOnTheScreen();
@@ -321,7 +305,6 @@ describe('EarnMusdConversionEducationView', () => {
             chainId: '0x1',
           },
           skipEducationCheck: true,
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
         });
         expect(mockNavigation.navigate).not.toHaveBeenCalledWith(
           Routes.WALLET.HOME,
@@ -512,7 +495,6 @@ describe('EarnMusdConversionEducationView', () => {
             chainId: mockConversionTokenHighBalance.chainId,
           },
           skipEducationCheck: true,
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
         });
       });
     });
@@ -947,43 +929,6 @@ describe('EarnMusdConversionEducationView', () => {
     });
   });
 
-  describe('external links', () => {
-    it('opens bonus terms of use when "Terms apply" is pressed', () => {
-      const openUrlSpy = jest
-        .spyOn(Linking, 'openURL')
-        .mockResolvedValueOnce(undefined);
-
-      const { getByText } = renderWithProvider(
-        <EarnMusdConversionEducationView />,
-        { state: {} },
-      );
-
-      mockTrackEvent.mockClear();
-      mockCreateEventBuilder.mockClear();
-      mockAddProperties.mockClear();
-      mockBuild.mockClear();
-
-      fireEvent.press(
-        getByText(strings('earn.musd_conversion.education.terms_apply')),
-      );
-
-      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
-        MetaMetricsEvents.MUSD_BONUS_TERMS_OF_USE_PRESSED,
-      );
-      expect(mockAddProperties).toHaveBeenCalledWith({
-        location:
-          MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.CONVERSION_EDUCATION_SCREEN,
-        url: AppConstants.URLS.MUSD_CONVERSION_BONUS_TERMS_OF_USE,
-      });
-      expect(mockTrackEvent).toHaveBeenCalledWith({ name: 'mock-built-event' });
-
-      expect(openUrlSpy).toHaveBeenCalledTimes(1);
-      expect(openUrlSpy).toHaveBeenCalledWith(
-        AppConstants.URLS.MUSD_CONVERSION_BONUS_TERMS_OF_USE,
-      );
-    });
-  });
-
   describe('redux actions', () => {
     it('dispatches setMusdConversionEducationSeen when continue button pressed', async () => {
       const { getByTestId } = renderWithProvider(
@@ -1057,7 +1002,6 @@ describe('EarnMusdConversionEducationView', () => {
         expect(mockInitiateConversion).toHaveBeenCalledWith({
           preferredPaymentToken: mockRouteParams.preferredPaymentToken,
           skipEducationCheck: true,
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
         });
       });
     });
@@ -1115,38 +1059,6 @@ describe('EarnMusdConversionEducationView', () => {
       });
       expect(mockInitiateConversion).not.toHaveBeenCalled();
     });
-
-    it("forwards caller's navigationOverride (CUSTOM) to initiateCustomConversion instead of hardcoding QUICK_CONVERT", async () => {
-      mockUseParams.mockReturnValue({
-        preferredPaymentToken: {
-          address: '0xabc' as Hex,
-          chainId: '0x1' as Hex,
-        },
-        navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.CUSTOM,
-      });
-
-      const { getByTestId } = renderWithProvider(
-        <EarnMusdConversionEducationView />,
-        { state: {} },
-      );
-
-      await act(async () => {
-        fireEvent.press(
-          getByTestId(
-            EARN_TEST_IDS.MUSD.CONVERSION_EDUCATION_VIEW.PRIMARY_BUTTON,
-          ),
-        );
-      });
-
-      await waitFor(() => {
-        expect(mockInitiateConversion).toHaveBeenCalledWith(
-          expect.objectContaining({
-            navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.CUSTOM,
-            skipEducationCheck: true,
-          }),
-        );
-      });
-    });
   });
 
   describe('MetaMetrics', () => {
@@ -1232,9 +1144,7 @@ describe('EarnMusdConversionEducationView', () => {
       });
     });
 
-    it('tracks quick convert redirect when quick convert is enabled', async () => {
-      mockSelectMusdQuickConvertEnabledFlag.mockReturnValue(true);
-
+    it('tracks fullscreen announcement button clicked event when go back button is pressed', () => {
       const { getByTestId } = renderWithProvider(
         <EarnMusdConversionEducationView />,
         { state: {} },
@@ -1245,30 +1155,32 @@ describe('EarnMusdConversionEducationView', () => {
       mockAddProperties.mockClear();
       mockBuild.mockClear();
 
-      await act(async () => {
-        fireEvent.press(
-          getByTestId(
-            EARN_TEST_IDS.MUSD.CONVERSION_EDUCATION_VIEW.PRIMARY_BUTTON,
-          ),
-        );
-      });
+      fireEvent.press(
+        getByTestId(
+          EARN_TEST_IDS.MUSD.CONVERSION_EDUCATION_VIEW.SECONDARY_BUTTON,
+        ),
+      );
 
-      await waitFor(() => {
-        expect(mockCreateEventBuilder).toHaveBeenCalledWith(
-          MetaMetricsEvents.MUSD_FULLSCREEN_ANNOUNCEMENT_BUTTON_CLICKED,
-        );
+      expect(mockCreateEventBuilder).toHaveBeenCalledTimes(1);
+      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+        MetaMetricsEvents.MUSD_FULLSCREEN_ANNOUNCEMENT_BUTTON_CLICKED,
+      );
 
-        expect(mockAddProperties).toHaveBeenCalledWith({
-          location: 'conversion_education_screen',
-          button_type: 'primary',
-          button_text: strings('earn.musd_conversion.education.primary_button'),
-          redirects_to:
-            MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN,
-        });
+      expect(mockAddProperties).toHaveBeenCalledTimes(1);
+      expect(mockAddProperties).toHaveBeenCalledWith({
+        location: 'conversion_education_screen',
+        button_type: 'secondary',
+        button_text: strings('earn.musd_conversion.education.secondary_button'),
       });
+
+      expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+      expect(mockTrackEvent).toHaveBeenCalledWith({ name: 'mock-built-event' });
     });
 
-    it('tracks fullscreen announcement button clicked event when go back button is pressed', () => {
+    it('includes redirects_to money_hub when secondary button pressed with deeplink, Money Hub enabled, and geo-eligible', () => {
+      mockSelectMoneyHubEnabledFlag.mockReturnValue(true);
+      mockUseParams.mockReturnValue({ isDeeplink: true });
+
       const { getByTestId } = renderWithProvider(
         <EarnMusdConversionEducationView />,
         { state: {} },
@@ -1285,20 +1197,46 @@ describe('EarnMusdConversionEducationView', () => {
         ),
       );
 
-      expect(mockCreateEventBuilder).toHaveBeenCalledTimes(1);
       expect(mockCreateEventBuilder).toHaveBeenCalledWith(
         MetaMetricsEvents.MUSD_FULLSCREEN_ANNOUNCEMENT_BUTTON_CLICKED,
       );
-
-      expect(mockAddProperties).toHaveBeenCalledTimes(1);
       expect(mockAddProperties).toHaveBeenCalledWith({
-        location: 'conversion_education_screen',
+        location:
+          MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.CONVERSION_EDUCATION_SCREEN,
         button_type: 'secondary',
         button_text: strings('earn.musd_conversion.education.secondary_button'),
+        redirects_to: MONEY_EVENTS_CONSTANTS.EVENT_LOCATIONS.MONEY_HUB,
       });
+    });
 
-      expect(mockTrackEvent).toHaveBeenCalledTimes(1);
-      expect(mockTrackEvent).toHaveBeenCalledWith({ name: 'mock-built-event' });
+    it('omits redirects_to when secondary button pressed in normal non-deeplink flow', () => {
+      mockUseParams.mockReturnValue({ isDeeplink: false });
+
+      const { getByTestId } = renderWithProvider(
+        <EarnMusdConversionEducationView />,
+        { state: {} },
+      );
+
+      mockTrackEvent.mockClear();
+      mockCreateEventBuilder.mockClear();
+      mockAddProperties.mockClear();
+      mockBuild.mockClear();
+
+      fireEvent.press(
+        getByTestId(
+          EARN_TEST_IDS.MUSD.CONVERSION_EDUCATION_VIEW.SECONDARY_BUTTON,
+        ),
+      );
+
+      expect(mockAddProperties).toHaveBeenCalledWith({
+        location:
+          MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.CONVERSION_EDUCATION_SCREEN,
+        button_type: 'secondary',
+        button_text: strings('earn.musd_conversion.education.secondary_button'),
+      });
+      expect(mockAddProperties).not.toHaveBeenCalledWith(
+        expect.objectContaining({ redirects_to: expect.anything() }),
+      );
     });
 
     it('tracks money_hub redirect when continue is pressed with returnTo', async () => {
diff --git a/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.tsx b/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.tsx
index db2ac8c416d..864536c593b 100644
--- a/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.tsx
+++ b/app/components/UI/Earn/Views/EarnMusdConversionEducationView/index.tsx
@@ -1,19 +1,9 @@
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { Hex } from '@metamask/utils';
 import { useDispatch, useSelector } from 'react-redux';
-import { View, Image, useColorScheme, Linking } from 'react-native';
+import { Image, StyleSheet, useColorScheme } from 'react-native';
 import { setMusdConversionEducationSeen } from '../../../../../actions/user';
 import Logger from '../../../../../util/Logger';
-import Text, {
-  TextVariant,
-} from '../../../../../component-library/components/Texts/Text';
-import Button, {
-  ButtonSize,
-  ButtonVariants,
-  ButtonWidthTypes,
-} from '../../../../../component-library/components/Buttons/Button';
-import { useStyles } from '../../../../../component-library/hooks';
-import { styleSheet } from './EarnMusdConversionEducationView.styles';
 import musdEducationBackgroundV2Dark from '../../../../../images/musd-conversion-education-screen-v2-dark-3x.png';
 import musdEducationBackgroundV2Light from '../../../../../images/musd-conversion-education-screen-v2-light-3x.png';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -22,9 +12,28 @@ import { useParams } from '../../../../../util/navigation/navUtils';
 import { useNavigation } from '@react-navigation/native';
 import { StackNavigationProp } from '@react-navigation/stack';
 import {
-  Button as DesignSystemButton,
-  ButtonVariant as DesignSystemButtonVariant,
+  Box,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  Button,
+  ButtonSize,
+  ButtonVariant,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Text,
+  TextColor,
+  TextVariant,
 } from '@metamask/design-system-react-native';
+// component-library TagBase: DSRN Tag has no startAccessory + Rectangle shape support
+import TagBase from '../../../../../component-library/base-components/TagBase';
+import {
+  TagShape,
+  TagSeverity,
+} from '../../../../../component-library/base-components/TagBase/TagBase.types';
+import { TextVariant as ComponentTextVariant } from '../../../../../component-library/components/Texts/Text/Text.types';
 import { strings } from '../../../../../../locales/i18n';
 import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
@@ -39,16 +48,31 @@ import Routes from '../../../../../constants/navigation/Routes';
 import { useRampNavigation } from '../../../Ramp/hooks/useRampNavigation';
 import { RampIntent } from '../../../Ramp/types';
 import { EARN_TEST_IDS } from '../../constants/testIds';
-import AppConstants from '../../../../../core/AppConstants';
-import {
-  MUSD_CONVERSION_NAVIGATION_OVERRIDE,
-  MusdNavigationTarget,
-} from '../../types/musd.types';
-import { selectMusdQuickConvertEnabledFlag } from '../../selectors/featureFlags';
+import { MusdNavigationTarget } from '../../types/musd.types';
 import { toChecksumAddress } from '../../../../../util/address';
 import { safeFormatChainIdToHex } from '../../../Card/util/safeFormatChainIdToHex';
 import { MONEY_EVENTS_CONSTANTS } from '../../../Money/constants/moneyEvents';
-import { selectMoneyHubEnabledFlag } from '../../../Money/selectors/featureFlags.ts';
+import { selectMoneyHubEnabledFlag } from '../../../Money/selectors/featureFlags';
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    paddingTop: 40,
+  },
+  heading: {
+    fontFamily: 'MMPoly-Regular',
+    fontSize: 40,
+    lineHeight: 40,
+    paddingVertical: 16,
+    textAlign: 'center',
+  },
+  backgroundImage: {
+    width: '100%',
+    height: '100%',
+    resizeMode: 'contain',
+  },
+});
+
 interface EarnMusdConversionEducationViewRouteParams {
   /**
    * Indicates if this navigation originated from a deeplink
@@ -65,12 +89,6 @@ interface EarnMusdConversionEducationViewRouteParams {
     address: Hex;
     chainId: Hex;
   };
-  /**
-   * Caller's intended navigation override. When present, this is forwarded to
-   * `initiateCustomConversion` on continue so the education screen doesn't hijack
-   * the destination (e.g., pencil-in-Hub preserves CUSTOM; other callers keep their intent).
-   */
-  navigationOverride?: MUSD_CONVERSION_NAVIGATION_OVERRIDE;
   /**
    * Pure-navigation exit target. When present, the primary button routes here and
    * skips conversion entirely. Use for entry points that only needed the education
@@ -86,18 +104,13 @@ interface EarnMusdConversionEducationViewRouteParams {
 const EarnMusdConversionEducationView = () => {
   const dispatch = useDispatch();
 
-  const isQuickConvertEnabled = useSelector(selectMusdQuickConvertEnabledFlag);
   const isMoneyHubEnabled = useSelector(selectMoneyHubEnabledFlag);
 
   const { initiateCustomConversion } = useMusdConversion();
   const { goToBuy } = useRampNavigation();
 
-  const {
-    preferredPaymentToken,
-    isDeeplink,
-    navigationOverride: callerNavigationOverride,
-    returnTo,
-  } = useParams<EarnMusdConversionEducationViewRouteParams>();
+  const { preferredPaymentToken, isDeeplink, returnTo } =
+    useParams<EarnMusdConversionEducationViewRouteParams>();
 
   // Hooks for deeplink case (when no params provided)
   const {
@@ -109,8 +122,6 @@ const EarnMusdConversionEducationView = () => {
     conversionTokens,
   } = useMusdConversionFlowData();
 
-  const { styles } = useStyles(styleSheet, {});
-
   const navigation =
     useNavigation<StackNavigationProp<Record<string, object | undefined>>>();
 
@@ -219,11 +230,11 @@ const EarnMusdConversionEducationView = () => {
   }, [submitScreenViewedEvent]);
 
   const submitContinuePressedEvent = useCallback(() => {
-    let redirectsTo = isQuickConvertEnabled
-      ? MUSD_EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN
-      : MUSD_EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN;
+    let redirectsTo = MUSD_EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN;
     if (returnTo) {
       redirectsTo = MONEY_EVENT_LOCATIONS.MONEY_HUB;
+    } else if (deeplinkState?.action === 'navigate_money_hub') {
+      redirectsTo = MONEY_EVENT_LOCATIONS.MONEY_HUB;
     } else if (deeplinkState?.action === 'navigate_home') {
       redirectsTo = MUSD_EVENT_LOCATIONS.HOME_SCREEN;
     } else if (deeplinkState?.action === 'buy') {
@@ -243,9 +254,7 @@ const EarnMusdConversionEducationView = () => {
         .build(),
     );
   }, [
-    isQuickConvertEnabled,
     returnTo,
-    MUSD_EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN,
     MUSD_EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN,
     MUSD_EVENT_LOCATIONS.CONVERSION_EDUCATION_SCREEN,
     MUSD_EVENT_LOCATIONS.HOME_SCREEN,
@@ -323,22 +332,15 @@ const EarnMusdConversionEducationView = () => {
           await initiateCustomConversion({
             preferredPaymentToken: deeplinkState.paymentToken,
             skipEducationCheck: true,
-            navigationOverride:
-              MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
           });
           return;
         }
       }
 
-      // Proceed to conversion flow if we have the required params (normal flow).
-      // Honor caller's navigationOverride; fall back to QUICK_CONVERT.
       if (!isDeeplink && preferredPaymentToken) {
         await initiateCustomConversion({
           preferredPaymentToken,
           skipEducationCheck: true,
-          navigationOverride:
-            callerNavigationOverride ??
-            MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
         });
         return;
       }
@@ -363,7 +365,6 @@ const EarnMusdConversionEducationView = () => {
     goToBuy,
     isDeeplink,
     returnTo,
-    callerNavigationOverride,
   ]);
 
   const handleNotNow = () => {
@@ -388,19 +389,6 @@ const EarnMusdConversionEducationView = () => {
     }
   };
 
-  const handleTermsOfUsePressed = () => {
-    trackEvent(
-      createEventBuilder(MetaMetricsEvents.MUSD_BONUS_TERMS_OF_USE_PRESSED)
-        .addProperties({
-          location: MUSD_EVENT_LOCATIONS.CONVERSION_EDUCATION_SCREEN,
-          url: AppConstants.URLS.MUSD_CONVERSION_BONUS_TERMS_OF_USE,
-        })
-        .build(),
-    );
-
-    Linking.openURL(AppConstants.URLS.MUSD_CONVERSION_BONUS_TERMS_OF_USE);
-  };
-
   return (
     // Do not remove the top edge as this screen does not have a navbar set in the route options.
     <SafeAreaView
@@ -408,53 +396,86 @@ const EarnMusdConversionEducationView = () => {
       edges={['top', 'bottom']}
       testID={EARN_TEST_IDS.MUSD.CONVERSION_EDUCATION_VIEW.CONTAINER}
     >
-      <View style={styles.content}>
+      <Box twClassName="px-4 items-center">
         <Text style={styles.heading} numberOfLines={2} adjustsFontSizeToFit>
           {strings('earn.musd_conversion.education.heading', {
             percentage: MUSD_CONVERSION_APY,
           })}
         </Text>
-        <Text variant={TextVariant.BodyMD} style={styles.bodyText}>
-          {strings('earn.musd_conversion.education.description', {
-            percentage: MUSD_CONVERSION_APY,
-          })}{' '}
-          <Text
-            variant={TextVariant.BodyMD}
-            style={styles.termsText}
-            onPress={handleTermsOfUsePressed}
-          >
-            {strings('earn.musd_conversion.education.terms_apply')}
-          </Text>
-        </Text>
-      </View>
-      <View style={styles.imageContainer}>
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          justifyContent={BoxJustifyContent.Center}
+          twClassName="flex-wrap gap-1 mt-4"
+        >
+          {[
+            'earn.musd_conversion.education.checklist.dollar_backed',
+            'earn.musd_conversion.education.checklist.no_lockups',
+            'earn.musd_conversion.education.checklist.daily_bonus',
+            'earn.musd_conversion.education.checklist.metamask_stablecoins',
+            'earn.musd_conversion.education.checklist.no_metamask_fee',
+          ].map((key) => (
+            <TagBase
+              key={key}
+              shape={TagShape.Rectangle}
+              severity={TagSeverity.Neutral}
+              gap={4}
+              startAccessory={
+                <Icon
+                  name={IconName.CheckBold}
+                  size={IconSize.Sm}
+                  color={IconColor.SuccessDefault}
+                />
+              }
+              textProps={{
+                variant: ComponentTextVariant.BodySMMedium,
+                numberOfLines: 1,
+              }}
+            >
+              {strings(key)}
+            </TagBase>
+          ))}
+        </Box>
+      </Box>
+      <Box twClassName="flex-1 min-h-[100px]">
         <Image
           source={backgroundImage}
           style={styles.backgroundImage}
           testID={EARN_TEST_IDS.MUSD.CONVERSION_EDUCATION_VIEW.BACKGROUND_IMAGE}
         />
-      </View>
+      </Box>
+      <Box twClassName="px-4 items-center">
+        <Text
+          variant={TextVariant.BodyMd}
+          color={TextColor.TextAlternative}
+          twClassName="text-center mt-4 mb-6"
+        >
+          {strings('earn.musd_conversion.education.description', {
+            percentage: MUSD_CONVERSION_APY,
+          })}
+        </Text>
+      </Box>
 
-      <View style={styles.buttonsContainer}>
+      <Box twClassName="mx-4 mb-4 gap-2">
         <Button
-          variant={ButtonVariants.Primary}
-          label={primaryButtonText}
+          variant={ButtonVariant.Primary}
           onPress={handleContinue}
           size={ButtonSize.Lg}
-          width={ButtonWidthTypes.Full}
+          isFullWidth
           testID={EARN_TEST_IDS.MUSD.CONVERSION_EDUCATION_VIEW.PRIMARY_BUTTON}
-        />
-        <DesignSystemButton
-          variant={DesignSystemButtonVariant.Tertiary}
+        >
+          {primaryButtonText}
+        </Button>
+        <Button
+          variant={ButtonVariant.Tertiary}
           isFullWidth
           onPress={handleNotNow}
           testID={EARN_TEST_IDS.MUSD.CONVERSION_EDUCATION_VIEW.SECONDARY_BUTTON}
         >
-          <Text variant={TextVariant.BodyMDMedium}>
+          <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
             {strings('earn.musd_conversion.education.secondary_button')}
           </Text>
-        </DesignSystemButton>
-      </View>
+        </Button>
+      </Box>
     </SafeAreaView>
   );
 };
diff --git a/app/components/UI/Earn/Views/MusdQuickConvertView/MusdQuickConvertView.styles.ts b/app/components/UI/Earn/Views/MusdQuickConvertView/MusdQuickConvertView.styles.ts
deleted file mode 100644
index 37a85b329cd..00000000000
--- a/app/components/UI/Earn/Views/MusdQuickConvertView/MusdQuickConvertView.styles.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { StyleSheet } from 'react-native';
-import type { Theme } from '../../../../../util/theme/models';
-
-const styleSheet = ({ theme }: { theme: Theme }) =>
-  StyleSheet.create({
-    container: {
-      flex: 1,
-      padding: 16,
-      backgroundColor: theme.colors.background.default,
-    },
-    listContainer: {
-      flex: 1,
-    },
-    headerTextContainer: {
-      gap: 8,
-      paddingBottom: 16,
-    },
-    balanceCardHeader: {
-      paddingBottom: 8,
-    },
-    emptyContainer: {
-      flex: 1,
-      alignItems: 'center',
-      justifyContent: 'center',
-    },
-    listHeaderContainer: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      gap: 8,
-    },
-    termsApply: {
-      textDecorationLine: 'underline',
-    },
-    balanceCardContainer: {
-      paddingVertical: 12,
-    },
-  });
-
-export default styleSheet;
diff --git a/app/components/UI/Earn/Views/MusdQuickConvertView/MusdQuickConvertView.test.tsx b/app/components/UI/Earn/Views/MusdQuickConvertView/MusdQuickConvertView.test.tsx
deleted file mode 100644
index cfe0b54a992..00000000000
--- a/app/components/UI/Earn/Views/MusdQuickConvertView/MusdQuickConvertView.test.tsx
+++ /dev/null
@@ -1,692 +0,0 @@
-import React from 'react';
-import { fireEvent, act } from '@testing-library/react-native';
-import { TransactionStatus } from '@metamask/transaction-controller';
-import { Hex } from '@metamask/utils';
-import renderWithProvider from '../../../../../util/test/renderWithProvider';
-import initialRootState from '../../../../../util/test/initial-root-state';
-import MusdQuickConvertView, { MusdQuickConvertViewTestIds } from './index';
-import { AssetType } from '../../../../Views/confirmations/types/token';
-import { useMusdConversionTokens } from '../../hooks/useMusdConversionTokens';
-import { useMusdConversion } from '../../hooks/useMusdConversion';
-import { selectMusdQuickConvertEnabledFlag } from '../../selectors/featureFlags';
-import {
-  createTokenChainKey,
-  selectHasInFlightMusdConversion,
-  selectHasUnapprovedMusdConversion,
-  selectMusdConversionStatuses,
-} from '../../selectors/musdConversionStatus';
-import { MUSD_CONVERSION_APY } from '../../constants/musd';
-import AppConstants from '../../../../../core/AppConstants';
-import { Linking } from 'react-native';
-import { useNavigation, useFocusEffect } from '@react-navigation/native';
-import { MetaMetricsEvents } from '../../../../../core/Analytics';
-import { MUSD_EVENTS_CONSTANTS } from '../../constants/events';
-import { strings } from '../../../../../../locales/i18n';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../../types/musd.types';
-import { ConvertTokenRowTestIds } from '../../components/Musd/ConvertTokenRow';
-import { useMusdBalance } from '../../hooks/useMusdBalance';
-import { IconName } from '@metamask/design-system-react-native';
-
-const mockTrackEvent = jest.fn();
-const mockCreateEventBuilder = jest.fn();
-const mockAddProperties = jest.fn();
-const mockBuild = jest.fn();
-
-jest.mock('../../../../hooks/useAnalytics/useAnalytics', () => ({
-  useAnalytics: () => ({
-    trackEvent: mockTrackEvent,
-    createEventBuilder: mockCreateEventBuilder,
-  }),
-}));
-
-jest.mock('@react-navigation/native', () => {
-  const actual = jest.requireActual('@react-navigation/native');
-  return {
-    ...actual,
-    useNavigation: jest.fn(),
-    useFocusEffect: jest.fn(),
-  };
-});
-
-jest.mock('../../hooks/useMusdConversionTokens');
-jest.mock('../../hooks/useMusdConversion');
-jest.mock('../../hooks/useMusdBalance');
-jest.mock('../../selectors/featureFlags', () => ({
-  ...jest.requireActual('../../selectors/featureFlags'),
-  selectMusdQuickConvertEnabledFlag: jest.fn(),
-}));
-jest.mock('../../selectors/musdConversionStatus', () => ({
-  ...jest.requireActual('../../selectors/musdConversionStatus'),
-  selectHasInFlightMusdConversion: jest.fn(),
-  selectHasUnapprovedMusdConversion: jest.fn(),
-  selectMusdConversionStatuses: jest.fn(),
-}));
-const mockGetStakingNavbar = jest.fn<object, unknown[]>(() => ({}));
-jest.mock('../../../Navbar', () => ({
-  getStakingNavbar: (
-    title: string,
-    nav: unknown,
-    colors: unknown,
-    options?: { hasCancelButton?: boolean },
-  ) => mockGetStakingNavbar(title, nav, colors, options),
-}));
-jest.mock('../../../../hooks/useStyles', () => ({
-  useStyles: jest.fn(() => ({
-    styles: {
-      container: {},
-      headerContainer: {},
-      headerTextContainer: {},
-      listContainer: {},
-      emptyContainer: {},
-      listHeaderContainer: {},
-      termsApply: {},
-      balanceCardHeader: {},
-    },
-    theme: { colors: {} },
-  })),
-}));
-jest.mock('../../utils/network', () => ({
-  getNetworkName: jest.fn(() => 'Ethereum'),
-}));
-jest.mock('react-native/Libraries/Linking/Linking', () => ({
-  addEventListener: jest.fn(),
-  removeEventListener: jest.fn(),
-  openURL: jest.fn(),
-  canOpenURL: jest.fn(),
-  getInitialURL: jest.fn(),
-}));
-
-const mockSelectMusdQuickConvertEnabledFlag =
-  selectMusdQuickConvertEnabledFlag as jest.MockedFunction<
-    typeof selectMusdQuickConvertEnabledFlag
-  >;
-const mockUseMusdConversionTokens =
-  useMusdConversionTokens as jest.MockedFunction<
-    typeof useMusdConversionTokens
-  >;
-const mockUseMusdConversion = useMusdConversion as jest.MockedFunction<
-  typeof useMusdConversion
->;
-const mockUseMusdBalance = useMusdBalance as jest.MockedFunction<
-  typeof useMusdBalance
->;
-const mockSelectHasUnapprovedMusdConversion =
-  selectHasUnapprovedMusdConversion as jest.MockedFunction<
-    typeof selectHasUnapprovedMusdConversion
-  >;
-const mockSelectHasInFlightMusdConversion =
-  selectHasInFlightMusdConversion as jest.MockedFunction<
-    typeof selectHasInFlightMusdConversion
-  >;
-const mockSelectMusdConversionStatuses =
-  selectMusdConversionStatuses as jest.MockedFunction<
-    typeof selectMusdConversionStatuses
-  >;
-const mockUseNavigation = useNavigation as jest.MockedFunction<
-  typeof useNavigation
->;
-const mockUseFocusEffect = useFocusEffect as jest.MockedFunction<
-  typeof useFocusEffect
->;
-
-const createMockToken = (overrides: Partial<AssetType> = {}): AssetType => ({
-  address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' as Hex,
-  chainId: '0x1' as Hex,
-  symbol: 'USDC',
-  decimals: 6,
-  rawBalance: '0x5f5e100' as Hex,
-  name: 'USD Coin',
-  aggregators: [],
-  image: 'https://example.com/usdc.png',
-  balance: '100',
-  logo: 'https://example.com/usdc.png',
-  isETH: false,
-  fiat: { balance: 100 },
-  ...overrides,
-});
-
-describe('MusdQuickConvertView', () => {
-  const mockInitiateMaxConversion = jest.fn();
-  const mockInitiateCustomConversion = jest.fn();
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    mockBuild.mockReturnValue({ name: 'mock-built-event' });
-    mockAddProperties.mockImplementation(() => ({ build: mockBuild }));
-    mockCreateEventBuilder.mockImplementation(() => ({
-      addProperties: mockAddProperties,
-      build: mockBuild,
-    }));
-
-    mockUseNavigation.mockReturnValue({
-      navigate: jest.fn(),
-      goBack: jest.fn(),
-      reset: jest.fn(),
-      setParams: jest.fn(),
-      dispatch: jest.fn(),
-      isFocused: jest.fn().mockReturnValue(true),
-      canGoBack: jest.fn().mockReturnValue(true),
-      getParent: jest.fn(),
-      getId: jest.fn(),
-      getState: jest.fn(),
-      setOptions: jest.fn(),
-      addListener: jest.fn(),
-      removeListener: jest.fn(),
-    } as unknown as ReturnType<typeof useNavigation>);
-    mockUseFocusEffect.mockImplementation((callback) => {
-      callback();
-    });
-    mockSelectMusdQuickConvertEnabledFlag.mockReturnValue(true);
-    mockUseMusdConversionTokens.mockReturnValue({
-      tokens: [],
-      filterAllowedTokens: jest.fn(),
-      isConversionToken: jest.fn(),
-      isMusdSupportedOnChain: jest.fn(),
-      hasConvertibleTokensByChainId: jest.fn(),
-    });
-    mockUseMusdConversion.mockReturnValue({
-      initiateMaxConversion: mockInitiateMaxConversion,
-      initiateCustomConversion: mockInitiateCustomConversion,
-      clearError: jest.fn(),
-      error: null,
-      hasSeenConversionEducationScreen: true,
-    });
-    mockUseMusdBalance.mockReturnValue({
-      hasMusdBalanceOnAnyChain: false,
-      hasMusdBalanceOnChain: jest.fn(),
-      tokenBalanceByChain: {},
-      fiatBalanceByChain: {},
-      fiatBalanceFormattedByChain: {},
-      tokenBalanceAggregated: '0',
-      fiatBalanceAggregated: undefined,
-      fiatBalanceAggregatedFormatted: '$0.00',
-    });
-    mockSelectHasInFlightMusdConversion.mockReturnValue(false);
-    mockSelectHasUnapprovedMusdConversion.mockReturnValue(false);
-    mockSelectMusdConversionStatuses.mockReturnValue({});
-  });
-
-  describe('navigation setup', () => {
-    it('calls setOptions with getStakingNavbar when screen gains focus', () => {
-      const mockSetOptions = jest.fn();
-      mockUseNavigation.mockReturnValue({
-        navigate: jest.fn(),
-        goBack: jest.fn(),
-        reset: jest.fn(),
-        setParams: jest.fn(),
-        dispatch: jest.fn(),
-        isFocused: jest.fn().mockReturnValue(true),
-        canGoBack: jest.fn().mockReturnValue(true),
-        getParent: jest.fn(),
-        getId: jest.fn(),
-        getState: jest.fn(),
-        setOptions: mockSetOptions,
-        addListener: jest.fn(),
-        removeListener: jest.fn(),
-      } as unknown as ReturnType<typeof useNavigation>);
-
-      renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      expect(mockGetStakingNavbar).toHaveBeenCalledWith(
-        '',
-        expect.anything(),
-        expect.anything(),
-        { hasCancelButton: false },
-      );
-      expect(mockSetOptions).toHaveBeenCalled();
-    });
-  });
-
-  describe('feature flag branching', () => {
-    it('returns null when quick convert feature flag is disabled', () => {
-      mockSelectMusdQuickConvertEnabledFlag.mockReturnValue(false);
-
-      const { queryByTestId } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      expect(
-        queryByTestId(MusdQuickConvertViewTestIds.CONTAINER),
-      ).not.toBeOnTheScreen();
-    });
-
-    it('renders container when quick convert feature flag is enabled', () => {
-      mockSelectMusdQuickConvertEnabledFlag.mockReturnValue(true);
-
-      const { getByTestId } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      expect(
-        getByTestId(MusdQuickConvertViewTestIds.CONTAINER),
-      ).toBeOnTheScreen();
-    });
-  });
-
-  describe('empty state', () => {
-    it('displays empty state when no tokens have balance', () => {
-      mockUseMusdConversionTokens.mockReturnValue({
-        tokens: [],
-        filterAllowedTokens: jest.fn(),
-        isConversionToken: jest.fn(),
-        isMusdSupportedOnChain: jest.fn(),
-        hasConvertibleTokensByChainId: jest.fn(),
-      });
-
-      const { getByTestId, getByText } = renderWithProvider(
-        <MusdQuickConvertView />,
-        { state: initialRootState },
-      );
-
-      expect(
-        getByTestId(MusdQuickConvertViewTestIds.EMPTY_STATE),
-      ).toBeOnTheScreen();
-      expect(
-        getByText(strings('earn.musd_conversion.no_tokens_to_convert')),
-      ).toBeOnTheScreen();
-    });
-
-    it('displays empty state when tokens have zero rawBalance', () => {
-      mockUseMusdConversionTokens.mockReturnValue({
-        tokens: [
-          createMockToken({ rawBalance: '0x0' as Hex }),
-          createMockToken({ rawBalance: undefined }),
-        ],
-        filterAllowedTokens: jest.fn(),
-        isConversionToken: jest.fn(),
-        isMusdSupportedOnChain: jest.fn(),
-        hasConvertibleTokensByChainId: jest.fn(),
-      });
-
-      const { getByTestId } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      expect(
-        getByTestId(MusdQuickConvertViewTestIds.EMPTY_STATE),
-      ).toBeOnTheScreen();
-    });
-  });
-
-  describe('token list with balance', () => {
-    it('renders token rows when tokens have balance', () => {
-      const token = createMockToken();
-      mockUseMusdConversionTokens.mockReturnValue({
-        tokens: [token],
-        filterAllowedTokens: jest.fn(),
-        isConversionToken: jest.fn(),
-        isMusdSupportedOnChain: jest.fn(),
-        hasConvertibleTokensByChainId: jest.fn(),
-      });
-
-      const { getByTestId, getAllByTestId, getByText } = renderWithProvider(
-        <MusdQuickConvertView />,
-        { state: initialRootState },
-      );
-
-      expect(
-        getByTestId(MusdQuickConvertViewTestIds.TOKEN_LIST),
-      ).toBeOnTheScreen();
-      expect(getAllByTestId(ConvertTokenRowTestIds.CONTAINER).length).toBe(1);
-      expect(getByText(strings('earn.your_stablecoins'))).toBeOnTheScreen();
-    });
-
-    it('does not render Your mUSD section when user has no balance on any chain', () => {
-      const { getByTestId, getByText, queryByText } = renderWithProvider(
-        <MusdQuickConvertView />,
-        { state: initialRootState },
-      );
-
-      expect(getByTestId(MusdQuickConvertViewTestIds.HEADER)).toBeOnTheScreen();
-      expect(
-        getByText(
-          strings('earn.musd_conversion.quick_convert.title', {
-            percentage: MUSD_CONVERSION_APY,
-          }),
-        ),
-      ).toBeOnTheScreen();
-      expect(
-        queryByText(strings('earn.musd_conversion.your_musd')),
-      ).not.toBeOnTheScreen();
-    });
-
-    it('renders Your mUSD section when user has balance on any chain', () => {
-      mockUseMusdBalance.mockReturnValue({
-        hasMusdBalanceOnAnyChain: true,
-        hasMusdBalanceOnChain: jest.fn(),
-        tokenBalanceByChain: { '0x1': '100.00' },
-        fiatBalanceByChain: { '0x1': '100.00' },
-        fiatBalanceFormattedByChain: { '0x1': '$100.00' },
-        tokenBalanceAggregated: '100.00',
-        fiatBalanceAggregated: '100.00',
-        fiatBalanceAggregatedFormatted: '$100.00',
-      });
-
-      const { getByText } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      expect(
-        getByText(strings('earn.musd_conversion.your_musd')),
-      ).toBeOnTheScreen();
-    });
-
-    it('falls back to token balance when fiat balance is unavailable', () => {
-      mockUseMusdBalance.mockReturnValue({
-        hasMusdBalanceOnAnyChain: true,
-        hasMusdBalanceOnChain: jest.fn(),
-        tokenBalanceByChain: { '0x1': '123.45' },
-        fiatBalanceByChain: {},
-        fiatBalanceFormattedByChain: {},
-        tokenBalanceAggregated: '123.45',
-        fiatBalanceAggregated: undefined,
-        fiatBalanceAggregatedFormatted: '$0.00',
-      });
-
-      const { getByText } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      expect(getByText('123.45')).toBeOnTheScreen();
-    });
-  });
-
-  describe('Max flow', () => {
-    it('calls initiateMaxConversion when Max button is pressed', async () => {
-      const token = createMockToken();
-      mockUseMusdConversionTokens.mockReturnValue({
-        tokens: [token],
-        filterAllowedTokens: jest.fn(),
-        isConversionToken: jest.fn(),
-        isMusdSupportedOnChain: jest.fn(),
-        hasConvertibleTokensByChainId: jest.fn(),
-      });
-      mockInitiateMaxConversion.mockResolvedValue({
-        transactionId: 'tx-max-123',
-      });
-
-      const { getAllByTestId } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      const maxButton = getAllByTestId(ConvertTokenRowTestIds.MAX_BUTTON)[0];
-
-      await act(async () => {
-        fireEvent.press(maxButton);
-      });
-
-      expect(mockInitiateMaxConversion).toHaveBeenCalledWith(token);
-    });
-  });
-
-  describe('Edit flow', () => {
-    it('calls initiateCustomConversion when Edit button is pressed', async () => {
-      const token = createMockToken();
-      mockUseMusdConversionTokens.mockReturnValue({
-        tokens: [token],
-        filterAllowedTokens: jest.fn(),
-        isConversionToken: jest.fn(),
-        isMusdSupportedOnChain: jest.fn(),
-        hasConvertibleTokensByChainId: jest.fn(),
-      });
-      mockInitiateCustomConversion.mockResolvedValue('tx-edit-789');
-
-      const { getAllByTestId } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      const editButton = getAllByTestId(ConvertTokenRowTestIds.EDIT_BUTTON)[0];
-
-      await act(async () => {
-        fireEvent.press(editButton);
-      });
-
-      expect(mockInitiateCustomConversion).toHaveBeenCalledWith({
-        preferredPaymentToken: {
-          address: token.address,
-          chainId: token.chainId,
-        },
-        navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.CUSTOM,
-      });
-    });
-  });
-
-  describe('conversion pending state', () => {
-    it('hides Max and Edit buttons when conversion is pending for token', () => {
-      const token = createMockToken();
-      const tokenChainKey = createTokenChainKey(
-        token.address as string,
-        token.chainId as string,
-      );
-      mockUseMusdConversionTokens.mockReturnValue({
-        tokens: [token],
-        filterAllowedTokens: jest.fn(),
-        isConversionToken: jest.fn(),
-        isMusdSupportedOnChain: jest.fn(),
-        hasConvertibleTokensByChainId: jest.fn(),
-      });
-      mockSelectMusdConversionStatuses.mockReturnValue({
-        [tokenChainKey]: {
-          txId: 'tx-pending-1',
-          status: TransactionStatus.submitted,
-          isPending: true,
-          isConfirmed: false,
-          isFailed: false,
-        },
-      });
-
-      const { queryAllByTestId } = renderWithProvider(
-        <MusdQuickConvertView />,
-        {
-          state: initialRootState,
-        },
-      );
-
-      expect(queryAllByTestId(ConvertTokenRowTestIds.MAX_BUTTON).length).toBe(
-        0,
-      );
-      expect(queryAllByTestId(ConvertTokenRowTestIds.EDIT_BUTTON).length).toBe(
-        0,
-      );
-    });
-  });
-
-  describe('unapproved conversion', () => {
-    it('does not call initiateMaxConversion or initiateCustomConversion when Max or Edit is pressed and hasUnapprovedMusdConversion is true', async () => {
-      const token = createMockToken();
-      mockUseMusdConversionTokens.mockReturnValue({
-        tokens: [token],
-        filterAllowedTokens: jest.fn(),
-        isConversionToken: jest.fn(),
-        isMusdSupportedOnChain: jest.fn(),
-        hasConvertibleTokensByChainId: jest.fn(),
-      });
-      mockSelectHasUnapprovedMusdConversion.mockReturnValue(true);
-
-      const { getAllByTestId } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      const maxButton = getAllByTestId(ConvertTokenRowTestIds.MAX_BUTTON)[0];
-      const editButton = getAllByTestId(ConvertTokenRowTestIds.EDIT_BUTTON)[0];
-
-      await act(async () => {
-        fireEvent.press(maxButton);
-      });
-      expect(mockInitiateMaxConversion).not.toHaveBeenCalled();
-
-      await act(async () => {
-        fireEvent.press(editButton);
-      });
-      expect(mockInitiateCustomConversion).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('terms of use', () => {
-    it('opens terms URL when terms apply text is pressed', () => {
-      const { getByText } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      const termsApplyText = getByText(
-        strings('earn.musd_conversion.education.terms_apply'),
-      );
-
-      act(() => {
-        fireEvent.press(termsApplyText);
-      });
-
-      expect(Linking.openURL).toHaveBeenCalledWith(
-        AppConstants.URLS.MUSD_CONVERSION_BONUS_TERMS_OF_USE,
-      );
-    });
-  });
-
-  describe('MetaMetrics', () => {
-    it('tracks MUSD_BONUS_TERMS_OF_USE_PRESSED event when terms apply text is pressed', () => {
-      const { getByText } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      mockTrackEvent.mockClear();
-      mockCreateEventBuilder.mockClear();
-      mockAddProperties.mockClear();
-      mockBuild.mockClear();
-
-      const termsApplyText = getByText(
-        strings('earn.musd_conversion.education.terms_apply'),
-      );
-
-      act(() => {
-        fireEvent.press(termsApplyText);
-      });
-
-      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
-        MetaMetricsEvents.MUSD_BONUS_TERMS_OF_USE_PRESSED,
-      );
-      expect(mockAddProperties).toHaveBeenCalledWith({
-        location:
-          MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN,
-        url: AppConstants.URLS.MUSD_CONVERSION_BONUS_TERMS_OF_USE,
-      });
-      expect(mockTrackEvent).toHaveBeenCalledWith({ name: 'mock-built-event' });
-    });
-
-    it('tracks MUSD_QUICK_CONVERT_SCREEN_VIEWED event on mount', () => {
-      renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
-        MetaMetricsEvents.MUSD_QUICK_CONVERT_SCREEN_VIEWED,
-      );
-      expect(mockTrackEvent).toHaveBeenCalledWith({ name: 'mock-built-event' });
-    });
-
-    it('does not track MUSD_QUICK_CONVERT_SCREEN_VIEWED when feature flag is disabled', () => {
-      mockSelectMusdQuickConvertEnabledFlag.mockReturnValue(false);
-
-      renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      expect(mockCreateEventBuilder).not.toHaveBeenCalledWith(
-        MetaMetricsEvents.MUSD_QUICK_CONVERT_SCREEN_VIEWED,
-      );
-    });
-
-    it('tracks MUSD_QUICK_CONVERT_TOKEN_ROW_BUTTON_CLICKED event when Max button is pressed', async () => {
-      const token = createMockToken();
-      mockUseMusdConversionTokens.mockReturnValue({
-        tokens: [token],
-        filterAllowedTokens: jest.fn(),
-        isConversionToken: jest.fn(),
-        isMusdSupportedOnChain: jest.fn(),
-        hasConvertibleTokensByChainId: jest.fn(),
-      });
-      mockInitiateMaxConversion.mockResolvedValue({
-        transactionId: 'tx-max-123',
-      });
-
-      const { getAllByTestId } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      mockTrackEvent.mockClear();
-      mockCreateEventBuilder.mockClear();
-      mockAddProperties.mockClear();
-      mockBuild.mockClear();
-
-      const maxButton = getAllByTestId(ConvertTokenRowTestIds.MAX_BUTTON)[0];
-
-      await act(async () => {
-        fireEvent.press(maxButton);
-      });
-
-      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
-        MetaMetricsEvents.MUSD_QUICK_CONVERT_TOKEN_ROW_BUTTON_CLICKED,
-      );
-      expect(mockAddProperties).toHaveBeenCalledWith({
-        location:
-          MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN,
-        button_type: 'text_button',
-        button_action: 'max',
-        button_text: strings('earn.musd_conversion.max'),
-        redirects_to:
-          MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS
-            .QUICK_CONVERT_MAX_BOTTOM_SHEET_CONFIRMATION_SCREEN,
-        asset_symbol: token.symbol,
-        network_chain_id: token.chainId,
-        network_name: 'Ethereum',
-      });
-      expect(mockTrackEvent).toHaveBeenCalledWith({ name: 'mock-built-event' });
-    });
-
-    it('tracks MUSD_QUICK_CONVERT_TOKEN_ROW_BUTTON_CLICKED event when Edit button is pressed', async () => {
-      const token = createMockToken();
-      mockUseMusdConversionTokens.mockReturnValue({
-        tokens: [token],
-        filterAllowedTokens: jest.fn(),
-        isConversionToken: jest.fn(),
-        isMusdSupportedOnChain: jest.fn(),
-        hasConvertibleTokensByChainId: jest.fn(),
-      });
-      mockInitiateCustomConversion.mockResolvedValue('tx-edit-789');
-
-      const { getAllByTestId } = renderWithProvider(<MusdQuickConvertView />, {
-        state: initialRootState,
-      });
-
-      mockTrackEvent.mockClear();
-      mockCreateEventBuilder.mockClear();
-      mockAddProperties.mockClear();
-      mockBuild.mockClear();
-
-      const editButton = getAllByTestId(ConvertTokenRowTestIds.EDIT_BUTTON)[0];
-
-      await act(async () => {
-        fireEvent.press(editButton);
-      });
-
-      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
-        MetaMetricsEvents.MUSD_QUICK_CONVERT_TOKEN_ROW_BUTTON_CLICKED,
-      );
-      expect(mockAddProperties).toHaveBeenCalledWith({
-        location:
-          MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN,
-        button_type: 'icon_button',
-        icon: IconName.Edit,
-        button_action: 'custom',
-        redirects_to:
-          MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN,
-        asset_symbol: token.symbol,
-        network_chain_id: token.chainId,
-        network_name: 'Ethereum',
-      });
-      expect(mockTrackEvent).toHaveBeenCalledWith({ name: 'mock-built-event' });
-    });
-  });
-});
diff --git a/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/MusdBalanceCard.styles.ts b/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/MusdBalanceCard.styles.ts
deleted file mode 100644
index 269a3932009..00000000000
--- a/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/MusdBalanceCard.styles.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { StyleSheet } from 'react-native';
-import { Theme } from '../../../../../../../util/theme/models';
-
-const styleSheet = (_params: { theme: Theme }) =>
-  StyleSheet.create({
-    container: {
-      width: '100%',
-      justifyContent: 'space-between',
-      flexDirection: 'row',
-    },
-    left: {
-      flexDirection: 'row',
-      gap: 16,
-    },
-    right: {
-      alignSelf: 'center',
-    },
-    tokenIconContainer: {
-      width: 32,
-      height: 32,
-      position: 'relative',
-    },
-    tokenIcon: {
-      width: 32,
-      height: 32,
-    },
-  });
-
-export default styleSheet;
diff --git a/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/MusdBalanceCard.test.tsx b/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/MusdBalanceCard.test.tsx
deleted file mode 100644
index 45d598b8906..00000000000
--- a/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/MusdBalanceCard.test.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import React from 'react';
-import { CHAIN_IDS } from '@metamask/transaction-controller';
-
-jest.mock('../../../../../../../util/networks', () => ({
-  getNetworkImageSource: jest.fn(() => ({ uri: 'mock-network-image' })),
-}));
-
-import renderWithProvider from '../../../../../../../util/test/renderWithProvider';
-import MusdBalanceCard, { MusdBalanceCardTestIds } from './MusdBalanceCard';
-import { MUSD_TOKEN } from '../../../../constants/musd';
-import initialRootState from '../../../../../../../util/test/initial-root-state';
-
-describe('MusdBalanceCard', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe('rendering', () => {
-    it('renders card container', () => {
-      const { getByTestId } = renderWithProvider(
-        <MusdBalanceCard chainId={CHAIN_IDS.MAINNET} balance="$100.00" />,
-        {
-          state: initialRootState,
-        },
-      );
-
-      expect(getByTestId(MusdBalanceCardTestIds.CONTAINER)).toBeOnTheScreen();
-      expect(getByTestId(MusdBalanceCardTestIds.TOKEN_ICON)).toBeOnTheScreen();
-    });
-
-    it('displays balance from props', () => {
-      const formattedBalance = '$1,234.56';
-      const { getByText } = renderWithProvider(
-        <MusdBalanceCard
-          chainId={CHAIN_IDS.LINEA_MAINNET}
-          balance={formattedBalance}
-        />,
-        {
-          state: initialRootState,
-        },
-      );
-
-      expect(getByText(formattedBalance)).toBeOnTheScreen();
-    });
-
-    it('displays mUSD symbol', () => {
-      const { getByText } = renderWithProvider(
-        <MusdBalanceCard chainId={CHAIN_IDS.MAINNET} balance="$100.00" />,
-        {
-          state: initialRootState,
-        },
-      );
-
-      expect(getByText(MUSD_TOKEN.symbol)).toBeOnTheScreen();
-    });
-
-    it('displays percentage bonus text from localization', () => {
-      const { getByText } = renderWithProvider(
-        <MusdBalanceCard chainId={CHAIN_IDS.MAINNET} balance="$100.00" />,
-        {
-          state: initialRootState,
-        },
-      );
-
-      expect(getByText('3% bonus')).toBeOnTheScreen();
-    });
-  });
-});
diff --git a/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/MusdBalanceCard.tsx b/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/MusdBalanceCard.tsx
deleted file mode 100644
index a0876b88b3e..00000000000
--- a/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/MusdBalanceCard.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import React from 'react';
-import { View, Image } from 'react-native';
-import Text, {
-  TextColor,
-  TextVariant,
-} from '../../../../../../../component-library/components/Texts/Text';
-import Badge, {
-  BadgeVariant,
-} from '../../../../../../../component-library/components/Badges/Badge';
-import BadgeWrapper, {
-  BadgePosition,
-} from '../../../../../../../component-library/components/Badges/BadgeWrapper';
-import { AvatarSize } from '../../../../../../../component-library/components/Avatars/Avatar';
-import { useStyles } from '../../../../../../hooks/useStyles';
-import { strings } from '../../../../../../../../locales/i18n';
-import { MUSD_CONVERSION_APY, MUSD_TOKEN } from '../../../../constants/musd';
-import { getNetworkImageSource } from '../../../../../../../util/networks';
-import styleSheet from './MusdBalanceCard.styles';
-import { Hex } from '@metamask/utils';
-
-/**
- * Test IDs for the MusdBalanceCard component.
- */
-export const MusdBalanceCardTestIds = {
-  CONTAINER: 'musd-balance-card',
-  TOKEN_ICON: 'musd-token-icon',
-} as const;
-
-interface MusdBalanceCardProps {
-  chainId: Hex;
-  balance: string;
-}
-
-const MusdBalanceCard = ({ chainId, balance }: MusdBalanceCardProps) => {
-  const { styles } = useStyles(styleSheet, {});
-
-  return (
-    <View style={styles.container} testID={MusdBalanceCardTestIds.CONTAINER}>
-      <View style={styles.left}>
-        <View style={styles.tokenIconContainer}>
-          <BadgeWrapper
-            badgePosition={BadgePosition.BottomRight}
-            badgeElement={
-              <Badge
-                variant={BadgeVariant.Network}
-                imageSource={getNetworkImageSource({
-                  chainId,
-                })}
-                isScaled={false}
-                size={AvatarSize.Xs}
-              />
-            }
-          >
-            <Image
-              source={MUSD_TOKEN.imageSource}
-              style={styles.tokenIcon}
-              testID={MusdBalanceCardTestIds.TOKEN_ICON}
-            />
-          </BadgeWrapper>
-        </View>
-        <View>
-          <Text variant={TextVariant.BodyMDMedium}>{balance}</Text>
-          <Text
-            variant={TextVariant.BodySMMedium}
-            color={TextColor.Alternative}
-          >
-            {MUSD_TOKEN.symbol}
-          </Text>
-        </View>
-      </View>
-
-      <View style={styles.right}>
-        <Text variant={TextVariant.BodyMDMedium} color={TextColor.Success}>
-          {strings('earn.musd_conversion.percentage_bonus', {
-            percentage: MUSD_CONVERSION_APY,
-          })}
-        </Text>
-      </View>
-    </View>
-  );
-};
-
-export default MusdBalanceCard;
diff --git a/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/index.ts b/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/index.ts
deleted file mode 100644
index fbcb42a56ca..00000000000
--- a/app/components/UI/Earn/Views/MusdQuickConvertView/components/MusdBalanceCard/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './MusdBalanceCard';
diff --git a/app/components/UI/Earn/Views/MusdQuickConvertView/index.tsx b/app/components/UI/Earn/Views/MusdQuickConvertView/index.tsx
deleted file mode 100644
index a6221510000..00000000000
--- a/app/components/UI/Earn/Views/MusdQuickConvertView/index.tsx
+++ /dev/null
@@ -1,385 +0,0 @@
-import React, { useCallback, useEffect, useMemo } from 'react';
-import { View, SectionList, Linking } from 'react-native';
-import { useSelector } from 'react-redux';
-import { useNavigation, useFocusEffect } from '@react-navigation/native';
-import { SafeAreaView } from 'react-native-safe-area-context';
-import { Hex } from '@metamask/utils';
-import Text, {
-  TextColor,
-  TextVariant,
-} from '../../../../../component-library/components/Texts/Text';
-import { useStyles } from '../../../../hooks/useStyles';
-import { strings } from '../../../../../../locales/i18n';
-import { getStakingNavbar } from '../../../Navbar';
-import { AssetType } from '../../../../Views/confirmations/types/token';
-import { useMusdConversionTokens } from '../../hooks/useMusdConversionTokens';
-import { useMusdConversion } from '../../hooks/useMusdConversion';
-import { selectMusdQuickConvertEnabledFlag } from '../../selectors/featureFlags';
-import {
-  createTokenChainKey,
-  selectHasInFlightMusdConversion,
-  selectHasUnapprovedMusdConversion,
-  selectMusdConversionStatuses,
-} from '../../selectors/musdConversionStatus';
-import ConvertTokenRow from '../../components/Musd/ConvertTokenRow';
-import styleSheet from './MusdQuickConvertView.styles';
-import Tag from '../../../../../component-library/components/Tags/Tag';
-import { TagProps } from '../../../../../component-library/components/Tags/Tag/Tag.types';
-import { MUSD_CONVERSION_APY } from '../../constants/musd';
-import AppConstants from '../../../../../core/AppConstants';
-import MusdBalanceCard from './components/MusdBalanceCard';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../../types/musd.types';
-import Logger from '../../../../../util/Logger';
-import { useMusdBalance } from '../../hooks/useMusdBalance';
-import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
-import { MetaMetricsEvents } from '../../../../../core/Analytics';
-import { MUSD_EVENTS_CONSTANTS } from '../../constants/events';
-import { getNetworkName } from '../../utils/network';
-import { IconName } from '@metamask/design-system-react-native';
-
-const { EVENT_LOCATIONS } = MUSD_EVENTS_CONSTANTS;
-
-export const MusdQuickConvertViewTestIds = {
-  CONTAINER: 'musd-quick-convert-view-container',
-  TOKEN_LIST: 'musd-quick-convert-view-token-list',
-  EMPTY_STATE: 'musd-quick-convert-view-empty-state',
-  LOADING: 'musd-quick-convert-view-loading',
-  HEADER: 'musd-quick-convert-view-header',
-} as const;
-
-interface SectionHeaderProps {
-  title: string;
-  tag?: TagProps;
-}
-
-const SectionHeader = ({ title, tag }: SectionHeaderProps) => {
-  const { styles } = useStyles(styleSheet, {});
-
-  return (
-    <View style={styles.listHeaderContainer}>
-      <Text variant={TextVariant.BodyMDMedium}>{title}</Text>
-      {tag && <Tag {...tag} />}
-    </View>
-  );
-};
-
-interface TokenSection {
-  title: string;
-  tag?: TagProps;
-  data: AssetType[];
-}
-
-/**
- * Quick Convert Token List screen.
- *
- * Displays all convertible tokens the user holds with Max and Edit buttons.
- * - Max: Opens a bottom sheet for quick full-balance conversion
- * - Edit: Navigates to the existing custom amount confirmation screen
- */
-const MusdQuickConvertView = () => {
-  const { styles, theme } = useStyles(styleSheet, {});
-  const { colors } = theme;
-  const navigation = useNavigation();
-  const { initiateCustomConversion, initiateMaxConversion } =
-    useMusdConversion();
-
-  const { trackEvent, createEventBuilder } = useAnalytics();
-
-  // Feature flags
-  const isQuickConvertEnabled = useSelector(selectMusdQuickConvertEnabledFlag);
-
-  // Get convertible tokens
-  const { tokens: conversionTokens } = useMusdConversionTokens();
-
-  const hasUnapprovedMusdConversion = useSelector(
-    selectHasUnapprovedMusdConversion,
-  );
-  const hasInFlightMusdConversion = useSelector(
-    selectHasInFlightMusdConversion,
-  );
-
-  const conversionStatusesByTokenChainKey = useSelector(
-    selectMusdConversionStatuses,
-  );
-
-  // Set up navigation header
-  useFocusEffect(
-    useCallback(() => {
-      navigation.setOptions(
-        getStakingNavbar('', navigation, colors, {
-          hasCancelButton: false,
-        }),
-      );
-    }, [navigation, colors]),
-  );
-
-  useEffect(() => {
-    if (!isQuickConvertEnabled) return;
-
-    trackEvent(
-      createEventBuilder(
-        MetaMetricsEvents.MUSD_QUICK_CONVERT_SCREEN_VIEWED,
-      ).build(),
-    );
-  }, [createEventBuilder, isQuickConvertEnabled, trackEvent]);
-
-  // navigate to max conversion bottom sheet
-  const handleMaxPress = useCallback(
-    async (token: AssetType) => {
-      trackEvent(
-        createEventBuilder(
-          MetaMetricsEvents.MUSD_QUICK_CONVERT_TOKEN_ROW_BUTTON_CLICKED,
-        )
-          .addProperties({
-            location: EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN,
-            button_type: 'text_button',
-            button_action: 'max',
-            button_text: strings('earn.musd_conversion.max'),
-            redirects_to:
-              EVENT_LOCATIONS.QUICK_CONVERT_MAX_BOTTOM_SHEET_CONFIRMATION_SCREEN,
-            asset_symbol: token.symbol,
-            network_chain_id: token.chainId,
-            network_name: token.chainId
-              ? getNetworkName(token.chainId as Hex)
-              : 'unknown',
-          })
-          .build(),
-      );
-
-      try {
-        await initiateMaxConversion(token);
-      } catch {
-        Logger.error(new Error('Failed to initiate max conversion'), {
-          tags: {
-            feature: 'musd_conversion',
-            action: 'initiate_max_conversion',
-          },
-          context: {
-            name: 'MusdQuickConvertView.handleMaxPress',
-            data: {
-              token,
-            },
-          },
-        });
-      }
-    },
-    [createEventBuilder, initiateMaxConversion, trackEvent],
-  );
-
-  // navigate to existing confirmation screen
-  const handleEditPress = useCallback(
-    async (token: AssetType) => {
-      trackEvent(
-        createEventBuilder(
-          MetaMetricsEvents.MUSD_QUICK_CONVERT_TOKEN_ROW_BUTTON_CLICKED,
-        )
-          .addProperties({
-            location: EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN,
-            button_type: 'icon_button',
-            icon: IconName.Edit,
-            button_action: 'custom',
-            redirects_to: EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN,
-            asset_symbol: token.symbol,
-            network_chain_id: token.chainId,
-            network_name: token.chainId
-              ? getNetworkName(token.chainId as Hex)
-              : 'unknown',
-          })
-          .build(),
-      );
-
-      try {
-        await initiateCustomConversion({
-          preferredPaymentToken: {
-            address: token.address as Hex,
-            chainId: token.chainId as Hex,
-          },
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.CUSTOM,
-        });
-      } catch {
-        Logger.error(new Error('Failed to initiate custom conversion'), {
-          tags: {
-            feature: 'musd_conversion',
-            action: 'initiate_custom_conversion',
-          },
-          context: {
-            name: 'MusdQuickConvertView.handleEditPress',
-            data: {
-              token,
-            },
-          },
-        });
-      }
-    },
-    [createEventBuilder, initiateCustomConversion, trackEvent],
-  );
-
-  const tokensWithBalance = useMemo(
-    () =>
-      conversionTokens.filter(
-        (token) => token.rawBalance && token.rawBalance !== '0x0',
-      ),
-    [conversionTokens],
-  );
-
-  // Keep this as a SectionList even while we only have one section today.
-  // In the near future we'll add additional sections (e.g. non-stablecoins) below.
-  const tokenSections = useMemo<TokenSection[]>(() => {
-    if (tokensWithBalance.length === 0) {
-      return [];
-    }
-
-    return [
-      {
-        title: strings('earn.your_stablecoins'),
-        data: tokensWithBalance,
-      },
-    ];
-  }, [tokensWithBalance]);
-
-  // Render individual token row
-  const renderTokenItem = useCallback(
-    ({ item }: { item: AssetType }) => {
-      const tokenAddress = item.address;
-      const tokenChainId = item.chainId;
-
-      const tokenChainKey =
-        tokenAddress && tokenChainId
-          ? createTokenChainKey(tokenAddress, tokenChainId)
-          : undefined;
-
-      const txStatusInfo = tokenChainKey
-        ? conversionStatusesByTokenChainKey[tokenChainKey]
-        : undefined;
-
-      return (
-        <ConvertTokenRow
-          token={item}
-          onMaxPress={handleMaxPress}
-          onEditPress={handleEditPress}
-          areActionsDisabled={
-            hasUnapprovedMusdConversion || hasInFlightMusdConversion
-          }
-          isConversionPending={Boolean(txStatusInfo?.isPending)}
-        />
-      );
-    },
-    [
-      conversionStatusesByTokenChainKey,
-      handleEditPress,
-      handleMaxPress,
-      hasInFlightMusdConversion,
-      hasUnapprovedMusdConversion,
-    ],
-  );
-
-  const {
-    fiatBalanceFormattedByChain,
-    tokenBalanceByChain,
-    hasMusdBalanceOnAnyChain,
-  } = useMusdBalance();
-
-  const renderSectionHeader = useCallback(
-    ({ section }: { section: TokenSection }) => (
-      <SectionHeader title={section.title} tag={section.tag} />
-    ),
-    [],
-  );
-
-  // Ideally users can't get to the quick convert view if they don't have any tokens to convert.
-  const renderEmptyState = () => (
-    <View
-      style={styles.emptyContainer}
-      testID={MusdQuickConvertViewTestIds.EMPTY_STATE}
-    >
-      <Text variant={TextVariant.BodyMD} color={TextColor.Alternative}>
-        {strings('earn.musd_conversion.no_tokens_to_convert')}
-      </Text>
-    </View>
-  );
-
-  const handleTermsOfUsePressed = useCallback(() => {
-    trackEvent(
-      createEventBuilder(MetaMetricsEvents.MUSD_BONUS_TERMS_OF_USE_PRESSED)
-        .addProperties({
-          location: EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN,
-          url: AppConstants.URLS.MUSD_CONVERSION_BONUS_TERMS_OF_USE,
-        })
-        .build(),
-    );
-    Linking.openURL(AppConstants.URLS.MUSD_CONVERSION_BONUS_TERMS_OF_USE);
-  }, [createEventBuilder, trackEvent]);
-
-  // If feature flags are not enabled, don't render
-  if (!isQuickConvertEnabled) {
-    return null;
-  }
-
-  return (
-    <SafeAreaView
-      style={styles.container}
-      edges={['bottom']}
-      testID={MusdQuickConvertViewTestIds.CONTAINER}
-    >
-      {/* Header section */}
-      <View testID={MusdQuickConvertViewTestIds.HEADER}>
-        <View style={styles.headerTextContainer}>
-          <Text variant={TextVariant.HeadingLG}>
-            {strings('earn.musd_conversion.quick_convert.title', {
-              percentage: MUSD_CONVERSION_APY,
-            })}
-          </Text>
-          <Text variant={TextVariant.BodySM} color={TextColor.Alternative}>
-            {strings('earn.musd_conversion.quick_convert.subtitle', {
-              percentage: MUSD_CONVERSION_APY,
-            })}{' '}
-            <Text
-              variant={TextVariant.BodySM}
-              color={TextColor.Alternative}
-              style={styles.termsApply}
-              onPress={handleTermsOfUsePressed}
-            >
-              {strings('earn.musd_conversion.education.terms_apply')}
-            </Text>
-          </Text>
-        </View>
-        {hasMusdBalanceOnAnyChain && (
-          <View>
-            <Text
-              variant={TextVariant.BodyMDMedium}
-              style={styles.balanceCardHeader}
-            >
-              {strings('earn.musd_conversion.your_musd')}
-            </Text>
-            {Object.keys(tokenBalanceByChain).map((chainId) => (
-              <View key={chainId} style={styles.balanceCardContainer}>
-                <MusdBalanceCard
-                  chainId={chainId as Hex}
-                  balance={
-                    fiatBalanceFormattedByChain[chainId as Hex] ??
-                    tokenBalanceByChain[chainId as Hex]
-                  }
-                />
-              </View>
-            ))}
-          </View>
-        )}
-      </View>
-
-      {/* Token list */}
-      <SectionList<AssetType, TokenSection>
-        style={styles.listContainer}
-        sections={tokenSections}
-        renderItem={renderTokenItem}
-        keyExtractor={(item) => `${item.address}-${item.chainId}`}
-        renderSectionHeader={renderSectionHeader}
-        ListEmptyComponent={renderEmptyState}
-        showsVerticalScrollIndicator={false}
-        testID={MusdQuickConvertViewTestIds.TOKEN_LIST}
-        stickySectionHeadersEnabled={false}
-      />
-    </SafeAreaView>
-  );
-};
-
-export default MusdQuickConvertView;
diff --git a/app/components/UI/Earn/components/AssetOverviewClaimBonus/AssetOverviewClaimBonus.test.tsx b/app/components/UI/Earn/components/AssetOverviewClaimBonus/AssetOverviewClaimBonus.test.tsx
index 9917f800bce..6f2633ce026 100644
--- a/app/components/UI/Earn/components/AssetOverviewClaimBonus/AssetOverviewClaimBonus.test.tsx
+++ b/app/components/UI/Earn/components/AssetOverviewClaimBonus/AssetOverviewClaimBonus.test.tsx
@@ -197,7 +197,7 @@ describe('AssetOverviewClaimBonus', () => {
       ).not.toBeDisabled();
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.ANNUAL_BONUS_VALUE),
-      ).toHaveTextContent('+$30.00');
+      ).toHaveTextContent('$30.00');
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.LIFETIME_VALUE),
       ).toHaveTextContent('+$221.59');
@@ -239,7 +239,7 @@ describe('AssetOverviewClaimBonus', () => {
       ).toBeDisabled();
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.ANNUAL_BONUS_VALUE),
-      ).toHaveTextContent('+$15.00');
+      ).toHaveTextContent('$15.00');
     });
   });
 
@@ -279,7 +279,7 @@ describe('AssetOverviewClaimBonus', () => {
       ).not.toBeDisabled();
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.ANNUAL_BONUS_VALUE),
-      ).toHaveTextContent('+$0.00');
+      ).toHaveTextContent('$0.00');
     });
   });
 
@@ -318,7 +318,7 @@ describe('AssetOverviewClaimBonus', () => {
       ).toBeDisabled();
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.ANNUAL_BONUS_VALUE),
-      ).toHaveTextContent('+$0.00');
+      ).toHaveTextContent('$0.00');
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.LIFETIME_VALUE),
       ).toHaveTextContent('$0.00');
@@ -560,7 +560,7 @@ describe('AssetOverviewClaimBonus', () => {
       // (700 + 300) * 3% = 30.00
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.ANNUAL_BONUS_VALUE),
-      ).toHaveTextContent('+$30.00');
+      ).toHaveTextContent('$30.00');
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.CLAIM_BUTTON),
       ).toHaveTextContent('Claim $5.00 bonus');
@@ -586,7 +586,7 @@ describe('AssetOverviewClaimBonus', () => {
       // 500 * 3% = 15.00, "Accruing next bonus" because balance > 0 & no claim
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.ANNUAL_BONUS_VALUE),
-      ).toHaveTextContent('+$15.00');
+      ).toHaveTextContent('$15.00');
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.CLAIM_BUTTON),
       ).toHaveTextContent('Accruing next bonus');
@@ -614,7 +614,7 @@ describe('AssetOverviewClaimBonus', () => {
       // on Linea and always returned undefined, dropping Linea balances.
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.ANNUAL_BONUS_VALUE),
-      ).toHaveTextContent('+$6.00');
+      ).toHaveTextContent('$6.00');
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.CLAIM_BUTTON),
       ).toHaveTextContent('Accruing next bonus');
@@ -642,7 +642,7 @@ describe('AssetOverviewClaimBonus', () => {
 
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.ANNUAL_BONUS_VALUE),
-      ).toHaveTextContent('+$0.00');
+      ).toHaveTextContent('$0.00');
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.CLAIM_BUTTON),
       ).toHaveTextContent('No accruing bonus');
@@ -683,7 +683,7 @@ describe('AssetOverviewClaimBonus', () => {
 
       expect(
         getByTestId(ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.ANNUAL_BONUS_VALUE),
-      ).toHaveTextContent('+$4.50');
+      ).toHaveTextContent('$4.50');
     });
 
     it('looks up mUSD on each chain using checksummed addresses', () => {
diff --git a/app/components/UI/Earn/components/AssetOverviewClaimBonus/AssetOverviewClaimBonus.tsx b/app/components/UI/Earn/components/AssetOverviewClaimBonus/AssetOverviewClaimBonus.tsx
index 67903b1e659..be7bddd408a 100644
--- a/app/components/UI/Earn/components/AssetOverviewClaimBonus/AssetOverviewClaimBonus.tsx
+++ b/app/components/UI/Earn/components/AssetOverviewClaimBonus/AssetOverviewClaimBonus.tsx
@@ -129,8 +129,8 @@ const AssetOverviewClaimBonus: React.FC<AssetOverviewClaimBonusProps> = ({
     [balance],
   );
   const formattedAnnualBonus = hasBalance
-    ? `+$${estimatedAnnualBonus.toFixed(2)}`
-    : '+$0.00';
+    ? `$${estimatedAnnualBonus.toFixed(2)}`
+    : '$0.00';
 
   // Lifetime bonus: white $0.00 until first claim, then green +$X.
   const hasLifetimeBonus = Number(lifetimeBonusClaimed) > 0;
@@ -356,7 +356,7 @@ const AssetOverviewClaimBonus: React.FC<AssetOverviewClaimBonusProps> = ({
         {/* CTA Button */}
         <Button
           testID={ASSET_OVERVIEW_CLAIM_BONUS_TEST_IDS.CLAIM_BUTTON}
-          variant={ButtonVariant.Primary}
+          variant={ButtonVariant.Secondary}
           size={ButtonSize.Lg}
           twClassName="w-full mt-4 mb-3"
           onPress={handleClaimPress}
diff --git a/app/components/UI/Earn/components/EarnLendingBalance/EarnLendingBalance.test.tsx b/app/components/UI/Earn/components/EarnLendingBalance/EarnLendingBalance.test.tsx
index 97d08b96c8f..8803da84c31 100644
--- a/app/components/UI/Earn/components/EarnLendingBalance/EarnLendingBalance.test.tsx
+++ b/app/components/UI/Earn/components/EarnLendingBalance/EarnLendingBalance.test.tsx
@@ -13,7 +13,6 @@ import { EARN_EXPERIENCES } from '../../constants/experiences';
 import { useMusdCtaVisibility } from '../../hooks/useMusdCtaVisibility';
 import {
   selectIsMusdConversionFlowEnabledFlag,
-  selectMusdQuickConvertEnabledFlag,
   selectPooledStakingEnabledFlag,
   selectPooledStakingServiceInterruptionBannerEnabledFlag,
   selectStablecoinLendingEnabledFlag,
@@ -167,7 +166,6 @@ jest.mock('../../hooks/useMusdConversionEligibility', () => ({
 
 jest.mock('../../selectors/featureFlags', () => ({
   selectIsMusdConversionFlowEnabledFlag: jest.fn(),
-  selectMusdQuickConvertEnabledFlag: jest.fn(),
   selectPooledStakingEnabledFlag: jest.fn(),
   selectStablecoinLendingEnabledFlag: jest.fn(),
   selectStablecoinLendingServiceInterruptionBannerEnabledFlag: jest.fn(),
@@ -243,13 +241,6 @@ describe('EarnLendingBalance', () => {
         typeof selectStablecoinLendingEnabledFlag
       >
     ).mockReturnValue(true);
-
-    (
-      selectMusdQuickConvertEnabledFlag as jest.MockedFunction<
-        typeof selectMusdQuickConvertEnabledFlag
-      >
-    ).mockReturnValue(false);
-
     (
       selectStablecoinLendingServiceInterruptionBannerEnabledFlag as jest.MockedFunction<
         typeof selectStablecoinLendingServiceInterruptionBannerEnabledFlag
diff --git a/app/components/UI/Earn/components/EarnTokenList/EarnTokenList.test.tsx b/app/components/UI/Earn/components/EarnTokenList/EarnTokenList.test.tsx
index f0582518581..4f00abfac02 100644
--- a/app/components/UI/Earn/components/EarnTokenList/EarnTokenList.test.tsx
+++ b/app/components/UI/Earn/components/EarnTokenList/EarnTokenList.test.tsx
@@ -947,7 +947,7 @@ describe('EarnTokenList', () => {
     });
   });
 
-  describe('HeaderCompactStandard close button', () => {
+  describe('HeaderStandard close button', () => {
     it('invokes handleClose when close button is pressed', async () => {
       const { getByTestId } = renderWithProvider(
         <SafeAreaProvider initialMetrics={initialMetrics}>
diff --git a/app/components/UI/Earn/components/EarnTokenList/index.tsx b/app/components/UI/Earn/components/EarnTokenList/index.tsx
index be1181e5aa2..8eafa4e8909 100644
--- a/app/components/UI/Earn/components/EarnTokenList/index.tsx
+++ b/app/components/UI/Earn/components/EarnTokenList/index.tsx
@@ -5,11 +5,11 @@ import React, {
   useReducer,
   useMemo,
 } from 'react';
+import { HeaderStandard } from '@metamask/design-system-react-native';
 import BottomSheet, {
   BottomSheetRef,
 } from '../../../../../component-library/components/BottomSheets/BottomSheet';
 import { TextColor } from '../../../../../component-library/components/Texts/Text';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import { View } from 'react-native';
 import { useStyles } from '../../../../hooks/useStyles';
 import styleSheet from './EarnTokenList.styles';
@@ -380,7 +380,7 @@ const EarnTokenList = () => {
 
   return (
     <BottomSheet ref={bottomSheetRef}>
-      <HeaderCompactStandard
+      <HeaderStandard
         title={
           params?.onItemPressScreen === EARN_INPUT_VIEW_ACTIONS.WITHDRAW
             ? strings('stake.select_a_token_to_withdraw')
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 ee841b31dd6..e5dd56d6f61 100644
--- a/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/MusdConversionAssetListCta.test.tsx
+++ b/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/MusdConversionAssetListCta.test.tsx
@@ -35,8 +35,6 @@ import { useAnalytics } from '../../../../../hooks/useAnalytics/useAnalytics';
 import { useNetworkName } from '../../../../../Views/confirmations/hooks/useNetworkName';
 import { MUSD_EVENTS_CONSTANTS } from '../../../constants/events';
 import { Hex } from '@metamask/utils';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../../../types/musd.types';
-import { selectMusdQuickConvertEnabledFlag } from '../../../selectors/featureFlags';
 
 const mockConversionToken = {
   address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
@@ -67,14 +65,9 @@ describe('MusdConversionAssetListCta', () => {
   const mockGetPreferredPaymentToken = jest.fn();
   const mockGetChainIdForBuyFlow = jest.fn();
   const mockGetMusdOutputChainId = jest.fn();
-  const mockSelectMusdQuickConvertEnabledFlag =
-    selectMusdQuickConvertEnabledFlag as jest.MockedFunction<
-      typeof selectMusdQuickConvertEnabledFlag
-    >;
 
   beforeEach(() => {
     jest.clearAllMocks();
-    mockSelectMusdQuickConvertEnabledFlag.mockReturnValue(false);
 
     jest.spyOn(Date, 'now').mockReturnValue(FIXED_NOW_MS);
 
@@ -370,7 +363,6 @@ describe('MusdConversionAssetListCta', () => {
             address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
             chainId: '0x1',
           },
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
         });
       });
     });
@@ -428,7 +420,6 @@ describe('MusdConversionAssetListCta', () => {
       await waitFor(() => {
         expect(mockInitiateConversion).toHaveBeenCalledWith({
           preferredPaymentToken: lineaToken,
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
         });
       });
     });
@@ -486,7 +477,6 @@ describe('MusdConversionAssetListCta', () => {
       await waitFor(() => {
         expect(mockInitiateConversion).toHaveBeenCalledWith({
           preferredPaymentToken: firstToken,
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
         });
       });
     });
@@ -506,7 +496,6 @@ describe('MusdConversionAssetListCta', () => {
             address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
             chainId: '0x1',
           },
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
         });
       });
     });
@@ -1055,30 +1044,6 @@ describe('MusdConversionAssetListCta', () => {
           network_name: strings('wallet.popular_networks'),
         });
       });
-
-      it('tracks QUICK_CONVERT_HOME_SCREEN when wallet has tokens, education has been seen, and quick convert is enabled', async () => {
-        mockSelectMusdQuickConvertEnabledFlag.mockReturnValue(true);
-
-        const { getByText } = arrange({
-          isEmptyWallet: false,
-          selectedChainId: null,
-          hasSeenConversionEducationScreen: true,
-        });
-
-        await act(async () => {
-          pressCtaButton(getByText, false);
-        });
-
-        expectTrackedEventProps({
-          location: EVENT_LOCATIONS.HOME_SCREEN,
-          redirects_to: EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN,
-          cta_type: MUSD_CTA_TYPES.PRIMARY,
-          cta_text: strings('earn.musd_conversion.get_musd'),
-          cta_click_target: 'cta_button',
-          network_chain_id: null,
-          network_name: strings('wallet.popular_networks'),
-        });
-      });
     });
   });
 });
diff --git a/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/index.tsx b/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/index.tsx
index fd331bd7e21..bee2b2ad9d2 100644
--- a/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/index.tsx
+++ b/app/components/UI/Earn/components/Musd/MusdConversionAssetListCta/index.tsx
@@ -40,9 +40,6 @@ import { useNetworkName } from '../../../../../Views/confirmations/hooks/useNetw
 import Badge, {
   BadgeVariant,
 } from '../../../../../../component-library/components/Badges/Badge';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../../../types/musd.types';
-import { selectMusdQuickConvertEnabledFlag } from '../../../selectors/featureFlags';
-import { useSelector } from 'react-redux';
 
 enum CTA_CLICK_TARGET {
   CTA_BUTTON = 'cta_button',
@@ -52,8 +49,6 @@ enum CTA_CLICK_TARGET {
 const MusdConversionAssetListCta = () => {
   const { styles } = useStyles(styleSheet, {});
 
-  const isQuickConvertEnabled = useSelector(selectMusdQuickConvertEnabledFlag);
-
   const { goToBuy } = useRampNavigation();
 
   const { getPaymentTokenForSelectedNetwork, getChainIdForBuyFlow } =
@@ -88,9 +83,7 @@ const MusdConversionAssetListCta = () => {
         return EVENT_LOCATIONS.CONVERSION_EDUCATION_SCREEN;
       }
 
-      return isQuickConvertEnabled
-        ? EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN
-        : EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN;
+      return EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN;
     };
 
     const ctaText =
@@ -140,7 +133,6 @@ const MusdConversionAssetListCta = () => {
     try {
       await initiateCustomConversion({
         preferredPaymentToken: paymentToken,
-        navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
       });
     } catch (error) {
       Logger.error(
diff --git a/app/components/UI/Earn/components/Musd/MusdConversionAssetOverviewCta/MusdConversionAssetOverviewCta.test.tsx b/app/components/UI/Earn/components/Musd/MusdConversionAssetOverviewCta/MusdConversionAssetOverviewCta.test.tsx
index e2ade49a6a8..cd4744c63bb 100644
--- a/app/components/UI/Earn/components/Musd/MusdConversionAssetOverviewCta/MusdConversionAssetOverviewCta.test.tsx
+++ b/app/components/UI/Earn/components/Musd/MusdConversionAssetOverviewCta/MusdConversionAssetOverviewCta.test.tsx
@@ -21,8 +21,6 @@ import { useNetworkName } from '../../../../../Views/confirmations/hooks/useNetw
 import { MUSD_EVENTS_CONSTANTS } from '../../../constants/events';
 import { strings } from '../../../../../../../locales/i18n';
 import { MUSD_CONVERSION_APY } from '../../../constants/musd';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../../../types/musd.types';
-import { selectMusdQuickConvertEnabledFlag } from '../../../selectors/featureFlags';
 
 const createMockToken = (overrides: Partial<TokenI> = {}): TokenI => ({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
@@ -49,14 +47,9 @@ describe('MusdConversionAssetOverviewCta', () => {
   const mockInitiateMaxConversion = jest.fn();
   const mockClearError = jest.fn();
   const mockLoggerError = jest.mocked(Logger.error);
-  const mockSelectMusdQuickConvertEnabledFlag =
-    selectMusdQuickConvertEnabledFlag as jest.MockedFunction<
-      typeof selectMusdQuickConvertEnabledFlag
-    >;
 
   beforeEach(() => {
     jest.clearAllMocks();
-    mockSelectMusdQuickConvertEnabledFlag.mockReturnValue(false);
 
     jest.spyOn(Date, 'now').mockReturnValue(FIXED_NOW_MS);
 
@@ -245,7 +238,6 @@ describe('MusdConversionAssetOverviewCta', () => {
             address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
             chainId: '0x1',
           },
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
           navigationStack: Routes.EARN.ROOT,
         });
       });
@@ -507,55 +499,5 @@ describe('MusdConversionAssetOverviewCta', () => {
       expect(mockTrackEvent).toHaveBeenCalledTimes(1);
       expect(mockTrackEvent).toHaveBeenCalledWith({ name: 'mock-built-event' });
     });
-
-    it('tracks mUSD conversion CTA clicked event with QUICK_CONVERT_HOME_SCREEN when quick convert is enabled', async () => {
-      // Arrange
-      mockSelectMusdQuickConvertEnabledFlag.mockReturnValue(true);
-      jest.mocked(useMusdConversion).mockReturnValue({
-        initiateMaxConversion: mockInitiateMaxConversion,
-        initiateCustomConversion: mockInitiateConversion,
-        clearError: mockClearError,
-        error: null,
-        hasSeenConversionEducationScreen: true,
-      });
-
-      const asset = createMockToken();
-
-      const { getByTestId } = renderWithProvider(
-        <MusdConversionAssetOverviewCta asset={asset} />,
-        { state: initialRootState },
-      );
-
-      // Act
-      await act(async () => {
-        fireEvent.press(
-          getByTestId(EARN_TEST_IDS.MUSD.ASSET_OVERVIEW_CONVERSION_CTA),
-        );
-      });
-
-      // Assert
-      const expectedCtaText = strings('earn.musd_conversion.bonus_title', {
-        percentage: MUSD_CONVERSION_APY,
-      });
-
-      expect(mockCreateEventBuilder).toHaveBeenCalledTimes(1);
-      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
-        MetaMetricsEvents.MUSD_CONVERSION_CTA_CLICKED,
-      );
-
-      expect(mockAddProperties).toHaveBeenCalledTimes(1);
-      expect(mockAddProperties).toHaveBeenCalledWith({
-        location: EVENT_LOCATIONS.ASSET_OVERVIEW,
-        redirects_to: EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN,
-        cta_type: MUSD_CTA_TYPES.TERTIARY,
-        cta_text: expectedCtaText,
-        network_chain_id: asset.chainId,
-        network_name: 'Ethereum Mainnet',
-        asset_symbol: asset.symbol,
-      });
-
-      expect(mockTrackEvent).toHaveBeenCalledTimes(1);
-      expect(mockTrackEvent).toHaveBeenCalledWith({ name: 'mock-built-event' });
-    });
   });
 });
diff --git a/app/components/UI/Earn/components/Musd/MusdConversionAssetOverviewCta/index.tsx b/app/components/UI/Earn/components/Musd/MusdConversionAssetOverviewCta/index.tsx
index 2d066511d1e..19edbf93dd1 100644
--- a/app/components/UI/Earn/components/Musd/MusdConversionAssetOverviewCta/index.tsx
+++ b/app/components/UI/Earn/components/Musd/MusdConversionAssetOverviewCta/index.tsx
@@ -25,9 +25,6 @@ import { MetaMetricsEvents } from '../../../../../../core/Analytics';
 import { MUSD_EVENTS_CONSTANTS } from '../../../constants/events';
 import { useNetworkName } from '../../../../../Views/confirmations/hooks/useNetworkName';
 import { Hex } from '@metamask/utils';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../../../types/musd.types';
-import { selectMusdQuickConvertEnabledFlag } from '../../../selectors/featureFlags';
-import { useSelector } from 'react-redux';
 interface MusdConversionAssetOverviewCtaProps {
   asset: TokenI;
   testId?: string;
@@ -48,8 +45,6 @@ const MusdConversionAssetOverviewCta = ({
   const { initiateCustomConversion, hasSeenConversionEducationScreen } =
     useMusdConversion();
 
-  const isQuickConvertEnabled = useSelector(selectMusdQuickConvertEnabledFlag);
-
   const submitCtaPressedEvent = () => {
     const { EVENT_LOCATIONS, MUSD_CTA_TYPES } = MUSD_EVENTS_CONSTANTS;
 
@@ -62,9 +57,7 @@ const MusdConversionAssetOverviewCta = ({
         return EVENT_LOCATIONS.CONVERSION_EDUCATION_SCREEN;
       }
 
-      return isQuickConvertEnabled
-        ? EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN
-        : EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN;
+      return EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN;
     };
 
     trackEvent(
@@ -96,7 +89,6 @@ const MusdConversionAssetOverviewCta = ({
           chainId: toHex(asset.chainId),
         },
         navigationStack: Routes.EARN.ROOT,
-        navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
       });
     } catch (error) {
       Logger.error(
diff --git a/app/components/UI/Earn/components/Musd/ConvertTokenRow/ConvertTokenRow.styles.ts b/app/components/UI/Earn/components/Musd/MusdConversionAssetRow/MusdConversionAssetRow.styles.ts
similarity index 100%
rename from app/components/UI/Earn/components/Musd/ConvertTokenRow/ConvertTokenRow.styles.ts
rename to app/components/UI/Earn/components/Musd/MusdConversionAssetRow/MusdConversionAssetRow.styles.ts
diff --git a/app/components/UI/Earn/components/Musd/ConvertTokenRow/ConvertTokenRow.test.tsx b/app/components/UI/Earn/components/Musd/MusdConversionAssetRow/MusdConversionAssetRow.test.tsx
similarity index 70%
rename from app/components/UI/Earn/components/Musd/ConvertTokenRow/ConvertTokenRow.test.tsx
rename to app/components/UI/Earn/components/Musd/MusdConversionAssetRow/MusdConversionAssetRow.test.tsx
index 5eec42a65f7..4efdbc72f58 100644
--- a/app/components/UI/Earn/components/Musd/ConvertTokenRow/ConvertTokenRow.test.tsx
+++ b/app/components/UI/Earn/components/Musd/MusdConversionAssetRow/MusdConversionAssetRow.test.tsx
@@ -27,8 +27,8 @@ jest.mock('../../EarnNetworkAvatar', () => ({
 import { useStyles } from '../../../../../hooks/useStyles';
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import initialRootState from '../../../../../../util/test/initial-root-state';
-import ConvertTokenRow, { ConvertTokenRowTestIds } from './index';
-import { ConvertTokenRowProps } from './ConvertTokenRow.types';
+import MusdConversionAssetRow, { MusdConversionAssetRowTestIds } from './index';
+import { MusdConversionAssetRowProps } from './MusdConversionAssetRow.types';
 
 const mockUseStyles = useStyles as jest.MockedFunction<typeof useStyles>;
 
@@ -59,11 +59,11 @@ const createMockStyles = () => ({
   errorText: {},
 });
 
-describe('ConvertTokenRow', () => {
+describe('MusdConversionAssetRow', () => {
   const mockOnMaxPress = jest.fn();
   const mockOnEditPress = jest.fn();
 
-  const defaultProps: ConvertTokenRowProps = {
+  const defaultProps: MusdConversionAssetRowProps = {
     token: createMockToken(),
     onMaxPress: mockOnMaxPress,
     onEditPress: mockOnEditPress,
@@ -84,66 +84,85 @@ describe('ConvertTokenRow', () => {
   });
 
   describe('rendering', () => {
-    it('renders container with convert-token-row-container testID', () => {
+    it('renders container with musd-conversion-asset-row-container testID', () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} />,
+        <MusdConversionAssetRow {...defaultProps} />,
         { state: initialRootState },
       );
 
-      expect(getByTestId(ConvertTokenRowTestIds.CONTAINER)).toBeOnTheScreen();
+      expect(
+        getByTestId(MusdConversionAssetRowTestIds.CONTAINER),
+      ).toBeOnTheScreen();
     });
 
-    it('renders token icon with convert-token-row-token-icon testID', () => {
+    it('renders token icon with musd-conversion-asset-row-token-icon testID', () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} />,
+        <MusdConversionAssetRow {...defaultProps} />,
         { state: initialRootState },
       );
 
-      expect(getByTestId(ConvertTokenRowTestIds.TOKEN_ICON)).toBeOnTheScreen();
+      expect(
+        getByTestId(MusdConversionAssetRowTestIds.TOKEN_ICON),
+      ).toBeOnTheScreen();
     });
 
-    it('renders token balance with convert-token-row-token-balance testID', () => {
+    it('renders token balance with musd-conversion-asset-row-token-balance testID', () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} />,
+        <MusdConversionAssetRow {...defaultProps} />,
         { state: initialRootState },
       );
 
       expect(
-        getByTestId(ConvertTokenRowTestIds.TOKEN_BALANCE),
+        getByTestId(MusdConversionAssetRowTestIds.TOKEN_BALANCE),
       ).toBeOnTheScreen();
     });
 
-    it('renders token name with convert-token-row-token-name testID', () => {
+    it('renders token name with musd-conversion-asset-row-token-name testID', () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} />,
+        <MusdConversionAssetRow {...defaultProps} />,
         { state: initialRootState },
       );
 
-      expect(getByTestId(ConvertTokenRowTestIds.TOKEN_NAME)).toBeOnTheScreen();
+      expect(
+        getByTestId(MusdConversionAssetRowTestIds.TOKEN_NAME),
+      ).toBeOnTheScreen();
     });
 
-    it('renders Max button with convert-token-row-max-button testID when not pending', () => {
+    it('renders Max button with musd-conversion-asset-row-max-button testID when not pending', () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} isConversionPending={false} />,
+        <MusdConversionAssetRow
+          {...defaultProps}
+          isConversionPending={false}
+        />,
         { state: initialRootState },
       );
 
-      expect(getByTestId(ConvertTokenRowTestIds.MAX_BUTTON)).toBeOnTheScreen();
+      expect(
+        getByTestId(MusdConversionAssetRowTestIds.MAX_BUTTON),
+      ).toBeOnTheScreen();
     });
 
-    it('renders Edit button with convert-token-row-edit-button testID when not pending', () => {
+    it('renders Edit button with musd-conversion-asset-row-edit-button testID when not pending', () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} isConversionPending={false} />,
+        <MusdConversionAssetRow
+          {...defaultProps}
+          isConversionPending={false}
+        />,
         { state: initialRootState },
       );
 
-      expect(getByTestId(ConvertTokenRowTestIds.EDIT_BUTTON)).toBeOnTheScreen();
+      expect(
+        getByTestId(MusdConversionAssetRowTestIds.EDIT_BUTTON),
+      ).toBeOnTheScreen();
     });
 
     it('renders error message when errorMessage prop is provided', () => {
       const errorMessage = 'Conversion failed';
       const { getByText } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} errorMessage={errorMessage} />,
+        <MusdConversionAssetRow
+          {...defaultProps}
+          errorMessage={errorMessage}
+        />,
         { state: initialRootState },
       );
 
@@ -152,7 +171,7 @@ describe('ConvertTokenRow', () => {
 
     it('does not render error message when errorMessage is undefined', () => {
       const { queryByText } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} />,
+        <MusdConversionAssetRow {...defaultProps} />,
         { state: initialRootState },
       );
 
@@ -161,7 +180,7 @@ describe('ConvertTokenRow', () => {
 
     it('does not render error message when errorMessage is empty string', () => {
       const { queryByText } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} errorMessage="" />,
+        <MusdConversionAssetRow {...defaultProps} errorMessage="" />,
         { state: initialRootState },
       );
 
@@ -171,7 +190,7 @@ describe('ConvertTokenRow', () => {
     it('displays token symbol in token name', () => {
       const token = createMockToken({ symbol: 'USDT' });
       const { getByText } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} token={token} />,
+        <MusdConversionAssetRow {...defaultProps} token={token} />,
         { state: initialRootState },
       );
 
@@ -182,57 +201,63 @@ describe('ConvertTokenRow', () => {
   describe('pending state', () => {
     it('hides Max and Edit buttons when isConversionPending is true', () => {
       const { getByTestId, queryByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} isConversionPending />,
+        <MusdConversionAssetRow {...defaultProps} isConversionPending />,
         { state: initialRootState },
       );
 
-      expect(getByTestId(ConvertTokenRowTestIds.CONTAINER)).toBeOnTheScreen();
-      expect(queryByTestId(ConvertTokenRowTestIds.MAX_BUTTON)).toBeNull();
-      expect(queryByTestId(ConvertTokenRowTestIds.EDIT_BUTTON)).toBeNull();
+      expect(
+        getByTestId(MusdConversionAssetRowTestIds.CONTAINER),
+      ).toBeOnTheScreen();
+      expect(
+        queryByTestId(MusdConversionAssetRowTestIds.MAX_BUTTON),
+      ).toBeNull();
+      expect(
+        queryByTestId(MusdConversionAssetRowTestIds.EDIT_BUTTON),
+      ).toBeNull();
     });
   });
 
   describe('disabled button behavior', () => {
     it('Max button has isDisabled true when areActionsDisabled is true', () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} areActionsDisabled />,
+        <MusdConversionAssetRow {...defaultProps} areActionsDisabled />,
         { state: initialRootState },
       );
 
-      const maxButton = getByTestId(ConvertTokenRowTestIds.MAX_BUTTON);
+      const maxButton = getByTestId(MusdConversionAssetRowTestIds.MAX_BUTTON);
 
       expect(maxButton).toBeDisabled();
     });
 
     it('Edit button has isDisabled true when areActionsDisabled is true', () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} areActionsDisabled />,
+        <MusdConversionAssetRow {...defaultProps} areActionsDisabled />,
         { state: initialRootState },
       );
 
-      const editButton = getByTestId(ConvertTokenRowTestIds.EDIT_BUTTON);
+      const editButton = getByTestId(MusdConversionAssetRowTestIds.EDIT_BUTTON);
 
       expect(editButton).toBeDisabled();
     });
 
     it('Max button has isDisabled false when areActionsDisabled is false', () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} areActionsDisabled={false} />,
+        <MusdConversionAssetRow {...defaultProps} areActionsDisabled={false} />,
         { state: initialRootState },
       );
 
-      const maxButton = getByTestId(ConvertTokenRowTestIds.MAX_BUTTON);
+      const maxButton = getByTestId(MusdConversionAssetRowTestIds.MAX_BUTTON);
 
       expect(maxButton).toBeEnabled();
     });
 
     it('Edit button has isDisabled false when areActionsDisabled is false', () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} areActionsDisabled={false} />,
+        <MusdConversionAssetRow {...defaultProps} areActionsDisabled={false} />,
         { state: initialRootState },
       );
 
-      const editButton = getByTestId(ConvertTokenRowTestIds.EDIT_BUTTON);
+      const editButton = getByTestId(MusdConversionAssetRowTestIds.EDIT_BUTTON);
 
       expect(editButton).toBeEnabled();
     });
@@ -242,7 +267,7 @@ describe('ConvertTokenRow', () => {
     it('calls onMaxPress with token when Max button is pressed and not disabled', async () => {
       const token = createMockToken({ symbol: 'DAI' });
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow
+        <MusdConversionAssetRow
           {...defaultProps}
           token={token}
           areActionsDisabled={false}
@@ -251,7 +276,7 @@ describe('ConvertTokenRow', () => {
         { state: initialRootState },
       );
 
-      const maxButton = getByTestId(ConvertTokenRowTestIds.MAX_BUTTON);
+      const maxButton = getByTestId(MusdConversionAssetRowTestIds.MAX_BUTTON);
 
       await act(async () => {
         fireEvent.press(maxButton);
@@ -264,7 +289,7 @@ describe('ConvertTokenRow', () => {
     it('calls onEditPress with token when Edit button is pressed and not disabled', async () => {
       const token = createMockToken({ symbol: 'USDT' });
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow
+        <MusdConversionAssetRow
           {...defaultProps}
           token={token}
           areActionsDisabled={false}
@@ -273,7 +298,7 @@ describe('ConvertTokenRow', () => {
         { state: initialRootState },
       );
 
-      const editButton = getByTestId(ConvertTokenRowTestIds.EDIT_BUTTON);
+      const editButton = getByTestId(MusdConversionAssetRowTestIds.EDIT_BUTTON);
 
       await act(async () => {
         fireEvent.press(editButton);
@@ -285,7 +310,7 @@ describe('ConvertTokenRow', () => {
 
     it('does not call onMaxPress when Max button is pressed and areActionsDisabled is true', async () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow
+        <MusdConversionAssetRow
           {...defaultProps}
           areActionsDisabled
           isConversionPending={false}
@@ -293,7 +318,7 @@ describe('ConvertTokenRow', () => {
         { state: initialRootState },
       );
 
-      const maxButton = getByTestId(ConvertTokenRowTestIds.MAX_BUTTON);
+      const maxButton = getByTestId(MusdConversionAssetRowTestIds.MAX_BUTTON);
 
       await act(async () => {
         fireEvent.press(maxButton);
@@ -304,7 +329,7 @@ describe('ConvertTokenRow', () => {
 
     it('does not call onEditPress when Edit button is pressed and areActionsDisabled is true', async () => {
       const { getByTestId } = renderWithProvider(
-        <ConvertTokenRow
+        <MusdConversionAssetRow
           {...defaultProps}
           areActionsDisabled
           isConversionPending={false}
@@ -312,7 +337,7 @@ describe('ConvertTokenRow', () => {
         { state: initialRootState },
       );
 
-      const editButton = getByTestId(ConvertTokenRowTestIds.EDIT_BUTTON);
+      const editButton = getByTestId(MusdConversionAssetRowTestIds.EDIT_BUTTON);
 
       await act(async () => {
         fireEvent.press(editButton);
@@ -331,14 +356,14 @@ describe('ConvertTokenRow', () => {
       jest.mocked(useFiatFormatter).mockReturnValue(mockFormatFiat);
 
       const { getByText, getByTestId } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} token={token} />,
+        <MusdConversionAssetRow {...defaultProps} token={token} />,
         { state: initialRootState },
       );
 
       expect(mockFormatFiat).toHaveBeenCalled();
       expect(getByText('$123.45')).toBeOnTheScreen();
       expect(
-        getByTestId(ConvertTokenRowTestIds.TOKEN_BALANCE),
+        getByTestId(MusdConversionAssetRowTestIds.TOKEN_BALANCE),
       ).toBeOnTheScreen();
     });
 
@@ -352,7 +377,7 @@ describe('ConvertTokenRow', () => {
       jest.mocked(useFiatFormatter).mockReturnValue(mockFormatFiat);
 
       const { getByText } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} token={token} />,
+        <MusdConversionAssetRow {...defaultProps} token={token} />,
         { state: initialRootState },
       );
 
@@ -370,7 +395,7 @@ describe('ConvertTokenRow', () => {
       jest.mocked(useFiatFormatter).mockReturnValue(mockFormatFiat);
 
       const { getByText } = renderWithProvider(
-        <ConvertTokenRow {...defaultProps} token={token} />,
+        <MusdConversionAssetRow {...defaultProps} token={token} />,
         { state: initialRootState },
       );
 
diff --git a/app/components/UI/Earn/components/Musd/ConvertTokenRow/ConvertTokenRow.types.ts b/app/components/UI/Earn/components/Musd/MusdConversionAssetRow/MusdConversionAssetRow.types.ts
similarity index 86%
rename from app/components/UI/Earn/components/Musd/ConvertTokenRow/ConvertTokenRow.types.ts
rename to app/components/UI/Earn/components/Musd/MusdConversionAssetRow/MusdConversionAssetRow.types.ts
index eb43de5e15e..8d36dd04f5b 100644
--- a/app/components/UI/Earn/components/Musd/ConvertTokenRow/ConvertTokenRow.types.ts
+++ b/app/components/UI/Earn/components/Musd/MusdConversionAssetRow/MusdConversionAssetRow.types.ts
@@ -1,9 +1,9 @@
 import { AssetType } from '../../../../../Views/confirmations/types/token';
 
 /**
- * Props for the ConvertTokenRow component.
+ * Props for the MusdConversionAssetRow component.
  */
-export interface ConvertTokenRowProps {
+export interface MusdConversionAssetRowProps {
   token: AssetType;
   onMaxPress: (token: AssetType) => void;
   onEditPress: (token: AssetType) => void;
diff --git a/app/components/UI/Earn/components/Musd/ConvertTokenRow/index.tsx b/app/components/UI/Earn/components/Musd/MusdConversionAssetRow/index.tsx
similarity index 80%
rename from app/components/UI/Earn/components/Musd/ConvertTokenRow/index.tsx
rename to app/components/UI/Earn/components/Musd/MusdConversionAssetRow/index.tsx
index b82377b651b..44b96e2e4f5 100644
--- a/app/components/UI/Earn/components/Musd/ConvertTokenRow/index.tsx
+++ b/app/components/UI/Earn/components/Musd/MusdConversionAssetRow/index.tsx
@@ -27,32 +27,32 @@ import { Hex } from '@metamask/utils';
 import { useStyles } from '../../../../../hooks/useStyles';
 import { getNetworkImageSource } from '../../../../../../util/networks';
 import { EarnNetworkAvatar } from '../../EarnNetworkAvatar';
-import styleSheet from './ConvertTokenRow.styles';
-import { ConvertTokenRowProps } from './ConvertTokenRow.types';
+import styleSheet from './MusdConversionAssetRow.styles';
+import { MusdConversionAssetRowProps } from './MusdConversionAssetRow.types';
 import useFiatFormatter from '../../../../SimulationDetails/FiatDisplay/useFiatFormatter';
 import BigNumber from 'bignumber.js';
 
 /**
- * Test IDs for the ConvertTokenRow component.
+ * Test IDs for the MusdConversionAssetRow component.
  */
-export const ConvertTokenRowTestIds = {
-  CONTAINER: 'convert-token-row-container',
-  TOKEN_ICON: 'convert-token-row-token-icon',
-  TOKEN_NAME: 'convert-token-row-token-name',
-  TOKEN_BALANCE: 'convert-token-row-token-balance',
-  MAX_BUTTON: 'convert-token-row-max-button',
-  EDIT_BUTTON: 'convert-token-row-edit-button',
+export const MusdConversionAssetRowTestIds = {
+  CONTAINER: 'musd-conversion-asset-row-container',
+  TOKEN_ICON: 'musd-conversion-asset-row-token-icon',
+  TOKEN_NAME: 'musd-conversion-asset-row-token-name',
+  TOKEN_BALANCE: 'musd-conversion-asset-row-token-balance',
+  MAX_BUTTON: 'musd-conversion-asset-row-max-button',
+  EDIT_BUTTON: 'musd-conversion-asset-row-edit-button',
 } as const;
 
 /**
- * A row component for displaying a token in the Quick Convert list.
+ * A row component that exposes the Max and Edit conversion buttons for a token.
  *
  * Displays:
  * - Token icon with network badge
  * - Token name and balance
  * - Max and Edit buttons
  */
-const ConvertTokenRow: React.FC<ConvertTokenRowProps> = ({
+const MusdConversionAssetRow: React.FC<MusdConversionAssetRowProps> = ({
   token,
   onMaxPress,
   onEditPress,
@@ -86,11 +86,14 @@ const ConvertTokenRow: React.FC<ConvertTokenRowProps> = ({
   }, [areActionsDisabled, isConversionPending, onEditPress, token]);
 
   return (
-    <View style={styles.container} testID={ConvertTokenRowTestIds.CONTAINER}>
+    <View
+      style={styles.container}
+      testID={MusdConversionAssetRowTestIds.CONTAINER}
+    >
       <View style={styles.row}>
         {/* Left side: Token icon and info */}
         <View style={styles.left}>
-          <View testID={ConvertTokenRowTestIds.TOKEN_ICON}>
+          <View testID={MusdConversionAssetRowTestIds.TOKEN_ICON}>
             <View style={styles.tokenIconContainer}>
               <BadgeWrapper
                 badgePosition={BadgePosition.BottomRight}
@@ -115,7 +118,7 @@ const ConvertTokenRow: React.FC<ConvertTokenRowProps> = ({
               variant={TextVariant.BodyMDMedium}
               numberOfLines={1}
               ellipsizeMode="tail"
-              testID={ConvertTokenRowTestIds.TOKEN_BALANCE}
+              testID={MusdConversionAssetRowTestIds.TOKEN_BALANCE}
             >
               {formattedBalance}
             </Text>
@@ -123,7 +126,7 @@ const ConvertTokenRow: React.FC<ConvertTokenRowProps> = ({
               variant={TextVariant.BodySMMedium}
               color={TextColor.Alternative}
               numberOfLines={1}
-              testID={ConvertTokenRowTestIds.TOKEN_NAME}
+              testID={MusdConversionAssetRowTestIds.TOKEN_NAME}
             >
               {token.symbol}
             </Text>
@@ -141,7 +144,7 @@ const ConvertTokenRow: React.FC<ConvertTokenRowProps> = ({
                 size={ButtonSize.Md}
                 onPress={handleMaxPress}
                 isDisabled={areActionsDisabled}
-                testID={ConvertTokenRowTestIds.MAX_BUTTON}
+                testID={MusdConversionAssetRowTestIds.MAX_BUTTON}
               >
                 <Text variant={TextVariant.BodyMDMedium}>
                   {strings('earn.musd_conversion.max')}
@@ -154,7 +157,7 @@ const ConvertTokenRow: React.FC<ConvertTokenRowProps> = ({
                 iconProps={{ size: IconSize.Sm }}
                 onPress={handleEditPress}
                 isDisabled={areActionsDisabled}
-                testID={ConvertTokenRowTestIds.EDIT_BUTTON}
+                testID={MusdConversionAssetRowTestIds.EDIT_BUTTON}
               />
             </>
           )}
@@ -169,4 +172,4 @@ const ConvertTokenRow: React.FC<ConvertTokenRowProps> = ({
   );
 };
 
-export default ConvertTokenRow;
+export default MusdConversionAssetRow;
diff --git a/app/components/UI/Earn/constants/events/musdEvents.ts b/app/components/UI/Earn/constants/events/musdEvents.ts
index eb87e9177e7..72a680225e6 100644
--- a/app/components/UI/Earn/constants/events/musdEvents.ts
+++ b/app/components/UI/Earn/constants/events/musdEvents.ts
@@ -12,7 +12,6 @@ const EVENT_LOCATIONS = {
   CONVERSION_EDUCATION_SCREEN: 'conversion_education_screen',
   CUSTOM_AMOUNT_SCREEN: 'custom_amount_screen', // Single convert screen.
   BUY_SCREEN: 'buy_screen', // Buy mUSD screen.
-  QUICK_CONVERT_HOME_SCREEN: 'quick_convert_home_screen',
   QUICK_CONVERT_MAX_BOTTOM_SHEET_CONFIRMATION_SCREEN:
     'quick_convert_max_bottom_sheet_confirmation_screen',
   CUSTOM_AMOUNT_NAVBAR: 'custom_amount_navbar',
diff --git a/app/components/UI/Earn/constants/musd.ts b/app/components/UI/Earn/constants/musd.ts
index 55568e72d4b..d32da829d67 100644
--- a/app/components/UI/Earn/constants/musd.ts
+++ b/app/components/UI/Earn/constants/musd.ts
@@ -11,6 +11,13 @@ export const MUSD_TOKEN = {
   name: 'MetaMask USD',
   decimals: 6,
   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;
 
 /**
diff --git a/app/components/UI/Earn/hooks/useMusdConversion.test.ts b/app/components/UI/Earn/hooks/useMusdConversion.test.ts
index cde2e237d4f..a1eb54654c6 100644
--- a/app/components/UI/Earn/hooks/useMusdConversion.test.ts
+++ b/app/components/UI/Earn/hooks/useMusdConversion.test.ts
@@ -16,7 +16,6 @@ import { RootState } from '../../../../reducers';
 import { selectSelectedInternalAccountByScope } from '../../../../selectors/multichainAccounts/accounts';
 import { useMusdConversionTokens } from './useMusdConversionTokens';
 import { AssetType } from '../../../Views/confirmations/types/token';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../types/musd.types';
 
 const mockTrace = trace as jest.MockedFunction<typeof trace>;
 
@@ -442,7 +441,7 @@ describe('useMusdConversion', () => {
       });
     });
 
-    it('threads returnTo and navigationOverride into education screen params when first-time user triggers custom conversion', async () => {
+    it('threads returnTo into education screen params when first-time user triggers custom conversion', async () => {
       setupUseSelectorMock({
         hasSeenConversionEducationScreen: false,
       });
@@ -455,7 +454,6 @@ describe('useMusdConversion', () => {
             address: '0xabc' as Hex,
             chainId: '0x1' as Hex,
           },
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.CUSTOM,
           returnTo: { screen: Routes.WALLET.CASH_TOKENS_FULL_VIEW },
         });
       });
@@ -464,7 +462,6 @@ describe('useMusdConversion', () => {
         screen: Routes.EARN.MUSD.CONVERSION_EDUCATION,
         params: {
           preferredPaymentToken: { address: '0xabc', chainId: '0x1' },
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.CUSTOM,
           returnTo: { screen: Routes.WALLET.CASH_TOKENS_FULL_VIEW },
         },
       });
diff --git a/app/components/UI/Earn/hooks/useMusdConversion.ts b/app/components/UI/Earn/hooks/useMusdConversion.ts
index 253322c8fd3..c5b17948fb5 100644
--- a/app/components/UI/Earn/hooks/useMusdConversion.ts
+++ b/app/components/UI/Earn/hooks/useMusdConversion.ts
@@ -22,11 +22,7 @@ import { selectTransactionsByIds } from '../../../../selectors/transactionContro
 import { AssetType } from '../../../Views/confirmations/types/token';
 import { toHex } from '@metamask/controller-utils';
 import EngineService from '../../../../core/EngineService';
-import {
-  MUSD_CONVERSION_NAVIGATION_OVERRIDE,
-  MusdNavigationTarget,
-} from '../types/musd.types';
-import { selectMusdQuickConvertEnabledFlag } from '../selectors/featureFlags';
+import { MusdNavigationTarget } from '../types/musd.types';
 import { providerErrors } from '@metamask/rpc-errors';
 
 type MusdInitiationResult = { transactionId: string } | void;
@@ -125,10 +121,6 @@ export interface MusdConversionConfig {
    * Skip the education screen check. Used when calling from the education view itself
    */
   skipEducationCheck?: boolean;
-  /**
-   * Optional navigation mode override for this initiation.
-   */
-  navigationOverride?: MUSD_CONVERSION_NAVIGATION_OVERRIDE;
   /**
    * When the education screen is shown for a first-time user, and this config has
    * `returnTo`, the education screen's primary button routes to `returnTo` instead of
@@ -192,10 +184,6 @@ export const useMusdConversion = () => {
     selectMusdConversionEducationSeen,
   );
 
-  const isMusdQuickConvertEnabledFlag = useSelector(
-    selectMusdQuickConvertEnabledFlag,
-  );
-
   /**
    * Initiates a max-amount mUSD conversion.
    *
@@ -377,16 +365,6 @@ export const useMusdConversion = () => {
     [navigation, pendingTransactionMetas, selectedAddress],
   );
 
-  const navigateToQuickConvertScreen = useCallback(
-    (config: MusdConversionConfig) => {
-      const { navigationStack = Routes.EARN.ROOT } = config;
-      navigation.navigate(navigationStack, {
-        screen: Routes.EARN.MUSD.QUICK_CONVERT,
-      });
-    },
-    [navigation],
-  );
-
   /**
    * Navigates to the custom amount conversion screen.
    */
@@ -432,7 +410,6 @@ export const useMusdConversion = () => {
         screen: Routes.EARN.MUSD.CONVERSION_EDUCATION,
         params: {
           preferredPaymentToken,
-          navigationOverride: config.navigationOverride,
           returnTo: config.returnTo,
         },
       });
@@ -456,10 +433,7 @@ export const useMusdConversion = () => {
         return;
       }
 
-      const {
-        preferredPaymentToken,
-        navigationOverride = MUSD_CONVERSION_NAVIGATION_OVERRIDE.CUSTOM,
-      } = config;
+      const { preferredPaymentToken } = config;
 
       try {
         setError(null);
@@ -472,15 +446,6 @@ export const useMusdConversion = () => {
           throw new Error('No account selected');
         }
 
-        if (
-          navigationOverride ===
-            MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT &&
-          isMusdQuickConvertEnabledFlag
-        ) {
-          navigateToQuickConvertScreen(config);
-          return;
-        }
-
         const existingPendingMusdConversion = findExistingPendingMusdConversion(
           {
             pendingTransactionMetas,
@@ -577,9 +542,7 @@ export const useMusdConversion = () => {
     },
     [
       handleEducationRedirectIfNeeded,
-      isMusdQuickConvertEnabledFlag,
       navigateToCustomConversionScreen,
-      navigateToQuickConvertScreen,
       navigation,
       pendingTransactionMetas,
       selectedAddress,
diff --git a/app/components/UI/Earn/hooks/useTronClaimUnstakedTrx.test.ts b/app/components/UI/Earn/hooks/useTronClaimUnstakedTrx.test.ts
index 2148bcf5fd5..5cf60425a85 100644
--- a/app/components/UI/Earn/hooks/useTronClaimUnstakedTrx.test.ts
+++ b/app/components/UI/Earn/hooks/useTronClaimUnstakedTrx.test.ts
@@ -29,8 +29,6 @@ describe('useTronClaimUnstakedTrx', () => {
       name: 'Tron Account',
       snap: {
         id: 'npm:@metamask/tron-wallet-snap',
-        name: 'Tron Wallet Snap',
-        enabled: true,
       },
       importTime: 0,
       keyring: { type: 'snap' },
diff --git a/app/components/UI/Earn/routes/index.test.tsx b/app/components/UI/Earn/routes/index.test.tsx
index 03760282970..7d75af64a1f 100644
--- a/app/components/UI/Earn/routes/index.test.tsx
+++ b/app/components/UI/Earn/routes/index.test.tsx
@@ -46,19 +46,6 @@ jest.mock('../Views/EarnMusdConversionEducationView', () => {
   return MockView;
 });
 
-jest.mock('../Views/MusdQuickConvertView', () => {
-  const MockView = () => {
-    const { View, Text } = jest.requireActual('react-native');
-    return (
-      <View testID="musd-quick-convert">
-        <Text>MUSD Quick Convert</Text>
-      </View>
-    );
-  };
-  MockView.displayName = 'MockMusdQuickConvertView';
-  return MockView;
-});
-
 jest.mock('../modals/LendingMaxWithdrawalModal', () => {
   const MockModal = () => {
     const { View, Text } = jest.requireActual('react-native');
@@ -139,10 +126,6 @@ describe('EarnScreenStack', () => {
     expect(Routes.EARN.MUSD.CONVERSION_EDUCATION).toBeDefined();
   });
 
-  it('defines MUSD quick convert route', () => {
-    expect(Routes.EARN.MUSD.QUICK_CONVERT).toBeDefined();
-  });
-
   it('defines full screen confirmations route', () => {
     expect(
       Routes.FULL_SCREEN_CONFIRMATIONS.REDESIGNED_CONFIRMATIONS,
diff --git a/app/components/UI/Earn/routes/index.tsx b/app/components/UI/Earn/routes/index.tsx
index 0d112c51788..da812e3ec4d 100644
--- a/app/components/UI/Earn/routes/index.tsx
+++ b/app/components/UI/Earn/routes/index.tsx
@@ -4,7 +4,6 @@ import Routes from '../../../../constants/navigation/Routes';
 import EarnLendingDepositConfirmationView from '../../Earn/Views/EarnLendingDepositConfirmationView';
 import EarnLendingWithdrawalConfirmationView from '../Views/EarnLendingWithdrawalConfirmationView';
 import EarnMusdConversionEducationView from '../Views/EarnMusdConversionEducationView';
-import MusdQuickConvertView from '../Views/MusdQuickConvertView';
 import EarnLendingMaxWithdrawalModal from '../modals/LendingMaxWithdrawalModal';
 import LendingLearnMoreModal from '../LendingLearnMoreModal';
 import { Confirm } from '../../../Views/confirmations/components/confirm';
@@ -37,10 +36,6 @@ const EarnScreenStack = () => {
         component={EarnMusdConversionEducationView}
         options={{ headerShown: false }}
       />
-      <Stack.Screen
-        name={Routes.EARN.MUSD.QUICK_CONVERT}
-        component={MusdQuickConvertView}
-      />
     </Stack.Navigator>
   );
 };
diff --git a/app/components/UI/Earn/selectors/featureFlags/index.ts b/app/components/UI/Earn/selectors/featureFlags/index.ts
index 24229f9e6e5..5e5f2f3a106 100644
--- a/app/components/UI/Earn/selectors/featureFlags/index.ts
+++ b/app/components/UI/Earn/selectors/featureFlags/index.ts
@@ -168,30 +168,6 @@ export const selectMusdConversionCTATokens = createSelector(
     ),
 );
 
-/**
- * Selector for the mUSD Quick Convert feature flag.
- * This flag enables the Quick Convert Token List screen where users can
- * quickly convert their existing tokens to mUSD via Max or Edit flows.
- *
- * IMPORTANT: This flag depends on selectIsMusdConversionFlowEnabledFlag.
- */
-export const selectMusdQuickConvertEnabledFlag = createSelector(
-  selectRemoteFeatureFlags,
-  selectIsMusdConversionFlowEnabledFlag,
-  (remoteFeatureFlags, isMusdConversionFlowEnabled) => {
-    if (!isMusdConversionFlowEnabled) {
-      return false;
-    }
-
-    const localFlag = process.env.MM_MUSD_QUICK_CONVERT_ENABLED === 'true';
-    const remoteFlag =
-      remoteFeatureFlags?.earnMusdQuickConvertEnabled as unknown as VersionGatedFeatureFlag;
-
-    // Fallback to local flag if remote flag is not available
-    return validatedVersionGatedFeatureFlag(remoteFlag) ?? localFlag;
-  },
-);
-
 /**
  * Selects the allowed payment tokens for mUSD conversion from remote config or local fallback.
  * Returns a wildcard allowlist mapping chain IDs (or "*") to token symbols (or ["*"]).
diff --git a/app/components/UI/Earn/types/musd.types.ts b/app/components/UI/Earn/types/musd.types.ts
index ce144b931d3..9e31400ee08 100644
--- a/app/components/UI/Earn/types/musd.types.ts
+++ b/app/components/UI/Earn/types/musd.types.ts
@@ -1,8 +1,3 @@
-export enum MUSD_CONVERSION_NAVIGATION_OVERRIDE {
-  QUICK_CONVERT = 'quickConvert',
-  CUSTOM = 'custom',
-}
-
 /**
  * Pure-navigation target used by the education gate. When present, the
  * education screen's primary button routes here instead of continuing
diff --git a/app/components/UI/EthereumAddress/EthereumAddress.testIds.ts b/app/components/UI/EthereumAddress/EthereumAddress.testIds.ts
new file mode 100644
index 00000000000..ae003d447e4
--- /dev/null
+++ b/app/components/UI/EthereumAddress/EthereumAddress.testIds.ts
@@ -0,0 +1,3 @@
+export const EthereumAddressSelectorsIDs = {
+  ADDRESS_LABEL: 'wallet-account-address-label',
+};
diff --git a/app/components/UI/EthereumAddress/index.js b/app/components/UI/EthereumAddress/index.js
index 82b2ce368a8..cd2cd15e0e0 100644
--- a/app/components/UI/EthereumAddress/index.js
+++ b/app/components/UI/EthereumAddress/index.js
@@ -1,9 +1,8 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { Platform, Text } from 'react-native';
+import { Text } from 'react-native';
 import { formatAddress } from '../../../util/address';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import { WALLET_ACCOUNT_ADDRESS_LABEL } from '../../../../wdio/screen-objects/testIDs/Screens/WalletView.testIds';
+import { EthereumAddressSelectorsIDs } from './EthereumAddress.testIds';
 
 /**
  * View that renders an ethereum address
@@ -56,7 +55,7 @@ class EthereumAddress extends PureComponent {
       <Text
         style={this.props.style}
         numberOfLines={1}
-        {...generateTestId(Platform, WALLET_ACCOUNT_ADDRESS_LABEL)}
+        testID={EthereumAddressSelectorsIDs.ADDRESS_LABEL}
       >
         {this.state.address}
       </Text>
diff --git a/app/components/UI/HardwareWallet/AccountSelector/AccountSelector.testIds.ts b/app/components/UI/HardwareWallet/AccountSelector/AccountSelector.testIds.ts
new file mode 100644
index 00000000000..606a2dfeedd
--- /dev/null
+++ b/app/components/UI/HardwareWallet/AccountSelector/AccountSelector.testIds.ts
@@ -0,0 +1,5 @@
+export const AccountSelectorSelectorsIDs = {
+  NEXT_BUTTON: 'account-selector-next-button',
+  PREVIOUS_BUTTON: 'account-selector-previous-button',
+  FORGET_BUTTON: 'account-selector-forget-button',
+};
diff --git a/app/components/UI/HardwareWallet/AccountSelector/index.tsx b/app/components/UI/HardwareWallet/AccountSelector/index.tsx
index 78a2114f615..f693200af2e 100644
--- a/app/components/UI/HardwareWallet/AccountSelector/index.tsx
+++ b/app/components/UI/HardwareWallet/AccountSelector/index.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useState, useMemo } from 'react';
-import { View, Text, FlatList, TouchableOpacity, Platform } from 'react-native';
+import { View, Text, FlatList, TouchableOpacity } from 'react-native';
 import Icon from 'react-native-vector-icons/FontAwesome';
 import CheckBox from '@react-native-community/checkbox';
 import { useSelector } from 'react-redux';
@@ -13,12 +13,7 @@ import { createStyle } from './styles';
 import AccountDetails from '../AccountDetails';
 import StyledButton from '../../../UI/StyledButton';
 import { selectProviderConfig } from '../../../../selectors/networkController';
-import generateTestId from '../../../../../wdio/utils/generateTestId';
-import {
-  ACCOUNT_SELECTOR_FORGET_BUTTON,
-  ACCOUNT_SELECTOR_NEXT_BUTTON,
-  ACCOUNT_SELECTOR_PREVIOUS_BUTTON,
-} from '../../../../../wdio/screen-objects/testIDs/Components/AccountSelector.testIds';
+import { AccountSelectorSelectorsIDs } from './AccountSelector.testIds';
 import { toFormattedAddress } from '../../../../util/address';
 
 interface ISelectQRAccountsProps {
@@ -122,7 +117,7 @@ const AccountSelector = (props: ISelectQRAccountsProps) => {
         <TouchableOpacity
           style={styles.paginationItem}
           onPress={prevPage}
-          {...generateTestId(Platform, ACCOUNT_SELECTOR_PREVIOUS_BUTTON)}
+          testID={AccountSelectorSelectorsIDs.PREVIOUS_BUTTON}
         >
           <Icon name={'chevron-left'} color={colors.primary.default} />
           <Text style={styles.paginationText}>
@@ -132,7 +127,7 @@ const AccountSelector = (props: ISelectQRAccountsProps) => {
         <TouchableOpacity
           style={styles.paginationItem}
           onPress={nextPage}
-          {...generateTestId(Platform, ACCOUNT_SELECTOR_NEXT_BUTTON)}
+          testID={AccountSelectorSelectorsIDs.NEXT_BUTTON}
         >
           <Text style={styles.paginationText}>
             {strings('account_selector.next')}
@@ -153,7 +148,7 @@ const AccountSelector = (props: ISelectQRAccountsProps) => {
           type={'transparent-blue'}
           onPress={onForget}
           containerStyle={[styles.button]}
-          {...generateTestId(Platform, ACCOUNT_SELECTOR_FORGET_BUTTON)}
+          testID={AccountSelectorSelectorsIDs.FORGET_BUTTON}
         >
           {strings('account_selector.forget')}
         </StyledButton>
diff --git a/app/components/UI/Identity/BackupAndSyncFeaturesToggles/BackupAndSyncFeaturesToggles.tsx b/app/components/UI/Identity/BackupAndSyncFeaturesToggles/BackupAndSyncFeaturesToggles.tsx
index 623f96eb47b..b328f249d3c 100644
--- a/app/components/UI/Identity/BackupAndSyncFeaturesToggles/BackupAndSyncFeaturesToggles.tsx
+++ b/app/components/UI/Identity/BackupAndSyncFeaturesToggles/BackupAndSyncFeaturesToggles.tsx
@@ -1,10 +1,13 @@
 import React, { useCallback, useMemo } from 'react';
 import { View, Switch, InteractionManager } from 'react-native';
 
-import Text, {
+import {
+  Text,
   TextColor,
   TextVariant,
-} from '../../../../component-library/components/Texts/Text';
+  Icon,
+  IconName,
+} from '@metamask/design-system-react-native';
 import { useTheme } from '../../../../util/theme';
 import styles from './BackupAndSyncFeaturesToggles.styles';
 import { useBackupAndSync } from '../../../../util/identity/hooks/useBackupAndSync';
@@ -16,9 +19,6 @@ import {
   selectIsBackupAndSyncUpdateLoading,
 } from '../../../../selectors/identity';
 import { BACKUPANDSYNC_FEATURES } from '@metamask/profile-sync-controller/user-storage';
-import Icon, {
-  IconName,
-} from '../../../../component-library/components/Icons/Icon';
 import { strings } from '../../../../../locales/i18n';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
@@ -126,10 +126,10 @@ const BackupAndSyncFeaturesToggles = () => {
   return (
     <View style={styles.setting}>
       <View style={styles.heading}>
-        <Text variant={TextVariant.HeadingSM}>
+        <Text variant={TextVariant.HeadingSm}>
           {strings('backupAndSync.manageWhatYouSync.title')}
         </Text>
-        <Text variant={TextVariant.BodySM} color={TextColor.Alternative}>
+        <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
           {strings('backupAndSync.manageWhatYouSync.description')}
         </Text>
       </View>
diff --git a/app/components/UI/Identity/BackupAndSyncToggle/BackupAndSyncToggle.tsx b/app/components/UI/Identity/BackupAndSyncToggle/BackupAndSyncToggle.tsx
index 5a6f1155975..ad287b91399 100644
--- a/app/components/UI/Identity/BackupAndSyncToggle/BackupAndSyncToggle.tsx
+++ b/app/components/UI/Identity/BackupAndSyncToggle/BackupAndSyncToggle.tsx
@@ -3,10 +3,11 @@ import React, { useCallback, useEffect } from 'react';
 import { View, Switch, Linking, InteractionManager } from 'react-native';
 // import { useNavigation } from '@react-navigation/native';
 
-import Text, {
+import {
+  Text,
   TextVariant,
   TextColor,
-} from '../../../../component-library/components/Texts/Text';
+} from '@metamask/design-system-react-native';
 import { useTheme } from '../../../../util/theme';
 // import { strings } from '../../../../../locales/i18n';
 import styles from './BackupAndSyncToggle.styles';
@@ -150,7 +151,7 @@ const BackupAndSyncToggle = ({
   return (
     <View style={styles.setting}>
       <View style={styles.heading}>
-        <Text variant={TextVariant.HeadingSM}>
+        <Text variant={TextVariant.HeadingSm}>
           {strings('backupAndSync.title')}
         </Text>
         <Switch
@@ -165,9 +166,9 @@ const BackupAndSyncToggle = ({
           testID={BACKUP_AND_SYNC_TOGGLE_TEST_IDS.TOGGLE}
         />
       </View>
-      <Text variant={TextVariant.BodyMD} color={TextColor.Alternative}>
+      <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
         {strings('backupAndSync.enable.description')}
-        <Text color={TextColor.Info} onPress={handleLink}>
+        <Text color={TextColor.InfoDefault} onPress={handleLink}>
           {strings('backupAndSync.privacyLink')}
         </Text>
       </Text>
diff --git a/app/components/UI/Identity/ConfirmTurnOnBackupAndSyncModal/ConfirmTurnOnBackupAndSyncModal.tsx b/app/components/UI/Identity/ConfirmTurnOnBackupAndSyncModal/ConfirmTurnOnBackupAndSyncModal.tsx
index 79a22efcaaa..a917aa0a4c3 100644
--- a/app/components/UI/Identity/ConfirmTurnOnBackupAndSyncModal/ConfirmTurnOnBackupAndSyncModal.tsx
+++ b/app/components/UI/Identity/ConfirmTurnOnBackupAndSyncModal/ConfirmTurnOnBackupAndSyncModal.tsx
@@ -1,15 +1,13 @@
 import React, { useRef } from 'react';
 
-import BottomSheet, {
-  BottomSheetRef,
-} from '../../../../component-library/components/BottomSheets/BottomSheet';
-import { strings } from '../../../../../locales/i18n';
-
 import {
+  BottomSheet,
+  type BottomSheetRef,
   IconColor,
   IconName,
   IconSize,
-} from '../../../../component-library/components/Icons/Icon';
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../locales/i18n';
 import ModalContent from '../../Notification/Modal';
 import { toggleBasicFunctionality } from '../../../../actions/settings';
 import { useParams } from '../../../../util/navigation/navUtils';
@@ -45,7 +43,7 @@ const ConfirmTurnOnBackupAndSyncModal = () => {
   const turnContent = {
     icon: {
       name: IconName.Check,
-      color: IconColor.Success,
+      color: IconColor.SuccessDefault,
     },
     bottomSheetTitle: strings('backupAndSync.enable.title'),
     bottomSheetMessage: strings('backupAndSync.enable.confirmation'),
diff --git a/app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView.view.test.tsx b/app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView.view.test.tsx
new file mode 100644
index 00000000000..45ad955674f
--- /dev/null
+++ b/app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView.view.test.tsx
@@ -0,0 +1,182 @@
+/**
+ * Component view tests for token (non-Perps) MarketInsightsView: content,
+ * swap/buy navigation, trend sources sheet, thumbs up.
+ * Mirrors smoke: tests/smoke/assets/market-insights/view-market-insights.spec.ts
+ * (cases 7, 10, 11, 12). Entry card visibility cases (8, 9) are covered by
+ * AssetOverviewContent.view.test.tsx.
+ * Run: yarn test:view:one MarketInsightsView.view.test.tsx
+ */
+import '../../../../../../tests/component-view/mocks';
+import { fireEvent, screen, waitFor } from '@testing-library/react-native';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import {
+  MOCK_PERPS_MARKET_INSIGHTS_REPORT,
+  setupMarketInsightsEngineMock,
+} from '../../../../../../tests/component-view/fixtures/perpsMarketInsights';
+import { renderMarketInsightsViewWithNavigation } from '../../../../../../tests/component-view/renderers/marketInsights';
+import { describeForPlatforms } from '../../../../../../tests/component-view/platform';
+import { BuildQuoteSelectors } from '../../../Ramp/Aggregator/Views/BuildQuote/BuildQuote.testIds';
+import { MarketInsightsSelectorsIDs } from '../../MarketInsights.testIds';
+import { analytics } from '../../../../../util/analytics/analytics';
+import { resetFeedbackCache } from './MarketInsightsView';
+
+const ETH_MAINNET_ROUTE_PARAMS = {
+  assetSymbol: 'ETH',
+  assetIdentifier: 'eip155:1/slip44:60',
+  tokenAddress: '0x0000000000000000000000000000000000000000',
+  tokenDecimals: 18,
+  tokenName: 'Ethereum',
+  tokenChainId: CHAIN_IDS.MAINNET,
+  token: {
+    address: '0x123',
+    symbol: 'ETH',
+    decimals: 18,
+    name: 'Ethereum',
+    chainId: '0x1',
+    image: 'https://example.com/eth.png',
+    balance: '0',
+    logo: undefined,
+  },
+};
+
+describeForPlatforms('MarketInsightsView (token flow)', () => {
+  beforeEach(() => {
+    setupMarketInsightsEngineMock(MOCK_PERPS_MARKET_INSIGHTS_REPORT);
+  });
+
+  afterEach(() => {
+    resetFeedbackCache();
+  });
+
+  it('displays market insights content and navigates to swap', async () => {
+    renderMarketInsightsViewWithNavigation({
+      initialParams: ETH_MAINNET_ROUTE_PARAMS,
+      overrides: {
+        engine: {
+          backgroundState: {
+            TokensController: {
+              allTokens: {
+                '0x1': {
+                  '0x0000000000000000000000000000000000000001': [
+                    {
+                      address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                      decimals: 6,
+                      symbol: 'USDC',
+                      name: 'USD Coin',
+                      image: '',
+                    },
+                  ],
+                },
+              },
+              allIgnoredTokens: {},
+            },
+            TokenBalancesController: {
+              tokenBalances: {
+                '0x0000000000000000000000000000000000000001': {
+                  '0x1': {
+                    '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': '0x3b9aca00',
+                  },
+                },
+              },
+            },
+            TokenRatesController: {
+              marketData: {
+                '0x1': {
+                  '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': {
+                    tokenAddress: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                    currency: 'ETH',
+                    price: 0.0005,
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    });
+
+    expect(
+      await screen.findByTestId(MarketInsightsSelectorsIDs.VIEW_CONTAINER),
+    ).toBeOnTheScreen();
+    expect(
+      await screen.findByText(
+        'Ethereum shows strong momentum amid institutional demand',
+      ),
+    ).toBeOnTheScreen();
+    expect(
+      await screen.findByText(
+        'Ethereum continues to attract institutional interest with increasing on-chain activity and a healthy DeFi ecosystem.',
+      ),
+    ).toBeOnTheScreen();
+    expect(await screen.findByText('Institutional Adoption')).toBeOnTheScreen();
+    expect(await screen.findByText('DeFi Activity Surge')).toBeOnTheScreen();
+
+    fireEvent.press(
+      await screen.findByTestId(MarketInsightsSelectorsIDs.SWAP_BUTTON),
+    );
+
+    expect(await screen.findByTestId('route-BridgeView')).toBeOnTheScreen();
+  });
+
+  it('navigates to buy flow when tapping Buy button', async () => {
+    renderMarketInsightsViewWithNavigation({
+      initialParams: ETH_MAINNET_ROUTE_PARAMS,
+    });
+
+    await screen.findByTestId(MarketInsightsSelectorsIDs.VIEW_CONTAINER);
+
+    fireEvent.press(
+      await screen.findByTestId(MarketInsightsSelectorsIDs.BUY_BUTTON),
+    );
+
+    expect(
+      await screen.findByTestId(BuildQuoteSelectors.CONTINUE_BUTTON),
+    ).toBeOnTheScreen();
+  });
+
+  it('shows sources bottom sheet when tapping a trend item', async () => {
+    renderMarketInsightsViewWithNavigation({
+      initialParams: ETH_MAINNET_ROUTE_PARAMS,
+    });
+
+    await screen.findByTestId(MarketInsightsSelectorsIDs.VIEW_CONTAINER);
+
+    fireEvent.press(
+      await screen.findByTestId(`${MarketInsightsSelectorsIDs.TREND_ITEM}-0`),
+    );
+
+    expect(
+      await screen.findByText('Spot Ethereum ETFs See Record Weekly Inflows'),
+    ).toBeOnTheScreen();
+  });
+
+  it('can tap thumbs up feedback button', async () => {
+    const trackEventSpy = jest.spyOn(analytics, 'trackEvent');
+    try {
+      renderMarketInsightsViewWithNavigation({
+        initialParams: ETH_MAINNET_ROUTE_PARAMS,
+      });
+
+      await screen.findByTestId(MarketInsightsSelectorsIDs.VIEW_CONTAINER);
+
+      const thumbsUp = await screen.findByTestId(
+        MarketInsightsSelectorsIDs.THUMBS_UP_BUTTON,
+      );
+      trackEventSpy.mockClear();
+      fireEvent.press(thumbsUp);
+
+      await waitFor(() => {
+        expect(trackEventSpy).toHaveBeenCalledWith(
+          expect.objectContaining({
+            name: 'Market Insights Interaction',
+            properties: expect.objectContaining({
+              interaction_type: 'thumbs_up',
+            }),
+          }),
+        );
+      });
+    } finally {
+      trackEventSpy.mockRestore();
+    }
+  });
+});
diff --git a/app/components/UI/MarketInsights/components/ArticleRow.test.tsx b/app/components/UI/MarketInsights/components/ArticleRow.test.tsx
new file mode 100644
index 00000000000..421eccd0511
--- /dev/null
+++ b/app/components/UI/MarketInsights/components/ArticleRow.test.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import { screen, fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../util/test/renderWithProvider';
+import ArticleRow from './ArticleRow';
+import type { Article } from '@metamask/ai-controllers';
+
+const mockArticle: Article = {
+  title: 'Bitcoin ETF inflows hit record high',
+  url: 'https://coindesk.com/news/btc-etf-inflows',
+  source: 'CoinDesk',
+  date: '2026-03-15T10:00:00.000Z',
+};
+
+const mockArticleNoDate: Article = {
+  title: 'Ethereum upgrade expected next quarter',
+  url: 'https://theblock.co/news/eth-upgrade',
+  source: 'The Block',
+  date: '',
+};
+
+describe('ArticleRow', () => {
+  it('renders the article title', () => {
+    renderWithProvider(
+      <ArticleRow article={mockArticle} onPress={jest.fn()} />,
+    );
+    expect(screen.getByText(mockArticle.title)).toBeOnTheScreen();
+  });
+
+  it('renders the article source', () => {
+    renderWithProvider(
+      <ArticleRow article={mockArticle} onPress={jest.fn()} />,
+    );
+    expect(screen.getByText(mockArticle.source)).toBeOnTheScreen();
+  });
+
+  it('renders relative date when article has a date', () => {
+    renderWithProvider(
+      <ArticleRow article={mockArticle} onPress={jest.fn()} />,
+    );
+    // A separator dot is shown between source and date
+    expect(screen.getByText('•')).toBeOnTheScreen();
+  });
+
+  it('does not render date separator when article has no date', () => {
+    renderWithProvider(
+      <ArticleRow article={mockArticleNoDate} onPress={jest.fn()} />,
+    );
+    expect(screen.queryByText('•')).toBeNull();
+  });
+
+  it('calls onPress with the article URL when tapped', () => {
+    const onPress = jest.fn();
+    renderWithProvider(<ArticleRow article={mockArticle} onPress={onPress} />);
+    fireEvent.press(screen.getByText(mockArticle.title));
+    expect(onPress).toHaveBeenCalledTimes(1);
+    expect(onPress).toHaveBeenCalledWith(mockArticle.url);
+  });
+
+  it('renders a bottom border when isLastItem is false', () => {
+    const { toJSON } = renderWithProvider(
+      <ArticleRow
+        article={mockArticle}
+        onPress={jest.fn()}
+        isLastItem={false}
+      />,
+    );
+    // Tailwind compiles 'border-b border-muted' to resolved style props at render time.
+    const json = JSON.stringify(toJSON());
+    expect(json).toContain('"borderBottomWidth":1');
+  });
+
+  it('does not render a bottom border when isLastItem is true', () => {
+    const { toJSON } = renderWithProvider(
+      <ArticleRow article={mockArticle} onPress={jest.fn()} isLastItem />,
+    );
+    const json = JSON.stringify(toJSON());
+    expect(json).not.toContain('"borderBottomWidth":1');
+  });
+});
diff --git a/app/components/UI/MarketInsights/components/ArticleRow.tsx b/app/components/UI/MarketInsights/components/ArticleRow.tsx
new file mode 100644
index 00000000000..b498d869d5f
--- /dev/null
+++ b/app/components/UI/MarketInsights/components/ArticleRow.tsx
@@ -0,0 +1,126 @@
+import React, { useCallback } from 'react';
+import { Image, Pressable } from 'react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import type { Article } from '@metamask/ai-controllers';
+import {
+  formatRelativeTime,
+  getFaviconUrl,
+} from '../utils/marketInsightsFormatting';
+
+interface ArticleRowProps {
+  article: Article;
+  onPress: (url: string) => void;
+  isLastItem?: boolean;
+}
+
+/**
+ * A single article row used in sources bottom sheets (What's Happening and
+ * Market Insights). Displays the article title, favicon, source domain,
+ * relative date, and an export icon. Tapping the row calls onPress with the
+ * article URL.
+ */
+const ArticleRow: React.FC<ArticleRowProps> = ({
+  article,
+  onPress,
+  isLastItem,
+}) => {
+  const tw = useTailwind();
+
+  const handlePress = useCallback(() => {
+    onPress(article.url);
+  }, [onPress, article.url]);
+
+  return (
+    <Pressable
+      onPress={handlePress}
+      accessibilityRole="link"
+      style={({ pressed }) =>
+        tw.style(
+          'flex-row items-start py-3',
+          !isLastItem && 'border-b border-muted',
+          pressed && 'opacity-70',
+        )
+      }
+    >
+      <Box twClassName="flex-1">
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Start}
+          twClassName="pr-1"
+        >
+          <Text
+            variant={TextVariant.BodyMd}
+            color={TextColor.TextDefault}
+            twClassName="flex-1 pr-2"
+          >
+            {article.title}
+          </Text>
+          <Box paddingTop={1}>
+            <Icon
+              name={IconName.Export}
+              size={IconSize.Sm}
+              color={IconColor.IconAlternative}
+            />
+          </Box>
+        </Box>
+
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          twClassName="pt-3"
+        >
+          <Box twClassName="w-4 h-4 rounded-full overflow-hidden mr-2">
+            <Image
+              source={{ uri: getFaviconUrl(article.url || article.source) }}
+              style={tw.style('w-4 h-4 rounded-full')}
+            />
+          </Box>
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            gap={1}
+          >
+            <Text
+              variant={TextVariant.BodySm}
+              fontWeight={FontWeight.Medium}
+              color={TextColor.TextAlternative}
+            >
+              {article.source}
+            </Text>
+            {article.date ? (
+              <>
+                <Text
+                  variant={TextVariant.BodySm}
+                  color={TextColor.TextAlternative}
+                >
+                  {'•'}
+                </Text>
+                <Text
+                  variant={TextVariant.BodySm}
+                  color={TextColor.TextAlternative}
+                >
+                  {formatRelativeTime(article.date, { nowLabel: 'now' })}
+                </Text>
+              </>
+            ) : null}
+          </Box>
+        </Box>
+      </Box>
+    </Pressable>
+  );
+};
+
+export default ArticleRow;
diff --git a/app/components/UI/MarketInsights/components/MarketInsightsTrendSourcesBottomSheet.tsx b/app/components/UI/MarketInsights/components/MarketInsightsTrendSourcesBottomSheet.tsx
index 67563d194a5..8da2fee0194 100644
--- a/app/components/UI/MarketInsights/components/MarketInsightsTrendSourcesBottomSheet.tsx
+++ b/app/components/UI/MarketInsights/components/MarketInsightsTrendSourcesBottomSheet.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useRef } from 'react';
-import { Image, Pressable, ScrollView } from 'react-native';
+import { Pressable, ScrollView } from 'react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import {
   Box,
@@ -25,9 +25,9 @@ import BottomSheetHeader from '../../../../component-library/components/BottomSh
 import { strings } from '../../../../../locales/i18n';
 import {
   formatRelativeTime,
-  getFaviconUrl,
   getNormalizedHandle,
 } from '../utils/marketInsightsFormatting';
+import ArticleRow from './ArticleRow';
 
 interface MarketInsightsTrendSourcesBottomSheetProps {
   isVisible: boolean;
@@ -79,85 +79,12 @@ const MarketInsightsTrendSourcesBottomSheet: React.FC<
           const isLastItem =
             index === articles.length - 1 && tweets.length === 0;
           return (
-            <Pressable
+            <ArticleRow
               key={article.url}
-              onPress={() => handleSourcePress(article.url)}
-              style={({ pressed }) =>
-                tw.style(
-                  'flex-row items-start py-3',
-                  !isLastItem && 'border-b border-muted',
-                  pressed && 'opacity-70',
-                )
-              }
-            >
-              <Box twClassName="flex-1">
-                <Box
-                  flexDirection={BoxFlexDirection.Row}
-                  alignItems={BoxAlignItems.Start}
-                  twClassName="pr-1"
-                >
-                  <Text
-                    variant={TextVariant.BodyMd}
-                    color={TextColor.TextDefault}
-                    twClassName="flex-1 pr-2"
-                  >
-                    {article.title}
-                  </Text>
-                  <Box paddingTop={1}>
-                    <Icon
-                      name={IconName.Export}
-                      size={IconSize.Sm}
-                      color={IconColor.IconAlternative}
-                    />
-                  </Box>
-                </Box>
-                <Box
-                  flexDirection={BoxFlexDirection.Row}
-                  alignItems={BoxAlignItems.Center}
-                  twClassName="pt-3"
-                >
-                  <Box twClassName="w-4 h-4 rounded-full overflow-hidden mr-2">
-                    <Image
-                      source={{
-                        uri: getFaviconUrl(article.url || article.source),
-                      }}
-                      style={tw.style('w-4 h-4 rounded-full')}
-                    />
-                  </Box>
-                  <Box
-                    flexDirection={BoxFlexDirection.Row}
-                    alignItems={BoxAlignItems.Center}
-                    gap={1}
-                  >
-                    <Text
-                      variant={TextVariant.BodySm}
-                      fontWeight={FontWeight.Medium}
-                      color={TextColor.TextAlternative}
-                    >
-                      {article.source}
-                    </Text>
-                    {article.date ? (
-                      <>
-                        <Text
-                          variant={TextVariant.BodySm}
-                          color={TextColor.TextAlternative}
-                        >
-                          {'•'}
-                        </Text>
-                        <Text
-                          variant={TextVariant.BodySm}
-                          color={TextColor.TextAlternative}
-                        >
-                          {formatRelativeTime(article.date, {
-                            nowLabel: 'now',
-                          })}
-                        </Text>
-                      </>
-                    ) : null}
-                  </Box>
-                </Box>
-              </Box>
-            </Pressable>
+              article={article}
+              onPress={handleSourcePress}
+              isLastItem={isLastItem}
+            />
           );
         })}
 
diff --git a/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.styles.ts b/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.styles.ts
index e7239008a51..50163fcfc2a 100644
--- a/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.styles.ts
+++ b/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.styles.ts
@@ -8,7 +8,7 @@ const styleSheet = (params: { theme: Theme }) =>
       backgroundColor: params.theme.colors.background.default,
     },
     scrollContent: {
-      paddingBottom: 0,
+      paddingBottom: 40,
     },
   });
 
diff --git a/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.test.tsx b/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.test.tsx
index b31a97a175c..b2e7100d337 100644
--- a/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.test.tsx
+++ b/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { fireEvent } from '@testing-library/react-native';
+import { Linking } from 'react-native';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import MoneyHomeView from './MoneyHomeView';
 import { MoneyHomeViewTestIds } from './MoneyHomeView.testIds';
@@ -16,15 +17,23 @@ import { MoneyFooterTestIds } from '../../components/MoneyFooter/MoneyFooter.tes
 import { MoneyActivityListTestIds } from '../../components/MoneyActivityList/MoneyActivityList.testIds';
 import { MoneyCondensedInfoCardsTestIds } from '../../components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.testIds';
 import { MoneyMusdTokenRowTestIds } from '../../components/MoneyMusdTokenRow/MoneyMusdTokenRow.testIds';
+import { MoneySectionHeaderTestIds } from '../../components/MoneySectionHeader/MoneySectionHeader.testIds';
 import Routes from '../../../../../constants/navigation/Routes';
 import { useMoneyAccountTransactions } from '../../hooks/useMoneyAccountTransactions';
 import { strings } from '../../../../../../locales/i18n';
 import MOCK_MONEY_TRANSACTIONS from '../../constants/mockActivityData';
 import useMoneyAccountBalance from '../../hooks/useMoneyAccountBalance';
 import { selectIsCardholder } from '../../../../../selectors/cardController';
+import { getDetectedGeolocation } from '../../../../../reducers/fiatOrders';
+import { moneyFormatFiat } from '../../utils/moneyFormatFiat';
+import { useMusdConversion } from '../../../Earn/hooks/useMusdConversion';
 
 const mockGoBack = jest.fn();
 const mockNavigate = jest.fn();
+const mockInitiateCustomConversion = jest.fn();
+const mockMoneyFormatFiat = moneyFormatFiat as jest.MockedFunction<
+  typeof moneyFormatFiat
+>;
 
 jest.mock('@react-navigation/native', () => {
   const actualReactNavigation = jest.requireActual('@react-navigation/native');
@@ -65,17 +74,42 @@ jest.mock('../../hooks/useMoneyAccountBalance', () => ({
   default: jest.fn(),
 }));
 
+jest.mock('../../../Earn/hooks/useMusdConversion', () => ({
+  useMusdConversion: jest.fn(),
+}));
+
+jest.mock('../../../../../core/NavigationService', () => ({
+  __esModule: true,
+  default: {
+    navigation: {
+      navigate: jest.fn(),
+    },
+  },
+}));
+
+jest.mock('../../utils/moneyFormatFiat', () => ({
+  moneyFormatFiat: jest.fn(() => '$0.12'),
+}));
+
 jest.mock('../../../../../selectors/cardController', () => ({
   ...jest.requireActual('../../../../../selectors/cardController'),
   selectIsCardholder: jest.fn(),
 }));
 
+jest.mock('../../../../../reducers/fiatOrders', () => ({
+  ...jest.requireActual('../../../../../reducers/fiatOrders'),
+  getDetectedGeolocation: jest.fn(),
+}));
+
 const mockSelectIsCardholder = jest.mocked(selectIsCardholder);
+const mockGetDetectedGeolocation = jest.mocked(getDetectedGeolocation);
 
 const mockUseMoneyAccountTransactions = jest.mocked(
   useMoneyAccountTransactions,
 );
 
+const mockUseMusdConversion = jest.mocked(useMusdConversion);
+
 const mockUseMoneyAccountBalance = jest.mocked(useMoneyAccountBalance);
 
 jest.mock(
@@ -97,13 +131,22 @@ jest.mock('../../../../../component-library/components/Badges/Badge', () => ({
 }));
 
 jest.mock('../../components/MoneyActivityItem/MoneyActivityItem', () => {
-  const { View, Text } = jest.requireActual('react-native');
+  const { TouchableOpacity, Text } = jest.requireActual('react-native');
   return {
     __esModule: true,
-    default: ({ tx }: { tx: { id: string } }) => (
-      <View testID={`money-activity-item-${tx.id}`}>
+    default: ({
+      tx,
+      onPress,
+    }: {
+      tx: { id: string };
+      onPress?: () => void;
+    }) => (
+      <TouchableOpacity
+        testID={`money-activity-item-${tx.id}`}
+        onPress={onPress}
+      >
         <Text>{tx.id}</Text>
-      </View>
+      </TouchableOpacity>
     ),
   };
 });
@@ -112,13 +155,23 @@ jest.mock('@react-native-masked-view/masked-view', () => 'MaskedView');
 jest.mock('../../../../UI/AssetOverview/Balance/Balance', () => ({
   NetworkBadgeSource: jest.fn(() => null),
 }));
+jest.mock('../../../../../util/Logger', () => ({
+  __esModule: true,
+  default: { error: jest.fn() },
+}));
 
 describe('MoneyHomeView', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     global.alert = jest.fn();
 
+    mockInitiateCustomConversion.mockResolvedValue(undefined);
+    mockUseMusdConversion.mockReturnValue({
+      initiateCustomConversion: mockInitiateCustomConversion,
+    } as unknown as ReturnType<typeof useMusdConversion>);
+
     mockSelectIsCardholder.mockReturnValue(false);
+    mockGetDetectedGeolocation.mockReturnValue('US');
 
     mockUseMoneyAccountBalance.mockReturnValue({
       totalFiatFormatted: '$3.00',
@@ -127,8 +180,11 @@ describe('MoneyHomeView', () => {
       totalFiatRaw: '3',
       tokenTotal: undefined,
       isAggregatedBalanceLoading: false,
+      apyDecimal: 0.05,
+      apyPercent: 5,
+      apyPercentFormatted: '5%',
       vaultApyQuery: {
-        data: { apy: 5.5, timestamp: '2026-01-01T00:00:00Z' },
+        data: { apy: 0.05, timestamp: '2026-01-01T00:00:00Z' },
         isLoading: false,
       },
       musdBalanceQuery: {
@@ -238,14 +294,6 @@ describe('MoneyHomeView', () => {
     expect(getByTestId(MoneyFooterTestIds.CONTAINER)).toBeOnTheScreen();
   });
 
-  it('pressing the back button calls navigation.goBack', () => {
-    const { getByTestId } = renderWithProvider(<MoneyHomeView />);
-
-    fireEvent.press(getByTestId(MoneyHeaderTestIds.BACK_BUTTON));
-
-    expect(mockGoBack).toHaveBeenCalledTimes(1);
-  });
-
   it('navigates to the Money activity screen when View all is pressed', () => {
     const { getByTestId } = renderWithProvider(<MoneyHomeView />);
 
@@ -267,6 +315,138 @@ describe('MoneyHomeView', () => {
     });
   });
 
+  it('opens the More sheet when menu button is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+    fireEvent.press(getByTestId(MoneyHeaderTestIds.MENU_BUTTON));
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.MODALS.ROOT, {
+      screen: Routes.MONEY.MODALS.MORE_SHEET,
+    });
+  });
+
+  it('opens the Transfer sheet when Transfer button is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+    fireEvent.press(getByTestId(MoneyActionButtonRowTestIds.TRANSFER_BUTTON));
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.MODALS.ROOT, {
+      screen: Routes.MONEY.MODALS.TRANSFER_MONEY_SHEET,
+    });
+  });
+
+  it('navigates to Card root when Card button is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+    fireEvent.press(getByTestId(MoneyActionButtonRowTestIds.CARD_BUTTON));
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.CARD.ROOT);
+  });
+
+  it('opens the APY info sheet when the APY info button is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+    fireEvent.press(getByTestId(MoneyBalanceSummaryTestIds.APY_INFO_BUTTON));
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.MODALS.ROOT, {
+      screen: Routes.MONEY.MODALS.APY_INFO_SHEET,
+      params: { apy: 5 },
+    });
+  });
+
+  it('opens the earnings info sheet when the earnings info button is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+    fireEvent.press(getByTestId(MoneySectionHeaderTestIds.INFO_BUTTON));
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.MODALS.ROOT, {
+      screen: Routes.MONEY.MODALS.EARNINGS_INFO_SHEET,
+    });
+  });
+
+  it('navigates to Card root when Get now row is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+    fireEvent.press(getByTestId(MoneyMetaMaskCardTestIds.VIRTUAL_CARD_ROW));
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.CARD.ROOT);
+  });
+
+  it('navigates to potential earnings screen when View potential earnings is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+    fireEvent.press(getByTestId(MoneyPotentialEarningsTestIds.VIEW_ALL_BUTTON));
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.POTENTIAL_EARNINGS);
+  });
+
+  it('opens the MUSD learn more URL when learn more is pressed in empty state', () => {
+    const mockOpenURL = jest
+      .spyOn(Linking, 'openURL')
+      .mockResolvedValue(undefined);
+
+    mockUseMoneyAccountTransactions.mockReturnValue({
+      allTransactions: [],
+      deposits: [],
+      transfers: [],
+      submittedTransactions: [],
+      moneyAddress: '0x0000000000000000000000000000000000000001',
+    });
+
+    const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+    fireEvent.press(getByTestId(MoneyWhatYouGetTestIds.LEARN_MORE_BUTTON));
+
+    expect(mockOpenURL).toHaveBeenCalledTimes(1);
+    mockOpenURL.mockRestore();
+  });
+
+  describe('monthly and yearly earnings', () => {
+    it('passes the formatted monthly earnings to MoneyEarnings', () => {
+      mockMoneyFormatFiat.mockReturnValue('$0.12');
+
+      const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+      expect(getByTestId(MoneyEarningsTestIds.MONTHLY_VALUE)).toHaveTextContent(
+        '$0.12',
+      );
+    });
+
+    it('passes the formatted yearly earnings to MoneyEarnings', () => {
+      mockMoneyFormatFiat.mockReturnValue('$0.12');
+
+      const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+      expect(getByTestId(MoneyEarningsTestIds.YEARLY_VALUE)).toHaveTextContent(
+        '$0.12',
+      );
+    });
+
+    it('displays the zero-formatted value for monthly earnings when totalFiatRaw is absent', () => {
+      mockMoneyFormatFiat.mockReturnValue('$0.00');
+      mockUseMoneyAccountBalance.mockReturnValue({
+        totalFiatFormatted: undefined,
+        musdFiatFormatted: undefined,
+        musdSHFvdFiatFormatted: undefined,
+        totalFiatRaw: undefined,
+        tokenTotal: undefined,
+        isAggregatedBalanceLoading: false,
+        apyDecimal: 0.05,
+        apyPercent: 5,
+        apyPercentFormatted: '5%',
+        vaultApyQuery: { data: { apy: 0.05 }, isLoading: false },
+        musdBalanceQuery: { data: undefined, isLoading: false },
+        musdEquivalentBalanceQuery: { data: undefined, isLoading: false },
+      } as ReturnType<typeof useMoneyAccountBalance>);
+
+      const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+      expect(getByTestId(MoneyEarningsTestIds.MONTHLY_VALUE)).toHaveTextContent(
+        '$0.00',
+      );
+    });
+  });
+
   describe('milestone state (1-9 transactions)', () => {
     beforeEach(() => {
       mockUseMoneyAccountTransactions.mockReturnValue({
@@ -319,11 +499,12 @@ describe('MoneyHomeView', () => {
       expect(getByTestId(MoneyMetaMaskCardTestIds.CONTAINER)).toBeOnTheScreen();
     });
 
-    it('fires handleCardPress when onboarding CTA is tapped', () => {
+    it('navigates to Card root when onboarding CTA is tapped', () => {
       const { getByTestId } = renderWithProvider(<MoneyHomeView />);
-      expect(() => {
-        fireEvent.press(getByTestId(MoneyOnboardingCardTestIds.CTA_BUTTON));
-      }).not.toThrow();
+
+      fireEvent.press(getByTestId(MoneyOnboardingCardTestIds.CTA_BUTTON));
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.CARD.ROOT);
     });
   });
 
@@ -421,11 +602,14 @@ describe('MoneyHomeView', () => {
       expect(getByTestId(MoneyFooterTestIds.CONTAINER)).toBeOnTheScreen();
     });
 
-    it('fires handleLinkCardPress when onboarding CTA is tapped', () => {
+    it('navigates to Card home when onboarding CTA is tapped by cardholder', () => {
       const { getByTestId } = renderWithProvider(<MoneyHomeView />);
-      expect(() => {
-        fireEvent.press(getByTestId(MoneyOnboardingCardTestIds.CTA_BUTTON));
-      }).not.toThrow();
+
+      fireEvent.press(getByTestId(MoneyOnboardingCardTestIds.CTA_BUTTON));
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.CARD.ROOT, {
+        screen: Routes.CARD.HOME,
+      });
     });
   });
 
@@ -483,5 +667,184 @@ describe('MoneyHomeView', () => {
         screen: Routes.MONEY.MODALS.ADD_MONEY_SHEET,
       });
     });
+
+    it('navigates to Asset details when the mUSD token row is pressed', () => {
+      const NavigationService = jest.requireMock(
+        '../../../../../core/NavigationService',
+      ).default;
+
+      const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+      fireEvent.press(getByTestId(MoneyMusdTokenRowTestIds.CONTAINER));
+
+      expect(NavigationService.navigation.navigate).toHaveBeenCalledWith(
+        'Asset',
+        expect.objectContaining({ source: expect.any(String) }),
+      );
+    });
+
+    it('navigates to HowItWorks when its section header is pressed', () => {
+      const { getByText } = renderWithProvider(<MoneyHomeView />);
+
+      fireEvent.press(getByText(strings('money.how_it_works.title')));
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.HOW_IT_WORKS);
+    });
+
+    it('opens the Learn more URL when Learn more is pressed', () => {
+      const { Linking } = jest.requireMock('react-native');
+      const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+      fireEvent.press(getByTestId(MoneyWhatYouGetTestIds.LEARN_MORE_BUTTON));
+
+      expect(Linking.openURL).toHaveBeenCalledWith(
+        expect.stringContaining('http'),
+      );
+    });
+  });
+
+  describe('filled state navigation handlers', () => {
+    it('navigates to Potential Earnings when View all is pressed on potential earnings section', () => {
+      const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+      fireEvent.press(
+        getByTestId(MoneyPotentialEarningsTestIds.VIEW_ALL_BUTTON),
+      );
+
+      expect(mockNavigate).toHaveBeenCalledWith(
+        Routes.MONEY.POTENTIAL_EARNINGS,
+      );
+    });
+
+    it('initiates a custom conversion when a token Convert button is pressed', async () => {
+      const { getByText } = renderWithProvider(<MoneyHomeView />);
+
+      fireEvent.press(getByText(strings('money.potential_earnings.convert')));
+
+      expect(mockInitiateCustomConversion).toHaveBeenCalledWith(
+        expect.objectContaining({
+          preferredPaymentToken: expect.objectContaining({
+            address: mockConversionTokens[0].address,
+          }),
+          navigationStack: Routes.MONEY.ROOT,
+        }),
+      );
+    });
+
+    it('logs an error when initiateCustomConversion rejects', async () => {
+      mockInitiateCustomConversion.mockRejectedValueOnce(
+        new Error('network failure'),
+      );
+      const Logger = jest.requireMock('../../../../../util/Logger');
+
+      const { getByText } = renderWithProvider(<MoneyHomeView />);
+
+      fireEvent.press(getByText(strings('money.potential_earnings.convert')));
+
+      await Promise.resolve();
+
+      expect(Logger.default.error).toHaveBeenCalledWith(
+        expect.any(Error),
+        expect.objectContaining({
+          message: expect.stringContaining('MoneyHomeView'),
+        }),
+      );
+    });
+
+    it('triggers the under-construction alert when an activity item is pressed', () => {
+      const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+      fireEvent.press(getByTestId('money-activity-item-padded-0'));
+
+      expect(global.alert).toHaveBeenCalled();
+    });
+  });
+
+  describe('card upsell mode — Get Now handler', () => {
+    it('navigates to Card root when the Get Now card row is pressed', () => {
+      const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+      fireEvent.press(getByTestId(MoneyMetaMaskCardTestIds.VIRTUAL_CARD_ROW));
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.CARD.ROOT);
+    });
+  });
+
+  describe('Metal card geolocation gating', () => {
+    it('renders the Metal card row when geolocation is US', () => {
+      mockGetDetectedGeolocation.mockReturnValue('US');
+
+      const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+      expect(
+        getByTestId(MoneyMetaMaskCardTestIds.METAL_CARD_ROW),
+      ).toBeOnTheScreen();
+      expect(
+        getByTestId(MoneyMetaMaskCardTestIds.VIRTUAL_CARD_ROW),
+      ).toBeOnTheScreen();
+    });
+
+    it('renders the Metal card row when geolocation is a US sub-region (e.g. US-CA)', () => {
+      mockGetDetectedGeolocation.mockReturnValue('us-ca');
+
+      const { getByTestId } = renderWithProvider(<MoneyHomeView />);
+
+      expect(
+        getByTestId(MoneyMetaMaskCardTestIds.METAL_CARD_ROW),
+      ).toBeOnTheScreen();
+    });
+
+    it('hides the Metal card row when geolocation is GB', () => {
+      mockGetDetectedGeolocation.mockReturnValue('GB');
+
+      const { queryByTestId, getByTestId } = renderWithProvider(
+        <MoneyHomeView />,
+      );
+
+      expect(
+        queryByTestId(MoneyMetaMaskCardTestIds.METAL_CARD_ROW),
+      ).not.toBeOnTheScreen();
+      expect(
+        getByTestId(MoneyMetaMaskCardTestIds.VIRTUAL_CARD_ROW),
+      ).toBeOnTheScreen();
+    });
+
+    it('hides the Metal card row when geolocation is undefined (loading/unknown - fail closed)', () => {
+      mockGetDetectedGeolocation.mockReturnValue(undefined);
+
+      const { queryByTestId, getByTestId } = renderWithProvider(
+        <MoneyHomeView />,
+      );
+
+      expect(
+        queryByTestId(MoneyMetaMaskCardTestIds.METAL_CARD_ROW),
+      ).not.toBeOnTheScreen();
+      expect(
+        getByTestId(MoneyMetaMaskCardTestIds.VIRTUAL_CARD_ROW),
+      ).toBeOnTheScreen();
+    });
+  });
+
+  describe('Get now navigation', () => {
+    it('navigates to the card sign-up flow when the virtual card Get now button is pressed', () => {
+      mockGetDetectedGeolocation.mockReturnValue('GB');
+
+      const { getByText } = renderWithProvider(<MoneyHomeView />);
+
+      fireEvent.press(getByText(strings('money.metamask_card.get_now')));
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.CARD.ROOT);
+    });
+
+    it('navigates to the card sign-up flow when the metal card Get now button is pressed', () => {
+      mockGetDetectedGeolocation.mockReturnValue('US');
+
+      const { getAllByText } = renderWithProvider(<MoneyHomeView />);
+      const buttons = getAllByText(strings('money.metamask_card.get_now'));
+
+      fireEvent.press(buttons[1]);
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.CARD.ROOT);
+    });
   });
 });
diff --git a/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.tsx b/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.tsx
index 98bcb6e8393..8a72ab505d5 100644
--- a/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.tsx
+++ b/app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.tsx
@@ -1,9 +1,9 @@
-import React, { useCallback } from 'react';
-import { useMoneyAccountDeposit } from '../../hooks/useMoneyAccount';
-import { ScrollView, Linking } from 'react-native';
+import React, { useCallback, useMemo } from 'react';
+import { Linking, ScrollView } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useNavigation } from '@react-navigation/native';
 import { useSelector } from 'react-redux';
+import BigNumber from 'bignumber.js';
 import { Box } from '@metamask/design-system-react-native';
 import { useStyles } from '../../../../hooks/useStyles';
 import MoneyHeader from '../../components/MoneyHeader';
@@ -24,14 +24,22 @@ import Routes from '../../../../../constants/navigation/Routes';
 import { MoneyHomeViewTestIds } from './MoneyHomeView.testIds';
 import styleSheet from './MoneyHomeView.styles';
 import { useMusdConversionTokens } from '../../../Earn/hooks/useMusdConversionTokens';
+import { useMusdConversion } from '../../../Earn/hooks/useMusdConversion';
 import { useMoneyAccountTransactions } from '../../hooks/useMoneyAccountTransactions';
 import { showMoneyActivityUnderConstructionAlert } from '../../constants/showMoneyActivityUnderConstructionAlert';
 import useMoneyAccountBalance from '../../hooks/useMoneyAccountBalance';
+import { selectCurrentCurrency } from '../../../../../selectors/currencyRateController';
+import { moneyFormatFiat } from '../../utils/moneyFormatFiat';
+import { calculateProjectedEarnings } from '../../utils/projections';
 import { MUSD_MAINNET_ASSET_FOR_DETAILS } from '../../../../Views/Homepage/Sections/Cash/CashGetMusdEmptyState.constants';
 import { TokenDetailsSource } from '../../../TokenDetails/constants/constants';
 import AppConstants from '../../../../../core/AppConstants';
 import NavigationService from '../../../../../core/NavigationService';
 import { selectIsCardholder } from '../../../../../selectors/cardController';
+import { getDetectedGeolocation } from '../../../../../reducers/fiatOrders';
+import Logger from '../../../../../util/Logger';
+import { AssetType } from '../../../../Views/confirmations/types/token';
+import { Hex } from '@metamask/utils';
 
 const Divider = () => <Box twClassName="h-px bg-border-muted my-5" />;
 
@@ -48,56 +56,144 @@ const getMoneyHomeState = (transactionCount: number): MoneyHomeState => {
 const displayUnderConstructionAlert = () => alert('Under construction 🚧');
 
 const MoneyHomeView = () => {
-  // TODO: wire to initiateDeposit(amount) once the amount entry UI is ready
-  // const { initiateDeposit } = useMoneyAccountDeposit();
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
   const { styles } = useStyles(styleSheet, {});
+  const currentCurrency = useSelector(selectCurrentCurrency);
 
-  const { totalFiatFormatted, vaultApyQuery, isAggregatedBalanceLoading } =
-    useMoneyAccountBalance();
+  const {
+    totalFiatFormatted,
+    totalFiatRaw,
+    vaultApyQuery,
+    isAggregatedBalanceLoading,
+    apyPercent,
+  } = useMoneyAccountBalance();
 
   const { tokens: conversionTokens } = useMusdConversionTokens();
+  const { initiateCustomConversion } = useMusdConversion();
   const { allTransactions, moneyAddress } = useMoneyAccountTransactions();
 
   const isCardholder = useSelector(selectIsCardholder);
+  const geolocation = useSelector(getDetectedGeolocation);
+  const isUS = geolocation?.toUpperCase().split('-')[0] === 'US';
 
   const homeState = getMoneyHomeState(allTransactions.length);
   const isMilestone = homeState === 'milestone' || homeState === 'filled';
-  const isCardUnlinked = isMilestone && isCardholder;
+  const isCardholderWithMilestone = isMilestone && isCardholder;
 
-  const handleBackPress = useCallback(() => {
-    navigation.goBack();
-  }, [navigation]);
+  const formattedZero = useMemo(
+    () => moneyFormatFiat(new BigNumber(0), currentCurrency),
+    [currentCurrency],
+  );
+
+  const monthlyEarnings = useMemo(() => {
+    if (!totalFiatRaw || !apyPercent) return formattedZero;
+    const balance = new BigNumber(totalFiatRaw);
+    if (balance.isZero() || balance.isNaN()) return formattedZero;
+    const earnings = calculateProjectedEarnings(
+      balance.toNumber(),
+      apyPercent,
+      1 / 12,
+    );
+    if (!Number.isFinite(earnings)) return formattedZero;
+    return moneyFormatFiat(new BigNumber(earnings), currentCurrency);
+  }, [totalFiatRaw, apyPercent, currentCurrency, formattedZero]);
 
-  // // eslint-disable-next-line no-alert
-  const handleMenuPress = displayUnderConstructionAlert;
+  const yearlyEarnings = useMemo(() => {
+    if (!totalFiatRaw || !apyPercent) return formattedZero;
+    const balance = new BigNumber(totalFiatRaw);
+    if (balance.isZero() || balance.isNaN()) return formattedZero;
+    const earnings = calculateProjectedEarnings(
+      balance.toNumber(),
+      apyPercent,
+      1,
+    );
+    if (!Number.isFinite(earnings)) return formattedZero;
+    return moneyFormatFiat(new BigNumber(earnings), currentCurrency);
+  }, [totalFiatRaw, apyPercent, currentCurrency, formattedZero]);
+
+  const handleMenuPress = useCallback(() => {
+    navigation.navigate(Routes.MONEY.MODALS.ROOT, {
+      screen: Routes.MONEY.MODALS.MORE_SHEET,
+    });
+  }, [navigation]);
 
   const handleAddPress = useCallback(() => {
     navigation.navigate(Routes.MONEY.MODALS.ROOT, {
       screen: Routes.MONEY.MODALS.ADD_MONEY_SHEET,
     });
   }, [navigation]);
-  const handleTransferPress = displayUnderConstructionAlert;
-  const handleCardPress = displayUnderConstructionAlert;
-  const handleApyInfoPress = displayUnderConstructionAlert;
-  const handleProjectedEarningsPress = displayUnderConstructionAlert;
-  const handleGetNowPress = displayUnderConstructionAlert;
-  const handleLinkCardPress = displayUnderConstructionAlert;
+
+  const handleTransferPress = useCallback(() => {
+    navigation.navigate(Routes.MONEY.MODALS.ROOT, {
+      screen: Routes.MONEY.MODALS.TRANSFER_MONEY_SHEET,
+    });
+  }, [navigation]);
+
+  const handleCardPress = useCallback(() => {
+    navigation.navigate(Routes.CARD.ROOT);
+  }, [navigation]);
+
+  const handleLinkCardPress = useCallback(() => {
+    navigation.navigate(Routes.CARD.ROOT, {
+      screen: Routes.CARD.HOME,
+    });
+  }, [navigation]);
+
+  const handleGetNowPress = useCallback(() => {
+    navigation.navigate(Routes.CARD.ROOT);
+  }, [navigation]);
+
+  const handleApyInfoPress = useCallback(() => {
+    navigation.navigate(Routes.MONEY.MODALS.ROOT, {
+      screen: Routes.MONEY.MODALS.APY_INFO_SHEET,
+      params: { apy: apyPercent },
+    });
+  }, [navigation, apyPercent]);
+
+  const handleEarningsInfoPress = useCallback(() => {
+    navigation.navigate(Routes.MONEY.MODALS.ROOT, {
+      screen: Routes.MONEY.MODALS.EARNINGS_INFO_SHEET,
+    });
+  }, [navigation]);
+
   const handleMusdRowPress = useCallback(() => {
     NavigationService.navigation.navigate('Asset', {
       ...MUSD_MAINNET_ASSET_FOR_DETAILS,
       source: TokenDetailsSource.MobileTokenListPage,
     });
   }, []);
+
   const handleHeaderPress = displayUnderConstructionAlert;
 
-  const handleTokenConvertPress = displayUnderConstructionAlert;
+  const handleTokenConvertPress = useCallback(
+    async (token: AssetType) => {
+      try {
+        await initiateCustomConversion({
+          preferredPaymentToken: {
+            address: token.address as Hex,
+            chainId: token.chainId as Hex,
+          },
+          navigationStack: Routes.MONEY.ROOT,
+        });
+      } catch (error) {
+        Logger.error(error as Error, {
+          message:
+            '[MoneyHomeView] Failed to initiate conversion from potential earnings',
+        });
+      }
+    },
+    [initiateCustomConversion],
+  );
+
+  const handleEarnCryptoPress = useCallback(() => {
+    navigation.navigate(Routes.MONEY.POTENTIAL_EARNINGS as never);
+  }, [navigation]);
 
-  const handleEarnCryptoPress = displayUnderConstructionAlert;
   const handleLearnMorePress = useCallback(() => {
     Linking.openURL(AppConstants.URLS.MUSD_LEARN_MORE);
   }, []);
+
   const handleHowItWorksHeaderPress = useCallback(() => {
     navigation.navigate(Routes.MONEY.HOW_IT_WORKS as never);
   }, [navigation]);
@@ -112,7 +208,7 @@ const MoneyHomeView = () => {
   }, []);
 
   const handleOnboardingCtaPress = useCallback(() => {
-    if (isCardUnlinked) {
+    if (isCardholderWithMilestone) {
       handleLinkCardPress();
       return;
     }
@@ -124,34 +220,27 @@ const MoneyHomeView = () => {
 
     handleAddPress();
   }, [
-    isCardUnlinked,
+    isCardholderWithMilestone,
     isMilestone,
     handleLinkCardPress,
     handleCardPress,
     handleAddPress,
   ]);
 
-  // TODO: Remove before launch
-  // Useful for testing how zero and non-zero APYs are handled quickly.
-  const DEV_APY = __DEV__ ? 4 : vaultApyQuery.data?.apy;
-
   return (
     <Box
       style={[styles.safeArea, { paddingTop: insets.top }]}
       twClassName="flex-1 bg-default"
       testID={MoneyHomeViewTestIds.CONTAINER}
     >
-      <MoneyHeader
-        onBackPress={handleBackPress}
-        onMenuPress={handleMenuPress}
-      />
+      <MoneyHeader onMenuPress={handleMenuPress} />
       <ScrollView
         testID={MoneyHomeViewTestIds.SCROLL_VIEW}
         contentContainerStyle={styles.scrollContent}
         showsVerticalScrollIndicator={false}
       >
         <MoneyBalanceSummary
-          apy={DEV_APY}
+          apy={apyPercent}
           balance={totalFiatFormatted ?? '--.--'}
           onApyInfoPress={handleApyInfoPress}
           isLoading={vaultApyQuery.isLoading || isAggregatedBalanceLoading}
@@ -163,16 +252,21 @@ const MoneyHomeView = () => {
         />
         <MoneyOnboardingCard
           currentStep={isMilestone ? 2 : 1}
-          variant={isCardUnlinked ? 'link-card' : 'get-card'}
+          variant={isCardholderWithMilestone ? 'link-card' : 'get-card'}
           onCtaPress={handleOnboardingCtaPress}
         />
         <Divider />
-        <MoneyEarnings onProjectedPress={handleProjectedEarningsPress} />
+        <MoneyEarnings
+          monthlyEarnings={monthlyEarnings}
+          yearlyEarnings={yearlyEarnings}
+          isLoading={vaultApyQuery.isLoading || isAggregatedBalanceLoading}
+          onInfoPress={handleEarningsInfoPress}
+        />
         <Divider />
         {!isMilestone && (
           <>
             <MoneyHowItWorks
-              apy={DEV_APY}
+              apy={apyPercent}
               onHeaderPress={handleHowItWorksHeaderPress}
               isLoading={vaultApyQuery.isLoading}
             />
@@ -199,8 +293,7 @@ const MoneyHomeView = () => {
           <>
             <MoneyPotentialEarnings
               tokens={conversionTokens}
-              apy={DEV_APY}
-              condensed={isMilestone}
+              apy={apyPercent}
               onTokenPress={handleTokenConvertPress}
               onViewAllPress={handleEarnCryptoPress}
               onHeaderPress={handleEarnCryptoPress}
@@ -209,11 +302,12 @@ const MoneyHomeView = () => {
           </>
         )}
         <MoneyMetaMaskCard
-          mode={isCardUnlinked ? 'link' : 'upsell'}
+          mode={isCardholderWithMilestone ? 'link' : 'upsell'}
           onGetNowPress={handleGetNowPress}
           onHeaderPress={handleHeaderPress}
           onLinkPress={handleLinkCardPress}
-          apy={DEV_APY}
+          apy={apyPercent}
+          showMetalCard={isUS}
         />
         <Divider />
         {isMilestone && (
@@ -227,13 +321,16 @@ const MoneyHomeView = () => {
           </>
         )}
         {!isMilestone && (
-          <MoneyWhatYouGet
-            apy={DEV_APY}
-            onLearnMorePress={handleLearnMorePress}
-          />
+          <>
+            <MoneyWhatYouGet
+              apy={apyPercent}
+              onLearnMorePress={handleLearnMorePress}
+            />
+            <Divider />
+          </>
         )}
+        <MoneyFooter onAddMoneyPress={handleAddPress} />
       </ScrollView>
-      <MoneyFooter onAddMoneyPress={handleAddPress} />
     </Box>
   );
 };
diff --git a/app/components/UI/Money/Views/MoneyHowItWorksView/MoneyHowItWorksView.tsx b/app/components/UI/Money/Views/MoneyHowItWorksView/MoneyHowItWorksView.tsx
index 37c66143994..29ee8488748 100644
--- a/app/components/UI/Money/Views/MoneyHowItWorksView/MoneyHowItWorksView.tsx
+++ b/app/components/UI/Money/Views/MoneyHowItWorksView/MoneyHowItWorksView.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react';
-import { Pressable, ScrollView, StyleSheet, View } from 'react-native';
+import { Pressable, ScrollView, StyleSheet } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useNavigation } from '@react-navigation/native';
 import {
@@ -33,7 +33,6 @@ import { MoneyHowItWorksViewTestIds } from './MoneyHowItWorksView.testIds';
 
 const localStyles = StyleSheet.create({
   safeArea: { flex: 1 },
-  graphicPlaceholder: { height: 140 },
   headerSpacer: { width: 40 },
 });
 
@@ -121,7 +120,7 @@ const FaqItem = ({
 const MoneyHowItWorksView = () => {
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
-  const { colors } = useTheme();
+  const { colors: themeColors } = useTheme();
 
   const handleGoBack = useCallback(() => {
     navigation.goBack();
@@ -131,7 +130,10 @@ const MoneyHowItWorksView = () => {
     <Box
       style={[
         localStyles.safeArea,
-        { paddingTop: insets.top, backgroundColor: colors.background.default },
+        {
+          paddingTop: insets.top,
+          backgroundColor: themeColors.background.default,
+        },
       ]}
       twClassName="flex-1"
       testID={MoneyHowItWorksViewTestIds.CONTAINER}
@@ -159,15 +161,6 @@ const MoneyHowItWorksView = () => {
         showsVerticalScrollIndicator={false}
         contentContainerStyle={{ paddingBottom: insets.bottom + 16 }}
       >
-        <View
-          style={[
-            localStyles.graphicPlaceholder,
-            { backgroundColor: colors.background.alternative },
-          ]}
-          accessibilityRole="image"
-          accessibilityLabel="How it works graphic"
-        />
-
         <Box twClassName="px-4 pt-6 pb-3 gap-3">
           <Text
             variant={TextVariant.HeadingMd}
diff --git a/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.styles.ts b/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.styles.ts
new file mode 100644
index 00000000000..7b46f948237
--- /dev/null
+++ b/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.styles.ts
@@ -0,0 +1,12 @@
+import { StyleSheet } from 'react-native';
+import type { Theme } from '../../../../../util/theme/models';
+
+const styleSheet = (params: { theme: Theme }) =>
+  StyleSheet.create({
+    safeArea: {
+      flex: 1,
+      backgroundColor: params.theme.colors.background.default,
+    },
+  });
+
+export default styleSheet;
diff --git a/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.test.tsx b/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.test.tsx
new file mode 100644
index 00000000000..0487297372c
--- /dev/null
+++ b/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.test.tsx
@@ -0,0 +1,205 @@
+import React from 'react';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import MoneyPotentialEarningsView from './MoneyPotentialEarningsView';
+import { MoneyPotentialEarningsViewTestIds } from './MoneyPotentialEarningsView.testIds';
+import { strings } from '../../../../../../locales/i18n';
+import useMoneyAccountBalance from '../../hooks/useMoneyAccountBalance';
+
+const mockGoBack = jest.fn();
+
+jest.mock('@react-navigation/native', () => {
+  const actualReactNavigation = jest.requireActual('@react-navigation/native');
+  return {
+    ...actualReactNavigation,
+    useNavigation: () => ({
+      goBack: mockGoBack,
+    }),
+  };
+});
+
+const mockConversionTokens = [
+  {
+    name: 'USD Coin',
+    symbol: 'USDC',
+    address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+    chainId: '0x1',
+    decimals: 6,
+    balanceInSelectedCurrency: '$5,000.00',
+    fiat: { balance: 5000 },
+  },
+  {
+    name: 'Tether',
+    symbol: 'USDT',
+    address: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+    chainId: '0x1',
+    decimals: 6,
+    balanceInSelectedCurrency: '$3,000.00',
+    fiat: { balance: 3000 },
+  },
+  {
+    name: 'Dai',
+    symbol: 'DAI',
+    address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
+    chainId: '0x1',
+    decimals: 18,
+    balanceInSelectedCurrency: '$2,000.00',
+    fiat: { balance: 2000 },
+  },
+  {
+    name: 'Wrapped Ether',
+    symbol: 'WETH',
+    address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+    chainId: '0x1',
+    decimals: 18,
+    balanceInSelectedCurrency: '$1,500.00',
+    fiat: { balance: 1500 },
+  },
+  {
+    name: 'ChainLink',
+    symbol: 'LINK',
+    address: '0x514910771AF9Ca656af840dff83E8264EcF986CA',
+    chainId: '0x1',
+    decimals: 18,
+    balanceInSelectedCurrency: '$800.00',
+    fiat: { balance: 800 },
+  },
+  {
+    name: 'Uniswap',
+    symbol: 'UNI',
+    address: '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984',
+    chainId: '0x1',
+    decimals: 18,
+    balanceInSelectedCurrency: '$400.00',
+    fiat: { balance: 400 },
+  },
+];
+
+jest.mock('../../../Earn/hooks/useMusdConversionTokens', () => ({
+  useMusdConversionTokens: () => ({ tokens: mockConversionTokens }),
+  STABLECOIN_SYMBOLS: new Set(['USDC', 'USDT', 'DAI']),
+  tokenFiatValue: (token: { fiat?: { balance?: number } }) =>
+    token?.fiat?.balance ?? 0,
+}));
+
+jest.mock('../../hooks/useMoneyAccountBalance', () => ({
+  __esModule: true,
+  default: jest.fn(),
+}));
+
+jest.mock('../../../Earn/hooks/useMusdConversion', () => ({
+  useMusdConversion: () => ({
+    initiateCustomConversion: jest.fn(),
+  }),
+}));
+
+jest.mock(
+  '../../../../UI/Assets/components/AssetLogo/AssetLogo',
+  () => 'AssetLogo',
+);
+jest.mock(
+  '../../../../../component-library/components/Badges/BadgeWrapper',
+  () => ({
+    __esModule: true,
+    default: 'BadgeWrapper',
+    BadgePosition: { BottomRight: 'BottomRight' },
+  }),
+);
+jest.mock('../../../../../component-library/components/Badges/Badge', () => ({
+  __esModule: true,
+  default: 'Badge',
+  BadgeVariant: { Network: 'Network' },
+}));
+jest.mock('../../../../UI/AssetOverview/Balance/Balance', () => ({
+  NetworkBadgeSource: jest.fn(() => null),
+}));
+jest.mock('react-native-linear-gradient', () => 'LinearGradient');
+jest.mock('@react-native-masked-view/masked-view', () => 'MaskedView');
+jest.mock('../../utils/moneyFormatFiat', () => ({
+  moneyFormatFiat: jest.fn((value: BigNumber) => `$${value.toFixed(2)}`),
+}));
+
+const mockUseMoneyAccountBalance = jest.mocked(useMoneyAccountBalance);
+
+describe('MoneyPotentialEarningsView', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseMoneyAccountBalance.mockReturnValue({
+      apyPercent: 4,
+      apyDecimal: 0.04,
+      apyPercentFormatted: '4%',
+      totalFiatFormatted: '$10,000.00',
+      totalFiatRaw: '10000',
+      tokenTotal: undefined,
+      isAggregatedBalanceLoading: false,
+      vaultApyQuery: {
+        data: { apy: 0.04, timestamp: '2026-01-01T00:00:00Z' },
+        isLoading: false,
+      },
+      musdBalanceQuery: {
+        data: { balance: '10000000000' },
+        isLoading: false,
+      },
+      musdEquivalentBalanceQuery: {
+        data: {
+          musdEquivalentValue: '0',
+          musdSHFvdBalance: '0',
+          exchangeRate: '1000000',
+        },
+        isLoading: false,
+      },
+      musdFiatFormatted: '$10,000.00',
+      musdSHFvdFiatFormatted: '$0.00',
+    } as ReturnType<typeof useMoneyAccountBalance>);
+  });
+
+  it('renders the container', () => {
+    const { getByTestId } = renderWithProvider(<MoneyPotentialEarningsView />);
+
+    expect(
+      getByTestId(MoneyPotentialEarningsViewTestIds.CONTAINER),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the scroll view', () => {
+    const { getByTestId } = renderWithProvider(<MoneyPotentialEarningsView />);
+
+    expect(
+      getByTestId(MoneyPotentialEarningsViewTestIds.SCROLL_VIEW),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the section title', () => {
+    const { getByText } = renderWithProvider(<MoneyPotentialEarningsView />);
+
+    expect(
+      getByText(strings('money.potential_earnings.title')),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the description text', () => {
+    const { getByText } = renderWithProvider(<MoneyPotentialEarningsView />);
+
+    expect(
+      getByText(strings('money.potential_earnings.description')),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders ALL eligible tokens, not limited to 5', () => {
+    const { getByText } = renderWithProvider(<MoneyPotentialEarningsView />);
+
+    expect(getByText('USDC')).toBeOnTheScreen();
+    expect(getByText('USDT')).toBeOnTheScreen();
+    expect(getByText('DAI')).toBeOnTheScreen();
+    expect(getByText('WETH')).toBeOnTheScreen();
+    expect(getByText('LINK')).toBeOnTheScreen();
+    expect(getByText('UNI')).toBeOnTheScreen();
+  });
+
+  it('renders the view without errors', () => {
+    const { getByTestId } = renderWithProvider(<MoneyPotentialEarningsView />);
+
+    expect(
+      getByTestId(MoneyPotentialEarningsViewTestIds.CONTAINER),
+    ).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.testIds.ts b/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.testIds.ts
new file mode 100644
index 00000000000..e5bb7593409
--- /dev/null
+++ b/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.testIds.ts
@@ -0,0 +1,4 @@
+export const MoneyPotentialEarningsViewTestIds = {
+  CONTAINER: 'money-potential-earnings-view-container',
+  SCROLL_VIEW: 'money-potential-earnings-view-scroll',
+} as const;
diff --git a/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.tsx b/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.tsx
new file mode 100644
index 00000000000..673c8c46c14
--- /dev/null
+++ b/app/components/UI/Money/Views/MoneyPotentialEarningsView/MoneyPotentialEarningsView.tsx
@@ -0,0 +1,146 @@
+import React, { useCallback, useMemo } from 'react';
+import { ScrollView } from 'react-native';
+import { useSelector } from 'react-redux';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { useNavigation } from '@react-navigation/native';
+import { BigNumber } from 'bignumber.js';
+import {
+  Box,
+  ButtonIcon,
+  ButtonIconSize,
+  FontWeight,
+  IconName,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import { useStyles } from '../../../../../component-library/hooks';
+import {
+  useMusdConversionTokens,
+  STABLECOIN_SYMBOLS,
+  tokenFiatValue,
+} from '../../../Earn/hooks/useMusdConversionTokens';
+import { useMusdConversion } from '../../../Earn/hooks/useMusdConversion';
+import useMoneyAccountBalance from '../../hooks/useMoneyAccountBalance';
+import { selectCurrentCurrency } from '../../../../../selectors/currencyRateController';
+import { moneyFormatFiat } from '../../utils/moneyFormatFiat';
+import Logger from '../../../../../util/Logger';
+import Routes from '../../../../../constants/navigation/Routes';
+import { AssetType } from '../../../../Views/confirmations/types/token';
+import { Hex } from '@metamask/utils';
+import MoneyGradientText from '../../components/MoneyPotentialEarnings/MoneyGradientText';
+import PotentialEarningsTokenRow from '../../components/MoneyPotentialEarnings/PotentialEarningsTokenRow';
+import { isPositiveNumber } from '../../utils/number';
+import {
+  calculateProjectedEarnings,
+  PROJECTION_YEARS,
+} from '../../utils/projections';
+import styleSheet from './MoneyPotentialEarningsView.styles';
+import { MoneyPotentialEarningsViewTestIds } from './MoneyPotentialEarningsView.testIds';
+
+const MoneyPotentialEarningsView = () => {
+  const navigation = useNavigation();
+  const insets = useSafeAreaInsets();
+  const { styles } = useStyles(styleSheet, {});
+  const currentCurrency = useSelector(selectCurrentCurrency);
+
+  const { tokens } = useMusdConversionTokens();
+  const { initiateCustomConversion } = useMusdConversion();
+  const { apyPercent } = useMoneyAccountBalance();
+  const apyPercentForProjection = apyPercent ?? 0;
+
+  const eligibleTokens = useMemo(
+    () => (tokens ?? []).filter((token) => tokenFiatValue(token) > 0),
+    [tokens],
+  );
+
+  const projectedAmount = useMemo(
+    () =>
+      eligibleTokens.reduce(
+        (sum, token) =>
+          sum +
+          calculateProjectedEarnings(
+            tokenFiatValue(token),
+            apyPercentForProjection,
+            PROJECTION_YEARS,
+          ),
+        0,
+      ),
+    [eligibleTokens, apyPercentForProjection],
+  );
+
+  const handleBackPress = useCallback(() => {
+    navigation.goBack();
+  }, [navigation]);
+
+  const handleTokenPress = useCallback(
+    (token: AssetType) => async () => {
+      try {
+        await initiateCustomConversion({
+          preferredPaymentToken: {
+            address: token.address as Hex,
+            chainId: token.chainId as Hex,
+          },
+          navigationStack: Routes.MONEY.ROOT,
+        });
+      } catch (error) {
+        Logger.error(error as Error, {
+          message: '[MoneyPotentialEarningsView] Failed to initiate conversion',
+        });
+      }
+    },
+    [initiateCustomConversion],
+  );
+
+  return (
+    <Box
+      style={[styles.safeArea, { paddingTop: insets.top }]}
+      testID={MoneyPotentialEarningsViewTestIds.CONTAINER}
+    >
+      <Box twClassName="flex-row items-center px-4 py-2">
+        <ButtonIcon
+          iconName={IconName.ArrowLeft}
+          size={ButtonIconSize.Md}
+          onPress={handleBackPress}
+        />
+      </Box>
+      <ScrollView
+        testID={MoneyPotentialEarningsViewTestIds.SCROLL_VIEW}
+        showsVerticalScrollIndicator={false}
+      >
+        <Box twClassName="px-4 py-3 gap-3">
+          <Text variant={TextVariant.HeadingMd}>
+            {strings('money.potential_earnings.title')}
+          </Text>
+
+          {isPositiveNumber(projectedAmount) && (
+            <MoneyGradientText
+              value={`+${moneyFormatFiat(new BigNumber(projectedAmount), currentCurrency)}`}
+            />
+          )}
+
+          <Text
+            variant={TextVariant.BodyMd}
+            fontWeight={FontWeight.Regular}
+            color={TextColor.TextAlternative}
+          >
+            {strings('money.potential_earnings.description')}
+          </Text>
+        </Box>
+
+        {eligibleTokens.map((token) => (
+          <PotentialEarningsTokenRow
+            key={`${token.address}-${token.chainId}`}
+            token={token}
+            hasSubsidizedFee={STABLECOIN_SYMBOLS.has(token.symbol)}
+            apyPercent={apyPercentForProjection}
+            onPress={handleTokenPress(token)}
+          />
+        ))}
+      </ScrollView>
+    </Box>
+  );
+};
+
+export default MoneyPotentialEarningsView;
diff --git a/app/components/UI/Money/Views/MoneyPotentialEarningsView/index.ts b/app/components/UI/Money/Views/MoneyPotentialEarningsView/index.ts
new file mode 100644
index 00000000000..91b8a4f17e4
--- /dev/null
+++ b/app/components/UI/Money/Views/MoneyPotentialEarningsView/index.ts
@@ -0,0 +1 @@
+export { default } from './MoneyPotentialEarningsView';
diff --git a/app/components/UI/Money/components/MoneyAddMoneySheet/MoneyAddMoneySheet.test.tsx b/app/components/UI/Money/components/MoneyAddMoneySheet/MoneyAddMoneySheet.test.tsx
index f669718c1b1..d78f8e0b638 100644
--- a/app/components/UI/Money/components/MoneyAddMoneySheet/MoneyAddMoneySheet.test.tsx
+++ b/app/components/UI/Money/components/MoneyAddMoneySheet/MoneyAddMoneySheet.test.tsx
@@ -5,7 +5,7 @@ import MoneyAddMoneySheet from './MoneyAddMoneySheet';
 import { MoneyAddMoneySheetTestIds } from './MoneyAddMoneySheet.testIds';
 import { useMusdConversionFlowData } from '../../../Earn/hooks/useMusdConversionFlowData';
 import { useRampNavigation } from '../../../Ramp/hooks/useRampNavigation';
-import { useMusdBalance } from '../../../Earn/hooks/useMusdBalance';
+import useMoneyAccountBalance from '../../hooks/useMoneyAccountBalance';
 import { useMoneyAccountDeposit } from '../../hooks/useMoneyAccount';
 import {
   MUSD_CONVERSION_DEFAULT_CHAIN_ID,
@@ -38,8 +38,9 @@ jest.mock('../../../Ramp/hooks/useRampNavigation', () => ({
   useRampNavigation: jest.fn(),
 }));
 
-jest.mock('../../../Earn/hooks/useMusdBalance', () => ({
-  useMusdBalance: jest.fn(),
+jest.mock('../../hooks/useMoneyAccountBalance', () => ({
+  __esModule: true,
+  default: jest.fn(),
 }));
 
 jest.mock('../../hooks/useMoneyAccount', () => ({
@@ -86,8 +87,8 @@ describe('MoneyAddMoneySheet', () => {
     (useRampNavigation as jest.Mock).mockReturnValue({
       goToBuy: mockGoToBuy,
     });
-    (useMusdBalance as jest.Mock).mockReturnValue({
-      fiatBalanceAggregatedFormatted: '$1,203.89',
+    (useMoneyAccountBalance as jest.Mock).mockReturnValue({
+      totalFiatFormatted: '$1,203.89',
     });
     (useMoneyAccountDeposit as jest.Mock).mockReturnValue({
       initiateDeposit: mockInitiateDeposit,
@@ -110,8 +111,8 @@ describe('MoneyAddMoneySheet', () => {
   });
 
   it('preserves the locale fiat prefix in the Move mUSD row', () => {
-    (useMusdBalance as jest.Mock).mockReturnValue({
-      fiatBalanceAggregatedFormatted: 'CA$1,500.00',
+    (useMoneyAccountBalance as jest.Mock).mockReturnValue({
+      totalFiatFormatted: 'CA$1,500.00',
     });
     const { getByText } = renderWithProvider(<MoneyAddMoneySheet />);
 
@@ -119,8 +120,8 @@ describe('MoneyAddMoneySheet', () => {
   });
 
   it('falls back to the no-amount copy when the mUSD balance is unavailable', () => {
-    (useMusdBalance as jest.Mock).mockReturnValue({
-      fiatBalanceAggregatedFormatted: undefined,
+    (useMoneyAccountBalance as jest.Mock).mockReturnValue({
+      totalFiatFormatted: undefined,
     });
     const { getByText } = renderWithProvider(<MoneyAddMoneySheet />);
 
@@ -148,7 +149,7 @@ describe('MoneyAddMoneySheet', () => {
     );
 
     expect(mockOnCloseBottomSheet).toHaveBeenCalledTimes(1);
-    expect(mockInitiateDeposit).toHaveBeenCalledWith(BigInt(0));
+    expect(mockInitiateDeposit).toHaveBeenCalledWith();
   });
 
   it('closes the sheet when Move mUSD is pressed (interim, no flow wired yet)', () => {
diff --git a/app/components/UI/Money/components/MoneyAddMoneySheet/MoneyAddMoneySheet.tsx b/app/components/UI/Money/components/MoneyAddMoneySheet/MoneyAddMoneySheet.tsx
index 6b559e9982d..824a3a1fc1d 100644
--- a/app/components/UI/Money/components/MoneyAddMoneySheet/MoneyAddMoneySheet.tsx
+++ b/app/components/UI/Money/components/MoneyAddMoneySheet/MoneyAddMoneySheet.tsx
@@ -17,8 +17,8 @@ import {
 import Tag from '../../../../../component-library/components/Tags/Tag';
 import { strings } from '../../../../../../locales/i18n';
 import { useStyles } from '../../../../../component-library/hooks';
-import { useMusdBalance } from '../../../Earn/hooks/useMusdBalance';
 import { useMusdConversionFlowData } from '../../../Earn/hooks/useMusdConversionFlowData';
+import useMoneyAccountBalance from '../../hooks/useMoneyAccountBalance';
 import {
   MUSD_CONVERSION_DEFAULT_CHAIN_ID,
   MUSD_TOKEN_ASSET_ID_BY_CHAIN,
@@ -40,7 +40,7 @@ const MoneyAddMoneySheet: React.FC = () => {
   const navigation = useNavigation();
   const { styles } = useStyles(styleSheet, {});
 
-  const { fiatBalanceAggregatedFormatted } = useMusdBalance();
+  const { totalFiatFormatted } = useMoneyAccountBalance();
   const { getChainIdForBuyFlow } = useMusdConversionFlowData();
   const { goToBuy } = useRampNavigation();
   const { initiateDeposit } = useMoneyAccountDeposit();
@@ -53,12 +53,9 @@ const MoneyAddMoneySheet: React.FC = () => {
     navigation.goBack();
   }, [navigation]);
 
-  // TODO(MUSD-478/MUSD-516): point to the MM Pay "Add money" amount-entry
-  // screen (Figma 2547:8887). Amount is collected by the MM Pay UI; the
-  // placeholder 0n keeps the deposit pipeline wired until that lands.
   const handleConvertCrypto = useCallback(() => {
     closeAndNavigate(() => {
-      initiateDeposit(BigInt(0)).catch(() => undefined);
+      initiateDeposit().catch(() => undefined);
     });
   }, [closeAndNavigate, initiateDeposit]);
 
@@ -94,9 +91,9 @@ const MoneyAddMoneySheet: React.FC = () => {
       testID: MoneyAddMoneySheetTestIds.DEPOSIT_FUNDS_OPTION,
     },
     {
-      label: fiatBalanceAggregatedFormatted
+      label: totalFiatFormatted
         ? strings('money.add_money_sheet.move_musd', {
-            amount: fiatBalanceAggregatedFormatted,
+            amount: totalFiatFormatted,
           })
         : strings('money.add_money_sheet.move_musd_no_amount'),
       icon: IconName.Add,
diff --git a/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.styles.ts b/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.styles.ts
new file mode 100644
index 00000000000..2b468c1d5dc
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.styles.ts
@@ -0,0 +1,14 @@
+import { StyleSheet } from 'react-native';
+import type { Theme } from '../../../../../util/theme/models';
+
+const styleSheet = (params: { theme: Theme }) =>
+  StyleSheet.create({
+    content: {
+      paddingHorizontal: 16,
+      paddingBottom: 8,
+      gap: 16,
+      backgroundColor: params.theme.colors.background.default,
+    },
+  });
+
+export default styleSheet;
diff --git a/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.test.tsx b/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.test.tsx
new file mode 100644
index 00000000000..c5dc286bfde
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.test.tsx
@@ -0,0 +1,164 @@
+import React from 'react';
+import { Linking } from 'react-native';
+import { fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import MoneyApyInfoSheet from './MoneyApyInfoSheet';
+import { MoneyApyInfoSheetTestIds } from './MoneyApyInfoSheet.testIds';
+import { strings } from '../../../../../../locales/i18n';
+import { useParams } from '../../../../../util/navigation/navUtils';
+import AppConstants from '../../../../../core/AppConstants';
+
+const mockOnCloseBottomSheet = jest.fn((cb?: () => void) => cb?.());
+const mockGoBack = jest.fn();
+
+jest.mock('@react-navigation/native', () => {
+  const actualReactNavigation = jest.requireActual('@react-navigation/native');
+  return {
+    ...actualReactNavigation,
+    useNavigation: () => ({
+      goBack: mockGoBack,
+    }),
+  };
+});
+
+jest.mock('../../../../../util/navigation/navUtils', () => ({
+  useParams: 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, 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 MockBottomSheetHeader = ({
+    children,
+    onClose,
+  }: {
+    children: React.ReactNode;
+    onClose?: () => void;
+  }) =>
+    ReactActual.createElement(
+      View,
+      { testID: 'bottom-sheet-header' },
+      ReactActual.createElement(
+        Pressable,
+        { testID: 'bottom-sheet-close-button', onPress: onClose },
+        ReactActual.createElement(RNText, {}, 'close'),
+      ),
+      children,
+    );
+
+  return {
+    ...actual,
+    BottomSheet: MockBottomSheet,
+    BottomSheetHeader: MockBottomSheetHeader,
+  };
+});
+
+const mockUseParams = useParams as jest.MockedFunction<typeof useParams>;
+
+const DEFAULT_APY = 5;
+
+describe('MoneyApyInfoSheet', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseParams.mockReturnValue({ apy: DEFAULT_APY });
+  });
+
+  it('renders the container', () => {
+    const { getByTestId } = renderWithProvider(<MoneyApyInfoSheet />);
+
+    expect(getByTestId(MoneyApyInfoSheetTestIds.CONTAINER)).toBeOnTheScreen();
+  });
+
+  it('renders the sheet title', () => {
+    const { getByText } = renderWithProvider(<MoneyApyInfoSheet />);
+
+    expect(getByText(strings('money.apy_tooltip.title'))).toBeOnTheScreen();
+  });
+
+  it('renders paragraph_1 with the apy percentage interpolated', () => {
+    const { getByText } = renderWithProvider(<MoneyApyInfoSheet />);
+
+    expect(
+      getByText(
+        strings('money.apy_tooltip.paragraph_1', { percentage: DEFAULT_APY }),
+      ),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders paragraph_2', () => {
+    const { getByText } = renderWithProvider(<MoneyApyInfoSheet />);
+
+    expect(
+      getByText(strings('money.apy_tooltip.paragraph_2')),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders paragraph_3', () => {
+    const { getByText } = renderWithProvider(<MoneyApyInfoSheet />);
+
+    expect(
+      getByText(strings('money.apy_tooltip.paragraph_3')),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the Learn More footer button', () => {
+    const { getByTestId } = renderWithProvider(<MoneyApyInfoSheet />);
+
+    expect(
+      getByTestId(MoneyApyInfoSheetTestIds.LEARN_MORE_BUTTON),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the correct label on the Learn More button', () => {
+    const { getByText } = renderWithProvider(<MoneyApyInfoSheet />);
+
+    expect(
+      getByText(strings('money.apy_tooltip.learn_more')),
+    ).toBeOnTheScreen();
+  });
+
+  it('opens the learn more URL when the footer button is pressed', () => {
+    const openURLSpy = jest
+      .spyOn(Linking, 'openURL')
+      .mockResolvedValue(undefined);
+
+    const { getByTestId } = renderWithProvider(<MoneyApyInfoSheet />);
+
+    fireEvent.press(getByTestId(MoneyApyInfoSheetTestIds.LEARN_MORE_BUTTON));
+
+    expect(openURLSpy).toHaveBeenCalledWith(AppConstants.URLS.MUSD_LEARN_MORE);
+  });
+
+  it('does not close the sheet when the Learn More button is pressed', () => {
+    jest.spyOn(Linking, 'openURL').mockResolvedValue(undefined);
+
+    const { getByTestId } = renderWithProvider(<MoneyApyInfoSheet />);
+
+    fireEvent.press(getByTestId(MoneyApyInfoSheetTestIds.LEARN_MORE_BUTTON));
+
+    expect(mockOnCloseBottomSheet).not.toHaveBeenCalled();
+  });
+
+  it('closes the sheet when the close button is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyApyInfoSheet />);
+
+    fireEvent.press(getByTestId('bottom-sheet-close-button'));
+
+    expect(mockOnCloseBottomSheet).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.testIds.ts b/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.testIds.ts
new file mode 100644
index 00000000000..6117f18edc9
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.testIds.ts
@@ -0,0 +1,4 @@
+export const MoneyApyInfoSheetTestIds = {
+  CONTAINER: 'money-apy-info-sheet-container',
+  LEARN_MORE_BUTTON: 'money-apy-info-sheet-learn-more-button',
+} as const;
diff --git a/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.tsx b/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.tsx
new file mode 100644
index 00000000000..b14d88d6676
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyApyInfoSheet/MoneyApyInfoSheet.tsx
@@ -0,0 +1,79 @@
+import React, { useCallback, useRef } from 'react';
+import { Linking, View } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import {
+  BottomSheet,
+  BottomSheetFooter,
+  BottomSheetHeader,
+  ButtonSize,
+  type BottomSheetRef,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import { useStyles } from '../../../../../component-library/hooks';
+import AppConstants from '../../../../../core/AppConstants';
+import { useParams } from '../../../../../util/navigation/navUtils';
+import styleSheet from './MoneyApyInfoSheet.styles';
+import { MoneyApyInfoSheetTestIds } from './MoneyApyInfoSheet.testIds';
+
+interface MoneyApyInfoSheetParams {
+  apy: number;
+}
+
+const MoneyApyInfoSheet = () => {
+  const sheetRef = useRef<BottomSheetRef>(null);
+  const navigation = useNavigation();
+  const { styles } = useStyles(styleSheet, {});
+  const { apy } = useParams<MoneyApyInfoSheetParams>();
+
+  const handleGoBack = useCallback(() => {
+    navigation.goBack();
+  }, [navigation]);
+
+  const handleClose = useCallback(() => {
+    sheetRef.current?.onCloseBottomSheet();
+  }, []);
+
+  const handleLearnMorePress = useCallback(() => {
+    Linking.openURL(AppConstants.URLS.MUSD_LEARN_MORE);
+  }, []);
+
+  return (
+    <BottomSheet
+      ref={sheetRef}
+      goBack={handleGoBack}
+      testID={MoneyApyInfoSheetTestIds.CONTAINER}
+      keyboardAvoidingViewEnabled={false}
+    >
+      <BottomSheetHeader onClose={handleClose}>
+        <Text variant={TextVariant.HeadingSm}>
+          {strings('money.apy_tooltip.title')}
+        </Text>
+      </BottomSheetHeader>
+      <View style={styles.content}>
+        <Text variant={TextVariant.BodyMd}>
+          {strings('money.apy_tooltip.paragraph_1', { percentage: apy })}
+        </Text>
+        <Text variant={TextVariant.BodyMd}>
+          {strings('money.apy_tooltip.paragraph_2')}
+        </Text>
+        <Text variant={TextVariant.BodyMd}>
+          {strings('money.apy_tooltip.paragraph_3')}
+        </Text>
+      </View>
+      <BottomSheetFooter
+        primaryButtonProps={{
+          size: ButtonSize.Lg,
+          children: strings('money.apy_tooltip.learn_more'),
+          onPress: handleLearnMorePress,
+          testID: MoneyApyInfoSheetTestIds.LEARN_MORE_BUTTON,
+        }}
+        twClassName="px-4 pt-6 pb-6"
+      />
+    </BottomSheet>
+  );
+};
+
+export default MoneyApyInfoSheet;
diff --git a/app/components/UI/Money/components/MoneyApyInfoSheet/index.ts b/app/components/UI/Money/components/MoneyApyInfoSheet/index.ts
new file mode 100644
index 00000000000..3a6d3fd4c20
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyApyInfoSheet/index.ts
@@ -0,0 +1 @@
+export { default } from './MoneyApyInfoSheet';
diff --git a/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.styles.ts b/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.styles.ts
new file mode 100644
index 00000000000..016c8f5dece
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.styles.ts
@@ -0,0 +1,13 @@
+import { StyleSheet } from 'react-native';
+
+const styleSheet = () =>
+  StyleSheet.create({
+    container: {
+      height: 82,
+      borderRadius: 12,
+      paddingHorizontal: 16,
+      marginHorizontal: 16,
+    },
+  });
+
+export default styleSheet;
diff --git a/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.test.tsx b/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.test.tsx
new file mode 100644
index 00000000000..cce3b643534
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.test.tsx
@@ -0,0 +1,367 @@
+import React from 'react';
+import { fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import MoneyBalanceCard from './MoneyBalanceCard';
+import { MoneyBalanceCardTestIds } from './MoneyBalanceCard.testIds';
+import { strings } from '../../../../../../locales/i18n';
+import Routes from '../../../../../constants/navigation/Routes';
+import useMoneyAccountBalance from '../../hooks/useMoneyAccountBalance';
+import { selectMusdConversionEducationSeen } from '../../../../../reducers/user/selectors';
+
+const mockNavigate = jest.fn();
+
+jest.mock('@react-navigation/native', () => {
+  const actualReactNavigation = jest.requireActual('@react-navigation/native');
+  return {
+    ...actualReactNavigation,
+    useNavigation: () => ({
+      navigate: mockNavigate,
+    }),
+  };
+});
+
+jest.mock('../../hooks/useMoneyAccountBalance', () => ({
+  __esModule: true,
+  default: jest.fn(),
+}));
+
+jest.mock('../../../../../reducers/user/selectors', () => ({
+  __esModule: true,
+  selectMusdConversionEducationSeen: jest.fn(),
+}));
+
+const mockUseMoneyAccountBalance = jest.mocked(useMoneyAccountBalance);
+const mockSelectMusdConversionEducationSeen = jest.mocked(
+  selectMusdConversionEducationSeen,
+);
+
+const createBalanceMock = (
+  overrides: Partial<ReturnType<typeof useMoneyAccountBalance>> = {},
+) =>
+  ({
+    totalFiatFormatted: '$1,000.00',
+    totalFiatRaw: '1000',
+    tokenTotal: undefined,
+    isAggregatedBalanceLoading: false,
+    apyDecimal: 0.04,
+    apyPercent: 4,
+    apyPercentFormatted: '4%',
+    vaultApyQuery: {
+      data: { apy: 0.04, timestamp: '2026-01-01T00:00:00Z' },
+      isLoading: false,
+    },
+    musdBalanceQuery: {
+      data: { balance: '1000000000' },
+      isLoading: false,
+    },
+    musdEquivalentBalanceQuery: {
+      data: {
+        musdEquivalentValue: '0',
+        musdSHFvdBalance: '0',
+        exchangeRate: '1000000',
+      },
+      isLoading: false,
+    },
+    musdFiatFormatted: '$1,000.00',
+    musdSHFvdFiatFormatted: '$0.00',
+    ...overrides,
+  }) as ReturnType<typeof useMoneyAccountBalance>;
+
+describe('MoneyBalanceCard', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseMoneyAccountBalance.mockReturnValue(createBalanceMock());
+    mockSelectMusdConversionEducationSeen.mockReturnValue(true);
+  });
+
+  describe('when balance is empty (totalFiatRaw undefined)', () => {
+    beforeEach(() => {
+      mockUseMoneyAccountBalance.mockReturnValue(
+        createBalanceMock({
+          totalFiatRaw: undefined,
+          totalFiatFormatted: undefined,
+        }),
+      );
+    });
+
+    it('renders the empty container testID', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(
+        getByTestId(MoneyBalanceCardTestIds.EMPTY_CONTAINER),
+      ).toBeOnTheScreen();
+    });
+
+    it('renders the balance as $0.00', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(getByTestId(MoneyBalanceCardTestIds.BALANCE)).toHaveTextContent(
+        '$0.00',
+      );
+    });
+
+    it('renders the Add button', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(getByTestId(MoneyBalanceCardTestIds.ADD_BUTTON)).toBeOnTheScreen();
+    });
+
+    it('renders the label', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(getByTestId(MoneyBalanceCardTestIds.LABEL)).toHaveTextContent(
+        strings('money.balance_card.label'),
+      );
+    });
+
+    it('renders the empty container when totalFiatRaw is the string zero', () => {
+      mockUseMoneyAccountBalance.mockReturnValue(
+        createBalanceMock({ totalFiatRaw: '0', totalFiatFormatted: '$0.00' }),
+      );
+
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(
+        getByTestId(MoneyBalanceCardTestIds.EMPTY_CONTAINER),
+      ).toBeOnTheScreen();
+    });
+  });
+
+  describe('when balance is empty and onboarding has not been seen', () => {
+    beforeEach(() => {
+      mockUseMoneyAccountBalance.mockReturnValue(
+        createBalanceMock({
+          totalFiatRaw: undefined,
+          totalFiatFormatted: undefined,
+        }),
+      );
+      mockSelectMusdConversionEducationSeen.mockReturnValue(false);
+    });
+
+    it('renders the new-user container testID', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(
+        getByTestId(MoneyBalanceCardTestIds.NEW_USER_CONTAINER),
+      ).toBeOnTheScreen();
+    });
+
+    it('renders the Get started button', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(
+        getByTestId(MoneyBalanceCardTestIds.GET_STARTED_BUTTON),
+      ).toHaveTextContent(
+        strings('homepage.sections.money_empty_state.get_started'),
+      );
+    });
+
+    it('does not render the Add button', () => {
+      const { queryByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(
+        queryByTestId(MoneyBalanceCardTestIds.ADD_BUTTON),
+      ).not.toBeOnTheScreen();
+    });
+
+    it('navigates to the conversion education flow when Get started is pressed', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      fireEvent.press(getByTestId(MoneyBalanceCardTestIds.GET_STARTED_BUTTON));
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.EARN.ROOT, {
+        screen: Routes.EARN.MUSD.CONVERSION_EDUCATION,
+        params: {
+          returnTo: {
+            screen: Routes.MONEY.ROOT,
+            params: { screen: Routes.MONEY.HOME },
+          },
+        },
+      });
+    });
+  });
+
+  describe('when balance is funded', () => {
+    it('renders the funded container testID', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(
+        getByTestId(MoneyBalanceCardTestIds.FUNDED_CONTAINER),
+      ).toBeOnTheScreen();
+    });
+
+    it('renders the balance from useMoneyAccountBalance', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(getByTestId(MoneyBalanceCardTestIds.BALANCE)).toHaveTextContent(
+        '$1,000.00',
+      );
+    });
+
+    it('renders the Add button', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(getByTestId(MoneyBalanceCardTestIds.ADD_BUTTON)).toBeOnTheScreen();
+    });
+
+    it('renders the APY tag', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(getByTestId(MoneyBalanceCardTestIds.APY_TAG)).toHaveTextContent(
+        strings('money.apy_label', { percentage: 4 }),
+      );
+    });
+
+    it('falls back to $0.00 when totalFiatFormatted is undefined but totalFiatRaw is non-zero', () => {
+      mockUseMoneyAccountBalance.mockReturnValue(
+        createBalanceMock({
+          totalFiatRaw: '1000',
+          totalFiatFormatted: undefined,
+        }),
+      );
+
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(getByTestId(MoneyBalanceCardTestIds.BALANCE)).toHaveTextContent(
+        '$0.00',
+      );
+    });
+  });
+
+  describe('navigation', () => {
+    it('navigates to MONEY home when the card body is pressed', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      fireEvent.press(getByTestId(MoneyBalanceCardTestIds.FUNDED_CONTAINER));
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.ROOT, {
+        screen: Routes.MONEY.HOME,
+      });
+    });
+
+    it('opens the Add money sheet when Add is pressed', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      fireEvent.press(getByTestId(MoneyBalanceCardTestIds.ADD_BUTTON));
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.MODALS.ROOT, {
+        screen: Routes.MONEY.MODALS.ADD_MONEY_SHEET,
+      });
+    });
+
+    it('opens the Money balance info sheet when the info icon is pressed', () => {
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      fireEvent.press(getByTestId(MoneyBalanceCardTestIds.INFO_BUTTON));
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.MODALS.ROOT, {
+        screen: Routes.MONEY.MODALS.MONEY_BALANCE_INFO_SHEET,
+      });
+    });
+
+    it('opens the Add money sheet (and not the Money home) when Add is pressed in empty state', () => {
+      mockUseMoneyAccountBalance.mockReturnValue(
+        createBalanceMock({
+          totalFiatRaw: undefined,
+          totalFiatFormatted: undefined,
+        }),
+      );
+
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      fireEvent.press(getByTestId(MoneyBalanceCardTestIds.ADD_BUTTON));
+
+      expect(mockNavigate).toHaveBeenCalledTimes(1);
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.MODALS.ROOT, {
+        screen: Routes.MONEY.MODALS.ADD_MONEY_SHEET,
+      });
+    });
+  });
+
+  describe('loading states', () => {
+    it('renders balance skeleton when balance is loading', () => {
+      mockUseMoneyAccountBalance.mockReturnValue(
+        createBalanceMock({ isAggregatedBalanceLoading: true }),
+      );
+
+      const { getByTestId, queryByTestId } = renderWithProvider(
+        <MoneyBalanceCard />,
+      );
+
+      expect(
+        getByTestId(MoneyBalanceCardTestIds.BALANCE_SKELETON),
+      ).toBeOnTheScreen();
+      expect(
+        queryByTestId(MoneyBalanceCardTestIds.BALANCE),
+      ).not.toBeOnTheScreen();
+    });
+
+    it('renders APY skeleton when APY is loading', () => {
+      mockUseMoneyAccountBalance.mockReturnValue(
+        createBalanceMock({
+          vaultApyQuery: {
+            data: undefined,
+            isLoading: true,
+          } as ReturnType<typeof useMoneyAccountBalance>['vaultApyQuery'],
+        }),
+      );
+
+      const { getByTestId, queryByTestId } = renderWithProvider(
+        <MoneyBalanceCard />,
+      );
+
+      expect(
+        getByTestId(MoneyBalanceCardTestIds.APY_TAG_SKELETON),
+      ).toBeOnTheScreen();
+      expect(
+        queryByTestId(MoneyBalanceCardTestIds.APY_TAG),
+      ).not.toBeOnTheScreen();
+    });
+
+    it('renders balance and APY values when data has loaded', () => {
+      const { getByTestId, queryByTestId } = renderWithProvider(
+        <MoneyBalanceCard />,
+      );
+
+      expect(getByTestId(MoneyBalanceCardTestIds.BALANCE)).toBeOnTheScreen();
+      expect(getByTestId(MoneyBalanceCardTestIds.APY_TAG)).toBeOnTheScreen();
+      expect(
+        queryByTestId(MoneyBalanceCardTestIds.BALANCE_SKELETON),
+      ).not.toBeOnTheScreen();
+      expect(
+        queryByTestId(MoneyBalanceCardTestIds.APY_TAG_SKELETON),
+      ).not.toBeOnTheScreen();
+    });
+
+    it('renders the APY tag with 0 when apyPercent is undefined', () => {
+      mockUseMoneyAccountBalance.mockReturnValue(
+        createBalanceMock({ apyPercent: undefined }),
+      );
+
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(getByTestId(MoneyBalanceCardTestIds.APY_TAG)).toHaveTextContent(
+        strings('money.apy_label', { percentage: 0 }),
+      );
+    });
+  });
+
+  describe('layout resilience', () => {
+    it('keeps the APY tag and Add button on screen when the balance is very long', () => {
+      mockUseMoneyAccountBalance.mockReturnValue(
+        createBalanceMock({
+          totalFiatRaw: '999999999990',
+          totalFiatFormatted: '$999,999,999,999.99',
+        }),
+      );
+
+      const { getByTestId } = renderWithProvider(<MoneyBalanceCard />);
+
+      expect(getByTestId(MoneyBalanceCardTestIds.BALANCE)).toHaveTextContent(
+        '$999,999,999,999.99',
+      );
+      expect(getByTestId(MoneyBalanceCardTestIds.APY_TAG)).toBeOnTheScreen();
+      expect(getByTestId(MoneyBalanceCardTestIds.ADD_BUTTON)).toBeOnTheScreen();
+    });
+  });
+});
diff --git a/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.testIds.ts b/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.testIds.ts
new file mode 100644
index 00000000000..6c9a3dac516
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.testIds.ts
@@ -0,0 +1,13 @@
+export const MoneyBalanceCardTestIds = {
+  NEW_USER_CONTAINER: 'money-balance-card-new-user-container',
+  EMPTY_CONTAINER: 'money-balance-card-empty-container',
+  FUNDED_CONTAINER: 'money-balance-card-funded-container',
+  LABEL: 'money-balance-card-label',
+  INFO_BUTTON: 'money-balance-card-info-button',
+  BALANCE: 'money-balance-card-balance',
+  BALANCE_SKELETON: 'money-balance-card-balance-skeleton',
+  APY_TAG: 'money-balance-card-apy-tag',
+  APY_TAG_SKELETON: 'money-balance-card-apy-tag-skeleton',
+  ADD_BUTTON: 'money-balance-card-add-button',
+  GET_STARTED_BUTTON: 'money-balance-card-get-started-button',
+} as const;
diff --git a/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.tsx b/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.tsx
new file mode 100644
index 00000000000..18719ab448d
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyBalanceCard/MoneyBalanceCard.tsx
@@ -0,0 +1,204 @@
+import React, { useCallback } from 'react';
+import { Pressable } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  Button,
+  ButtonIcon,
+  ButtonIconSize,
+  ButtonSize,
+  ButtonVariant,
+  FontWeight,
+  IconColor,
+  IconName,
+  Skeleton,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import Routes from '../../../../../constants/navigation/Routes';
+import { useStyles } from '../../../../../component-library/hooks';
+import { selectMusdConversionEducationSeen } from '../../../../../reducers/user/selectors';
+import useMoneyAccountBalance from '../../hooks/useMoneyAccountBalance';
+import styleSheet from './MoneyBalanceCard.styles';
+import { MoneyBalanceCardTestIds } from './MoneyBalanceCard.testIds';
+
+const EMPTY_BALANCE_DISPLAY = '$0.00';
+
+const MoneyBalanceCard = () => {
+  const tw = useTailwind();
+  const navigation = useNavigation();
+  const { styles } = useStyles(styleSheet, {});
+  const {
+    totalFiatRaw,
+    totalFiatFormatted,
+    apyPercent,
+    isAggregatedBalanceLoading,
+    vaultApyQuery,
+  } = useMoneyAccountBalance();
+  const hasSeenOnboarding = useSelector(selectMusdConversionEducationSeen);
+
+  const isEmpty = totalFiatRaw === undefined || totalFiatRaw === '0';
+  const isNewUser = isEmpty && !hasSeenOnboarding;
+
+  let balanceText: string;
+  let buttonVariant: ButtonVariant;
+  let buttonLabel: string;
+  let buttonTestId: string;
+  let containerTestId: string;
+  if (isNewUser) {
+    balanceText = EMPTY_BALANCE_DISPLAY;
+    buttonVariant = ButtonVariant.Primary;
+    buttonLabel = strings('homepage.sections.money_empty_state.get_started');
+    buttonTestId = MoneyBalanceCardTestIds.GET_STARTED_BUTTON;
+    containerTestId = MoneyBalanceCardTestIds.NEW_USER_CONTAINER;
+  } else if (isEmpty) {
+    balanceText = EMPTY_BALANCE_DISPLAY;
+    buttonVariant = ButtonVariant.Primary;
+    buttonLabel = strings('money.balance_card.add');
+    buttonTestId = MoneyBalanceCardTestIds.ADD_BUTTON;
+    containerTestId = MoneyBalanceCardTestIds.EMPTY_CONTAINER;
+  } else {
+    balanceText = totalFiatFormatted ?? EMPTY_BALANCE_DISPLAY;
+    buttonVariant = ButtonVariant.Secondary;
+    buttonLabel = strings('money.balance_card.add');
+    buttonTestId = MoneyBalanceCardTestIds.ADD_BUTTON;
+    containerTestId = MoneyBalanceCardTestIds.FUNDED_CONTAINER;
+  }
+
+  const handleCardPress = useCallback(() => {
+    navigation.navigate(Routes.MONEY.ROOT, {
+      screen: Routes.MONEY.HOME,
+    });
+  }, [navigation]);
+
+  const handleAddPress = useCallback(() => {
+    navigation.navigate(Routes.MONEY.MODALS.ROOT, {
+      screen: Routes.MONEY.MODALS.ADD_MONEY_SHEET,
+    });
+  }, [navigation]);
+
+  const handleGetStartedPress = useCallback(() => {
+    navigation.navigate(Routes.EARN.ROOT, {
+      screen: Routes.EARN.MUSD.CONVERSION_EDUCATION,
+      params: {
+        returnTo: {
+          screen: Routes.MONEY.ROOT,
+          params: { screen: Routes.MONEY.HOME },
+        },
+      },
+    });
+  }, [navigation]);
+
+  const handleButtonPress = isNewUser ? handleGetStartedPress : handleAddPress;
+
+  const handleInfoPress = useCallback(() => {
+    navigation.navigate(Routes.MONEY.MODALS.ROOT, {
+      screen: Routes.MONEY.MODALS.MONEY_BALANCE_INFO_SHEET,
+    });
+  }, [navigation]);
+
+  return (
+    <Pressable
+      testID={containerTestId}
+      onPress={handleCardPress}
+      style={({ pressed }) => [
+        styles.container,
+        tw.style(
+          'flex-row items-center justify-between bg-muted',
+          pressed && 'opacity-80',
+        ),
+      ]}
+    >
+      <Box twClassName="flex-1 gap-1 pr-3">
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          twClassName="gap-1"
+        >
+          <Text
+            variant={TextVariant.BodySm}
+            fontWeight={FontWeight.Medium}
+            color={TextColor.TextDefault}
+            testID={MoneyBalanceCardTestIds.LABEL}
+          >
+            {strings('money.balance_card.label')}
+          </Text>
+          <ButtonIcon
+            iconName={IconName.Info}
+            iconProps={{ color: IconColor.IconDefault }}
+            size={ButtonIconSize.Sm}
+            onPress={handleInfoPress}
+            accessibilityLabel={strings('money.balance_card.info_sheet_title')}
+            testID={MoneyBalanceCardTestIds.INFO_BUTTON}
+          />
+        </Box>
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          twClassName="gap-2"
+        >
+          {isAggregatedBalanceLoading ? (
+            <Skeleton
+              height={24}
+              width={100}
+              testID={MoneyBalanceCardTestIds.BALANCE_SKELETON}
+            />
+          ) : (
+            <Text
+              variant={TextVariant.HeadingMd}
+              fontWeight={FontWeight.Medium}
+              color={TextColor.TextDefault}
+              testID={MoneyBalanceCardTestIds.BALANCE}
+            >
+              {balanceText}
+            </Text>
+          )}
+          {vaultApyQuery.isLoading ? (
+            <Skeleton
+              height={20}
+              width={60}
+              twClassName="rounded-md"
+              testID={MoneyBalanceCardTestIds.APY_TAG_SKELETON}
+            />
+          ) : (
+            <Box
+              twClassName="self-center rounded-md bg-success-muted px-2 py-0.5"
+              testID={MoneyBalanceCardTestIds.APY_TAG}
+            >
+              <Text
+                variant={TextVariant.BodySm}
+                fontWeight={FontWeight.Medium}
+                color={TextColor.SuccessDefault}
+              >
+                {strings('money.apy_label', { percentage: apyPercent ?? 0 })}
+              </Text>
+            </Box>
+          )}
+        </Box>
+      </Box>
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        justifyContent={BoxJustifyContent.End}
+      >
+        <Button
+          testID={buttonTestId}
+          variant={buttonVariant}
+          size={ButtonSize.Md}
+          onPress={handleButtonPress}
+        >
+          {buttonLabel}
+        </Button>
+      </Box>
+    </Pressable>
+  );
+};
+
+export default MoneyBalanceCard;
diff --git a/app/components/UI/Money/components/MoneyBalanceCard/index.ts b/app/components/UI/Money/components/MoneyBalanceCard/index.ts
new file mode 100644
index 00000000000..f9961f83ad5
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyBalanceCard/index.ts
@@ -0,0 +1,2 @@
+export { default } from './MoneyBalanceCard';
+export { MoneyBalanceCardTestIds } from './MoneyBalanceCard.testIds';
diff --git a/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.styles.ts b/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.styles.ts
new file mode 100644
index 00000000000..83a15787e29
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.styles.ts
@@ -0,0 +1,14 @@
+import { StyleSheet } from 'react-native';
+import type { Theme } from '../../../../../util/theme/models';
+
+const styleSheet = (params: { theme: Theme }) =>
+  StyleSheet.create({
+    content: {
+      paddingHorizontal: 16,
+      paddingBottom: 16,
+      gap: 16,
+      backgroundColor: params.theme.colors.background.default,
+    },
+  });
+
+export default styleSheet;
diff --git a/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.test.tsx b/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.test.tsx
new file mode 100644
index 00000000000..1ce76bb0d7a
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.test.tsx
@@ -0,0 +1,128 @@
+import React from 'react';
+import { fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import MoneyBalanceInfoSheet from './MoneyBalanceInfoSheet';
+import { MoneyBalanceInfoSheetTestIds } from './MoneyBalanceInfoSheet.testIds';
+import { strings } from '../../../../../../locales/i18n';
+
+const mockOnCloseBottomSheet = jest.fn((cb?: () => void) => cb?.());
+const mockGoBack = jest.fn();
+
+jest.mock('@react-navigation/native', () => {
+  const actualReactNavigation = jest.requireActual('@react-navigation/native');
+  return {
+    ...actualReactNavigation,
+    useNavigation: () => ({
+      goBack: mockGoBack,
+    }),
+  };
+});
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@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,
+        goBack,
+      }: {
+        children: React.ReactNode;
+        testID?: string;
+        goBack?: () => void;
+      },
+      ref: React.Ref<{ onCloseBottomSheet: (cb?: () => void) => void }>,
+    ) => {
+      ReactActual.useImperativeHandle(ref, () => ({
+        onCloseBottomSheet: mockOnCloseBottomSheet,
+        onOpenBottomSheet: jest.fn(),
+      }));
+      return ReactActual.createElement(
+        View,
+        { testID },
+        ReactActual.createElement(
+          Pressable,
+          {
+            testID: 'bottom-sheet-go-back',
+            onPress: goBack,
+          },
+          ReactActual.createElement(RNText, {}, 'go-back'),
+        ),
+        children,
+      );
+    },
+  );
+
+  const MockBottomSheetHeader = ({
+    children,
+    onClose,
+  }: {
+    children: React.ReactNode;
+    onClose?: () => void;
+  }) =>
+    ReactActual.createElement(
+      View,
+      { testID: 'bottom-sheet-header' },
+      ReactActual.createElement(
+        Pressable,
+        { testID: 'bottom-sheet-close-button', onPress: onClose },
+        ReactActual.createElement(RNText, {}, 'close'),
+      ),
+      children,
+    );
+
+  return {
+    ...actual,
+    BottomSheet: MockBottomSheet,
+    BottomSheetHeader: MockBottomSheetHeader,
+  };
+});
+
+describe('MoneyBalanceInfoSheet', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the container', () => {
+    const { getByTestId } = renderWithProvider(<MoneyBalanceInfoSheet />);
+
+    expect(
+      getByTestId(MoneyBalanceInfoSheetTestIds.CONTAINER),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the sheet title', () => {
+    const { getByTestId } = renderWithProvider(<MoneyBalanceInfoSheet />);
+
+    expect(getByTestId(MoneyBalanceInfoSheetTestIds.TITLE)).toHaveTextContent(
+      strings('money.balance_card.info_sheet_title'),
+    );
+  });
+
+  it('renders the body copy', () => {
+    const { getByTestId } = renderWithProvider(<MoneyBalanceInfoSheet />);
+
+    expect(getByTestId(MoneyBalanceInfoSheetTestIds.BODY)).toHaveTextContent(
+      strings('money.balance_card.info_sheet_body'),
+    );
+  });
+
+  it('closes the sheet when the close button is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyBalanceInfoSheet />);
+
+    fireEvent.press(getByTestId('bottom-sheet-close-button'));
+
+    expect(mockOnCloseBottomSheet).toHaveBeenCalledTimes(1);
+  });
+
+  it('navigates back when the BottomSheet goBack handler is invoked', () => {
+    const { getByTestId } = renderWithProvider(<MoneyBalanceInfoSheet />);
+
+    fireEvent.press(getByTestId('bottom-sheet-go-back'));
+
+    expect(mockGoBack).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.testIds.ts b/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.testIds.ts
new file mode 100644
index 00000000000..11f47f9297d
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.testIds.ts
@@ -0,0 +1,5 @@
+export const MoneyBalanceInfoSheetTestIds = {
+  CONTAINER: 'money-balance-info-sheet-container',
+  TITLE: 'money-balance-info-sheet-title',
+  BODY: 'money-balance-info-sheet-body',
+} as const;
diff --git a/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.tsx b/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.tsx
new file mode 100644
index 00000000000..3b3ec1a9841
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyBalanceInfoSheet/MoneyBalanceInfoSheet.tsx
@@ -0,0 +1,56 @@
+import React, { useCallback, useRef } from 'react';
+import { View } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import {
+  BottomSheet,
+  BottomSheetHeader,
+  type BottomSheetRef,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import { useStyles } from '../../../../../component-library/hooks';
+import styleSheet from './MoneyBalanceInfoSheet.styles';
+import { MoneyBalanceInfoSheetTestIds } from './MoneyBalanceInfoSheet.testIds';
+
+const MoneyBalanceInfoSheet = () => {
+  const sheetRef = useRef<BottomSheetRef>(null);
+  const navigation = useNavigation();
+  const { styles } = useStyles(styleSheet, {});
+
+  const handleGoBack = useCallback(() => {
+    navigation.goBack();
+  }, [navigation]);
+
+  const handleClose = useCallback(() => {
+    sheetRef.current?.onCloseBottomSheet();
+  }, []);
+
+  return (
+    <BottomSheet
+      ref={sheetRef}
+      goBack={handleGoBack}
+      testID={MoneyBalanceInfoSheetTestIds.CONTAINER}
+      keyboardAvoidingViewEnabled={false}
+    >
+      <BottomSheetHeader onClose={handleClose}>
+        <Text
+          variant={TextVariant.HeadingSm}
+          testID={MoneyBalanceInfoSheetTestIds.TITLE}
+        >
+          {strings('money.balance_card.info_sheet_title')}
+        </Text>
+      </BottomSheetHeader>
+      <View style={styles.content}>
+        <Text
+          variant={TextVariant.BodyMd}
+          testID={MoneyBalanceInfoSheetTestIds.BODY}
+        >
+          {strings('money.balance_card.info_sheet_body')}
+        </Text>
+      </View>
+    </BottomSheet>
+  );
+};
+
+export default MoneyBalanceInfoSheet;
diff --git a/app/components/UI/Money/components/MoneyBalanceInfoSheet/index.ts b/app/components/UI/Money/components/MoneyBalanceInfoSheet/index.ts
new file mode 100644
index 00000000000..9bc437212a2
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyBalanceInfoSheet/index.ts
@@ -0,0 +1,2 @@
+export { default } from './MoneyBalanceInfoSheet';
+export { MoneyBalanceInfoSheetTestIds } from './MoneyBalanceInfoSheet.testIds';
diff --git a/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.tsx b/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.tsx
index 183b8878016..bb8f27d72fa 100644
--- a/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.tsx
+++ b/app/components/UI/Money/components/MoneyBalanceSummary/MoneyBalanceSummary.tsx
@@ -9,6 +9,8 @@ import {
   IconColor,
   IconName,
   Skeleton,
+  Tag,
+  TagSeverity,
   Text,
   TextColor,
   TextVariant,
@@ -51,7 +53,7 @@ const MoneyBalanceSummary = ({
         fontWeight={FontWeight.Bold}
         testID={MoneyBalanceSummaryTestIds.TITLE}
       >
-        {strings('money.title')}
+        {strings('money.your_balance')}
       </Text>
     </Box>
 
@@ -87,19 +89,19 @@ const MoneyBalanceSummary = ({
           />
         ) : (
           isPositiveNumber(apy) && (
-            <Box
-              twClassName="self-start rounded-md bg-success-muted px-2 py-0.5"
+            <Tag
+              severity={TagSeverity.Success}
               testID={MoneyBalanceSummaryTestIds.APY_TAG}
             >
               <Text
-                variant={TextVariant.BodySm}
+                variant={TextVariant.BodyMd}
                 fontWeight={FontWeight.Medium}
                 color={TextColor.SuccessDefault}
                 testID={MoneyBalanceSummaryTestIds.APY}
               >
                 {strings('money.apy_label', { percentage: apy })}
               </Text>
-            </Box>
+            </Tag>
           )
         )}
         {onApyInfoPress && isPositiveNumber(apy) && !isLoading && (
diff --git a/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.test.tsx b/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.test.tsx
index 7fee5790fbd..b7c2c74d5d5 100644
--- a/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.test.tsx
+++ b/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.test.tsx
@@ -3,6 +3,9 @@ import { render, fireEvent } from '@testing-library/react-native';
 import MoneyCondensedInfoCards from './MoneyCondensedInfoCards';
 import { MoneyCondensedInfoCardsTestIds } from './MoneyCondensedInfoCards.testIds';
 import { strings } from '../../../../../../locales/i18n';
+import ethTreeImage from '../../../../../images/eth-tree.png';
+import musdCoinImage from '../../../../../images/musd-icon-no-background-2x.png';
+import purpleOrangeRibbonImage from '../../../../../images/purple-orange-ribbon.png';
 
 describe('MoneyCondensedInfoCards', () => {
   it('renders all three cards', () => {
@@ -19,6 +22,26 @@ describe('MoneyCondensedInfoCards', () => {
     ).toBeOnTheScreen();
   });
 
+  it('renders card artwork via expo-image with expected sources and styles', () => {
+    const { getByTestId } = render(<MoneyCondensedInfoCards />);
+
+    const howItWorksImage = getByTestId(
+      MoneyCondensedInfoCardsTestIds.HOW_IT_WORKS_IMAGE,
+    );
+    expect(howItWorksImage.props.source).toBe(ethTreeImage);
+    expect(howItWorksImage.props.style).toEqual({ height: 50, width: 64 });
+
+    const musdImage = getByTestId(MoneyCondensedInfoCardsTestIds.MUSD_IMAGE);
+    expect(musdImage.props.source).toBe(musdCoinImage);
+    expect(musdImage.props.style).toEqual({ height: 50, width: 50 });
+
+    const whatYouGetImage = getByTestId(
+      MoneyCondensedInfoCardsTestIds.WHAT_YOU_GET_IMAGE,
+    );
+    expect(whatYouGetImage.props.source).toBe(purpleOrangeRibbonImage);
+    expect(whatYouGetImage.props.style).toEqual({ height: 64, width: 64 });
+  });
+
   it('renders correct titles and subtitles', () => {
     const { getByText } = render(<MoneyCondensedInfoCards />);
 
diff --git a/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.testIds.ts b/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.testIds.ts
index 3c98d2d374c..2e4ac210293 100644
--- a/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.testIds.ts
+++ b/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.testIds.ts
@@ -1,6 +1,9 @@
 export const MoneyCondensedInfoCardsTestIds = {
   CONTAINER: 'money-condensed-info-cards-container',
   HOW_IT_WORKS_CARD: 'money-condensed-info-cards-how-it-works',
+  HOW_IT_WORKS_IMAGE: 'money-condensed-info-cards-how-it-works-image',
   MUSD_CARD: 'money-condensed-info-cards-musd',
+  MUSD_IMAGE: 'money-condensed-info-cards-musd-image',
   WHAT_YOU_GET_CARD: 'money-condensed-info-cards-what-you-get',
+  WHAT_YOU_GET_IMAGE: 'money-condensed-info-cards-what-you-get-image',
 } as const;
diff --git a/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.tsx b/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.tsx
index 8b4d478e820..3aafdc2bb91 100644
--- a/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.tsx
+++ b/app/components/UI/Money/components/MoneyCondensedInfoCards/MoneyCondensedInfoCards.tsx
@@ -15,6 +15,10 @@ import {
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../../../locales/i18n';
 import { MoneyCondensedInfoCardsTestIds } from './MoneyCondensedInfoCards.testIds';
+import ethTreeImage from '../../../../../images/eth-tree.png';
+import musdCoinImage from '../../../../../images/musd-icon-no-background-2x.png';
+import purpleOrangeRibbonImage from '../../../../../images/purple-orange-ribbon.png';
+import { Image, ImageProps } from 'expo-image';
 
 interface MoneyCondensedInfoCardsProps {
   onHowItWorksPress?: () => void;
@@ -23,13 +27,13 @@ interface MoneyCondensedInfoCardsProps {
 }
 
 const CondensedCard = ({
-  iconName,
+  image,
   title,
   subtitle,
   onPress,
   testID,
 }: {
-  iconName: IconName;
+  image: Pick<ImageProps, 'source' | 'style' | 'testID'>;
   title: string;
   subtitle: string;
   onPress?: () => void;
@@ -45,11 +49,19 @@ const CondensedCard = ({
         alignItems={BoxAlignItems.Center}
         twClassName="bg-muted rounded-xl size-[78px] justify-center"
       >
-        <Icon
-          name={iconName}
-          size={IconSize.Xl}
-          color={IconColor.IconAlternative}
-        />
+        {image?.source ? (
+          <Image
+            source={image.source}
+            style={image.style}
+            testID={image.testID}
+          />
+        ) : (
+          <Icon
+            name={IconName.Info}
+            size={IconSize.Xl}
+            color={IconColor.IconAlternative}
+          />
+        )}
       </Box>
       <Box twClassName="flex-1 gap-1">
         <Text variant={TextVariant.BodySm} fontWeight={FontWeight.Medium}>
@@ -77,21 +89,33 @@ const MoneyCondensedInfoCards = ({
     testID={MoneyCondensedInfoCardsTestIds.CONTAINER}
   >
     <CondensedCard
-      iconName={IconName.Stake}
+      image={{
+        source: ethTreeImage,
+        style: { height: 50, width: 64 },
+        testID: MoneyCondensedInfoCardsTestIds.HOW_IT_WORKS_IMAGE,
+      }}
       title={strings('money.condensed_cards.how_it_works_title')}
       subtitle={strings('money.condensed_cards.how_it_works_subtitle')}
       onPress={onHowItWorksPress}
       testID={MoneyCondensedInfoCardsTestIds.HOW_IT_WORKS_CARD}
     />
     <CondensedCard
-      iconName={IconName.Coin}
+      image={{
+        source: musdCoinImage,
+        style: { height: 50, width: 50 },
+        testID: MoneyCondensedInfoCardsTestIds.MUSD_IMAGE,
+      }}
       title={strings('money.condensed_cards.musd_title')}
       subtitle={strings('money.condensed_cards.musd_subtitle')}
       onPress={onMusdPress}
       testID={MoneyCondensedInfoCardsTestIds.MUSD_CARD}
     />
     <CondensedCard
-      iconName={IconName.SwapHorizontal}
+      image={{
+        source: purpleOrangeRibbonImage,
+        style: { height: 64, width: 64 },
+        testID: MoneyCondensedInfoCardsTestIds.WHAT_YOU_GET_IMAGE,
+      }}
       title={strings('money.condensed_cards.what_you_get_title')}
       subtitle={strings('money.condensed_cards.what_you_get_subtitle')}
       onPress={onWhatYouGetPress}
diff --git a/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.test.tsx b/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.test.tsx
index 8433297d1e1..b6d6d933ce7 100644
--- a/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.test.tsx
+++ b/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.test.tsx
@@ -5,12 +5,20 @@ import MoneyConvertStablecoins from './MoneyConvertStablecoins';
 import { MoneyConvertStablecoinsTestIds } from './MoneyConvertStablecoins.testIds';
 import { strings } from '../../../../../../locales/i18n';
 import { AssetType } from '../../../../Views/confirmations/types/token';
-import { ConvertTokenRowTestIds } from '../../../Earn/components/Musd/ConvertTokenRow';
+import { MusdConversionAssetRowTestIds } from '../../../Earn/components/Musd/MusdConversionAssetRow';
 import {
   selectHasUnapprovedMusdConversion,
   selectHasInFlightMusdConversion,
   selectMusdConversionStatuses,
 } from '../../../Earn/selectors/musdConversionStatus';
+import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import { MUSD_EVENTS_CONSTANTS } from '../../../Earn/constants/events/musdEvents';
+import { MONEY_EVENTS_CONSTANTS } from '../../constants/moneyEvents';
+
+const { EVENT_LOCATIONS: MUSD_EVENT_LOCATIONS } = MUSD_EVENTS_CONSTANTS;
+const { EVENT_LOCATIONS: MONEY_EVENT_LOCATIONS } = MONEY_EVENTS_CONSTANTS;
+
+const TEST_LOCATION = MONEY_EVENT_LOCATIONS.MONEY_HUB;
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -19,6 +27,43 @@ jest.mock('react-redux', () => ({
 
 const mockUseSelector = useSelector as jest.Mock;
 
+const mockUseMusdConversionTokens = jest.fn();
+const mockInitiateMaxConversion = jest.fn();
+const mockInitiateCustomConversion = jest.fn();
+const mockTrackEvent = jest.fn();
+const mockAddProperties = jest.fn();
+const mockBuild = jest.fn(() => ({ event: 'built' }));
+const mockCreateEventBuilder = jest.fn(() => ({
+  addProperties: mockAddProperties,
+  build: mockBuild,
+}));
+
+mockAddProperties.mockReturnValue({
+  build: mockBuild,
+});
+
+jest.mock('../../../Earn/hooks/useMusdConversionTokens', () => ({
+  useMusdConversionTokens: () => mockUseMusdConversionTokens(),
+}));
+
+jest.mock('../../../Earn/hooks/useMusdConversion', () => ({
+  useMusdConversion: () => ({
+    initiateMaxConversion: mockInitiateMaxConversion,
+    initiateCustomConversion: mockInitiateCustomConversion,
+  }),
+}));
+
+jest.mock('../../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  }),
+}));
+
+jest.mock('../../../Earn/utils/network', () => ({
+  getNetworkName: jest.fn(() => 'Ethereum Mainnet'),
+}));
+
 jest.mock('../../../../../component-library/base-components/TagBase', () => ({
   __esModule: true,
   default: ({ children }: { children: React.ReactNode }) => {
@@ -38,9 +83,9 @@ jest.mock(
   },
 );
 
-jest.mock('../../../Earn/components/Musd/ConvertTokenRow', () => {
+jest.mock('../../../Earn/components/Musd/MusdConversionAssetRow', () => {
   const { TouchableOpacity, Text } = jest.requireActual('react-native');
-  const MockConvertTokenRow = ({
+  const MockMusdConversionAssetRow = ({
     token,
     onMaxPress,
     onEditPress,
@@ -49,27 +94,27 @@ jest.mock('../../../Earn/components/Musd/ConvertTokenRow', () => {
     onMaxPress: (t: unknown) => void;
     onEditPress: (t: unknown) => void;
   }) => (
-    <TouchableOpacity testID="convert-token-row-container">
-      <Text testID="convert-token-row-token-name">{token.symbol}</Text>
+    <TouchableOpacity testID="musd-conversion-asset-row-container">
+      <Text testID="musd-conversion-asset-row-token-name">{token.symbol}</Text>
       <TouchableOpacity
-        testID="convert-token-row-max-button"
+        testID="musd-conversion-asset-row-max-button"
         onPress={() => onMaxPress(token)}
       />
       <TouchableOpacity
-        testID="convert-token-row-edit-button"
+        testID="musd-conversion-asset-row-edit-button"
         onPress={() => onEditPress(token)}
       />
     </TouchableOpacity>
   );
-  MockConvertTokenRow.displayName = 'ConvertTokenRow';
+  MockMusdConversionAssetRow.displayName = 'MusdConversionAssetRow';
   return {
     __esModule: true,
-    default: MockConvertTokenRow,
-    ConvertTokenRowTestIds: {
-      CONTAINER: 'convert-token-row-container',
-      TOKEN_NAME: 'convert-token-row-token-name',
-      MAX_BUTTON: 'convert-token-row-max-button',
-      EDIT_BUTTON: 'convert-token-row-edit-button',
+    default: MockMusdConversionAssetRow,
+    MusdConversionAssetRowTestIds: {
+      CONTAINER: 'musd-conversion-asset-row-container',
+      TOKEN_NAME: 'musd-conversion-asset-row-token-name',
+      MAX_BUTTON: 'musd-conversion-asset-row-max-button',
+      EDIT_BUTTON: 'musd-conversion-asset-row-edit-button',
     },
   };
 });
@@ -103,28 +148,24 @@ const MOCK_DAI: AssetType = {
 
 const mockTokens: AssetType[] = [MOCK_USDC, MOCK_USDT, MOCK_DAI];
 
-const defaultProps = {
-  tokens: mockTokens,
-  onMaxPress: jest.fn(),
-  onEditPress: jest.fn(),
-  onLearnMorePress: jest.fn(),
-};
-
 describe('MoneyConvertStablecoins', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockAddProperties.mockReturnValue({ build: mockBuild });
+    mockBuild.mockReturnValue({ event: 'built' });
     mockUseSelector.mockImplementation((selector) => {
       if (selector === selectHasUnapprovedMusdConversion) return false;
       if (selector === selectHasInFlightMusdConversion) return false;
       if (selector === selectMusdConversionStatuses) return {};
       return undefined;
     });
+    mockUseMusdConversionTokens.mockReturnValue({ tokens: mockTokens });
   });
 
   describe('with eligible tokens', () => {
     it('renders the container', () => {
       const { getByTestId } = render(
-        <MoneyConvertStablecoins {...defaultProps} />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
       expect(
@@ -134,7 +175,7 @@ describe('MoneyConvertStablecoins', () => {
 
     it('renders the convert title', () => {
       const { getByText } = render(
-        <MoneyConvertStablecoins {...defaultProps} />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
       expect(
@@ -144,7 +185,7 @@ describe('MoneyConvertStablecoins', () => {
 
     it('renders the description with bonus text', () => {
       const { getByTestId } = render(
-        <MoneyConvertStablecoins {...defaultProps} />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
       expect(
@@ -154,7 +195,7 @@ describe('MoneyConvertStablecoins', () => {
 
     it('renders feature tags', () => {
       const { getByTestId } = render(
-        <MoneyConvertStablecoins {...defaultProps} />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
       expect(
@@ -162,18 +203,18 @@ describe('MoneyConvertStablecoins', () => {
       ).toBeOnTheScreen();
     });
 
-    it('renders a ConvertTokenRow for each token', () => {
+    it('renders a MusdConversionAssetRow for each token', () => {
       const { getAllByTestId } = render(
-        <MoneyConvertStablecoins {...defaultProps} />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
-      const rows = getAllByTestId(ConvertTokenRowTestIds.CONTAINER);
+      const rows = getAllByTestId(MusdConversionAssetRowTestIds.CONTAINER);
       expect(rows).toHaveLength(3);
     });
 
     it('renders token symbols', () => {
       const { getByText } = render(
-        <MoneyConvertStablecoins {...defaultProps} />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
       expect(getByText('USDC')).toBeOnTheScreen();
@@ -181,69 +222,68 @@ describe('MoneyConvertStablecoins', () => {
       expect(getByText('DAI')).toBeOnTheScreen();
     });
 
-    it('renders the Learn more button', () => {
-      const { getByTestId } = render(
-        <MoneyConvertStablecoins {...defaultProps} />,
+    it('initiates max conversion and tracks event with location when Max is pressed', () => {
+      const { getAllByTestId } = render(
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
-      expect(
-        getByTestId(MoneyConvertStablecoinsTestIds.LEARN_MORE_CTA),
-      ).toBeOnTheScreen();
-    });
-
-    it('calls onLearnMorePress when Learn more is pressed', () => {
-      const mockLearnMore = jest.fn();
-      const { getByTestId } = render(
-        <MoneyConvertStablecoins
-          {...defaultProps}
-          onLearnMorePress={mockLearnMore}
-        />,
+      const maxButtons = getAllByTestId(
+        MusdConversionAssetRowTestIds.MAX_BUTTON,
       );
+      fireEvent.press(maxButtons[0]);
 
-      fireEvent.press(
-        getByTestId(MoneyConvertStablecoinsTestIds.LEARN_MORE_CTA),
+      expect(mockInitiateMaxConversion).toHaveBeenCalledWith(MOCK_USDC);
+      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+        MetaMetricsEvents.MONEY_HUB_TOKEN_ROW_CONVERT_CLICKED,
       );
-
-      expect(mockLearnMore).toHaveBeenCalledTimes(1);
-    });
-
-    it('calls onMaxPress with token when Max is pressed', () => {
-      const mockMaxPress = jest.fn();
-      const { getAllByTestId } = render(
-        <MoneyConvertStablecoins {...defaultProps} onMaxPress={mockMaxPress} />,
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({
+          location: TEST_LOCATION,
+          button_action: 'max',
+          asset_symbol: 'USDC',
+          redirects_to:
+            MUSD_EVENT_LOCATIONS.QUICK_CONVERT_MAX_BOTTOM_SHEET_CONFIRMATION_SCREEN,
+        }),
       );
-
-      const maxButtons = getAllByTestId(ConvertTokenRowTestIds.MAX_BUTTON);
-      fireEvent.press(maxButtons[0]);
-
-      expect(mockMaxPress).toHaveBeenCalledWith(MOCK_USDC);
     });
 
-    it('calls onEditPress with token when Edit is pressed', () => {
-      const mockEditPress = jest.fn();
+    it('initiates custom conversion and tracks event with location when Edit is pressed', () => {
       const { getAllByTestId } = render(
-        <MoneyConvertStablecoins
-          {...defaultProps}
-          onEditPress={mockEditPress}
-        />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
-      const editButtons = getAllByTestId(ConvertTokenRowTestIds.EDIT_BUTTON);
+      const editButtons = getAllByTestId(
+        MusdConversionAssetRowTestIds.EDIT_BUTTON,
+      );
       fireEvent.press(editButtons[1]);
 
-      expect(mockEditPress).toHaveBeenCalledWith(MOCK_USDT);
+      expect(mockInitiateCustomConversion).toHaveBeenCalledWith(
+        expect.objectContaining({
+          preferredPaymentToken: {
+            address: MOCK_USDT.address,
+            chainId: MOCK_USDT.chainId,
+          },
+        }),
+      );
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({
+          location: TEST_LOCATION,
+          button_action: 'custom',
+          asset_symbol: 'USDT',
+          redirects_to: MUSD_EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN,
+        }),
+      );
     });
   });
 
   describe('without eligible tokens', () => {
-    const infoProps = {
-      ...defaultProps,
-      tokens: [],
-    };
+    beforeEach(() => {
+      mockUseMusdConversionTokens.mockReturnValue({ tokens: [] });
+    });
 
     it('renders the container', () => {
       const { getByTestId } = render(
-        <MoneyConvertStablecoins {...infoProps} />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
       expect(
@@ -252,7 +292,9 @@ describe('MoneyConvertStablecoins', () => {
     });
 
     it('renders the convert title', () => {
-      const { getByText } = render(<MoneyConvertStablecoins {...infoProps} />);
+      const { getByText } = render(
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
+      );
 
       expect(
         getByText(strings('money.convert_stablecoins.title')),
@@ -261,7 +303,7 @@ describe('MoneyConvertStablecoins', () => {
 
     it('renders stacked token icons', () => {
       const { getByTestId } = render(
-        <MoneyConvertStablecoins {...infoProps} />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
       expect(
@@ -271,7 +313,7 @@ describe('MoneyConvertStablecoins', () => {
 
     it('renders the description', () => {
       const { getByTestId } = render(
-        <MoneyConvertStablecoins {...infoProps} />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
       expect(
@@ -281,7 +323,7 @@ describe('MoneyConvertStablecoins', () => {
 
     it('renders feature tags', () => {
       const { getByTestId } = render(
-        <MoneyConvertStablecoins {...infoProps} />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
       expect(
@@ -291,20 +333,10 @@ describe('MoneyConvertStablecoins', () => {
 
     it('does not render token rows', () => {
       const { queryByTestId } = render(
-        <MoneyConvertStablecoins {...infoProps} />,
+        <MoneyConvertStablecoins location={TEST_LOCATION} />,
       );
 
-      expect(queryByTestId(ConvertTokenRowTestIds.CONTAINER)).toBeNull();
-    });
-
-    it('renders Learn more button', () => {
-      const { getByTestId } = render(
-        <MoneyConvertStablecoins {...infoProps} />,
-      );
-
-      expect(
-        getByTestId(MoneyConvertStablecoinsTestIds.LEARN_MORE_CTA),
-      ).toBeOnTheScreen();
+      expect(queryByTestId(MusdConversionAssetRowTestIds.CONTAINER)).toBeNull();
     });
   });
 });
diff --git a/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.testIds.ts b/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.testIds.ts
index 007ab9a71db..61496089ba5 100644
--- a/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.testIds.ts
+++ b/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.testIds.ts
@@ -2,6 +2,5 @@ export const MoneyConvertStablecoinsTestIds = {
   CONTAINER: 'money-convert-stablecoins-container',
   DESCRIPTION: 'money-convert-stablecoins-description',
   FEATURE_TAGS: 'money-convert-stablecoins-feature-tags',
-  LEARN_MORE_CTA: 'money-convert-stablecoins-learn-more-cta',
   TOKEN_ICONS: 'money-convert-stablecoins-token-icons',
 } as const;
diff --git a/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.tsx b/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.tsx
index 411a42fbeac..536269ec90e 100644
--- a/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.tsx
+++ b/app/components/UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins.tsx
@@ -1,10 +1,7 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import {
   Box,
   BoxFlexDirection,
-  Button,
-  ButtonSize,
-  ButtonVariant,
   FontWeight,
   Icon,
   IconColor,
@@ -26,10 +23,10 @@ import { AvatarVariant } from '../../../../../component-library/components/Avata
 import { strings } from '../../../../../../locales/i18n';
 import { useTheme } from '../../../../../util/theme';
 import { buildTokenIconUrl } from '../../../Card/util/buildTokenIconUrl';
-import ConvertTokenRow from '../../../Earn/components/Musd/ConvertTokenRow';
+import MusdConversionAssetRow from '../../../Earn/components/Musd/MusdConversionAssetRow';
 import { AssetType } from '../../../../Views/confirmations/types/token';
 import { MoneyConvertStablecoinsTestIds } from './MoneyConvertStablecoins.testIds';
-import { CaipChainId } from '@metamask/utils';
+import { CaipChainId, Hex } from '@metamask/utils';
 import { useSelector } from 'react-redux';
 import {
   createTokenChainKey,
@@ -37,12 +34,18 @@ import {
   selectHasUnapprovedMusdConversion,
   selectMusdConversionStatuses,
 } from '../../../Earn/selectors/musdConversionStatus';
+import { useMusdConversionTokens } from '../../../Earn/hooks/useMusdConversionTokens';
+import { useMusdConversion } from '../../../Earn/hooks/useMusdConversion';
+import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
+import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import { MUSD_EVENTS_CONSTANTS } from '../../../Earn/constants/events/musdEvents';
+import { getNetworkName } from '../../../Earn/utils/network';
+import Logger from '../../../../../util/Logger';
+
+const { EVENT_LOCATIONS: MUSD_EVENT_LOCATIONS } = MUSD_EVENTS_CONSTANTS;
 
 interface MoneyConvertStablecoinsProps {
-  tokens: AssetType[];
-  onMaxPress: (token: AssetType) => void;
-  onEditPress: (token: AssetType) => void;
-  onLearnMorePress: () => void;
+  location: string;
 }
 
 const FEATURE_TAGS = [
@@ -134,13 +137,86 @@ const Description = () => (
 );
 
 const MoneyConvertStablecoins = ({
-  tokens,
-  onMaxPress,
-  onEditPress,
-  onLearnMorePress,
+  location,
 }: MoneyConvertStablecoinsProps) => {
+  const { tokens } = useMusdConversionTokens();
+  const { initiateMaxConversion, initiateCustomConversion } =
+    useMusdConversion();
+  const { trackEvent, createEventBuilder } = useAnalytics();
+
   const hasTokens = tokens.length > 0;
 
+  const handleMaxPress = useCallback(
+    async (token: AssetType) => {
+      try {
+        trackEvent(
+          createEventBuilder(
+            MetaMetricsEvents.MONEY_HUB_TOKEN_ROW_CONVERT_CLICKED,
+          )
+            .addProperties({
+              location,
+              button_type: 'text_button',
+              button_action: 'max',
+              button_text: strings('earn.musd_conversion.max'),
+              redirects_to:
+                MUSD_EVENT_LOCATIONS.QUICK_CONVERT_MAX_BOTTOM_SHEET_CONFIRMATION_SCREEN,
+              asset_symbol: token.symbol,
+              network_chain_id: token.chainId,
+              network_name: token.chainId
+                ? getNetworkName(token.chainId as Hex)
+                : 'unknown',
+            })
+            .build(),
+        );
+        await initiateMaxConversion(token);
+      } catch (error) {
+        Logger.error(error as Error, {
+          message:
+            '[MoneyConvertStablecoins] Failed to initiate max conversion',
+        });
+      }
+    },
+    [createEventBuilder, initiateMaxConversion, location, trackEvent],
+  );
+
+  const handleEditPress = useCallback(
+    async (token: AssetType) => {
+      try {
+        trackEvent(
+          createEventBuilder(
+            MetaMetricsEvents.MONEY_HUB_TOKEN_ROW_CONVERT_CLICKED,
+          )
+            .addProperties({
+              location,
+              button_type: 'icon_button',
+              icon: IconName.Edit,
+              button_action: 'custom',
+              redirects_to: MUSD_EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN,
+              asset_symbol: token.symbol,
+              network_chain_id: token.chainId,
+              network_name: token.chainId
+                ? getNetworkName(token.chainId as Hex)
+                : 'unknown',
+            })
+            .build(),
+        );
+
+        await initiateCustomConversion({
+          preferredPaymentToken: {
+            address: token.address as Hex,
+            chainId: token.chainId as Hex,
+          },
+        });
+      } catch (error) {
+        Logger.error(error as Error, {
+          message:
+            '[MoneyConvertStablecoins] Failed to initiate custom conversion',
+        });
+      }
+    },
+    [createEventBuilder, initiateCustomConversion, location, trackEvent],
+  );
+
   const hasUnapprovedMusdConversion = useSelector(
     selectHasUnapprovedMusdConversion,
   );
@@ -194,10 +270,10 @@ const MoneyConvertStablecoins = ({
         <Box twClassName="mt-3">
           {tokens.map((token) => (
             <Box key={`${token.address}-${token.chainId}`} twClassName="px-4">
-              <ConvertTokenRow
+              <MusdConversionAssetRow
                 token={token}
-                onMaxPress={onMaxPress}
-                onEditPress={onEditPress}
+                onMaxPress={handleMaxPress}
+                onEditPress={handleEditPress}
                 areActionsDisabled={
                   hasUnapprovedMusdConversion || hasInFlightMusdConversion
                 }
@@ -207,18 +283,6 @@ const MoneyConvertStablecoins = ({
           ))}
         </Box>
       )}
-
-      <Box twClassName="px-4 mt-3">
-        <Button
-          variant={ButtonVariant.Secondary}
-          size={ButtonSize.Lg}
-          isFullWidth
-          onPress={onLearnMorePress}
-          testID={MoneyConvertStablecoinsTestIds.LEARN_MORE_CTA}
-        >
-          {strings('money.convert_stablecoins.learn_more')}
-        </Button>
-      </Box>
     </Box>
   );
 };
diff --git a/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.test.tsx b/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.test.tsx
index 6decc6d7507..ee847929b0d 100644
--- a/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.test.tsx
+++ b/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.test.tsx
@@ -1,88 +1,107 @@
 import React from 'react';
-import { render, fireEvent } from '@testing-library/react-native';
+import { render } from '@testing-library/react-native';
 import MoneyEarnings from './MoneyEarnings';
 import { MoneyEarningsTestIds } from './MoneyEarnings.testIds';
 import { strings } from '../../../../../../locales/i18n';
 
+const ZERO_VALUE = '$0.00';
+const MONTHLY_VALUE = '$1.23';
+const YEARLY_VALUE = '$14.76';
+
 describe('MoneyEarnings', () => {
   it('renders the section title', () => {
-    const { getByText } = render(<MoneyEarnings />);
+    const { getByText } = render(
+      <MoneyEarnings
+        monthlyEarnings={ZERO_VALUE}
+        yearlyEarnings={ZERO_VALUE}
+      />,
+    );
 
     expect(getByText(strings('money.earnings.title'))).toBeOnTheScreen();
   });
 
-  it('renders both default zero values when no props are provided', () => {
-    const { getByTestId } = render(<MoneyEarnings />);
+  it('renders the estimated monthly and yearly labels', () => {
+    const { getByText } = render(
+      <MoneyEarnings
+        monthlyEarnings={ZERO_VALUE}
+        yearlyEarnings={ZERO_VALUE}
+      />,
+    );
 
-    expect(getByTestId(MoneyEarningsTestIds.LIFETIME_VALUE)).toHaveTextContent(
-      '$0.00',
+    expect(
+      getByText(strings('money.earnings.estimated_monthly')),
+    ).toBeOnTheScreen();
+    expect(
+      getByText(strings('money.earnings.estimated_yearly')),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the provided zero values when no real earnings exist', () => {
+    const { getByTestId } = render(
+      <MoneyEarnings
+        monthlyEarnings={ZERO_VALUE}
+        yearlyEarnings={ZERO_VALUE}
+      />,
+    );
+
+    expect(getByTestId(MoneyEarningsTestIds.MONTHLY_VALUE)).toHaveTextContent(
+      ZERO_VALUE,
     );
-    expect(getByTestId(MoneyEarningsTestIds.PROJECTED_VALUE)).toHaveTextContent(
-      '$0.00',
+    expect(getByTestId(MoneyEarningsTestIds.YEARLY_VALUE)).toHaveTextContent(
+      ZERO_VALUE,
     );
   });
 
-  it('renders the provided lifetime and projected earnings values', () => {
+  it('renders the provided monthly and yearly earnings values', () => {
     const { getByTestId } = render(
-      <MoneyEarnings lifetimeEarnings="$12.34" projectedEarnings="$56.78" />,
+      <MoneyEarnings
+        monthlyEarnings={MONTHLY_VALUE}
+        yearlyEarnings={YEARLY_VALUE}
+      />,
     );
 
-    expect(getByTestId(MoneyEarningsTestIds.LIFETIME_VALUE)).toHaveTextContent(
-      '$12.34',
+    expect(getByTestId(MoneyEarningsTestIds.MONTHLY_VALUE)).toHaveTextContent(
+      MONTHLY_VALUE,
     );
-    expect(getByTestId(MoneyEarningsTestIds.PROJECTED_VALUE)).toHaveTextContent(
-      '$56.78',
+    expect(getByTestId(MoneyEarningsTestIds.YEARLY_VALUE)).toHaveTextContent(
+      YEARLY_VALUE,
     );
   });
 
   it('renders skeletons instead of values when loading', () => {
-    const { getByTestId, queryByTestId } = render(<MoneyEarnings isLoading />);
+    const { getByTestId, queryByTestId } = render(
+      <MoneyEarnings
+        monthlyEarnings={ZERO_VALUE}
+        yearlyEarnings={ZERO_VALUE}
+        isLoading
+      />,
+    );
 
     expect(
-      getByTestId(MoneyEarningsTestIds.LIFETIME_SKELETON),
-    ).toBeOnTheScreen();
-    expect(
-      getByTestId(MoneyEarningsTestIds.PROJECTED_SKELETON),
+      getByTestId(MoneyEarningsTestIds.MONTHLY_SKELETON),
     ).toBeOnTheScreen();
+    expect(getByTestId(MoneyEarningsTestIds.YEARLY_SKELETON)).toBeOnTheScreen();
     expect(
-      queryByTestId(MoneyEarningsTestIds.LIFETIME_VALUE),
+      queryByTestId(MoneyEarningsTestIds.MONTHLY_VALUE),
     ).not.toBeOnTheScreen();
     expect(
-      queryByTestId(MoneyEarningsTestIds.PROJECTED_VALUE),
+      queryByTestId(MoneyEarningsTestIds.YEARLY_VALUE),
     ).not.toBeOnTheScreen();
   });
 
-  it('renders the navigation chevron on the projected column', () => {
-    const { getByTestId } = render(<MoneyEarnings />);
-
-    expect(
-      getByTestId(MoneyEarningsTestIds.PROJECTED_CHEVRON),
-    ).toBeOnTheScreen();
-  });
-
-  it('calls onProjectedPress when the projected column is tapped', () => {
-    const mockPress = jest.fn();
+  it('renders value text in default color regardless of sign', () => {
     const { getByTestId } = render(
-      <MoneyEarnings onProjectedPress={mockPress} />,
+      <MoneyEarnings
+        monthlyEarnings={MONTHLY_VALUE}
+        yearlyEarnings={YEARLY_VALUE}
+      />,
     );
 
-    fireEvent.press(getByTestId(MoneyEarningsTestIds.PROJECTED));
-
-    expect(mockPress).toHaveBeenCalledTimes(1);
-  });
-
-  it('does not throw when the projected column is tapped without a handler', () => {
-    const { getByTestId } = render(<MoneyEarnings />);
-
-    expect(() => {
-      fireEvent.press(getByTestId(MoneyEarningsTestIds.PROJECTED));
-    }).not.toThrow();
-  });
-
-  it('renders lifetime earnings in success color when value starts with +', () => {
-    const { getByTestId } = render(<MoneyEarnings lifetimeEarnings="+$2.84" />);
-
-    const lifetimeValue = getByTestId(MoneyEarningsTestIds.LIFETIME_VALUE);
-    expect(lifetimeValue).toHaveTextContent('+$2.84');
+    expect(getByTestId(MoneyEarningsTestIds.MONTHLY_VALUE)).toHaveTextContent(
+      MONTHLY_VALUE,
+    );
+    expect(getByTestId(MoneyEarningsTestIds.YEARLY_VALUE)).toHaveTextContent(
+      YEARLY_VALUE,
+    );
   });
 });
diff --git a/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.testIds.ts b/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.testIds.ts
index 8884c689e63..b2082b2a838 100644
--- a/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.testIds.ts
+++ b/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.testIds.ts
@@ -1,10 +1,9 @@
 export const MoneyEarningsTestIds = {
   CONTAINER: 'money-earnings-container',
-  LIFETIME: 'money-earnings-lifetime',
-  LIFETIME_VALUE: 'money-earnings-lifetime-value',
-  LIFETIME_SKELETON: 'money-earnings-lifetime-skeleton',
-  PROJECTED: 'money-earnings-projected',
-  PROJECTED_VALUE: 'money-earnings-projected-value',
-  PROJECTED_SKELETON: 'money-earnings-projected-skeleton',
-  PROJECTED_CHEVRON: 'money-earnings-projected-chevron',
+  MONTHLY: 'money-earnings-monthly',
+  MONTHLY_VALUE: 'money-earnings-monthly-value',
+  MONTHLY_SKELETON: 'money-earnings-monthly-skeleton',
+  YEARLY: 'money-earnings-yearly',
+  YEARLY_VALUE: 'money-earnings-yearly-value',
+  YEARLY_SKELETON: 'money-earnings-yearly-skeleton',
 } as const;
diff --git a/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.tsx b/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.tsx
index fda158c0833..2ceef8618c7 100644
--- a/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.tsx
+++ b/app/components/UI/Money/components/MoneyEarnings/MoneyEarnings.tsx
@@ -1,14 +1,9 @@
 import React from 'react';
-import { Pressable, StyleSheet } from 'react-native';
 import {
   Box,
   BoxAlignItems,
   BoxFlexDirection,
   FontWeight,
-  Icon,
-  IconColor,
-  IconName,
-  IconSize,
   Skeleton,
   Text,
   TextColor,
@@ -18,47 +13,39 @@ import { strings } from '../../../../../../locales/i18n';
 import MoneySectionHeader from '../MoneySectionHeader';
 import { MoneyEarningsTestIds } from './MoneyEarnings.testIds';
 
-const DEFAULT_VALUE = '$0.00';
-
-const styles = StyleSheet.create({
-  projectedColumn: { flex: 1 },
-});
-
 interface MoneyEarningsProps {
   /**
-   * Cumulative yield earned to date. Falls back to "$0.00" when omitted.
+   * Estimated monthly earnings based on current balance and APY, formatted in
+   * the user's selected currency.
    */
-  lifetimeEarnings?: string;
+  monthlyEarnings: string;
   /**
-   * Forward-looking earnings based on current balance and APY. Falls back to
-   * "$0.00" when omitted.
+   * Estimated yearly earnings based on current balance and APY, formatted in
+   * the user's selected currency.
    */
-  projectedEarnings?: string;
+  yearlyEarnings: string;
   /**
    * Render skeletons in place of the two earnings values while data is being
    * fetched.
    */
   isLoading?: boolean;
   /**
-   * Handler fired when the projected column is tapped. Navigates to the "Earn
-   * on your crypto" page (MUSD follow-up).
+   * Handler fired when the info icon next to the section title is tapped.
+   * Opens the Earnings tooltip bottom sheet.
    */
-  onProjectedPress?: () => void;
+  onInfoPress?: () => void;
 }
 
 const ValueText = ({
   children,
   testID,
-  color,
 }: {
   children: string;
   testID: string;
-  color?: TextColor;
 }) => (
   <Text
     variant={TextVariant.BodyMd}
     fontWeight={FontWeight.Medium}
-    color={color}
     testID={testID}
   >
     {children}
@@ -66,85 +53,62 @@ const ValueText = ({
 );
 
 const MoneyEarnings = ({
-  lifetimeEarnings = DEFAULT_VALUE,
-  projectedEarnings = DEFAULT_VALUE,
+  monthlyEarnings,
+  yearlyEarnings,
   isLoading = false,
-  onProjectedPress,
+  onInfoPress,
 }: MoneyEarningsProps) => (
   <Box twClassName="px-4 py-3" testID={MoneyEarningsTestIds.CONTAINER}>
-    <MoneySectionHeader title={strings('money.earnings.title')} />
+    <MoneySectionHeader
+      title={strings('money.earnings.title')}
+      onInfoPress={onInfoPress}
+      infoAccessibilityLabel={strings('money.earnings.info_label')}
+    />
 
-    <Box
-      flexDirection={BoxFlexDirection.Row}
-      alignItems={BoxAlignItems.Start}
-      twClassName="mt-3 gap-4"
-    >
-      <Box twClassName="flex-1 gap-0.5" testID={MoneyEarningsTestIds.LIFETIME}>
-        <Text
-          variant={TextVariant.BodySm}
-          fontWeight={FontWeight.Medium}
-          color={TextColor.TextAlternative}
-        >
-          {strings('money.earnings.lifetime')}
+    <Box twClassName="mt-3 gap-4">
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        twClassName="justify-between"
+        testID={MoneyEarningsTestIds.MONTHLY}
+      >
+        <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+          {strings('money.earnings.estimated_monthly')}
         </Text>
         {isLoading ? (
           <Skeleton
             height={24}
             width={80}
-            testID={MoneyEarningsTestIds.LIFETIME_SKELETON}
+            testID={MoneyEarningsTestIds.MONTHLY_SKELETON}
           />
         ) : (
-          <ValueText
-            testID={MoneyEarningsTestIds.LIFETIME_VALUE}
-            color={
-              lifetimeEarnings.startsWith('+')
-                ? TextColor.SuccessDefault
-                : undefined
-            }
-          >
-            {lifetimeEarnings}
+          <ValueText testID={MoneyEarningsTestIds.MONTHLY_VALUE}>
+            {monthlyEarnings}
           </ValueText>
         )}
       </Box>
 
-      <Pressable
-        onPress={onProjectedPress}
-        style={styles.projectedColumn}
-        testID={MoneyEarningsTestIds.PROJECTED}
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        twClassName="justify-between"
+        testID={MoneyEarningsTestIds.YEARLY}
       >
-        <Box twClassName="gap-0.5">
-          <Box
-            flexDirection={BoxFlexDirection.Row}
-            alignItems={BoxAlignItems.Center}
-            twClassName="gap-1"
-          >
-            <Text
-              variant={TextVariant.BodySm}
-              fontWeight={FontWeight.Medium}
-              color={TextColor.TextAlternative}
-            >
-              {strings('money.earnings.projected')}
-            </Text>
-            <Icon
-              name={IconName.ArrowRight}
-              size={IconSize.Sm}
-              color={IconColor.IconAlternative}
-              testID={MoneyEarningsTestIds.PROJECTED_CHEVRON}
-            />
-          </Box>
-          {isLoading ? (
-            <Skeleton
-              height={24}
-              width={80}
-              testID={MoneyEarningsTestIds.PROJECTED_SKELETON}
-            />
-          ) : (
-            <ValueText testID={MoneyEarningsTestIds.PROJECTED_VALUE}>
-              {projectedEarnings}
-            </ValueText>
-          )}
-        </Box>
-      </Pressable>
+        <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+          {strings('money.earnings.estimated_yearly')}
+        </Text>
+        {isLoading ? (
+          <Skeleton
+            height={24}
+            width={80}
+            testID={MoneyEarningsTestIds.YEARLY_SKELETON}
+          />
+        ) : (
+          <ValueText testID={MoneyEarningsTestIds.YEARLY_VALUE}>
+            {yearlyEarnings}
+          </ValueText>
+        )}
+      </Box>
     </Box>
   </Box>
 );
diff --git a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.styles.ts b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.styles.ts
new file mode 100644
index 00000000000..2b468c1d5dc
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.styles.ts
@@ -0,0 +1,14 @@
+import { StyleSheet } from 'react-native';
+import type { Theme } from '../../../../../util/theme/models';
+
+const styleSheet = (params: { theme: Theme }) =>
+  StyleSheet.create({
+    content: {
+      paddingHorizontal: 16,
+      paddingBottom: 8,
+      gap: 16,
+      backgroundColor: params.theme.colors.background.default,
+    },
+  });
+
+export default styleSheet;
diff --git a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.test.tsx b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.test.tsx
new file mode 100644
index 00000000000..727eb9817d7
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.test.tsx
@@ -0,0 +1,120 @@
+import React from 'react';
+import { fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import MoneyEarningsInfoSheet from './MoneyEarningsInfoSheet';
+import { MoneyEarningsInfoSheetTestIds } from './MoneyEarningsInfoSheet.testIds';
+import { strings } from '../../../../../../locales/i18n';
+
+const mockOnCloseBottomSheet = jest.fn((cb?: () => void) => cb?.());
+const mockGoBack = jest.fn();
+
+jest.mock('@react-navigation/native', () => {
+  const actualReactNavigation = jest.requireActual('@react-navigation/native');
+  return {
+    ...actualReactNavigation,
+    useNavigation: () => ({
+      goBack: mockGoBack,
+    }),
+  };
+});
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@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 MockBottomSheetHeader = ({
+    children,
+    onClose,
+  }: {
+    children: React.ReactNode;
+    onClose?: () => void;
+  }) =>
+    ReactActual.createElement(
+      View,
+      { testID: 'bottom-sheet-header' },
+      ReactActual.createElement(
+        Pressable,
+        { testID: 'bottom-sheet-close-button', onPress: onClose },
+        ReactActual.createElement(RNText, {}, 'close'),
+      ),
+      children,
+    );
+
+  return {
+    ...actual,
+    BottomSheet: MockBottomSheet,
+    BottomSheetHeader: MockBottomSheetHeader,
+  };
+});
+
+describe('MoneyEarningsInfoSheet', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the container', () => {
+    const { getByTestId } = renderWithProvider(<MoneyEarningsInfoSheet />);
+
+    expect(
+      getByTestId(MoneyEarningsInfoSheetTestIds.CONTAINER),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the sheet title', () => {
+    const { getByText } = renderWithProvider(<MoneyEarningsInfoSheet />);
+
+    expect(
+      getByText(strings('money.earnings_tooltip.title')),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the body paragraph', () => {
+    const { getByText } = renderWithProvider(<MoneyEarningsInfoSheet />);
+
+    expect(getByText(strings('money.earnings_tooltip.body'))).toBeOnTheScreen();
+  });
+
+  it('renders the Got It footer button', () => {
+    const { getByTestId } = renderWithProvider(<MoneyEarningsInfoSheet />);
+
+    expect(
+      getByTestId(MoneyEarningsInfoSheetTestIds.GOT_IT_BUTTON),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the correct label on the Got It button', () => {
+    const { getByText } = renderWithProvider(<MoneyEarningsInfoSheet />);
+
+    expect(getByText(strings('browser.got_it'))).toBeOnTheScreen();
+  });
+
+  it('closes the sheet when the Got It button is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyEarningsInfoSheet />);
+
+    fireEvent.press(getByTestId(MoneyEarningsInfoSheetTestIds.GOT_IT_BUTTON));
+
+    expect(mockOnCloseBottomSheet).toHaveBeenCalledTimes(1);
+  });
+
+  it('closes the sheet when the close button is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyEarningsInfoSheet />);
+
+    fireEvent.press(getByTestId('bottom-sheet-close-button'));
+
+    expect(mockOnCloseBottomSheet).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.testIds.ts b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.testIds.ts
new file mode 100644
index 00000000000..a1d718b93b6
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.testIds.ts
@@ -0,0 +1,4 @@
+export const MoneyEarningsInfoSheetTestIds = {
+  CONTAINER: 'money-earnings-info-sheet-container',
+  GOT_IT_BUTTON: 'money-earnings-info-sheet-got-it-button',
+} as const;
diff --git a/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.tsx b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.tsx
new file mode 100644
index 00000000000..b6ea317d279
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyEarningsInfoSheet/MoneyEarningsInfoSheet.tsx
@@ -0,0 +1,65 @@
+import React, { useCallback, useRef } from 'react';
+import { View } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import {
+  BottomSheet,
+  BottomSheetFooter,
+  BottomSheetHeader,
+  ButtonSize,
+  type BottomSheetRef,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import { useStyles } from '../../../../../component-library/hooks';
+import styleSheet from './MoneyEarningsInfoSheet.styles';
+import { MoneyEarningsInfoSheetTestIds } from './MoneyEarningsInfoSheet.testIds';
+
+const MoneyEarningsInfoSheet = () => {
+  const sheetRef = useRef<BottomSheetRef>(null);
+  const navigation = useNavigation();
+  const { styles } = useStyles(styleSheet, {});
+
+  const handleGoBack = useCallback(() => {
+    navigation.goBack();
+  }, [navigation]);
+
+  const handleClose = useCallback(() => {
+    sheetRef.current?.onCloseBottomSheet();
+  }, []);
+
+  const handleGotItPress = useCallback(() => {
+    sheetRef.current?.onCloseBottomSheet();
+  }, []);
+
+  return (
+    <BottomSheet
+      ref={sheetRef}
+      goBack={handleGoBack}
+      testID={MoneyEarningsInfoSheetTestIds.CONTAINER}
+      keyboardAvoidingViewEnabled={false}
+    >
+      <BottomSheetHeader onClose={handleClose}>
+        <Text variant={TextVariant.HeadingSm}>
+          {strings('money.earnings_tooltip.title')}
+        </Text>
+      </BottomSheetHeader>
+      <View style={styles.content}>
+        <Text variant={TextVariant.BodyMd}>
+          {strings('money.earnings_tooltip.body')}
+        </Text>
+      </View>
+      <BottomSheetFooter
+        primaryButtonProps={{
+          size: ButtonSize.Lg,
+          children: strings('browser.got_it'),
+          onPress: handleGotItPress,
+          testID: MoneyEarningsInfoSheetTestIds.GOT_IT_BUTTON,
+        }}
+        twClassName="px-4 pt-6 pb-6"
+      />
+    </BottomSheet>
+  );
+};
+
+export default MoneyEarningsInfoSheet;
diff --git a/app/components/UI/Money/components/MoneyEarningsInfoSheet/index.ts b/app/components/UI/Money/components/MoneyEarningsInfoSheet/index.ts
new file mode 100644
index 00000000000..b1c0dfbbd46
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyEarningsInfoSheet/index.ts
@@ -0,0 +1 @@
+export { default } from './MoneyEarningsInfoSheet';
diff --git a/app/components/UI/Money/components/MoneyFooter/MoneyFooter.styles.ts b/app/components/UI/Money/components/MoneyFooter/MoneyFooter.styles.ts
deleted file mode 100644
index b56bbae502d..00000000000
--- a/app/components/UI/Money/components/MoneyFooter/MoneyFooter.styles.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-const createStyles = (bottom: number) =>
-  StyleSheet.create({
-    container: {
-      paddingBottom: Math.max(bottom, 16),
-    },
-  });
-
-export default createStyles;
diff --git a/app/components/UI/Money/components/MoneyFooter/MoneyFooter.tsx b/app/components/UI/Money/components/MoneyFooter/MoneyFooter.tsx
index 2733cbcffee..22d48ff7ba4 100644
--- a/app/components/UI/Money/components/MoneyFooter/MoneyFooter.tsx
+++ b/app/components/UI/Money/components/MoneyFooter/MoneyFooter.tsx
@@ -1,5 +1,4 @@
-import React, { useMemo } from 'react';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import React from 'react';
 import {
   Box,
   Button,
@@ -8,7 +7,6 @@ import {
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../../../locales/i18n';
 import { MoneyFooterTestIds } from './MoneyFooter.testIds';
-import createStyles from './MoneyFooter.styles';
 
 interface MoneyFooterProps {
   onAddMoneyPress?: () => void;
@@ -16,27 +14,18 @@ interface MoneyFooterProps {
 
 const MoneyFooter = ({
   onAddMoneyPress = () => undefined,
-}: MoneyFooterProps) => {
-  const { bottom } = useSafeAreaInsets();
-  const styles = useMemo(() => createStyles(bottom), [bottom]);
-
-  return (
-    <Box
-      twClassName="px-4 pt-4 bg-default"
-      style={styles.container}
-      testID={MoneyFooterTestIds.CONTAINER}
+}: MoneyFooterProps) => (
+  <Box twClassName="px-4 py-3" testID={MoneyFooterTestIds.CONTAINER}>
+    <Button
+      variant={ButtonVariant.Primary}
+      size={ButtonSize.Lg}
+      isFullWidth
+      onPress={onAddMoneyPress}
+      testID={MoneyFooterTestIds.ADD_MONEY_BUTTON}
     >
-      <Button
-        variant={ButtonVariant.Primary}
-        size={ButtonSize.Lg}
-        isFullWidth
-        onPress={onAddMoneyPress}
-        testID={MoneyFooterTestIds.ADD_MONEY_BUTTON}
-      >
-        {strings('money.footer.add_money')}
-      </Button>
-    </Box>
-  );
-};
+      {strings('money.footer.add_money')}
+    </Button>
+  </Box>
+);
 
 export default MoneyFooter;
diff --git a/app/components/UI/Money/components/MoneyHeader/MoneyHeader.test.tsx b/app/components/UI/Money/components/MoneyHeader/MoneyHeader.test.tsx
index e6957fb1603..2b7a7ebcc97 100644
--- a/app/components/UI/Money/components/MoneyHeader/MoneyHeader.test.tsx
+++ b/app/components/UI/Money/components/MoneyHeader/MoneyHeader.test.tsx
@@ -2,34 +2,27 @@ import React from 'react';
 import { render, fireEvent } from '@testing-library/react-native';
 import MoneyHeader from './MoneyHeader';
 import { MoneyHeaderTestIds } from './MoneyHeader.testIds';
-
-const noop = jest.fn();
+import { strings } from '../../../../../../locales/i18n';
 
 describe('MoneyHeader', () => {
-  it('renders the back and menu buttons', () => {
-    const { getByTestId } = render(
-      <MoneyHeader onBackPress={noop} onMenuPress={noop} />,
-    );
+  it('renders the menu button', () => {
+    const { getByTestId } = render(<MoneyHeader onMenuPress={jest.fn()} />);
 
-    expect(getByTestId(MoneyHeaderTestIds.BACK_BUTTON)).toBeOnTheScreen();
     expect(getByTestId(MoneyHeaderTestIds.MENU_BUTTON)).toBeOnTheScreen();
   });
 
-  it('calls onBackPress when the back button is pressed', () => {
-    const mockOnBackPress = jest.fn();
-    const { getByTestId } = render(
-      <MoneyHeader onBackPress={mockOnBackPress} onMenuPress={noop} />,
-    );
-
-    fireEvent.press(getByTestId(MoneyHeaderTestIds.BACK_BUTTON));
+  it('renders the Money title alongside the menu button', () => {
+    const { getByTestId } = render(<MoneyHeader onMenuPress={jest.fn()} />);
 
-    expect(mockOnBackPress).toHaveBeenCalledTimes(1);
+    expect(getByTestId(MoneyHeaderTestIds.TITLE)).toHaveTextContent(
+      strings('money.title'),
+    );
   });
 
   it('calls onMenuPress when the menu button is pressed', () => {
     const mockOnMenuPress = jest.fn();
     const { getByTestId } = render(
-      <MoneyHeader onBackPress={noop} onMenuPress={mockOnMenuPress} />,
+      <MoneyHeader onMenuPress={mockOnMenuPress} />,
     );
 
     fireEvent.press(getByTestId(MoneyHeaderTestIds.MENU_BUTTON));
diff --git a/app/components/UI/Money/components/MoneyHeader/MoneyHeader.testIds.ts b/app/components/UI/Money/components/MoneyHeader/MoneyHeader.testIds.ts
index 29abd63b1cd..e41dc9605c5 100644
--- a/app/components/UI/Money/components/MoneyHeader/MoneyHeader.testIds.ts
+++ b/app/components/UI/Money/components/MoneyHeader/MoneyHeader.testIds.ts
@@ -1,5 +1,5 @@
 export const MoneyHeaderTestIds = {
   CONTAINER: 'money-header-container',
-  BACK_BUTTON: 'money-header-back-button',
+  TITLE: 'money-header-title',
   MENU_BUTTON: 'money-header-menu-button',
 } as const;
diff --git a/app/components/UI/Money/components/MoneyHeader/MoneyHeader.tsx b/app/components/UI/Money/components/MoneyHeader/MoneyHeader.tsx
index da1cb440f54..f63fd31d16c 100644
--- a/app/components/UI/Money/components/MoneyHeader/MoneyHeader.tsx
+++ b/app/components/UI/Money/components/MoneyHeader/MoneyHeader.tsx
@@ -1,26 +1,25 @@
 import React from 'react';
-import { HeaderStandard, IconName } from '@metamask/design-system-react-native';
+import {
+  HeaderBase,
+  HeaderBaseVariant,
+  IconName,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
 import { MoneyHeaderTestIds } from './MoneyHeader.testIds';
 
 interface MoneyHeaderProps {
-  /**
-   * Handler for the back/navigation button
-   */
-  onBackPress: () => void;
   /**
    * Handler for the options menu button
    */
   onMenuPress: () => void;
 }
 
-const MoneyHeader = ({ onBackPress, onMenuPress }: MoneyHeaderProps) => (
-  <HeaderStandard
+const MoneyHeader = ({ onMenuPress }: MoneyHeaderProps) => (
+  <HeaderBase
     testID={MoneyHeaderTestIds.CONTAINER}
-    onBack={onBackPress}
-    backButtonProps={{
-      accessibilityLabel: 'Back',
-      testID: MoneyHeaderTestIds.BACK_BUTTON,
-    }}
+    variant={HeaderBaseVariant.Display}
+    twClassName="px-4"
+    titleTestID={MoneyHeaderTestIds.TITLE}
     endButtonIconProps={[
       {
         iconName: IconName.MoreVertical,
@@ -29,7 +28,9 @@ const MoneyHeader = ({ onBackPress, onMenuPress }: MoneyHeaderProps) => (
         testID: MoneyHeaderTestIds.MENU_BUTTON,
       },
     ]}
-  />
+  >
+    {strings('money.title')}
+  </HeaderBase>
 );
 
 export default MoneyHeader;
diff --git a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.styles.ts b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.styles.ts
index 386a64c6428..8c132c100e7 100644
--- a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.styles.ts
+++ b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.styles.ts
@@ -5,6 +5,10 @@ const styles = StyleSheet.create({
     width: 104,
     height: 66,
   },
+  linkCardImage: {
+    width: 152,
+    height: 96,
+  },
 });
 
 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 55ec813d7e1..485b94c2ad7 100644
--- a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.test.tsx
+++ b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.test.tsx
@@ -6,7 +6,9 @@ import { strings } from '../../../../../../locales/i18n';
 
 describe('MoneyMetaMaskCard', () => {
   it('renders the section title and subtitle', () => {
-    const { getByText } = render(<MoneyMetaMaskCard />);
+    const { getByText } = render(
+      <MoneyMetaMaskCard onGetNowPress={jest.fn()} />,
+    );
 
     expect(getByText(strings('money.metamask_card.title'))).toBeOnTheScreen();
     expect(
@@ -15,7 +17,9 @@ describe('MoneyMetaMaskCard', () => {
   });
 
   it('renders virtual card row', () => {
-    const { getByText, getByTestId } = render(<MoneyMetaMaskCard />);
+    const { getByText, getByTestId } = render(
+      <MoneyMetaMaskCard onGetNowPress={jest.fn()} />,
+    );
 
     expect(
       getByText(strings('money.metamask_card.virtual_card')),
@@ -28,8 +32,10 @@ describe('MoneyMetaMaskCard', () => {
     ).toBeOnTheScreen();
   });
 
-  it('renders metal card row', () => {
-    const { getByText, getByTestId } = render(<MoneyMetaMaskCard />);
+  it('renders metal card row when showMetalCard is true', () => {
+    const { getByText, getByTestId } = render(
+      <MoneyMetaMaskCard onGetNowPress={jest.fn()} showMetalCard />,
+    );
 
     expect(
       getByText(strings('money.metamask_card.metal_card')),
@@ -42,34 +48,58 @@ describe('MoneyMetaMaskCard', () => {
     ).toBeOnTheScreen();
   });
 
-  it('calls onGetNowPress with "virtual" when virtual card Get now is pressed', () => {
+  it('hides metal card row by default (showMetalCard not provided)', () => {
+    const { queryByTestId, queryByText } = render(
+      <MoneyMetaMaskCard onGetNowPress={jest.fn()} />,
+    );
+
+    expect(
+      queryByTestId(MoneyMetaMaskCardTestIds.METAL_CARD_ROW),
+    ).not.toBeOnTheScreen();
+    expect(
+      queryByText(strings('money.metamask_card.metal_card')),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('hides metal card row when showMetalCard is false', () => {
+    const { queryByTestId } = render(
+      <MoneyMetaMaskCard onGetNowPress={jest.fn()} showMetalCard={false} />,
+    );
+
+    expect(
+      queryByTestId(MoneyMetaMaskCardTestIds.METAL_CARD_ROW),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('calls onGetNowPress when virtual card Get now is pressed', () => {
     const mockGetNow = jest.fn();
-    const { getAllByText } = render(
+    const { getByText } = render(
       <MoneyMetaMaskCard onGetNowPress={mockGetNow} />,
     );
 
-    const getNowButtons = getAllByText(strings('money.metamask_card.get_now'));
-    fireEvent.press(getNowButtons[0]);
+    fireEvent.press(getByText(strings('money.metamask_card.get_now')));
 
-    expect(mockGetNow).toHaveBeenCalledWith('virtual');
+    expect(mockGetNow).toHaveBeenCalledTimes(1);
+    expect(mockGetNow.mock.calls[0]).toEqual([]);
   });
 
-  it('calls onGetNowPress with "metal" when metal card Get now is pressed', () => {
+  it('calls onGetNowPress when metal card Get now is pressed', () => {
     const mockGetNow = jest.fn();
     const { getAllByText } = render(
-      <MoneyMetaMaskCard onGetNowPress={mockGetNow} />,
+      <MoneyMetaMaskCard onGetNowPress={mockGetNow} showMetalCard />,
     );
-
     const getNowButtons = getAllByText(strings('money.metamask_card.get_now'));
+
     fireEvent.press(getNowButtons[1]);
 
-    expect(mockGetNow).toHaveBeenCalledWith('metal');
+    expect(mockGetNow).toHaveBeenCalledTimes(1);
+    expect(mockGetNow.mock.calls[0]).toEqual([]);
   });
 
   describe('link mode', () => {
     it('renders link subtitle instead of upsell subtitle', () => {
       const { getByText, queryByText } = render(
-        <MoneyMetaMaskCard mode="link" />,
+        <MoneyMetaMaskCard mode="link" onGetNowPress={jest.fn()} />,
       );
 
       expect(
@@ -81,7 +111,9 @@ describe('MoneyMetaMaskCard', () => {
     });
 
     it('renders card image in link mode', () => {
-      const { getByTestId } = render(<MoneyMetaMaskCard mode="link" />);
+      const { getByTestId } = render(
+        <MoneyMetaMaskCard mode="link" onGetNowPress={jest.fn()} />,
+      );
 
       expect(
         getByTestId(MoneyMetaMaskCardTestIds.LINK_CARD_IMAGE),
@@ -89,7 +121,9 @@ describe('MoneyMetaMaskCard', () => {
     });
 
     it('renders cashback and APY bullets', () => {
-      const { getByTestId } = render(<MoneyMetaMaskCard mode="link" apy={5} />);
+      const { getByTestId } = render(
+        <MoneyMetaMaskCard mode="link" apy={5} onGetNowPress={jest.fn()} />,
+      );
 
       expect(
         getByTestId(MoneyMetaMaskCardTestIds.LINK_BULLET_CASHBACK),
@@ -100,7 +134,9 @@ describe('MoneyMetaMaskCard', () => {
     });
 
     it('renders "Link card" button', () => {
-      const { getByTestId } = render(<MoneyMetaMaskCard mode="link" />);
+      const { getByTestId } = render(
+        <MoneyMetaMaskCard mode="link" onGetNowPress={jest.fn()} />,
+      );
 
       expect(
         getByTestId(MoneyMetaMaskCardTestIds.LINK_BUTTON),
@@ -108,7 +144,9 @@ describe('MoneyMetaMaskCard', () => {
     });
 
     it('hides virtual and metal card rows in link mode', () => {
-      const { queryByTestId } = render(<MoneyMetaMaskCard mode="link" />);
+      const { queryByTestId } = render(
+        <MoneyMetaMaskCard mode="link" onGetNowPress={jest.fn()} />,
+      );
 
       expect(
         queryByTestId(MoneyMetaMaskCardTestIds.VIRTUAL_CARD_ROW),
@@ -121,7 +159,11 @@ describe('MoneyMetaMaskCard', () => {
     it('calls onLinkPress when "Link card" button is pressed', () => {
       const mockLink = jest.fn();
       const { getByTestId } = render(
-        <MoneyMetaMaskCard mode="link" onLinkPress={mockLink} />,
+        <MoneyMetaMaskCard
+          mode="link"
+          onGetNowPress={jest.fn()}
+          onLinkPress={mockLink}
+        />,
       );
 
       fireEvent.press(getByTestId(MoneyMetaMaskCardTestIds.LINK_BUTTON));
@@ -129,7 +171,9 @@ describe('MoneyMetaMaskCard', () => {
     });
 
     it('renders link-specific section title', () => {
-      const { getByText } = render(<MoneyMetaMaskCard mode="link" />);
+      const { getByText } = render(
+        <MoneyMetaMaskCard mode="link" onGetNowPress={jest.fn()} />,
+      );
 
       expect(
         getByText(strings('money.metamask_card.link_title')),
@@ -139,7 +183,11 @@ describe('MoneyMetaMaskCard', () => {
     it('calls onHeaderPress when section header is tapped in link mode', () => {
       const mockHeader = jest.fn();
       const { getByText } = render(
-        <MoneyMetaMaskCard mode="link" onHeaderPress={mockHeader} />,
+        <MoneyMetaMaskCard
+          mode="link"
+          onGetNowPress={jest.fn()}
+          onHeaderPress={mockHeader}
+        />,
       );
 
       fireEvent.press(getByText(strings('money.metamask_card.link_title')));
@@ -148,8 +196,10 @@ describe('MoneyMetaMaskCard', () => {
   });
 
   describe('upsell mode (default)', () => {
-    it('renders virtual and metal card rows', () => {
-      const { getByTestId } = render(<MoneyMetaMaskCard />);
+    it('renders virtual and metal card rows when showMetalCard is true', () => {
+      const { getByTestId } = render(
+        <MoneyMetaMaskCard onGetNowPress={jest.fn()} showMetalCard />,
+      );
 
       expect(
         getByTestId(MoneyMetaMaskCardTestIds.VIRTUAL_CARD_ROW),
@@ -159,8 +209,23 @@ describe('MoneyMetaMaskCard', () => {
       ).toBeOnTheScreen();
     });
 
+    it('renders only the virtual card row when showMetalCard is false', () => {
+      const { getByTestId, queryByTestId } = render(
+        <MoneyMetaMaskCard onGetNowPress={jest.fn()} showMetalCard={false} />,
+      );
+
+      expect(
+        getByTestId(MoneyMetaMaskCardTestIds.VIRTUAL_CARD_ROW),
+      ).toBeOnTheScreen();
+      expect(
+        queryByTestId(MoneyMetaMaskCardTestIds.METAL_CARD_ROW),
+      ).not.toBeOnTheScreen();
+    });
+
     it('does not render link mode elements', () => {
-      const { queryByTestId } = render(<MoneyMetaMaskCard />);
+      const { queryByTestId } = render(
+        <MoneyMetaMaskCard onGetNowPress={jest.fn()} />,
+      );
 
       expect(
         queryByTestId(MoneyMetaMaskCardTestIds.LINK_BUTTON),
diff --git a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.tsx b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.tsx
index 6f796d92b9a..aa195159598 100644
--- a/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.tsx
+++ b/app/components/UI/Money/components/MoneyMetaMaskCard/MoneyMetaMaskCard.tsx
@@ -13,6 +13,8 @@ import {
   IconColor,
   IconName,
   IconSize,
+  Tag,
+  TagSeverity,
   Text,
   TextColor,
   TextVariant,
@@ -28,12 +30,18 @@ import mmCardMetal from '../../../../../images/mm_card_metal.png';
 interface MoneyMetaMaskCardProps {
   /** 'upsell' (default): virtual/metal card rows. 'link': card-linking CTA layout. */
   mode?: 'upsell' | 'link';
-  onGetNowPress?: (cardType: string) => void;
+  onGetNowPress: () => void;
   onHeaderPress?: () => void;
   /** Called when the "Link card" button is pressed (link mode only). */
   onLinkPress?: () => void;
   /** Current APY value displayed in the link mode bullet. */
   apy?: number;
+  /**
+   * Whether to render the Metal card row in upsell mode. Defaults to `false`
+   * because the Metal card is currently only available to US users; the parent
+   * is expected to pass the geolocation-derived flag.
+   */
+  showMetalCard?: boolean;
 }
 
 const CardRow = ({
@@ -66,15 +74,11 @@ const CardRow = ({
         <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
           {cardName}
         </Text>
-        <Text
-          variant={TextVariant.BodySm}
-          fontWeight={FontWeight.Regular}
-          color={TextColor.SuccessDefault}
-        >
+        <Tag severity={TagSeverity.Success}>
           {strings('money.metamask_card.cashback', {
             percentage: cashbackPercentage,
           })}
-        </Text>
+        </Tag>
       </Box>
     </Box>
     <Button
@@ -127,12 +131,13 @@ const LinkContent = ({
     </Text>
     <Box
       flexDirection={BoxFlexDirection.Row}
+      alignItems={BoxAlignItems.Center}
       twClassName="gap-4"
       testID={MoneyMetaMaskCardTestIds.LINK_CONTAINER}
     >
       <Image
         source={mmCardMetal}
-        style={styles.cardImage}
+        style={styles.linkCardImage}
         testID={MoneyMetaMaskCardTestIds.LINK_CARD_IMAGE}
       />
       <Box twClassName="gap-2 flex-1 justify-center">
@@ -162,19 +167,12 @@ const LinkContent = ({
 
 const MoneyMetaMaskCard = ({
   mode = 'upsell',
-  onGetNowPress = () => undefined,
+  onGetNowPress,
   onHeaderPress,
   onLinkPress,
   apy,
+  showMetalCard = false,
 }: MoneyMetaMaskCardProps) => {
-  const handleVirtualPress = useCallback(
-    () => onGetNowPress('virtual'),
-    [onGetNowPress],
-  );
-  const handleMetalPress = useCallback(
-    () => onGetNowPress('metal'),
-    [onGetNowPress],
-  );
   const handleLinkPress = useCallback(() => onLinkPress?.(), [onLinkPress]);
 
   return (
@@ -205,16 +203,18 @@ const MoneyMetaMaskCard = ({
             imageSource={mmCardRegular}
             cardName={strings('money.metamask_card.virtual_card')}
             cashbackPercentage="1"
-            onPress={handleVirtualPress}
+            onPress={onGetNowPress}
             testID={MoneyMetaMaskCardTestIds.VIRTUAL_CARD_ROW}
           />
-          <CardRow
-            imageSource={mmCardMetal}
-            cardName={strings('money.metamask_card.metal_card')}
-            cashbackPercentage="3"
-            onPress={handleMetalPress}
-            testID={MoneyMetaMaskCardTestIds.METAL_CARD_ROW}
-          />
+          {showMetalCard && (
+            <CardRow
+              imageSource={mmCardMetal}
+              cardName={strings('money.metamask_card.metal_card')}
+              cashbackPercentage="3"
+              onPress={onGetNowPress}
+              testID={MoneyMetaMaskCardTestIds.METAL_CARD_ROW}
+            />
+          )}
         </>
       )}
     </Box>
diff --git a/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.styles.tsx b/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.styles.tsx
new file mode 100644
index 00000000000..346695c4108
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.styles.tsx
@@ -0,0 +1,20 @@
+import { StyleSheet } from 'react-native';
+import type { Theme } from '../../../../../util/theme/models';
+
+const styleSheet = (params: { theme: Theme }) =>
+  StyleSheet.create({
+    list: {
+      paddingBottom: 16,
+      backgroundColor: params.theme.colors.background.default,
+    },
+    row: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      gap: 16,
+      paddingHorizontal: 16,
+      paddingVertical: 8,
+      minHeight: 59,
+    },
+  });
+
+export default styleSheet;
diff --git a/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.test.tsx b/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.test.tsx
new file mode 100644
index 00000000000..6b4ed44351e
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.test.tsx
@@ -0,0 +1,109 @@
+import React from 'react';
+import { Linking } from 'react-native';
+import { fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import MoneyMoreSheet from './MoneyMoreSheet';
+import { MoneyMoreSheetTestIds } from './MoneyMoreSheet.testIds';
+import { strings } from '../../../../../../locales/i18n';
+import Routes from '../../../../../constants/navigation/Routes';
+import AppConstants from '../../../../../core/AppConstants';
+import { METAMASK_SUPPORT_URL } from '../../../../../constants/urls';
+
+const mockOnCloseBottomSheet = jest.fn((cb?: () => void) => cb?.());
+const mockNavigate = jest.fn();
+const mockGoBack = jest.fn();
+
+jest.mock('@react-navigation/native', () => {
+  const actualReactNavigation = jest.requireActual('@react-navigation/native');
+  return {
+    ...actualReactNavigation,
+    useNavigation: () => ({
+      navigate: mockNavigate,
+      goBack: mockGoBack,
+    }),
+  };
+});
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  const { forwardRef, useImperativeHandle } = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  const MockBottomSheet = forwardRef(
+    (
+      { children, testID }: { children: React.ReactNode; testID?: string },
+      ref: React.Ref<{ onCloseBottomSheet: (cb?: () => void) => void }>,
+    ) => {
+      useImperativeHandle(ref, () => ({
+        onCloseBottomSheet: mockOnCloseBottomSheet,
+        onOpenBottomSheet: jest.fn(),
+      }));
+      return <View testID={testID}>{children}</View>;
+    },
+  );
+  const MockBottomSheetHeader = ({
+    children,
+  }: {
+    children: React.ReactNode;
+  }) => <View>{children}</View>;
+  return {
+    ...actual,
+    BottomSheet: MockBottomSheet,
+    BottomSheetHeader: MockBottomSheetHeader,
+  };
+});
+
+describe('MoneyMoreSheet', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.spyOn(Linking, 'openURL').mockResolvedValue(undefined);
+  });
+
+  it('renders all three menu options', () => {
+    const { getByTestId } = renderWithProvider(<MoneyMoreSheet />);
+
+    expect(
+      getByTestId(MoneyMoreSheetTestIds.HOW_IT_WORKS_OPTION),
+    ).toBeOnTheScreen();
+    expect(
+      getByTestId(MoneyMoreSheetTestIds.WHAT_YOU_GET_OPTION),
+    ).toBeOnTheScreen();
+    expect(
+      getByTestId(MoneyMoreSheetTestIds.CONTACT_SUPPORT_OPTION),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders the sheet title', () => {
+    const { getByText } = renderWithProvider(<MoneyMoreSheet />);
+
+    expect(getByText(strings('money.more_sheet.title'))).toBeOnTheScreen();
+  });
+
+  it('navigates to MoneyHowItWorks when "How it works" is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyMoreSheet />);
+
+    fireEvent.press(getByTestId(MoneyMoreSheetTestIds.HOW_IT_WORKS_OPTION));
+
+    expect(mockOnCloseBottomSheet).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.HOW_IT_WORKS);
+  });
+
+  it('opens the mUSD learn more URL when "What you get" is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyMoreSheet />);
+
+    fireEvent.press(getByTestId(MoneyMoreSheetTestIds.WHAT_YOU_GET_OPTION));
+
+    expect(mockOnCloseBottomSheet).toHaveBeenCalledTimes(1);
+    expect(Linking.openURL).toHaveBeenCalledWith(
+      AppConstants.URLS.MUSD_LEARN_MORE,
+    );
+  });
+
+  it('opens the MetaMask support URL when "Contact support" is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyMoreSheet />);
+
+    fireEvent.press(getByTestId(MoneyMoreSheetTestIds.CONTACT_SUPPORT_OPTION));
+
+    expect(mockOnCloseBottomSheet).toHaveBeenCalledTimes(1);
+    expect(Linking.openURL).toHaveBeenCalledWith(METAMASK_SUPPORT_URL);
+  });
+});
diff --git a/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.testIds.ts b/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.testIds.ts
new file mode 100644
index 00000000000..557189f9b83
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.testIds.ts
@@ -0,0 +1,6 @@
+export const MoneyMoreSheetTestIds = {
+  CONTAINER: 'money-more-sheet-container',
+  HOW_IT_WORKS_OPTION: 'money-more-sheet-how-it-works',
+  WHAT_YOU_GET_OPTION: 'money-more-sheet-what-you-get',
+  CONTACT_SUPPORT_OPTION: 'money-more-sheet-contact-support',
+} as const;
diff --git a/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.tsx b/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.tsx
new file mode 100644
index 00000000000..f8ba219b8d4
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyMoreSheet/MoneyMoreSheet.tsx
@@ -0,0 +1,118 @@
+import React, { useCallback, useRef } from 'react';
+import { TouchableOpacity, View, Linking } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import {
+  BottomSheet,
+  BottomSheetHeader,
+  type BottomSheetRef,
+  FontWeight,
+  Icon,
+  IconName,
+  IconSize,
+  IconColor,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import { useStyles } from '../../../../../component-library/hooks';
+import Routes from '../../../../../constants/navigation/Routes';
+import AppConstants from '../../../../../core/AppConstants';
+import { METAMASK_SUPPORT_URL } from '../../../../../constants/urls';
+import styleSheet from './MoneyMoreSheet.styles';
+import { MoneyMoreSheetTestIds } from './MoneyMoreSheet.testIds';
+
+interface MenuOption {
+  label: string;
+  icon: IconName;
+  onPress: () => void;
+  testID: string;
+}
+
+const MoneyMoreSheet = () => {
+  const sheetRef = useRef<BottomSheetRef>(null);
+  const navigation = useNavigation();
+  const { styles } = useStyles(styleSheet, {});
+
+  const closeAndNavigate = useCallback((navigateFn: () => void) => {
+    sheetRef.current?.onCloseBottomSheet(navigateFn);
+  }, []);
+
+  const handleGoBack = useCallback(() => {
+    navigation.goBack();
+  }, [navigation]);
+
+  const handleHowItWorks = useCallback(() => {
+    closeAndNavigate(() => {
+      navigation.navigate(Routes.MONEY.HOW_IT_WORKS as never);
+    });
+  }, [closeAndNavigate, navigation]);
+
+  const handleWhatYouGet = useCallback(() => {
+    closeAndNavigate(() => {
+      Linking.openURL(AppConstants.URLS.MUSD_LEARN_MORE);
+    });
+  }, [closeAndNavigate]);
+
+  const handleContactSupport = useCallback(() => {
+    closeAndNavigate(() => {
+      Linking.openURL(METAMASK_SUPPORT_URL);
+    });
+  }, [closeAndNavigate]);
+
+  const options: MenuOption[] = [
+    {
+      label: strings('money.more_sheet.how_it_works'),
+      icon: IconName.Info,
+      onPress: handleHowItWorks,
+      testID: MoneyMoreSheetTestIds.HOW_IT_WORKS_OPTION,
+    },
+    {
+      label: strings('money.more_sheet.what_you_get'),
+      icon: IconName.Star,
+      onPress: handleWhatYouGet,
+      testID: MoneyMoreSheetTestIds.WHAT_YOU_GET_OPTION,
+    },
+    {
+      label: strings('money.more_sheet.contact_support'),
+      icon: IconName.MessageQuestion,
+      onPress: handleContactSupport,
+      testID: MoneyMoreSheetTestIds.CONTACT_SUPPORT_OPTION,
+    },
+  ];
+
+  return (
+    <BottomSheet
+      ref={sheetRef}
+      goBack={handleGoBack}
+      testID={MoneyMoreSheetTestIds.CONTAINER}
+      keyboardAvoidingViewEnabled={false}
+    >
+      <BottomSheetHeader onClose={() => sheetRef.current?.onCloseBottomSheet()}>
+        <Text variant={TextVariant.HeadingSm}>
+          {strings('money.more_sheet.title')}
+        </Text>
+      </BottomSheetHeader>
+      <View style={styles.list}>
+        {options.map((item) => (
+          <TouchableOpacity
+            key={item.testID}
+            onPress={item.onPress}
+            style={styles.row}
+            testID={item.testID}
+          >
+            <Icon
+              name={item.icon}
+              size={IconSize.Lg}
+              color={IconColor.IconDefault}
+            />
+            <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+              {item.label}
+            </Text>
+          </TouchableOpacity>
+        ))}
+      </View>
+    </BottomSheet>
+  );
+};
+
+export default MoneyMoreSheet;
diff --git a/app/components/UI/Money/components/MoneyMoreSheet/index.ts b/app/components/UI/Money/components/MoneyMoreSheet/index.ts
new file mode 100644
index 00000000000..5f210270831
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyMoreSheet/index.ts
@@ -0,0 +1,2 @@
+export { default } from './MoneyMoreSheet';
+export { MoneyMoreSheetTestIds } from './MoneyMoreSheet.testIds';
diff --git a/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/MoneyMusdEmptyBalanceRow.test.tsx b/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/MoneyMusdEmptyBalanceRow.test.tsx
new file mode 100644
index 00000000000..2e80be9fb97
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/MoneyMusdEmptyBalanceRow.test.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import MoneyMusdEmptyBalanceRow from './MoneyMusdEmptyBalanceRow';
+import { MoneyMusdEmptyBalanceRowTestIds } from './MoneyMusdEmptyBalanceRow.testIds';
+
+describe('MoneyMusdEmptyBalanceRow', () => {
+  it('renders the MetaMask USD name', () => {
+    const { getByText } = renderWithProvider(<MoneyMusdEmptyBalanceRow />);
+    expect(getByText('MetaMask USD')).toBeOnTheScreen();
+  });
+
+  it('renders the zero fiat balance', () => {
+    const { getByTestId } = renderWithProvider(<MoneyMusdEmptyBalanceRow />);
+    expect(
+      getByTestId(MoneyMusdEmptyBalanceRowTestIds.FIAT_BALANCE),
+    ).toHaveTextContent('$0.00');
+  });
+
+  it('renders the zero native balance', () => {
+    const { getByTestId } = renderWithProvider(<MoneyMusdEmptyBalanceRow />);
+    expect(
+      getByTestId(MoneyMusdEmptyBalanceRowTestIds.NATIVE_BALANCE),
+    ).toHaveTextContent('0 mUSD');
+  });
+
+  it('calls onPress when the row is tapped', () => {
+    const onPress = jest.fn();
+    const { getByTestId } = renderWithProvider(
+      <MoneyMusdEmptyBalanceRow onPress={onPress} />,
+    );
+    fireEvent.press(getByTestId(MoneyMusdEmptyBalanceRowTestIds.CONTAINER));
+    expect(onPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not throw when tapped without an onPress handler', () => {
+    const { getByTestId } = renderWithProvider(<MoneyMusdEmptyBalanceRow />);
+    expect(() =>
+      fireEvent.press(getByTestId(MoneyMusdEmptyBalanceRowTestIds.CONTAINER)),
+    ).not.toThrow();
+  });
+});
diff --git a/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/MoneyMusdEmptyBalanceRow.testIds.ts b/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/MoneyMusdEmptyBalanceRow.testIds.ts
new file mode 100644
index 00000000000..03882c7cab9
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/MoneyMusdEmptyBalanceRow.testIds.ts
@@ -0,0 +1,5 @@
+export const MoneyMusdEmptyBalanceRowTestIds = {
+  CONTAINER: 'money-musd-empty-balance-row-container',
+  FIAT_BALANCE: 'money-musd-empty-balance-row-fiat',
+  NATIVE_BALANCE: 'money-musd-empty-balance-row-native',
+};
diff --git a/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/MoneyMusdEmptyBalanceRow.tsx b/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/MoneyMusdEmptyBalanceRow.tsx
new file mode 100644
index 00000000000..6b5690c4049
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/MoneyMusdEmptyBalanceRow.tsx
@@ -0,0 +1,92 @@
+import React from 'react';
+import { Pressable, StyleSheet } from 'react-native';
+import {
+  AvatarToken,
+  AvatarTokenSize,
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  FontWeight,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import BadgeWrapper, {
+  BadgePosition,
+} from '../../../../../component-library/components/Badges/BadgeWrapper';
+import Badge, {
+  BadgeVariant,
+} from '../../../../../component-library/components/Badges/Badge';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import { getNetworkImageSource } from '../../../../../util/networks';
+import { MUSD_TOKEN } from '../../../Earn/constants/musd';
+import { MoneyMusdEmptyBalanceRowTestIds } from './MoneyMusdEmptyBalanceRow.testIds';
+import type { ImageOrSvgSrc } from '@metamask/design-system-react-native/dist/components/temp-components/ImageOrSvg/ImageOrSvg.types.d.cts';
+
+const styles = StyleSheet.create({
+  badgeWrapper: { alignSelf: 'center' },
+});
+
+interface MoneyMusdEmptyBalanceRowProps {
+  onPress?: () => void;
+}
+
+const MoneyMusdEmptyBalanceRow = ({
+  onPress,
+}: MoneyMusdEmptyBalanceRowProps) => (
+  <Pressable
+    onPress={onPress}
+    testID={MoneyMusdEmptyBalanceRowTestIds.CONTAINER}
+  >
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      alignItems={BoxAlignItems.Center}
+      justifyContent={BoxJustifyContent.Between}
+      twClassName="px-4 py-3 gap-4"
+    >
+      <BadgeWrapper
+        badgePosition={BadgePosition.BottomRight}
+        style={styles.badgeWrapper}
+        badgeElement={
+          <Badge
+            variant={BadgeVariant.Network}
+            imageSource={getNetworkImageSource({
+              chainId: CHAIN_IDS.MAINNET,
+            })}
+          />
+        }
+      >
+        <AvatarToken
+          name={MUSD_TOKEN.symbol}
+          src={MUSD_TOKEN.imageSource as ImageOrSvgSrc}
+          size={AvatarTokenSize.Md}
+        />
+      </BadgeWrapper>
+      <Box twClassName="flex-1">
+        <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+          {MUSD_TOKEN.name}
+        </Text>
+      </Box>
+      <Box twClassName="items-end">
+        <Text
+          variant={TextVariant.BodyMd}
+          fontWeight={FontWeight.Medium}
+          testID={MoneyMusdEmptyBalanceRowTestIds.FIAT_BALANCE}
+        >
+          $0.00
+        </Text>
+        <Text
+          variant={TextVariant.BodySm}
+          fontWeight={FontWeight.Medium}
+          color={TextColor.TextAlternative}
+          testID={MoneyMusdEmptyBalanceRowTestIds.NATIVE_BALANCE}
+        >
+          {`0 ${MUSD_TOKEN.symbol}`}
+        </Text>
+      </Box>
+    </Box>
+  </Pressable>
+);
+
+export default MoneyMusdEmptyBalanceRow;
diff --git a/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/index.ts b/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/index.ts
new file mode 100644
index 00000000000..eeab43f11e1
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyMusdEmptyBalanceRow/index.ts
@@ -0,0 +1 @@
+export { default } from './MoneyMusdEmptyBalanceRow';
diff --git a/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.styles.ts b/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.styles.ts
new file mode 100644
index 00000000000..660314416cf
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.styles.ts
@@ -0,0 +1,11 @@
+import { StyleSheet } from 'react-native';
+
+const stylesheet = () =>
+  StyleSheet.create({
+    coinIllustration: {
+      width: '100%',
+      height: '100%',
+    },
+  });
+
+export default stylesheet;
diff --git a/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.tsx b/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.tsx
index 1283a9499fd..45902a527bc 100644
--- a/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.tsx
+++ b/app/components/UI/Money/components/MoneyOnboardingCard/MoneyOnboardingCard.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { Image, StyleSheet } from 'react-native';
 import {
   Box,
   BoxAlignItems,
@@ -7,17 +8,16 @@ import {
   ButtonSize,
   ButtonVariant,
   FontWeight,
-  Icon,
-  IconColor,
-  IconName,
-  IconSize,
   Text,
   TextColor,
   TextVariant,
 } from '@metamask/design-system-react-native';
+import moneyAccountCoins from '../../../../../images/money-account-coins.png';
 import { strings } from '../../../../../../locales/i18n';
 import MoneyProgressBar from '../MoneyProgressBar';
 import { MoneyOnboardingCardTestIds } from './MoneyOnboardingCard.testIds';
+import { useStyles } from '../../../../../component-library/hooks';
+import stylesheet from './MoneyOnboardingCard.styles';
 
 const NOOP = () => undefined;
 
@@ -72,6 +72,8 @@ const MoneyOnboardingCard = ({
   totalSteps = 2,
   variant = 'get-card',
 }: MoneyOnboardingCardProps) => {
+  const { styles } = useStyles(stylesheet, {});
+
   const isLinkCard = variant === 'link-card' && currentStep === 2;
   const content = isLinkCard
     ? STEP_2_LINK_CARD
@@ -105,13 +107,13 @@ const MoneyOnboardingCard = ({
       <Box
         alignItems={BoxAlignItems.Center}
         justifyContent={BoxJustifyContent.Center}
-        twClassName="h-[202px]"
+        twClassName="h-[200px]"
         testID={MoneyOnboardingCardTestIds.COIN_ILLUSTRATION}
       >
-        <Icon
-          name={IconName.Stake}
-          size={IconSize.Xl}
-          color={IconColor.IconAlternative}
+        <Image
+          source={moneyAccountCoins}
+          style={styles.coinIllustration}
+          resizeMode="cover"
         />
       </Box>
 
diff --git a/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyGradientText.test.tsx b/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyGradientText.test.tsx
new file mode 100644
index 00000000000..3d6a775279a
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyGradientText.test.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { render } from '@testing-library/react-native';
+import MoneyGradientText from './MoneyGradientText';
+import { MoneyPotentialEarningsTestIds } from './MoneyPotentialEarnings.testIds';
+
+jest.mock('react-native-linear-gradient', () => 'LinearGradient');
+jest.mock('@react-native-masked-view/masked-view', () => 'MaskedView');
+
+describe('MoneyGradientText', () => {
+  it('renders the value text with the TEXT testID', () => {
+    const { getByTestId } = render(<MoneyGradientText value="+$200.00" />);
+
+    expect(getByTestId(MoneyPotentialEarningsTestIds.TEXT)).toBeOnTheScreen();
+  });
+
+  it('displays the provided value string', () => {
+    const { getByTestId } = render(<MoneyGradientText value="+$1,500.00" />);
+
+    expect(getByTestId(MoneyPotentialEarningsTestIds.TEXT)).toHaveTextContent(
+      '+$1,500.00',
+    );
+  });
+
+  it('renders correctly with an empty string value', () => {
+    const { getByTestId } = render(<MoneyGradientText value="" />);
+
+    expect(getByTestId(MoneyPotentialEarningsTestIds.TEXT)).toHaveTextContent(
+      '',
+    );
+  });
+});
diff --git a/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyGradientText.tsx b/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyGradientText.tsx
new file mode 100644
index 00000000000..9fb3cd380d0
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyGradientText.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import { StyleSheet } from 'react-native';
+import MaskedView from '@react-native-masked-view/masked-view';
+import LinearGradient from 'react-native-linear-gradient';
+import { brandColor } from '@metamask/design-tokens';
+import {
+  FontWeight,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { MoneyPotentialEarningsTestIds } from './MoneyPotentialEarnings.testIds';
+
+const GRADIENT_COLORS = [brandColor.lime100, brandColor.lime200];
+const GRADIENT_START = { x: 0, y: 0 };
+const GRADIENT_END = { x: 1, y: 0 };
+
+const styles = StyleSheet.create({
+  gradientContainer: { flexDirection: 'row' },
+  gradient: { flex: 1 },
+});
+
+const MoneyGradientText = ({ value }: { value: string }) => {
+  const textProps = {
+    variant: TextVariant.HeadingMd,
+    fontWeight: FontWeight.Bold,
+  };
+  return (
+    <MaskedView
+      style={styles.gradientContainer}
+      maskElement={
+        <Text {...textProps} color={TextColor.TextDefault}>
+          {value}
+        </Text>
+      }
+    >
+      <LinearGradient
+        colors={GRADIENT_COLORS}
+        start={GRADIENT_START}
+        end={GRADIENT_END}
+        style={styles.gradient}
+      >
+        <Text
+          {...textProps}
+          twClassName="opacity-0"
+          testID={MoneyPotentialEarningsTestIds.TEXT}
+        >
+          {value}
+        </Text>
+      </LinearGradient>
+    </MaskedView>
+  );
+};
+
+export default MoneyGradientText;
diff --git a/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.test.tsx b/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.test.tsx
index 2e7c7b17e7c..05aa21edb60 100644
--- a/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.test.tsx
+++ b/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.test.tsx
@@ -27,13 +27,13 @@ jest.mock('../../../../UI/AssetOverview/Balance/Balance', () => ({
 }));
 jest.mock('react-native-linear-gradient', () => 'LinearGradient');
 jest.mock('@react-native-masked-view/masked-view', () => 'MaskedView');
-jest.mock('../../../SimulationDetails/FiatDisplay/useFiatFormatter', () => ({
-  __esModule: true,
-  default: () => (amount: { toString: () => string }) =>
-    `$${Number(amount.toString()).toLocaleString('en-US', {
-      minimumFractionDigits: 2,
-      maximumFractionDigits: 2,
-    })}`,
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(() => 'usd'),
+}));
+
+jest.mock('../../utils/moneyFormatFiat', () => ({
+  moneyFormatFiat: jest.fn((value: BigNumber) => `$${value.toFixed(2)}`),
 }));
 
 const makeToken = (overrides: Partial<AssetType>): AssetType =>
@@ -113,13 +113,13 @@ describe('MoneyPotentialEarnings', () => {
   });
 
   it('computes the aggregate projected amount from token fiat balances', () => {
-    // USDC 5000 + USDT 4000 = 9000 * 0.2 = 1800
+    // USDC $5000 + USDT $4000 = $9000 × (4% APY × 1 year) = $360.00
     const { getByTestId } = render(
       <MoneyPotentialEarnings apy={4} tokens={[MOCK_USDC, MOCK_USDT]} />,
     );
 
-    expect(getByTestId(MoneyPotentialEarningsTestIds.AMOUNT)).toHaveTextContent(
-      '+$1,800.00',
+    expect(getByTestId(MoneyPotentialEarningsTestIds.TEXT)).toHaveTextContent(
+      '+$360.00',
     );
   });
 
@@ -216,7 +216,7 @@ describe('MoneyPotentialEarnings', () => {
     );
 
     expect(
-      queryByTestId(MoneyPotentialEarningsTestIds.AMOUNT),
+      queryByTestId(MoneyPotentialEarningsTestIds.TEXT),
     ).not.toBeOnTheScreen();
   });
 
@@ -229,82 +229,4 @@ describe('MoneyPotentialEarnings', () => {
     // which fails isPositiveNumber and hides the "+$..." text in each token row.
     expect(queryByText(/^\+\$/)).not.toBeOnTheScreen();
   });
-
-  describe('condensed mode', () => {
-    it('renders the gradient amount and description in condensed mode', () => {
-      const { getByTestId, getByText } = render(
-        <MoneyPotentialEarnings apy={4} tokens={[MOCK_USDC]} condensed />,
-      );
-      expect(
-        getByTestId(MoneyPotentialEarningsTestIds.AMOUNT),
-      ).toBeOnTheScreen();
-      expect(
-        getByText(strings('money.potential_earnings.description')),
-      ).toBeOnTheScreen();
-    });
-
-    it('hides token rows in condensed mode', () => {
-      const { queryByText } = render(
-        <MoneyPotentialEarnings apy={4} tokens={[MOCK_USDC]} condensed />,
-      );
-      expect(queryByText('USDC')).not.toBeOnTheScreen();
-    });
-
-    it('hides the View all button in condensed mode', () => {
-      const { queryByTestId } = render(
-        <MoneyPotentialEarnings
-          apy={4}
-          tokens={[MOCK_USDC]}
-          condensed
-          onViewAllPress={jest.fn()}
-        />,
-      );
-      expect(
-        queryByTestId(MoneyPotentialEarningsTestIds.VIEW_ALL_BUTTON),
-      ).not.toBeOnTheScreen();
-    });
-
-    it('renders the View potential earnings button in condensed mode', () => {
-      const { getByTestId } = render(
-        <MoneyPotentialEarnings apy={4} tokens={[MOCK_USDC]} condensed />,
-      );
-      expect(
-        getByTestId(
-          MoneyPotentialEarningsTestIds.VIEW_POTENTIAL_EARNINGS_BUTTON,
-        ),
-      ).toBeOnTheScreen();
-    });
-
-    it('calls onViewAllPress when View potential earnings is pressed', () => {
-      const onViewAll = jest.fn();
-      const { getByTestId } = render(
-        <MoneyPotentialEarnings
-          apy={4}
-          tokens={[MOCK_USDC]}
-          condensed
-          onViewAllPress={onViewAll}
-        />,
-      );
-      fireEvent.press(
-        getByTestId(
-          MoneyPotentialEarningsTestIds.VIEW_POTENTIAL_EARNINGS_BUTTON,
-        ),
-      );
-      expect(onViewAll).toHaveBeenCalledTimes(1);
-    });
-
-    it('still renders section header with onHeaderPress in condensed mode', () => {
-      const onHeader = jest.fn();
-      const { getByText } = render(
-        <MoneyPotentialEarnings
-          apy={4}
-          tokens={[MOCK_USDC]}
-          condensed
-          onHeaderPress={onHeader}
-        />,
-      );
-      fireEvent.press(getByText(strings('money.potential_earnings.title')));
-      expect(onHeader).toHaveBeenCalledTimes(1);
-    });
-  });
 });
diff --git a/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.testIds.ts b/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.testIds.ts
index a17815bbb79..6854102b834 100644
--- a/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.testIds.ts
+++ b/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.testIds.ts
@@ -1,7 +1,5 @@
 export const MoneyPotentialEarningsTestIds = {
   CONTAINER: 'money-potential-earnings-container',
-  AMOUNT: 'money-potential-earnings-amount',
+  TEXT: 'money-potential-earnings-text',
   VIEW_ALL_BUTTON: 'money-potential-earnings-view-all-button',
-  VIEW_POTENTIAL_EARNINGS_BUTTON:
-    'money-potential-earnings-view-potential-button',
 } as const;
diff --git a/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.tsx b/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.tsx
index 8df55079f3a..ff61672ccfb 100644
--- a/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.tsx
+++ b/app/components/UI/Money/components/MoneyPotentialEarnings/MoneyPotentialEarnings.tsx
@@ -1,13 +1,8 @@
 import React, { useCallback, useMemo } from 'react';
-import { Pressable, StyleSheet } from 'react-native';
-import MaskedView from '@react-native-masked-view/masked-view';
-import LinearGradient from 'react-native-linear-gradient';
 import { BigNumber } from 'bignumber.js';
-import { brandColor } from '@metamask/design-tokens';
+import { useSelector } from 'react-redux';
 import {
   Box,
-  BoxAlignItems,
-  BoxFlexDirection,
   Button,
   ButtonSize,
   ButtonVariant,
@@ -19,35 +14,23 @@ import {
 import { strings } from '../../../../../../locales/i18n';
 import MoneySectionHeader from '../MoneySectionHeader';
 import { MoneyPotentialEarningsTestIds } from './MoneyPotentialEarnings.testIds';
-import BadgeWrapper, {
-  BadgePosition,
-} from '../../../../../component-library/components/Badges/BadgeWrapper';
-import Badge, {
-  BadgeVariant,
-} from '../../../../../component-library/components/Badges/Badge';
-import AssetLogo from '../../../Assets/components/AssetLogo/AssetLogo';
-import { NetworkBadgeSource } from '../../../AssetOverview/Balance/Balance';
-import useFiatFormatter from '../../../SimulationDetails/FiatDisplay/useFiatFormatter';
+import { selectCurrentCurrency } from '../../../../../selectors/currencyRateController';
+import { moneyFormatFiat } from '../../utils/moneyFormatFiat';
 import {
   STABLECOIN_SYMBOLS,
   tokenFiatValue,
 } from '../../../Earn/hooks/useMusdConversionTokens';
-import { Hex } from '@metamask/utils';
 import { AssetType } from '../../../../Views/confirmations/types/token';
 import { isPositiveNumber } from '../../utils/number';
+import MoneyGradientText from './MoneyGradientText';
+import PotentialEarningsTokenRow from './PotentialEarningsTokenRow';
+import {
+  calculateProjectedEarnings,
+  PROJECTION_YEARS,
+} from '../../utils/projections';
 
 /** Number of years the projected earnings are simulated over. */
-const PROJECTION_YEARS = 5;
 const MAX_TOKENS = 5;
-const GRADIENT_COLORS = [brandColor.lime100, brandColor.lime200];
-const GRADIENT_START = { x: 0, y: 0 };
-const GRADIENT_END = { x: 1, y: 0 };
-
-const styles = StyleSheet.create({
-  gradientContainer: { flexDirection: 'row' },
-  gradient: { flex: 1 },
-  rowPressable: { flex: 1 },
-});
 
 /**
  * True when the token list contains at least one token with a positive fiat
@@ -69,163 +52,23 @@ interface MoneyPotentialEarningsProps {
   onTokenPress?: (token: AssetType) => void;
   onViewAllPress?: () => void;
   onHeaderPress?: () => void;
-  /** When true, hides token rows and shows a single "View potential earnings" button. */
-  condensed?: boolean;
 }
 
-const GradientAmountText = ({ value }: { value: string }) => {
-  const textProps = {
-    variant: TextVariant.HeadingMd,
-    fontWeight: FontWeight.Bold,
-  };
-  return (
-    <MaskedView
-      style={styles.gradientContainer}
-      maskElement={
-        <Text {...textProps} color={TextColor.TextDefault}>
-          {value}
-        </Text>
-      }
-    >
-      <LinearGradient
-        colors={GRADIENT_COLORS}
-        start={GRADIENT_START}
-        end={GRADIENT_END}
-        style={styles.gradient}
-      >
-        <Text
-          {...textProps}
-          twClassName="opacity-0"
-          testID={MoneyPotentialEarningsTestIds.AMOUNT}
-        >
-          {value}
-        </Text>
-      </LinearGradient>
-    </MaskedView>
-  );
-};
-
-const TokenRow = ({
-  token,
-  hasSubsidizedFee,
-  projectedMultiplier,
-  onPress,
-}: {
-  token: AssetType;
-  hasSubsidizedFee: boolean;
-  projectedMultiplier: number;
-  onPress: () => void;
-}) => {
-  const formatFiat = useFiatFormatter();
-  const networkBadgeSource = useMemo(
-    () => (token.chainId ? NetworkBadgeSource(token.chainId as Hex) : null),
-    [token.chainId],
-  );
-
-  const projectedFiatNumber = tokenFiatValue(token) * projectedMultiplier;
-  const projectedFiatFormatted = formatFiat(new BigNumber(projectedFiatNumber));
-
-  const balanceFiatFormatted = token.balanceInSelectedCurrency;
-
-  return (
-    <Box
-      flexDirection={BoxFlexDirection.Row}
-      alignItems={BoxAlignItems.Center}
-      twClassName="px-4 py-3 gap-4"
-    >
-      <Pressable onPress={onPress} style={styles.rowPressable}>
-        <Box
-          flexDirection={BoxFlexDirection.Row}
-          alignItems={BoxAlignItems.Center}
-          twClassName="gap-4"
-        >
-          <BadgeWrapper
-            badgePosition={BadgePosition.BottomRight}
-            badgeElement={
-              networkBadgeSource && (
-                <Badge
-                  variant={BadgeVariant.Network}
-                  imageSource={networkBadgeSource}
-                />
-              )
-            }
-          >
-            <AssetLogo asset={token} />
-          </BadgeWrapper>
-
-          <Box twClassName="flex-1">
-            <Box
-              flexDirection={BoxFlexDirection.Row}
-              alignItems={BoxAlignItems.Center}
-              twClassName="gap-1"
-            >
-              <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
-                {token.symbol}
-              </Text>
-              {hasSubsidizedFee && (
-                <Box twClassName="rounded bg-muted px-1.5">
-                  <Text
-                    variant={TextVariant.BodyXs}
-                    fontWeight={FontWeight.Medium}
-                    color={TextColor.TextAlternative}
-                  >
-                    {strings('money.potential_earnings.no_fee')}
-                  </Text>
-                </Box>
-              )}
-            </Box>
-            <Box
-              flexDirection={BoxFlexDirection.Row}
-              alignItems={BoxAlignItems.Center}
-              twClassName="gap-1"
-            >
-              <Text variant={TextVariant.BodySm} fontWeight={FontWeight.Medium}>
-                {balanceFiatFormatted}
-              </Text>
-              {isPositiveNumber(projectedFiatNumber) && (
-                <Text
-                  variant={TextVariant.BodySm}
-                  fontWeight={FontWeight.Medium}
-                  color={TextColor.SuccessDefault}
-                >
-                  {`+${projectedFiatFormatted}`}
-                </Text>
-              )}
-            </Box>
-          </Box>
-        </Box>
-      </Pressable>
-
-      <Button
-        variant={ButtonVariant.Secondary}
-        size={ButtonSize.Md}
-        onPress={onPress}
-      >
-        {strings('money.potential_earnings.convert')}
-      </Button>
-    </Box>
-  );
-};
-
 const MoneyPotentialEarnings = ({
   tokens,
   apy,
   onTokenPress,
   onViewAllPress,
   onHeaderPress,
-  condensed = false,
 }: MoneyPotentialEarningsProps) => {
-  const formatFiat = useFiatFormatter();
-  const projectedMultiplier = useMemo(
-    () => ((apy ?? 0) / 100) * PROJECTION_YEARS,
-    [apy],
-  );
+  const currentCurrency = useSelector(selectCurrentCurrency);
+  const apyPercent = apy ?? 0;
 
   // Tokens arrive pre-sorted (stablecoins first, then fiat desc) from
   // useMusdConversionTokens; strip zero-balance entries defensively — the
   // feature flag threshold may be set to 0 in some environments.
   const eligibleTokens = useMemo(
-    () => (tokens ?? []).filter((token) => tokenFiatValue(token) > 0),
+    () => tokens.filter((token) => tokenFiatValue(token) > 0),
     [tokens],
   );
   const visibleTokens = useMemo(
@@ -240,10 +83,16 @@ const MoneyPotentialEarnings = ({
   const projectedAmount = useMemo(
     () =>
       eligibleTokens.reduce(
-        (sum, token) => sum + tokenFiatValue(token) * projectedMultiplier,
+        (sum, token) =>
+          sum +
+          calculateProjectedEarnings(
+            tokenFiatValue(token),
+            apyPercent,
+            PROJECTION_YEARS,
+          ),
         0,
       ),
-    [eligibleTokens, projectedMultiplier],
+    [eligibleTokens, apyPercent],
   );
 
   const handleTokenPress = useCallback(
@@ -264,8 +113,8 @@ const MoneyPotentialEarnings = ({
         />
 
         {isPositiveNumber(projectedAmount) && (
-          <GradientAmountText
-            value={`+${formatFiat(new BigNumber(projectedAmount))}`}
+          <MoneyGradientText
+            value={`+${moneyFormatFiat(new BigNumber(projectedAmount), currentCurrency)}`}
           />
         )}
 
@@ -278,45 +127,29 @@ const MoneyPotentialEarnings = ({
         </Text>
       </Box>
 
-      {condensed ? (
+      <>
+        {visibleTokens.map((token) => (
+          <PotentialEarningsTokenRow
+            key={`${token.address}-${token.chainId}`}
+            token={token}
+            hasSubsidizedFee={STABLECOIN_SYMBOLS.has(token.symbol)}
+            apyPercent={apyPercent}
+            onPress={handleTokenPress(token)}
+          />
+        ))}
+
         <Box twClassName="px-4 py-3">
           <Button
             variant={ButtonVariant.Secondary}
             size={ButtonSize.Lg}
             isFullWidth
             onPress={onViewAllPress}
-            testID={
-              MoneyPotentialEarningsTestIds.VIEW_POTENTIAL_EARNINGS_BUTTON
-            }
+            testID={MoneyPotentialEarningsTestIds.VIEW_ALL_BUTTON}
           >
-            {strings('money.potential_earnings.view_potential_earnings')}
+            {strings('money.potential_earnings.view_all')}
           </Button>
         </Box>
-      ) : (
-        <>
-          {visibleTokens.map((token) => (
-            <TokenRow
-              key={`${token.address}-${token.chainId}`}
-              token={token}
-              hasSubsidizedFee={STABLECOIN_SYMBOLS.has(token.symbol)}
-              projectedMultiplier={projectedMultiplier}
-              onPress={handleTokenPress(token)}
-            />
-          ))}
-
-          <Box twClassName="px-4 py-3">
-            <Button
-              variant={ButtonVariant.Secondary}
-              size={ButtonSize.Lg}
-              isFullWidth
-              onPress={onViewAllPress}
-              testID={MoneyPotentialEarningsTestIds.VIEW_ALL_BUTTON}
-            >
-              {strings('money.potential_earnings.view_all')}
-            </Button>
-          </Box>
-        </>
-      )}
+      </>
     </Box>
   );
 };
diff --git a/app/components/UI/Money/components/MoneyPotentialEarnings/PotentialEarningsTokenRow.test.tsx b/app/components/UI/Money/components/MoneyPotentialEarnings/PotentialEarningsTokenRow.test.tsx
new file mode 100644
index 00000000000..73c58d09a18
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyPotentialEarnings/PotentialEarningsTokenRow.test.tsx
@@ -0,0 +1,185 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import PotentialEarningsTokenRow from './PotentialEarningsTokenRow';
+import { strings } from '../../../../../../locales/i18n';
+import { AssetType } from '../../../../Views/confirmations/types/token';
+
+jest.mock(
+  '../../../../UI/Assets/components/AssetLogo/AssetLogo',
+  () => 'AssetLogo',
+);
+jest.mock(
+  '../../../../../component-library/components/Badges/BadgeWrapper',
+  () => ({
+    __esModule: true,
+    default: 'BadgeWrapper',
+    BadgePosition: { BottomRight: 'BottomRight' },
+  }),
+);
+jest.mock('../../../../../component-library/components/Badges/Badge', () => ({
+  __esModule: true,
+  default: 'Badge',
+  BadgeVariant: { Network: 'Network' },
+}));
+jest.mock('../../../../UI/AssetOverview/Balance/Balance', () => ({
+  NetworkBadgeSource: jest.fn(() => null),
+}));
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(() => 'usd'),
+}));
+
+jest.mock('../../utils/moneyFormatFiat', () => ({
+  moneyFormatFiat: jest.fn((value: BigNumber) => `$${value.toFixed(2)}`),
+}));
+
+const makeToken = (overrides: Partial<AssetType>): AssetType =>
+  ({
+    name: 'Token',
+    symbol: 'TOK',
+    address: '0x0000000000000000000000000000000000000000',
+    chainId: '0x1',
+    decimals: 18,
+    balanceInSelectedCurrency: '$0.00',
+    fiat: { balance: 0 },
+    ...overrides,
+  }) as AssetType;
+
+const MOCK_USDC = makeToken({
+  name: 'USD Coin',
+  symbol: 'USDC',
+  address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+  balanceInSelectedCurrency: '$5,000.00',
+  fiat: { balance: 5000 },
+});
+
+describe('PotentialEarningsTokenRow', () => {
+  it('renders the token symbol', () => {
+    const { getByText } = render(
+      <PotentialEarningsTokenRow
+        token={MOCK_USDC}
+        hasSubsidizedFee={false}
+        apyPercent={20}
+        onPress={jest.fn()}
+      />,
+    );
+
+    expect(getByText('USDC')).toBeOnTheScreen();
+  });
+
+  it('renders the token fiat balance', () => {
+    const { getByText } = render(
+      <PotentialEarningsTokenRow
+        token={MOCK_USDC}
+        hasSubsidizedFee={false}
+        apyPercent={20}
+        onPress={jest.fn()}
+      />,
+    );
+
+    expect(getByText('$5000.00')).toBeOnTheScreen();
+  });
+
+  it('renders projected earnings when multiplier produces a positive value', () => {
+    const { getByText } = render(
+      <PotentialEarningsTokenRow
+        token={MOCK_USDC}
+        hasSubsidizedFee={false}
+        apyPercent={20}
+        onPress={jest.fn()}
+      />,
+    );
+
+    expect(getByText('+$1000.00')).toBeOnTheScreen();
+  });
+
+  it('hides projected earnings when multiplier is zero', () => {
+    const { queryByText } = render(
+      <PotentialEarningsTokenRow
+        token={MOCK_USDC}
+        hasSubsidizedFee={false}
+        apyPercent={0}
+        onPress={jest.fn()}
+      />,
+    );
+
+    expect(queryByText(/^\+\$/)).toBeNull();
+  });
+
+  it('renders the "No MetaMask fee" tag when hasSubsidizedFee is true', () => {
+    const { getByText } = render(
+      <PotentialEarningsTokenRow
+        token={MOCK_USDC}
+        hasSubsidizedFee
+        apyPercent={20}
+        onPress={jest.fn()}
+      />,
+    );
+
+    expect(
+      getByText(strings('money.potential_earnings.no_fee')),
+    ).toBeOnTheScreen();
+  });
+
+  it('hides the "No MetaMask fee" tag when hasSubsidizedFee is false', () => {
+    const { queryByText } = render(
+      <PotentialEarningsTokenRow
+        token={MOCK_USDC}
+        hasSubsidizedFee={false}
+        apyPercent={20}
+        onPress={jest.fn()}
+      />,
+    );
+
+    expect(
+      queryByText(strings('money.potential_earnings.no_fee')),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('renders the Convert button', () => {
+    const { getByText } = render(
+      <PotentialEarningsTokenRow
+        token={MOCK_USDC}
+        hasSubsidizedFee={false}
+        apyPercent={20}
+        onPress={jest.fn()}
+      />,
+    );
+
+    expect(
+      getByText(strings('money.potential_earnings.convert')),
+    ).toBeOnTheScreen();
+  });
+
+  it('calls onPress when the Convert button is pressed', () => {
+    const mockOnPress = jest.fn();
+    const { getByText } = render(
+      <PotentialEarningsTokenRow
+        token={MOCK_USDC}
+        hasSubsidizedFee={false}
+        apyPercent={20}
+        onPress={mockOnPress}
+      />,
+    );
+
+    fireEvent.press(getByText(strings('money.potential_earnings.convert')));
+
+    expect(mockOnPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('calls onPress when the row pressable area is pressed', () => {
+    const mockOnPress = jest.fn();
+    const { getByText } = render(
+      <PotentialEarningsTokenRow
+        token={MOCK_USDC}
+        hasSubsidizedFee={false}
+        apyPercent={20}
+        onPress={mockOnPress}
+      />,
+    );
+
+    fireEvent.press(getByText('USDC'));
+
+    expect(mockOnPress).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/app/components/UI/Money/components/MoneyPotentialEarnings/PotentialEarningsTokenRow.tsx b/app/components/UI/Money/components/MoneyPotentialEarnings/PotentialEarningsTokenRow.tsx
new file mode 100644
index 00000000000..58c90dfbe59
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyPotentialEarnings/PotentialEarningsTokenRow.tsx
@@ -0,0 +1,155 @@
+import React, { useMemo } from 'react';
+import { Pressable, StyleSheet } from 'react-native';
+import { BigNumber } from 'bignumber.js';
+import { useSelector } from 'react-redux';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  Button,
+  ButtonSize,
+  ButtonVariant,
+  FontWeight,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../locales/i18n';
+import BadgeWrapper, {
+  BadgePosition,
+} from '../../../../../component-library/components/Badges/BadgeWrapper';
+import Badge, {
+  BadgeVariant,
+} from '../../../../../component-library/components/Badges/Badge';
+import AssetLogo from '../../../Assets/components/AssetLogo/AssetLogo';
+import { NetworkBadgeSource } from '../../../AssetOverview/Balance/Balance';
+import { selectCurrentCurrency } from '../../../../../selectors/currencyRateController';
+import { moneyFormatFiat } from '../../utils/moneyFormatFiat';
+import {
+  calculateProjectedEarnings,
+  PROJECTION_YEARS,
+} from '../../utils/projections';
+import { tokenFiatValue } from '../../../Earn/hooks/useMusdConversionTokens';
+import { Hex } from '@metamask/utils';
+import { AssetType } from '../../../../Views/confirmations/types/token';
+import { isPositiveNumber } from '../../utils/number';
+
+const styles = StyleSheet.create({
+  rowPressable: { flex: 1 },
+});
+
+const PotentialEarningsTokenRow = ({
+  token,
+  hasSubsidizedFee,
+  apyPercent,
+  onPress,
+}: {
+  token: AssetType;
+  hasSubsidizedFee: boolean;
+  /** APY as a percentage (e.g. 4 for 4%). */
+  apyPercent: number;
+  onPress: () => void;
+}) => {
+  const currentCurrency = useSelector(selectCurrentCurrency);
+  const networkBadgeSource = useMemo(
+    () => (token.chainId ? NetworkBadgeSource(token.chainId as Hex) : null),
+    [token.chainId],
+  );
+
+  const fiatBalance = tokenFiatValue(token);
+  const projectedFiatNumber = calculateProjectedEarnings(
+    fiatBalance,
+    apyPercent,
+    PROJECTION_YEARS,
+  );
+  const projectedFiatFormatted = moneyFormatFiat(
+    new BigNumber(projectedFiatNumber),
+    currentCurrency,
+  );
+
+  const balanceFiatFormatted = moneyFormatFiat(
+    new BigNumber(fiatBalance),
+    currentCurrency,
+  );
+
+  return (
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      alignItems={BoxAlignItems.Center}
+      twClassName="px-4 py-3 gap-4"
+    >
+      <Pressable onPress={onPress} style={styles.rowPressable}>
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          twClassName="gap-4"
+        >
+          <BadgeWrapper
+            badgePosition={BadgePosition.BottomRight}
+            badgeElement={
+              networkBadgeSource && (
+                <Badge
+                  variant={BadgeVariant.Network}
+                  imageSource={networkBadgeSource}
+                />
+              )
+            }
+          >
+            <AssetLogo asset={token} />
+          </BadgeWrapper>
+
+          <Box twClassName="flex-1">
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              twClassName="gap-1"
+            >
+              <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+                {token.symbol}
+              </Text>
+              {hasSubsidizedFee && (
+                <Box twClassName="rounded bg-muted px-1.5">
+                  <Text
+                    variant={TextVariant.BodyXs}
+                    fontWeight={FontWeight.Medium}
+                    color={TextColor.TextAlternative}
+                  >
+                    {strings('money.potential_earnings.no_fee')}
+                  </Text>
+                </Box>
+              )}
+            </Box>
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              twClassName="gap-1"
+            >
+              <Text variant={TextVariant.BodySm} fontWeight={FontWeight.Medium}>
+                {balanceFiatFormatted}
+              </Text>
+              {isPositiveNumber(projectedFiatNumber) && (
+                <Text
+                  variant={TextVariant.BodySm}
+                  fontWeight={FontWeight.Medium}
+                  color={TextColor.SuccessDefault}
+                >
+                  {`+${projectedFiatFormatted}`}
+                </Text>
+              )}
+            </Box>
+          </Box>
+        </Box>
+      </Pressable>
+
+      <Button
+        variant={ButtonVariant.Secondary}
+        size={ButtonSize.Md}
+        onPress={onPress}
+      >
+        {strings('money.potential_earnings.convert')}
+      </Button>
+    </Box>
+  );
+};
+
+export default PotentialEarningsTokenRow;
diff --git a/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.test.tsx b/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.test.tsx
index 76a256632f1..26afae2d946 100644
--- a/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.test.tsx
+++ b/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.test.tsx
@@ -38,4 +38,50 @@ describe('MoneySectionHeader', () => {
 
     expect(mockOnPress).toHaveBeenCalledTimes(1);
   });
+
+  it('does not render info button when onInfoPress is not provided', () => {
+    const { queryByTestId } = render(
+      <MoneySectionHeader title="Test Section" />,
+    );
+
+    expect(
+      queryByTestId(MoneySectionHeaderTestIds.INFO_BUTTON),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('renders info button when onInfoPress is provided', () => {
+    const { getByTestId } = render(
+      <MoneySectionHeader title="Test Section" onInfoPress={jest.fn()} />,
+    );
+
+    expect(
+      getByTestId(MoneySectionHeaderTestIds.INFO_BUTTON),
+    ).toBeOnTheScreen();
+  });
+
+  it('calls onInfoPress when info button is pressed', () => {
+    const mockOnInfoPress = jest.fn();
+    const { getByTestId } = render(
+      <MoneySectionHeader title="Test Section" onInfoPress={mockOnInfoPress} />,
+    );
+
+    fireEvent.press(getByTestId(MoneySectionHeaderTestIds.INFO_BUTTON));
+
+    expect(mockOnInfoPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders both info button and chevron when both props are provided', () => {
+    const { getByTestId } = render(
+      <MoneySectionHeader
+        title="Test Section"
+        onPress={jest.fn()}
+        onInfoPress={jest.fn()}
+      />,
+    );
+
+    expect(
+      getByTestId(MoneySectionHeaderTestIds.INFO_BUTTON),
+    ).toBeOnTheScreen();
+    expect(getByTestId(MoneySectionHeaderTestIds.CHEVRON)).toBeOnTheScreen();
+  });
 });
diff --git a/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.testIds.ts b/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.testIds.ts
index 7c16b568f8c..0ae4f80d818 100644
--- a/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.testIds.ts
+++ b/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.testIds.ts
@@ -1,4 +1,5 @@
 export const MoneySectionHeaderTestIds = {
   TITLE: 'money-section-header-title',
   CHEVRON: 'money-section-header-chevron',
+  INFO_BUTTON: 'money-section-header-info-button',
 } as const;
diff --git a/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.tsx b/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.tsx
index 4f2e0c1b706..2a4531f8a52 100644
--- a/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.tsx
+++ b/app/components/UI/Money/components/MoneySectionHeader/MoneySectionHeader.tsx
@@ -4,6 +4,8 @@ import {
   Box,
   BoxAlignItems,
   BoxFlexDirection,
+  ButtonIcon,
+  ButtonIconSize,
   Icon,
   IconColor,
   IconName,
@@ -22,9 +24,22 @@ interface MoneySectionHeaderProps {
    * When provided, renders a chevron and makes the header tappable
    */
   onPress?: () => void;
+  /**
+   * When provided, renders an info icon button next to the title
+   */
+  onInfoPress?: () => void;
+  /**
+   * Accessibility label for the info icon button
+   */
+  infoAccessibilityLabel?: string;
 }
 
-const MoneySectionHeader = ({ title, onPress }: MoneySectionHeaderProps) => {
+const MoneySectionHeader = ({
+  title,
+  onPress,
+  onInfoPress,
+  infoAccessibilityLabel,
+}: MoneySectionHeaderProps) => {
   const handlePress = useCallback(() => {
     onPress?.();
   }, [onPress]);
@@ -41,6 +56,16 @@ const MoneySectionHeader = ({ title, onPress }: MoneySectionHeaderProps) => {
       >
         {title}
       </Text>
+      {onInfoPress && (
+        <ButtonIcon
+          iconName={IconName.Info}
+          iconProps={{ color: IconColor.IconAlternative }}
+          size={ButtonIconSize.Sm}
+          onPress={onInfoPress}
+          accessibilityLabel={infoAccessibilityLabel}
+          testID={MoneySectionHeaderTestIds.INFO_BUTTON}
+        />
+      )}
       {onPress && (
         <Icon
           name={IconName.ArrowRight}
diff --git a/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.styles.tsx b/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.styles.tsx
new file mode 100644
index 00000000000..a408cd49bc0
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.styles.tsx
@@ -0,0 +1,29 @@
+import { StyleSheet } from 'react-native';
+import type { Theme } from '../../../../../util/theme/models';
+
+const styleSheet = (params: { theme: Theme }) =>
+  StyleSheet.create({
+    list: {
+      paddingBottom: 16,
+      backgroundColor: params.theme.colors.background.default,
+    },
+    row: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      gap: 16,
+      paddingHorizontal: 16,
+      paddingVertical: 8,
+      minHeight: 59,
+    },
+    disabledRowContent: {
+      flex: 1,
+      flexDirection: 'column',
+      alignItems: 'flex-start',
+      gap: 4,
+    },
+    comingSoonTag: {
+      borderRadius: 8,
+    },
+  });
+
+export default styleSheet;
diff --git a/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.test.tsx b/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.test.tsx
new file mode 100644
index 00000000000..e32ca2b945b
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.test.tsx
@@ -0,0 +1,119 @@
+import React from 'react';
+import { fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../../util/test/renderWithProvider';
+import MoneyTransferSheet from './MoneyTransferSheet';
+import { MoneyTransferSheetTestIds } from './MoneyTransferSheet.testIds';
+import { strings } from '../../../../../../locales/i18n';
+
+const mockOnCloseBottomSheet = jest.fn((cb?: () => void) => cb?.());
+const mockGoBack = jest.fn();
+
+jest.mock('@react-navigation/native', () => {
+  const actualReactNavigation = jest.requireActual('@react-navigation/native');
+  return {
+    ...actualReactNavigation,
+    useNavigation: () => ({
+      goBack: mockGoBack,
+    }),
+  };
+});
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  const { forwardRef, useImperativeHandle } = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  const MockBottomSheet = forwardRef(
+    (
+      { children, testID }: { children: React.ReactNode; testID?: string },
+      ref: React.Ref<{ onCloseBottomSheet: (cb?: () => void) => void }>,
+    ) => {
+      useImperativeHandle(ref, () => ({
+        onCloseBottomSheet: mockOnCloseBottomSheet,
+        onOpenBottomSheet: jest.fn(),
+      }));
+      return <View testID={testID}>{children}</View>;
+    },
+  );
+  const MockBottomSheetHeader = ({
+    children,
+  }: {
+    children: React.ReactNode;
+  }) => <View>{children}</View>;
+  return {
+    ...actual,
+    BottomSheet: MockBottomSheet,
+    BottomSheetHeader: MockBottomSheetHeader,
+  };
+});
+
+describe('MoneyTransferSheet', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    global.alert = jest.fn();
+  });
+
+  it('renders the sheet title', () => {
+    const { getByText } = renderWithProvider(<MoneyTransferSheet />);
+
+    expect(getByText(strings('money.transfer_sheet.title'))).toBeOnTheScreen();
+  });
+
+  it('renders all five list items', () => {
+    const { getByTestId } = renderWithProvider(<MoneyTransferSheet />);
+
+    expect(
+      getByTestId(MoneyTransferSheetTestIds.BETWEEN_ACCOUNTS_OPTION),
+    ).toBeOnTheScreen();
+    expect(
+      getByTestId(MoneyTransferSheetTestIds.PERPS_ACCOUNT_OPTION),
+    ).toBeOnTheScreen();
+    expect(
+      getByTestId(MoneyTransferSheetTestIds.PREDICTIONS_ACCOUNT_OPTION),
+    ).toBeOnTheScreen();
+    expect(
+      getByTestId(MoneyTransferSheetTestIds.SEND_EXTERNAL_ROW),
+    ).toBeOnTheScreen();
+    expect(
+      getByTestId(MoneyTransferSheetTestIds.WITHDRAW_TO_BANK_ROW),
+    ).toBeOnTheScreen();
+  });
+
+  it('renders "Coming soon" tags on the last two items', () => {
+    const { getAllByText } = renderWithProvider(<MoneyTransferSheet />);
+
+    const comingSoonTags = getAllByText(
+      strings('money.add_money_sheet.coming_soon'),
+    );
+    expect(comingSoonTags).toHaveLength(2);
+  });
+
+  it('fires an alert when "Between accounts" is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyTransferSheet />);
+
+    fireEvent.press(
+      getByTestId(MoneyTransferSheetTestIds.BETWEEN_ACCOUNTS_OPTION),
+    );
+
+    expect(global.alert).toHaveBeenCalledWith('Under construction 🚧');
+  });
+
+  it('fires an alert when "Perps account" is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyTransferSheet />);
+
+    fireEvent.press(
+      getByTestId(MoneyTransferSheetTestIds.PERPS_ACCOUNT_OPTION),
+    );
+
+    expect(global.alert).toHaveBeenCalledWith('Under construction 🚧');
+  });
+
+  it('fires an alert when "Predictions account" is pressed', () => {
+    const { getByTestId } = renderWithProvider(<MoneyTransferSheet />);
+
+    fireEvent.press(
+      getByTestId(MoneyTransferSheetTestIds.PREDICTIONS_ACCOUNT_OPTION),
+    );
+
+    expect(global.alert).toHaveBeenCalledWith('Under construction 🚧');
+  });
+});
diff --git a/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.testIds.ts b/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.testIds.ts
new file mode 100644
index 00000000000..1918ff09883
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.testIds.ts
@@ -0,0 +1,8 @@
+export const MoneyTransferSheetTestIds = {
+  CONTAINER: 'money-transfer-sheet-container',
+  BETWEEN_ACCOUNTS_OPTION: 'money-transfer-sheet-between-accounts',
+  PERPS_ACCOUNT_OPTION: 'money-transfer-sheet-perps-account',
+  PREDICTIONS_ACCOUNT_OPTION: 'money-transfer-sheet-predictions-account',
+  SEND_EXTERNAL_ROW: 'money-transfer-sheet-send-external',
+  WITHDRAW_TO_BANK_ROW: 'money-transfer-sheet-withdraw-to-bank',
+} as const;
diff --git a/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.tsx b/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.tsx
new file mode 100644
index 00000000000..4f4034d0795
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyTransferSheet/MoneyTransferSheet.tsx
@@ -0,0 +1,151 @@
+import React, { useCallback, useRef } from 'react';
+import { TouchableOpacity, View } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import {
+  BottomSheet,
+  BottomSheetHeader,
+  type BottomSheetRef,
+  FontWeight,
+  Icon,
+  IconName,
+  IconSize,
+  IconColor,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import Tag from '../../../../../component-library/components/Tags/Tag';
+import { strings } from '../../../../../../locales/i18n';
+import { useStyles } from '../../../../../component-library/hooks';
+import styleSheet from './MoneyTransferSheet.styles';
+import { MoneyTransferSheetTestIds } from './MoneyTransferSheet.testIds';
+
+interface ActiveOption {
+  label: string;
+  icon: IconName;
+  onPress: () => void;
+  testID: string;
+}
+
+interface DisabledOption {
+  label: string;
+  icon: IconName;
+  testID: string;
+}
+
+const MoneyTransferSheet = () => {
+  const sheetRef = useRef<BottomSheetRef>(null);
+  const navigation = useNavigation();
+  const { styles } = useStyles(styleSheet, {});
+
+  const handleGoBack = useCallback(() => {
+    navigation.goBack();
+  }, [navigation]);
+
+  const handleBetweenAccounts = useCallback(() => {
+    // eslint-disable-next-line no-alert
+    alert('Under construction 🚧');
+  }, []);
+
+  const handlePerpsAccount = useCallback(() => {
+    // eslint-disable-next-line no-alert
+    alert('Under construction 🚧');
+  }, []);
+
+  const handlePredictionsAccount = useCallback(() => {
+    // eslint-disable-next-line no-alert
+    alert('Under construction 🚧');
+  }, []);
+
+  const activeOptions: ActiveOption[] = [
+    {
+      label: strings('money.transfer_sheet.between_accounts'),
+      icon: IconName.SwapHorizontal,
+      onPress: handleBetweenAccounts,
+      testID: MoneyTransferSheetTestIds.BETWEEN_ACCOUNTS_OPTION,
+    },
+    {
+      label: strings('money.transfer_sheet.perps_account'),
+      icon: IconName.Candlestick,
+      onPress: handlePerpsAccount,
+      testID: MoneyTransferSheetTestIds.PERPS_ACCOUNT_OPTION,
+    },
+    {
+      label: strings('money.transfer_sheet.predictions_account'),
+      icon: IconName.Speedometer,
+      onPress: handlePredictionsAccount,
+      testID: MoneyTransferSheetTestIds.PREDICTIONS_ACCOUNT_OPTION,
+    },
+  ];
+
+  const disabledOptions: DisabledOption[] = [
+    {
+      label: strings('money.transfer_sheet.send_external'),
+      icon: IconName.Send,
+      testID: MoneyTransferSheetTestIds.SEND_EXTERNAL_ROW,
+    },
+    {
+      label: strings('money.transfer_sheet.withdraw_to_bank'),
+      icon: IconName.Bank,
+      testID: MoneyTransferSheetTestIds.WITHDRAW_TO_BANK_ROW,
+    },
+  ];
+
+  return (
+    <BottomSheet
+      ref={sheetRef}
+      goBack={handleGoBack}
+      testID={MoneyTransferSheetTestIds.CONTAINER}
+      keyboardAvoidingViewEnabled={false}
+    >
+      <BottomSheetHeader onClose={() => sheetRef.current?.onCloseBottomSheet()}>
+        <Text variant={TextVariant.HeadingSm}>
+          {strings('money.transfer_sheet.title')}
+        </Text>
+      </BottomSheetHeader>
+      <View style={styles.list}>
+        {activeOptions.map((item) => (
+          <TouchableOpacity
+            key={item.testID}
+            onPress={item.onPress}
+            style={styles.row}
+            testID={item.testID}
+          >
+            <Icon
+              name={item.icon}
+              size={IconSize.Lg}
+              color={IconColor.IconDefault}
+            />
+            <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+              {item.label}
+            </Text>
+          </TouchableOpacity>
+        ))}
+        {disabledOptions.map((item) => (
+          <View key={item.testID} style={styles.row} testID={item.testID}>
+            <Icon
+              name={item.icon}
+              size={IconSize.Lg}
+              color={IconColor.IconMuted}
+            />
+            <View style={styles.disabledRowContent}>
+              <Text
+                variant={TextVariant.BodyMd}
+                fontWeight={FontWeight.Medium}
+                color={TextColor.TextAlternative}
+              >
+                {item.label}
+              </Text>
+              <Tag
+                label={strings('money.add_money_sheet.coming_soon')}
+                style={styles.comingSoonTag}
+              />
+            </View>
+          </View>
+        ))}
+      </View>
+    </BottomSheet>
+  );
+};
+
+export default MoneyTransferSheet;
diff --git a/app/components/UI/Money/components/MoneyTransferSheet/index.ts b/app/components/UI/Money/components/MoneyTransferSheet/index.ts
new file mode 100644
index 00000000000..0182b510106
--- /dev/null
+++ b/app/components/UI/Money/components/MoneyTransferSheet/index.ts
@@ -0,0 +1,2 @@
+export { default } from './MoneyTransferSheet';
+export { MoneyTransferSheetTestIds } from './MoneyTransferSheet.testIds';
diff --git a/app/components/UI/Money/components/MoneyWhatYouGet/MoneyWhatYouGet.test.tsx b/app/components/UI/Money/components/MoneyWhatYouGet/MoneyWhatYouGet.test.tsx
index f9a9af60cba..a89016af816 100644
--- a/app/components/UI/Money/components/MoneyWhatYouGet/MoneyWhatYouGet.test.tsx
+++ b/app/components/UI/Money/components/MoneyWhatYouGet/MoneyWhatYouGet.test.tsx
@@ -27,7 +27,7 @@ describe('MoneyWhatYouGet', () => {
     expect(container).toHaveTextContent(/Auto-earn/);
     expect(container).toHaveTextContent(/dollar-backed stablecoin/);
     expect(container).toHaveTextContent(/Get full liquidity/);
-    expect(container).toHaveTextContent(/1-3% cashback/);
+    expect(container).toHaveTextContent(/1-3% mUSD back/);
     expect(container).toHaveTextContent(
       /Transfer money to any of your wallets/,
     );
diff --git a/app/components/UI/Money/constants/moneyEvents.ts b/app/components/UI/Money/constants/moneyEvents.ts
index 7927c1018b2..231477334a1 100644
--- a/app/components/UI/Money/constants/moneyEvents.ts
+++ b/app/components/UI/Money/constants/moneyEvents.ts
@@ -1,5 +1,6 @@
 const EVENT_LOCATIONS = {
   MONEY_HUB: 'money_hub',
+  ASSET_DETAIL: 'asset_detail',
 };
 
 const MONEY_HUB_STATES = {
diff --git a/app/components/UI/Money/hooks/useMoneyAccount.test.ts b/app/components/UI/Money/hooks/useMoneyAccount.test.ts
index a0d33349326..a87f90f67a6 100644
--- a/app/components/UI/Money/hooks/useMoneyAccount.test.ts
+++ b/app/components/UI/Money/hooks/useMoneyAccount.test.ts
@@ -158,7 +158,7 @@ describe('useMoneyAccountDeposit', () => {
 
     await expect(
       act(async () => {
-        await result.current.initiateDeposit(BigInt(1_000_000));
+        await result.current.initiateDeposit();
       }),
     ).rejects.toThrow('Missing vault config');
 
@@ -173,7 +173,7 @@ describe('useMoneyAccountDeposit', () => {
 
     await expect(
       act(async () => {
-        await result.current.initiateDeposit(BigInt(1_000_000));
+        await result.current.initiateDeposit();
       }),
     ).rejects.toThrow('No provider available');
 
@@ -184,12 +184,12 @@ describe('useMoneyAccountDeposit', () => {
     const { result } = renderHook(() => useMoneyAccountDeposit());
 
     await act(async () => {
-      await result.current.initiateDeposit(BigInt(1_000_000));
+      await result.current.initiateDeposit();
     });
 
     expect(mockBuildDepositBatch).toHaveBeenCalledWith(
       expect.objectContaining({
-        amount: BigInt(1_000_000),
+        amount: BigInt(0),
         chainId: MOCK_VAULT_CONFIG.chainId,
         boringVault: MOCK_VAULT_CONFIG.boringVault,
       }),
@@ -220,7 +220,7 @@ describe('useMoneyAccountDeposit', () => {
     let caught: Error | undefined;
     await act(async () => {
       try {
-        await result.current.initiateDeposit(BigInt(1_000_000));
+        await result.current.initiateDeposit();
       } catch (error) {
         caught = error as Error;
       }
@@ -242,7 +242,7 @@ describe('useMoneyAccountDeposit', () => {
 
     await expect(
       act(async () => {
-        await result.current.initiateDeposit(BigInt(1_000_000));
+        await result.current.initiateDeposit();
       }),
     ).rejects.toThrow('Network client not found');
 
diff --git a/app/components/UI/Money/hooks/useMoneyAccount.ts b/app/components/UI/Money/hooks/useMoneyAccount.ts
index 18ad80bc3e7..6eb6b77f74c 100644
--- a/app/components/UI/Money/hooks/useMoneyAccount.ts
+++ b/app/components/UI/Money/hooks/useMoneyAccount.ts
@@ -12,6 +12,7 @@ import { selectPrimaryMoneyAccount } from '../../../../selectors/moneyAccountCon
 import {
   buildMoneyAccountDepositBatch,
   buildMoneyAccountWithdraw,
+  getMoneyAccountDepositAssetAddress,
 } from '../utils/moneyAccountTransactions';
 import { getProviderByChainId } from '../../../../util/notifications/methods/common';
 import Logger from '../../../../util/Logger';
@@ -36,74 +37,71 @@ export function useMoneyAccountDeposit() {
   const primaryMoneyAccount = useSelector(selectPrimaryMoneyAccount);
   const { navigateToConfirmation } = useConfirmNavigation();
 
-  const initiateDeposit = useCallback(
-    // TODO: remove the account parameter and instead of directly building approve and deposit transactions
-    // we need to implemend a hook from `addTransactionBatch` from which we can get the user inputed amount
-    // and then use that to build the approve and deposit transactions. This is because user inputs the amount
-    // in the MM pay UI and we need to use that amount.
-    async (amount: bigint) => {
-      if (!vaultConfig) {
-        throw new Error(`${LOG_TAG} Missing vault config`);
-      }
-      if (!primaryMoneyAccount?.address) {
-        throw new Error(`${LOG_TAG} Missing money account address`);
-      }
-
-      const {
-        chainId,
-        boringVault,
-        tellerAddress,
-        accountantAddress,
-        lensAddress,
-      } = vaultConfig;
-
-      const chainIdHex = chainId as Hex;
-      const provider = getProviderByChainId(chainIdHex);
-      if (!provider) {
-        throw new Error(
-          `${LOG_TAG} No provider available for chain ${chainId}`,
-        );
-      }
-
-      const networkClientId = resolveNetworkClientId(chainIdHex);
-
-      // TODO: as mentioned above this should move into hook from `addTransactionBatch`.
-      const { approveTx, depositTx } = await buildMoneyAccountDepositBatch({
-        amount,
-        chainId: chainIdHex,
-        boringVault,
-        tellerAddress,
-        accountantAddress,
-        lensAddress,
-        provider,
-      });
-
-      // Navigate early for better UX; recover on failure below.
-      navigateToConfirmation({
-        loader: ConfirmationLoader.CustomAmount,
-        stack: Routes.MONEY.ROOT,
+  const initiateDeposit = useCallback(async () => {
+    if (!vaultConfig) {
+      throw new Error(`${LOG_TAG} Missing vault config`);
+    }
+    if (!primaryMoneyAccount?.address) {
+      throw new Error(`${LOG_TAG} Missing money account address`);
+    }
+
+    const {
+      chainId,
+      boringVault,
+      tellerAddress,
+      accountantAddress,
+      lensAddress,
+    } = vaultConfig;
+
+    const chainIdHex = chainId as Hex;
+    const provider = getProviderByChainId(chainIdHex);
+    if (!provider) {
+      throw new Error(`${LOG_TAG} No provider available for chain ${chainId}`);
+    }
+
+    const networkClientId = resolveNetworkClientId(chainIdHex);
+
+    const { approveTx, depositTx } = await buildMoneyAccountDepositBatch({
+      amount: BigInt(0),
+      chainId: chainIdHex,
+      boringVault,
+      tellerAddress,
+      accountantAddress,
+      lensAddress,
+      provider,
+    });
+
+    // Navigate early for better UX; recover on failure below.
+    navigateToConfirmation({
+      loader: ConfirmationLoader.CustomAmount,
+      stack: Routes.MONEY.ROOT,
+    });
+
+    try {
+      // We only set the transaction from the money account perspective.
+      // MM Pay selects the user's account and moves funds to the money account,
+      // so `from` must be the money account and `networkClientId` its chain.
+      await addTransactionBatch({
+        from: primaryMoneyAccount.address as Hex,
+        networkClientId,
+        origin: ORIGIN_METAMASK,
+        disableHook: true,
+        disableSequential: true,
+        transactions: [approveTx, depositTx],
+        requiredAssets: [
+          {
+            address: getMoneyAccountDepositAssetAddress(chainIdHex),
+            amount: '0x0' as Hex,
+            standard: 'erc20',
+          },
+        ],
       });
-
-      try {
-        // We only set the transaction from the money account perspective.
-        // MM Pay selects the user's account and moves funds to the money account,
-        // so `from` must be the money account and `networkClientId` its chain.
-        await addTransactionBatch({
-          from: primaryMoneyAccount.address as Hex,
-          networkClientId,
-          origin: ORIGIN_METAMASK,
-          disableHook: true,
-          disableSequential: true,
-          transactions: [approveTx, depositTx],
-        });
-      } catch (error) {
-        Logger.error(error as Error, `${LOG_TAG} Deposit transaction failed`);
-        // Rethrow so the caller can roll back navigation / surface a toast.
-        throw error;
-      }
-    },
-    [navigateToConfirmation, primaryMoneyAccount, vaultConfig],
-  );
+    } catch (error) {
+      Logger.error(error as Error, `${LOG_TAG} Deposit transaction failed`);
+      // Rethrow so the caller can roll back navigation / surface a toast.
+      throw error;
+    }
+  }, [navigateToConfirmation, primaryMoneyAccount, vaultConfig]);
 
   return { initiateDeposit };
 }
diff --git a/app/components/UI/Money/hooks/useMoneyAccountBalance.test.ts b/app/components/UI/Money/hooks/useMoneyAccountBalance.test.ts
index dbcfb0723f3..581b1e24d3a 100644
--- a/app/components/UI/Money/hooks/useMoneyAccountBalance.test.ts
+++ b/app/components/UI/Money/hooks/useMoneyAccountBalance.test.ts
@@ -6,7 +6,10 @@ import useMoneyAccountBalance, {
 } from './useMoneyAccountBalance';
 import { selectPrimaryMoneyAccount } from '../../../../selectors/moneyAccountController';
 import { selectTokenMarketData } from '../../../../selectors/tokenRatesController';
-import { selectCurrencyRates } from '../../../../selectors/currencyRateController';
+import {
+  selectCurrencyRates,
+  selectCurrentCurrency,
+} from '../../../../selectors/currencyRateController';
 import { selectNetworkConfigurations } from '../../../../selectors/networkController';
 import Engine from '../../../../core/Engine';
 
@@ -20,12 +23,6 @@ jest.mock('@tanstack/react-query', () => ({
   useQueries: jest.fn(),
 }));
 
-jest.mock('../../SimulationDetails/FiatDisplay/useFiatFormatter', () => ({
-  __esModule: true,
-  default: () => (val: { toFixed: (n: number) => string }) =>
-    `$${val.toFixed(2)}`,
-}));
-
 jest.mock('../../../../core/Engine', () => ({
   __esModule: true,
   default: {
@@ -46,6 +43,7 @@ jest.mock('../../../../selectors/tokenRatesController', () => ({
 }));
 jest.mock('../../../../selectors/currencyRateController', () => ({
   selectCurrencyRates: jest.fn(),
+  selectCurrentCurrency: jest.fn(),
 }));
 jest.mock('../../../../selectors/networkController', () => ({
   selectNetworkConfigurations: jest.fn(),
@@ -93,6 +91,9 @@ function setupDefaultSelectors() {
     if (selector === selectNetworkConfigurations) {
       return MOCK_NETWORK_CONFIGURATIONS;
     }
+    if (selector === selectCurrentCurrency) {
+      return 'usd';
+    }
     return undefined;
   });
 }
@@ -107,7 +108,7 @@ const DEFAULT_MUSD_BALANCE_QUERY: QueryState<{ balance: string }> = {
   isLoading: false,
 };
 const DEFAULT_VAULT_APY_QUERY: QueryState<{ apy: number }> = {
-  data: { apy: 5.5 },
+  data: { apy: 0.05 },
   isLoading: false,
 };
 const DEFAULT_MUSD_EQUIVALENT_BALANCE_QUERY: QueryState<{
@@ -269,6 +270,9 @@ describe('useMoneyAccountBalance', () => {
       if (selector === selectNetworkConfigurations) {
         return MOCK_NETWORK_CONFIGURATIONS;
       }
+      if (selector === selectCurrentCurrency) {
+        return 'usd';
+      }
       return undefined;
     });
 
@@ -286,4 +290,36 @@ describe('useMoneyAccountBalance', () => {
 
     expect(result.current.totalFiatRaw).toBe('3');
   });
+
+  it('returns apyDecimal as the raw vault APY value from the API', () => {
+    const { result } = renderHook(() => useMoneyAccountBalance());
+
+    expect(result.current.apyDecimal).toBe(0.05);
+  });
+
+  it('returns apyPercent as the vault APY multiplied by 100', () => {
+    const { result } = renderHook(() => useMoneyAccountBalance());
+
+    expect(result.current.apyPercent).toBe(5);
+  });
+
+  it('returns apyPercentFormatted as a display-ready percentage string', () => {
+    const { result } = renderHook(() => useMoneyAccountBalance());
+
+    expect(result.current.apyPercentFormatted).toBe('5%');
+  });
+
+  it('returns undefined for all APY fields when vault APY data is not available', () => {
+    mockUseQueries.mockReturnValue(
+      makeQueryResults({
+        vaultApy: { data: undefined, isLoading: true },
+      }),
+    );
+
+    const { result } = renderHook(() => useMoneyAccountBalance());
+
+    expect(result.current.apyDecimal).toBeUndefined();
+    expect(result.current.apyPercent).toBeUndefined();
+    expect(result.current.apyPercentFormatted).toBeUndefined();
+  });
 });
diff --git a/app/components/UI/Money/hooks/useMoneyAccountBalance.ts b/app/components/UI/Money/hooks/useMoneyAccountBalance.ts
index 60c49297f7b..8d1b0609a54 100644
--- a/app/components/UI/Money/hooks/useMoneyAccountBalance.ts
+++ b/app/components/UI/Money/hooks/useMoneyAccountBalance.ts
@@ -7,15 +7,18 @@ import {
 import { useQueries, type UseQueryResult } from '@tanstack/react-query';
 import BigNumber from 'bignumber.js';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
-import useFiatFormatter from '../../SimulationDetails/FiatDisplay/useFiatFormatter';
+import { fromTokenMinimalUnitString } from '../../../../util/number';
+import { moneyFormatFiat } from '../utils/moneyFormatFiat';
 import { selectTokenMarketData } from '../../../../selectors/tokenRatesController';
-import { selectCurrencyRates } from '../../../../selectors/currencyRateController';
+import {
+  selectCurrencyRates,
+  selectCurrentCurrency,
+} from '../../../../selectors/currencyRateController';
 import { selectNetworkConfigurations } from '../../../../selectors/networkController';
 import {
   MUSD_TOKEN_ADDRESS_BY_CHAIN,
   MUSD_DECIMALS,
 } from '../../Earn/constants/musd';
-import { fromTokenMinimalUnitString } from '../../../../util/number';
 import { toChecksumAddress } from '../../../../util/address';
 import { MoneyAccountBalanceServiceQueryKeys } from '../queryKeys';
 import Engine from '../../../../core/Engine';
@@ -23,6 +26,13 @@ import { selectPrimaryMoneyAccount } from '../../../../selectors/moneyAccountCon
 
 const DEFAULT_REFETCH_INTERVAL = 30 * 1000; // 30 seconds
 
+// TODO: Remove __DEV__ values before launch. This is temporary to circumvent the Vault's current 0% APY.
+const DEV_APY = {
+  decimal: 0.04,
+  percent: 4,
+  percentFormatted: '4%',
+};
+
 /**
  * Fetches the live exchange rate for the mUSD token.
  * This is necessary when we need the most current rate at runtime (e.g. Money account withdrawal).
@@ -41,7 +51,7 @@ const useMoneyAccountBalance = (
   const tokenMarketData = useSelector(selectTokenMarketData);
   const currencyRates = useSelector(selectCurrencyRates);
   const networkConfigurations = useSelector(selectNetworkConfigurations);
-  const formatFiat = useFiatFormatter();
+  const currentCurrency = useSelector(selectCurrentCurrency);
 
   const [musdBalanceQuery, vaultApyQuery, musdEquivalentBalanceQuery] =
     useQueries({
@@ -158,13 +168,24 @@ const useMoneyAccountBalance = (
     musdFiatRate,
   ]);
 
-  const musdFiatFormatted = musdFiat ? formatFiat(musdFiat) : undefined;
+  const musdFiatFormatted = musdFiat
+    ? moneyFormatFiat(musdFiat, currentCurrency)
+    : undefined;
   const musdSHFvdFiatFormatted = musdSHFvdFiat
-    ? formatFiat(musdSHFvdFiat)
+    ? moneyFormatFiat(musdSHFvdFiat, currentCurrency)
+    : undefined;
+  const totalFiatFormatted = totalFiat
+    ? moneyFormatFiat(totalFiat, currentCurrency)
     : undefined;
-  const totalFiatFormatted = totalFiat ? formatFiat(totalFiat) : undefined;
   const totalFiatRaw = totalFiat ? totalFiat.toString() : undefined;
 
+  const rawApy = vaultApyQuery.data?.apy;
+
+  const apyDecimal = rawApy;
+  const apyPercent = rawApy !== undefined ? rawApy * 100 : undefined;
+  const apyPercentFormatted =
+    apyPercent !== undefined ? `${apyPercent}%` : undefined;
+
   return {
     musdBalanceQuery,
     vaultApyQuery,
@@ -175,6 +196,12 @@ const useMoneyAccountBalance = (
     tokenTotal,
     totalFiatFormatted,
     totalFiatRaw,
+    // TODO: Remove __DEV__ values before launch. This is temporary to circumvent the Vault's current 0% APY.
+    apyDecimal: __DEV__ ? DEV_APY.decimal : apyDecimal,
+    apyPercent: __DEV__ ? DEV_APY.percent : apyPercent,
+    apyPercentFormatted: __DEV__
+      ? DEV_APY.percentFormatted
+      : apyPercentFormatted,
   };
 };
 
diff --git a/app/components/UI/Money/routes/index.test.tsx b/app/components/UI/Money/routes/index.test.tsx
index ecccc38fa57..a8796dd4c36 100644
--- a/app/components/UI/Money/routes/index.test.tsx
+++ b/app/components/UI/Money/routes/index.test.tsx
@@ -2,7 +2,18 @@ import React from 'react';
 import { Text as MockText, View as MockView } from 'react-native';
 import renderWithProvider from '../../../../util/test/renderWithProvider';
 import { mockTheme } from '../../../../util/theme';
-import { MoneyModalStack, MoneyScreenStack } from './index';
+import { upgradeMoneyAccount } from '../../../../actions/money';
+import {
+  MoneyAccountStackGate,
+  MoneyModalStack,
+  MoneyScreenStack,
+} from './index';
+
+jest.mock('../../../../actions/money', () => ({
+  upgradeMoneyAccount: jest.fn(() => () => undefined),
+}));
+
+const mockUpgradeMoneyAccount = jest.mocked(upgradeMoneyAccount);
 
 const EXPECTED_CARD_BACKGROUND = '#money-test-bg';
 
@@ -88,6 +99,28 @@ describe('MoneyScreenStack', () => {
   });
 });
 
+describe('MoneyAccountStackGate', () => {
+  beforeEach(() => {
+    mockUpgradeMoneyAccount.mockClear();
+  });
+
+  it('dispatches upgradeMoneyAccount once when the stack mounts', () => {
+    renderWithProvider(<MoneyAccountStackGate />, {
+      theme: themeWithCustomBackground,
+    });
+
+    expect(mockUpgradeMoneyAccount).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders the Money screen stack', () => {
+    const { getByTestId } = renderWithProvider(<MoneyAccountStackGate />, {
+      theme: themeWithCustomBackground,
+    });
+
+    expect(getByTestId('money-screen-MoneyHome')).toBeOnTheScreen();
+  });
+});
+
 describe('MoneyModalStack', () => {
   it('registers the Add money sheet as a modal screen', () => {
     const { getByTestId } = renderWithProvider(<MoneyModalStack />, {
@@ -96,4 +129,12 @@ describe('MoneyModalStack', () => {
 
     expect(getByTestId('money-screen-MoneyAddMoneySheet')).toBeOnTheScreen();
   });
+
+  it('registers the Money balance info sheet as a modal screen', () => {
+    const { getByTestId } = renderWithProvider(<MoneyModalStack />, {
+      theme: themeWithCustomBackground,
+    });
+
+    expect(getByTestId('money-screen-MoneyBalanceInfoSheet')).toBeOnTheScreen();
+  });
 });
diff --git a/app/components/UI/Money/routes/index.tsx b/app/components/UI/Money/routes/index.tsx
index f8606e09ebd..153de51ac71 100644
--- a/app/components/UI/Money/routes/index.tsx
+++ b/app/components/UI/Money/routes/index.tsx
@@ -1,12 +1,20 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { createStackNavigator } from '@react-navigation/stack';
 import Routes from '../../../../constants/navigation/Routes';
 import { clearStackNavigatorOptions } from '../../../../constants/navigation/clearStackNavigatorOptions';
 import { useTheme } from '../../../../util/theme';
+import useThunkDispatch from '../../../hooks/useThunkDispatch';
+import { upgradeMoneyAccount } from '../../../../actions/money';
 import MoneyHomeView from '../Views/MoneyHomeView';
 import MoneyActivityView from '../Views/MoneyActivityView';
 import MoneyHowItWorksView from '../Views/MoneyHowItWorksView';
+import MoneyPotentialEarningsView from '../Views/MoneyPotentialEarningsView';
 import MoneyAddMoneySheet from '../components/MoneyAddMoneySheet';
+import MoneyMoreSheet from '../components/MoneyMoreSheet';
+import MoneyTransferSheet from '../components/MoneyTransferSheet';
+import MoneyApyInfoSheet from '../components/MoneyApyInfoSheet';
+import MoneyEarningsInfoSheet from '../components/MoneyEarningsInfoSheet';
+import MoneyBalanceInfoSheet from '../components/MoneyBalanceInfoSheet';
 import { Confirm } from '../../../Views/confirmations/components/confirm';
 import { useEmptyNavHeaderForConfirmations } from '../../../Views/confirmations/hooks/ui/useEmptyNavHeaderForConfirmations';
 
@@ -19,6 +27,7 @@ const MoneyScreenStack = () => {
 
   return (
     <Stack.Navigator
+      initialRouteName={Routes.MONEY.HOME}
       screenOptions={{
         headerShown: false,
         cardStyle: { backgroundColor: colors.background.default },
@@ -33,6 +42,10 @@ const MoneyScreenStack = () => {
         name={Routes.MONEY.HOW_IT_WORKS}
         component={MoneyHowItWorksView}
       />
+      <Stack.Screen
+        name={Routes.MONEY.POTENTIAL_EARNINGS}
+        component={MoneyPotentialEarningsView}
+      />
       <Stack.Screen
         name={Routes.FULL_SCREEN_CONFIRMATIONS.REDESIGNED_CONFIRMATIONS}
         options={emptyNavHeaderOptions}
@@ -54,7 +67,42 @@ const MoneyModalStack = () => (
       component={MoneyAddMoneySheet}
       options={{ headerShown: false }}
     />
+    <ModalStack.Screen
+      name={Routes.MONEY.MODALS.MORE_SHEET}
+      component={MoneyMoreSheet}
+      options={{ headerShown: false }}
+    />
+    <ModalStack.Screen
+      name={Routes.MONEY.MODALS.TRANSFER_MONEY_SHEET}
+      component={MoneyTransferSheet}
+      options={{ headerShown: false }}
+    />
+    <ModalStack.Screen
+      name={Routes.MONEY.MODALS.APY_INFO_SHEET}
+      component={MoneyApyInfoSheet}
+      options={{ headerShown: false }}
+    />
+    <ModalStack.Screen
+      name={Routes.MONEY.MODALS.EARNINGS_INFO_SHEET}
+      component={MoneyEarningsInfoSheet}
+      options={{ headerShown: false }}
+    />
+    <ModalStack.Screen
+      name={Routes.MONEY.MODALS.MONEY_BALANCE_INFO_SHEET}
+      component={MoneyBalanceInfoSheet}
+      options={{ headerShown: false }}
+    />
   </ModalStack.Navigator>
 );
 
-export { MoneyScreenStack, MoneyModalStack };
+const MoneyAccountStackGate = () => {
+  const dispatch = useThunkDispatch();
+
+  useEffect(() => {
+    dispatch(upgradeMoneyAccount());
+  }, [dispatch]);
+
+  return <MoneyScreenStack />;
+};
+
+export { MoneyAccountStackGate, MoneyScreenStack, MoneyModalStack };
diff --git a/app/components/UI/Money/utils/moneyAccountTransactions.test.ts b/app/components/UI/Money/utils/moneyAccountTransactions.test.ts
index 94cef3e111f..7a1ce5f6d6a 100644
--- a/app/components/UI/Money/utils/moneyAccountTransactions.test.ts
+++ b/app/components/UI/Money/utils/moneyAccountTransactions.test.ts
@@ -1,5 +1,8 @@
 import { ethers } from 'ethers';
-import { TransactionType } from '@metamask/transaction-controller';
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
 import { ORIGIN_METAMASK } from '@metamask/controller-utils';
 import type { Hex } from '@metamask/utils';
 import { MUSD_TOKEN_ADDRESS_BY_CHAIN } from '../../Earn/constants/musd';
@@ -8,7 +11,15 @@ import {
   getSharesForWithdrawal,
   buildMoneyAccountDepositBatch,
   buildMoneyAccountWithdraw,
+  updateMoneyAccountDepositTokenAmount,
+  updateMoneyAccountWithdrawTokenAmount,
 } from './moneyAccountTransactions';
+import {
+  type MoneyAccountVaultConfig,
+  selectMoneyAccountVaultConfig,
+} from '../../../../selectors/featureFlagController/moneyAccount';
+import { getProviderByChainId } from '../../../../util/notifications/methods/common';
+import ReduxService from '../../../../core/redux';
 
 jest.mock('../../Earn/constants/musd', () => ({
   MUSD_TOKEN_ADDRESS_BY_CHAIN: {} as Record<string, Hex>,
@@ -21,6 +32,10 @@ jest.mock('../../../../core/AppConstants', () => ({
   },
 }));
 
+jest.mock('../../../../util/notifications/methods/common');
+jest.mock('../../../../core/redux');
+jest.mock('../../../../selectors/featureFlagController/moneyAccount');
+
 const mockPreviewDeposit = jest.fn();
 const mockGetRate = jest.fn();
 
@@ -45,6 +60,11 @@ jest.mock('ethers', () => {
   };
 });
 
+const mockGetProviderByChainId = jest.mocked(getProviderByChainId);
+const mockSelectMoneyAccountVaultConfig = jest.mocked(
+  selectMoneyAccountVaultConfig,
+);
+
 const MOCK_CHAIN_ID = '0x1' as Hex;
 const MOCK_MUSD_ADDRESS = '0xaca92e438df0b2401ff60da7e4337b687a2435da' as Hex;
 const MOCK_BORING_VAULT = '0xB5F07d769dD60fE54c97dd53101181073DDf21b2' as Hex;
@@ -54,6 +74,14 @@ const MOCK_LENS = '0x846a7832022350434B5cC006d07cc9c782469660' as Hex;
 const MOCK_TO_ADDRESS = '0x1234567890abcdef1234567890abcdef12345678' as Hex;
 const MOCK_PROVIDER = {} as ethers.providers.Provider;
 
+const MOCK_VAULT_CONFIG: MoneyAccountVaultConfig = {
+  chainId: '0xa4b1',
+  boringVault: MOCK_BORING_VAULT,
+  tellerAddress: MOCK_TELLER,
+  accountantAddress: MOCK_ACCOUNTANT,
+  lensAddress: MOCK_LENS,
+};
+
 describe('moneyAccountTransactions', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -172,6 +200,113 @@ describe('moneyAccountTransactions', () => {
     });
   });
 
+  describe('updateMoneyAccountDepositTokenAmount', () => {
+    const mockTransactionMeta = {
+      id: 'tx-1',
+      chainId: MOCK_VAULT_CONFIG.chainId as Hex,
+    } as unknown as TransactionMeta;
+
+    beforeEach(() => {
+      // Default: vault config present, provider present
+      mockGetProviderByChainId.mockReturnValue(MOCK_PROVIDER as never);
+      mockSelectMoneyAccountVaultConfig.mockReturnValue(MOCK_VAULT_CONFIG);
+      (
+        jest.mocked(ReduxService) as unknown as {
+          store: { getState: jest.Mock };
+        }
+      ).store = { getState: jest.fn().mockReturnValue({}) };
+    });
+
+    it('returns indexed approve and deposit calls for a valid amount', async () => {
+      mockPreviewDeposit.mockResolvedValue(ethers.BigNumber.from('1000000'));
+
+      const result = await updateMoneyAccountDepositTokenAmount(
+        mockTransactionMeta,
+        '1.0',
+      );
+
+      expect(result).toHaveLength(2);
+      expect(result[0].nestedTransactionIndex).toBe(0);
+      expect(result[0].transactionData).toMatch(/^0x/);
+      expect(result[1].nestedTransactionIndex).toBe(1);
+      expect(result[1].transactionData).toMatch(/^0x/);
+    });
+
+    it('calls previewDeposit with the converted amount', async () => {
+      mockPreviewDeposit.mockResolvedValue(ethers.BigNumber.from('1000000'));
+
+      await updateMoneyAccountDepositTokenAmount(mockTransactionMeta, '1.0');
+
+      // 1.0 USDC with 6 decimals = 1_000_000
+      expect(mockPreviewDeposit).toHaveBeenCalledWith(
+        expect.any(String),
+        '1000000',
+        MOCK_VAULT_CONFIG.boringVault,
+        MOCK_VAULT_CONFIG.accountantAddress,
+      );
+    });
+
+    it('returns [] when vault config is missing', async () => {
+      mockSelectMoneyAccountVaultConfig.mockReturnValue(undefined);
+
+      const result = await updateMoneyAccountDepositTokenAmount(
+        mockTransactionMeta,
+        '1.0',
+      );
+
+      expect(result).toEqual([]);
+      expect(mockGetProviderByChainId).not.toHaveBeenCalled();
+      expect(mockPreviewDeposit).not.toHaveBeenCalled();
+    });
+
+    it('returns [] when provider is missing', async () => {
+      mockGetProviderByChainId.mockReturnValue(undefined as never);
+
+      const result = await updateMoneyAccountDepositTokenAmount(
+        mockTransactionMeta,
+        '1.0',
+      );
+
+      expect(result).toEqual([]);
+      expect(mockPreviewDeposit).not.toHaveBeenCalled();
+    });
+
+    it('rejects when previewDeposit fails so the dispatcher can log the error', async () => {
+      const rpcError = new Error('RPC connection refused');
+      mockPreviewDeposit.mockRejectedValue(rpcError);
+
+      await expect(
+        updateMoneyAccountDepositTokenAmount(mockTransactionMeta, '1.0'),
+      ).rejects.toThrow('RPC connection refused');
+    });
+  });
+
+  describe('updateMoneyAccountWithdrawTokenAmount', () => {
+    it('resolves to an empty array (stub implementation)', async () => {
+      const transactionMeta = {
+        id: 'tx-1',
+        nestedTransactions: [],
+      } as unknown as TransactionMeta;
+
+      await expect(
+        updateMoneyAccountWithdrawTokenAmount(transactionMeta, '1.23'),
+      ).resolves.toEqual([]);
+    });
+
+    it('resolves to an array regardless of transactionMeta shape', async () => {
+      const transactionMeta = {
+        id: 'tx-2',
+      } as unknown as TransactionMeta;
+
+      const result = await updateMoneyAccountWithdrawTokenAmount(
+        transactionMeta,
+        '1.23',
+      );
+
+      expect(Array.isArray(result)).toBe(true);
+    });
+  });
+
   describe('buildMoneyAccountWithdraw', () => {
     it('returns withdraw params with correct transaction type', async () => {
       mockGetRate.mockResolvedValue(ethers.BigNumber.from('1000000'));
diff --git a/app/components/UI/Money/utils/moneyAccountTransactions.ts b/app/components/UI/Money/utils/moneyAccountTransactions.ts
index dba593fe903..76fef2d8388 100644
--- a/app/components/UI/Money/utils/moneyAccountTransactions.ts
+++ b/app/components/UI/Money/utils/moneyAccountTransactions.ts
@@ -1,9 +1,19 @@
 import { ethers } from 'ethers';
-import { TransactionType } from '@metamask/transaction-controller';
+import { BigNumber } from 'bignumber.js';
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
 import { ORIGIN_METAMASK } from '@metamask/controller-utils';
 import { Hex } from '@metamask/utils';
+import { UpdateTransactionPayAmountCall } from '../../../Views/confirmations/types/transactions';
 import { MUSD_TOKEN_ADDRESS_BY_CHAIN } from '../../Earn/constants/musd';
 import AppConstants from '../../../../core/AppConstants';
+import { calcTokenValue } from '../../../../util/transactions';
+import { getProviderByChainId } from '../../../../util/notifications/methods/common';
+import { selectMoneyAccountVaultConfig } from '../../../../selectors/featureFlagController/moneyAccount';
+import ReduxService from '../../../../core/redux';
+import type { RootState } from '../../../../reducers';
 
 const LENS_ABI = [
   'function previewDeposit(address depositAsset, uint256 depositAmount, address boringVault, address accountant) view returns (uint256 shares)',
@@ -91,6 +101,24 @@ function buildDepositData(
   ]) as Hex;
 }
 
+/**
+ * Single source of truth for the deposit asset so both calldata encoding
+ * (`buildMoneyAccountDepositBatch`) and Pay's `requiredAssets` agree.
+ * @param _chainId - The chain ID to get the deposit asset address for.
+ * @returns The deposit asset address for the given chain ID.
+ */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function getMoneyAccountDepositAssetAddress(chainId: Hex): Hex {
+  // TODO: uncomment when mUSD is deployed
+  // const musdAddress = MUSD_TOKEN_ADDRESS_BY_CHAIN[_chainId];
+  // if (!musdAddress) {
+  //   throw new Error(`mUSD not deployed on chain ${_chainId}`);
+  // }
+  // return musdAddress;
+  // TODO: remove when mUSD is deployed - temporarily hardcoded USDC
+  return '0xaf88d065e77c8cC2239327C5EDb3A432268e5831';
+}
+
 export interface MoneyAccountDepositBatchResult {
   approveTx: MoneyAccountTxParams;
   depositTx: MoneyAccountTxParams;
@@ -121,24 +149,23 @@ export async function buildMoneyAccountDepositBatch({
   lensAddress: string;
   provider: ethers.providers.Provider;
 }): Promise<MoneyAccountDepositBatchResult> {
-  // TODO: uncomment when mUSD is deployed
-  // const musdAddress = MUSD_TOKEN_ADDRESS_BY_CHAIN[chainId];
-  // if (!musdAddress) {
-  //   throw new Error(`mUSD not deployed on chain ${chainId}`);
-  // }
-  // TODO: remove when mUSD is deployed - temporarily hardcoded USDC
-  const musdAddress = '0xaf88d065e77c8cC2239327C5EDb3A432268e5831';
+  const musdAddress = getMoneyAccountDepositAssetAddress(chainId);
 
-  const expectedShares = await getExpectedDepositShares({
-    lensAddress,
-    boringVault,
-    accountantAddress,
-    musdAddress,
-    amount,
-    provider,
-  });
+  // Skip the RPC call for zero-amount placeholder batches (e.g. initial deposit submission).
+  const minimumMint =
+    amount === 0n
+      ? 0n
+      : applySlippage(
+          await getExpectedDepositShares({
+            lensAddress,
+            boringVault,
+            accountantAddress,
+            musdAddress,
+            amount,
+            provider,
+          }),
+        );
 
-  const minimumMint = applySlippage(expectedShares);
   const approveData = buildApproveData(boringVault, amount);
   const depositData = buildDepositData(musdAddress, amount, minimumMint);
 
@@ -162,6 +189,72 @@ export async function buildMoneyAccountDepositBatch({
   };
 }
 
+/** Decimals for USDC (the deposit asset). */
+const USDC_DECIMALS = 6;
+
+/**
+ * Returns the per-nested-call data updates required when the user changes
+ * the deposit amount on a Money Account deposit confirmation.
+ *
+ * Reads vault config from the Redux store, calls `previewDeposit` on the
+ * lens contract to derive an accurate `minimumMint`, and returns the
+ * re-encoded approve + deposit calldata ready for `updateAtomicBatchData`.
+ *
+ * Returns `[]` (no-op) if vault config or provider is unavailable.
+ * Lets `buildMoneyAccountDepositBatch` errors propagate so the dispatcher
+ * can log them via its prep-error handler.
+ */
+export async function updateMoneyAccountDepositTokenAmount(
+  transactionMeta: TransactionMeta,
+  amountHuman: string,
+): Promise<UpdateTransactionPayAmountCall[]> {
+  const vaultConfig = selectMoneyAccountVaultConfig(
+    ReduxService.store.getState() as RootState,
+  );
+  if (!vaultConfig) return [];
+
+  const chainIdHex = transactionMeta.chainId as Hex;
+  const provider = getProviderByChainId(chainIdHex);
+  if (!provider) return [];
+
+  const amount = BigInt(
+    calcTokenValue(amountHuman, USDC_DECIMALS)
+      .decimalPlaces(0, BigNumber.ROUND_UP)
+      .toFixed(0),
+  );
+
+  const { approveTx, depositTx } = await buildMoneyAccountDepositBatch({
+    amount,
+    chainId: chainIdHex,
+    boringVault: vaultConfig.boringVault,
+    tellerAddress: vaultConfig.tellerAddress,
+    accountantAddress: vaultConfig.accountantAddress,
+    lensAddress: vaultConfig.lensAddress,
+    provider,
+  });
+
+  return [
+    { nestedTransactionIndex: 0, transactionData: approveTx.params.data },
+    { nestedTransactionIndex: 1, transactionData: depositTx.params.data },
+  ];
+}
+
+/**
+ * Returns the per-nested-call data updates required when the user changes
+ * the withdrawal amount on a Money Account withdraw confirmation.
+ *
+ * Stub implementation — real encoding will replace this once the withdraw
+ * re-encoding logic is wired in.
+ */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export async function updateMoneyAccountWithdrawTokenAmount(
+  _transactionMeta: TransactionMeta,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  _amountHuman: string,
+): Promise<UpdateTransactionPayAmountCall[]> {
+  return [];
+}
+
 // -- Withdrawal helpers ----------------------------------------------------
 
 async function getVaultRate({
diff --git a/app/components/UI/Money/utils/moneyActivityFiat.test.ts b/app/components/UI/Money/utils/moneyActivityFiat.test.ts
index caf75dbf54c..01f2b245c72 100644
--- a/app/components/UI/Money/utils/moneyActivityFiat.test.ts
+++ b/app/components/UI/Money/utils/moneyActivityFiat.test.ts
@@ -4,10 +4,7 @@ import {
 } from '@metamask/transaction-controller';
 import type { Hex } from '@metamask/utils';
 import { safeToChecksumAddress } from '../../../../util/address';
-import {
-  buildMoneyActivityFiatLine,
-  formatMoneyActivityFiatDisplay,
-} from './moneyActivityFiat';
+import { buildMoneyActivityFiatLine } from './moneyActivityFiat';
 import { getMusdDisplayAmountFromTransactionMeta } from '../constants/activityStyles';
 import { MUSD_TOKEN_ADDRESS } from '../../Earn/constants/musd';
 
@@ -66,48 +63,67 @@ function makeIncomingTx(
 }
 
 describe('moneyActivityFiat', () => {
-  describe('formatMoneyActivityFiatDisplay', () => {
-    it('uses exactly two fractional digits', () => {
-      const out = formatMoneyActivityFiatDisplay(1234.5, 'USD');
-      expect(out).toMatch(/1,234\.50/);
-    });
-  });
-
   describe('buildMoneyActivityFiatLine', () => {
-    it('prefixes with sign and formats fiat in USD using market rate', () => {
+    it('prefixes with + and formats fiat in USD using market rate', () => {
       const tx = makeIncomingTx('1000000000');
-      expect(
-        buildMoneyActivityFiatLine(tx, mockRates, 'usd', mockMarketUsd),
-      ).toMatch(/^\+.*1,000\.00/);
+
+      const line = buildMoneyActivityFiatLine(
+        tx,
+        mockRates,
+        'usd',
+        mockMarketUsd,
+      );
+
+      expect(line).toMatch(/^\+.*1,000\.00/);
+    });
+
+    it('prefixes outgoing transactions with -', () => {
+      const tx = makeIncomingTx('1000000000', {
+        type: TransactionType.simpleSend,
+      });
+
+      const line = buildMoneyActivityFiatLine(
+        tx,
+        mockRates,
+        'usd',
+        mockMarketUsd,
+      );
+
+      expect(line).toMatch(/^-/);
     });
 
     it('converts to EUR using token→ETH price and ETH→fiat rate', () => {
       const tx = makeIncomingTx('1000000000');
+
       const line = buildMoneyActivityFiatLine(
         tx,
         mockRatesEur,
         'eur',
         mockMarketEur,
       );
+
       expect(line).toMatch(/^\+/);
       expect(line).toMatch(/920/);
     });
 
     it('converts mUSD to fiat via peg-derived token→ETH price when market data is missing', () => {
       const tx = makeIncomingTx('1000000000');
-      expect(buildMoneyActivityFiatLine(tx, mockRates, 'usd', {})).toMatch(
-        /^\+.*1,000\.00/,
-      );
+
+      const line = buildMoneyActivityFiatLine(tx, mockRates, 'usd', {});
+
+      expect(line).toMatch(/^\+.*1,000\.00/);
     });
 
     it('converts mUSD to EUR via peg when market data is missing', () => {
       const tx = makeIncomingTx('1000000000');
+
       const line = buildMoneyActivityFiatLine(tx, mockRatesEur, 'eur', {});
+
       expect(line).toMatch(/^\+/);
       expect(line).toMatch(/920/);
     });
 
-    it('returns empty when market data is missing and token is not mUSD-like', () => {
+    it('returns empty string when market data is missing and token is not mUSD-like', () => {
       const tx = makeIncomingTx('1000000000', {
         transferInformation: {
           amount: '1000000000',
@@ -116,21 +132,65 @@ describe('moneyActivityFiat', () => {
           contractAddress: OTHER_TOKEN_CONTRACT,
         },
       });
-      expect(buildMoneyActivityFiatLine(tx, mockRates, 'usd', {})).toBe('');
+
+      const line = buildMoneyActivityFiatLine(tx, mockRates, 'usd', {});
+
+      expect(line).toBe('');
+    });
+
+    it('returns empty string when transferInformation is absent', () => {
+      const tx = makeIncomingTx('1000000000', {
+        transferInformation: undefined,
+      });
+
+      const line = buildMoneyActivityFiatLine(
+        tx,
+        mockRates,
+        'usd',
+        mockMarketUsd,
+      );
+
+      expect(line).toBe('');
+    });
+
+    it('returns empty string when currentCurrency is undefined', () => {
+      const tx = makeIncomingTx('1000000000');
+
+      const line = buildMoneyActivityFiatLine(
+        tx,
+        mockRates,
+        undefined,
+        mockMarketUsd,
+      );
+
+      expect(line).toBe('');
+    });
+
+    it('returns empty string when currencyRates are undefined', () => {
+      const tx = makeIncomingTx('1000000000');
+
+      const line = buildMoneyActivityFiatLine(tx, undefined, 'usd', {});
+
+      expect(line).toBe('');
     });
   });
 
   describe('token amount from raw minimal units', () => {
     it('formats a whole-number amount with two decimals and thousands separator', () => {
       const tx = makeIncomingTx('1000000000');
+
       const display = getMusdDisplayAmountFromTransactionMeta(tx);
+
       expect(display).toContain('1,000.00');
       expect(display).toContain('mUSD');
     });
 
     it('formats a fractional amount with two decimals', () => {
       const tx = makeIncomingTx('1000500000');
-      expect(getMusdDisplayAmountFromTransactionMeta(tx)).toContain('1,000.50');
+
+      const display = getMusdDisplayAmountFromTransactionMeta(tx);
+
+      expect(display).toContain('1,000.50');
     });
   });
 });
diff --git a/app/components/UI/Money/utils/moneyActivityFiat.ts b/app/components/UI/Money/utils/moneyActivityFiat.ts
index 5461c0b7498..db067a125a0 100644
--- a/app/components/UI/Money/utils/moneyActivityFiat.ts
+++ b/app/components/UI/Money/utils/moneyActivityFiat.ts
@@ -1,9 +1,9 @@
 import type { TransactionMeta } from '@metamask/transaction-controller';
 import type { CurrencyRateState } from '@metamask/assets-controllers';
 import type { Hex } from '@metamask/utils';
-import I18n from '../../../../../locales/i18n';
-import { getIntlNumberFormatter } from '../../../../util/intl';
+import BigNumber from 'bignumber.js';
 import { safeToChecksumAddress } from '../../../../util/address';
+import { moneyFormatFiat } from './moneyFormatFiat';
 import {
   balanceToFiatNumber,
   fromTokenMinimalUnit,
@@ -130,26 +130,6 @@ function getEthToFiatConversionRate(
   return resolveCurrencyRateEntry(currencyRates, ETH_TICKER)?.conversionRate;
 }
 
-/**
- * Formats a fiat value with exactly two fractional digits for Money activity rows.
- */
-export function formatMoneyActivityFiatDisplay(
-  amountInSelectedCurrency: number,
-  isoCurrencyCode: string,
-): string {
-  try {
-    return getIntlNumberFormatter(I18n.locale, {
-      style: 'currency',
-      currency: isoCurrencyCode.toUpperCase(),
-      currencyDisplay: 'narrowSymbol',
-      minimumFractionDigits: 2,
-      maximumFractionDigits: 2,
-    }).format(amountInSelectedCurrency);
-  } catch {
-    return `${amountInSelectedCurrency.toFixed(2)} ${isoCurrencyCode.toUpperCase()}`;
-  }
-}
-
 /**
  * Secondary fiat line for a Money activity row: prefix (+/-) + localized currency (2 decimals).
  * Converts **token → fiat** via {@link balanceToFiatNumber}: human token amount × ETH→fiat
@@ -232,6 +212,5 @@ export function buildMoneyActivityFiatLine(
     return '';
   }
 
-  const display = formatMoneyActivityFiatDisplay(fiatNumber, currentCurrency);
-  return `${prefix}${display}`;
+  return `${prefix}${moneyFormatFiat(new BigNumber(fiatNumber), currentCurrency)}`;
 }
diff --git a/app/components/UI/Money/utils/moneyFormatFiat.test.ts b/app/components/UI/Money/utils/moneyFormatFiat.test.ts
new file mode 100644
index 00000000000..0fcd4c81a77
--- /dev/null
+++ b/app/components/UI/Money/utils/moneyFormatFiat.test.ts
@@ -0,0 +1,64 @@
+import { BigNumber } from 'bignumber.js';
+import { formatWithThreshold } from '../../../../util/assets';
+import { getLocaleLanguageCode } from '../../../hooks/useFormatters';
+import { moneyFormatFiat } from './moneyFormatFiat';
+
+jest.mock('../../../../util/assets', () => ({
+  formatWithThreshold: jest.fn(),
+}));
+
+jest.mock('../../../hooks/useFormatters', () => ({
+  getLocaleLanguageCode: jest.fn(),
+}));
+
+describe('moneyFormatFiat', () => {
+  const mockFormatWithThreshold = jest.mocked(formatWithThreshold);
+  const mockGetLocaleLanguageCode = jest.mocked(getLocaleLanguageCode);
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockGetLocaleLanguageCode.mockReturnValue('en');
+    mockFormatWithThreshold.mockReturnValue('formatted');
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('delegates to formatWithThreshold with locale from getLocaleLanguageCode', () => {
+    mockGetLocaleLanguageCode.mockReturnValue('fr');
+
+    moneyFormatFiat(new BigNumber(42), 'usd');
+
+    expect(mockFormatWithThreshold).toHaveBeenCalledWith(42, 0.01, 'fr', {
+      style: 'currency',
+      currency: 'usd',
+    });
+  });
+
+  it('passes the numeric value from BigNumber.toNumber()', () => {
+    moneyFormatFiat(new BigNumber('99.99'), 'eur');
+
+    expect(mockFormatWithThreshold).toHaveBeenCalledWith(99.99, 0.01, 'en', {
+      style: 'currency',
+      currency: 'eur',
+    });
+  });
+
+  it('uses the provided ISO currency code in format options', () => {
+    moneyFormatFiat(new BigNumber(5), 'gbp');
+
+    expect(mockFormatWithThreshold).toHaveBeenCalledWith(5, 0.01, 'en', {
+      style: 'currency',
+      currency: 'gbp',
+    });
+  });
+
+  it('returns the string produced by formatWithThreshold', () => {
+    mockFormatWithThreshold.mockReturnValue('£10.00');
+
+    const result = moneyFormatFiat(new BigNumber(10), 'gbp');
+
+    expect(result).toBe('£10.00');
+  });
+});
diff --git a/app/components/UI/Money/utils/moneyFormatFiat.ts b/app/components/UI/Money/utils/moneyFormatFiat.ts
new file mode 100644
index 00000000000..cf0131f9860
--- /dev/null
+++ b/app/components/UI/Money/utils/moneyFormatFiat.ts
@@ -0,0 +1,21 @@
+import { formatWithThreshold } from '../../../../util/assets';
+import { getLocaleLanguageCode } from '../../../hooks/useFormatters';
+
+const THRESHOLD = 0.01;
+
+/**
+ *
+ * Helper that wraps formatWithThreshold to centralize Money formatting logic.
+ *
+ * @param value - The fiat value to format.
+ * @param currentCurrency - The user's selected currency to format the value in.
+ * @returns The formatted fiat value.
+ */
+export const moneyFormatFiat = (
+  value: BigNumber,
+  currentCurrency: string,
+): string =>
+  formatWithThreshold(value.toNumber(), THRESHOLD, getLocaleLanguageCode(), {
+    style: 'currency',
+    currency: currentCurrency,
+  });
diff --git a/app/components/UI/Money/utils/projections.test.ts b/app/components/UI/Money/utils/projections.test.ts
new file mode 100644
index 00000000000..20e3c74823f
--- /dev/null
+++ b/app/components/UI/Money/utils/projections.test.ts
@@ -0,0 +1,47 @@
+import { calculateProjectedEarnings } from './projections';
+
+describe('calculateProjectedEarnings', () => {
+  it('returns zero when principal is zero', () => {
+    const result = calculateProjectedEarnings(0, 4);
+
+    expect(result).toBe(0);
+  });
+
+  it('returns zero when APY is zero', () => {
+    const result = calculateProjectedEarnings(1000, 0);
+
+    expect(result).toBe(0);
+  });
+
+  it('calculates 1-year earnings using the default year parameter', () => {
+    const result = calculateProjectedEarnings(1000, 4);
+
+    expect(result).toBe(40);
+  });
+
+  it('calculates multi-year earnings with an explicit year parameter', () => {
+    const result = calculateProjectedEarnings(1000, 4, 5);
+
+    expect(result).toBe(200);
+  });
+
+  it('uses linear projection, not compound', () => {
+    const linear = calculateProjectedEarnings(1000, 4, 5);
+    const compound = 1000 * (Math.pow(1 + 4 / 100, 5) - 1);
+
+    expect(linear).toBe(200);
+    expect(linear).not.toBeCloseTo(compound, 1);
+  });
+
+  it('handles fractional APY values', () => {
+    const result = calculateProjectedEarnings(1000, 5.5, 1);
+
+    expect(result).toBe(55);
+  });
+
+  it('handles fractional year values', () => {
+    const result = calculateProjectedEarnings(1000, 4, 0.5);
+
+    expect(result).toBe(20);
+  });
+});
diff --git a/app/components/UI/Money/utils/projections.ts b/app/components/UI/Money/utils/projections.ts
new file mode 100644
index 00000000000..fdb1203676a
--- /dev/null
+++ b/app/components/UI/Money/utils/projections.ts
@@ -0,0 +1,20 @@
+/** Number of years the projected earnings are simulated over. */
+export const PROJECTION_YEARS = 1;
+
+/**
+ * Linear projection of earnings over a given time period.
+ *
+ * We intentionally use simple interest rather than compound interest because
+ * the APY rate is variable and may change daily. Compounding a variable rate
+ * over multiple years would create unrealistic return expectations.
+ *
+ * @param principalFiat - The fiat value of the principal amount.
+ * @param apyPercent - APY expressed as a percentage (e.g. 4 for 4%).
+ * @param years - The number of years to project over (defaults to 1).
+ * @returns The projected earnings in fiat.
+ */
+export const calculateProjectedEarnings = (
+  principalFiat: number,
+  apyPercent: number,
+  years: number = 1,
+): number => principalFiat * (apyPercent / 100) * years;
diff --git a/app/components/UI/MultichainBridgeTransactionListItem/MultichainBridgeTransactionListItem.tsx b/app/components/UI/MultichainBridgeTransactionListItem/MultichainBridgeTransactionListItem.tsx
index ab09e422929..1469dbcb56d 100644
--- a/app/components/UI/MultichainBridgeTransactionListItem/MultichainBridgeTransactionListItem.tsx
+++ b/app/components/UI/MultichainBridgeTransactionListItem/MultichainBridgeTransactionListItem.tsx
@@ -27,6 +27,7 @@ import BadgeWrapper from '../../../component-library/components/Badges/BadgeWrap
 import Badge, {
   BadgeVariant,
 } from '../../../component-library/components/Badges/Badge';
+import { AvatarSize } from '../../../component-library/components/Avatars/Avatar';
 import { getNetworkImageSource } from '../../../util/networks';
 import { parseCaipAssetType } from '@metamask/utils';
 import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
@@ -102,10 +103,13 @@ const MultichainBridgeTransactionListItem = ({
     const networkImageSource = getNetworkImageSource({ chainId });
     return (
       <BadgeWrapper
+        badgePosition={{ bottom: -4, right: -4 }}
         badgeElement={
           <Badge
             variant={BadgeVariant.Network}
             imageSource={networkImageSource}
+            isScaled={false}
+            size={AvatarSize.Xs}
           />
         }
       >
diff --git a/app/components/UI/MultichainTransactionListItem/MultichainTransactionListItem.tsx b/app/components/UI/MultichainTransactionListItem/MultichainTransactionListItem.tsx
index 24b416ef220..ce4454228a7 100644
--- a/app/components/UI/MultichainTransactionListItem/MultichainTransactionListItem.tsx
+++ b/app/components/UI/MultichainTransactionListItem/MultichainTransactionListItem.tsx
@@ -21,6 +21,7 @@ import BadgeWrapper from '../../../component-library/components/Badges/BadgeWrap
 import Badge, {
   BadgeVariant,
 } from '../../../component-library/components/Badges/Badge';
+import { AvatarSize } from '../../../component-library/components/Avatars/Avatar';
 import { getNetworkImageSource } from '../../../util/networks';
 import Routes from '../../../constants/navigation/Routes';
 import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
@@ -91,10 +92,13 @@ const MultichainTransactionListItem = ({
 
     return (
       <BadgeWrapper
+        badgePosition={{ bottom: -4, right: -4 }}
         badgeElement={
           <Badge
             variant={BadgeVariant.Network}
             imageSource={networkImageSource}
+            isScaled={false}
+            size={AvatarSize.Xs}
           />
         }
       >
diff --git a/app/components/UI/Navbar/Navbar.testIds.ts b/app/components/UI/Navbar/Navbar.testIds.ts
new file mode 100644
index 00000000000..503ce2f5862
--- /dev/null
+++ b/app/components/UI/Navbar/Navbar.testIds.ts
@@ -0,0 +1,4 @@
+export const NavbarSelectorsIDs = {
+  ANDROID_BACK_BUTTON: 'nav-android-back',
+  BACK_BUTTON_SIMPLE_WEBVIEW: 'back_button_simple_webview',
+};
diff --git a/app/components/UI/Navbar/index.js b/app/components/UI/Navbar/index.js
index b639085f6dd..7c671c31fc8 100644
--- a/app/components/UI/Navbar/index.js
+++ b/app/components/UI/Navbar/index.js
@@ -5,7 +5,6 @@ import ModalNavbarTitle from '../ModalNavbarTitle';
 import {
   Alert,
   Image,
-  Platform,
   StyleSheet,
   Text,
   TouchableOpacity,
@@ -21,9 +20,7 @@ import { analytics } from '../../../util/analytics/analytics';
 import { Authentication } from '../../../core';
 import { isNotificationsFeatureEnabled } from '../../../util/notifications';
 import Device from '../../../util/device';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import { NAV_ANDROID_BACK_BUTTON } from '../../../../wdio/screen-objects/testIDs/Screens/NetworksScreen.testids';
-import { BACK_BUTTON_SIMPLE_WEBVIEW } from '../../../../wdio/screen-objects/testIDs/Components/SimpleWebView.testIds';
+import { NavbarSelectorsIDs } from './Navbar.testIds';
 import Routes from '../../../constants/navigation/Routes';
 
 import {
@@ -602,7 +599,7 @@ export function getClosableNavigationOptions(
         <TouchableOpacity
           onPress={navigationPop}
           style={styles.backButton}
-          {...generateTestId(Platform, NAV_ANDROID_BACK_BUTTON)}
+          testID={NavbarSelectorsIDs.ANDROID_BACK_BUTTON}
         >
           <IonicIcon
             name={'arrow-back'}
diff --git a/app/components/UI/NetworkInfo/index.tsx b/app/components/UI/NetworkInfo/index.tsx
index 972edde269f..6d2cb60a8ea 100644
--- a/app/components/UI/NetworkInfo/index.tsx
+++ b/app/components/UI/NetworkInfo/index.tsx
@@ -9,7 +9,6 @@ import Description from './InfoDescription';
 import { useTheme } from '../../../util/theme';
 import { fontStyles } from '../../../styles/common';
 import { isTokenDetectionSupportedForNetwork } from '@metamask/assets-controllers';
-import { NETWORK_EDUCATION_MODAL_CLOSE_BUTTON } from '../../../../wdio/screen-objects/testIDs/Screens/NetworksScreen.testids.js';
 import {
   selectChainId,
   selectProviderConfig,
@@ -223,7 +222,7 @@ const NetworkInfo = (props: NetworkInfoProps) => {
           type="confirm"
           onPress={onClose}
           containerStyle={styles.closeButton}
-          testID={NETWORK_EDUCATION_MODAL_CLOSE_BUTTON}
+          testID={NetworkEducationModalSelectorsIDs.CLOSE_BUTTON}
         >
           {strings('network_information.got_it')}
         </StyledButton>
diff --git a/app/components/UI/Notification/Modal/index.tsx b/app/components/UI/Notification/Modal/index.tsx
index 9a37c8f3cae..4f4077167e8 100644
--- a/app/components/UI/Notification/Modal/index.tsx
+++ b/app/components/UI/Notification/Modal/index.tsx
@@ -1,18 +1,16 @@
 import React from 'react';
 import { View } from 'react-native';
 import Checkbox from '../../../../component-library/components/Checkbox/Checkbox';
-import Icon, {
-  IconColor,
-  IconName,
-  IconSize,
-} from '../../../../component-library/components/Icons/Icon';
-import Text, {
-  TextVariant,
-} from '../../../../component-library/components/Texts/Text';
 import {
   Button,
   ButtonVariant,
   ButtonSize,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Text,
+  TextVariant,
 } from '@metamask/design-system-react-native';
 import createStyles from './styles';
 import { useTheme } from '../../../../util/theme';
@@ -60,10 +58,10 @@ const ModalContent = ({
         size={iconSize}
         style={styles.icon}
       />
-      <Text variant={TextVariant.HeadingMD} style={styles.title}>
+      <Text variant={TextVariant.HeadingMd} style={styles.title}>
         {title}
       </Text>
-      <Text variant={TextVariant.BodyMD} style={styles.description}>
+      <Text variant={TextVariant.BodyMd} style={styles.description}>
         {message}
       </Text>
       <View style={styles.bottom}>
diff --git a/app/components/UI/Perps/Debug/HIP3DebugView.tsx b/app/components/UI/Perps/Debug/HIP3DebugView.tsx
index bd018ef1bbe..d0357376799 100644
--- a/app/components/UI/Perps/Debug/HIP3DebugView.tsx
+++ b/app/components/UI/Perps/Debug/HIP3DebugView.tsx
@@ -52,13 +52,13 @@ const HIP3DebugView: React.FC = () => {
   // Balance and positions display state
   const [balanceInfo, setBalanceInfo] = useState<{
     totalBalance: string;
-    availableBalance: string;
+    spendableBalance: string;
     marginUsed: string;
     positionCount: number;
     subAccountCount: number;
     subAccountBreakdown?: Record<
       string,
-      { availableBalance: string; totalBalance: string }
+      { spendableBalance: string; totalBalance: string }
     >;
   } | null>(null);
 
@@ -167,7 +167,7 @@ const HIP3DebugView: React.FC = () => {
 
       const accountSummary = {
         totalBalance: accountState.totalBalance,
-        availableBalance: accountState.availableBalance,
+        spendableBalance: accountState.spendableBalance,
         marginUsed: accountState.marginUsed,
         unrealizedPnl: accountState.unrealizedPnl,
         positions: positions.length,
@@ -187,7 +187,7 @@ const HIP3DebugView: React.FC = () => {
           ([subAccount, breakdown]) => {
             const subAccountInfo = {
               totalBalance: breakdown.totalBalance,
-              availableBalance: breakdown.availableBalance,
+              spendableBalance: breakdown.spendableBalance,
             };
             DevLogger.log(
               `  ${subAccount || 'main'} sub-account:\n` +
@@ -200,7 +200,7 @@ const HIP3DebugView: React.FC = () => {
       // Update UI state
       setBalanceInfo({
         totalBalance: accountState.totalBalance,
-        availableBalance: accountState.availableBalance,
+        spendableBalance: accountState.spendableBalance,
         marginUsed: accountState.marginUsed,
         positionCount: positions.length,
         subAccountCount,
@@ -267,10 +267,10 @@ const HIP3DebugView: React.FC = () => {
     try {
       // Get current balance on selected DEX
       const accountState = await provider.getAccountState();
-      const availableBalance =
-        accountState.subAccountBreakdown?.[selectedDex]?.availableBalance;
+      const spendableBalance =
+        accountState.subAccountBreakdown?.[selectedDex]?.spendableBalance;
 
-      if (!availableBalance || parseFloat(availableBalance) <= 0) {
+      if (!spendableBalance || parseFloat(spendableBalance) <= 0) {
         const message = `⚠️ No available balance on ${selectedDex} DEX to transfer`;
         DevLogger.log(message);
         setTransferResult({
@@ -281,17 +281,17 @@ const HIP3DebugView: React.FC = () => {
       }
 
       DevLogger.log(
-        `Transferring ALL available balance ($${availableBalance}) from ${selectedDex} to main`,
+        `Transferring ALL available balance ($${spendableBalance}) from ${selectedDex} to main`,
       );
 
       const result = await provider.transferBetweenDexs({
         sourceDex: selectedDex,
         destinationDex: '',
-        amount: availableBalance,
+        amount: spendableBalance,
       });
 
       if (result.success) {
-        const message = `✅ Reset complete: Transferred $${availableBalance} from ${selectedDex} to main DEX`;
+        const message = `✅ Reset complete: Transferred $${spendableBalance} from ${selectedDex} to main DEX`;
         DevLogger.log(message);
         setTransferResult({
           status: 'success',
@@ -623,7 +623,7 @@ const HIP3DebugView: React.FC = () => {
                 Total: ${balanceInfo.totalBalance}
               </Text>
               <Text variant={TextVariant.BodySM} style={styles.successText}>
-                Available: ${balanceInfo.availableBalance}
+                Available: ${balanceInfo.spendableBalance}
               </Text>
               <Text variant={TextVariant.BodySM} style={styles.successText}>
                 Margin Used: ${balanceInfo.marginUsed}
@@ -662,7 +662,7 @@ const HIP3DebugView: React.FC = () => {
                             variant={TextVariant.BodySM}
                             style={styles.successText}
                           >
-                            {'  '}Available: ${breakdown.availableBalance}
+                            {'  '}Available: ${breakdown.spendableBalance}
                           </Text>
                         </View>
                       ),
diff --git a/app/components/UI/Perps/Perps.testIds.ts b/app/components/UI/Perps/Perps.testIds.ts
index 3dcaa9ff3ef..921e4cb7885 100644
--- a/app/components/UI/Perps/Perps.testIds.ts
+++ b/app/components/UI/Perps/Perps.testIds.ts
@@ -331,8 +331,8 @@ export const PerpsWithdrawViewSelectorsIDs = {
   RECEIVE_VALUE: 'perps-withdraw-receive-value',
   FEE_VALUE: 'perps-withdraw-fee-value',
   TIME_VALUE: 'perps-withdraw-time-value',
-  // Must render availableBalance only (not availableToTradeBalance):
-  // withdraw does not offer spot collateral.
+  // Renders withdrawableBalance (provider handles any spot→perps sweep
+  // internally, so the field already reflects the max that can exit).
   AVAILABLE_BALANCE_TEXT: 'perps-withdraw-available-balance-text',
 };
 
diff --git a/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.test.tsx b/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.test.tsx
index 4cfb56fad70..948a508e4f5 100644
--- a/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsAdjustMarginView/PerpsAdjustMarginView.test.tsx
@@ -222,7 +222,7 @@ describe('PerpsAdjustMarginView', () => {
       newLiquidationPrice: 1900,
       currentLiquidationDistance: 5,
       newLiquidationDistance: 5,
-      availableBalance: 1000,
+      spendableBalance: 1000,
       currentPrice: 2000,
       isAddMode: true,
       positionLeverage: 10,
@@ -305,7 +305,7 @@ describe('PerpsAdjustMarginView', () => {
         newLiquidationPrice: 1900,
         currentLiquidationDistance: 5,
         newLiquidationDistance: 5,
-        availableBalance: 1000,
+        spendableBalance: 1000,
         currentPrice: 2000,
         isAddMode: false,
         positionLeverage: 10,
@@ -373,7 +373,7 @@ describe('PerpsAdjustMarginView', () => {
         newLiquidationPrice: 0,
         currentLiquidationDistance: 0,
         newLiquidationDistance: 0,
-        availableBalance: 0,
+        spendableBalance: 0,
         currentPrice: 0,
         isAddMode: true,
         positionLeverage: 10,
@@ -493,7 +493,7 @@ describe('PerpsAdjustMarginView', () => {
         newLiquidationPrice: 1900,
         currentLiquidationDistance: 5,
         newLiquidationDistance: 5,
-        availableBalance: 1000,
+        spendableBalance: 1000,
         currentPrice: 2000,
         isAddMode: false,
         positionLeverage: 10,
diff --git a/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.test.tsx b/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.test.tsx
index b4511051839..0e5d68c95bd 100644
--- a/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.test.tsx
@@ -4,6 +4,25 @@ import PerpsHomeView from './PerpsHomeView';
 import { PERPS_EVENT_VALUE } from '@metamask/perps-controller';
 import { selectPerpsFeedbackEnabledFlag } from '../../selectors/featureFlags';
 import { mockTheme } from '../../../../../util/theme';
+import { useDiscoveryScrollManager } from '../../../Predict/hooks/useDiscoveryScrollManager';
+
+// Mock useDiscoveryScrollManager
+const mockPerpsOnTabEnter = jest.fn();
+const mockPerpsScrollHandler = jest.fn();
+jest.mock('../../../Predict/hooks/useDiscoveryScrollManager', () => ({
+  useDiscoveryScrollManager: jest.fn(() => ({
+    scrollHandler: mockPerpsScrollHandler,
+    onTabEnter: mockPerpsOnTabEnter,
+    headerHidden: false,
+  })),
+}));
+
+// Mock react-native-reanimated
+jest.mock('react-native-reanimated', () => {
+  const Reanimated = jest.requireActual('react-native-reanimated/mock');
+  Reanimated.default.ScrollView = jest.requireActual('react-native').ScrollView;
+  return Reanimated;
+});
 
 // Mock navigation
 const mockNavigate = jest.fn();
@@ -113,7 +132,8 @@ jest.mock('../../hooks/stream', () => ({
   usePerpsLiveAccount: jest.fn(() => ({
     account: {
       totalBalance: '0',
-      availableBalance: '0',
+      spendableBalance: '0',
+      withdrawableBalance: '0',
       unrealizedPnl: '0',
       returnOnEquity: '0',
     },
@@ -876,4 +896,77 @@ describe('PerpsHomeView', () => {
       });
     });
   });
+
+  describe('hideHeader prop', () => {
+    it('renders the header by default', () => {
+      const { getByTestId } = render(<PerpsHomeView />);
+      expect(getByTestId('back-button')).toBeTruthy();
+      expect(getByTestId('perps-home-search-toggle')).toBeTruthy();
+    });
+
+    it('hides the header when hideHeader is true', () => {
+      const { queryByTestId } = render(<PerpsHomeView hideHeader />);
+      expect(queryByTestId('back-button')).toBeNull();
+      expect(queryByTestId('perps-home-search-toggle')).toBeNull();
+    });
+
+    it('still renders content when hideHeader is true', () => {
+      const { UNSAFE_getByType } = render(<PerpsHomeView hideHeader />);
+      expect(
+        UNSAFE_getByType('PerpsMarketBalanceActions' as never),
+      ).toBeTruthy();
+    });
+  });
+
+  describe('tabEnterCallbackRef prop', () => {
+    it('populates tabEnterCallbackRef.current with onTabEnter after mount', () => {
+      const ref = { current: null } as React.MutableRefObject<
+        (() => void) | null
+      >;
+      render(<PerpsHomeView tabEnterCallbackRef={ref} />);
+      expect(ref.current).toBe(mockPerpsOnTabEnter);
+    });
+
+    it('updates tabEnterCallbackRef.current when onTabEnter changes', () => {
+      const ref = { current: null } as React.MutableRefObject<
+        (() => void) | null
+      >;
+      const newOnTabEnter = jest.fn();
+      (useDiscoveryScrollManager as jest.Mock).mockReturnValueOnce({
+        scrollHandler: mockPerpsScrollHandler,
+        onTabEnter: newOnTabEnter,
+        headerHidden: false,
+      });
+      render(<PerpsHomeView tabEnterCallbackRef={ref} />);
+      expect(ref.current).toBe(newOnTabEnter);
+    });
+
+    it('does not throw when tabEnterCallbackRef is not provided', () => {
+      expect(() => render(<PerpsHomeView />)).not.toThrow();
+    });
+  });
+
+  describe('useDiscoveryScrollManager integration', () => {
+    it('passes walletHeaderHeight to useDiscoveryScrollManager', () => {
+      render(<PerpsHomeView walletHeaderHeight={56} />);
+      expect(useDiscoveryScrollManager).toHaveBeenCalledWith(
+        expect.objectContaining({ walletHeaderHeight: 56 }),
+      );
+    });
+
+    it('passes onHeaderHiddenChange to useDiscoveryScrollManager', () => {
+      const onHeaderHiddenChange = jest.fn();
+      render(<PerpsHomeView onHeaderHiddenChange={onHeaderHiddenChange} />);
+      expect(useDiscoveryScrollManager).toHaveBeenCalledWith(
+        expect.objectContaining({ onHeaderHiddenChange }),
+      );
+    });
+
+    it('uses default walletHeaderHeight of 0 when not provided', () => {
+      render(<PerpsHomeView />);
+      expect(useDiscoveryScrollManager).toHaveBeenCalledWith(
+        expect.objectContaining({ walletHeaderHeight: 0 }),
+      );
+    });
+  });
 });
diff --git a/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.tsx b/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.tsx
index 2baecf8cf13..b43a4169ee4 100644
--- a/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.tsx
+++ b/app/components/UI/Perps/Views/PerpsHomeView/PerpsHomeView.tsx
@@ -5,7 +5,7 @@ import React, {
   useEffect,
   useMemo,
 } from 'react';
-import { View, ScrollView, Modal } from 'react-native';
+import { View, Modal, NativeScrollEvent } from 'react-native';
 import { useSelector } from 'react-redux';
 import {
   SafeAreaView,
@@ -57,6 +57,8 @@ import PerpsHomeHeader from '../../components/PerpsHomeHeader';
 import type { PerpsNavigationParamList } from '../../types/navigation';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
 import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
+import Reanimated, { SharedValue } from 'react-native-reanimated';
+import { useDiscoveryScrollManager } from '../../../Predict/hooks/useDiscoveryScrollManager';
 import styleSheet from './PerpsHomeView.styles';
 import { TraceName } from '../../../../../util/trace';
 import {
@@ -72,7 +74,30 @@ import PerpsNavigationCard, {
   NavigationItem,
 } from '../../components/PerpsNavigationCard/PerpsNavigationCard';
 
-const PerpsHomeView = () => {
+interface PerpsHomeViewProps {
+  hideHeader?: boolean;
+  walletHeaderTranslateY?: SharedValue<number>;
+  walletHeaderHeight?: number;
+  /** Ref populated with this tab's onTabEnter so the parent can call it on tab switch. */
+  tabEnterCallbackRef?: React.MutableRefObject<(() => void) | null>;
+  /** Forwarded to useDiscoveryScrollManager to sync icon animations with header hide/show. */
+  onHeaderHiddenChange?: (hidden: boolean) => void;
+  /**
+   * Top padding applied inside the scroll content container — used by HomepageDiscoveryTabs
+   * (Hub Page Discovery Tabs feature flag treatment) so the perps gradient extends up
+   * directly under the discovery tab bar instead of leaving a transparent gap.
+   */
+  topInset?: number;
+}
+
+const PerpsHomeView = ({
+  hideHeader = false,
+  walletHeaderTranslateY,
+  walletHeaderHeight = 0,
+  tabEnterCallbackRef,
+  onHeaderHiddenChange,
+  topInset = 0,
+}: PerpsHomeViewProps) => {
   const { styles } = useStyles(styleSheet, {});
   const insets = useSafeAreaInsets();
   const navigation = useNavigation();
@@ -124,6 +149,38 @@ const PerpsHomeView = () => {
   const { handleSectionLayout, handleScroll, resetTracking } =
     usePerpsHomeSectionTracking();
 
+  // Bridge analytics handler into the Reanimated worklet via onScrollEvent
+  const handleScrollEvent = useCallback(
+    (scrollY: number, viewportHeight: number) => {
+      handleScroll({
+        nativeEvent: {
+          contentOffset: { x: 0, y: scrollY },
+          layoutMeasurement: { width: 0, height: viewportHeight },
+        } as NativeScrollEvent,
+      });
+    },
+    [handleScroll],
+  );
+
+  const { scrollHandler: perpsScrollHandler, onTabEnter: perpsOnTabEnter } =
+    useDiscoveryScrollManager({
+      walletHeaderHeight,
+      walletHeaderTranslateY,
+      onScrollEvent: handleScrollEvent,
+      onHeaderHiddenChange,
+    });
+
+  // Expose onTabEnter to the parent so it can restore this tab's header state on switch.
+  useEffect(() => {
+    if (tabEnterCallbackRef) {
+      tabEnterCallbackRef.current = perpsOnTabEnter;
+      return () => {
+        tabEnterCallbackRef.current = null;
+      };
+    }
+    return undefined;
+  }, [tabEnterCallbackRef, perpsOnTabEnter]);
+
   // Get balance state directly from Redux
   const { account: perpsAccount } = usePerpsLiveAccount({ throttleMs: 1000 });
   const totalBalance = perpsAccount?.totalBalance || '0';
@@ -417,20 +474,28 @@ const PerpsHomeView = () => {
   const handleBackPress = perpsNavigation.navigateToWallet;
 
   return (
-    <SafeAreaView style={styles.container}>
+    <SafeAreaView
+      style={styles.container}
+      edges={hideHeader ? { bottom: 'additive' } : undefined}
+    >
       {/* Header */}
-      <PerpsHomeHeader
-        onBack={handleBackPress}
-        onSearchToggle={handleSearchToggle}
-        testID="perps-home"
-      />
+      {!hideHeader && (
+        <PerpsHomeHeader
+          onBack={handleBackPress}
+          onSearchToggle={handleSearchToggle}
+          testID="perps-home"
+        />
+      )}
 
       {/* Main Content - ScrollView with all carousels */}
-      <ScrollView
+      <Reanimated.ScrollView
         style={styles.scrollView}
-        contentContainerStyle={styles.scrollViewContent}
+        contentContainerStyle={[
+          styles.scrollViewContent,
+          topInset > 0 ? { paddingTop: topInset } : null,
+        ]}
         showsVerticalScrollIndicator={false}
-        onScroll={handleScroll}
+        onScroll={perpsScrollHandler}
         scrollEventThrottle={16}
       >
         <PerpsHomeHeader
@@ -553,7 +618,7 @@ const PerpsHomeView = () => {
 
         {/* Bottom spacing for tab bar */}
         <View style={bottomSpacerStyle} />
-      </ScrollView>
+      </Reanimated.ScrollView>
 
       {/* Close All Positions Bottom Sheet */}
       {showCloseAllSheet && (
diff --git a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx
index a2937d7337a..e7eb831f526 100644
--- a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx
@@ -755,7 +755,8 @@ describe('PerpsMarketDetailsView', () => {
   beforeEach(() => {
     mockUsePerpsAccount.mockReturnValue({
       account: {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         marginUsed: '0.00',
         unrealizedPnl: '0.00',
         returnOnEquity: '0.00',
@@ -766,7 +767,8 @@ describe('PerpsMarketDetailsView', () => {
 
     mockUsePerpsLiveAccount.mockReturnValue({
       account: {
-        availableBalance: '1000',
+        spendableBalance: '1000',
+        withdrawableBalance: '1000',
         marginUsed: '0',
         unrealizedPnl: '0',
         returnOnEquity: '0',
@@ -992,7 +994,8 @@ describe('PerpsMarketDetailsView', () => {
       });
       mockUsePerpsAccount.mockReturnValue({
         account: {
-          availableBalance: '0.00',
+          spendableBalance: '0.00',
+          withdrawableBalance: '0.00',
           marginUsed: '0.00',
           unrealizedPnl: '0.00',
           returnOnEquity: '0.00',
@@ -1003,7 +1006,8 @@ describe('PerpsMarketDetailsView', () => {
 
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '0',
+          spendableBalance: '0',
+          withdrawableBalance: '0',
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -1039,7 +1043,8 @@ describe('PerpsMarketDetailsView', () => {
       mockUseDefaultPayWithTokenWhenNoPerpsBalance.mockReturnValue(null);
       mockUsePerpsAccount.mockReturnValue({
         account: {
-          availableBalance: '0.00',
+          spendableBalance: '0.00',
+          withdrawableBalance: '0.00',
           marginUsed: '0.00',
           unrealizedPnl: '0.00',
           returnOnEquity: '0.00',
@@ -1049,7 +1054,8 @@ describe('PerpsMarketDetailsView', () => {
       });
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '0',
+          spendableBalance: '0',
+          withdrawableBalance: '0',
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -1080,7 +1086,8 @@ describe('PerpsMarketDetailsView', () => {
       mockUseDefaultPayWithTokenWhenNoPerpsBalance.mockReturnValue(null);
       mockUsePerpsAccount.mockReturnValue({
         account: {
-          availableBalance: '0.00',
+          spendableBalance: '0.00',
+          withdrawableBalance: '0.00',
           marginUsed: '0.00',
           unrealizedPnl: '0.00',
           returnOnEquity: '0.00',
@@ -1090,7 +1097,8 @@ describe('PerpsMarketDetailsView', () => {
       });
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '0',
+          spendableBalance: '0',
+          withdrawableBalance: '0',
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -1121,7 +1129,8 @@ describe('PerpsMarketDetailsView', () => {
       mockUseDefaultPayWithTokenWhenNoPerpsBalance.mockReturnValue(null);
       mockUsePerpsAccount.mockReturnValue({
         account: {
-          availableBalance: '0.00',
+          spendableBalance: '0.00',
+          withdrawableBalance: '0.00',
           marginUsed: '0.00',
           unrealizedPnl: '0.00',
           returnOnEquity: '0.00',
@@ -1131,7 +1140,8 @@ describe('PerpsMarketDetailsView', () => {
       });
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '0',
+          spendableBalance: '0',
+          withdrawableBalance: '0',
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -1169,7 +1179,8 @@ describe('PerpsMarketDetailsView', () => {
       mockUseDefaultPayWithTokenWhenNoPerpsBalance.mockReturnValue(null);
       mockUsePerpsAccount.mockReturnValue({
         account: {
-          availableBalance: '0.00',
+          spendableBalance: '0.00',
+          withdrawableBalance: '0.00',
           marginUsed: '0.00',
           unrealizedPnl: '0.00',
           returnOnEquity: '0.00',
@@ -1179,7 +1190,8 @@ describe('PerpsMarketDetailsView', () => {
       });
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '0',
+          spendableBalance: '0',
+          withdrawableBalance: '0',
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -1213,7 +1225,8 @@ describe('PerpsMarketDetailsView', () => {
       // Override with non-zero balance and existing position
       mockUsePerpsAccount.mockReturnValue({
         account: {
-          availableBalance: '1000.00',
+          spendableBalance: '1000.00',
+          withdrawableBalance: '1000.00',
           marginUsed: '500.00',
           unrealizedPnl: '50.00',
           returnOnEquity: '3.33',
diff --git a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx
index 4f170ff800d..87e54a385e4 100644
--- a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx
@@ -443,14 +443,12 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
     useDefaultPayWithTokenWhenNoPerpsBalance();
   const { depositWithConfirmation } = usePerpsTrading();
   const { navigateToConfirmation } = useConfirmNavigation();
-  const tradeableBalance = Number.parseFloat(
-    account?.availableToTradeBalance?.toString() ??
-      account?.availableBalance?.toString() ??
-      '0',
+  const spendableBalance = Number.parseFloat(
+    account?.spendableBalance?.toString() ?? '0',
   );
   const hasDirectOrderFundingPath =
     !isLoadingAccount &&
-    (tradeableBalance >= PERPS_MIN_BALANCE_THRESHOLD ||
+    (spendableBalance >= PERPS_MIN_BALANCE_THRESHOLD ||
       defaultPayTokenWhenNoPerpsBalance !== null);
 
   const handleAddFunds = useCallback(async () => {
diff --git a/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx b/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx
index 862a34e1d6c..b5c21785947 100644
--- a/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx
@@ -5,13 +5,13 @@ import React, {
   useMemo,
   useCallback,
 } from 'react';
+import { HeaderStandard } from '@metamask/design-system-react-native';
 import { View, Animated } from 'react-native';
 import { useStyles } from '../../../../../component-library/hooks';
 import Icon, {
   IconName,
   IconSize,
 } from '../../../../../component-library/components/Icons/Icon';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import TextFieldSearch from '../../../../../component-library/components/Form/TextFieldSearch/TextFieldSearch';
 import { strings } from '../../../../../../locales/i18n';
 import Text, {
@@ -67,6 +67,7 @@ const PerpsMarketListView = ({
     route.params?.showWatchlistOnly ?? propShowWatchlistOnly ?? false;
   const defaultMarketTypeFilter =
     route.params?.defaultMarketTypeFilter ?? 'all';
+  const defaultSortOptionId = route.params?.defaultSortOptionId;
 
   const fadeAnimation = useRef(new Animated.Value(0)).current;
   const [isSortFieldSheetVisible, setIsSortFieldSheetVisible] = useState(false);
@@ -84,6 +85,7 @@ const PerpsMarketListView = ({
     enablePolling: false,
     showWatchlistOnly,
     defaultMarketTypeFilter,
+    defaultSortOptionId,
     showZeroVolume: __DEV__,
   });
 
@@ -317,7 +319,7 @@ const PerpsMarketListView = ({
 
   return (
     <SafeAreaView style={styles.container}>
-      <HeaderCompactStandard
+      <HeaderStandard
         title={title || strings('perps.home.markets')}
         onBack={handleBackPressed}
         backButtonProps={{
diff --git a/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.test.tsx b/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.test.tsx
index 02b294ea8be..9253a52719a 100644
--- a/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.test.tsx
@@ -136,7 +136,8 @@ jest.mock('../../contexts/PerpsOrderContext', () => {
 jest.mock('../../hooks/stream', () => ({
   usePerpsLiveAccount: jest.fn(() => ({
     account: {
-      availableBalance: '1000',
+      spendableBalance: '1000',
+      withdrawableBalance: '1000',
       marginUsed: '0',
       unrealizedPnl: '0',
       returnOnEquity: '0',
@@ -570,7 +571,8 @@ jest.mock('../../../../../core/Engine', () => ({
       subscribeToPrices: jest.fn(() => jest.fn()),
       getAccountState: jest.fn().mockResolvedValue({
         totalBalance: '1000',
-        availableBalance: '1000',
+        spendableBalance: '1000',
+        withdrawableBalance: '1000',
         marginUsed: '0',
         unrealizedPnl: '0',
       }),
@@ -714,7 +716,8 @@ const defaultMockRoute = {
 const defaultMockHooks = {
   usePerpsLiveAccount: {
     account: {
-      availableBalance: '1000',
+      spendableBalance: '1000',
+      withdrawableBalance: '1000',
       marginUsed: '0',
       unrealizedPnl: '0',
       returnOnEquity: '0',
@@ -1569,7 +1572,8 @@ describe('PerpsOrderView', () => {
   it('handles zero balance warning', async () => {
     (usePerpsLiveAccount as jest.Mock).mockReturnValue({
       balance: '0',
-      availableBalance: '0',
+      spendableBalance: '0',
+      withdrawableBalance: '0',
       accountInfo: {
         marginSummary: {
           accountValue: 0,
@@ -1590,7 +1594,8 @@ describe('PerpsOrderView', () => {
     // Mock insufficient balance
     (usePerpsLiveAccount as jest.Mock).mockReturnValue({
       balance: '10',
-      availableBalance: '10',
+      spendableBalance: '10',
+      withdrawableBalance: '10',
       accountInfo: {
         marginSummary: {
           accountValue: 10,
@@ -3744,7 +3749,8 @@ describe('PerpsOrderView', () => {
       // appear while account data is still loading
       (usePerpsLiveAccount as jest.Mock).mockReturnValue({
         account: {
-          availableBalance: '0', // Zero balance
+          spendableBalance: '0', // Zero balance
+          withdrawableBalance: '0', // Zero balance
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -3773,7 +3779,8 @@ describe('PerpsOrderView', () => {
       // Arrange - Mock sufficient balance and adjust order form amount
       (usePerpsLiveAccount as jest.Mock).mockReturnValue({
         account: {
-          availableBalance: '10000', // High balance
+          spendableBalance: '10000', // High balance
+          withdrawableBalance: '10000', // High balance
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
diff --git a/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.tsx b/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.tsx
index 16aa59640f8..2d683c72426 100644
--- a/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.tsx
+++ b/app/components/UI/Perps/Views/PerpsOrderView/PerpsOrderView.tsx
@@ -291,7 +291,7 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
     handlePercentageAmount,
     handleMaxAmount,
     maxPossibleAmount,
-    balanceForValidation: availableBalance,
+    balanceForValidation: spendableBalance,
     // existingPosition is available in context but not used in this component
   } = usePerpsOrderContext();
 
@@ -776,7 +776,7 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
     orderForm,
     positionSize,
     assetPrice: assetData.price,
-    availableBalance,
+    spendableBalance,
     marginRequired: marginRequired || '0',
     existingPositionLeverage: existingPositionLeverageForValidation,
     skipValidation: isInputFocused,
@@ -1248,7 +1248,7 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
   useInitPerpsPaymentToken(orderForm.asset ?? '');
 
   // Use the same calculation as handleMaxAmount in usePerpsOrderForm to avoid insufficient funds error
-  const amountTimesLeverage = Math.floor(availableBalance * orderForm.leverage);
+  const amountTimesLeverage = Math.floor(spendableBalance * orderForm.leverage);
 
   const isAmountDisabled = amountTimesLeverage < minimumOrderAmount;
 
@@ -1329,12 +1329,12 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
         {/* Amount Display */}
         <PerpsAmountDisplay
           amount={orderForm.amount}
-          showWarning={!isLoadingAccount && availableBalance === 0}
+          showWarning={!isLoadingAccount && spendableBalance === 0}
           onPress={handleAmountPress}
           isActive={isInputFocused}
           tokenAmount={positionSize}
           tokenSymbol={getPerpsDisplaySymbol(orderForm.asset)}
-          hasError={availableBalance > 0 && !!filteredErrors.length}
+          hasError={spendableBalance > 0 && !!filteredErrors.length}
           isLoading={isLoadingAccount}
         />
 
@@ -1853,7 +1853,7 @@ const PerpsOrderViewContentBase: React.FC<PerpsOrderViewContentProps> = ({
 
           // Check if current amount exceeds new maximum value and adjust if needed
           const currentAmount = parseFloat(orderForm.amount || '0');
-          const newMaxAmount = availableBalance * leverage;
+          const newMaxAmount = spendableBalance * leverage;
           if (currentAmount > newMaxAmount) {
             setAmount(Math.floor(newMaxAmount).toString());
           }
diff --git a/app/components/UI/Perps/Views/PerpsPositionsView/PerpsPositionsView.test.tsx b/app/components/UI/Perps/Views/PerpsPositionsView/PerpsPositionsView.test.tsx
index d3abf488f8e..e8cbb9991d2 100644
--- a/app/components/UI/Perps/Views/PerpsPositionsView/PerpsPositionsView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsPositionsView/PerpsPositionsView.test.tsx
@@ -153,7 +153,8 @@ const mockPositions: Position[] = [
 
 const mockAccountState = {
   totalBalance: '10000',
-  availableBalance: '4700',
+  spendableBalance: '4700',
+  withdrawableBalance: '4700',
   marginUsed: '5300',
 };
 
@@ -239,7 +240,7 @@ describe('PerpsPositionsView', () => {
         // Check that the actual formatted values appear in the UI
         // PRICE_RANGES_MINIMAL_VIEW: Fixed 2 decimals, trailing zeros removed
         expect(screen.getByText('$10,000')).toBeOnTheScreen(); // totalBalance
-        expect(screen.getByText('$4,700')).toBeOnTheScreen(); // availableBalance
+        expect(screen.getByText('$4,700')).toBeOnTheScreen(); // spendableBalance
         expect(screen.getByText('$5,300')).toBeOnTheScreen(); // marginUsed
         expect(screen.getByText('+$75.50')).toBeOnTheScreen(); // total PnL
       });
@@ -387,7 +388,8 @@ describe('PerpsPositionsView', () => {
       (usePerpsLiveAccount as jest.Mock).mockReturnValue({
         account: {
           totalBalance: null,
-          availableBalance: undefined,
+          spendableBalance: undefined,
+          withdrawableBalance: undefined,
           marginUsed: '',
         },
         isInitialLoading: false,
diff --git a/app/components/UI/Perps/Views/PerpsPositionsView/PerpsPositionsView.tsx b/app/components/UI/Perps/Views/PerpsPositionsView/PerpsPositionsView.tsx
index 7c9e99a430b..2a344c369da 100644
--- a/app/components/UI/Perps/Views/PerpsPositionsView/PerpsPositionsView.tsx
+++ b/app/components/UI/Perps/Views/PerpsPositionsView/PerpsPositionsView.tsx
@@ -185,9 +185,9 @@ const PerpsPositionsView: React.FC = () => {
               isHidden={privacyMode}
               length={SensitiveTextLength.Short}
             >
-              {account?.availableBalance !== undefined &&
-              account?.availableBalance !== null
-                ? formatPerpsFiat(account.availableBalance, {
+              {account?.spendableBalance !== undefined &&
+              account?.spendableBalance !== null
+                ? formatPerpsFiat(account.spendableBalance, {
                     ranges: PRICE_RANGES_MINIMAL_VIEW,
                   })
                 : PERPS_CONSTANTS.FallbackDataDisplay}
diff --git a/app/components/UI/Perps/Views/PerpsTabView/PerpsTabView.test.tsx b/app/components/UI/Perps/Views/PerpsTabView/PerpsTabView.test.tsx
index 7affd0d3a59..492ba221de9 100644
--- a/app/components/UI/Perps/Views/PerpsTabView/PerpsTabView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsTabView/PerpsTabView.test.tsx
@@ -122,7 +122,8 @@ jest.mock('../../hooks/stream', () => ({
   usePerpsLiveOrders: jest.fn(() => ({ orders: [] })),
   usePerpsLiveAccount: jest.fn(() => ({
     account: {
-      availableBalance: '1000.00',
+      spendableBalance: '1000.00',
+      withdrawableBalance: '1000.00',
       marginUsed: '0.00',
       unrealizedPnl: '0.00',
       returnOnEquity: '0.00',
diff --git a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsFundingTransactionView.tsx b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsFundingTransactionView.tsx
index ccdf9d0ae52..a9e0d008a6c 100644
--- a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsFundingTransactionView.tsx
+++ b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsFundingTransactionView.tsx
@@ -9,6 +9,7 @@ import {
   Button,
   ButtonVariant,
   ButtonSize,
+  HeaderStandard,
 } from '@metamask/design-system-react-native';
 import Text, {
   TextColor,
@@ -17,7 +18,6 @@ import Text, {
 import { useStyles } from '../../../../../component-library/hooks';
 import { selectSelectedInternalAccountByScope } from '../../../../../selectors/multichainAccounts/accounts';
 import ScreenView from '../../../../Base/ScreenView';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import PerpsTransactionDetailAssetHero from '../../components/PerpsTransactionDetailAssetHero';
 import { usePerpsBlockExplorerUrl } from '../../hooks';
 import {
@@ -54,10 +54,7 @@ const PerpsFundingTransactionView: React.FC = () => {
   if (!transaction) {
     return (
       <ScreenView>
-        <HeaderCompactStandard
-          includesTopInset
-          onBack={() => navigation.goBack()}
-        />
+        <HeaderStandard includesTopInset onBack={() => navigation.goBack()} />
         <View style={styles.content}>
           <Text>{strings('perps.transactions.not_found')}</Text>
         </View>
@@ -109,7 +106,7 @@ const PerpsFundingTransactionView: React.FC = () => {
 
   return (
     <ScreenView>
-      <HeaderCompactStandard
+      <HeaderStandard
         includesTopInset
         title={transaction.title}
         onBack={() => navigation.goBack()}
diff --git a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView.tsx b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView.tsx
index 258bd99d72c..f7c42f46fc6 100644
--- a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView.tsx
+++ b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView.tsx
@@ -13,11 +13,11 @@ import {
   Button,
   ButtonVariant,
   ButtonSize,
+  HeaderStandard,
 } from '@metamask/design-system-react-native';
 import { useStyles } from '../../../../../component-library/hooks';
 import { selectSelectedInternalAccountByScope } from '../../../../../selectors/multichainAccounts/accounts';
 import ScreenView from '../../../../Base/ScreenView';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import PerpsTransactionDetailAssetHero from '../../components/PerpsTransactionDetailAssetHero';
 import { usePerpsBlockExplorerUrl, usePerpsOrderFees } from '../../hooks';
 import { PerpsOrderTransactionRouteProp } from '../../types/transactionHistory';
@@ -54,10 +54,7 @@ const PerpsOrderTransactionView: React.FC = () => {
   if (!transaction) {
     return (
       <ScreenView>
-        <HeaderCompactStandard
-          includesTopInset
-          onBack={() => navigation.goBack()}
-        />
+        <HeaderStandard includesTopInset onBack={() => navigation.goBack()} />
         <View style={styles.content}>
           <Text>{strings('perps.transactions.not_found')}</Text>
         </View>
@@ -127,7 +124,7 @@ const PerpsOrderTransactionView: React.FC = () => {
 
   return (
     <ScreenView>
-      <HeaderCompactStandard
+      <HeaderStandard
         includesTopInset
         title={transaction.title}
         onBack={() => navigation.goBack()}
diff --git a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView.tsx b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView.tsx
index df790bf2a70..37d3e3f54df 100644
--- a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView.tsx
+++ b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView.tsx
@@ -13,12 +13,12 @@ import {
   Button,
   ButtonVariant,
   ButtonSize,
+  HeaderStandard,
 } from '@metamask/design-system-react-native';
 import { useStyles } from '../../../../../component-library/hooks';
 import { selectSelectedInternalAccountByScope } from '../../../../../selectors/multichainAccounts/accounts';
 import Routes from '../../../../../constants/navigation/Routes';
 import ScreenView from '../../../../Base/ScreenView';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import PerpsTransactionDetailAssetHero from '../../components/PerpsTransactionDetailAssetHero';
 import { usePerpsBlockExplorerUrl } from '../../hooks';
 import {
@@ -69,10 +69,7 @@ const PerpsPositionTransactionView: React.FC = () => {
     // Handle missing transaction data
     return (
       <ScreenView>
-        <HeaderCompactStandard
-          includesTopInset
-          onBack={() => navigation.goBack()}
-        />
+        <HeaderStandard includesTopInset onBack={() => navigation.goBack()} />
         <View style={styles.content}>
           <Text>{strings('perps.transactions.not_found')}</Text>
         </View>
@@ -174,7 +171,7 @@ const PerpsPositionTransactionView: React.FC = () => {
 
   return (
     <ScreenView>
-      <HeaderCompactStandard
+      <HeaderStandard
         title={transaction?.fill?.shortTitle || ''}
         onBack={() => navigation.goBack()}
         includesTopInset
diff --git a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.test.tsx b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.test.tsx
index a4ea86bc919..deca0f24dec 100644
--- a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.test.tsx
@@ -23,6 +23,7 @@ import { mockNetworkState } from '../../../../../util/test/network';
 import { TRANSACTION_DETAIL_EVENTS } from '../../../../../core/Analytics/events/transactions';
 import { MonetizedPrimitive } from '../../../../../core/Analytics/MetaMetrics.types';
 import { usePerpsMeasurement } from '../../hooks/usePerpsMeasurement';
+import { AccountGroupType, AccountWalletType } from '@metamask/account-api';
 
 const mockTrackEvent = jest.fn();
 const mockAddProperties = jest.fn();
@@ -68,6 +69,55 @@ const mockInitialState: DeepPartial<RootState> = {
   },
 };
 
+const createMockSelectedAccountGroupState = (
+  addresses: string[],
+  selectedAddress: string,
+) => {
+  const accountsControllerState = createMockAccountsControllerState(
+    addresses,
+    selectedAddress,
+  );
+  const accountIds = addresses.map(
+    (address) =>
+      accountsControllerState.accountIdByAddress[address.toLowerCase()],
+  );
+  const walletId = 'entropy:wallet1' as const;
+  const groupId = 'entropy:wallet1/0' as const;
+
+  return {
+    AccountsController: accountsControllerState,
+    AccountTreeController: {
+      accountTree: {
+        wallets: {
+          [walletId]: {
+            id: walletId,
+            type: AccountWalletType.Entropy as AccountWalletType.Entropy,
+            metadata: {
+              name: 'Wallet 1',
+              entropy: { id: 'wallet1' },
+            },
+            groups: {
+              [groupId]: {
+                id: groupId,
+                type: AccountGroupType.MultichainAccount as AccountGroupType.MultichainAccount,
+                accounts: accountIds,
+                metadata: {
+                  name: 'Account 1',
+                  entropy: { groupIndex: 0 },
+                  pinned: false,
+                  hidden: false,
+                  lastSelected: 0,
+                },
+              },
+            },
+          },
+        },
+      },
+      selectedAccountGroup: groupId,
+    },
+  };
+};
+
 const mockTransactions = [
   {
     id: 'fill-1',
@@ -739,16 +789,17 @@ describe('PerpsTransactionsView', () => {
     });
 
     it('computes and passes accountId when address and chainId are available', async () => {
+      const accountState = createMockSelectedAccountGroupState(
+        [mockSelectedAddress],
+        mockSelectedAddress,
+      );
       const stateWithAccount = {
         ...mockInitialState,
         engine: {
           ...mockInitialState.engine,
           backgroundState: {
             ...backgroundState,
-            AccountsController: createMockAccountsControllerState(
-              [mockSelectedAddress],
-              mockSelectedAddress,
-            ),
+            ...accountState,
             NetworkController: mockNetworkState({
               chainId: mockChainId,
               id: 'arbitrum',
@@ -867,6 +918,10 @@ describe('PerpsTransactionsView', () => {
       const secondAddress = '0x9876543210987654321098765432109876543210';
       const secondAccountId =
         'eip155:42161:0x9876543210987654321098765432109876543210' as CaipAccountId;
+      const accountState = createMockSelectedAccountGroupState(
+        [secondAddress],
+        secondAddress,
+      );
 
       const stateWithSecondAddress = {
         ...mockInitialState,
@@ -874,10 +929,7 @@ describe('PerpsTransactionsView', () => {
           ...mockInitialState.engine,
           backgroundState: {
             ...backgroundState,
-            AccountsController: createMockAccountsControllerState(
-              [secondAddress],
-              secondAddress,
-            ),
+            ...accountState,
             NetworkController: mockNetworkState({
               chainId: mockChainId,
               id: 'arbitrum',
@@ -913,6 +965,10 @@ describe('PerpsTransactionsView', () => {
       const secondChainId = '0x1'; // Ethereum mainnet (1)
       const secondAccountId =
         'eip155:1:0x1234567890123456789012345678901234567890' as CaipAccountId;
+      const accountState = createMockSelectedAccountGroupState(
+        [mockSelectedAddress],
+        mockSelectedAddress,
+      );
 
       const stateWithSecondChainId = {
         ...mockInitialState,
@@ -920,10 +976,7 @@ describe('PerpsTransactionsView', () => {
           ...mockInitialState.engine,
           backgroundState: {
             ...backgroundState,
-            AccountsController: createMockAccountsControllerState(
-              [mockSelectedAddress],
-              mockSelectedAddress,
-            ),
+            ...accountState,
             NetworkController: mockNetworkState({
               chainId: secondChainId,
               id: 'mainnet',
diff --git a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.tsx b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.tsx
index 3a97cf35e6f..d2fe1a0bd8d 100644
--- a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.tsx
+++ b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.tsx
@@ -25,7 +25,7 @@ import { useStyles } from '../../../../../component-library/hooks';
 import { TabEmptyState } from '../../../../../component-library/components-temp/TabEmptyState';
 import ButtonFilter from '../../../../../component-library/components-temp/ButtonFilter';
 import Routes from '../../../../../constants/navigation/Routes';
-import { selectSelectedInternalAccountFormattedAddress } from '../../../../../selectors/accountsController';
+import { selectSelectedAccountGroupEvmInternalAccount } from '../../../../../selectors/multichainAccounts/accountTreeController';
 import { selectChainId } from '../../../../../selectors/networkController';
 import {
   formatAccountToCaipAccountId,
@@ -70,9 +70,8 @@ const PerpsTransactionsView: React.FC = () => {
 
   const { isConnected, isConnecting } = usePerpsConnection();
 
-  const selectedAddress = useSelector(
-    selectSelectedInternalAccountFormattedAddress,
-  );
+  const evmAccount = useSelector(selectSelectedAccountGroupEvmInternalAccount);
+  const selectedAddress = evmAccount?.address;
   const currentChainId = useSelector(selectChainId);
   const accountId = useMemo(() => {
     if (!selectedAddress || !currentChainId) {
diff --git a/app/components/UI/Perps/Views/PerpsWithdrawView/PerpsWithdrawView.test.tsx b/app/components/UI/Perps/Views/PerpsWithdrawView/PerpsWithdrawView.test.tsx
index f9655ca53e8..0c4be82bcfc 100644
--- a/app/components/UI/Perps/Views/PerpsWithdrawView/PerpsWithdrawView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsWithdrawView/PerpsWithdrawView.test.tsx
@@ -44,7 +44,8 @@ jest.mock('../../../../../component-library/components/Buttons/Button', () => ({
 jest.mock('../../hooks/stream', () => ({
   usePerpsLiveAccount: jest.fn(() => ({
     account: {
-      availableBalance: '1000.00',
+      spendableBalance: '1000.00',
+      withdrawableBalance: '1000.00',
       marginUsed: '0.00',
       unrealizedPnl: '0.00',
       returnOnEquity: '0.00',
@@ -87,7 +88,8 @@ jest.mock('@metamask/design-system-twrnc-preset', () => ({
 // Mock hooks
 jest.mock('../../hooks', () => ({
   usePerpsAccount: jest.fn(() => ({
-    availableBalance: '$1000.00',
+    spendableBalance: '$1000.00',
+    withdrawableBalance: '$1000.00',
   })),
   usePerpsWithdrawQuote: jest.fn(() => ({
     formattedQuoteData: {
@@ -281,7 +283,8 @@ describe('PerpsWithdrawView', () => {
       jest.requireMock('../../hooks/stream').usePerpsLiveAccount;
     mockUsePerpsLiveAccount.mockReturnValue({
       account: {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         marginUsed: '0.00',
         unrealizedPnl: '0.00',
         returnOnEquity: '0.00',
@@ -308,13 +311,15 @@ describe('PerpsWithdrawView', () => {
       ).toBeOnTheScreen();
     });
 
-    it('uses availableToTradeBalance for the displayed Unified Account balance', () => {
+    it('uses withdrawableBalance for the displayed Unified Account balance', () => {
       const mockUsePerpsLiveAccount =
         jest.requireMock('../../hooks/stream').usePerpsLiveAccount;
+      // Diverge spendable from withdrawable so the assertion proves the view
+      // reads `withdrawableBalance` specifically (not `spendableBalance`).
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '0.00',
-          availableToTradeBalance: '2500.00',
+          spendableBalance: '0.00',
+          withdrawableBalance: '2500.00',
           marginUsed: '0.00',
           unrealizedPnl: '0.00',
           returnOnEquity: '0.00',
diff --git a/app/components/UI/Perps/Views/PerpsWithdrawView/PerpsWithdrawView.tsx b/app/components/UI/Perps/Views/PerpsWithdrawView/PerpsWithdrawView.tsx
index bde50cae4b5..77ebbca0194 100644
--- a/app/components/UI/Perps/Views/PerpsWithdrawView/PerpsWithdrawView.tsx
+++ b/app/components/UI/Perps/Views/PerpsWithdrawView/PerpsWithdrawView.tsx
@@ -17,8 +17,8 @@ import {
   Button,
   ButtonVariant,
   ButtonSize,
+  HeaderStandard,
 } from '@metamask/design-system-react-native';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { PerpsWithdrawViewSelectorsIDs } from '../../Perps.testIds';
 import { strings } from '../../../../../../locales/i18n';
@@ -106,23 +106,20 @@ const PerpsWithdrawView: React.FC = () => {
   // Get withdrawal tokens from hook
   const { destToken } = useWithdrawTokens();
 
-  // Release-branch bridge for Unified Account: availableToTradeBalance includes
-  // collateral HL can use in target mode. The full balance contract will replace
-  // this with an explicit withdrawableBalance field. Truncate so users can
-  // withdraw exactly the amount they see.
-  const availableBalance = useMemo(() => {
-    const balance =
-      account?.availableToTradeBalance ?? account?.availableBalance;
-    if (!balance) return 0;
-    return truncateToTwoDecimals(parseCurrencyString(balance));
-  }, [account?.availableBalance, account?.availableToTradeBalance]);
+  // Truncate to 2 decimals so the user can withdraw exactly what they see.
+  const withdrawableBalance = useMemo(() => {
+    if (!account?.withdrawableBalance) return 0;
+    return truncateToTwoDecimals(
+      parseCurrencyString(account.withdrawableBalance),
+    );
+  }, [account?.withdrawableBalance]);
 
   const formattedBalance = useMemo(
-    () => formatPerpsFiat(availableBalance),
-    [availableBalance],
+    () => formatPerpsFiat(withdrawableBalance),
+    [withdrawableBalance],
   );
 
-  const hasPositiveBalance = availableBalance > 0;
+  const hasPositiveBalance = withdrawableBalance > 0;
 
   // Get withdrawal validation
   const {
@@ -157,9 +154,9 @@ const PerpsWithdrawView: React.FC = () => {
   usePerpsMeasurement({
     traceName: TraceName.PerpsWithdrawView,
     conditions: [
-      !!(account?.availableToTradeBalance ?? account?.availableBalance),
+      !!account?.withdrawableBalance,
       !!destToken,
-      availableBalance !== undefined,
+      withdrawableBalance !== undefined,
     ],
   });
 
@@ -218,7 +215,7 @@ const PerpsWithdrawView: React.FC = () => {
     (percentage: number) => {
       if (!hasPositiveBalance) return;
 
-      const amount = availableBalance * percentage;
+      const amount = withdrawableBalance * percentage;
       // Format to 2 or 6 decimal places for USDC
       let formattedAmount = '0';
       if (amount < 0.01) {
@@ -238,10 +235,10 @@ const PerpsWithdrawView: React.FC = () => {
       DevLogger.log(
         `Percentage selected: ${
           percentage * 100
-        }%, Amount: ${formattedAmount}, Available Perps Balance: ${availableBalance}`,
+        }%, Amount: ${formattedAmount}, Withdrawable Balance: ${withdrawableBalance}`,
       );
     },
-    [availableBalance, hasPositiveBalance],
+    [withdrawableBalance, hasPositiveBalance],
   );
 
   const handleMaxPress = useCallback(() => {
@@ -374,7 +371,7 @@ const PerpsWithdrawView: React.FC = () => {
     <SafeAreaView style={tw.style('flex-1 bg-default')}>
       <Box twClassName="flex-1 bg-default">
         {/* Header */}
-        <HeaderCompactStandard
+        <HeaderStandard
           title={strings('perps.withdrawal.title')}
           onBack={handleBack}
           backButtonProps={{
diff --git a/app/components/UI/Perps/__mocks__/streamHooksMocks.ts b/app/components/UI/Perps/__mocks__/streamHooksMocks.ts
index 656fcd79430..6e1d9074c71 100644
--- a/app/components/UI/Perps/__mocks__/streamHooksMocks.ts
+++ b/app/components/UI/Perps/__mocks__/streamHooksMocks.ts
@@ -16,7 +16,8 @@ import {
  * Default mock account state for testing
  */
 export const defaultMockAccountState: AccountState = {
-  availableBalance: '1000.50',
+  spendableBalance: '1000.50',
+  withdrawableBalance: '1000.50',
   totalBalance: '1500.00',
   marginUsed: '500.00',
   unrealizedPnl: '25.50',
diff --git a/app/components/UI/Perps/components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.test.tsx b/app/components/UI/Perps/components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.test.tsx
index c86bde948ab..41393359a00 100644
--- a/app/components/UI/Perps/components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.test.tsx
+++ b/app/components/UI/Perps/components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.test.tsx
@@ -25,7 +25,8 @@ jest.mock('@react-navigation/native', () => {
 jest.mock('../../hooks/stream/usePerpsLiveAccount', () => ({
   usePerpsLiveAccount: jest.fn(() => ({
     account: {
-      availableBalance: '1000',
+      spendableBalance: '1000',
+      withdrawableBalance: '1000',
       marginUsed: '0',
       unrealizedPnl: '0',
       returnOnEquity: '0',
diff --git a/app/components/UI/Perps/components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.tsx b/app/components/UI/Perps/components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.tsx
index 1e84531fc34..68328fc0a55 100644
--- a/app/components/UI/Perps/components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.tsx
+++ b/app/components/UI/Perps/components/PerpsBottomSheetTooltip/PerpsBottomSheetTooltip.tsx
@@ -1,10 +1,10 @@
 /* eslint-disable jsdoc/check-indentation */
 import React, { useRef, useCallback, useMemo } from 'react';
+import { HeaderStandard } from '@metamask/design-system-react-native';
 import { View } from 'react-native';
 import BottomSheet, {
   BottomSheetRef,
 } from '../../../../../component-library/components/BottomSheets/BottomSheet';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import BottomSheetFooter, {
   ButtonsAlignment,
 } from '../../../../../component-library/components/BottomSheets/BottomSheetFooter';
@@ -147,7 +147,7 @@ const PerpsBottomSheetTooltip = React.memo<PerpsBottomSheetTooltipProps>(
         testID={testID}
       >
         {!hasCustomHeader && (
-          <HeaderCompactStandard
+          <HeaderStandard
             title={title}
             testID={PerpsBottomSheetTooltipSelectorsIDs.TITLE}
             onClose={handleClose}
diff --git a/app/components/UI/Perps/components/PerpsCompactOrderRow/PerpsCompactOrderRow.test.tsx b/app/components/UI/Perps/components/PerpsCompactOrderRow/PerpsCompactOrderRow.test.tsx
index 6e5fa79e887..2586498cf27 100644
--- a/app/components/UI/Perps/components/PerpsCompactOrderRow/PerpsCompactOrderRow.test.tsx
+++ b/app/components/UI/Perps/components/PerpsCompactOrderRow/PerpsCompactOrderRow.test.tsx
@@ -22,7 +22,7 @@ jest.mock('../../../../../component-library/hooks', () => ({
 jest.mock('../../utils/formatUtils', () => ({
   formatPositionSize: jest.fn((value) => value),
   formatPerpsFiat: jest.fn((value) => `$${value.toFixed(2)}`),
-  PRICE_RANGES_MINIMAL_VIEW: {},
+  PRICE_RANGES_UNIVERSAL: [{ id: 'universal' }],
 }));
 
 jest.mock('@metamask/perps-controller', () => ({
@@ -157,6 +157,17 @@ describe('PerpsCompactOrderRow', () => {
     expect(formatPerpsFiat).toHaveBeenCalledWith(50000, expect.any(Object));
   });
 
+  it('formats price with PRICE_RANGES_UNIVERSAL for market-appropriate decimals', () => {
+    const { formatPerpsFiat, PRICE_RANGES_UNIVERSAL } = jest.requireMock(
+      '../../utils/formatUtils',
+    );
+    render(<PerpsCompactOrderRow order={mockLimitBuyOrder} />);
+
+    expect(formatPerpsFiat).toHaveBeenCalledWith(50000, {
+      ranges: PRICE_RANGES_UNIVERSAL,
+    });
+  });
+
   it('calls onPress when tapped', () => {
     const mockOnPress = jest.fn();
     render(
diff --git a/app/components/UI/Perps/components/PerpsCompactOrderRow/PerpsCompactOrderRow.tsx b/app/components/UI/Perps/components/PerpsCompactOrderRow/PerpsCompactOrderRow.tsx
index 5af651d3e70..4c8d63dc43a 100644
--- a/app/components/UI/Perps/components/PerpsCompactOrderRow/PerpsCompactOrderRow.tsx
+++ b/app/components/UI/Perps/components/PerpsCompactOrderRow/PerpsCompactOrderRow.tsx
@@ -8,7 +8,7 @@ import { useStyles } from '../../../../../component-library/hooks';
 import {
   formatPositionSize,
   formatPerpsFiat,
-  PRICE_RANGES_MINIMAL_VIEW,
+  PRICE_RANGES_UNIVERSAL,
 } from '../../utils/formatUtils';
 import { getPerpsDisplaySymbol, type Order } from '@metamask/perps-controller';
 import { strings } from '../../../../../../locales/i18n';
@@ -49,7 +49,7 @@ const PerpsCompactOrderRow: React.FC<PerpsCompactOrderRowProps> = ({
   const formattedPrice =
     priceValue !== null
       ? formatPerpsFiat(priceValue, {
-          ranges: PRICE_RANGES_MINIMAL_VIEW,
+          ranges: PRICE_RANGES_UNIVERSAL,
         })
       : strings('perps.order.market');
 
diff --git a/app/components/UI/Perps/components/PerpsMarketBalanceActions/PerpsMarketBalanceActions.test.tsx b/app/components/UI/Perps/components/PerpsMarketBalanceActions/PerpsMarketBalanceActions.test.tsx
index 9df9c7e333e..d194e6944eb 100644
--- a/app/components/UI/Perps/components/PerpsMarketBalanceActions/PerpsMarketBalanceActions.test.tsx
+++ b/app/components/UI/Perps/components/PerpsMarketBalanceActions/PerpsMarketBalanceActions.test.tsx
@@ -314,7 +314,8 @@ const mockUseConfirmNavigation = useConfirmNavigation as jest.Mock;
 describe('PerpsMarketBalanceActions', () => {
   const defaultPerpsAccount = {
     totalBalance: '10.57',
-    availableBalance: '10.57',
+    spendableBalance: '10.57',
+    withdrawableBalance: '10.57',
     marginUsed: '0.00',
     totalUSDBalance: 10.57,
     positions: [],
@@ -513,7 +514,8 @@ describe('PerpsMarketBalanceActions', () => {
         account: {
           ...defaultPerpsAccount,
           totalBalance: '15.50',
-          availableBalance: '15.50',
+          spendableBalance: '15.50',
+          withdrawableBalance: '15.50',
         },
         isInitialLoading: false,
         isLoading: false,
@@ -579,7 +581,8 @@ describe('PerpsMarketBalanceActions', () => {
         account: {
           ...defaultPerpsAccount,
           totalBalance: '0',
-          availableBalance: '0',
+          spendableBalance: '0',
+          withdrawableBalance: '0',
         },
         isInitialLoading: false,
         isLoading: false,
@@ -620,13 +623,49 @@ describe('PerpsMarketBalanceActions', () => {
   });
 
   describe('Edge Cases', () => {
+    it('shows funded UI when spendableBalance is 0 but totalBalance > 0 (collateral locked in open positions)', () => {
+      // Arrange — account with all equity in margin: spendable=0, total>0
+      mockUsePerpsLiveAccount.mockReturnValue({
+        account: {
+          ...defaultPerpsAccount,
+          totalBalance: '125.00',
+          spendableBalance: '0',
+          withdrawableBalance: '0',
+          marginUsed: '125.00',
+        },
+        isInitialLoading: false,
+        isLoading: false,
+        error: null,
+      });
+
+      // Act
+      const { getByTestId, getByText } = renderWithProvider(
+        <PerpsMarketBalanceActions />,
+        { state: createMockState() },
+        false,
+      );
+
+      // Assert — funded UI: real totalBalance + Withdraw + Add Funds (no $0 empty state)
+      expect(
+        getByTestId(PerpsMarketBalanceActionsSelectorsIDs.BALANCE_VALUE),
+      ).toBeOnTheScreen();
+      expect(getByText('$125.00')).toBeOnTheScreen();
+      expect(
+        getByTestId(PerpsMarketBalanceActionsSelectorsIDs.WITHDRAW_BUTTON),
+      ).toBeOnTheScreen();
+      expect(
+        getByTestId(PerpsMarketBalanceActionsSelectorsIDs.ADD_FUNDS_BUTTON),
+      ).toBeOnTheScreen();
+    });
+
     it('shows empty state when balance is zero', () => {
       // Arrange
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
           ...defaultPerpsAccount,
           totalBalance: '0.00',
-          availableBalance: '0.00',
+          spendableBalance: '0.00',
+          withdrawableBalance: '0.00',
         },
         isInitialLoading: false,
         isLoading: false,
diff --git a/app/components/UI/Perps/components/PerpsMarketBalanceActions/PerpsMarketBalanceActions.tsx b/app/components/UI/Perps/components/PerpsMarketBalanceActions/PerpsMarketBalanceActions.tsx
index 354265ac7e9..e9c35e24a66 100644
--- a/app/components/UI/Perps/components/PerpsMarketBalanceActions/PerpsMarketBalanceActions.tsx
+++ b/app/components/UI/Perps/components/PerpsMarketBalanceActions/PerpsMarketBalanceActions.tsx
@@ -84,7 +84,17 @@ const PerpsMarketBalanceActions: React.FC<PerpsMarketBalanceActionsProps> = ({
   });
 
   const totalBalance = perpsAccount?.totalBalance || '0';
-  const isBalanceEmpty = BigNumber(totalBalance).isZero();
+  const spendableBalance = perpsAccount?.spendableBalance || '0';
+  // "Empty" gates on totalBalance — venue equity. Accounts with all collateral
+  // tied up in open positions have spendableBalance = 0 but totalBalance > 0;
+  // they are funded users who should see the normal balance + Withdraw/Add Funds
+  // surface, not the $0 empty state.
+  //
+  // During loading, totalBalance may carry a sentinel string
+  // (PERPS_CONSTANTS.FallbackDataDisplay = '--'). Treat non-finite parses
+  // as empty so skeleton / empty-state renders until real data lands.
+  const totalBn = BigNumber(totalBalance);
+  const isBalanceEmpty = !totalBn.isFinite() || totalBn.isZero();
 
   // Use hook for eligibility checks and action handlers
   // Determine button location based on whether balance is empty (empty state) or not (home)
@@ -179,14 +189,6 @@ const PerpsMarketBalanceActions: React.FC<PerpsMarketBalanceActionsProps> = ({
     [stopBalanceAnimation],
   );
 
-  // Order-entry surface reads availableToTradeBalance (withdrawable +
-  // unreserved spot collateral). Withdraw surfaces keep reading
-  // availableBalance directly.
-  const availableBalance =
-    perpsAccount?.availableToTradeBalance ??
-    perpsAccount?.availableBalance ??
-    '0';
-
   // Show skeleton while loading initial account data
   if (isInitialLoading) {
     return <PerpsMarketBalanceActionsSkeleton />;
@@ -268,7 +270,7 @@ const PerpsMarketBalanceActions: React.FC<PerpsMarketBalanceActionsProps> = ({
                 isHidden={privacyMode}
                 length={SensitiveTextLength.Short}
               >
-                {formatPerpsBalance(availableBalance)}
+                {formatPerpsBalance(spendableBalance)}
               </SensitiveText>
               <Text variant={TextVariant.BodyMD} color={TextColor.Alternative}>
                 {' '}
diff --git a/app/components/UI/Perps/components/PerpsMarketListHeader/PerpsMarketListHeader.test.tsx b/app/components/UI/Perps/components/PerpsMarketListHeader/PerpsMarketListHeader.test.tsx
index 09c629bd4f4..647448555c4 100644
--- a/app/components/UI/Perps/components/PerpsMarketListHeader/PerpsMarketListHeader.test.tsx
+++ b/app/components/UI/Perps/components/PerpsMarketListHeader/PerpsMarketListHeader.test.tsx
@@ -20,8 +20,10 @@ jest.mock('../../../../../../locales/i18n', () => ({
 }));
 
 jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
   const { View, Text: RNText } = jest.requireActual('react-native');
   return {
+    ...actual,
     Box: View,
     Text: RNText,
     BoxFlexDirection: { Row: 'row' },
@@ -89,55 +91,6 @@ jest.mock('../../../../../component-library/hooks', () => ({
   }),
 }));
 
-jest.mock(
-  '../../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const { View, Text, TouchableOpacity } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({
-        title,
-        onBack,
-        endButtonIconProps,
-        testID,
-      }: {
-        title: string;
-        onBack: () => void;
-        endButtonIconProps?: {
-          iconName: string;
-          onPress: () => void;
-          testID?: string;
-        }[];
-        testID?: string;
-      }) => (
-        <View testID={testID}>
-          <TouchableOpacity
-            testID={testID ? `${testID}-back-button` : undefined}
-            onPress={onBack}
-          >
-            <Text>Back</Text>
-          </TouchableOpacity>
-          <Text>{title}</Text>
-          {endButtonIconProps?.map(
-            (
-              props: { iconName: string; onPress: () => void; testID?: string },
-              index: number,
-            ) => (
-              <TouchableOpacity
-                key={index}
-                testID={props.testID}
-                onPress={props.onPress}
-              >
-                <Text>{props.iconName}</Text>
-              </TouchableOpacity>
-            ),
-          )}
-        </View>
-      ),
-    };
-  },
-);
-
 describe('PerpsMarketListHeader', () => {
   const mockGoBack = jest.fn();
   const mockCanGoBack = jest.fn();
diff --git a/app/components/UI/Perps/components/PerpsTabControlBar/PerpsTabControlBar.test.tsx b/app/components/UI/Perps/components/PerpsTabControlBar/PerpsTabControlBar.test.tsx
index 7a40e2f6442..d08ccbde34f 100644
--- a/app/components/UI/Perps/components/PerpsTabControlBar/PerpsTabControlBar.test.tsx
+++ b/app/components/UI/Perps/components/PerpsTabControlBar/PerpsTabControlBar.test.tsx
@@ -68,7 +68,8 @@ jest.mock('../../hooks/stream', () => ({
   usePerpsLiveAccount: jest.fn(() => ({
     account: {
       totalBalance: '10000.00',
-      availableBalance: '1000.50',
+      spendableBalance: '1000.50',
+      withdrawableBalance: '1000.50',
       marginUsed: '9000.00',
       unrealizedPnl: '100.50',
       returnOnEquity: '0.15',
@@ -159,7 +160,8 @@ describe('PerpsTabControlBar', () => {
   // Default mock return values
   const defaultAccountState = {
     totalBalance: '1000.50',
-    availableBalance: '800.25',
+    spendableBalance: '800.25',
+    withdrawableBalance: '800.25',
     marginUsed: '200.25',
     unrealizedPnl: '50.75',
   };
diff --git a/app/components/UI/Perps/hooks/stream/hasCachedPerpsData.test.ts b/app/components/UI/Perps/hooks/stream/hasCachedPerpsData.test.ts
index e4a2e07eacc..222e759e649 100644
--- a/app/components/UI/Perps/hooks/stream/hasCachedPerpsData.test.ts
+++ b/app/components/UI/Perps/hooks/stream/hasCachedPerpsData.test.ts
@@ -81,7 +81,7 @@ describe('hasPreloadedData', () => {
       mockCachedUserDataForActiveProvider = {
         positions: [],
         orders: [],
-        accountState: { availableBalance: '1000' },
+        accountState: { spendableBalance: '1000' },
       };
       expect(hasPreloadedData('cachedAccountState')).toBe(true);
     });
@@ -162,7 +162,7 @@ describe('getPreloadedData', () => {
   });
 
   it('returns cached accountState when available', () => {
-    const accountState = { availableBalance: '1000' };
+    const accountState = { spendableBalance: '1000' };
     mockCachedUserDataForActiveProvider = {
       positions: [],
       orders: [],
diff --git a/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.test.ts b/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.test.ts
index c72041558c3..01c158f0e62 100644
--- a/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.test.ts
+++ b/app/components/UI/Perps/hooks/stream/usePerpsLiveAccount.test.ts
@@ -74,7 +74,8 @@ describe('usePerpsLiveAccount', () => {
   describe('state from PerpsController', () => {
     it('returns account state from the channel snapshot before controller cache', () => {
       const mockAccountState: AccountState = {
-        availableBalance: '7000',
+        spendableBalance: '7000',
+        withdrawableBalance: '7000',
         marginUsed: '500',
         unrealizedPnl: '25',
         returnOnEquity: '1.0',
@@ -96,7 +97,8 @@ describe('usePerpsLiveAccount', () => {
 
     it('returns account state from PerpsController', () => {
       const mockAccountState: AccountState = {
-        availableBalance: '3000',
+        spendableBalance: '3000',
+        withdrawableBalance: '3000',
         marginUsed: '1000',
         unrealizedPnl: '50',
         returnOnEquity: '5.0',
@@ -121,7 +123,8 @@ describe('usePerpsLiveAccount', () => {
 
     it('handles zero balance account state', () => {
       const mockAccountState: AccountState = {
-        availableBalance: '0',
+        spendableBalance: '0',
+        withdrawableBalance: '0',
         marginUsed: '0',
         unrealizedPnl: '0',
         returnOnEquity: '0',
@@ -143,7 +146,7 @@ describe('usePerpsLiveAccount', () => {
         account: mockAccountState,
         isInitialLoading: false,
       });
-      expect(result.current?.account?.availableBalance).toBe('0');
+      expect(result.current?.account?.spendableBalance).toBe('0');
       expect(result.current?.account?.totalBalance).toBe('0');
     });
   });
@@ -151,7 +154,8 @@ describe('usePerpsLiveAccount', () => {
   describe('partial state handling', () => {
     it('handles partial account state', () => {
       const partialAccountState: AccountState = {
-        availableBalance: '100',
+        spendableBalance: '100',
+        withdrawableBalance: '100',
         marginUsed: '0',
         unrealizedPnl: '0',
         returnOnEquity: '0',
@@ -168,7 +172,7 @@ describe('usePerpsLiveAccount', () => {
         state: {},
       });
 
-      expect(result.current?.account?.availableBalance).toBe('100');
+      expect(result.current?.account?.spendableBalance).toBe('100');
       expect(result.current?.account?.totalBalance).toBe('200');
     });
 
@@ -190,7 +194,8 @@ describe('usePerpsLiveAccount', () => {
   describe('account state scenarios', () => {
     it('handles account with positive PnL', () => {
       const positivePnlState: AccountState = {
-        availableBalance: '5000',
+        spendableBalance: '5000',
+        withdrawableBalance: '5000',
         marginUsed: '1000',
         unrealizedPnl: '500',
         returnOnEquity: '50.0',
@@ -213,7 +218,8 @@ describe('usePerpsLiveAccount', () => {
 
     it('handles account with negative PnL', () => {
       const negativePnlState: AccountState = {
-        availableBalance: '3000',
+        spendableBalance: '3000',
+        withdrawableBalance: '3000',
         marginUsed: '2000',
         unrealizedPnl: '-500',
         returnOnEquity: '-25.0',
@@ -236,7 +242,8 @@ describe('usePerpsLiveAccount', () => {
 
     it('handles account with high margin usage', () => {
       const highMarginState: AccountState = {
-        availableBalance: '500',
+        spendableBalance: '500',
+        withdrawableBalance: '500',
         marginUsed: '9500',
         unrealizedPnl: '0',
         returnOnEquity: '0',
@@ -255,12 +262,13 @@ describe('usePerpsLiveAccount', () => {
 
       expect(result.current?.account?.marginUsed).toBe('9500');
       expect(Number(result.current?.account?.marginUsed)).toBe(9500);
-      expect(Number(result.current?.account?.availableBalance)).toBe(500);
+      expect(Number(result.current?.account?.spendableBalance)).toBe(500);
     });
 
     it('handles account with no margin used', () => {
       const noMarginState: AccountState = {
-        availableBalance: '10000',
+        spendableBalance: '10000',
+        withdrawableBalance: '10000',
         marginUsed: '0',
         unrealizedPnl: '0',
         returnOnEquity: '0',
@@ -278,7 +286,7 @@ describe('usePerpsLiveAccount', () => {
       });
 
       expect(result.current?.account?.marginUsed).toBe('0');
-      expect(result.current?.account?.availableBalance).toBe(
+      expect(result.current?.account?.spendableBalance).toBe(
         result.current?.account?.totalBalance,
       );
     });
@@ -287,7 +295,8 @@ describe('usePerpsLiveAccount', () => {
   describe('initial state from cache', () => {
     it('seeds account from cache when fresh cached data exists', () => {
       const cachedAccount: AccountState = {
-        availableBalance: '5000',
+        spendableBalance: '5000',
+        withdrawableBalance: '5000',
         marginUsed: '2000',
         unrealizedPnl: '100',
         returnOnEquity: '2.0',
@@ -348,7 +357,8 @@ describe('usePerpsLiveAccount', () => {
   describe('memoization', () => {
     it('returns same reference for same state', () => {
       const mockAccountState: AccountState = {
-        availableBalance: '1000',
+        spendableBalance: '1000',
+        withdrawableBalance: '1000',
         marginUsed: '0',
         unrealizedPnl: '0',
         returnOnEquity: '0',
diff --git a/app/components/UI/Perps/hooks/useDefaultPayWithTokenWhenNoPerpsBalance.test.ts b/app/components/UI/Perps/hooks/useDefaultPayWithTokenWhenNoPerpsBalance.test.ts
index 92a4480c89a..c72ae480c75 100644
--- a/app/components/UI/Perps/hooks/useDefaultPayWithTokenWhenNoPerpsBalance.test.ts
+++ b/app/components/UI/Perps/hooks/useDefaultPayWithTokenWhenNoPerpsBalance.test.ts
@@ -18,7 +18,7 @@ const mockUsePerpsPaymentTokens = jest.requireMock<
 
 function getState(
   overrides: {
-    perpsAccount?: { availableBalance: string } | null;
+    perpsAccount?: { spendableBalance: string } | null;
     allowlistAssets?: string[];
     isTestnet?: boolean;
     activeProvider?: 'hyperliquid' | 'myx' | 'aggregated';
@@ -26,7 +26,7 @@ function getState(
   } = {},
 ) {
   const {
-    perpsAccount = { availableBalance: '0' },
+    perpsAccount = { spendableBalance: '0' },
     allowlistAssets = [],
     isTestnet = false,
     activeProvider,
@@ -82,7 +82,7 @@ describe('useDefaultPayWithTokenWhenNoPerpsBalance', () => {
 
     const { result } = runHook(
       getState({
-        perpsAccount: { availableBalance: '100' },
+        perpsAccount: { spendableBalance: '100' },
         allowlistAssets: ['0xa4b1.0xusdc'],
       }),
     );
diff --git a/app/components/UI/Perps/hooks/useDefaultPayWithTokenWhenNoPerpsBalance.ts b/app/components/UI/Perps/hooks/useDefaultPayWithTokenWhenNoPerpsBalance.ts
index 77896bb1e0f..ff98b88a066 100644
--- a/app/components/UI/Perps/hooks/useDefaultPayWithTokenWhenNoPerpsBalance.ts
+++ b/app/components/UI/Perps/hooks/useDefaultPayWithTokenWhenNoPerpsBalance.ts
@@ -39,13 +39,11 @@ export function useDefaultPayWithTokenWhenNoPerpsBalance(): PerpsSelectedPayment
     if (!featureEnabled) {
       return null;
     }
-    const tradeableBalance = Number.parseFloat(
-      perpsAccount?.availableToTradeBalance?.toString() ??
-        perpsAccount?.availableBalance?.toString() ??
-        '0',
+    const spendableBalance = Number.parseFloat(
+      perpsAccount?.spendableBalance?.toString() ?? '0',
     );
 
-    if (tradeableBalance > PERPS_MIN_BALANCE_THRESHOLD) {
+    if (spendableBalance > PERPS_MIN_BALANCE_THRESHOLD) {
       return null;
     }
     if (!allowlistAssets?.length) {
@@ -94,8 +92,7 @@ export function useDefaultPayWithTokenWhenNoPerpsBalance(): PerpsSelectedPayment
     };
   }, [
     featureEnabled,
-    perpsAccount?.availableBalance,
-    perpsAccount?.availableToTradeBalance,
+    perpsAccount?.spendableBalance,
     allowlistAssets,
     activeProvider,
     currentNetwork,
diff --git a/app/components/UI/Perps/hooks/usePerpsAdjustMarginData.test.ts b/app/components/UI/Perps/hooks/usePerpsAdjustMarginData.test.ts
index b4c6c404206..fc00c883fa1 100644
--- a/app/components/UI/Perps/hooks/usePerpsAdjustMarginData.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsAdjustMarginData.test.ts
@@ -53,7 +53,8 @@ describe('usePerpsAdjustMarginData', () => {
   };
 
   const mockAccount = {
-    availableBalance: '10000',
+    spendableBalance: '10000',
+    withdrawableBalance: '10000',
     totalBalance: '15000',
     marginUsed: '5000',
     unrealizedPnl: '500',
@@ -178,7 +179,7 @@ describe('usePerpsAdjustMarginData', () => {
         }),
       );
 
-      expect(result.current.availableBalance).toBe(10000);
+      expect(result.current.spendableBalance).toBe(10000);
     });
   });
 
diff --git a/app/components/UI/Perps/hooks/usePerpsAdjustMarginData.ts b/app/components/UI/Perps/hooks/usePerpsAdjustMarginData.ts
index b715a724ba6..d4f988e4560 100644
--- a/app/components/UI/Perps/hooks/usePerpsAdjustMarginData.ts
+++ b/app/components/UI/Perps/hooks/usePerpsAdjustMarginData.ts
@@ -43,7 +43,7 @@ export interface UsePerpsAdjustMarginDataReturn {
   /** New liquidation distance percentage */
   newLiquidationDistance: number;
   /** Available balance for add mode */
-  availableBalance: number;
+  spendableBalance: number;
   /** Current market price */
   currentPrice: number;
   /** Whether this is add mode */
@@ -129,8 +129,8 @@ export function usePerpsAdjustMarginData(
     [livePrices, symbol],
   );
 
-  const availableBalance = useMemo(
-    () => parseFloat(account?.availableBalance || '0'),
+  const spendableBalance = useMemo(
+    () => parseFloat(account?.spendableBalance || '0'),
     [account],
   );
 
@@ -139,7 +139,7 @@ export function usePerpsAdjustMarginData(
   // Calculate max removable/addable amount
   const maxAmount = useMemo(() => {
     if (isAddMode) {
-      return Math.max(0, availableBalance);
+      return Math.max(0, spendableBalance);
     }
     return calculateMaxRemovableMargin({
       currentMargin,
@@ -151,7 +151,7 @@ export function usePerpsAdjustMarginData(
     });
   }, [
     isAddMode,
-    availableBalance,
+    spendableBalance,
     currentMargin,
     positionSize,
     entryPrice,
@@ -221,7 +221,7 @@ export function usePerpsAdjustMarginData(
     newLiquidationPrice,
     currentLiquidationDistance,
     newLiquidationDistance,
-    availableBalance,
+    spendableBalance,
     currentPrice,
     isAddMode,
     positionLeverage,
diff --git a/app/components/UI/Perps/hooks/usePerpsBalanceTokenFilter.test.ts b/app/components/UI/Perps/hooks/usePerpsBalanceTokenFilter.test.ts
index 3f9ca045db2..33613b35b3e 100644
--- a/app/components/UI/Perps/hooks/usePerpsBalanceTokenFilter.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsBalanceTokenFilter.test.ts
@@ -85,7 +85,7 @@ describe('usePerpsBalanceTokenFilter', () => {
     mockUseSelector.mockImplementation(
       (selector: (state: unknown) => unknown) => {
         if (selector === selectPerpsAccountState) {
-          return { availableBalance: '1500.00' };
+          return { spendableBalance: '1500.00' };
         }
         if (selector === selectPerpsPayWithAnyTokenAllowlistAssets) {
           return [];
@@ -153,7 +153,8 @@ describe('usePerpsBalanceTokenFilter', () => {
 
     it('prepends highlighted row with perps balance and Add funds button', () => {
       mockUseSelector.mockReturnValue({
-        availableBalance: '2000.50',
+        spendableBalance: '2000.50',
+        withdrawableBalance: '2000.50',
       });
       mockUseIsPerpsBalanceSelected.mockReturnValue(true);
       const inputTokens: AssetType[] = [
@@ -190,9 +191,10 @@ describe('usePerpsBalanceTokenFilter', () => {
       expect((output[1] as AssetType).address).toBe('0xusdc');
     });
 
-    it('uses availableBalance from perps account in highlighted row', () => {
+    it('uses spendableBalance from perps account in highlighted row', () => {
       mockUseSelector.mockReturnValue({
-        availableBalance: '999.99',
+        spendableBalance: '999.99',
+        withdrawableBalance: '999.99',
       });
       const inputTokens: AssetType[] = [];
 
@@ -207,14 +209,14 @@ describe('usePerpsBalanceTokenFilter', () => {
       }
     });
 
-    it('prefers availableToTradeBalance for Unified Account users', () => {
-      // Unified Account / Portfolio Margin: collateral lives in spot, so
-      // HL's `clearinghouseState.withdrawable` (mirrored as availableBalance)
-      // is $0. The synthetic Perps balance row in the Pay-with sheet must
-      // read the unified-aware `availableToTradeBalance` instead.
+    it('uses spendableBalance for Unified Account users', () => {
+      // Unified Account / Portfolio Margin: collateral lives in spot. The
+      // provider folds free spot USDC into spendableBalance via
+      // addSpotBalanceToAccountState, so the Pay-with sheet's synthetic
+      // Perps row sees the unified total without branching on mode.
       mockUseSelector.mockReturnValue({
-        availableBalance: '0.00',
-        availableToTradeBalance: '2500.00',
+        spendableBalance: '2500.00',
+        withdrawableBalance: '2500.00',
       });
       const inputTokens: AssetType[] = [];
 
@@ -254,7 +256,7 @@ describe('usePerpsBalanceTokenFilter', () => {
       mockUseSelector.mockImplementation(
         (selector: (state: unknown) => unknown) => {
           if (selector === selectPerpsAccountState)
-            return { availableBalance: '1500.00' };
+            return { spendableBalance: '1500.00' };
           if (selector === selectPerpsPayWithAnyTokenAllowlistAssets) return [];
           return undefined;
         },
@@ -286,7 +288,7 @@ describe('usePerpsBalanceTokenFilter', () => {
       mockUseSelector.mockImplementation(
         (selector: (state: unknown) => unknown) => {
           if (selector === selectPerpsAccountState)
-            return { availableBalance: '1500.00' };
+            return { spendableBalance: '1500.00' };
           if (selector === selectPerpsPayWithAnyTokenAllowlistAssets) return [];
           return undefined;
         },
@@ -312,7 +314,7 @@ describe('usePerpsBalanceTokenFilter', () => {
       mockUseSelector.mockImplementation(
         (selector: (state: unknown) => unknown) => {
           if (selector === selectPerpsAccountState)
-            return { availableBalance: '100.00' };
+            return { spendableBalance: '100.00' };
           if (selector === selectPerpsPayWithAnyTokenAllowlistAssets)
             return [allowlistKey];
           return [];
@@ -346,7 +348,8 @@ describe('usePerpsBalanceTokenFilter', () => {
 
     it('calls onReject, depositWithConfirmation and navigation.navigate when Add funds is pressed', async () => {
       mockUseSelector.mockReturnValue({
-        availableBalance: '500.00',
+        spendableBalance: '500.00',
+        withdrawableBalance: '500.00',
       });
       const inputTokens: AssetType[] = [
         {
@@ -382,7 +385,8 @@ describe('usePerpsBalanceTokenFilter', () => {
 
     it('calls onPerpsPaymentTokenChange with null when row action is invoked', () => {
       mockUseSelector.mockReturnValue({
-        availableBalance: '100.00',
+        spendableBalance: '100.00',
+        withdrawableBalance: '100.00',
       });
       const inputTokens: AssetType[] = [];
 
diff --git a/app/components/UI/Perps/hooks/usePerpsBalanceTokenFilter.ts b/app/components/UI/Perps/hooks/usePerpsBalanceTokenFilter.ts
index 2e4a5a0ee57..86ee09a367b 100644
--- a/app/components/UI/Perps/hooks/usePerpsBalanceTokenFilter.ts
+++ b/app/components/UI/Perps/hooks/usePerpsBalanceTokenFilter.ts
@@ -83,16 +83,9 @@ export function usePerpsBalanceTokenFilter(): (
         return tokens;
       }
 
-      // Prefer `availableToTradeBalance` so Unified Account / Portfolio
-      // Margin users see their real spendable balance in the Pay-with
-      // header — `availableBalance` mirrors HL's perps-only
-      // `clearinghouseState.withdrawable`, which is $0 in unified mode.
-      const availableBalance =
-        perpsAccount?.availableToTradeBalance ??
-        perpsAccount?.availableBalance ??
-        '0';
+      const spendableBalance = perpsAccount?.spendableBalance || '0';
       const balanceInSelectedCurrency = formatFiat(
-        new BigNumber(availableBalance),
+        new BigNumber(spendableBalance),
       );
 
       const perpsBalanceName = strings('perps.adjust_margin.perps_balance');
@@ -141,8 +134,7 @@ export function usePerpsBalanceTokenFilter(): (
       formatFiat,
       onPerpsPaymentTokenChange,
       isPerpsBalanceSelected,
-      perpsAccount?.availableBalance,
-      perpsAccount?.availableToTradeBalance,
+      perpsAccount?.spendableBalance,
       transactionMeta,
     ],
   );
diff --git a/app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.test.ts b/app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.test.ts
index 1a7fa9fbafd..73b36a7c1b8 100644
--- a/app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.test.ts
@@ -95,7 +95,9 @@ describe('usePerpsCloseAllCalculations', () => {
     mockUseSelector.mockImplementation(() => {
       selectorCallCount++;
       if (selectorCallCount % 2 === 1) {
-        return '0x1234567890123456789012345678901234567890'; // selectedAddress
+        return {
+          address: '0x1234567890123456789012345678901234567890',
+        }; // selected account group EVM account
       }
       return '0xa4b1'; // chainId
     });
diff --git a/app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.ts b/app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.ts
index b7407aaf2ae..ba9cc6af95f 100644
--- a/app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.ts
+++ b/app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.ts
@@ -10,7 +10,7 @@ import type {
   EstimatedPointsDto,
 } from '../../../../core/Engine/controllers/rewards-controller/types';
 import Engine from '../../../../core/Engine';
-import { selectSelectedInternalAccountFormattedAddress } from '../../../../selectors/accountsController';
+import { selectSelectedAccountGroupEvmInternalAccount } from '../../../../selectors/multichainAccounts/accountTreeController';
 import { selectChainId } from '../../../../selectors/networkController';
 
 /**
@@ -93,9 +93,8 @@ export function usePerpsCloseAllCalculations({
   priceData,
 }: UsePerpsCloseAllCalculationsParams): CloseAllCalculationsResult {
   // Selectors for account and chain
-  const selectedAddress = useSelector(
-    selectSelectedInternalAccountFormattedAddress,
-  );
+  const evmAccount = useSelector(selectSelectedAccountGroupEvmInternalAccount);
+  const selectedAddress = evmAccount?.address;
   const currentChainId = useSelector(selectChainId);
 
   // Use ref to access latest priceData without triggering re-renders
diff --git a/app/components/UI/Perps/hooks/usePerpsDepositProgress.test.ts b/app/components/UI/Perps/hooks/usePerpsDepositProgress.test.ts
index b427ed9cc9c..8acb5044581 100644
--- a/app/components/UI/Perps/hooks/usePerpsDepositProgress.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsDepositProgress.test.ts
@@ -36,7 +36,8 @@ describe('usePerpsDepositProgress', () => {
     // Default mock for usePerpsLiveAccount
     mockUsePerpsLiveAccount.mockReturnValue({
       account: {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         marginUsed: '9000.00',
         unrealizedPnl: '100.00',
         returnOnEquity: '0.15',
@@ -208,7 +209,8 @@ describe('usePerpsDepositProgress', () => {
       // Act - Update balance to simulate deposit completion
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '1500.00', // Increased from 1000.00
+          spendableBalance: '1500.00', // Increased from 1000.00
+          withdrawableBalance: '1500.00', // Increased from 1000.00
           marginUsed: '9000.00',
           unrealizedPnl: '100.00',
           returnOnEquity: '0.15',
@@ -223,6 +225,44 @@ describe('usePerpsDepositProgress', () => {
       expect(result.current.isDepositInProgress).toBe(false);
     });
 
+    it('does not clear deposit in progress when only totalBalance increases from unrealized pnl', () => {
+      const { result, rerender } = renderHook(() => usePerpsDepositProgress());
+
+      act(() => {
+        const transactionHandler = mockSubscribe.mock.calls.find(
+          (call) =>
+            call[0] === 'TransactionController:transactionStatusUpdated',
+        )?.[1];
+        if (transactionHandler) {
+          transactionHandler({
+            transactionMeta: {
+              id: 'test-tx-id',
+              type: TransactionType.perpsDeposit,
+              status: TransactionStatus.approved,
+            } as TransactionMeta,
+          });
+        }
+      });
+
+      expect(result.current.isDepositInProgress).toBe(true);
+
+      mockUsePerpsLiveAccount.mockReturnValue({
+        account: {
+          spendableBalance: '1000.00',
+          withdrawableBalance: '1000.00',
+          marginUsed: '9000.00',
+          unrealizedPnl: '600.00',
+          returnOnEquity: '0.15',
+          totalBalance: '10600.00',
+        },
+        isInitialLoading: false,
+      });
+
+      rerender({});
+
+      expect(result.current.isDepositInProgress).toBe(true);
+    });
+
     it('does not clear deposit in progress when balance decreases', () => {
       // Arrange
       const { result, rerender } = renderHook(() => usePerpsDepositProgress());
@@ -249,7 +289,8 @@ describe('usePerpsDepositProgress', () => {
       // Act - Update balance to simulate decrease
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '500.00', // Decreased from 1000.00
+          spendableBalance: '500.00', // Decreased from 1000.00
+          withdrawableBalance: '500.00', // Decreased from 1000.00
           marginUsed: '9000.00',
           unrealizedPnl: '100.00',
           returnOnEquity: '0.15',
@@ -290,7 +331,8 @@ describe('usePerpsDepositProgress', () => {
       // Act - Update balance to same value
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '1000.00', // Same as initial
+          spendableBalance: '1000.00', // Same as initial
+          withdrawableBalance: '1000.00', // Same as initial
           marginUsed: '9000.00',
           unrealizedPnl: '100.00',
           returnOnEquity: '0.15',
@@ -319,11 +361,12 @@ describe('usePerpsDepositProgress', () => {
       expect(result.current.isDepositInProgress).toBe(false);
     });
 
-    it('handles undefined availableBalance gracefully', () => {
+    it('handles undefined spendableBalance gracefully', () => {
       // Arrange
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '0',
+          spendableBalance: '0',
+          withdrawableBalance: '0',
           marginUsed: '9000.00',
           unrealizedPnl: '100.00',
           returnOnEquity: '0.15',
@@ -407,7 +450,8 @@ describe('usePerpsDepositProgress', () => {
       // Act - Small increase in decimal balance
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '1000.01', // Small increase
+          spendableBalance: '1000.01', // Small increase
+          withdrawableBalance: '1000.01', // Small increase
           marginUsed: '9000.00',
           unrealizedPnl: '100.00',
           returnOnEquity: '0.15',
diff --git a/app/components/UI/Perps/hooks/usePerpsDepositProgress.ts b/app/components/UI/Perps/hooks/usePerpsDepositProgress.ts
index 021d06dc84f..d44ff701780 100644
--- a/app/components/UI/Perps/hooks/usePerpsDepositProgress.ts
+++ b/app/components/UI/Perps/hooks/usePerpsDepositProgress.ts
@@ -20,7 +20,7 @@ export const usePerpsDepositProgress = () => {
 
   // Track if we're expecting a deposit
   const [isDepositInProgress, setIsDepositInProgress] = useState(false);
-  const prevAvailableBalanceRef = useRef<string>('0');
+  const prevSpendableBalanceRef = useRef<string>('0');
   const liveAccountRef = useRef(liveAccount);
 
   // Update the ref whenever liveAccount changes
@@ -46,8 +46,8 @@ export const usePerpsDepositProgress = () => {
       // Handle PerpsDeposit approved - set deposit in progress
       if (transactionMeta.status === TransactionStatus.approved) {
         setIsDepositInProgress(true);
-        prevAvailableBalanceRef.current =
-          liveAccountRef.current?.availableBalance || '0';
+        prevSpendableBalanceRef.current =
+          liveAccountRef.current?.spendableBalance || '0';
       }
 
       // Handle PerpsDeposit failed - clear deposit in progress
@@ -69,24 +69,22 @@ export const usePerpsDepositProgress = () => {
     };
   }, []);
 
-  // Watch for balance increases when expecting a deposit
+  // Watch for spendable-balance increases when expecting a deposit. A live
+  // totalBalance move can be pure unrealized PnL and must not clear progress.
+  const liveSpendable = liveAccount?.spendableBalance;
   useEffect(() => {
-    if (!isDepositInProgress || !liveAccount) {
+    if (!isDepositInProgress || liveSpendable == null) {
       return;
     }
 
-    const currentBalance = Number.parseFloat(
-      liveAccount.availableBalance || '0',
-    );
-    const previousBalance = Number.parseFloat(prevAvailableBalanceRef.current);
+    const currentBalance = Number.parseFloat(liveSpendable || '0');
+    const previousBalance = Number.parseFloat(prevSpendableBalanceRef.current);
 
-    // Check if balance increased
     if (currentBalance > previousBalance) {
-      // Deposit completed successfully
       setIsDepositInProgress(false);
-      prevAvailableBalanceRef.current = liveAccount.availableBalance;
+      prevSpendableBalanceRef.current = liveSpendable;
     }
-  }, [isDepositInProgress, liveAccount]);
+  }, [isDepositInProgress, liveSpendable]);
 
   return { isDepositInProgress };
 };
diff --git a/app/components/UI/Perps/hooks/usePerpsDepositStatus.test.ts b/app/components/UI/Perps/hooks/usePerpsDepositStatus.test.ts
index 4a58332ccd9..b90a4c841ca 100644
--- a/app/components/UI/Perps/hooks/usePerpsDepositStatus.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsDepositStatus.test.ts
@@ -99,7 +99,8 @@ describe('usePerpsDepositStatus', () => {
     // Default mock for usePerpsLiveAccount
     mockUsePerpsLiveAccount.mockReturnValue({
       account: {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         totalBalance: '10000.00',
         marginUsed: '9000.00',
         unrealizedPnl: '100.00',
@@ -466,7 +467,8 @@ describe('usePerpsDepositStatus', () => {
       // Update balance to simulate deposit completion
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '1500.00', // Increased from 1000.00
+          spendableBalance: '1500.00', // Increased from 1000.00
+          withdrawableBalance: '1500.00', // Increased from 1000.00
           marginUsed: '9000.00',
           unrealizedPnl: '100.00',
           returnOnEquity: '0.15',
@@ -489,7 +491,7 @@ describe('usePerpsDepositStatus', () => {
       });
       expect(
         mockPerpsToastOptions.accountManagement.deposit.success,
-      ).toHaveBeenCalledWith('1500.00'); // Current balance
+      ).toHaveBeenCalledWith('1500.00');
     });
 
     it('should not show success toast when balance decreases', () => {
@@ -515,7 +517,8 @@ describe('usePerpsDepositStatus', () => {
       // Update balance to simulate decrease
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '500.00', // Decreased from 1000.00
+          spendableBalance: '500.00', // Decreased from 1000.00
+          withdrawableBalance: '500.00', // Decreased from 1000.00
           marginUsed: '9000.00',
           unrealizedPnl: '100.00',
           returnOnEquity: '0.15',
@@ -535,7 +538,8 @@ describe('usePerpsDepositStatus', () => {
       // Update balance without setting up waiting for funds
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '1500.00',
+          spendableBalance: '1500.00',
+          withdrawableBalance: '1500.00',
           marginUsed: '9000.00',
           unrealizedPnl: '100.00',
           returnOnEquity: '0.15',
@@ -548,6 +552,44 @@ describe('usePerpsDepositStatus', () => {
 
       expect(mockShowToast).not.toHaveBeenCalledWith({ success: true });
     });
+
+    it('should not show success toast when only totalBalance increases from unrealized pnl', () => {
+      const { rerender } = renderHook(() => usePerpsDepositStatus());
+
+      act(() => {
+        const transactionHandler = mockSubscribe.mock.calls.find(
+          (call) =>
+            call[0] === 'TransactionController:transactionStatusUpdated',
+        )?.[1];
+        if (transactionHandler) {
+          transactionHandler({
+            transactionMeta: {
+              id: 'test-tx-id',
+              type: TransactionType.perpsDeposit,
+              status: TransactionStatus.approved,
+            } as TransactionMeta,
+          });
+        }
+      });
+
+      mockUsePerpsLiveAccount.mockReturnValue({
+        account: {
+          spendableBalance: '1000.00',
+          withdrawableBalance: '1000.00',
+          marginUsed: '9000.00',
+          unrealizedPnl: '600.00',
+          returnOnEquity: '0.15',
+          totalBalance: '10600.00',
+        },
+        isInitialLoading: false,
+      });
+
+      rerender({});
+
+      expect(
+        mockPerpsToastOptions.accountManagement.deposit.success,
+      ).not.toHaveBeenCalled();
+    });
   });
 
   describe('Controller Result Handling', () => {
diff --git a/app/components/UI/Perps/hooks/usePerpsDepositStatus.ts b/app/components/UI/Perps/hooks/usePerpsDepositStatus.ts
index ba9fcd245ee..6aae71a93d6 100644
--- a/app/components/UI/Perps/hooks/usePerpsDepositStatus.ts
+++ b/app/components/UI/Perps/hooks/usePerpsDepositStatus.ts
@@ -6,7 +6,6 @@ import {
 import { useEffect, useRef } from 'react';
 import { useSelector } from 'react-redux';
 import Engine from '../../../../core/Engine';
-import { selectTransactionBridgeQuotesById } from '../../../../core/redux/slices/confirmationMetrics';
 import type { RootState } from '../../../../reducers';
 import {
   ARBITRUM_MAINNET_CHAIN_ID_HEX,
@@ -36,7 +35,13 @@ export const usePerpsDepositStatus = () => {
 
   // Track if we're expecting a deposit
   const expectingDepositRef = useRef(false);
-  const prevAvailableBalanceRef = useRef<string>('0');
+  const prevSpendableBalanceRef = useRef<string>('0');
+  const liveAccountRef = useRef(liveAccount);
+
+  // Keep ref in sync without re-subscribing the transaction handler.
+  useEffect(() => {
+    liveAccountRef.current = liveAccount;
+  }, [liveAccount]);
 
   // Get deposit state from controller
   const depositInProgress = useSelector(
@@ -49,18 +54,6 @@ export const usePerpsDepositStatus = () => {
       state.engine.backgroundState.PerpsController?.lastDepositResult ?? null,
   );
 
-  // Get the internal transaction ID from the controller. Needed to get bridge quotes.
-  const lastDepositTransactionId = useSelector(
-    (state: RootState) =>
-      state.engine.backgroundState.PerpsController?.lastDepositTransactionId ??
-      null,
-  );
-
-  // For Perps deposits this array typically contains only one element.
-  const bridgeQuotes = useSelector((state: RootState) =>
-    selectTransactionBridgeQuotesById(state, lastDepositTransactionId ?? ''),
-  );
-
   // Listen for PerpsDeposit approval - Used to display deposit in progress toast
   useEffect(() => {
     const handleTransactionApproved = ({
@@ -79,7 +72,8 @@ export const usePerpsDepositStatus = () => {
         transactionMeta.status === TransactionStatus.approved
       ) {
         expectingDepositRef.current = true;
-        prevAvailableBalanceRef.current = liveAccount?.availableBalance || '0';
+        prevSpendableBalanceRef.current =
+          liveAccountRef.current?.spendableBalance || '0';
 
         const processingTimeSeconds = isArbUSDCDeposit ? 0 : 60; // hardcoded to 1 minute to avoid estimation failures of multiple bridges
 
@@ -103,37 +97,31 @@ export const usePerpsDepositStatus = () => {
         handleTransactionApproved,
       );
     };
-  }, [
-    PerpsToastOptions.accountManagement.deposit,
-    bridgeQuotes,
-    liveAccount?.availableBalance,
-    showToast,
-  ]);
-
-  // Watch for balance increases when expecting a deposit
+    // liveAccount.spendableBalance is read via ref to avoid rebinding the
+    // messenger listener on every balance fluctuation.
+  }, [PerpsToastOptions.accountManagement.deposit, showToast]);
+
+  // Watch for spendable-balance increases when expecting a deposit. Using
+  // totalBalance here is incorrect because unrealized PnL can move it without
+  // any deposit settling.
+  const liveSpendable = liveAccount?.spendableBalance;
   useEffect(() => {
-    if (!expectingDepositRef.current || !liveAccount) {
+    if (!expectingDepositRef.current || liveSpendable == null) {
       return;
     }
 
-    const currentBalance = Number.parseFloat(
-      liveAccount.availableBalance || '0',
-    );
-    const previousBalance = Number.parseFloat(prevAvailableBalanceRef.current);
-    // Check if balance increased
+    const currentBalance = Number.parseFloat(liveSpendable || '0');
+    const previousBalance = Number.parseFloat(prevSpendableBalanceRef.current);
+
     if (currentBalance > previousBalance) {
-      // Show success toast
       showToast(
-        PerpsToastOptions.accountManagement.deposit.success(
-          liveAccount?.availableBalance,
-        ),
+        PerpsToastOptions.accountManagement.deposit.success(liveSpendable),
       );
 
-      // Reset state
       expectingDepositRef.current = false;
-      prevAvailableBalanceRef.current = liveAccount.availableBalance;
+      prevSpendableBalanceRef.current = liveSpendable;
     }
-  }, [liveAccount, showToast, PerpsToastOptions.accountManagement.deposit]);
+  }, [liveSpendable, showToast, PerpsToastOptions.accountManagement.deposit]);
 
   // Handle deposit errors from controller state
   useEffect(() => {
diff --git a/app/components/UI/Perps/hooks/usePerpsMarketListView.test.ts b/app/components/UI/Perps/hooks/usePerpsMarketListView.test.ts
index 2390f2de6b6..cbaca476250 100644
--- a/app/components/UI/Perps/hooks/usePerpsMarketListView.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsMarketListView.test.ts
@@ -305,6 +305,68 @@ describe('usePerpsMarketListView', () => {
       });
     });
 
+    it('defaultSortOptionId overrides the saved sort option and resets direction to default', () => {
+      let selectorCallCount = 0;
+      mockUseSelector.mockImplementation(() => {
+        selectorCallCount++;
+        if (selectorCallCount % 2 === 1) {
+          return ['BTC'];
+        }
+        // Saved preference is volume/asc — user had it sorted ascending
+        return { optionId: 'volume', direction: 'asc' };
+      });
+
+      renderHook(() =>
+        usePerpsMarketListView({ defaultSortOptionId: 'priceChange' }),
+      );
+
+      // Option overridden → direction must reset to default (desc), not carry 'asc'
+      expect(mockUsePerpsSorting).toHaveBeenCalledWith({
+        initialOptionId: 'priceChange',
+        initialDirection: 'desc',
+      });
+    });
+
+    it('preserves saved direction when defaultSortOptionId matches the saved option', () => {
+      let selectorCallCount = 0;
+      mockUseSelector.mockImplementation(() => {
+        selectorCallCount++;
+        if (selectorCallCount % 2 === 1) {
+          return ['BTC'];
+        }
+        // Saved preference is priceChange/asc
+        return { optionId: 'priceChange', direction: 'asc' };
+      });
+
+      renderHook(() =>
+        usePerpsMarketListView({ defaultSortOptionId: 'priceChange' }),
+      );
+
+      // Same option — carry the saved direction, don't reset
+      expect(mockUsePerpsSorting).toHaveBeenCalledWith({
+        initialOptionId: 'priceChange',
+        initialDirection: 'asc',
+      });
+    });
+
+    it('falls back to saved sort preference when defaultSortOptionId is not provided', () => {
+      let selectorCallCount = 0;
+      mockUseSelector.mockImplementation(() => {
+        selectorCallCount++;
+        if (selectorCallCount % 2 === 1) {
+          return ['BTC'];
+        }
+        return { optionId: 'fundingRate', direction: 'asc' };
+      });
+
+      renderHook(() => usePerpsMarketListView());
+
+      expect(mockUsePerpsSorting).toHaveBeenCalledWith({
+        initialOptionId: 'fundingRate',
+        initialDirection: 'asc',
+      });
+    });
+
     it('exposes sort state correctly', () => {
       const { result } = renderHook(() => usePerpsMarketListView());
 
diff --git a/app/components/UI/Perps/hooks/usePerpsMarketListView.ts b/app/components/UI/Perps/hooks/usePerpsMarketListView.ts
index 6953520563c..8eeb0afff5c 100644
--- a/app/components/UI/Perps/hooks/usePerpsMarketListView.ts
+++ b/app/components/UI/Perps/hooks/usePerpsMarketListView.ts
@@ -4,6 +4,7 @@ import { usePerpsMarkets } from './usePerpsMarkets';
 import { usePerpsSearch } from './usePerpsSearch';
 import { usePerpsSorting } from './usePerpsSorting';
 import {
+  MARKET_SORTING_CONFIG,
   sortMarkets,
   type PerpsMarketData,
   type MarketTypeFilter,
@@ -33,6 +34,11 @@ interface UsePerpsMarketListViewParams {
    * @default 'all'
    */
   defaultMarketTypeFilter?: MarketTypeFilter;
+  /**
+   * Initial sort option ID — overrides the persisted user preference when provided.
+   * @default undefined (falls back to saved user preference)
+   */
+  defaultSortOptionId?: SortOptionId;
   /**
    * Show markets with $0.00 volume
    * @default false
@@ -133,6 +139,7 @@ export const usePerpsMarketListView = ({
   enablePolling = false,
   showWatchlistOnly = false,
   defaultMarketTypeFilter = 'all',
+  defaultSortOptionId,
   showZeroVolume = false,
 }: UsePerpsMarketListViewParams = {}): UsePerpsMarketListViewReturn => {
   // Fetch markets data
@@ -196,10 +203,20 @@ export const usePerpsMarketListView = ({
     return searchedMarkets;
   }, [searchedMarkets, marketTypeFilter]);
 
-  // Use sorting hook for sort state and sorting logic
+  // Use sorting hook for sort state and sorting logic.
+  // defaultSortOptionId (from navigation params) takes precedence over the saved user
+  // preference. When it overrides a *different* option, reset direction to the default
+  // so the market list opens sorted the same way the explore feed displayed it (always desc).
+  // When there is no override, or the override matches the saved option, carry the saved direction.
+  const isOptionOverridden =
+    defaultSortOptionId !== undefined &&
+    defaultSortOptionId !== savedSortPreference.optionId;
   const sortingHook = usePerpsSorting({
-    initialOptionId: savedSortPreference.optionId as SortOptionId,
-    initialDirection: savedSortPreference.direction,
+    initialOptionId: (defaultSortOptionId ??
+      savedSortPreference.optionId) as SortOptionId,
+    initialDirection: isOptionOverridden
+      ? MARKET_SORTING_CONFIG.DefaultDirection
+      : savedSortPreference.direction,
   });
 
   // Wrap handleOptionChange to save preference to PerpsController
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderFees.test.ts b/app/components/UI/Perps/hooks/usePerpsOrderFees.test.ts
index 262bd4dd24a..6ab40ec0228 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderFees.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderFees.test.ts
@@ -34,6 +34,15 @@ jest.mock('../../../../selectors/accountsController', () => ({
     .mockReturnValue('0x1234567890123456789012345678901234567890'),
 }));
 
+jest.mock(
+  '../../../../selectors/multichainAccounts/accountTreeController',
+  () => ({
+    selectSelectedAccountGroupEvmInternalAccount: jest.fn().mockReturnValue({
+      address: '0x1234567890123456789012345678901234567890',
+    }),
+  }),
+);
+
 jest.mock('../../../../selectors/networkController', () => ({
   selectChainId: jest.fn().mockReturnValue('0xa4b1'),
 }));
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderFees.ts b/app/components/UI/Perps/hooks/usePerpsOrderFees.ts
index d6fc28367f2..8da7dca07c0 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderFees.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderFees.ts
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
 import Engine from '../../../../core/Engine';
 import { DevLogger } from '../../../../core/SDKConnect/utils/DevLogger';
-import { selectSelectedInternalAccountFormattedAddress } from '../../../../selectors/accountsController';
+import { selectSelectedAccountGroupEvmInternalAccount } from '../../../../selectors/multichainAccounts/accountTreeController';
 import { selectChainId } from '../../../../selectors/networkController';
 
 import { setMeasurement } from '@sentry/react-native';
@@ -112,9 +112,8 @@ export function usePerpsOrderFees({
   currentBidPrice,
 }: UsePerpsOrderFeesParams): OrderFeesResult {
   const { calculateFees } = usePerpsTrading();
-  const selectedAddress = useSelector(
-    selectSelectedInternalAccountFormattedAddress,
-  );
+  const evmAccount = useSelector(selectSelectedAccountGroupEvmInternalAccount);
+  const selectedAddress = evmAccount?.address;
   const currentChainId = useSelector(selectChainId);
 
   const isMaker = useMemo(() => {
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts b/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts
index d4cf235ba96..57e29bb8382 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts
@@ -142,7 +142,8 @@ describe('usePerpsOrderForm', () => {
     mockUsePerpsNetwork.mockReturnValue('mainnet');
     mockUsePerpsLiveAccount.mockReturnValue({
       account: {
-        availableBalance: '1000',
+        spendableBalance: '1000',
+        withdrawableBalance: '1000',
         marginUsed: '0',
         unrealizedPnl: '0',
         returnOnEquity: '0',
@@ -426,7 +427,8 @@ describe('usePerpsOrderForm', () => {
       // Arrange - Set low available balance
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '2', // $2 available balance
+          spendableBalance: '2', // $2 available balance
+          withdrawableBalance: '2', // $2 available balance
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -450,7 +452,8 @@ describe('usePerpsOrderForm', () => {
       // Arrange - Set sufficient available balance
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '5', // $5 available balance
+          spendableBalance: '5', // $5 available balance
+          withdrawableBalance: '5', // $5 available balance
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -477,7 +480,8 @@ describe('usePerpsOrderForm', () => {
       // Arrange - Start with balance high enough that max >= 999 after 0.5% buffer (e.g. 335 * 3x → floor(1005*0.995) = 999)
       const mockAccount = {
         account: {
-          availableBalance: '335',
+          spendableBalance: '335',
+          withdrawableBalance: '335',
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -503,7 +507,7 @@ describe('usePerpsOrderForm', () => {
       expect(result.current.orderForm.amount).toBe('999');
 
       // Act - Change the available balance so the new max is below user's amount
-      mockAccount.account.availableBalance = '1'; // $1 balance → max order size drops below 999
+      mockAccount.account.spendableBalance = '1'; // $1 balance → max order size drops below 999
       mockUsePerpsLiveAccount.mockReturnValue(mockAccount);
       rerender({});
 
@@ -521,7 +525,8 @@ describe('usePerpsOrderForm', () => {
       // Test 1: Low balance scenario
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '2', // $2 balance, 3x leverage: max = floor(6 * 0.995) = 5 (less than $10 default)
+          spendableBalance: '2', // $2 balance, 3x leverage: max = floor(6 * 0.995) = 5 (less than $10 default)
+          withdrawableBalance: '2', // $2 balance, 3x leverage: max = floor(6 * 0.995) = 5 (less than $10 default)
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -539,7 +544,8 @@ describe('usePerpsOrderForm', () => {
       // Test 2: High balance scenario
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '100', // $100 balance = $300 max with 3x leverage (more than $10 default)
+          spendableBalance: '100', // $100 balance = $300 max with 3x leverage (more than $10 default)
+          withdrawableBalance: '100', // $100 balance = $300 max with 3x leverage (more than $10 default)
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -753,7 +759,8 @@ describe('usePerpsOrderForm', () => {
     it('should not update amount when balance is 0', () => {
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '0',
+          spendableBalance: '0',
+          withdrawableBalance: '0',
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderForm.ts b/app/components/UI/Perps/hooks/usePerpsOrderForm.ts
index af7d842319c..802cc2b0d29 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderForm.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderForm.ts
@@ -89,16 +89,14 @@ export function usePerpsOrderForm(
     selectPendingTradeConfiguration(state, initialAsset),
   );
 
-  const availableBalance = Number.parseFloat(
+  const spendableBalance = Number.parseFloat(
     effectiveAvailableBalanceParam != null
       ? effectiveAvailableBalanceParam.toString()
-      : (account?.availableToTradeBalance?.toString() ??
-          account?.availableBalance?.toString() ??
-          '0'),
+      : (account?.spendableBalance?.toString() ?? '0'),
   );
 
   // When paying with a custom token, use selected token amount in USD (including 0); otherwise use Perps balance
-  const balanceForMax = effectiveAvailableBalanceParam ?? availableBalance;
+  const balanceForMax = effectiveAvailableBalanceParam ?? spendableBalance;
 
   // Determine default amount based on network
   const defaultAmount =
@@ -132,7 +130,7 @@ export function usePerpsOrderForm(
     }
 
     const tempMaxAmount = getMaxAllowedAmount({
-      availableBalance: balanceForMax,
+      spendableBalance: balanceForMax,
       assetPrice: Number.parseFloat(currentPrice.price),
       assetSzDecimals: marketData?.szDecimals ?? 6,
       leverage: defaultLeverage, // Use default leverage for initial calculation
@@ -163,8 +161,8 @@ export function usePerpsOrderForm(
   const initialMarginRequired =
     Number.parseFloat(initialAmountValue) / defaultLeverage;
   const initialBalancePercent =
-    availableBalance > 0
-      ? Math.min((initialMarginRequired / availableBalance) * 100, 100)
+    spendableBalance > 0
+      ? Math.min((initialMarginRequired / spendableBalance) * 100, 100)
       : TRADING_DEFAULTS.marginPercent;
 
   // Initialize form state with pending config if available
@@ -184,7 +182,7 @@ export function usePerpsOrderForm(
   const maxPossibleAmount = useMemo(
     () =>
       getMaxAllowedAmount({
-        availableBalance: balanceForMax,
+        spendableBalance: balanceForMax,
         assetPrice: Number.parseFloat(currentPrice?.price) || 0,
         assetSzDecimals: marketData?.szDecimals ?? 6,
         leverage: orderForm.leverage, // Use current leverage instead of default
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderValidation.test.ts b/app/components/UI/Perps/hooks/usePerpsOrderValidation.test.ts
index a3dbea63163..10f5ba025e5 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderValidation.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderValidation.test.ts
@@ -70,7 +70,7 @@ describe('usePerpsOrderValidation', () => {
     orderForm: defaultOrderForm,
     positionSize: '0.002',
     assetPrice: 50000,
-    availableBalance: 1000,
+    spendableBalance: 1000,
     marginRequired: '10.00',
   };
 
@@ -160,7 +160,7 @@ describe('usePerpsOrderValidation', () => {
       const { result } = renderHook(() =>
         usePerpsOrderValidation({
           ...defaultParams,
-          availableBalance: 5,
+          spendableBalance: 5,
           marginRequired: '10.00',
         }),
       );
@@ -433,7 +433,7 @@ describe('usePerpsOrderValidation', () => {
       const { result } = renderHook(() =>
         usePerpsOrderValidation({
           ...defaultParams,
-          availableBalance: 5,
+          spendableBalance: 5,
           marginRequired: '10.00',
         }),
       );
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderValidation.ts b/app/components/UI/Perps/hooks/usePerpsOrderValidation.ts
index 6ae286bfe41..a3365ec03df 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderValidation.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderValidation.ts
@@ -21,7 +21,8 @@ interface UsePerpsOrderValidationParams {
   orderForm: OrderFormState;
   positionSize: string;
   assetPrice: number;
-  availableBalance: number;
+  /** Max USD that can collateralize a new position (mirrors AccountState.spendableBalance). */
+  spendableBalance: number;
   marginRequired: string;
   existingPositionLeverage?: number;
   skipValidation?: boolean;
@@ -53,7 +54,7 @@ export function usePerpsOrderValidation(
     orderForm,
     positionSize,
     assetPrice,
-    availableBalance,
+    spendableBalance,
     marginRequired,
     existingPositionLeverage,
     skipValidation,
@@ -92,11 +93,11 @@ export function usePerpsOrderValidation(
 
     // Balance validation (immediate)
     const requiredMargin = Number.parseFloat(marginRequired);
-    if (requiredMargin > availableBalance) {
+    if (requiredMargin > spendableBalance) {
       immediateErrors.push(
         strings('perps.order.validation.insufficient_balance', {
           required: marginRequired,
-          available: availableBalance.toString(),
+          available: spendableBalance.toString(),
         }),
       );
     }
@@ -228,7 +229,7 @@ export function usePerpsOrderValidation(
     orderForm.type,
     positionSize,
     assetPrice,
-    availableBalance,
+    spendableBalance,
     marginRequired,
     existingPositionLeverage,
     originalUsdAmount,
diff --git a/app/components/UI/Perps/hooks/usePerpsPaymentTokens.test.ts b/app/components/UI/Perps/hooks/usePerpsPaymentTokens.test.ts
index a22f5731676..98e7b5b3bcc 100644
--- a/app/components/UI/Perps/hooks/usePerpsPaymentTokens.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsPaymentTokens.test.ts
@@ -49,7 +49,8 @@ describe('usePerpsPaymentTokens', () => {
   };
 
   const mockAccountState: AccountState = {
-    availableBalance: '1000.50',
+    spendableBalance: '1000.50',
+    withdrawableBalance: '1000.50',
     marginUsed: '300.25',
     unrealizedPnl: '50.25',
     returnOnEquity: '0',
@@ -279,7 +280,8 @@ describe('usePerpsPaymentTokens', () => {
     it('handles zero Hyperliquid balance', () => {
       const zeroBalanceAccountState = {
         ...mockAccountState,
-        availableBalance: '0',
+        spendableBalance: '0',
+        withdrawableBalance: '0',
       };
 
       mockUsePerpsLiveAccount.mockReturnValue({
@@ -294,15 +296,16 @@ describe('usePerpsPaymentTokens', () => {
       expect(hyperliquidUsdc.balanceFiat).toBe('$0.00');
     });
 
-    it('uses availableToTradeBalance for Unified Account users', () => {
-      // Unified Account / Portfolio Margin: collateral lives in spot, so HL's
-      // `clearinghouseState.withdrawable` is $0. The Pay-with sheet must read
-      // `availableToTradeBalance` (perps + folded spot USDC) instead.
+    it('uses spendableBalance for Unified Account users', () => {
+      // Unified Account / Portfolio Margin: collateral lives in spot. The
+      // provider folds free spot USDC into spendableBalance via
+      // addSpotBalanceToAccountState, so the Pay-with sheet sees the unified
+      // total without branching on mode.
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
           ...mockAccountState,
-          availableBalance: '0',
-          availableToTradeBalance: '2500.00',
+          spendableBalance: '2500.00',
+          withdrawableBalance: '2500.00',
         },
         isInitialLoading: false,
       });
diff --git a/app/components/UI/Perps/hooks/usePerpsPaymentTokens.ts b/app/components/UI/Perps/hooks/usePerpsPaymentTokens.ts
index e7ec860c2c1..152942a2496 100644
--- a/app/components/UI/Perps/hooks/usePerpsPaymentTokens.ts
+++ b/app/components/UI/Perps/hooks/usePerpsPaymentTokens.ts
@@ -34,16 +34,12 @@ export function usePerpsPaymentTokens(): PerpsToken[] {
   // Use ref to store previous token array
   const previousTokensRef = useRef<PerpsToken[]>([]);
 
-  // Get Hyperliquid account balance. Prefer `availableToTradeBalance` so
-  // Unified Account / Portfolio Margin users see their real spendable balance
-  // in the Pay-with sheet — `availableBalance` mirrors HL's perps-only
-  // `clearinghouseState.withdrawable`, which is $0 in unified mode.
+  // Get Hyperliquid account balance from the reshaped balance contract.
+  // `spendableBalance` is the Unified-aware tradeable amount.
   const { account } = usePerpsLiveAccount();
   const currentNetwork = usePerpsNetwork();
   const hyperliquidBalance = Number.parseFloat(
-    (
-      account?.availableToTradeBalance ?? account?.availableBalance
-    )?.toString() || '0',
+    account?.spendableBalance?.toString() || '0',
   );
 
   // Get all chain IDs to search for tokens (exclude Hyperliquid chains)
diff --git a/app/components/UI/Perps/hooks/usePerpsPortfolioBalance.test.ts b/app/components/UI/Perps/hooks/usePerpsPortfolioBalance.test.ts
index 488ae3f5673..5ce3650ace5 100644
--- a/app/components/UI/Perps/hooks/usePerpsPortfolioBalance.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsPortfolioBalance.test.ts
@@ -70,7 +70,8 @@ describe('usePerpsPortfolioBalance', () => {
     // Set up default mock for usePerpsLiveAccount with zero balances
     mockUsePerpsLiveAccount.mockReturnValue({
       account: {
-        availableBalance: '0',
+        spendableBalance: '0',
+        withdrawableBalance: '0',
         marginUsed: '0',
         unrealizedPnl: '0',
         returnOnEquity: '0',
@@ -116,7 +117,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '1000.50',
+        spendableBalance: '1000.50',
+        withdrawableBalance: '1000.50',
         marginUsed: '0',
         unrealizedPnl: '50.25',
         returnOnEquity: '0',
@@ -155,7 +157,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '1500.75',
+        spendableBalance: '1500.75',
+        withdrawableBalance: '1500.75',
         marginUsed: '0',
         unrealizedPnl: '-25.15',
         returnOnEquity: '0',
@@ -183,7 +186,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '2500.00',
+        spendableBalance: '2500.00',
+        withdrawableBalance: '2500.00',
         marginUsed: '0',
         unrealizedPnl: '100.00',
         returnOnEquity: '0',
@@ -213,7 +217,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         marginUsed: '0',
         unrealizedPnl: '50.00',
         returnOnEquity: '0',
@@ -240,7 +245,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         marginUsed: '0',
         unrealizedPnl: '50.00',
         returnOnEquity: '0',
@@ -329,7 +335,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         marginUsed: '0',
         unrealizedPnl: '50.00',
         returnOnEquity: '0',
@@ -362,7 +369,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: 'invalid',
+        spendableBalance: 'invalid',
+        withdrawableBalance: 'invalid',
         marginUsed: '0',
         unrealizedPnl: 'NaN',
         returnOnEquity: '0',
@@ -391,7 +399,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '-100.50',
+        spendableBalance: '-100.50',
+        withdrawableBalance: '-100.50',
         marginUsed: '0',
         unrealizedPnl: '-200.25',
         returnOnEquity: '0',
@@ -418,7 +427,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '999999999.99',
+        spendableBalance: '999999999.99',
+        withdrawableBalance: '999999999.99',
         marginUsed: '0',
         unrealizedPnl: '123456789.12',
         returnOnEquity: '0',
@@ -444,7 +454,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         marginUsed: '0',
         unrealizedPnl: '0', // Missing field defaults to 0
         returnOnEquity: '0',
@@ -472,7 +483,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '500.00',
+        spendableBalance: '500.00',
+        withdrawableBalance: '500.00',
         marginUsed: '0',
         unrealizedPnl: '25.00',
         returnOnEquity: '0',
@@ -502,7 +514,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         marginUsed: '0',
         unrealizedPnl: '50.00',
         returnOnEquity: '0',
@@ -537,7 +550,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       let accountData = {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         marginUsed: '0',
         unrealizedPnl: '50.00',
         returnOnEquity: '0',
@@ -561,7 +575,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       accountData = {
-        availableBalance: '2000.00',
+        spendableBalance: '2000.00',
+        withdrawableBalance: '2000.00',
         marginUsed: '0',
         unrealizedPnl: '100.00',
         returnOnEquity: '0',
@@ -588,7 +603,8 @@ describe('usePerpsPortfolioBalance', () => {
       };
 
       const accountData = {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         marginUsed: '0',
         unrealizedPnl: '50.00',
         returnOnEquity: '0',
diff --git a/app/components/UI/Perps/hooks/usePerpsPositionForAsset.test.ts b/app/components/UI/Perps/hooks/usePerpsPositionForAsset.test.ts
index d76b8f9f75d..a02af1b7597 100644
--- a/app/components/UI/Perps/hooks/usePerpsPositionForAsset.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsPositionForAsset.test.ts
@@ -50,7 +50,8 @@ const mockPosition: Position = {
 };
 
 const mockAccountState: AccountState = {
-  availableBalance: '10000',
+  spendableBalance: '10000',
+  withdrawableBalance: '10000',
   marginUsed: '800',
   unrealizedPnl: '100',
   returnOnEquity: '0.03',
@@ -58,19 +59,23 @@ const mockAccountState: AccountState = {
 };
 
 const mockUserAddress = '0x1234567890123456789012345678901234567890';
+const mockNonEvmAddress = 'bc1qn7ag0000000000000000000000000000000000';
 
 const createMockState = (
-  overrides?: Partial<{ isTestnet: boolean }>,
+  overrides?: Partial<{
+    isTestnet: boolean;
+    selectedAccountId: string;
+    selectedGroupAccountIds: string[];
+  }>,
 ): DeepPartial<RootState> => ({
   engine: {
     backgroundState: {
       PerpsController: {
-        isTestnet: false,
-        ...overrides,
+        isTestnet: overrides?.isTestnet ?? false,
       },
       AccountsController: {
         internalAccounts: {
-          selectedAccount: 'account-1',
+          selectedAccount: overrides?.selectedAccountId ?? 'account-1',
           accounts: {
             'account-1': {
               id: 'account-1',
@@ -86,6 +91,53 @@ const createMockState = (
               methods: [],
               options: {},
             },
+            'account-btc': {
+              id: 'account-btc',
+              type: 'bip122:p2wpkh',
+              address: mockNonEvmAddress,
+              metadata: {
+                name: 'Bitcoin Account',
+                keyring: { type: 'Snap Keyring' },
+                importTime: 1234567890,
+                lastSelected: 1234567891,
+              },
+              scopes: ['bip122:000000000019d6689c085ae165831e93'],
+              methods: [],
+              options: {},
+            },
+          },
+        },
+      },
+      KeyringController: {
+        keyrings: [
+          {
+            accounts: [mockUserAddress],
+            type: 'HD Key Tree',
+          },
+        ],
+      },
+      AccountTreeController: {
+        selectedAccountGroup: 'entropy:wallet-1/0',
+        accountTree: {
+          wallets: {
+            'entropy:wallet-1': {
+              id: 'entropy:wallet-1',
+              metadata: {
+                name: 'Wallet 1',
+              },
+              groups: {
+                'entropy:wallet-1/0': {
+                  id: 'entropy:wallet-1/0',
+                  metadata: {
+                    name: 'Account 1',
+                  },
+                  accounts: overrides?.selectedGroupAccountIds ?? [
+                    'account-1',
+                    'account-btc',
+                  ],
+                },
+              },
+            },
           },
         },
       },
@@ -211,6 +263,50 @@ describe('usePerpsPositionForAsset', () => {
       });
     });
 
+    it('uses the selected account group EVM address when the selected account is non-EVM', async () => {
+      renderHookWithProvider(() => usePerpsPositionForAsset('ETH'), {
+        state: createMockState({ selectedAccountId: 'account-btc' }),
+      });
+
+      await waitFor(() => {
+        expect(mockGetPositions).toHaveBeenCalledWith({
+          standalone: true,
+          userAddress: mockUserAddress,
+        });
+      });
+
+      expect(mockGetAccountState).toHaveBeenCalledWith({
+        standalone: true,
+        userAddress: mockUserAddress,
+      });
+      expect(mockGetAccountState).not.toHaveBeenCalledWith(
+        expect.objectContaining({ userAddress: mockNonEvmAddress }),
+      );
+    });
+
+    it('returns empty state when the selected account group has no EVM account', async () => {
+      const { result } = renderHookWithProvider(
+        () => usePerpsPositionForAsset('ETH'),
+        {
+          state: createMockState({
+            selectedAccountId: 'account-btc',
+            selectedGroupAccountIds: ['account-btc'],
+          }),
+        },
+      );
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.position).toBeNull();
+      expect(result.current.hasFundsInPerps).toBe(false);
+      expect(result.current.accountState).toBeNull();
+      expect(result.current.error).toBeNull();
+      expect(mockGetPositions).not.toHaveBeenCalled();
+      expect(mockGetAccountState).not.toHaveBeenCalled();
+    });
+
     it('handles case-insensitive symbol matching', async () => {
       const { result } = renderHookWithProvider(
         () => usePerpsPositionForAsset('eth'),
diff --git a/app/components/UI/Perps/hooks/usePerpsPositionForAsset.ts b/app/components/UI/Perps/hooks/usePerpsPositionForAsset.ts
index bbf479c81dc..1e6f3ae06f1 100644
--- a/app/components/UI/Perps/hooks/usePerpsPositionForAsset.ts
+++ b/app/components/UI/Perps/hooks/usePerpsPositionForAsset.ts
@@ -4,7 +4,7 @@ import DevLogger from '../../../../core/SDKConnect/utils/DevLogger';
 import type { AccountState, Position } from '@metamask/perps-controller';
 import { usePerpsTrading } from './usePerpsTrading';
 import { usePerpsNetwork } from './usePerpsNetwork';
-import { selectSelectedInternalAccountFormattedAddress } from '../../../../selectors/accountsController';
+import { selectSelectedAccountGroupEvmInternalAccount } from '../../../../selectors/multichainAccounts/accountTreeController';
 import { PerpsCacheInvalidator } from '../services/PerpsCacheInvalidator';
 
 /**
@@ -89,9 +89,8 @@ export const usePerpsPositionForAsset = (
 ): UsePerpsPositionForAssetResult => {
   const { getPositions, getAccountState } = usePerpsTrading();
   const perpsNetwork = usePerpsNetwork();
-  const userAddress = useSelector(
-    selectSelectedInternalAccountFormattedAddress,
-  );
+  const evmAccount = useSelector(selectSelectedAccountGroupEvmInternalAccount);
+  const userAddress = evmAccount?.address;
 
   // Track if component is still mounted
   const isMountedRef = useRef(true);
diff --git a/app/components/UI/Perps/hooks/usePerpsSelector.test.ts b/app/components/UI/Perps/hooks/usePerpsSelector.test.ts
index 49d866d1d2b..91a8e92a81b 100644
--- a/app/components/UI/Perps/hooks/usePerpsSelector.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsSelector.test.ts
@@ -142,7 +142,8 @@ describe('usePerpsSelector', () => {
     const mockState: PerpsControllerState = {
       accountState: {
         totalBalance: '1000.00',
-        availableBalance: '750.00',
+        spendableBalance: '750.00',
+        withdrawableBalance: '750.00',
         marginUsed: '250.00',
       },
     } as PerpsControllerState;
@@ -158,7 +159,7 @@ describe('usePerpsSelector', () => {
     ) => ({
       total: Number.parseFloat(state?.accountState?.totalBalance ?? '0'),
       available: Number.parseFloat(
-        state?.accountState?.availableBalance ?? '0',
+        state?.accountState?.spendableBalance ?? '0',
       ),
       used: Number.parseFloat(state?.accountState?.marginUsed ?? '0'),
     });
diff --git a/app/components/UI/Perps/hooks/usePerpsTrading.test.ts b/app/components/UI/Perps/hooks/usePerpsTrading.test.ts
index 5f62f6d8373..f5791cdb39b 100644
--- a/app/components/UI/Perps/hooks/usePerpsTrading.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsTrading.test.ts
@@ -280,7 +280,8 @@ describe('usePerpsTrading', () => {
   describe('getAccountState', () => {
     it('should call PerpsController.getAccountState and return account state', async () => {
       const mockAccountState: AccountState = {
-        availableBalance: '10000',
+        spendableBalance: '10000',
+        withdrawableBalance: '10000',
         marginUsed: '0',
         unrealizedPnl: '0',
         returnOnEquity: '16.67',
@@ -304,7 +305,8 @@ describe('usePerpsTrading', () => {
 
     it('should call getAccountState without parameters', async () => {
       const mockAccountState: AccountState = {
-        availableBalance: '10000',
+        spendableBalance: '10000',
+        withdrawableBalance: '10000',
         marginUsed: '0',
         unrealizedPnl: '0',
         returnOnEquity: '16.67',
diff --git a/app/components/UI/Perps/hooks/usePerpsTransactionHistory.test.ts b/app/components/UI/Perps/hooks/usePerpsTransactionHistory.test.ts
index d8d25ef080d..e71f25d24c0 100644
--- a/app/components/UI/Perps/hooks/usePerpsTransactionHistory.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsTransactionHistory.test.ts
@@ -185,7 +185,9 @@ describe('usePerpsTransactionHistory', () => {
     // Mock Redux selectors: first call = wallet transactions, second = selected address
     mockUseSelector.mockImplementation(() => {
       const len = mockUseSelector.mock.calls.length;
-      return len % 2 === 1 ? [] : '0x1234567890123456789012345678901234567890';
+      return len % 2 === 1
+        ? []
+        : { address: '0x1234567890123456789012345678901234567890' };
     });
 
     // Mock provider
@@ -327,7 +329,7 @@ describe('usePerpsTransactionHistory', () => {
                 txParams: { from: selectedAddr },
               },
             ]
-          : selectedAddr;
+          : { address: selectedAddr };
       });
 
       const { result } = renderHook(() =>
@@ -396,7 +398,7 @@ describe('usePerpsTransactionHistory', () => {
                 txParams: { from: selectedAddr },
               },
             ]
-          : selectedAddr;
+          : { address: selectedAddr };
       });
 
       const { result } = renderHook(() =>
@@ -466,7 +468,7 @@ describe('usePerpsTransactionHistory', () => {
                 nestedTransactions: [{ type: 'perpsWithdraw' }],
               },
             ]
-          : selectedAddr;
+          : { address: selectedAddr };
       });
 
       const { result } = renderHook(() =>
@@ -547,7 +549,7 @@ describe('usePerpsTransactionHistory', () => {
                 nestedTransactions: [{ type: 'perpsWithdraw' }],
               },
             ]
-          : selectedAddr;
+          : { address: selectedAddr };
       });
 
       const { result } = renderHook(() =>
diff --git a/app/components/UI/Perps/hooks/usePerpsTransactionHistory.ts b/app/components/UI/Perps/hooks/usePerpsTransactionHistory.ts
index 1d353efe902..85c69021eb8 100644
--- a/app/components/UI/Perps/hooks/usePerpsTransactionHistory.ts
+++ b/app/components/UI/Perps/hooks/usePerpsTransactionHistory.ts
@@ -28,7 +28,7 @@ import DevLogger from '../../../../core/SDKConnect/utils/DevLogger';
 import type { CaipAccountId } from '@metamask/utils';
 import { areAddressesEqual } from '../../../../util/address';
 import { selectNonReplacedTransactions } from '../../../../selectors/transactionController';
-import { selectSelectedInternalAccountFormattedAddress } from '../../../../selectors/accountsController';
+import { selectSelectedAccountGroupEvmInternalAccount } from '../../../../selectors/multichainAccounts/accountTreeController';
 import {
   PerpsTransaction,
   PerpsTransactionType,
@@ -120,9 +120,8 @@ export const usePerpsTransactionHistory = ({
 
   // Wallet perps deposits and withdrawals for the Deposits tab
   const walletTransactions = useSelector(selectNonReplacedTransactions);
-  const selectedAddress = useSelector(
-    selectSelectedInternalAccountFormattedAddress,
-  );
+  const evmAccount = useSelector(selectSelectedAccountGroupEvmInternalAccount);
+  const selectedAddress = evmAccount?.address;
   const { walletDepositTransactions, walletWithdrawalTransactions } =
     useMemo(() => {
       if (!selectedAddress) {
diff --git a/app/components/UI/Perps/hooks/usePerpsWithdrawProgress.test.ts b/app/components/UI/Perps/hooks/usePerpsWithdrawProgress.test.ts
index 9e3496f8f0d..7315353a0ac 100644
--- a/app/components/UI/Perps/hooks/usePerpsWithdrawProgress.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsWithdrawProgress.test.ts
@@ -22,7 +22,8 @@ describe('usePerpsWithdrawProgress', () => {
     // Default mock for usePerpsLiveAccount
     mockUsePerpsLiveAccount.mockReturnValue({
       account: {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         totalBalance: '10000.00',
         marginUsed: '9000.00',
         unrealizedPnl: '100.00',
@@ -80,7 +81,8 @@ describe('usePerpsWithdrawProgress', () => {
     it('captures balance when withdrawal starts', () => {
       // Arrange
       const mockAccount = {
-        availableBalance: '500.00',
+        spendableBalance: '500.00',
+        withdrawableBalance: '500.00',
         totalBalance: '10000.00',
         marginUsed: '9500.00',
         unrealizedPnl: '100.00',
@@ -107,7 +109,8 @@ describe('usePerpsWithdrawProgress', () => {
     it('completes withdrawal when balance decreases', () => {
       // Arrange
       const initialAccount = {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         totalBalance: '10000.00',
         marginUsed: '9000.00',
         unrealizedPnl: '100.00',
@@ -115,7 +118,8 @@ describe('usePerpsWithdrawProgress', () => {
       };
 
       const updatedAccount = {
-        availableBalance: '500.00', // Balance decreased
+        spendableBalance: '500.00', // Balance decreased
+        withdrawableBalance: '500.00', // Balance decreased
         totalBalance: '9500.00',
         marginUsed: '9000.00',
         unrealizedPnl: '100.00',
@@ -150,7 +154,8 @@ describe('usePerpsWithdrawProgress', () => {
     it('does not complete withdrawal when balance increases', () => {
       // Arrange
       const initialAccount = {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         totalBalance: '10000.00',
         marginUsed: '9000.00',
         unrealizedPnl: '100.00',
@@ -158,7 +163,8 @@ describe('usePerpsWithdrawProgress', () => {
       };
 
       const updatedAccount = {
-        availableBalance: '1500.00', // Balance increased
+        spendableBalance: '1500.00', // Balance increased
+        withdrawableBalance: '1500.00', // Balance increased
         totalBalance: '10500.00',
         marginUsed: '9000.00',
         unrealizedPnl: '100.00',
@@ -193,7 +199,8 @@ describe('usePerpsWithdrawProgress', () => {
     it('does not complete withdrawal when balance stays the same', () => {
       // Arrange
       const account = {
-        availableBalance: '1000.00',
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
         totalBalance: '10000.00',
         marginUsed: '9000.00',
         unrealizedPnl: '100.00',
@@ -251,10 +258,11 @@ describe('usePerpsWithdrawProgress', () => {
       expect(result.current.isWithdrawInProgress).toBe(false);
     });
 
-    it('handles missing availableBalance gracefully', () => {
+    it('handles missing withdrawableBalance gracefully', () => {
       // Arrange
       const accountWithoutBalance = {
-        availableBalance: '',
+        spendableBalance: '',
+        withdrawableBalance: '',
         totalBalance: '10000.00',
         marginUsed: '9000.00',
         unrealizedPnl: '100.00',
diff --git a/app/components/UI/Perps/hooks/usePerpsWithdrawProgress.ts b/app/components/UI/Perps/hooks/usePerpsWithdrawProgress.ts
index 16184b0b047..879397a8f28 100644
--- a/app/components/UI/Perps/hooks/usePerpsWithdrawProgress.ts
+++ b/app/components/UI/Perps/hooks/usePerpsWithdrawProgress.ts
@@ -16,7 +16,7 @@ export const usePerpsWithdrawProgress = () => {
 
   // Track if we're expecting a withdrawal
   const [isWithdrawInProgress, setIsWithdrawInProgress] = useState(false);
-  const prevAvailableBalanceRef = useRef<string>('0');
+  const prevWithdrawableBalanceRef = useRef<string>('0');
   const liveAccountRef = useRef(liveAccount);
 
   // Get withdrawal progress state from controller
@@ -35,8 +35,8 @@ export const usePerpsWithdrawProgress = () => {
     if (withdrawInProgress) {
       // Withdrawal started - set progress state and capture current balance
       setIsWithdrawInProgress(true);
-      prevAvailableBalanceRef.current =
-        liveAccountRef.current?.availableBalance || '0';
+      prevWithdrawableBalanceRef.current =
+        liveAccountRef.current?.withdrawableBalance || '0';
     } else {
       // Withdrawal completed or failed - clear progress state
       setIsWithdrawInProgress(false);
@@ -49,14 +49,14 @@ export const usePerpsWithdrawProgress = () => {
       return;
     }
 
-    const currentBalance = parseFloat(liveAccount.availableBalance || '0');
-    const previousBalance = parseFloat(prevAvailableBalanceRef.current);
+    const currentBalance = parseFloat(liveAccount.withdrawableBalance || '0');
+    const previousBalance = parseFloat(prevWithdrawableBalanceRef.current);
 
     // Check if balance decreased (funds withdrawn)
     if (currentBalance < previousBalance) {
       // Withdrawal completed successfully
       setIsWithdrawInProgress(false);
-      prevAvailableBalanceRef.current = liveAccount.availableBalance;
+      prevWithdrawableBalanceRef.current = liveAccount.withdrawableBalance;
     }
   }, [isWithdrawInProgress, liveAccount]);
 
diff --git a/app/components/UI/Perps/hooks/useWithdrawValidation.test.ts b/app/components/UI/Perps/hooks/useWithdrawValidation.test.ts
index 9277463c6f2..6e99660cac1 100644
--- a/app/components/UI/Perps/hooks/useWithdrawValidation.test.ts
+++ b/app/components/UI/Perps/hooks/useWithdrawValidation.test.ts
@@ -63,7 +63,8 @@ describe('useWithdrawValidation', () => {
     jest.clearAllMocks();
     (usePerpsLiveAccount as jest.Mock).mockReturnValue({
       account: {
-        availableBalance: '$1000.00',
+        spendableBalance: '$1000.00',
+        withdrawableBalance: '$1000.00',
       },
       isInitialLoading: false,
     });
@@ -78,14 +79,14 @@ describe('useWithdrawValidation', () => {
       useWithdrawValidation({ withdrawAmount: '100' }),
     );
 
-    expect(result.current.availableBalance).toBe('1000');
+    expect(result.current.withdrawableBalance).toBe('1000');
   });
 
-  it('prefers availableToTradeBalance for Unified Account target state', () => {
+  it('uses withdrawableBalance populated by spot fold for Unified Account', () => {
     (usePerpsLiveAccount as jest.Mock).mockReturnValue({
       account: {
-        availableBalance: '$0.00',
-        availableToTradeBalance: '$2500.00',
+        spendableBalance: '$2500.00',
+        withdrawableBalance: '$2500.00',
       },
       isInitialLoading: false,
     });
@@ -94,14 +95,15 @@ describe('useWithdrawValidation', () => {
       useWithdrawValidation({ withdrawAmount: '100' }),
     );
 
-    expect(result.current.availableBalance).toBe('2500');
+    expect(result.current.withdrawableBalance).toBe('2500');
     expect(result.current.hasInsufficientBalance).toBe(false);
   });
 
   it('should handle empty balance', () => {
     (usePerpsLiveAccount as jest.Mock).mockReturnValue({
       account: {
-        availableBalance: null,
+        spendableBalance: null,
+        withdrawableBalance: null,
       },
       isInitialLoading: false,
     });
@@ -110,7 +112,7 @@ describe('useWithdrawValidation', () => {
       useWithdrawValidation({ withdrawAmount: '100' }),
     );
 
-    expect(result.current.availableBalance).toBe('0');
+    expect(result.current.withdrawableBalance).toBe('0');
   });
 
   it('should detect insufficient balance', () => {
@@ -124,7 +126,8 @@ describe('useWithdrawValidation', () => {
   it('should truncate available balance to 2 decimal places for validation', () => {
     (usePerpsLiveAccount as jest.Mock).mockReturnValue({
       account: {
-        availableBalance: '$16.069',
+        spendableBalance: '$16.069',
+        withdrawableBalance: '$16.069',
       },
       isInitialLoading: false,
     });
@@ -133,14 +136,15 @@ describe('useWithdrawValidation', () => {
       useWithdrawValidation({ withdrawAmount: '16.06' }),
     );
 
-    expect(result.current.availableBalance).toBe('16.06');
+    expect(result.current.withdrawableBalance).toBe('16.06');
     expect(result.current.hasInsufficientBalance).toBe(false);
   });
 
   it('should show insufficient balance when typing more than truncated balance', () => {
     (usePerpsLiveAccount as jest.Mock).mockReturnValue({
       account: {
-        availableBalance: '$16.069',
+        spendableBalance: '$16.069',
+        withdrawableBalance: '$16.069',
       },
       isInitialLoading: false,
     });
diff --git a/app/components/UI/Perps/hooks/useWithdrawValidation.ts b/app/components/UI/Perps/hooks/useWithdrawValidation.ts
index 3a8adb55263..13992bde788 100644
--- a/app/components/UI/Perps/hooks/useWithdrawValidation.ts
+++ b/app/components/UI/Perps/hooks/useWithdrawValidation.ts
@@ -28,12 +28,9 @@ export const useWithdrawValidation = ({
   const perpsNetwork = usePerpsNetwork();
   const isTestnet = perpsNetwork === 'testnet';
 
-  // Release-branch bridge for Unified Account: availableToTradeBalance includes
-  // collateral HL can use in target mode. The full balance contract will replace
-  // this with an explicit withdrawableBalance field.
-  const availableBalance = useMemo(() => {
-    const balance =
-      account?.availableToTradeBalance ?? account?.availableBalance ?? '0';
+  // Truncate to 2 decimal places so validation matches the displayed balance.
+  const withdrawableBalance = useMemo(() => {
+    const balance = account?.withdrawableBalance || '0';
     return truncateToTwoDecimals(parseCurrencyString(balance)).toString();
   }, [account]);
 
@@ -52,11 +49,11 @@ export const useWithdrawValidation = ({
 
   // Validation checks
   const hasInsufficientBalance = useMemo(() => {
-    if (!withdrawAmount || !availableBalance) return false;
+    if (!withdrawAmount || !withdrawableBalance) return false;
     return (
-      Number.parseFloat(withdrawAmount) > Number.parseFloat(availableBalance)
+      Number.parseFloat(withdrawAmount) > Number.parseFloat(withdrawableBalance)
     );
-  }, [withdrawAmount, availableBalance]);
+  }, [withdrawAmount, withdrawableBalance]);
 
   const isBelowMinimum = useMemo(() => {
     if (!withdrawAmount) return false;
@@ -95,7 +92,7 @@ export const useWithdrawValidation = ({
     );
 
   return {
-    availableBalance,
+    withdrawableBalance,
     withdrawalRoute,
     hasInsufficientBalance,
     isBelowMinimum,
diff --git a/app/components/UI/Perps/hooks/useWithdrawalRequests.ts b/app/components/UI/Perps/hooks/useWithdrawalRequests.ts
index 660f5707aa0..f479e5e525f 100644
--- a/app/components/UI/Perps/hooks/useWithdrawalRequests.ts
+++ b/app/components/UI/Perps/hooks/useWithdrawalRequests.ts
@@ -34,6 +34,9 @@ interface UseWithdrawalRequestsResult {
   refetch: () => Promise<void>;
 }
 
+const EMPTY_WITHDRAWAL_REQUESTS: WithdrawalRequest[] = [];
+const EMPTY_TX_HASHES: string[] = [];
+
 const WITHDRAWAL_POLL_INTERVAL_MS = 5000;
 const WITHDRAWAL_SEARCH_BUFFER_MS = 60000;
 
@@ -56,8 +59,10 @@ export const useWithdrawalRequests = (
 
   const allWithdrawals = useStableArray(
     usePerpsSelector((state) => {
-      const withdrawals = state?.withdrawalRequests || [];
-      if (!selectedAddress) return [];
+      const withdrawals =
+        state?.withdrawalRequests ?? EMPTY_WITHDRAWAL_REQUESTS;
+      if (!selectedAddress || withdrawals.length === 0)
+        return EMPTY_WITHDRAWAL_REQUESTS;
       return withdrawals.filter(
         (req) =>
           req.accountAddress?.toLowerCase() === selectedAddress.toLowerCase(),
@@ -79,7 +84,7 @@ export const useWithdrawalRequests = (
     (state) => state?.lastCompletedWithdrawalTimestamp ?? null,
   );
   const lastCompletedTxHashes = usePerpsSelector(
-    (state) => state?.lastCompletedWithdrawalTxHashes ?? [],
+    (state) => state?.lastCompletedWithdrawalTxHashes ?? EMPTY_TX_HASHES,
   );
 
   const initialFetchDoneRef = useRef(false);
diff --git a/app/components/UI/Perps/providers/PerpsStreamManager.test.tsx b/app/components/UI/Perps/providers/PerpsStreamManager.test.tsx
index 900da7ab83c..3eef6447d59 100644
--- a/app/components/UI/Perps/providers/PerpsStreamManager.test.tsx
+++ b/app/components/UI/Perps/providers/PerpsStreamManager.test.tsx
@@ -262,7 +262,8 @@ describe('PerpsStreamManager', () => {
     ]);
     jest.spyOn(testStreamManager.account, 'getSnapshot').mockReturnValue({
       totalBalance: '5000',
-      availableBalance: '4000',
+      spendableBalance: '4000',
+      withdrawableBalance: '4000',
       marginUsed: '1000',
       unrealizedPnl: '0',
       returnOnEquity: '0',
@@ -2707,6 +2708,259 @@ describe('PerpsStreamManager', () => {
     });
   });
 
+  describe('StreamChannel pause reference counting', () => {
+    let mockOrdersSubscribe: jest.Mock;
+    let mockOrdersUnsubscribe: jest.Mock;
+    let orderCallback: ((orders: Order[]) => void) | null;
+
+    const SAMPLE_ORDER: Order = {
+      orderId: '1',
+      symbol: 'BTC',
+      side: 'buy',
+      orderType: 'limit',
+      size: '1.0',
+      originalSize: '1.0',
+      price: '50000',
+      filledSize: '0',
+      remainingSize: '1.0',
+      status: 'open',
+      timestamp: Date.now(),
+      detailedOrderType: 'Limit',
+      isTrigger: false,
+      reduceOnly: false,
+    };
+
+    beforeEach(() => {
+      orderCallback = null;
+      mockOrdersUnsubscribe = jest.fn();
+      mockOrdersSubscribe = jest
+        .fn()
+        .mockImplementation(
+          (params: { callback: (orders: Order[]) => void }) => {
+            orderCallback = params.callback;
+            return mockOrdersUnsubscribe;
+          },
+        );
+      mockEngine.context.PerpsController.subscribeToOrders =
+        mockOrdersSubscribe;
+      mockEngine.context.PerpsController.isCurrentlyReinitializing = jest
+        .fn()
+        .mockReturnValue(false);
+    });
+
+    it('requires all pause holders to resume before emission unblocks', async () => {
+      const callback = jest.fn();
+      const unsubscribe = testStreamManager.orders.subscribe({
+        callback,
+        throttleMs: 0,
+      });
+
+      await waitFor(() => expect(mockOrdersSubscribe).toHaveBeenCalled());
+
+      // Deliver first update so hasReceivedFirstUpdate is set
+      act(() => {
+        orderCallback?.([SAMPLE_ORDER]);
+      });
+      await waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
+      callback.mockClear();
+
+      // Two independent callers pause — simulating tab visibility + controller op
+      act(() => {
+        testStreamManager.orders.pause(); // caller A: tab
+        testStreamManager.orders.pause(); // caller B: controller
+      });
+
+      act(() => {
+        orderCallback?.([{ ...SAMPLE_ORDER, orderId: '2' }]);
+      });
+      await act(async () => {
+        await Promise.resolve();
+      });
+      expect(callback).not.toHaveBeenCalled();
+
+      // Caller A releases — count drops to 1, still blocked
+      act(() => {
+        testStreamManager.orders.resume();
+      }); // caller A: tab
+      act(() => {
+        orderCallback?.([{ ...SAMPLE_ORDER, orderId: '3' }]);
+      });
+      await act(async () => {
+        await Promise.resolve();
+      });
+      expect(callback).not.toHaveBeenCalled();
+
+      // Caller B releases — count drops to 0, emission resumes
+      act(() => {
+        testStreamManager.orders.resume();
+      }); // caller B: controller
+      act(() => {
+        orderCallback?.([{ ...SAMPLE_ORDER, orderId: '4' }]);
+      });
+      await waitFor(() => {
+        expect(callback).toHaveBeenCalledTimes(1);
+        expect(callback).toHaveBeenCalledWith(
+          expect.arrayContaining([expect.objectContaining({ orderId: '4' })]),
+        );
+      });
+
+      unsubscribe();
+    });
+
+    it('tab resume does not release a concurrent controller pause', async () => {
+      // Regression: the old boolean would allow tab resume to unblock the channel
+      // while a controller operation (e.g. closePosition) was still in-flight.
+      const callback = jest.fn();
+      const unsubscribe = testStreamManager.orders.subscribe({
+        callback,
+        throttleMs: 0,
+      });
+
+      await waitFor(() => expect(mockOrdersSubscribe).toHaveBeenCalled());
+
+      act(() => {
+        orderCallback?.([SAMPLE_ORDER]);
+      });
+      await waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
+      callback.mockClear();
+
+      act(() => {
+        // Predictions tab becomes active
+        testStreamManager.orders.pause(); // tab: count → 1
+        // Controller starts a trade operation on the same channel
+        testStreamManager.orders.pause(); // controller: count → 2
+      });
+
+      // User switches back to Portfolio — tab releases its pause
+      act(() => {
+        testStreamManager.orders.resume();
+      }); // tab: count → 1
+
+      // Update arrives while controller op is still running — must be blocked
+      act(() => {
+        orderCallback?.([{ ...SAMPLE_ORDER, orderId: 'mid-op' }]);
+      });
+      await act(async () => {
+        await Promise.resolve();
+      });
+      expect(callback).not.toHaveBeenCalled();
+
+      // Controller finally block releases — count → 0, emission resumes
+      act(() => {
+        testStreamManager.orders.resume();
+      }); // controller: count → 0
+      act(() => {
+        orderCallback?.([{ ...SAMPLE_ORDER, orderId: 'after-op' }]);
+      });
+      await waitFor(() => {
+        expect(callback).toHaveBeenCalledWith(
+          expect.arrayContaining([
+            expect.objectContaining({ orderId: 'after-op' }),
+          ]),
+        );
+      });
+
+      unsubscribe();
+    });
+
+    it('resume() never drives pauseCount below zero (unmatched resume guard)', async () => {
+      const callback = jest.fn();
+      const unsubscribe = testStreamManager.orders.subscribe({
+        callback,
+        throttleMs: 0,
+      });
+
+      await waitFor(() => expect(mockOrdersSubscribe).toHaveBeenCalled());
+
+      act(() => {
+        orderCallback?.([SAMPLE_ORDER]);
+      });
+      await waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
+      callback.mockClear();
+
+      // Extra resume calls with no matching pause should be no-ops
+      act(() => {
+        testStreamManager.orders.resume();
+        testStreamManager.orders.resume();
+        testStreamManager.orders.resume();
+      });
+
+      // Emission must still work — count is 0, not negative
+      act(() => {
+        orderCallback?.([{ ...SAMPLE_ORDER, orderId: 'after-unmatched' }]);
+      });
+      await waitFor(() => {
+        expect(callback).toHaveBeenCalledTimes(1);
+        expect(callback).toHaveBeenCalledWith(
+          expect.arrayContaining([
+            expect.objectContaining({ orderId: 'after-unmatched' }),
+          ]),
+        );
+      });
+
+      unsubscribe();
+    });
+
+    it('each channel tracks its own pause count independently', () => {
+      // Pausing orders should not affect prices
+      const orderPauseSpy = jest.spyOn(testStreamManager.orders, 'pause');
+      const pricesPauseSpy = jest.spyOn(testStreamManager.prices, 'pause');
+
+      testStreamManager.orders.pause();
+
+      expect(orderPauseSpy).toHaveBeenCalledTimes(1);
+      expect(pricesPauseSpy).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('pauseAllChannels / resumeAllChannels', () => {
+    const CHANNEL_NAMES = [
+      'prices',
+      'orders',
+      'positions',
+      'fills',
+      'account',
+      'oiCaps',
+      'topOfBook',
+      'candles',
+    ] as const;
+
+    it('pauseAllChannels calls pause() on every channel', () => {
+      for (const channel of CHANNEL_NAMES) {
+        jest.spyOn(testStreamManager[channel], 'pause');
+      }
+
+      testStreamManager.pauseAllChannels();
+
+      for (const channel of CHANNEL_NAMES) {
+        expect(testStreamManager[channel].pause).toHaveBeenCalledTimes(1);
+      }
+    });
+
+    it('resumeAllChannels calls resume() on every channel', () => {
+      for (const channel of CHANNEL_NAMES) {
+        jest.spyOn(testStreamManager[channel], 'resume');
+      }
+
+      testStreamManager.resumeAllChannels();
+
+      for (const channel of CHANNEL_NAMES) {
+        expect(testStreamManager[channel].resume).toHaveBeenCalledTimes(1);
+      }
+    });
+
+    it('does not touch marketData (REST-based, not a stream channel)', () => {
+      const pauseSpy = jest.spyOn(testStreamManager.marketData, 'pause');
+      const resumeSpy = jest.spyOn(testStreamManager.marketData, 'resume');
+
+      testStreamManager.pauseAllChannels();
+      testStreamManager.resumeAllChannels();
+
+      expect(pauseSpy).not.toHaveBeenCalled();
+      expect(resumeSpy).not.toHaveBeenCalled();
+    });
+  });
+
   describe('TopOfBookStreamChannel', () => {
     it('subscribes to top of book with includeOrderBook flag', () => {
       const callback = jest.fn();
@@ -3473,7 +3727,8 @@ describe('PerpsStreamManager', () => {
 
     const mockAccountState: AccountState = {
       totalBalance: '10000',
-      availableBalance: '5000',
+      spendableBalance: '5000',
+      withdrawableBalance: '5000',
       unrealizedPnl: '1000',
       marginUsed: '4000',
       returnOnEquity: '0.1',
diff --git a/app/components/UI/Perps/providers/PerpsStreamManager.tsx b/app/components/UI/Perps/providers/PerpsStreamManager.tsx
index 80d2f1b2916..71e8e745fd8 100644
--- a/app/components/UI/Perps/providers/PerpsStreamManager.tsx
+++ b/app/components/UI/Perps/providers/PerpsStreamManager.tsx
@@ -83,8 +83,10 @@ abstract class StreamChannel<T> {
   protected accountAddress: string | null = null;
   // Track WebSocket connection timing for first data measurement
   protected wsConnectionStartTime: number | null = null;
-  // Flag to pause emission during operations (keeps WebSocket alive)
-  protected isPaused = false;
+  // Reference count for pause requests. Emission is blocked whenever > 0,
+  // allowing independent callers (tab visibility, controller operations) to
+  // pause/resume without clobbering each other.
+  protected pauseCount = 0;
   // Retry counter for deferred connect() calls
   protected connectRetryCount = 0;
   // Timer handle for deferConnect so it can be cancelled on disconnect
@@ -92,8 +94,8 @@ abstract class StreamChannel<T> {
   private static readonly MAX_CONNECT_RETRIES = 150; // 30s at 200ms
 
   protected notifySubscribers(updates: T) {
-    // Block emission if paused (WebSocket continues receiving updates)
-    if (this.isPaused) {
+    // Block emission while any pause is held (WebSocket continues receiving updates)
+    if (this.pauseCount > 0) {
       return;
     }
 
@@ -314,15 +316,16 @@ abstract class StreamChannel<T> {
    * Used during batch operations to prevent UI re-renders from stale data
    */
   public pause(): void {
-    this.isPaused = true;
+    this.pauseCount += 1;
   }
 
   /**
-   * Resume emission of updates to subscribers
-   * Subscribers will receive the next update from the WebSocket
+   * Resume emission of updates to subscribers.
+   * Each pause() call must be matched by exactly one resume(). Emission
+   * resumes only when all callers have released their pause.
    */
   public resume(): void {
-    this.isPaused = false;
+    this.pauseCount = Math.max(0, this.pauseCount - 1);
   }
 
   protected getCachedData(): T | null {
@@ -1734,6 +1737,37 @@ export class PerpsStreamManager {
     });
   }
 
+  /**
+   * Pause all stream channels — stops emitting updates to subscribers while
+   * keeping WebSocket subscriptions alive and cache warm. Call when the Perps
+   * UI is not visible to avoid unnecessary processing.
+   */
+  public pauseAllChannels(): void {
+    this.prices.pause();
+    this.orders.pause();
+    this.positions.pause();
+    this.fills.pause();
+    this.account.pause();
+    this.oiCaps.pause();
+    this.topOfBook.pause();
+    this.candles.pause();
+  }
+
+  /**
+   * Resume all stream channels after a pause. Subscribers will receive the
+   * next update pushed by the WebSocket.
+   */
+  public resumeAllChannels(): void {
+    this.prices.resume();
+    this.orders.resume();
+    this.positions.resume();
+    this.fills.resume();
+    this.account.resume();
+    this.oiCaps.resume();
+    this.topOfBook.resume();
+    this.candles.resume();
+  }
+
   /**
    * Force reconnection of all stream channels after WebSocket reconnection
    * Disconnects all channels and reconnects those with active subscribers
diff --git a/app/components/UI/Perps/routes/index.tsx b/app/components/UI/Perps/routes/index.tsx
index c7a322f2ab1..fe3c4f4082f 100644
--- a/app/components/UI/Perps/routes/index.tsx
+++ b/app/components/UI/Perps/routes/index.tsx
@@ -47,7 +47,11 @@ import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
 /* eslint-disable-next-line */
 import { NavigationContext } from '@react-navigation/core';
 import { CONFIRMATION_HEADER_CONFIG } from '../constants/perpsConfig';
-import { clearStackNavigatorOptions } from '../../../../constants/navigation/clearStackNavigatorOptions';
+import {
+  clearNativeStackNavigatorOptions,
+  clearStackNavigatorOptions,
+  transparentModalScreenOptions,
+} from '../../../../constants/navigation/clearStackNavigatorOptions';
 
 const Stack = createNativeStackNavigator<PerpsNavigationParamList>();
 const ModalStack = createStackNavigator();
@@ -73,7 +77,7 @@ function getRedesignedConfirmationsHeaderOptions({
     title: '',
     headerBackVisible: false,
     contentStyle: { backgroundColor: 'transparent' },
-    presentation: 'transparentModal',
+    ...transparentModalScreenOptions,
   };
 }
 
@@ -353,9 +357,9 @@ const PerpsScreenStack = () => {
             name={Routes.PERPS.TPSL}
             component={PerpsTPSLView}
             options={{
+              ...transparentModalScreenOptions,
               title: strings('perps.tpsl.title'),
               headerShown: false,
-              presentation: 'transparentModal',
             }}
           />
 
@@ -411,12 +415,8 @@ const PerpsScreenStack = () => {
             name={Routes.PERPS.MODALS.CLOSE_POSITION_MODALS}
             component={PerpsClosePositionBottomSheetStack}
             options={{
-              headerShown: false,
-              contentStyle: {
-                backgroundColor: 'transparent',
-              },
-              animation: 'none',
-              presentation: 'transparentModal',
+              ...clearNativeStackNavigatorOptions,
+              ...transparentModalScreenOptions,
             }}
           />
 
@@ -425,12 +425,8 @@ const PerpsScreenStack = () => {
             name={Routes.PERPS.MODALS.ROOT}
             component={PerpsModalStack}
             options={{
-              headerShown: false,
-              contentStyle: {
-                backgroundColor: 'transparent',
-              },
-              animation: 'none',
-              presentation: 'transparentModal',
+              ...clearNativeStackNavigatorOptions,
+              ...transparentModalScreenOptions,
             }}
           />
 
@@ -442,7 +438,7 @@ const PerpsScreenStack = () => {
             component={PayWithModal}
             options={{
               headerShown: false,
-              presentation: 'transparentModal',
+              ...transparentModalScreenOptions,
             }}
           />
 
diff --git a/app/components/UI/Perps/selectors/perpsController/index.test.ts b/app/components/UI/Perps/selectors/perpsController/index.test.ts
index 2661bfebad4..c28adccaedb 100644
--- a/app/components/UI/Perps/selectors/perpsController/index.test.ts
+++ b/app/components/UI/Perps/selectors/perpsController/index.test.ts
@@ -93,7 +93,8 @@ describe('PerpsController Selectors', () => {
     it('returns account state from PerpsController', () => {
       // Arrange
       const mockAccountState: AccountState = {
-        availableBalance: '3000',
+        spendableBalance: '3000',
+        withdrawableBalance: '3000',
         marginUsed: '1000',
         unrealizedPnl: '50',
         returnOnEquity: '10.0',
@@ -138,7 +139,8 @@ describe('PerpsController Selectors', () => {
     it('handles zero balance account state', () => {
       // Arrange
       const mockAccountState: AccountState = {
-        availableBalance: '0',
+        spendableBalance: '0',
+        withdrawableBalance: '0',
         marginUsed: '0',
         unrealizedPnl: '0',
         returnOnEquity: '0',
@@ -154,14 +156,15 @@ describe('PerpsController Selectors', () => {
 
       // Assert
       expect(result).toEqual(mockAccountState);
-      expect(result?.availableBalance).toBe('0');
+      expect(result?.spendableBalance).toBe('0');
       expect(result?.totalBalance).toBe('0');
     });
 
     it('handles account with positive PnL', () => {
       // Arrange
       const positivePnlState: AccountState = {
-        availableBalance: '5000',
+        spendableBalance: '5000',
+        withdrawableBalance: '5000',
         marginUsed: '1000',
         unrealizedPnl: '500',
         returnOnEquity: '100.0',
@@ -183,7 +186,8 @@ describe('PerpsController Selectors', () => {
     it('handles account with negative PnL', () => {
       // Arrange
       const negativePnlState: AccountState = {
-        availableBalance: '3000',
+        spendableBalance: '3000',
+        withdrawableBalance: '3000',
         marginUsed: '2000',
         unrealizedPnl: '-500',
         returnOnEquity: '-25.0',
@@ -540,7 +544,8 @@ describe('PerpsController Selectors', () => {
       const mockState = createMockState({
         activeProvider: 'testProvider',
         accountState: {
-          availableBalance: '1000',
+          spendableBalance: '1000',
+          withdrawableBalance: '1000',
           totalBalance: '1000',
           marginUsed: '0',
           unrealizedPnl: '0',
@@ -582,7 +587,8 @@ describe('PerpsController Selectors', () => {
       const complexState = createMockState({
         activeProvider: 'nestedProvider',
         accountState: {
-          availableBalance: '5000',
+          spendableBalance: '5000',
+          withdrawableBalance: '5000',
           totalBalance: '6000',
           marginUsed: '1000',
           unrealizedPnl: '100',
@@ -609,7 +615,8 @@ describe('PerpsController Selectors', () => {
       // Then - they extract only the relevant data
       expect(provider).toBe('nestedProvider');
       expect(account).toEqual({
-        availableBalance: '5000',
+        spendableBalance: '5000',
+        withdrawableBalance: '5000',
         totalBalance: '6000',
         marginUsed: '1000',
         unrealizedPnl: '100',
diff --git a/app/components/UI/Perps/types/navigation.ts b/app/components/UI/Perps/types/navigation.ts
index c8c98c56985..58ee90e2599 100644
--- a/app/components/UI/Perps/types/navigation.ts
+++ b/app/components/UI/Perps/types/navigation.ts
@@ -5,6 +5,7 @@ import {
   type OrderType,
   type PerpsMarketData,
   type TPSLTrackingData,
+  type SortOptionId,
 } from '@metamask/perps-controller';
 import { PerpsTransaction } from './transactionHistory';
 import type { DataMonitorParams } from '../hooks/usePerpsDataMonitor';
@@ -90,6 +91,7 @@ export interface PerpsNavigationParamList extends ParamListBase {
       | 'commodities'
       | 'forex'
       | 'new';
+    defaultSortOptionId?: SortOptionId;
     fromHome?: boolean;
     button_clicked?: string;
     button_location?: string;
diff --git a/app/components/UI/Perps/utils/e2eBridgePerps.deeplink.test.ts b/app/components/UI/Perps/utils/e2eBridgePerps.deeplink.test.ts
index b7053d990cf..b8064f20ffc 100644
--- a/app/components/UI/Perps/utils/e2eBridgePerps.deeplink.test.ts
+++ b/app/components/UI/Perps/utils/e2eBridgePerps.deeplink.test.ts
@@ -33,7 +33,7 @@ jest.mock(
     PerpsE2EMockService: {
       getInstance: () => ({
         reset: jest.fn(),
-        getMockAccountState: () => ({ availableBalance: '10000.00' }),
+        getMockAccountState: () => ({ spendableBalance: '10000.00' }),
         getMockPositions: () => [],
         getMockMarkets: () => [],
         mockPushPrice,
diff --git a/app/components/UI/Perps/utils/e2eBridgePerps.liquidation.test.ts b/app/components/UI/Perps/utils/e2eBridgePerps.liquidation.test.ts
index 6a18ecab7f3..048fd4fc558 100644
--- a/app/components/UI/Perps/utils/e2eBridgePerps.liquidation.test.ts
+++ b/app/components/UI/Perps/utils/e2eBridgePerps.liquidation.test.ts
@@ -12,7 +12,8 @@ jest.mock('react-native', () => {
 const mockGetInstance = () => ({
   reset: jest.fn(),
   getMockAccountState: () => ({
-    availableBalance: '8000.00',
+    spendableBalance: '8000.00',
+    withdrawableBalance: '8000.00',
     marginUsed: '2000.00',
     unrealizedPnl: '0.00',
     returnOnEquity: '0',
diff --git a/app/components/UI/Perps/utils/e2eBridgePerps.test.ts b/app/components/UI/Perps/utils/e2eBridgePerps.test.ts
index a2ee4ce08e5..2fcb2b94833 100644
--- a/app/components/UI/Perps/utils/e2eBridgePerps.test.ts
+++ b/app/components/UI/Perps/utils/e2eBridgePerps.test.ts
@@ -41,12 +41,13 @@ describe('e2eBridgePerps (no UI)', () => {
 
     const account = await (
       controller.getAccountState as () => Promise<{
-        availableBalance: string;
+        spendableBalance: string;
+        withdrawableBalance: string;
       }>
     )();
 
     expect(account).toBeTruthy();
-    expect(account.availableBalance).toBeDefined();
+    expect(account.spendableBalance).toBeDefined();
   });
 
   it('exposes a mock stream manager in E2E', () => {
@@ -124,7 +125,7 @@ describe('e2eBridgePerps - isE2E switch', () => {
     const mockReset = jest.fn();
     const mockService = {
       reset: mockReset,
-      getMockAccountState: () => ({ availableBalance: '1000' }),
+      getMockAccountState: () => ({ spendableBalance: '1000' }),
       getMockPositions: () => [],
       getMockMarkets: () => [],
     };
diff --git a/app/components/UI/Perps/utils/e2eBridgePerps.ts b/app/components/UI/Perps/utils/e2eBridgePerps.ts
index dad574ad35d..6522ea8fd93 100644
--- a/app/components/UI/Perps/utils/e2eBridgePerps.ts
+++ b/app/components/UI/Perps/utils/e2eBridgePerps.ts
@@ -195,7 +195,7 @@ function autoConfigureE2EBridge(): void {
 
     DevLogger.log('E2E Bridge auto-configured successfully');
     DevLogger.log('Mock state:', {
-      accountBalance: mockService.getMockAccountState().availableBalance,
+      accountBalance: mockService.getMockAccountState().spendableBalance,
       positionsCount: mockService.getMockPositions().length,
       marketsCount: mockService.getMockMarkets().length,
     });
diff --git a/app/components/UI/Perps/utils/hyperLiquidAdapter.test.ts b/app/components/UI/Perps/utils/hyperLiquidAdapter.test.ts
index 404b386961c..9a704cddcc9 100644
--- a/app/components/UI/Perps/utils/hyperLiquidAdapter.test.ts
+++ b/app/components/UI/Perps/utils/hyperLiquidAdapter.test.ts
@@ -1074,8 +1074,8 @@ describe('hyperLiquidAdapter', () => {
       const result = adaptAccountStateFromSDK(perpsState);
 
       expect(result).toEqual({
-        availableBalance: '700.25',
-        availableToTradeBalance: '700.25', // withdrawable + free spot (no spot provided)
+        spendableBalance: '700.25',
+        withdrawableBalance: '700.25',
         marginUsed: '300.25',
         unrealizedPnl: '24.5', // 50.0 + (-25.5)
         returnOnEquity: '7.991673605328893', // Calculated from weighted return and margin
diff --git a/app/components/UI/Perps/utils/orderCalculations.test.ts b/app/components/UI/Perps/utils/orderCalculations.test.ts
index fcec7b02062..47afe5d14ac 100644
--- a/app/components/UI/Perps/utils/orderCalculations.test.ts
+++ b/app/components/UI/Perps/utils/orderCalculations.test.ts
@@ -260,7 +260,7 @@ describe('orderCalculations', () => {
     it('should return 0 when available balance is 0', () => {
       // Arrange
       const params = {
-        availableBalance: 0,
+        spendableBalance: 0,
         assetPrice: 50000,
         assetSzDecimals: 6,
         leverage: 10,
@@ -276,7 +276,7 @@ describe('orderCalculations', () => {
     it('should return 0 when asset price is invalid', () => {
       // Arrange
       const params = {
-        availableBalance: 1000,
+        spendableBalance: 1000,
         assetPrice: 0,
         assetSzDecimals: 6,
         leverage: 10,
@@ -292,7 +292,7 @@ describe('orderCalculations', () => {
     it('should return 0 when szDecimals is undefined', () => {
       // Arrange
       const params = {
-        availableBalance: 1000,
+        spendableBalance: 1000,
         assetPrice: 50000,
         assetSzDecimals: undefined as unknown as number,
         leverage: 10,
@@ -308,7 +308,7 @@ describe('orderCalculations', () => {
     it('should calculate max allowed amount with leverage', () => {
       // Arrange
       const params = {
-        availableBalance: 100,
+        spendableBalance: 100,
         assetPrice: 50000,
         assetSzDecimals: 6,
         leverage: 10,
@@ -325,7 +325,7 @@ describe('orderCalculations', () => {
     it('should handle high leverage scenarios', () => {
       // Arrange
       const params = {
-        availableBalance: 50,
+        spendableBalance: 50,
         assetPrice: 30000,
         assetSzDecimals: 4,
         leverage: 100,
@@ -342,7 +342,7 @@ describe('orderCalculations', () => {
     it('should account for position size rounding', () => {
       // Arrange
       const params = {
-        availableBalance: 10,
+        spendableBalance: 10,
         assetPrice: 50000,
         assetSzDecimals: 6,
         leverage: 5,
@@ -359,7 +359,7 @@ describe('orderCalculations', () => {
     it('should apply margin buffer so result is below theoretical max', () => {
       // Arrange - case where theoretical max is 1000 (100 * 10)
       const params = {
-        availableBalance: 100,
+        spendableBalance: 100,
         assetPrice: 50000,
         assetSzDecimals: 6,
         leverage: 10,
@@ -367,7 +367,7 @@ describe('orderCalculations', () => {
 
       // Act
       const result = getMaxAllowedAmount(params);
-      const theoreticalMax = params.availableBalance * params.leverage;
+      const theoreticalMax = params.spendableBalance * params.leverage;
 
       // Assert - buffer (0.5%) reduces max to avoid "Insufficient margin" rejections
       expect(result).toBeGreaterThan(0);
diff --git a/app/components/UI/PhishingModal/PhishingModal.testIds.ts b/app/components/UI/PhishingModal/PhishingModal.testIds.ts
new file mode 100644
index 00000000000..3346e5bb952
--- /dev/null
+++ b/app/components/UI/PhishingModal/PhishingModal.testIds.ts
@@ -0,0 +1,3 @@
+export const PhishingModalSelectorsIDs = {
+  DETECTION_TITLE: 'ethereum-detection-title',
+};
diff --git a/app/components/UI/PhishingModal/index.js b/app/components/UI/PhishingModal/index.js
index 9cf64191756..0e44773a893 100644
--- a/app/components/UI/PhishingModal/index.js
+++ b/app/components/UI/PhishingModal/index.js
@@ -3,7 +3,6 @@ import {
   View,
   Text,
   StyleSheet,
-  Platform,
   Linking,
   TouchableOpacity,
 } from 'react-native';
@@ -13,8 +12,7 @@ import { fontStyles } from '../../../styles/common';
 import { strings } from '../../../../locales/i18n';
 import URL from 'url-parse';
 import { ThemeContext, mockTheme } from '../../../util/theme';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import { ETHEREUM_DETECTION_TITLE } from '../../../../wdio/screen-objects/testIDs/BrowserScreen/ExternalWebsites.testIds';
+import { PhishingModalSelectorsIDs } from './PhishingModal.testIds';
 import Button from '../../../component-library/components/Buttons/Button/Button';
 import {
   ButtonVariants,
@@ -146,7 +144,7 @@ export default class PhishingModal extends PureComponent {
         </View>
         <Text
           style={styles.phishingModalTitle}
-          {...generateTestId(Platform, ETHEREUM_DETECTION_TITLE)}
+          testID={PhishingModalSelectorsIDs.DETECTION_TITLE}
         >
           {strings('phishing.site_might_be_harmful')}
         </Text>
diff --git a/app/components/UI/Predict/Predict.testIds.ts b/app/components/UI/Predict/Predict.testIds.ts
index ff8380c7136..e5c2cef25b3 100644
--- a/app/components/UI/Predict/Predict.testIds.ts
+++ b/app/components/UI/Predict/Predict.testIds.ts
@@ -31,6 +31,7 @@ export const PredictMarketListSelectorsIDs = {
   CRYPTO_TAB: 'predict-market-list-crypto-tab',
   POLITICS_TAB: 'predict-market-list-politics-tab',
   BACK_BUTTON: 'back-button',
+  TRENDING_MARKET_CARD: 'predict-market-list-trending-card-',
   // Empty state
   EMPTY_STATE: 'predict-market-list-empty-state',
 } as const;
diff --git a/app/components/UI/Predict/components/PredictActivity/PredictActivity.tsx b/app/components/UI/Predict/components/PredictActivity/PredictActivity.tsx
index 7ef643e9f59..2c85e7bb433 100644
--- a/app/components/UI/Predict/components/PredictActivity/PredictActivity.tsx
+++ b/app/components/UI/Predict/components/PredictActivity/PredictActivity.tsx
@@ -3,9 +3,6 @@ import { TouchableOpacity } from 'react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import {
   Box,
-  BoxAlignItems,
-  BoxFlexDirection,
-  BoxJustifyContent,
   Icon,
   IconName,
   Text,
@@ -76,46 +73,40 @@ const PredictActivity: React.FC<PredictActivityProps> = ({ item }) => {
   };
 
   return (
-    <TouchableOpacity onPress={handlePress}>
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Start}
-        justifyContent={BoxJustifyContent.Between}
-        twClassName="w-full p-2"
-      >
-        <Box twClassName="pt-1">
-          <Box twClassName="h-10 w-10 items-center justify-center rounded-full bg-muted mr-3 overflow-hidden">
-            {item.icon ? (
-              <Image
-                source={{ uri: item.icon }}
-                style={tw.style('w-full h-full')}
-                accessibilityLabel="activity icon"
-              />
-            ) : (
-              <Icon name={IconName.Activity} />
-            )}
-          </Box>
-        </Box>
+    <TouchableOpacity
+      onPress={handlePress}
+      style={tw.style('flex-row items-start justify-between w-full p-2')}
+    >
+      <Box twClassName="h-10 w-10 items-center justify-center rounded-full bg-muted mr-3 overflow-hidden mt-1">
+        {item.icon ? (
+          <Image
+            source={{ uri: item.icon }}
+            style={tw.style('w-full h-full')}
+            accessibilityLabel="activity icon"
+          />
+        ) : (
+          <Icon name={IconName.Activity} />
+        )}
+      </Box>
 
-        <Box twClassName="flex-1">
-          <Text variant={TextVariant.BodyMd} numberOfLines={1}>
-            {activityTitleByType[item.type]}
-          </Text>
-          <Text variant={TextVariant.BodySm} twClassName="text-alternative">
-            {item.marketTitle}
-          </Text>
-        </Box>
+      <Box twClassName="flex-1">
+        <Text variant={TextVariant.BodyMd} numberOfLines={1}>
+          {activityTitleByType[item.type]}
+        </Text>
+        <Text variant={TextVariant.BodySm} twClassName="text-alternative">
+          {item.marketTitle}
+        </Text>
+      </Box>
 
-        <Box twClassName="items-end ml-3">
-          <Text variant={TextVariant.BodyMd} twClassName="text-alternative">
-            {signedAmount}
+      <Box twClassName="items-end ml-3">
+        <Text variant={TextVariant.BodyMd} twClassName="text-alternative">
+          {signedAmount}
+        </Text>
+        {item.percentChange !== undefined ? (
+          <Text variant={TextVariant.BodySm} twClassName={percentColor}>
+            {formatPercentage(item.percentChange)}
           </Text>
-          {item.percentChange !== undefined ? (
-            <Text variant={TextVariant.BodySm} twClassName={percentColor}>
-              {formatPercentage(item.percentChange)}
-            </Text>
-          ) : null}
-        </Box>
+        ) : null}
       </Box>
     </TouchableOpacity>
   );
diff --git a/app/components/UI/Predict/components/PredictActivityDetail/PredictActivityDetail.tsx b/app/components/UI/Predict/components/PredictActivityDetail/PredictActivityDetail.tsx
index f1cb601ad68..e6e4e92df44 100644
--- a/app/components/UI/Predict/components/PredictActivityDetail/PredictActivityDetail.tsx
+++ b/app/components/UI/Predict/components/PredictActivityDetail/PredictActivityDetail.tsx
@@ -27,9 +27,9 @@ import {
   BoxFlexDirection,
   BoxAlignItems,
   BoxJustifyContent,
+  HeaderStandard,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import UsdcIcon from './usdc.svg';
 import { PredictActivityDetailsSelectorsIDs } from '../../Predict.testIds';
 interface PredictActivityDetailProps {}
@@ -413,7 +413,7 @@ const PredictActivityDetails: React.FC<PredictActivityDetailProps> = () => {
       testID={PredictActivityDetailsSelectorsIDs.CONTAINER}
     >
       <Box twClassName="flex-1">
-        <HeaderCompactStandard
+        <HeaderStandard
           title={
             activityDetails?.headerTitle ??
             strings('predict.transactions.activity_details')
diff --git a/app/components/UI/Predict/components/PredictDetailsChart/PredictDetailsChart.tsx b/app/components/UI/Predict/components/PredictDetailsChart/PredictDetailsChart.tsx
index 994c342406b..902eda34bf9 100644
--- a/app/components/UI/Predict/components/PredictDetailsChart/PredictDetailsChart.tsx
+++ b/app/components/UI/Predict/components/PredictDetailsChart/PredictDetailsChart.tsx
@@ -457,11 +457,6 @@ const PredictDetailsChart: React.FC<PredictDetailsChartProps> = ({
               )}
             </Box>
           </Box>
-          <Box
-            flexDirection={BoxFlexDirection.Row}
-            justifyContent={BoxJustifyContent.Between}
-            twClassName="px-4 pt-4 pb-0 min-h-[31px]"
-          />
         </Box>
       );
     }
@@ -586,14 +581,14 @@ const PredictDetailsChart: React.FC<PredictDetailsChartProps> = ({
   };
 
   return (
-    <Box>
+    <>
       {renderGraph()}
       <TimeframeSelector
         timeframes={timeframes}
         selectedTimeframe={selectedTimeframe}
         onTimeframeChange={onTimeframeChange}
       />
-    </Box>
+    </>
   );
 };
 
diff --git a/app/components/UI/Predict/components/PredictDetailsChart/components/TimeframeSelector.tsx b/app/components/UI/Predict/components/PredictDetailsChart/components/TimeframeSelector.tsx
index d88bbfd54bb..3677d955221 100644
--- a/app/components/UI/Predict/components/PredictDetailsChart/components/TimeframeSelector.tsx
+++ b/app/components/UI/Predict/components/PredictDetailsChart/components/TimeframeSelector.tsx
@@ -5,7 +5,6 @@ import {
   Box,
   BoxFlexDirection,
   BoxAlignItems,
-  BoxJustifyContent,
 } from '@metamask/design-system-react-native';
 import Text, {
   TextColor,
@@ -29,39 +28,33 @@ const TimeframeSelector: React.FC<TimeframeSelectorProps> = ({
     <Box
       flexDirection={BoxFlexDirection.Row}
       alignItems={BoxAlignItems.Center}
-      justifyContent={BoxJustifyContent.Between}
+      twClassName="gap-1"
     >
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Center}
-        twClassName="gap-1"
-      >
-        {timeframes.map((timeframe) => (
-          <Pressable
-            key={timeframe}
-            onPress={() => onTimeframeChange(timeframe)}
-            style={({ pressed }) =>
-              tw.style(
-                'flex-1 py-2 rounded-lg',
-                selectedTimeframe === timeframe ? 'bg-muted' : 'bg-default',
-                pressed && 'bg-pressed',
-              )
+      {timeframes.map((timeframe) => (
+        <Pressable
+          key={timeframe}
+          onPress={() => onTimeframeChange(timeframe)}
+          style={({ pressed }) =>
+            tw.style(
+              'flex-1 py-2 rounded-lg',
+              selectedTimeframe === timeframe ? 'bg-muted' : 'bg-default',
+              pressed && 'bg-pressed',
+            )
+          }
+        >
+          <Text
+            variant={TextVariant.BodySM}
+            color={
+              selectedTimeframe === timeframe
+                ? TextColor.Default
+                : TextColor.Alternative
             }
+            style={tw.style('text-center')}
           >
-            <Text
-              variant={TextVariant.BodySM}
-              color={
-                selectedTimeframe === timeframe
-                  ? TextColor.Default
-                  : TextColor.Alternative
-              }
-              style={tw.style('text-center')}
-            >
-              {timeframe.toUpperCase()}
-            </Text>
-          </Pressable>
-        ))}
-      </Box>
+            {timeframe.toUpperCase()}
+          </Text>
+        </Pressable>
+      ))}
     </Box>
   );
 };
diff --git a/app/components/UI/Predict/components/PredictGameDetailsContent/PredictGameDetailsContent.tsx b/app/components/UI/Predict/components/PredictGameDetailsContent/PredictGameDetailsContent.tsx
index 1fef385dea2..7dcc0b4c590 100644
--- a/app/components/UI/Predict/components/PredictGameDetailsContent/PredictGameDetailsContent.tsx
+++ b/app/components/UI/Predict/components/PredictGameDetailsContent/PredictGameDetailsContent.tsx
@@ -80,6 +80,7 @@ const PredictGameDetailsContent: React.FC<PredictGameDetailsContentProps> = ({
     marketId: market.id,
     childMarketIds: market.childMarketIds,
     claimable: false,
+    livePriceUpdates: true,
   });
   const { data: claimablePositions = [] } = usePredictPositions({
     marketId: market.id,
diff --git a/app/components/UI/Predict/components/PredictHome/PredictHomeFeaturedCarousel.test.tsx b/app/components/UI/Predict/components/PredictHome/PredictHomeFeaturedCarousel.test.tsx
index 530e0b3a004..6f5cf17cdc9 100644
--- a/app/components/UI/Predict/components/PredictHome/PredictHomeFeaturedCarousel.test.tsx
+++ b/app/components/UI/Predict/components/PredictHome/PredictHomeFeaturedCarousel.test.tsx
@@ -36,6 +36,7 @@ jest.mock('@metamask/design-system-react-native', () => {
     ),
     BoxFlexDirection: { Row: 'row' },
     BoxAlignItems: { Center: 'center' },
+    BoxBorderColor: { BorderDefault: 'border-default' },
     Text: ({
       children,
       testID,
@@ -70,28 +71,77 @@ jest.mock('@metamask/design-system-react-native', () => {
   };
 });
 
-const mockSectionFn = jest.fn();
+const mockUsePredictionsFeed = jest.fn();
 jest.mock(
-  '../../../../Views/TrendingView/components/Sections/Section',
-  () =>
-    function MockSection(props: { sectionId: string }) {
-      mockSectionFn(props);
+  '../../../../Views/TrendingView/feeds/predictions/usePredictionsFeed',
+  () => ({
+    usePredictionsFeed: (...args: unknown[]) => mockUsePredictionsFeed(...args),
+  }),
+);
+jest.mock(
+  '../../../../Views/TrendingView/feeds/predictions/PredictionRowItem',
+  () => ({
+    PredictionCarouselRowItem: ({
+      market,
+    }: {
+      market: { id: string; title: string };
+    }) => {
       const ReactNative = jest.requireActual('react-native');
       return (
-        <ReactNative.View testID="mock-section">
-          <ReactNative.Text>Section: {props.sectionId}</ReactNative.Text>
+        <ReactNative.View testID={`prediction-row-${market.id}`}>
+          <ReactNative.Text>{market.title}</ReactNative.Text>
         </ReactNative.View>
       );
     },
+  }),
 );
-
-jest.mock('../../../../Views/TrendingView/sections.config', () => ({
-  SECTIONS_CONFIG: {
-    predictions: {
-      id: 'predictions',
+jest.mock(
+  '../../../../Views/TrendingView/feeds/predictions/PredictionsSkeleton',
+  () => ({
+    __esModule: true,
+    default: () => {
+      const ReactNative = jest.requireActual('react-native');
+      return <ReactNative.View testID="predictions-skeleton" />;
     },
+  }),
+);
+
+jest.mock(
+  '../../../../Views/TrendingView/components/HorizontalCarousel',
+  () => {
+    const ReactNative = jest.requireActual('react-native');
+    return {
+      __esModule: true,
+      default: ({
+        data,
+        isLoading,
+        renderItem,
+        Skeleton,
+      }: {
+        data: { id: string }[];
+        isLoading: boolean;
+        renderItem: (info: {
+          item: { id: string };
+          index: number;
+          target: 'Cell';
+        }) => React.ReactNode;
+        Skeleton: React.ComponentType;
+      }) => (
+        <ReactNative.View testID="mock-horizontal-carousel">
+          {isLoading ? (
+            <Skeleton />
+          ) : (
+            data.map((item, index) => (
+              <ReactNative.View key={item.id}>
+                {renderItem({ item, index, target: 'Cell' })}
+              </ReactNative.View>
+            ))
+          )}
+        </ReactNative.View>
+      ),
+    };
   },
-}));
+);
 
 jest.mock('../../../../../../locales/i18n', () => ({
   strings: (key: string) => {
@@ -131,6 +181,14 @@ describe('PredictHomeFeaturedCarousel', () => {
     mockUseNavigation.mockReturnValue(
       mockNavigation as unknown as ReturnType<typeof useNavigation>,
     );
+    mockUsePredictionsFeed.mockReturnValue({
+      data: [
+        { id: 'm1', title: 'Market 1' },
+        { id: 'm2', title: 'Market 2' },
+      ],
+      isLoading: false,
+      refetch: jest.fn(),
+    });
   });
 
   afterEach(() => {
@@ -152,11 +210,24 @@ describe('PredictHomeFeaturedCarousel', () => {
       expect(screen.getByText('Trending')).toBeOnTheScreen();
     });
 
-    it('renders Section component with predictions sectionId', () => {
+    it('renders the horizontal carousel with predictions data', () => {
+      render(<PredictHomeFeaturedCarousel />);
+
+      expect(screen.getByTestId('mock-horizontal-carousel')).toBeOnTheScreen();
+      expect(screen.getByTestId('prediction-row-m1')).toBeOnTheScreen();
+      expect(screen.getByTestId('prediction-row-m2')).toBeOnTheScreen();
+    });
+
+    it('shows skeleton while loading', () => {
+      mockUsePredictionsFeed.mockReturnValue({
+        data: [],
+        isLoading: true,
+        refetch: jest.fn(),
+      });
+
       render(<PredictHomeFeaturedCarousel />);
 
-      expect(screen.getByTestId('mock-section')).toBeOnTheScreen();
-      expect(screen.getByText('Section: predictions')).toBeOnTheScreen();
+      expect(screen.getByTestId('predictions-skeleton')).toBeOnTheScreen();
     });
 
     it('renders header with correct testID', () => {
@@ -196,17 +267,12 @@ describe('PredictHomeFeaturedCarousel', () => {
     });
   });
 
-  describe('Section integration', () => {
-    it('passes correct props to Section component', () => {
+  describe('feed integration', () => {
+    it('subscribes to the trending predictions feed', () => {
       render(<PredictHomeFeaturedCarousel />);
 
-      expect(mockSectionFn).toHaveBeenCalledWith(
-        expect.objectContaining({
-          sectionId: 'predictions',
-          refreshConfig: { trigger: 0, silentRefresh: true },
-          toggleSectionEmptyState: expect.any(Function),
-          toggleSectionLoadingState: expect.any(Function),
-        }),
+      expect(mockUsePredictionsFeed).toHaveBeenCalledWith(
+        expect.objectContaining({ variant: 'trending' }),
       );
     });
   });
diff --git a/app/components/UI/Predict/components/PredictHome/PredictHomeFeaturedCarousel.tsx b/app/components/UI/Predict/components/PredictHome/PredictHomeFeaturedCarousel.tsx
index 291ee5e029d..0902021b559 100644
--- a/app/components/UI/Predict/components/PredictHome/PredictHomeFeaturedCarousel.tsx
+++ b/app/components/UI/Predict/components/PredictHome/PredictHomeFeaturedCarousel.tsx
@@ -14,8 +14,12 @@ import {
   TextColor,
   TextVariant,
 } from '@metamask/design-system-react-native';
-import Section from '../../../../Views/TrendingView/components/Sections/Section';
-import { SECTIONS_CONFIG } from '../../../../Views/TrendingView/sections.config';
+import type { ListRenderItem } from '@shopify/flash-list';
+import HorizontalCarousel from '../../../../Views/TrendingView/components/HorizontalCarousel';
+import { usePredictionsFeed } from '../../../../Views/TrendingView/feeds/predictions/usePredictionsFeed';
+import { PredictionCarouselRowItem } from '../../../../Views/TrendingView/feeds/predictions/PredictionRowItem';
+import PredictionsSkeleton from '../../../../Views/TrendingView/feeds/predictions/PredictionsSkeleton';
+import type { PredictMarket as PredictMarketType } from '../../types';
 import { strings } from '../../../../../../locales/i18n';
 import Routes from '../../../../../constants/navigation/Routes';
 import { PredictEventValues } from '../../constants/eventNames';
@@ -31,15 +35,7 @@ const PredictHomeFeaturedCarousel: React.FC<
 > = ({ testID = PREDICT_HOME_FEATURED_CAROUSEL_TEST_IDS.CAROUSEL }) => {
   const tw = useTailwind();
   const navigation = useNavigation();
-  const section = SECTIONS_CONFIG.predictions;
-
-  const handleToggleEmptyState = useCallback((_isEmpty: boolean) => {
-    // TODO: Toggle empty state
-  }, []);
-
-  const handleToggleLoadingState = useCallback((_isLoading: boolean) => {
-    // TODO: Toggle loading state
-  }, []);
+  const predictions = usePredictionsFeed({ variant: 'trending' });
 
   const handleHeaderPress = useCallback(() => {
     navigation.navigate(Routes.PREDICT.ROOT, {
@@ -50,6 +46,16 @@ const PredictHomeFeaturedCarousel: React.FC<
     });
   }, [navigation]);
 
+  const renderItem: ListRenderItem<PredictMarketType> = useCallback(
+    ({ item }) => (
+      <PredictionCarouselRowItem
+        market={item}
+        testIdPrefix="predict-market-row-item"
+      />
+    ),
+    [],
+  );
+
   return (
     <Box testID={testID}>
       <TouchableOpacity
@@ -75,11 +81,12 @@ const PredictHomeFeaturedCarousel: React.FC<
       <PredictEntryPointProvider
         entryPoint={PredictEventValues.ENTRY_POINT.HOMEPAGE_FEATURED_CAROUSEL}
       >
-        <Section
-          sectionId={section.id}
-          refreshConfig={{ trigger: 0, silentRefresh: true }}
-          toggleSectionEmptyState={handleToggleEmptyState}
-          toggleSectionLoadingState={handleToggleLoadingState}
+        <HorizontalCarousel<PredictMarketType>
+          data={predictions.data}
+          isLoading={predictions.isLoading}
+          renderItem={renderItem}
+          Skeleton={PredictionsSkeleton}
+          idPrefix="predict-home-featured"
         />
       </PredictEntryPointProvider>
     </Box>
diff --git a/app/components/UI/Predict/components/PredictHome/PredictHomePositions.tsx b/app/components/UI/Predict/components/PredictHome/PredictHomePositions.tsx
index 5753c9818ec..9a2c259a40e 100644
--- a/app/components/UI/Predict/components/PredictHome/PredictHomePositions.tsx
+++ b/app/components/UI/Predict/components/PredictHome/PredictHomePositions.tsx
@@ -42,7 +42,7 @@ const PredictHomePositions = forwardRef<
     refetch,
     isLoading: isActiveLoading,
     error: activeError,
-  } = usePredictPositions({ claimable: false });
+  } = usePredictPositions({ claimable: false, livePriceUpdates: true });
 
   const {
     data: claimablePositions = [],
diff --git a/app/components/UI/Predict/components/PredictMarket/PredictMarket.tsx b/app/components/UI/Predict/components/PredictMarket/PredictMarket.tsx
index f14340b2839..b81fc740555 100644
--- a/app/components/UI/Predict/components/PredictMarket/PredictMarket.tsx
+++ b/app/components/UI/Predict/components/PredictMarket/PredictMarket.tsx
@@ -12,6 +12,10 @@ interface PredictMarketProps {
   testID?: string;
   entryPoint?: PredictEntryPoint;
   isCarousel?: boolean;
+  /** Called synchronously before the card's navigation press fires. */
+  onCardPress?: () => void;
+  /** Called when the user taps a buy button (before betslip opens). */
+  onBuyButtonPress?: (marketId: string) => void;
 }
 
 const PredictMarket: React.FC<PredictMarketProps> = ({
@@ -19,6 +23,8 @@ const PredictMarket: React.FC<PredictMarketProps> = ({
   testID,
   entryPoint: propEntryPoint,
   isCarousel = false,
+  onCardPress,
+  onBuyButtonPress,
 }) => {
   const contextEntryPoint = usePredictEntryPoint();
   const entryPoint =
@@ -32,6 +38,8 @@ const PredictMarket: React.FC<PredictMarketProps> = ({
         testID={testID}
         entryPoint={entryPoint}
         isCarousel={isCarousel}
+        onCardPress={onCardPress}
+        onBuyButtonPress={onBuyButtonPress}
       />
     );
   }
@@ -43,6 +51,8 @@ const PredictMarket: React.FC<PredictMarketProps> = ({
         testID={testID}
         entryPoint={entryPoint}
         isCarousel={isCarousel}
+        onCardPress={onCardPress}
+        onBuyButtonPress={onBuyButtonPress}
       />
     );
   }
@@ -53,6 +63,8 @@ const PredictMarket: React.FC<PredictMarketProps> = ({
       testID={testID}
       entryPoint={entryPoint}
       isCarousel={isCarousel}
+      onCardPress={onCardPress}
+      onBuyButtonPress={onBuyButtonPress}
     />
   );
 };
diff --git a/app/components/UI/Predict/components/PredictMarketMultiple/PredictMarketMultiple.tsx b/app/components/UI/Predict/components/PredictMarketMultiple/PredictMarketMultiple.tsx
index 6e29aa63367..3dab46dbe3b 100644
--- a/app/components/UI/Predict/components/PredictMarketMultiple/PredictMarketMultiple.tsx
+++ b/app/components/UI/Predict/components/PredictMarketMultiple/PredictMarketMultiple.tsx
@@ -50,6 +50,10 @@ interface PredictMarketMultipleProps {
   testID?: string;
   entryPoint?: PredictEntryPoint;
   isCarousel?: boolean;
+  /** Called synchronously before the card's navigation press fires. */
+  onCardPress?: () => void;
+  /** Called when the user taps a buy button (before betslip opens). */
+  onBuyButtonPress?: (marketId: string) => void;
 }
 
 const PredictMarketMultiple: React.FC<PredictMarketMultipleProps> = ({
@@ -57,6 +61,8 @@ const PredictMarketMultiple: React.FC<PredictMarketMultipleProps> = ({
   testID,
   entryPoint: propEntryPoint,
   isCarousel = false,
+  onCardPress,
+  onBuyButtonPress,
 }) => {
   const contextEntryPoint = usePredictEntryPoint();
   const baseEntryPoint =
@@ -137,6 +143,7 @@ const PredictMarketMultiple: React.FC<PredictMarketMultipleProps> = ({
     outcome: PredictOutcome,
     outcomeToken: PredictOutcomeToken,
   ) => {
+    onBuyButtonPress?.(market.id);
     executeGuardedAction(
       () => {
         openBuySheet({
@@ -161,6 +168,7 @@ const PredictMarketMultiple: React.FC<PredictMarketMultipleProps> = ({
     <TouchableOpacity
       testID={testID}
       onPress={() => {
+        onCardPress?.();
         navigation.navigate(Routes.PREDICT.ROOT, {
           screen: Routes.PREDICT.MARKET_DETAILS,
           params: {
diff --git a/app/components/UI/Predict/components/PredictMarketOutcome/PredictMarketOutcome.styles.ts b/app/components/UI/Predict/components/PredictMarketOutcome/PredictMarketOutcome.styles.ts
index fdff4f06ad7..f6a7cd1c520 100644
--- a/app/components/UI/Predict/components/PredictMarketOutcome/PredictMarketOutcome.styles.ts
+++ b/app/components/UI/Predict/components/PredictMarketOutcome/PredictMarketOutcome.styles.ts
@@ -15,12 +15,6 @@ const styleSheet = (params: { theme: Theme }) => {
       padding: 16,
       marginBottom: 16,
     },
-    marketHeader: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-      width: '100%',
-    },
     marketFooter: {
       flexDirection: 'row',
       justifyContent: 'flex-end',
diff --git a/app/components/UI/Predict/components/PredictMarketOutcome/PredictMarketOutcome.tsx b/app/components/UI/Predict/components/PredictMarketOutcome/PredictMarketOutcome.tsx
index a865aef54f5..a341bbc9024 100644
--- a/app/components/UI/Predict/components/PredictMarketOutcome/PredictMarketOutcome.tsx
+++ b/app/components/UI/Predict/components/PredictMarketOutcome/PredictMarketOutcome.tsx
@@ -111,81 +111,74 @@ const PredictMarketOutcome: React.FC<PredictMarketOutcomeProps> = ({
 
   return (
     <View style={styles.marketContainer}>
-      <View style={styles.marketHeader}>
-        <Box
-          flexDirection={BoxFlexDirection.Row}
-          alignItems={BoxAlignItems.Center}
-          twClassName="flex-1 gap-3"
-        >
-          <Box twClassName="w-10 h-10 rounded-lg bg-muted overflow-hidden self-start">
-            {getImageUrl() ? (
-              <Image
-                source={{ uri: getImageUrl() }}
-                style={tw.style('w-full h-full')}
-                resizeMode="cover"
-              />
-            ) : (
-              <Box twClassName="w-full h-full bg-muted" />
-            )}
-          </Box>
-          <Box twClassName="flex-1 -mt-1">
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        twClassName="w-full gap-3"
+      >
+        <Box twClassName="w-10 h-10 rounded-lg bg-muted overflow-hidden self-start">
+          {getImageUrl() ? (
+            <Image
+              source={{ uri: getImageUrl() }}
+              style={tw.style('w-full h-full')}
+              resizeMode="cover"
+            />
+          ) : (
+            <Box twClassName="w-full h-full bg-muted" />
+          )}
+        </Box>
+        <Box twClassName="flex-1 -mt-1">
+          <Text
+            variant={TextVariant.BodyMd}
+            color={TextColor.TextDefault}
+            style={tw.style('font-medium')}
+          >
+            {getTitle()}
+          </Text>
+          <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
+            ${getVolumeDisplay()} {strings('predict.volume_abbreviated')}
+          </Text>
+        </Box>
+        {isClosed && outcomeToken ? (
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="gap-1"
+          >
             <Text
               variant={TextVariant.BodyMd}
-              color={TextColor.TextDefault}
-              style={tw.style('font-medium')}
-            >
-              {getTitle()}
-            </Text>
-            <Text
-              variant={TextVariant.BodySm}
-              color={TextColor.TextAlternative}
+              twClassName="font-medium"
+              color={
+                outcomeToken.price === 1
+                  ? TextColor.TextDefault
+                  : TextColor.TextAlternative
+              }
             >
-              ${getVolumeDisplay()} {strings('predict.volume_abbreviated')}
+              {outcomeToken.price === 1
+                ? strings('predict.outcome_winner')
+                : strings('predict.outcome_loser')}
             </Text>
-          </Box>
-          <Box>
-            {isClosed && outcomeToken ? (
-              <Box
-                flexDirection={BoxFlexDirection.Row}
-                alignItems={BoxAlignItems.Center}
-                twClassName="gap-1"
-              >
-                <Text
-                  variant={TextVariant.BodyMd}
-                  twClassName="font-medium"
-                  color={
-                    outcomeToken.price === 1
-                      ? TextColor.TextDefault
-                      : TextColor.TextAlternative
-                  }
-                >
-                  {outcomeToken.price === 1
-                    ? strings('predict.outcome_winner')
-                    : strings('predict.outcome_loser')}
-                </Text>
-                {outcomeToken.price === 1 && (
-                  <Icon
-                    name={IconName.Confirmation}
-                    size={IconSize.Md}
-                    color={
-                      outcomeToken.price === 1
-                        ? TextColor.SuccessDefault
-                        : TextColor.TextMuted
-                    }
-                  />
-                )}
-              </Box>
-            ) : (
-              <Text
-                style={tw.style('text-[20px] font-medium')}
-                color={TextColor.TextDefault}
-              >
-                {getYesPercentage()}
-              </Text>
+            {outcomeToken.price === 1 && (
+              <Icon
+                name={IconName.Confirmation}
+                size={IconSize.Md}
+                color={
+                  outcomeToken.price === 1
+                    ? TextColor.SuccessDefault
+                    : TextColor.TextMuted
+                }
+              />
             )}
           </Box>
-        </Box>
-      </View>
+        ) : (
+          <Text
+            style={tw.style('text-[20px] font-medium')}
+            color={TextColor.TextDefault}
+          >
+            {getYesPercentage()}
+          </Text>
+        )}
+      </Box>
       {!isClosed && (
         <View style={styles.buttonContainer}>
           <Button
diff --git a/app/components/UI/Predict/components/PredictMarketRowItem/PredictMarketRowItem.tsx b/app/components/UI/Predict/components/PredictMarketRowItem/PredictMarketRowItem.tsx
index 23f5a598b1a..48d3d785178 100644
--- a/app/components/UI/Predict/components/PredictMarketRowItem/PredictMarketRowItem.tsx
+++ b/app/components/UI/Predict/components/PredictMarketRowItem/PredictMarketRowItem.tsx
@@ -73,31 +73,27 @@ const PredictMarketRowItem = ({
       onPress={handlePress}
       testID={testID || `predict-market-row-item-${market.id}`}
     >
-      <View style={tw.style('h-10 w-10')}>
-        <Box twClassName="rounded-full bg-muted overflow-hidden items-center justify-center">
-          {market.image ? (
-            <Image
-              source={{ uri: market.image }}
-              style={tw.style('w-full h-full')}
-              resizeMode="cover"
-            />
-          ) : (
-            <Box twClassName="w-full h-full bg-muted" />
-          )}
-        </Box>
-      </View>
+      <Box twClassName="h-10 w-10 rounded-full bg-muted overflow-hidden items-center justify-center">
+        {market.image ? (
+          <Image
+            source={{ uri: market.image }}
+            style={tw.style('w-full h-full')}
+            resizeMode="cover"
+          />
+        ) : (
+          <Box twClassName="w-full h-full bg-muted" />
+        )}
+      </Box>
       <View style={tw.style('flex-1 pl-4')}>
-        <View style={tw.style('flex-row items-center')}>
-          <Text
-            variant={TextVariant.BodyMd}
-            color={TextColor.TextDefault}
-            style={tw.style('font-medium')}
-            numberOfLines={1}
-            ellipsizeMode="tail"
-          >
-            {market.title}
-          </Text>
-        </View>
+        <Text
+          variant={TextVariant.BodyMd}
+          color={TextColor.TextDefault}
+          style={tw.style('font-medium')}
+          numberOfLines={1}
+          ellipsizeMode="tail"
+        >
+          {market.title}
+        </Text>
         <Text
           variant={TextVariant.BodySm}
           color={TextColor.TextAlternative}
diff --git a/app/components/UI/Predict/components/PredictMarketSingle/PredictMarketSingle.tsx b/app/components/UI/Predict/components/PredictMarketSingle/PredictMarketSingle.tsx
index b831b609ccf..cd52f0264ff 100644
--- a/app/components/UI/Predict/components/PredictMarketSingle/PredictMarketSingle.tsx
+++ b/app/components/UI/Predict/components/PredictMarketSingle/PredictMarketSingle.tsx
@@ -128,6 +128,10 @@ interface PredictMarketSingleProps {
   testID?: string;
   entryPoint?: PredictEntryPoint;
   isCarousel?: boolean;
+  /** Called synchronously before the card's navigation press fires. */
+  onCardPress?: () => void;
+  /** Called when the user taps a buy button (before betslip opens). */
+  onBuyButtonPress?: (marketId: string) => void;
 }
 
 const PredictMarketSingle: React.FC<PredictMarketSingleProps> = ({
@@ -135,6 +139,8 @@ const PredictMarketSingle: React.FC<PredictMarketSingleProps> = ({
   testID,
   entryPoint: propEntryPoint,
   isCarousel = false,
+  onCardPress,
+  onBuyButtonPress,
 }) => {
   const contextEntryPoint = usePredictEntryPoint();
   const baseEntryPoint =
@@ -185,6 +191,7 @@ const PredictMarketSingle: React.FC<PredictMarketSingleProps> = ({
   const yesPercentage = getYesPercentage();
 
   const handleBuy = (token: PredictOutcomeToken) => {
+    onBuyButtonPress?.(market.id);
     executeGuardedAction(
       () => {
         openBuySheet({
@@ -204,6 +211,7 @@ const PredictMarketSingle: React.FC<PredictMarketSingleProps> = ({
     <TouchableOpacity
       testID={testID}
       onPress={() => {
+        onCardPress?.();
         navigation.navigate(Routes.PREDICT.ROOT, {
           screen: Routes.PREDICT.MARKET_DETAILS,
           params: {
diff --git a/app/components/UI/Predict/components/PredictMarketSportCard/PredictMarketSportCard.tsx b/app/components/UI/Predict/components/PredictMarketSportCard/PredictMarketSportCard.tsx
index b25adb66bb4..18700a3f9fa 100644
--- a/app/components/UI/Predict/components/PredictMarketSportCard/PredictMarketSportCard.tsx
+++ b/app/components/UI/Predict/components/PredictMarketSportCard/PredictMarketSportCard.tsx
@@ -27,6 +27,10 @@ interface PredictMarketSportCardProps {
   entryPoint?: PredictEntryPoint;
   onDismiss?: () => void;
   isCarousel?: boolean;
+  /** Called synchronously before the card's navigation press fires. */
+  onCardPress?: () => void;
+  /** Called when the user taps a buy button (before betslip opens). */
+  onBuyButtonPress?: (marketId: string) => void;
 }
 
 const PredictMarketSportCard: React.FC<PredictMarketSportCardProps> = ({
@@ -35,6 +39,8 @@ const PredictMarketSportCard: React.FC<PredictMarketSportCardProps> = ({
   entryPoint: propEntryPoint,
   onDismiss,
   isCarousel,
+  onCardPress,
+  onBuyButtonPress,
 }) => {
   const tw = useTailwind();
   const contextEntryPoint = usePredictEntryPoint();
@@ -57,6 +63,7 @@ const PredictMarketSportCard: React.FC<PredictMarketSportCardProps> = ({
       style={tw.style(isCarousel ? '' : 'my-[8px]')}
       testID={testID}
       onPress={() => {
+        onCardPress?.();
         navigation.navigate(Routes.PREDICT.ROOT, {
           screen: Routes.PREDICT.MARKET_DETAILS,
           params: {
@@ -102,6 +109,7 @@ const PredictMarketSportCard: React.FC<PredictMarketSportCardProps> = ({
             entryPoint={resolvedEntryPoint}
             testID={testID ? `${testID}-footer` : undefined}
             isCarousel={isCarousel}
+            onBuyButtonPress={onBuyButtonPress}
           />
         </Box>
       </Box>
diff --git a/app/components/UI/Predict/components/PredictPicks/PredictPicks.test.tsx b/app/components/UI/Predict/components/PredictPicks/PredictPicks.test.tsx
index c673a6d1b98..005c6b2e767 100644
--- a/app/components/UI/Predict/components/PredictPicks/PredictPicks.test.tsx
+++ b/app/components/UI/Predict/components/PredictPicks/PredictPicks.test.tsx
@@ -45,13 +45,6 @@ jest.mock('../../hooks/usePredictCashOut', () => ({
   usePredictCashOut: () => ({ onCashOut: mockOnCashOut }),
 }));
 
-jest.mock('../../hooks/usePredictLivePositions', () => ({
-  usePredictLivePositions: jest.fn((positions: unknown[]) => ({
-    livePositions: positions ?? [],
-    isConnected: false,
-    lastUpdateTime: null,
-  })),
-}));
 jest.mock('../../utils/format');
 
 const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
diff --git a/app/components/UI/Predict/components/PredictPicks/PredictPicks.tsx b/app/components/UI/Predict/components/PredictPicks/PredictPicks.tsx
index 0d560fdda2d..47568ad316a 100644
--- a/app/components/UI/Predict/components/PredictPicks/PredictPicks.tsx
+++ b/app/components/UI/Predict/components/PredictPicks/PredictPicks.tsx
@@ -1,7 +1,6 @@
 import { Box } from '@metamask/design-system-react-native';
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { usePredictLivePositions } from '../../hooks/usePredictLivePositions';
 import { usePredictCashOut } from '../../hooks/usePredictCashOut';
 import {
   PredictMarket,
@@ -29,7 +28,6 @@ const PredictPicks: React.FC<PredictPicksProps> = ({
   claimablePositions,
   testID = PREDICT_PICKS_TEST_ID,
 }) => {
-  const { livePositions } = usePredictLivePositions(positions);
   const { onCashOut } = usePredictCashOut({
     market,
     callerName: 'PredictPicks',
@@ -43,7 +41,7 @@ const PredictPicks: React.FC<PredictPicksProps> = ({
   if (usePositionDetail) {
     return (
       <Box testID={testID} twClassName="flex-col pt-3">
-        {livePositions.map((position) => (
+        {positions.map((position) => (
           <PredictPositionDetail
             key={position.id}
             position={position}
@@ -65,7 +63,7 @@ const PredictPicks: React.FC<PredictPicksProps> = ({
 
   return (
     <Box testID={testID} twClassName="flex-col">
-      {livePositions.map((position) => (
+      {positions.map((position) => (
         <PredictPickItem
           key={position.id}
           position={position}
diff --git a/app/components/UI/Predict/components/PredictPicks/PredictPicksForCard.test.tsx b/app/components/UI/Predict/components/PredictPicks/PredictPicksForCard.test.tsx
index d0c3e2b1b5f..a8a11d52df5 100644
--- a/app/components/UI/Predict/components/PredictPicks/PredictPicksForCard.test.tsx
+++ b/app/components/UI/Predict/components/PredictPicks/PredictPicksForCard.test.tsx
@@ -7,13 +7,6 @@ import { formatPrice } from '../../utils/format';
 
 import { POLYMARKET_PROVIDER_ID } from '../../providers/polymarket/constants';
 jest.mock('../../hooks/usePredictPositions');
-jest.mock('../../hooks/usePredictLivePositions', () => ({
-  usePredictLivePositions: jest.fn((positions: unknown[]) => ({
-    livePositions: positions ?? [],
-    isConnected: false,
-    lastUpdateTime: null,
-  })),
-}));
 jest.mock('../../utils/format');
 
 const mockUsePredictPositions = usePredictPositions as jest.Mock;
@@ -327,12 +320,12 @@ describe('PredictPicksForCard', () => {
 
       expect(mockUsePredictPositions).toHaveBeenCalledWith({
         marketId: 'specific-market-456',
-        refetchInterval: 10000,
         enabled: true,
+        livePriceUpdates: true,
       });
     });
 
-    it('passes refetchInterval of 10000ms to hook when no positions prop', () => {
+    it('enables livePriceUpdates when no positions prop', () => {
       mockUsePredictPositions.mockReturnValue({
         data: [],
         isLoading: false,
@@ -345,7 +338,7 @@ describe('PredictPicksForCard', () => {
 
       expect(mockUsePredictPositions).toHaveBeenCalledWith(
         expect.objectContaining({
-          refetchInterval: 10000,
+          livePriceUpdates: true,
         }),
       );
     });
@@ -362,8 +355,8 @@ describe('PredictPicksForCard', () => {
 
       expect(mockUsePredictPositions).toHaveBeenCalledWith({
         marketId: 'market-1',
-        refetchInterval: undefined,
         enabled: false,
+        livePriceUpdates: false,
       });
     });
   });
diff --git a/app/components/UI/Predict/components/PredictPicks/PredictPicksForCard.tsx b/app/components/UI/Predict/components/PredictPicks/PredictPicksForCard.tsx
index f2049d1248a..92e5ac875e3 100644
--- a/app/components/UI/Predict/components/PredictPicks/PredictPicksForCard.tsx
+++ b/app/components/UI/Predict/components/PredictPicks/PredictPicksForCard.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { Box } from '@metamask/design-system-react-native';
 
 import { usePredictPositions } from '../../hooks/usePredictPositions';
-import { usePredictLivePositions } from '../../hooks/usePredictLivePositions';
 import type { PredictPosition } from '../../types';
 import PredictPicksForCardItem from './PredictPicksForCardItem';
 import {
@@ -33,14 +32,13 @@ const PredictPicksForCard: React.FC<PredictPicksForCardProps> = ({
 }) => {
   const { data: fetchedPositions = [] } = usePredictPositions({
     marketId,
-    refetchInterval: positionsProp ? undefined : 10000,
     enabled: !positionsProp,
+    livePriceUpdates: !positionsProp,
   });
 
   const basePositions = positionsProp ?? fetchedPositions;
-  const { livePositions } = usePredictLivePositions(basePositions);
 
-  if (livePositions.length === 0) {
+  if (basePositions.length === 0) {
     return null;
   }
 
@@ -52,7 +50,7 @@ const PredictPicksForCard: React.FC<PredictPicksForCardProps> = ({
           twClassName="h-px bg-border-muted my-2"
         />
       )}
-      {livePositions.map((position) => (
+      {basePositions.map((position) => (
         <PredictPicksForCardItem
           key={position.id}
           position={position}
diff --git a/app/components/UI/Predict/components/PredictPositionDetail/PredictPositionDetail.tsx b/app/components/UI/Predict/components/PredictPositionDetail/PredictPositionDetail.tsx
index 3d2b5da6219..45c2a240241 100644
--- a/app/components/UI/Predict/components/PredictPositionDetail/PredictPositionDetail.tsx
+++ b/app/components/UI/Predict/components/PredictPositionDetail/PredictPositionDetail.tsx
@@ -206,19 +206,17 @@ const PredictPosition: React.FC<PredictPositionProps> = ({
         </Box>
       </Box>
       {marketStatus === PredictMarketStatus.OPEN && (
-        <Box>
-          <Button
-            testID={
-              PredictMarketDetailsSelectorsIDs.MARKET_DETAILS_CASH_OUT_BUTTON
-            }
-            variant={ButtonVariants.Secondary}
-            size={ButtonSize.Lg}
-            width={ButtonWidthTypes.Full}
-            label={strings('predict.cash_out')}
-            onPress={() => onCashOut(position)}
-            isDisabled={optimistic}
-          />
-        </Box>
+        <Button
+          testID={
+            PredictMarketDetailsSelectorsIDs.MARKET_DETAILS_CASH_OUT_BUTTON
+          }
+          variant={ButtonVariants.Secondary}
+          size={ButtonSize.Lg}
+          width={ButtonWidthTypes.Full}
+          label={strings('predict.cash_out')}
+          onPress={() => onCashOut(position)}
+          isDisabled={optimistic}
+        />
       )}
     </Box>
   );
diff --git a/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.test.tsx b/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.test.tsx
index 8fa4281d4ea..8480f2e34cf 100644
--- a/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.test.tsx
+++ b/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.test.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import Routes from '../../../../../constants/navigation/Routes';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { useUnrealizedPnL } from '../../hooks/useUnrealizedPnL';
+import { usePredictPositions } from '../../hooks/usePredictPositions';
 import { PredictPosition, PredictPositionStatus } from '../../types';
 import MarketsWonCard from './PredictPositionsHeader';
 
@@ -94,14 +95,9 @@ jest.mock('../../hooks/usePredictActionGuard', () => ({
 }));
 
 const mockRefetchClaimablePositions = jest.fn();
-jest.mock('../../hooks/usePredictPositions', () => ({
-  usePredictPositions: () => ({
-    data: [{ id: 'position-1' }],
-    isLoading: false,
-    error: null,
-    refetch: mockRefetchClaimablePositions,
-  }),
-}));
+let mockActivePositions: PredictPosition[] = [];
+let mockClaimablePositions: PredictPosition[] = [];
+jest.mock('../../hooks/usePredictPositions');
 
 const mockClaim = jest.fn();
 jest.mock('../../hooks/usePredictClaim', () => ({
@@ -127,36 +123,13 @@ jest.mock('../../../../../../locales/i18n', () => ({
   }),
 }));
 
-function createTestState(
-  _availableBalance?: number,
-  claimableAmount?: number,
-  privacyMode = false,
-) {
+function createTestState(_availableBalance?: number, privacyMode = false) {
   const testAddress = '0x1234567890123456789012345678901234567890';
   const testAccountId = 'test-account-id';
 
-  const claimablePositions = claimableAmount
-    ? ([
-        {
-          id: 'position-1',
-          status: PredictPositionStatus.WON,
-          cashPnl: claimableAmount,
-          currentValue: claimableAmount,
-          marketId: 'market-1',
-          title: 'Test Market',
-          outcome: 'Yes',
-        },
-      ] as unknown as PredictPosition[])
-    : [];
-
   return {
     engine: {
       backgroundState: {
-        PredictController: {
-          claimablePositions: {
-            [testAddress]: claimablePositions,
-          },
-        },
         AccountsController: {
           internalAccounts: {
             selectedAccount: testAccountId,
@@ -185,11 +158,16 @@ describe('MarketsWonCard', () => {
   const mockUseUnrealizedPnL = useUnrealizedPnL as jest.MockedFunction<
     typeof useUnrealizedPnL
   >;
+  const mockUsePredictPositions = usePredictPositions as jest.MockedFunction<
+    typeof usePredictPositions
+  >;
 
   beforeEach(() => {
     jest.clearAllMocks();
     mockBalanceResult.data = 100.5;
     mockBalanceResult.isLoading = false;
+    mockActivePositions = [{ id: 'position-1' } as PredictPosition];
+    mockClaimablePositions = [];
 
     mockUseUnrealizedPnL.mockReturnValue({
       data: {
@@ -201,13 +179,35 @@ describe('MarketsWonCard', () => {
       isFetching: false,
       error: null,
     } as unknown as ReturnType<typeof useUnrealizedPnL>);
+    mockUsePredictPositions.mockImplementation(
+      ({ claimable }: { claimable?: boolean } = {}) =>
+        ({
+          data: claimable ? mockClaimablePositions : mockActivePositions,
+          isLoading: false,
+          error: null,
+          refetch: mockRefetchClaimablePositions,
+        }) as unknown as ReturnType<typeof usePredictPositions>,
+    );
   });
 
   afterEach(() => {
-    jest.resetAllMocks();
+    jest.clearAllMocks();
   });
 
   describe('rendering', () => {
+    it('does not enable live updates for active position count query', () => {
+      const state = createTestState(100.5);
+
+      renderWithProvider(<MarketsWonCard />, { state });
+
+      const activePositionsCall = mockUsePredictPositions.mock.calls.find(
+        ([options]) => options?.claimable === false,
+      );
+
+      expect(activePositionsCall?.[0]).toMatchObject({ claimable: false });
+      expect(activePositionsCall?.[0]?.livePriceUpdates).toBeUndefined();
+    });
+
     it('displays available balance and unrealized P&L', () => {
       const state = createTestState(100.5);
 
@@ -230,7 +230,18 @@ describe('MarketsWonCard', () => {
     });
 
     it('hides monetary values when privacy mode is enabled', () => {
-      const state = createTestState(100.5, 24.66, true);
+      mockClaimablePositions = [
+        {
+          id: 'position-1',
+          status: PredictPositionStatus.WON,
+          cashPnl: 24.66,
+          currentValue: 24.66,
+          marketId: 'market-1',
+          title: 'Test Market',
+          outcome: 'Yes',
+        } as PredictPosition,
+      ];
+      const state = createTestState(100.5, true);
 
       renderWithProvider(<MarketsWonCard />, { state });
 
@@ -238,7 +249,7 @@ describe('MarketsWonCard', () => {
       expect(screen.queryByText('+$8.63 (+3.9%)')).toBeNull();
       expect(screen.queryByText('Claim $24.66')).toBeNull();
       expect(screen.getByText('••••••••••••')).toBeOnTheScreen();
-      expect(screen.getByText('•••••••••')).toBeOnTheScreen();
+      expect(screen.getAllByText('•••••••••').length).toBeGreaterThan(0);
     });
   });
 
diff --git a/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.tsx b/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.tsx
index 6bca1d097b8..6d37d864d30 100644
--- a/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.tsx
+++ b/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.tsx
@@ -46,8 +46,7 @@ import { usePredictDeposit } from '../../hooks/usePredictDeposit';
 import { useUnrealizedPnL } from '../../hooks/useUnrealizedPnL';
 import { usePredictActionGuard } from '../../hooks/usePredictActionGuard';
 import { usePredictPositions } from '../../hooks/usePredictPositions';
-import { selectPredictWonPositions } from '../../selectors/predictController';
-import { PredictPosition } from '../../types';
+import { PredictPosition, PredictPositionStatus } from '../../types';
 import { PredictNavigationParamList } from '../../types/navigation';
 import {
   formatPercentage,
@@ -95,12 +94,20 @@ const PredictPositionsHeader = forwardRef<
   const evmAccount = getEvmAccountFromSelectedAccountGroup();
   const selectedAddress = evmAccount?.address ?? '0x0';
   const { isDepositPending } = usePredictDeposit();
-  const wonPositions = useSelector(
-    selectPredictWonPositions({ address: selectedAddress }),
-  );
-
-  const { data: activePositions } = usePredictPositions({ claimable: false });
+  const { data: activePositions } = usePredictPositions({
+    claimable: false,
+  });
+  const { data: claimablePositions = [] } = usePredictPositions({
+    claimable: true,
+  });
   const hasPositions = (activePositions?.length ?? 0) > 0;
+  const wonPositions = useMemo(
+    () =>
+      claimablePositions.filter(
+        (position) => position.status === PredictPositionStatus.WON,
+      ),
+    [claimablePositions],
+  );
 
   const {
     data: pnlData,
diff --git a/app/components/UI/Predict/components/PredictSportCardFooter/PredictSportCardFooter.test.tsx b/app/components/UI/Predict/components/PredictSportCardFooter/PredictSportCardFooter.test.tsx
index 02d2100f1ca..bd700a62a77 100644
--- a/app/components/UI/Predict/components/PredictSportCardFooter/PredictSportCardFooter.test.tsx
+++ b/app/components/UI/Predict/components/PredictSportCardFooter/PredictSportCardFooter.test.tsx
@@ -306,7 +306,7 @@ describe('PredictSportCardFooter', () => {
       expect(mockUsePredictPositions).toHaveBeenCalledWith({
         marketId: 'specific-market-123',
         claimable: false,
-        refetchInterval: 10000,
+        livePriceUpdates: true,
       });
     });
 
diff --git a/app/components/UI/Predict/components/PredictSportCardFooter/PredictSportCardFooter.tsx b/app/components/UI/Predict/components/PredictSportCardFooter/PredictSportCardFooter.tsx
index 0f3b6af467a..f963826c67b 100644
--- a/app/components/UI/Predict/components/PredictSportCardFooter/PredictSportCardFooter.tsx
+++ b/app/components/UI/Predict/components/PredictSportCardFooter/PredictSportCardFooter.tsx
@@ -27,6 +27,8 @@ interface PredictSportCardFooterProps {
   testID?: string;
   entryPoint?: PredictEntryPoint;
   isCarousel?: boolean;
+  /** Called when the user taps a buy button (before betslip opens). */
+  onBuyButtonPress?: (marketId: string) => void;
 }
 
 const PredictSportCardFooter: React.FC<PredictSportCardFooterProps> = ({
@@ -34,6 +36,7 @@ const PredictSportCardFooter: React.FC<PredictSportCardFooterProps> = ({
   testID,
   entryPoint: propEntryPoint,
   isCarousel,
+  onBuyButtonPress,
 }) => {
   const tw = useTailwind();
   const navigation =
@@ -53,7 +56,7 @@ const PredictSportCardFooter: React.FC<PredictSportCardFooterProps> = ({
   const { data: positions = [], isLoading } = usePredictPositions({
     marketId: market.id,
     claimable: false,
-    refetchInterval: 10000,
+    livePriceUpdates: true,
   });
 
   const { data: claimablePositions = [] } = usePredictPositions({
@@ -82,6 +85,7 @@ const PredictSportCardFooter: React.FC<PredictSportCardFooterProps> = ({
           ),
         ) ?? market.outcomes?.[0];
 
+      onBuyButtonPress?.(market.id);
       executeGuardedAction(
         () => {
           openBuySheet({
@@ -96,7 +100,13 @@ const PredictSportCardFooter: React.FC<PredictSportCardFooterProps> = ({
         },
       );
     },
-    [executeGuardedAction, resolvedEntryPoint, openBuySheet, market],
+    [
+      executeGuardedAction,
+      resolvedEntryPoint,
+      openBuySheet,
+      market,
+      onBuyButtonPress,
+    ],
   );
 
   const handleClaimPress = useCallback(async () => {
diff --git a/app/components/UI/Predict/components/PredictUnavailable/PredictUnavailable.tsx b/app/components/UI/Predict/components/PredictUnavailable/PredictUnavailable.tsx
index 1f3e83b9a2e..78a4195078c 100644
--- a/app/components/UI/Predict/components/PredictUnavailable/PredictUnavailable.tsx
+++ b/app/components/UI/Predict/components/PredictUnavailable/PredictUnavailable.tsx
@@ -12,6 +12,7 @@ import {
   TextVariant,
   BoxAlignItems,
   BoxJustifyContent,
+  HeaderStandard,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { InteractionManager, TouchableOpacity } from 'react-native';
@@ -22,7 +23,6 @@ import { strings } from '../../../../../../locales/i18n';
 import BottomSheet from '../../../../../component-library/components/BottomSheets/BottomSheet/BottomSheet';
 import { BottomSheetRef } from '../../../../../component-library/components/BottomSheets/BottomSheet/BottomSheet.types';
 import BottomSheetFooter from '../../../../../component-library/components/BottomSheets/BottomSheetFooter/BottomSheetFooter';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import { ButtonVariants } from '../../../../../component-library/components/Buttons/Button/Button.types';
 import { PREDICT_UNAVAILABLE_TEST_IDS } from './PredictUnavailable.testIds';
 
@@ -116,7 +116,7 @@ const PredictUnavailable = forwardRef<
       isInteractable
       onClose={handleSheetClosed}
     >
-      <HeaderCompactStandard
+      <HeaderStandard
         testID="header"
         title={strings('predict.unavailable.title')}
         onClose={handleClose}
diff --git a/app/components/UI/Predict/constants/sports.ts b/app/components/UI/Predict/constants/sports.ts
index bec3dada92b..3317116821f 100644
--- a/app/components/UI/Predict/constants/sports.ts
+++ b/app/components/UI/Predict/constants/sports.ts
@@ -50,6 +50,7 @@ export const SUPPORTED_SPORTS_LEAGUES: PredictSportsLeague[] = [
   'itc',
   'dfb',
   'cde',
+  'fifwc',
 ];
 
 export const filterSupportedLeagues = (
@@ -98,6 +99,7 @@ const DRAW_CAPABLE_LEAGUES: ReadonlySet<PredictSportsLeague> = new Set([
   'itc',
   'dfb',
   'cde',
+  'fifwc',
 ]);
 
 export const isDrawCapableLeague = (league: PredictSportsLeague): boolean =>
diff --git a/app/components/UI/Predict/constants/transactions.ts b/app/components/UI/Predict/constants/transactions.ts
index 65f3fa21200..c0d5b1c74fb 100644
--- a/app/components/UI/Predict/constants/transactions.ts
+++ b/app/components/UI/Predict/constants/transactions.ts
@@ -7,6 +7,15 @@ export const PREDICT_BALANCE_CHAIN_ID = '0x89' as Hex;
 
 export const MINIMUM_BET = 1; // $1 minimum bet
 
+// Keeps the CTA locked long enough for the payment selector to close and the
+// new quote-loading state to arrive, while avoiding a laggy return to the buy
+// sheet after normal blur/focus navigation.
+export const PAYMENT_SELECTOR_NAVIGATION_UNLOCK_DELAY_MS = 1000;
+
+// Fallback recovery if the payment-selector route does not emit the expected
+// blur/focus events, such as transparent modal or interrupted navigation cases.
+export const PAYMENT_SELECTOR_NAVIGATION_SAFETY_UNLOCK_MS = 5000;
+
 export const PREDICT_BALANCE_TOKEN_KEY = 'predict-balance';
 
 export const PREDICTION_ERROR_TRANSACTION_BATCH_ID = 'NA';
diff --git a/app/components/UI/Predict/contexts/PredictPreviewSheetContext.test.tsx b/app/components/UI/Predict/contexts/PredictPreviewSheetContext.test.tsx
index aed1a5dbd16..43bcb01b8d4 100644
--- a/app/components/UI/Predict/contexts/PredictPreviewSheetContext.test.tsx
+++ b/app/components/UI/Predict/contexts/PredictPreviewSheetContext.test.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react-native';
+import { act, render, screen, fireEvent } from '@testing-library/react-native';
 import { Text, TouchableOpacity, View } from 'react-native';
+import { TEST_HEX_COLORS as mockTestHexColors } from '../testUtils/mockColors';
 import {
   isPredictSheetProviderMounted,
   PredictPreviewSheetProvider,
@@ -62,6 +63,28 @@ jest.mock('../hooks/usePredictActiveOrder', () => ({
   })),
 }));
 
+const mockToastShowToast = jest.fn();
+const mockToastCloseToast = jest.fn();
+jest.mock('../../../../core/ToastService', () => ({
+  __esModule: true,
+  default: {
+    showToast: (...args: unknown[]) => mockToastShowToast(...args),
+    closeToast: (...args: unknown[]) => mockToastCloseToast(...args),
+  },
+}));
+
+jest.mock('../../../../util/theme', () => ({
+  useAppThemeFromContext: () => ({
+    colors: {
+      accent04: { normal: mockTestHexColors.WHITE_BRIGHT },
+      error: {
+        default: mockTestHexColors.WHITE_BRIGHT,
+        muted: mockTestHexColors.WHITE_BRIGHT,
+      },
+    },
+  }),
+}));
+
 jest.mock('../components/PredictPreviewSheet/PredictPreviewSheet', () => {
   const { forwardRef, useImperativeHandle } = jest.requireActual('react');
   const {
@@ -204,6 +227,13 @@ describe('PredictPreviewSheetContext', () => {
     mockSelectPredictWithAnyTokenEnabledFlag.mockImplementation(
       () => mockPayWithAnyTokenEnabled,
     );
+    // Explicit toast/clearOrderError mock resets — `jest.clearAllMocks()`
+    // covers them but reset them by name for clarity and resilience to
+    // any future module-scope mock that doesn't get auto-cleared.
+    mockToastShowToast.mockReset();
+    mockToastCloseToast.mockReset();
+    mockClearOrderError.mockReset();
+    mockTrackBetslipDismissed.mockReset();
   });
 
   it('provides openBuySheet and openSellSheet to consumers', () => {
@@ -442,8 +472,8 @@ describe('PredictPreviewSheetContext', () => {
     expect(screen.getByTestId('predict-sell-preview-sheet')).toBeOnTheScreen();
   });
 
-  describe('background error auto-reopen', () => {
-    it('reopens the buy sheet when activeOrder.error appears after dismiss', () => {
+  describe('failure toast (state-based trigger)', () => {
+    it('does not auto-reopen the buy sheet when activeOrder.error appears after dismiss, and fires a Try again toast instead', () => {
       const { rerender } = render(
         <PredictPreviewSheetProvider>
           <TestConsumer />
@@ -465,10 +495,63 @@ describe('PredictPreviewSheetContext', () => {
         </PredictPreviewSheetProvider>,
       );
 
+      // The sheet must NOT auto-reopen.
+      expect(
+        screen.queryByTestId('predict-buy-preview-sheet'),
+      ).not.toBeOnTheScreen();
+
+      // Instead, ToastService.showToast is called with a non-persistent
+      // toast that auto-dismisses. The Retry uses `closeButtonOptions`
+      // (with `ButtonVariants.Link`) so it sits inline on the right of
+      // the row, matching the deposit/Track toast convention. The
+      // description line keeps the labels container two lines tall so
+      // the row's flex-start alignment looks balanced against the
+      // taller Primary Retry button.
+      expect(mockToastShowToast).toHaveBeenCalledTimes(1);
+      const toastCall = mockToastShowToast.mock.calls[0][0];
+      expect(toastCall.hasNoTimeout).toBe(false);
+      expect(toastCall.linkButtonOptions).toBeUndefined();
+      expect(toastCall.descriptionOptions).toEqual(
+        expect.objectContaining({ description: expect.any(String) }),
+      );
+      expect(toastCall.closeButtonOptions).toEqual(
+        expect.objectContaining({
+          label: expect.any(String),
+          variant: 'Link',
+        }),
+      );
+      expect(typeof toastCall.closeButtonOptions.onPress).toBe('function');
+
+      // Tapping Retry reopens the slip with the last params. The toast
+      // is left to animate out on its own (no explicit closeToast call).
+      act(() => {
+        toastCall.closeButtonOptions.onPress();
+      });
       expect(screen.getByTestId('predict-buy-preview-sheet')).toBeOnTheScreen();
+      expect(mockToastCloseToast).not.toHaveBeenCalled();
     });
 
-    it('does not auto-reopen when bottomSheetEnabled is OFF', () => {
+    it('does not fire the toast when the slip is open (banner handles it)', () => {
+      const { rerender } = render(
+        <PredictPreviewSheetProvider>
+          <TestConsumer />
+        </PredictPreviewSheetProvider>,
+      );
+
+      fireEvent.press(screen.getByTestId('open-buy'));
+      expect(screen.getByTestId('predict-buy-preview-sheet')).toBeOnTheScreen();
+
+      mockActiveOrder = { error: 'order/failed' };
+      rerender(
+        <PredictPreviewSheetProvider>
+          <TestConsumer />
+        </PredictPreviewSheetProvider>,
+      );
+
+      expect(mockToastShowToast).not.toHaveBeenCalled();
+    });
+
+    it('does not fire the toast when bottomSheetEnabled is OFF (legacy flow)', () => {
       mockBottomSheetEnabled = false;
       const { rerender } = render(
         <PredictPreviewSheetProvider>
@@ -476,7 +559,6 @@ describe('PredictPreviewSheetContext', () => {
         </PredictPreviewSheetProvider>,
       );
 
-      // navigation flow when flag is OFF - openBuySheet still records lastBuyParamsRef
       fireEvent.press(screen.getByTestId('open-buy'));
 
       mockActiveOrder = { error: 'order/failed' };
@@ -486,14 +568,27 @@ describe('PredictPreviewSheetContext', () => {
         </PredictPreviewSheetProvider>,
       );
 
-      expect(
-        screen.queryByTestId('predict-buy-preview-sheet'),
-      ).not.toBeOnTheScreen();
+      expect(mockToastShowToast).not.toHaveBeenCalled();
     });
 
-    it('does not auto-reopen when user dismisses while error is showing', () => {
+    it('does not fire the toast on error transitions when no buy sheet was ever opened', () => {
+      const { rerender } = render(
+        <PredictPreviewSheetProvider>
+          <TestConsumer />
+        </PredictPreviewSheetProvider>,
+      );
+
       mockActiveOrder = { error: 'order/failed' };
+      rerender(
+        <PredictPreviewSheetProvider>
+          <TestConsumer />
+        </PredictPreviewSheetProvider>,
+      );
 
+      expect(mockToastShowToast).not.toHaveBeenCalled();
+    });
+
+    it('only fires once per error transition (does not re-fire on unrelated rerenders)', () => {
       const { rerender } = render(
         <PredictPreviewSheetProvider>
           <TestConsumer />
@@ -501,31 +596,49 @@ describe('PredictPreviewSheetContext', () => {
       );
 
       fireEvent.press(screen.getByTestId('open-buy'));
-      expect(screen.getByTestId('predict-buy-preview-sheet')).toBeOnTheScreen();
-
       fireEvent.press(screen.getByTestId('dismiss-sheet'));
-      expect(
-        screen.queryByTestId('predict-buy-preview-sheet'),
-      ).not.toBeOnTheScreen();
 
+      mockActiveOrder = { error: 'order/failed' };
       rerender(
         <PredictPreviewSheetProvider>
           <TestConsumer />
         </PredictPreviewSheetProvider>,
       );
+      expect(mockToastShowToast).toHaveBeenCalledTimes(1);
 
-      expect(
-        screen.queryByTestId('predict-buy-preview-sheet'),
-      ).not.toBeOnTheScreen();
+      // A subsequent rerender with the same error must not re-fire.
+      rerender(
+        <PredictPreviewSheetProvider>
+          <TestConsumer />
+        </PredictPreviewSheetProvider>,
+      );
+      expect(mockToastShowToast).toHaveBeenCalledTimes(1);
     });
+  });
 
-    it('does not auto-reopen if no buy was previously opened', () => {
-      const { rerender } = render(
+  describe('failure toast auto-clear timer', () => {
+    beforeEach(() => {
+      jest.useFakeTimers();
+    });
+
+    afterEach(() => {
+      jest.useRealTimers();
+    });
+
+    const showRetryToast = () => {
+      const { rerender, unmount } = render(
         <PredictPreviewSheetProvider>
           <TestConsumer />
         </PredictPreviewSheetProvider>,
       );
 
+      fireEvent.press(screen.getByTestId('open-buy'));
+      fireEvent.press(screen.getByTestId('dismiss-sheet'));
+
+      // `clearOrderError` is called by the dismiss path; reset so subsequent
+      // assertions only count timer-driven calls.
+      mockClearOrderError.mockClear();
+
       mockActiveOrder = { error: 'order/failed' };
       rerender(
         <PredictPreviewSheetProvider>
@@ -533,9 +646,47 @@ describe('PredictPreviewSheetContext', () => {
         </PredictPreviewSheetProvider>,
       );
 
-      expect(
-        screen.queryByTestId('predict-buy-preview-sheet'),
-      ).not.toBeOnTheScreen();
+      return { rerender, unmount };
+    };
+
+    it('clears the order error after the toast auto-dismisses (~3s)', () => {
+      showRetryToast();
+      expect(mockToastShowToast).toHaveBeenCalledTimes(1);
+      expect(mockClearOrderError).not.toHaveBeenCalled();
+
+      act(() => {
+        jest.advanceTimersByTime(3000);
+      });
+
+      expect(mockClearOrderError).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not clear the order error if Retry is tapped before the timer fires', () => {
+      showRetryToast();
+      const toastCall = mockToastShowToast.mock.calls[0][0];
+
+      act(() => {
+        toastCall.closeButtonOptions.onPress();
+      });
+
+      // Advance well past the timer — Retry should have cancelled it.
+      act(() => {
+        jest.advanceTimersByTime(10000);
+      });
+
+      expect(mockClearOrderError).not.toHaveBeenCalled();
+    });
+
+    it('cancels the pending clear timer on provider unmount', () => {
+      const { unmount } = showRetryToast();
+
+      unmount();
+
+      act(() => {
+        jest.advanceTimersByTime(10000);
+      });
+
+      expect(mockClearOrderError).not.toHaveBeenCalled();
     });
   });
 
diff --git a/app/components/UI/Predict/contexts/PredictPreviewSheetContext.tsx b/app/components/UI/Predict/contexts/PredictPreviewSheetContext.tsx
index 4debfc8ddf1..54aa2048cbd 100644
--- a/app/components/UI/Predict/contexts/PredictPreviewSheetContext.tsx
+++ b/app/components/UI/Predict/contexts/PredictPreviewSheetContext.tsx
@@ -21,6 +21,11 @@ import { useSelector } from 'react-redux';
 import { useNavigation } from '@react-navigation/native';
 import { strings } from '../../../../../locales/i18n';
 import Routes from '../../../../constants/navigation/Routes';
+import { IconName } from '../../../../component-library/components/Icons/Icon';
+import { ToastVariants } from '../../../../component-library/components/Toast';
+import { ButtonVariants } from '../../../../component-library/components/Buttons/Button';
+import ToastService from '../../../../core/ToastService';
+import { useAppThemeFromContext } from '../../../../util/theme';
 import {
   selectPredictWithAnyTokenEnabledFlag,
   selectPredictBottomSheetEnabledFlag,
@@ -51,8 +56,9 @@ let _providerMounted = false;
 /**
  * Returns whether `PredictPreviewSheetProvider` is currently mounted somewhere
  * in the tree. Used by `usePredictToastRegistrations` to decide whether to
- * suppress the order-failure toast (the provider auto-reopens the sheet with
- * an inline error banner instead).
+ * suppress the order failure toast — when the provider is mounted, its
+ * state-based trigger surfaces a persistent Retry toast and the legacy plain
+ * toast would be a duplicate.
  */
 export function isPredictSheetProviderMounted(): boolean {
   return _providerMounted;
@@ -161,6 +167,7 @@ export const PredictPreviewSheetProvider: React.FC<
     selectPredictWithAnyTokenEnabledFlag,
   );
   const { activeOrder, clearOrderError } = usePredictActiveOrder();
+  const theme = useAppThemeFromContext();
 
   const buySheetRef = useRef<PredictPreviewSheetRef>(null);
   const sellSheetRef = useRef<PredictPreviewSheetRef>(null);
@@ -176,23 +183,36 @@ export const PredictPreviewSheetProvider: React.FC<
   const [sellNonce, setSellNonce] = useState(0);
 
   /**
-   * Remembers the last params passed to `openBuySheet` so we can auto-reopen
-   * the sheet when an order fails in the background after the sheet was
-   * dismissed (e.g. closed during DEPOSITING).
+   * Remembers the last params passed to `openBuySheet` so the failure toast's
+   * "Try again" action can reopen the sheet with the same market context.
    */
   const lastBuyParamsRef = useRef<PredictBuyPreviewParams | null>(null);
+
+  /**
+   * Holds the latest theme so the failure-toast effect can read its colors
+   * without listing them as deps (which would re-run the effect on theme
+   * changes and risk re-firing the toast for a still-truthy error).
+   */
+  const themeRef = useRef(theme);
+  themeRef.current = theme;
+
   /**
-   * Set when the user dismisses the sheet while an error is already visible.
-   * Prevents the auto-reopen effect from re-triggering the sheet before
-   * `clearOrderError` has propagated through Redux. Reset once the error
-   * becomes falsy (i.e. the clear has landed).
+   * Pending timer that auto-clears `activeOrder.error` after the failure
+   * toast finishes auto-dismissing (~3s — `visibilityDuration` 2750ms +
+   * exit animation in `Toast.tsx`). Cancelled when the user taps Retry
+   * (so the reopened slip surfaces the error banner) and on unmount (so
+   * we don't fire `clearOrderError` after teardown).
    */
-  const dismissedWithErrorRef = useRef(false);
+  const clearErrorTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   useEffect(() => {
     _providerMounted = true;
     return () => {
       _providerMounted = false;
+      if (clearErrorTimerRef.current) {
+        clearTimeout(clearErrorTimerRef.current);
+        clearErrorTimerRef.current = null;
+      }
     };
   }, []);
 
@@ -235,27 +255,86 @@ export const PredictPreviewSheetProvider: React.FC<
     }
   }, [sellParams, sellNonce]);
 
-  // Auto-reopen the buy sheet when a background order fails so the user can
-  // see the inline error banner and retry instead of getting a toast.
+  // State-based trigger for the "Try again" failure toast. Mirrors the
+  // original auto-reopen condition (which fired whenever `activeOrder.error`
+  // transitioned to truthy while the sheet was dismissed and we still had
+  // remembered buy params) — but instead of reopening the sheet uninvited,
+  // surfaces a Try again toast that the user can opt into. Using a state
+  // trigger here is more reliable than the controller's `'failed'` event,
+  // which depends on `isBackgroundOrder` being true (subject to a race
+  // between the slip's unmount cleanup and on-chain confirmation).
+  const previousErrorRef = useRef<string | undefined>(activeOrder?.error);
   useEffect(() => {
-    if (!activeOrder?.error) {
-      dismissedWithErrorRef.current = false;
+    const currentError = activeOrder?.error;
+    const previousError = previousErrorRef.current;
+    previousErrorRef.current = currentError;
+
+    // Only fire on falsy -> truthy transition.
+    if (!currentError || previousError) {
+      return;
+    }
+    // Only for the bottom-sheet flow, with the slip closed, and only if we
+    // know which params to reopen with.
+    if (!bottomSheetEnabled || buyParams || !lastBuyParamsRef.current) {
+      return;
     }
 
-    if (
-      bottomSheetEnabled &&
-      activeOrder?.error &&
-      !buyParams &&
-      lastBuyParamsRef.current &&
-      !dismissedWithErrorRef.current
-    ) {
-      const savedParams = lastBuyParamsRef.current;
-      lastBuyParamsRef.current = null;
-      setBuyParams(savedParams);
-      buyNonceRef.current += 1;
-      setBuyNonce(buyNonceRef.current);
+    const lastParams = lastBuyParamsRef.current;
+    // Use `closeButtonOptions` (with `ButtonVariants.Link`) rather than
+    // `linkButtonOptions` so the Retry sits inline on the right of the row
+    // (`[icon] [label] [Retry]`) instead of stacked below the label. This
+    // matches the deposit "Adding funds / Track" toast convention.
+    ToastService.showToast({
+      variant: ToastVariants.Icon,
+      labelOptions: [
+        {
+          label: strings('predict.order.prediction_failed'),
+          isBold: true,
+        },
+      ],
+      // The description provides useful context AND makes the labels
+      // container two lines tall — same height as the Retry Primary
+      // button — so the row's `alignItems: flex-start` produces a
+      // visually-balanced layout (matches the deposit/Track toast).
+      descriptionOptions: {
+        description: strings('predict.order.order_failed_generic'),
+      },
+      iconName: IconName.Error,
+      iconColor: themeRef.current.colors.error.default,
+      backgroundColor: themeRef.current.colors.error.muted,
+      hasNoTimeout: false,
+      closeButtonOptions: {
+        label: strings('predict.order.retry'),
+        variant: ButtonVariants.Link,
+        onPress: () => {
+          if (clearErrorTimerRef.current) {
+            clearTimeout(clearErrorTimerRef.current);
+            clearErrorTimerRef.current = null;
+          }
+          openBuySheet(lastParams);
+        },
+      },
+    });
+
+    // Toast auto-dismisses on the platform default (~2.75s visibility +
+    // ~250ms exit anim). When that finishes without the user tapping
+    // Retry, clear the error so the next slip open is clean (no banner).
+    // Tapping Retry cancels this timer so the reopened slip can show the
+    // banner explaining what went wrong.
+    if (clearErrorTimerRef.current) {
+      clearTimeout(clearErrorTimerRef.current);
     }
-  }, [activeOrder?.error, buyParams, bottomSheetEnabled]);
+    clearErrorTimerRef.current = setTimeout(() => {
+      clearErrorTimerRef.current = null;
+      clearOrderError();
+    }, 3000);
+  }, [
+    activeOrder?.error,
+    buyParams,
+    bottomSheetEnabled,
+    openBuySheet,
+    clearOrderError,
+  ]);
 
   const BuyComponent = useMemo(
     () => (payWithAnyTokenEnabled ? PredictBuyWithAnyToken : PredictBuyPreview),
@@ -263,10 +342,6 @@ export const PredictPreviewSheetProvider: React.FC<
   );
 
   const onBuyDismiss = useCallback(() => {
-    if (activeOrder?.error) {
-      dismissedWithErrorRef.current = true;
-    }
-
     // Fire Predict Betslip Dismissed for swipe / hardware-back paths.
     // Skip if: the back-button handler already fired it, or the sheet is
     // closing because the user confirmed an order (not a dismissal).
@@ -293,7 +368,7 @@ export const PredictPreviewSheetProvider: React.FC<
 
     setBuyParams(null);
     clearOrderError();
-  }, [clearOrderError, activeOrder?.error, buyParams]);
+  }, [clearOrderError, buyParams]);
   const onSellDismiss = useCallback(() => setSellParams(null), []);
 
   const contextValue = React.useMemo(
diff --git a/app/components/UI/Predict/hooks/index.ts b/app/components/UI/Predict/hooks/index.ts
index 1515de44b18..e22c2dda532 100644
--- a/app/components/UI/Predict/hooks/index.ts
+++ b/app/components/UI/Predict/hooks/index.ts
@@ -13,12 +13,6 @@ export {
   type UseLiveMarketPricesResult,
 } from './useLiveMarketPrices';
 
-export {
-  usePredictLivePositions,
-  type UseLivePositionsOptions,
-  type UseLivePositionsResult,
-} from './usePredictLivePositions';
-
 export {
   usePredictTabs,
   type FeedTab,
diff --git a/app/components/UI/Predict/hooks/useDiscoveryScrollManager.test.ts b/app/components/UI/Predict/hooks/useDiscoveryScrollManager.test.ts
new file mode 100644
index 00000000000..01b49ce5364
--- /dev/null
+++ b/app/components/UI/Predict/hooks/useDiscoveryScrollManager.test.ts
@@ -0,0 +1,558 @@
+import { renderHook, act } from '@testing-library/react-native';
+import { SharedValue } from 'react-native-reanimated';
+import {
+  useDiscoveryScrollManager,
+  ANIMATION_DURATION,
+  SCROLL_THRESHOLD,
+} from './useDiscoveryScrollManager';
+
+const mockWithTiming = jest.fn((toValue: unknown) => toValue);
+const mockWithDelay = jest.fn(
+  (_delay: unknown, animation: unknown) => animation,
+);
+const mockRunOnJS = jest.fn(
+  (fn: (...args: unknown[]) => void) =>
+    (...args: unknown[]) =>
+      fn(...args),
+);
+
+jest.mock('react-native-reanimated', () => {
+  const { useRef } = jest.requireActual('react');
+  return {
+    // useRef keeps the SharedValue object alive across re-renders, matching
+    // the real implementation and preventing isHeaderHidden from resetting to
+    // its initial value whenever a state update triggers a re-render.
+    useSharedValue: jest.fn((initialValue: unknown) => {
+      const ref = useRef({ value: initialValue });
+      return ref.current;
+    }),
+    useAnimatedScrollHandler: jest.fn(
+      (config: { onScroll: (event: ScrollEvent) => void }) => config,
+    ),
+    withTiming: mockWithTiming,
+    withDelay: mockWithDelay,
+    Easing: {
+      out: jest.fn((easing: unknown) => easing),
+      cubic: jest.fn(),
+    },
+    runOnJS: mockRunOnJS,
+  };
+});
+
+interface ScrollEvent {
+  contentOffset: { x?: number; y: number };
+  contentSize: { width?: number; height: number };
+  layoutMeasurement: { width?: number; height: number };
+}
+
+interface ScrollHandler {
+  onScroll?: (event: ScrollEvent) => void;
+}
+
+/** Build a realistic scroll event. contentSize defaults to a tall page. */
+const makeScrollEvent = (
+  y: number,
+  opts: { contentHeight?: number; viewportHeight?: number } = {},
+): ScrollEvent => ({
+  contentOffset: { x: 0, y },
+  contentSize: { width: 390, height: opts.contentHeight ?? 2000 },
+  layoutMeasurement: { width: 390, height: opts.viewportHeight ?? 800 },
+});
+
+describe('useDiscoveryScrollManager', () => {
+  const createSharedValue = (initial: number) =>
+    ({ value: initial }) as unknown as SharedValue<number>;
+
+  const createDefaultProps = (overrides = {}) => ({
+    walletHeaderHeight: 56,
+    walletHeaderTranslateY: createSharedValue(0),
+    ...overrides,
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // The global Reanimated.setUpTests() in testSetup.js may override the
+    // module-level jest.mock factory. Patch all used functions at runtime so
+    // worklet-called and JS-thread functions resolve to our controllable mocks.
+    const reanimated = jest.requireMock('react-native-reanimated');
+    reanimated.withTiming = mockWithTiming;
+    reanimated.withDelay = mockWithDelay;
+    reanimated.runOnJS = mockRunOnJS;
+    mockWithTiming.mockImplementation((toValue: unknown) => toValue);
+    mockWithDelay.mockImplementation(
+      (_delay: unknown, animation: unknown) => animation,
+    );
+  });
+
+  // ─── exports ───────────────────────────────────────────────────────────────
+
+  describe('exports', () => {
+    it('exports ANIMATION_DURATION as 300', () => {
+      expect(ANIMATION_DURATION).toBe(300);
+    });
+
+    it('exports SCROLL_THRESHOLD as 100', () => {
+      expect(SCROLL_THRESHOLD).toBe(100);
+    });
+  });
+
+  describe('initialization', () => {
+    it('returns required properties', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      expect(typeof result.current.headerHidden).toBe('boolean');
+      expect(typeof result.current.onTabEnter).toBe('function');
+      expect(result.current.scrollHandler).toBeDefined();
+    });
+
+    it('initializes headerHidden as false', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      expect(result.current.headerHidden).toBe(false);
+    });
+
+    it('works without optional walletHeaderTranslateY', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager({ walletHeaderHeight: 56 }),
+      );
+
+      expect(result.current.headerHidden).toBe(false);
+      expect(result.current.scrollHandler).toBeDefined();
+    });
+
+    it('works without any optional props', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager({ walletHeaderHeight: 56 }),
+      );
+
+      expect(result.current.headerHidden).toBe(false);
+    });
+  });
+
+  describe('walletHeaderHeight sync', () => {
+    it('updates sharedHeaderHeight when walletHeaderHeight prop changes', () => {
+      const props = createDefaultProps({ walletHeaderHeight: 56 });
+
+      const { rerender } = renderHook(
+        (p: typeof props) => useDiscoveryScrollManager(p),
+        { initialProps: props },
+      );
+
+      expect(() =>
+        rerender({ ...props, walletHeaderHeight: 80 }),
+      ).not.toThrow();
+    });
+  });
+
+  describe('scrollHandler', () => {
+    it('processes a scroll event without throwing', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      expect(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+      }).not.toThrow();
+    });
+
+    it('does not hide header when accumulated scroll is below threshold', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(50)); // 50px < SCROLL_THRESHOLD (100)
+      });
+
+      expect(result.current.headerHidden).toBe(false);
+    });
+
+    it('hides header after scrolling down past the threshold', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(101)); // > 100px threshold
+      });
+
+      expect(result.current.headerHidden).toBe(true);
+    });
+
+    it('shows header again after scrolling up past threshold when hidden', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(200));
+      });
+
+      expect(result.current.headerHidden).toBe(true);
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(200));
+        handler.onScroll?.(makeScrollEvent(50)); // -150px upward (> threshold)
+      });
+
+      expect(result.current.headerHidden).toBe(false);
+    });
+
+    it('shows header immediately when scrolled back to top', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(200));
+      });
+      expect(result.current.headerHidden).toBe(true);
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0)); // atTop forces show
+      });
+      expect(result.current.headerHidden).toBe(false);
+    });
+
+    it('resets accumulated delta when scroll direction reverses', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        // Scroll down 80px (below threshold)
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(80));
+
+        // Reverse — accumulated delta resets, only 20px down so far
+        handler.onScroll?.(makeScrollEvent(60));
+        handler.onScroll?.(makeScrollEvent(80)); // 20px down — still below threshold
+      });
+
+      expect(result.current.headerHidden).toBe(false);
+    });
+
+    it('ignores zero-delta events', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(50));
+        handler.onScroll?.(makeScrollEvent(50)); // delta = 0, should be ignored
+      });
+
+      expect(result.current.headerHidden).toBe(false);
+    });
+
+    it('ignores bounce events past the bottom edge', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(200));
+      });
+      expect(result.current.headerHidden).toBe(true);
+
+      act(() => {
+        // Bounce: scroll past bottom (contentHeight=2000, viewport=800 → max=1200)
+        handler.onScroll?.(
+          makeScrollEvent(1250, { contentHeight: 2000, viewportHeight: 800 }),
+        );
+        // Snapback upward should NOT re-show header (atBottom guard)
+        handler.onScroll?.(
+          makeScrollEvent(1200, { contentHeight: 2000, viewportHeight: 800 }),
+        );
+      });
+
+      expect(result.current.headerHidden).toBe(true);
+    });
+
+    it('invokes onPortfolioScroll on every scroll event', () => {
+      const onPortfolioScroll = jest.fn();
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps({ onPortfolioScroll })),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(10));
+        handler.onScroll?.(makeScrollEvent(20));
+      });
+
+      expect(onPortfolioScroll).toHaveBeenCalledTimes(2);
+    });
+
+    it('invokes onScrollEvent with scrollY and viewportHeight on every event', () => {
+      const onScrollEvent = jest.fn();
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps({ onScrollEvent })),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(42, { viewportHeight: 800 }));
+      });
+
+      expect(onScrollEvent).toHaveBeenCalledWith(42, 800);
+    });
+
+    it('invokes both onPortfolioScroll and onScrollEvent in the same scroll event', () => {
+      const onPortfolioScroll = jest.fn();
+      const onScrollEvent = jest.fn();
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(
+          createDefaultProps({ onPortfolioScroll, onScrollEvent }),
+        ),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(10, { viewportHeight: 750 }));
+      });
+
+      expect(onPortfolioScroll).toHaveBeenCalledTimes(1);
+      expect(onScrollEvent).toHaveBeenCalledWith(10, 750);
+    });
+
+    it('calls onHeaderHiddenChange(true) when header hides', () => {
+      const onHeaderHiddenChange = jest.fn();
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps({ onHeaderHiddenChange })),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(200));
+      });
+
+      expect(onHeaderHiddenChange).toHaveBeenCalledWith(true);
+    });
+
+    it('calls onHeaderHiddenChange(false) when header shows after scrolling up', () => {
+      const onHeaderHiddenChange = jest.fn();
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps({ onHeaderHiddenChange })),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(200));
+      });
+      onHeaderHiddenChange.mockClear();
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(200));
+        handler.onScroll?.(makeScrollEvent(50));
+      });
+
+      expect(onHeaderHiddenChange).toHaveBeenCalledWith(false);
+    });
+
+    it('calls onHeaderHiddenChange(false) when scrolled back to top', () => {
+      const onHeaderHiddenChange = jest.fn();
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps({ onHeaderHiddenChange })),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(200));
+      });
+      onHeaderHiddenChange.mockClear();
+
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+      });
+
+      expect(onHeaderHiddenChange).toHaveBeenCalledWith(false);
+    });
+  });
+
+  describe('onTabEnter', () => {
+    it('does not throw when header is visible', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      expect(() => {
+        act(() => {
+          result.current.onTabEnter();
+        });
+      }).not.toThrow();
+
+      expect(result.current.headerHidden).toBe(false);
+    });
+
+    it('does not throw after scrolling past threshold', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(200));
+      });
+
+      expect(() => {
+        act(() => {
+          result.current.onTabEnter();
+        });
+      }).not.toThrow();
+    });
+
+    it('does not throw on re-entry after header was hidden by scroll', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(200));
+      });
+      expect(result.current.headerHidden).toBe(true);
+
+      expect(() => {
+        act(() => {
+          result.current.onTabEnter();
+        });
+      }).not.toThrow();
+    });
+
+    it('shows header when re-entering a tab that was at the top', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      act(() => {
+        result.current.onTabEnter();
+      });
+
+      expect(result.current.headerHidden).toBe(false);
+    });
+
+    it('calls onHeaderHiddenChange(true) when entering a tab with hidden header', () => {
+      const onHeaderHiddenChange = jest.fn();
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps({ onHeaderHiddenChange })),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(200));
+      });
+      onHeaderHiddenChange.mockClear();
+
+      act(() => {
+        result.current.onTabEnter();
+      });
+
+      expect(onHeaderHiddenChange).toHaveBeenCalledWith(true);
+    });
+
+    it('calls onHeaderHiddenChange(false) when entering a tab with visible header', () => {
+      const onHeaderHiddenChange = jest.fn();
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps({ onHeaderHiddenChange })),
+      );
+
+      act(() => {
+        result.current.onTabEnter();
+      });
+
+      expect(onHeaderHiddenChange).toHaveBeenCalledWith(false);
+    });
+
+    it('skips settling scroll events after a tab switch', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        result.current.onTabEnter();
+      });
+
+      // Fire 5 settling events (tabSwitchEventsToSkip = 5) — none should hide header
+      act(() => {
+        for (let i = 0; i < 5; i++) {
+          handler.onScroll?.(makeScrollEvent(500));
+        }
+      });
+
+      expect(result.current.headerHidden).toBe(false);
+    });
+
+    it('processes scroll normally after the settling window expires', () => {
+      const { result } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        result.current.onTabEnter();
+      });
+
+      // Burn through all 5 skip slots
+      act(() => {
+        for (let i = 0; i < 5; i++) {
+          handler.onScroll?.(makeScrollEvent(0));
+        }
+      });
+
+      // Now normal scroll should work
+      act(() => {
+        handler.onScroll?.(makeScrollEvent(0));
+        handler.onScroll?.(makeScrollEvent(200));
+      });
+
+      expect(result.current.headerHidden).toBe(true);
+    });
+  });
+
+  describe('cleanup', () => {
+    it('unmounts without errors', () => {
+      const { unmount } = renderHook(() =>
+        useDiscoveryScrollManager(createDefaultProps()),
+      );
+
+      expect(() => unmount()).not.toThrow();
+    });
+  });
+});
diff --git a/app/components/UI/Predict/hooks/useDiscoveryScrollManager.ts b/app/components/UI/Predict/hooks/useDiscoveryScrollManager.ts
new file mode 100644
index 00000000000..c6cccf35749
--- /dev/null
+++ b/app/components/UI/Predict/hooks/useDiscoveryScrollManager.ts
@@ -0,0 +1,201 @@
+import { useState, useCallback, useEffect, useRef } from 'react';
+import {
+  useSharedValue,
+  useAnimatedScrollHandler,
+  SharedValue,
+  withTiming,
+  withDelay,
+  Easing,
+  runOnJS,
+} from 'react-native-reanimated';
+
+export const ANIMATION_DURATION = 300;
+export const SCROLL_THRESHOLD = 100;
+
+const hideAnimationConfig = {
+  duration: ANIMATION_DURATION,
+  easing: Easing.out(Easing.cubic),
+};
+
+const showAnimationConfig = {
+  duration: 250,
+  easing: Easing.out(Easing.cubic),
+};
+
+interface UseDiscoveryScrollManagerParams {
+  walletHeaderHeight: number;
+  walletHeaderTranslateY?: SharedValue<number>;
+  onPortfolioScroll?: () => void;
+  /**
+   * Called from the scroll worklet (via runOnJS) with the current scroll Y and
+   * viewport height. Use this to forward events to JS-thread scroll handlers
+   * (e.g. analytics section tracking) without needing a separate ScrollView.
+   */
+  onScrollEvent?: (scrollY: number, viewportHeight: number) => void;
+  /**
+   * Called via runOnJS at the exact moment the hide/show decision is made —
+   * same worklet frame as the withTiming call. Use this to sync sibling
+   * animations (e.g. icon collapse) without position-based polling.
+   */
+  onHeaderHiddenChange?: (hidden: boolean) => void;
+}
+
+interface UseDiscoveryScrollManagerReturn {
+  headerHidden: boolean;
+  scrollHandler: ReturnType<typeof useAnimatedScrollHandler>;
+  onTabEnter: () => void;
+}
+
+export const useDiscoveryScrollManager = ({
+  walletHeaderHeight,
+  walletHeaderTranslateY: externalTranslateY,
+  onPortfolioScroll,
+  onScrollEvent,
+  onHeaderHiddenChange,
+}: UseDiscoveryScrollManagerParams): UseDiscoveryScrollManagerReturn => {
+  const fallbackTranslateY = useSharedValue(0);
+  const walletHeaderTranslateY = externalTranslateY ?? fallbackTranslateY;
+  const isHeaderHidden = useSharedValue(0);
+  const sharedHeaderHeight = useSharedValue(walletHeaderHeight);
+  const lastScrollY = useSharedValue(0);
+  const accumulatedDelta = useSharedValue(0);
+  const lastDirection = useSharedValue(0);
+  const tabSwitchEventsToSkip = useSharedValue(0);
+
+  const [headerHidden, setHeaderHidden] = useState(false);
+
+  // Keep shared height in sync as it's measured after first render
+  useEffect(() => {
+    sharedHeaderHeight.value = walletHeaderHeight;
+  }, [walletHeaderHeight, sharedHeaderHeight]);
+
+  const onPortfolioScrollRef = useRef<(() => void) | undefined>(undefined);
+  onPortfolioScrollRef.current = onPortfolioScroll;
+
+  const onScrollEventRef = useRef<
+    ((scrollY: number, viewportHeight: number) => void) | undefined
+  >(undefined);
+  onScrollEventRef.current = onScrollEvent;
+
+  const callScrollCallbacks = useCallback(
+    (scrollY: number, viewportHeight: number) => {
+      onPortfolioScrollRef.current?.();
+      onScrollEventRef.current?.(scrollY, viewportHeight);
+    },
+    [],
+  );
+
+  const onHeaderHiddenChangeRef = useRef<
+    ((hidden: boolean) => void) | undefined
+  >(undefined);
+  onHeaderHiddenChangeRef.current = onHeaderHiddenChange;
+  const callHeaderHiddenChange = useCallback((hidden: boolean) => {
+    onHeaderHiddenChangeRef.current?.(hidden);
+  }, []);
+
+  const scrollHandler = useAnimatedScrollHandler({
+    onScroll: (event) => {
+      'worklet';
+
+      const currentY = event.contentOffset.y;
+      runOnJS(callScrollCallbacks)(currentY, event.layoutMeasurement.height);
+
+      // Skip settling events after a tab switch. Multiple events can fire
+      // when views remain mounted (opacity approach) and settle back into view.
+      if (tabSwitchEventsToSkip.value > 0) {
+        tabSwitchEventsToSkip.value -= 1;
+        lastScrollY.value = currentY;
+        accumulatedDelta.value = 0;
+        lastDirection.value = 0;
+        return;
+      }
+
+      const delta = currentY - lastScrollY.value;
+      lastScrollY.value = currentY;
+
+      const atTop = currentY <= 0;
+      const maxScrollY =
+        event.contentSize.height - event.layoutMeasurement.height;
+      const atBottom = maxScrollY > 0 && currentY >= maxScrollY;
+
+      // Ignore bounce events past the bottom edge — the snapback registers as
+      // an upward scroll and would falsely trigger the show-header logic.
+      if (atBottom) {
+        accumulatedDelta.value = 0;
+        return;
+      }
+
+      const currentDirection = delta > 0 ? 1 : delta < 0 ? -1 : 0;
+      if (currentDirection === 0) return;
+
+      // Reset accumulated delta when direction reverses
+      if (currentDirection !== lastDirection.value) {
+        lastDirection.value = currentDirection;
+        accumulatedDelta.value = 0;
+      }
+
+      accumulatedDelta.value += Math.abs(delta);
+
+      // Always show header when at the top of the list
+      if (atTop && isHeaderHidden.value === 1) {
+        isHeaderHidden.value = 0;
+        walletHeaderTranslateY.value = withTiming(0, showAnimationConfig);
+        accumulatedDelta.value = 0;
+        lastDirection.value = 0;
+        runOnJS(setHeaderHidden)(false);
+        runOnJS(callHeaderHiddenChange)(false);
+        return;
+      }
+
+      if (accumulatedDelta.value < SCROLL_THRESHOLD) return;
+
+      // Scroll down — hide header
+      if (currentDirection === 1 && isHeaderHidden.value === 0) {
+        isHeaderHidden.value = 1;
+        walletHeaderTranslateY.value = withTiming(
+          -sharedHeaderHeight.value,
+          hideAnimationConfig,
+        );
+        accumulatedDelta.value = 0;
+        runOnJS(setHeaderHidden)(true);
+        runOnJS(callHeaderHiddenChange)(true);
+      }
+
+      // Scroll up — show header
+      if (currentDirection === -1 && isHeaderHidden.value === 1) {
+        isHeaderHidden.value = 0;
+        walletHeaderTranslateY.value = withTiming(0, showAnimationConfig);
+        accumulatedDelta.value = 0;
+        runOnJS(setHeaderHidden)(false);
+        runOnJS(callHeaderHiddenChange)(false);
+      }
+    },
+  });
+
+  // Restore this tab's header state when the user enters it.
+  // If this tab was previously scrolled with the header hidden, keep it hidden.
+  // If this tab is at the top (or hasn't been visited), show the header.
+  const onTabEnter = useCallback(() => {
+    tabSwitchEventsToSkip.value = 5;
+    if (isHeaderHidden.value === 1) {
+      walletHeaderTranslateY.value = withDelay(
+        100,
+        withTiming(-sharedHeaderHeight.value, hideAnimationConfig),
+      );
+      setHeaderHidden(true);
+      callHeaderHiddenChange(true);
+    } else {
+      walletHeaderTranslateY.value = withTiming(0, showAnimationConfig);
+      setHeaderHidden(false);
+      callHeaderHiddenChange(false);
+    }
+  }, [
+    tabSwitchEventsToSkip,
+    isHeaderHidden,
+    walletHeaderTranslateY,
+    sharedHeaderHeight,
+    callHeaderHiddenChange,
+  ]);
+
+  return { headerHidden, scrollHandler, onTabEnter };
+};
diff --git a/app/components/UI/Predict/hooks/useFeedScrollManager.test.ts b/app/components/UI/Predict/hooks/useFeedScrollManager.test.ts
index 171ad8a6f39..ce5165dc928 100644
--- a/app/components/UI/Predict/hooks/useFeedScrollManager.test.ts
+++ b/app/components/UI/Predict/hooks/useFeedScrollManager.test.ts
@@ -436,6 +436,179 @@ describe('useFeedScrollManager', () => {
     });
   });
 
+  describe('wallet header coordination', () => {
+    interface ScrollHandler {
+      onScroll?: (event: { contentOffset: { y: number } }) => void;
+    }
+
+    const patchReanimatedMock = () => {
+      const reanimated = jest.requireMock('react-native-reanimated');
+      reanimated.withTiming = mockWithTiming;
+      reanimated.runOnJS = mockRunOnJS;
+    };
+
+    it('accepts walletHeaderTranslateY and walletHeaderHeight without error', () => {
+      patchReanimatedMock();
+      const walletHeaderTranslateY = { value: 0 };
+      const props = createDefaultProps({
+        walletHeaderTranslateY,
+        walletHeaderHeight: 100,
+      });
+
+      expect(() => renderHook(() => useFeedScrollManager(props))).not.toThrow();
+    });
+
+    it('hides predict header by combined header + tab bar height when scrolling down past threshold', async () => {
+      patchReanimatedMock();
+      const walletHeaderTranslateY = { value: 0 };
+      const props = createDefaultProps({
+        walletHeaderTranslateY,
+        walletHeaderHeight: 100,
+      });
+
+      const { result } = renderHook(() => useFeedScrollManager(props));
+
+      act(() => {
+        jest.advanceTimersByTime(100);
+      });
+
+      await waitFor(() => {
+        expect(result.current.layoutReady).toBe(true);
+      });
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      mockWithTiming.mockClear();
+
+      act(() => {
+        handler.onScroll?.({ contentOffset: { y: 0 } });
+        handler.onScroll?.({ contentOffset: { y: 300 } });
+      });
+
+      // withTiming should have been called with -(headerHeight + tabBarHeight) = -(120 + 48) = -168
+      const calledValues = mockWithTiming.mock.calls.map((call) => call[0]);
+      expect(calledValues).toContain(-168);
+    });
+
+    it('animates walletHeaderTranslateY in lock-step with predict header', async () => {
+      patchReanimatedMock();
+      const walletHeaderTranslateY = { value: 0 };
+      const props = createDefaultProps({
+        walletHeaderTranslateY,
+        walletHeaderHeight: 100,
+      });
+
+      const { result } = renderHook(() => useFeedScrollManager(props));
+
+      act(() => {
+        jest.advanceTimersByTime(100);
+      });
+
+      await waitFor(() => {
+        expect(result.current.layoutReady).toBe(true);
+      });
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      act(() => {
+        handler.onScroll?.({ contentOffset: { y: 0 } });
+        handler.onScroll?.({ contentOffset: { y: 300 } });
+      });
+
+      expect(walletHeaderTranslateY.value).toBe(-100);
+    });
+
+    it('restores walletHeaderTranslateY when scrolling up past threshold', async () => {
+      patchReanimatedMock();
+      const walletHeaderTranslateY = { value: 0 };
+      const props = createDefaultProps({
+        walletHeaderTranslateY,
+        walletHeaderHeight: 100,
+      });
+
+      const { result } = renderHook(() => useFeedScrollManager(props));
+
+      act(() => {
+        jest.advanceTimersByTime(100);
+      });
+
+      await waitFor(() => {
+        expect(result.current.layoutReady).toBe(true);
+      });
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      // Scroll down to hide
+      act(() => {
+        handler.onScroll?.({ contentOffset: { y: 0 } });
+        handler.onScroll?.({ contentOffset: { y: 300 } });
+      });
+      expect(walletHeaderTranslateY.value).toBe(-100);
+
+      // Scroll up past threshold to restore
+      act(() => {
+        handler.onScroll?.({ contentOffset: { y: 50 } });
+        handler.onScroll?.({ contentOffset: { y: -250 } });
+      });
+
+      expect(walletHeaderTranslateY.value).toBe(0);
+      expect(result.current.headerTranslateY.value).toBe(0);
+    });
+
+    it('hides only by headerHeight (predict tabs stay pinned) when walletHeaderTranslateY is omitted', async () => {
+      patchReanimatedMock();
+      const props = createDefaultProps();
+
+      const { result } = renderHook(() => useFeedScrollManager(props));
+
+      act(() => {
+        jest.advanceTimersByTime(100);
+      });
+
+      await waitFor(() => {
+        expect(result.current.layoutReady).toBe(true);
+      });
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      mockWithTiming.mockClear();
+
+      act(() => {
+        handler.onScroll?.({ contentOffset: { y: 0 } });
+        handler.onScroll?.({ contentOffset: { y: 300 } });
+      });
+
+      const calledValues = mockWithTiming.mock.calls.map((call) => call[0]);
+      // Standalone path: only -headerHeight (-120), not -(headerHeight + tabBarHeight) (-168)
+      expect(calledValues).toContain(-120);
+      expect(calledValues).not.toContain(-168);
+    });
+
+    it('does not throw when walletHeaderTranslateY is omitted', async () => {
+      patchReanimatedMock();
+      const props = createDefaultProps();
+
+      const { result } = renderHook(() => useFeedScrollManager(props));
+
+      act(() => {
+        jest.advanceTimersByTime(100);
+      });
+
+      await waitFor(() => {
+        expect(result.current.layoutReady).toBe(true);
+      });
+
+      const handler = result.current.scrollHandler as unknown as ScrollHandler;
+
+      expect(() => {
+        act(() => {
+          handler.onScroll?.({ contentOffset: { y: 0 } });
+          handler.onScroll?.({ contentOffset: { y: 300 } });
+        });
+      }).not.toThrow();
+    });
+  });
+
   describe('onLayout callbacks', () => {
     it('provides onHeaderLayout callback', () => {
       const props = createDefaultProps();
diff --git a/app/components/UI/Predict/hooks/useFeedScrollManager.ts b/app/components/UI/Predict/hooks/useFeedScrollManager.ts
index 5537e9a87dd..77d037e1475 100644
--- a/app/components/UI/Predict/hooks/useFeedScrollManager.ts
+++ b/app/components/UI/Predict/hooks/useFeedScrollManager.ts
@@ -17,6 +17,9 @@ export interface UseFeedScrollManagerParams {
   headerRef: React.RefObject<View>;
   tabBarRef: React.RefObject<View>;
   setActiveIndex: (index: number) => void;
+  onHeaderHiddenChange?: (hidden: boolean) => void;
+  walletHeaderTranslateY?: SharedValue<number>;
+  walletHeaderHeight?: number;
 }
 
 export interface UseFeedScrollManagerReturn {
@@ -69,12 +72,19 @@ export const useFeedScrollManager = ({
   headerRef,
   tabBarRef,
   setActiveIndex,
+  onHeaderHiddenChange,
+  walletHeaderTranslateY,
+  walletHeaderHeight = 0,
 }: UseFeedScrollManagerParams): UseFeedScrollManagerReturn => {
   const isHeaderHidden = useSharedValue(0);
   const headerTranslateY = useSharedValue(0);
 
   const sharedHeaderHeight = useSharedValue(0);
   const sharedTabBarHeight = useSharedValue(0);
+  const sharedWalletHeaderHeight = useSharedValue(walletHeaderHeight);
+  useLayoutEffect(() => {
+    sharedWalletHeaderHeight.value = walletHeaderHeight;
+  }, [walletHeaderHeight, sharedWalletHeaderHeight]);
   const lastScrollY = useSharedValue(0);
 
   const isTabSwitching = useSharedValue(false);
@@ -183,9 +193,13 @@ export const useFeedScrollManager = ({
       if (atTop && isHeaderHidden.value === 1 && currentDirection === -1) {
         isHeaderHidden.value = 0;
         headerTranslateY.value = withTiming(0, animationConfig);
+        if (walletHeaderTranslateY) {
+          walletHeaderTranslateY.value = withTiming(0, animationConfig);
+        }
         accumulatedDelta.value = 0;
         lastDirection.value = 0;
         runOnJS(setHeaderHidden)(false);
+        if (onHeaderHiddenChange) runOnJS(onHeaderHiddenChange)(false);
         return;
       }
 
@@ -193,23 +207,38 @@ export const useFeedScrollManager = ({
         return;
       }
 
-      // Scrolling down -> hide header
+      // Scrolling down -> hide header.
+      // When embedded in the Hub Page Discovery Tabs (feature flag treatment), walletHeaderTranslateY
+      // is provided and we slide both the predict header and predict tab bar away together so the
+      // outer discovery tabs become the only navigation row at the top. In the standalone screen
+      // path (no walletHeaderTranslateY), only the balance/carousel hides — predict tabs stay pinned.
       if (currentDirection === 1 && isHeaderHidden.value === 0) {
         isHeaderHidden.value = 1;
-        headerTranslateY.value = withTiming(
-          -sharedHeaderHeight.value,
-          animationConfig,
-        );
+        const hiddenTranslate = walletHeaderTranslateY
+          ? -(sharedHeaderHeight.value + sharedTabBarHeight.value)
+          : -sharedHeaderHeight.value;
+        headerTranslateY.value = withTiming(hiddenTranslate, animationConfig);
+        if (walletHeaderTranslateY) {
+          walletHeaderTranslateY.value = withTiming(
+            -sharedWalletHeaderHeight.value,
+            animationConfig,
+          );
+        }
         accumulatedDelta.value = 0;
         runOnJS(setHeaderHidden)(true);
+        if (onHeaderHiddenChange) runOnJS(onHeaderHiddenChange)(true);
       }
 
       // Scrolling up -> show header
       if (currentDirection === -1 && isHeaderHidden.value === 1) {
         isHeaderHidden.value = 0;
         headerTranslateY.value = withTiming(0, animationConfig);
+        if (walletHeaderTranslateY) {
+          walletHeaderTranslateY.value = withTiming(0, animationConfig);
+        }
         accumulatedDelta.value = 0;
         runOnJS(setHeaderHidden)(false);
+        if (onHeaderHiddenChange) runOnJS(onHeaderHiddenChange)(false);
       }
     },
   });
diff --git a/app/components/UI/Predict/hooks/usePredictLivePositions.test.ts b/app/components/UI/Predict/hooks/usePredictLivePositions.test.ts
index b091e2f8e79..91ec1f57b18 100644
--- a/app/components/UI/Predict/hooks/usePredictLivePositions.test.ts
+++ b/app/components/UI/Predict/hooks/usePredictLivePositions.test.ts
@@ -1,10 +1,19 @@
-import { renderHook } from '@testing-library/react-native';
+import React from 'react';
+import { renderHook, waitFor } from '@testing-library/react-native';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { usePredictLivePositions } from './usePredictLivePositions';
 import { useLiveMarketPrices } from './useLiveMarketPrices';
 import { PredictPosition, PredictPositionStatus, PriceUpdate } from '../types';
+import { predictQueries } from '../queries';
 
 import { POLYMARKET_PROVIDER_ID } from '../providers/polymarket/constants';
 jest.mock('./useLiveMarketPrices');
+const mockUseIsFocused = jest.fn(() => true);
+jest.mock('@react-navigation/native', () => ({
+  useIsFocused: () => mockUseIsFocused(),
+}));
+
+const MOCK_ADDRESS = '0x1234567890123456789012345678901234567890';
 
 const createMockPosition = (
   overrides: Partial<PredictPosition> = {},
@@ -42,11 +51,52 @@ const createMockPriceUpdate = (
   ...overrides,
 });
 
+const createWrapper = () => {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false, cacheTime: Infinity } },
+  });
+  const Wrapper = ({ children }: { children: React.ReactNode }) =>
+    React.createElement(QueryClientProvider, { client: queryClient }, children);
+
+  return { Wrapper, queryClient };
+};
+
+const renderLivePositionsHook = (
+  positions: PredictPosition[],
+  options?: Parameters<typeof usePredictLivePositions>[1],
+  cachedPositions?: PredictPosition[],
+) => {
+  const { Wrapper, queryClient } = createWrapper();
+  if (cachedPositions) {
+    queryClient.setQueryData(
+      predictQueries.positions.keys.byAddress(MOCK_ADDRESS),
+      cachedPositions,
+    );
+  }
+  const renderResult = renderHook(
+    () => usePredictLivePositions(positions, options),
+    {
+      wrapper: Wrapper,
+    },
+  );
+
+  return {
+    ...renderResult,
+    queryClient,
+  };
+};
+
 describe('usePredictLivePositions', () => {
   const mockUseLiveMarketPrices = useLiveMarketPrices as jest.Mock;
 
+  const getCachedPositions = (queryClient: QueryClient) =>
+    queryClient.getQueryData<PredictPosition[]>(
+      predictQueries.positions.keys.byAddress(MOCK_ADDRESS),
+    );
+
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUseIsFocused.mockReturnValue(true);
     mockUseLiveMarketPrices.mockReturnValue({
       prices: new Map(),
       isConnected: false,
@@ -61,7 +111,7 @@ describe('usePredictLivePositions', () => {
         createMockPosition({ id: 'position-2', outcomeTokenId: 'token-2' }),
       ];
 
-      renderHook(() => usePredictLivePositions(positions));
+      renderLivePositionsHook(positions);
 
       expect(mockUseLiveMarketPrices).toHaveBeenCalledWith(
         ['token-1', 'token-2'],
@@ -70,7 +120,7 @@ describe('usePredictLivePositions', () => {
     });
 
     it('disables subscription when positions array is empty', () => {
-      renderHook(() => usePredictLivePositions([]));
+      renderLivePositionsHook([]);
 
       expect(mockUseLiveMarketPrices).toHaveBeenCalledWith([], {
         enabled: false,
@@ -80,7 +130,7 @@ describe('usePredictLivePositions', () => {
     it('disables subscription when enabled option is false', () => {
       const positions = [createMockPosition()];
 
-      renderHook(() => usePredictLivePositions(positions, { enabled: false }));
+      renderLivePositionsHook(positions, { enabled: false });
 
       expect(mockUseLiveMarketPrices).toHaveBeenCalledWith(['token-1'], {
         enabled: false,
@@ -90,16 +140,37 @@ describe('usePredictLivePositions', () => {
     it('passes enabled true when positions exist and enabled is not specified', () => {
       const positions = [createMockPosition()];
 
-      renderHook(() => usePredictLivePositions(positions));
+      renderLivePositionsHook(positions);
 
       expect(mockUseLiveMarketPrices).toHaveBeenCalledWith(['token-1'], {
         enabled: true,
       });
     });
+
+    it('skips claimable positions when building live subscriptions', () => {
+      const positions = [createMockPosition({ claimable: true })];
+
+      renderLivePositionsHook(positions);
+
+      expect(mockUseLiveMarketPrices).toHaveBeenCalledWith([], {
+        enabled: false,
+      });
+    });
+
+    it('disables subscription when the screen is not focused', () => {
+      mockUseIsFocused.mockReturnValue(false);
+      const positions = [createMockPosition()];
+
+      renderLivePositionsHook(positions);
+
+      expect(mockUseLiveMarketPrices).toHaveBeenCalledWith(['token-1'], {
+        enabled: false,
+      });
+    });
   });
 
   describe('live position calculation', () => {
-    it('returns original positions when no price updates are available', () => {
+    it('preserves cached positions when no price updates are available', async () => {
       const positions = [createMockPosition({ currentValue: 100, cashPnl: 0 })];
       mockUseLiveMarketPrices.mockReturnValue({
         prices: new Map(),
@@ -107,13 +178,18 @@ describe('usePredictLivePositions', () => {
         lastUpdateTime: null,
       });
 
-      const { result } = renderHook(() => usePredictLivePositions(positions));
+      const { queryClient } = renderLivePositionsHook(
+        positions,
+        { cacheAddress: MOCK_ADDRESS },
+        positions,
+      );
 
-      expect(result.current.livePositions[0].currentValue).toBe(100);
-      expect(result.current.livePositions[0].cashPnl).toBe(0);
+      await waitFor(() => {
+        expect(getCachedPositions(queryClient)).toBe(positions);
+      });
     });
 
-    it('calculates currentValue as size multiplied by bestBid', () => {
+    it('calculates currentValue as size multiplied by bestBid', async () => {
       const position = createMockPosition({
         outcomeTokenId: 'token-1',
         size: 200,
@@ -129,12 +205,19 @@ describe('usePredictLivePositions', () => {
         lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions([position]));
+      const { queryClient } = renderLivePositionsHook(
+        [position],
+        { cacheAddress: MOCK_ADDRESS },
+        [position],
+      );
 
-      expect(result.current.livePositions[0].currentValue).toBe(120);
+      await waitFor(() => {
+        const cached = getCachedPositions(queryClient);
+        expect(cached?.[0].currentValue).toBe(120);
+      });
     });
 
-    it('calculates cashPnl as currentValue minus initialValue', () => {
+    it('calculates cashPnl as currentValue minus initialValue', async () => {
       const position = createMockPosition({
         outcomeTokenId: 'token-1',
         size: 200,
@@ -150,12 +233,19 @@ describe('usePredictLivePositions', () => {
         lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions([position]));
+      const { queryClient } = renderLivePositionsHook(
+        [position],
+        { cacheAddress: MOCK_ADDRESS },
+        [position],
+      );
 
-      expect(result.current.livePositions[0].cashPnl).toBe(20);
+      await waitFor(() => {
+        const cached = getCachedPositions(queryClient);
+        expect(cached?.[0].cashPnl).toBe(20);
+      });
     });
 
-    it('calculates percentPnl correctly for positive gains', () => {
+    it('calculates percentPnl correctly for positive gains', async () => {
       const position = createMockPosition({
         outcomeTokenId: 'token-1',
         size: 200,
@@ -171,12 +261,19 @@ describe('usePredictLivePositions', () => {
         lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions([position]));
+      const { queryClient } = renderLivePositionsHook(
+        [position],
+        { cacheAddress: MOCK_ADDRESS },
+        [position],
+      );
 
-      expect(result.current.livePositions[0].percentPnl).toBe(20);
+      await waitFor(() => {
+        const cached = getCachedPositions(queryClient);
+        expect(cached?.[0].percentPnl).toBe(20);
+      });
     });
 
-    it('calculates percentPnl correctly for negative losses', () => {
+    it('calculates percentPnl correctly for negative losses', async () => {
       const position = createMockPosition({
         outcomeTokenId: 'token-1',
         size: 200,
@@ -192,14 +289,21 @@ describe('usePredictLivePositions', () => {
         lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions([position]));
+      const { queryClient } = renderLivePositionsHook(
+        [position],
+        { cacheAddress: MOCK_ADDRESS },
+        [position],
+      );
 
-      expect(result.current.livePositions[0].currentValue).toBe(80);
-      expect(result.current.livePositions[0].cashPnl).toBe(-20);
-      expect(result.current.livePositions[0].percentPnl).toBe(-20);
+      await waitFor(() => {
+        const cached = getCachedPositions(queryClient);
+        expect(cached?.[0].currentValue).toBe(80);
+        expect(cached?.[0].cashPnl).toBe(-20);
+        expect(cached?.[0].percentPnl).toBe(-20);
+      });
     });
 
-    it('returns zero percentPnl when initialValue is zero', () => {
+    it('returns zero percentPnl when initialValue is zero', async () => {
       const position = createMockPosition({
         outcomeTokenId: 'token-1',
         size: 200,
@@ -215,12 +319,19 @@ describe('usePredictLivePositions', () => {
         lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions([position]));
+      const { queryClient } = renderLivePositionsHook(
+        [position],
+        { cacheAddress: MOCK_ADDRESS },
+        [position],
+      );
 
-      expect(result.current.livePositions[0].percentPnl).toBe(0);
+      await waitFor(() => {
+        const cached = getCachedPositions(queryClient);
+        expect(cached?.[0].percentPnl).toBe(0);
+      });
     });
 
-    it('updates price field with bestBid value', () => {
+    it('updates price field with bestBid value', async () => {
       const position = createMockPosition({
         outcomeTokenId: 'token-1',
         price: 0.5,
@@ -235,14 +346,21 @@ describe('usePredictLivePositions', () => {
         lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions([position]));
+      const { queryClient } = renderLivePositionsHook(
+        [position],
+        { cacheAddress: MOCK_ADDRESS },
+        [position],
+      );
 
-      expect(result.current.livePositions[0].price).toBe(0.65);
+      await waitFor(() => {
+        const cached = getCachedPositions(queryClient);
+        expect(cached?.[0].price).toBe(0.65);
+      });
     });
   });
 
   describe('multiple positions', () => {
-    it('updates only positions with matching price updates', () => {
+    it('updates only positions with matching price updates', async () => {
       const positions = [
         createMockPosition({
           id: 'position-1',
@@ -269,15 +387,22 @@ describe('usePredictLivePositions', () => {
         lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions(positions));
+      const { queryClient } = renderLivePositionsHook(
+        positions,
+        { cacheAddress: MOCK_ADDRESS },
+        positions,
+      );
 
-      expect(result.current.livePositions[0].currentValue).toBe(70);
-      expect(result.current.livePositions[0].cashPnl).toBe(20);
-      expect(result.current.livePositions[1].currentValue).toBe(100);
-      expect(result.current.livePositions[1].cashPnl).toBe(0);
+      await waitFor(() => {
+        const cached = getCachedPositions(queryClient);
+        expect(cached?.[0].currentValue).toBe(70);
+        expect(cached?.[0].cashPnl).toBe(20);
+        expect(cached?.[1].currentValue).toBe(100);
+        expect(cached?.[1].cashPnl).toBe(0);
+      });
     });
 
-    it('updates all positions when all have price updates', () => {
+    it('updates all positions when all have price updates', async () => {
       const positions = [
         createMockPosition({
           id: 'position-1',
@@ -308,122 +433,265 @@ describe('usePredictLivePositions', () => {
         lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions(positions));
+      const { queryClient } = renderLivePositionsHook(
+        positions,
+        { cacheAddress: MOCK_ADDRESS },
+        positions,
+      );
 
-      expect(result.current.livePositions[0].currentValue).toBe(60);
-      expect(result.current.livePositions[1].currentValue).toBe(160);
+      await waitFor(() => {
+        const cached = getCachedPositions(queryClient);
+        expect(cached?.[0].currentValue).toBe(60);
+        expect(cached?.[1].currentValue).toBe(160);
+      });
     });
   });
 
-  describe('connection status', () => {
-    it('returns isConnected from useLiveMarketPrices', () => {
+  describe('cache synchronization', () => {
+    it('syncs live values into the address cache for passed active positions', async () => {
+      const activePosition = createMockPosition({
+        id: 'active-position',
+        currentValue: 100,
+        cashPnl: 0,
+        percentPnl: 0,
+      });
+      const untouchedPosition = createMockPosition({
+        id: 'untouched-position',
+        outcomeTokenId: 'token-2',
+        currentValue: 55,
+        cashPnl: 5,
+        percentPnl: 10,
+      });
+      const priceUpdate = createMockPriceUpdate({
+        tokenId: activePosition.outcomeTokenId,
+        bestBid: 0.6,
+      });
+
       mockUseLiveMarketPrices.mockReturnValue({
-        prices: new Map(),
+        prices: new Map([[activePosition.outcomeTokenId, priceUpdate]]),
         isConnected: true,
-        lastUpdateTime: null,
+        lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions([]));
+      const { queryClient } = renderLivePositionsHook(
+        [activePosition],
+        {
+          cacheAddress: MOCK_ADDRESS,
+        },
+        [activePosition, untouchedPosition],
+      );
 
-      expect(result.current.isConnected).toBe(true);
+      await waitFor(() => {
+        expect(getCachedPositions(queryClient)).toEqual([
+          expect.objectContaining({
+            id: activePosition.id,
+            currentValue: 120,
+            cashPnl: 20,
+            percentPnl: 20,
+            price: 0.6,
+          }),
+          untouchedPosition,
+        ]);
+      });
     });
 
-    it('returns false for isConnected when disconnected', () => {
-      mockUseLiveMarketPrices.mockReturnValue({
-        prices: new Map(),
-        isConnected: false,
-        lastUpdateTime: null,
+    it('ignores claimable positions when syncing cache', async () => {
+      const claimablePosition = createMockPosition({
+        id: 'claimable-position',
+        claimable: true,
+        currentValue: 80,
+        cashPnl: 30,
+        percentPnl: 60,
       });
+      const { queryClient } = renderLivePositionsHook(
+        [claimablePosition],
+        {
+          cacheAddress: MOCK_ADDRESS,
+        },
+        [claimablePosition],
+      );
 
-      const { result } = renderHook(() => usePredictLivePositions([]));
-
-      expect(result.current.isConnected).toBe(false);
+      await waitFor(() => {
+        expect(getCachedPositions(queryClient)).toEqual([claimablePosition]);
+      });
     });
 
-    it('returns lastUpdateTime from useLiveMarketPrices', () => {
-      const timestamp = 1704067200000;
+    it('does not rewrite cache when live values are unchanged', async () => {
+      const livePosition = createMockPosition({
+        currentValue: 120,
+        cashPnl: 20,
+        percentPnl: 20,
+        price: 0.6,
+      });
+      const priceUpdate = createMockPriceUpdate({
+        tokenId: livePosition.outcomeTokenId,
+        bestBid: 0.6,
+      });
       mockUseLiveMarketPrices.mockReturnValue({
-        prices: new Map(),
+        prices: new Map([[livePosition.outcomeTokenId, priceUpdate]]),
         isConnected: true,
-        lastUpdateTime: timestamp,
+        lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions([]));
+      const cachedPositions = [livePosition];
+      const { queryClient } = renderLivePositionsHook(
+        [livePosition],
+        {
+          cacheAddress: MOCK_ADDRESS,
+        },
+        cachedPositions,
+      );
 
-      expect(result.current.lastUpdateTime).toBe(timestamp);
+      await waitFor(() => {
+        expect(getCachedPositions(queryClient)).toBe(cachedPositions);
+      });
     });
 
-    it('returns null lastUpdateTime when no updates received', () => {
+    it('disables cache sync when enabled is false', async () => {
+      const activePosition = createMockPosition({
+        currentValue: 100,
+        cashPnl: 0,
+        percentPnl: 0,
+      });
+      const priceUpdate = createMockPriceUpdate({
+        tokenId: activePosition.outcomeTokenId,
+        bestBid: 0.6,
+      });
       mockUseLiveMarketPrices.mockReturnValue({
-        prices: new Map(),
+        prices: new Map([[activePosition.outcomeTokenId, priceUpdate]]),
         isConnected: true,
-        lastUpdateTime: null,
+        lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions([]));
+      const cachedPositions = [activePosition];
+      const { queryClient } = renderLivePositionsHook(
+        [activePosition],
+        {
+          enabled: false,
+          cacheAddress: MOCK_ADDRESS,
+        },
+        cachedPositions,
+      );
 
-      expect(result.current.lastUpdateTime).toBeNull();
+      await waitFor(() => {
+        expect(getCachedPositions(queryClient)).toBe(cachedPositions);
+      });
     });
-  });
 
-  describe('empty state', () => {
-    it('returns empty array for empty positions input', () => {
-      const { result } = renderHook(() => usePredictLivePositions([]));
+    it('disables cache sync when the screen is not focused', async () => {
+      mockUseIsFocused.mockReturnValue(false);
+      const activePosition = createMockPosition({
+        currentValue: 100,
+        cashPnl: 0,
+        percentPnl: 0,
+      });
+      const priceUpdate = createMockPriceUpdate({
+        tokenId: activePosition.outcomeTokenId,
+        bestBid: 0.6,
+      });
+      mockUseLiveMarketPrices.mockReturnValue({
+        prices: new Map([[activePosition.outcomeTokenId, priceUpdate]]),
+        isConnected: true,
+        lastUpdateTime: Date.now(),
+      });
 
-      expect(result.current.livePositions).toEqual([]);
+      const cachedPositions = [activePosition];
+      const { queryClient } = renderLivePositionsHook(
+        [activePosition],
+        {
+          cacheAddress: MOCK_ADDRESS,
+        },
+        cachedPositions,
+      );
+
+      await waitFor(() => {
+        expect(getCachedPositions(queryClient)).toBe(cachedPositions);
+      });
     });
 
-    it('preserves position order in output', () => {
-      const positions = [
-        createMockPosition({ id: 'first', outcomeTokenId: 'token-1' }),
-        createMockPosition({ id: 'second', outcomeTokenId: 'token-2' }),
-        createMockPosition({ id: 'third', outcomeTokenId: 'token-3' }),
-      ];
+    it('disables cache sync when cacheAddress is missing', async () => {
+      const activePosition = createMockPosition({
+        currentValue: 100,
+        cashPnl: 0,
+        percentPnl: 0,
+      });
+      const priceUpdate = createMockPriceUpdate({
+        tokenId: activePosition.outcomeTokenId,
+        bestBid: 0.6,
+      });
+      mockUseLiveMarketPrices.mockReturnValue({
+        prices: new Map([[activePosition.outcomeTokenId, priceUpdate]]),
+        isConnected: true,
+        lastUpdateTime: Date.now(),
+      });
 
-      const { result } = renderHook(() => usePredictLivePositions(positions));
+      const cachedPositions = [activePosition];
+      const { queryClient } = renderLivePositionsHook(
+        [activePosition],
+        undefined,
+        cachedPositions,
+      );
 
-      expect(result.current.livePositions[0].id).toBe('first');
-      expect(result.current.livePositions[1].id).toBe('second');
-      expect(result.current.livePositions[2].id).toBe('third');
+      await waitFor(() => {
+        expect(getCachedPositions(queryClient)).toBe(cachedPositions);
+      });
     });
   });
 
-  describe('position data preservation', () => {
-    it('preserves all original position fields not related to value calculation', () => {
-      const position = createMockPosition({
-        id: 'test-id',
-        providerId: 'test-provider',
-        marketId: 'test-market',
-        outcomeId: 'test-outcome',
-        outcome: 'Test Outcome',
-        title: 'Test Title',
-        icon: 'test-icon',
-        status: PredictPositionStatus.OPEN,
-        claimable: true,
-        endDate: '2025-06-15',
-        negRisk: true,
-      });
-      const priceUpdate = createMockPriceUpdate({ tokenId: 'token-1' });
+  describe('empty state', () => {
+    it('preserves position order in cache output', async () => {
+      const positions = [
+        createMockPosition({
+          id: 'first',
+          outcomeTokenId: 'token-1',
+          size: 100,
+          initialValue: 50,
+        }),
+        createMockPosition({
+          id: 'second',
+          outcomeTokenId: 'token-2',
+          size: 200,
+          initialValue: 100,
+        }),
+        createMockPosition({
+          id: 'third',
+          outcomeTokenId: 'token-3',
+          size: 300,
+          initialValue: 150,
+        }),
+      ];
+      const pricesMap = new Map([
+        [
+          'token-1',
+          createMockPriceUpdate({ tokenId: 'token-1', bestBid: 0.6 }),
+        ],
+        [
+          'token-2',
+          createMockPriceUpdate({ tokenId: 'token-2', bestBid: 0.7 }),
+        ],
+        [
+          'token-3',
+          createMockPriceUpdate({ tokenId: 'token-3', bestBid: 0.8 }),
+        ],
+      ]);
       mockUseLiveMarketPrices.mockReturnValue({
-        prices: new Map([['token-1', priceUpdate]]),
+        prices: pricesMap,
         isConnected: true,
         lastUpdateTime: Date.now(),
       });
 
-      const { result } = renderHook(() => usePredictLivePositions([position]));
-
-      const livePosition = result.current.livePositions[0];
-      expect(livePosition.id).toBe('test-id');
-      expect(livePosition.providerId).toBe('test-provider');
-      expect(livePosition.marketId).toBe('test-market');
-      expect(livePosition.outcomeId).toBe('test-outcome');
-      expect(livePosition.outcome).toBe('Test Outcome');
-      expect(livePosition.title).toBe('Test Title');
-      expect(livePosition.icon).toBe('test-icon');
-      expect(livePosition.status).toBe(PredictPositionStatus.OPEN);
-      expect(livePosition.claimable).toBe(true);
-      expect(livePosition.endDate).toBe('2025-06-15');
-      expect(livePosition.negRisk).toBe(true);
+      const { queryClient } = renderLivePositionsHook(
+        positions,
+        { cacheAddress: MOCK_ADDRESS },
+        positions,
+      );
+
+      await waitFor(() => {
+        const cached = getCachedPositions(queryClient);
+        expect(cached?.[0].id).toBe('first');
+        expect(cached?.[1].id).toBe('second');
+        expect(cached?.[2].id).toBe('third');
+      });
     });
   });
 });
diff --git a/app/components/UI/Predict/hooks/usePredictLivePositions.ts b/app/components/UI/Predict/hooks/usePredictLivePositions.ts
index 80530359d25..7878b3d39f0 100644
--- a/app/components/UI/Predict/hooks/usePredictLivePositions.ts
+++ b/app/components/UI/Predict/hooks/usePredictLivePositions.ts
@@ -1,64 +1,74 @@
-import { useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
+import { useQueryClient } from '@tanstack/react-query';
+import { useIsFocused } from '@react-navigation/native';
 import { PredictPosition } from '../types';
+import { predictQueries } from '../queries';
 import { useLiveMarketPrices } from './useLiveMarketPrices';
 
+/**
+ * Stable empty Map reference to avoid unnecessary useEffect cycles.
+ * When livePositionUpdates computes an empty Map, returning this constant
+ * preserves referential equality and prevents the cache-sync effect from firing.
+ */
+const EMPTY_POSITION_UPDATES = new Map<
+  string,
+  Pick<PredictPosition, 'currentValue' | 'cashPnl' | 'percentPnl' | 'price'>
+>();
+
 export interface UseLivePositionsOptions {
   /**
    * Whether to enable live price updates
    * @default true
    */
   enabled?: boolean;
-}
-
-export interface UseLivePositionsResult {
-  /**
-   * Positions with live-updated values based on current market prices
-   */
-  livePositions: PredictPosition[];
-  /**
-   * Whether the WebSocket connection is active
-   */
-  isConnected: boolean;
   /**
-   * Timestamp of the last price update
+   * Address-scoped positions cache to sync live values into
+   * @internal
    */
-  lastUpdateTime: number | null;
+  cacheAddress?: string;
 }
 
 /**
- * Hook that takes positions and returns live-updated positions based on real-time market prices.
- *
- * Uses the bestBid price from live market data to calculate:
- * - currentValue: size * bestBid (what you can sell for right now)
- * - cashPnl: currentValue - initialValue (profit/loss)
- * - percentPnl: ((currentValue - initialValue) / initialValue) * 100
+ * Side-effect hook that subscribes to live market prices and syncs
+ * computed position values (currentValue, cashPnl, percentPnl, price)
+ * into the address-scoped positions query cache.
  *
  * @param positions - Array of positions to track (from usePredictPositions)
- * @param options - Configuration options (enabled: boolean)
- * @returns Live-updated positions, connection status, and last update timestamp
+ * @param options - Configuration options
+ * @internal Only consumed by usePredictPositions
  */
 export const usePredictLivePositions = (
   positions: PredictPosition[],
   options: UseLivePositionsOptions = {},
-): UseLivePositionsResult => {
-  const { enabled = true } = options;
+): void => {
+  const { enabled = true, cacheAddress } = options;
+  const queryClient = useQueryClient();
+  const isScreenFocused = useIsFocused();
 
   const tokenIds = useMemo(
-    () => positions.map((position) => position.outcomeTokenId),
+    () =>
+      positions
+        .filter((position) => !position.claimable)
+        .map((position) => position.outcomeTokenId),
     [positions],
   );
 
-  const { prices, isConnected, lastUpdateTime } = useLiveMarketPrices(
-    tokenIds,
-    { enabled: enabled && positions.length > 0 },
-  );
+  const { prices } = useLiveMarketPrices(tokenIds, {
+    enabled: enabled && isScreenFocused && tokenIds.length > 0,
+  });
 
   const livePositions = useMemo(() => {
     if (positions.length === 0) {
       return [];
     }
 
-    return positions.map((position) => {
+    let hasChanges = false;
+
+    const nextPositions = positions.map((position) => {
+      if (position.claimable) {
+        return position;
+      }
+
       const priceUpdate = prices.get(position.outcomeTokenId);
 
       if (!priceUpdate) {
@@ -75,6 +85,17 @@ export const usePredictLivePositions = (
             100
           : 0;
 
+      if (
+        position.currentValue === liveCurrentValue &&
+        position.cashPnl === liveCashPnl &&
+        position.percentPnl === livePercentPnl &&
+        position.price === bestBid
+      ) {
+        return position;
+      }
+
+      hasChanges = true;
+
       return {
         ...position,
         currentValue: liveCurrentValue,
@@ -83,11 +104,90 @@ export const usePredictLivePositions = (
         price: bestBid,
       };
     });
+
+    return hasChanges ? nextPositions : positions;
   }, [positions, prices]);
 
-  return {
-    livePositions,
-    isConnected,
-    lastUpdateTime,
-  };
+  const livePositionUpdates = useMemo(() => {
+    const updates = new Map<
+      string,
+      Pick<PredictPosition, 'currentValue' | 'cashPnl' | 'percentPnl' | 'price'>
+    >();
+
+    livePositions.forEach((livePosition, index) => {
+      const originalPosition = positions[index];
+
+      if (
+        !originalPosition ||
+        originalPosition.id !== livePosition.id ||
+        originalPosition === livePosition ||
+        livePosition.claimable
+      ) {
+        return;
+      }
+
+      updates.set(livePosition.id, {
+        currentValue: livePosition.currentValue,
+        cashPnl: livePosition.cashPnl,
+        percentPnl: livePosition.percentPnl,
+        price: livePosition.price,
+      });
+    });
+
+    return updates.size > 0 ? updates : EMPTY_POSITION_UPDATES;
+  }, [livePositions, positions]);
+
+  useEffect(() => {
+    if (
+      !enabled ||
+      !isScreenFocused ||
+      !cacheAddress ||
+      livePositionUpdates.size === 0
+    ) {
+      return;
+    }
+
+    queryClient.setQueryData<PredictPosition[]>(
+      predictQueries.positions.keys.byAddress(cacheAddress),
+      (cachedPositions) => {
+        if (!cachedPositions || cachedPositions.length === 0) {
+          return cachedPositions;
+        }
+
+        let hasChanges = false;
+
+        const nextPositions = cachedPositions.map((cachedPosition) => {
+          const livePositionUpdate = livePositionUpdates.get(cachedPosition.id);
+
+          if (!livePositionUpdate || cachedPosition.claimable) {
+            return cachedPosition;
+          }
+
+          if (
+            cachedPosition.currentValue === livePositionUpdate.currentValue &&
+            cachedPosition.cashPnl === livePositionUpdate.cashPnl &&
+            cachedPosition.percentPnl === livePositionUpdate.percentPnl &&
+            cachedPosition.price === livePositionUpdate.price
+          ) {
+            return cachedPosition;
+          }
+
+          hasChanges = true;
+
+          return {
+            ...cachedPosition,
+            ...livePositionUpdate,
+          };
+        });
+
+        return hasChanges ? nextPositions : cachedPositions;
+      },
+    );
+  }, [
+    cacheAddress,
+    enabled,
+    isScreenFocused,
+    livePositionUpdates,
+    queryClient,
+  ]);
 };
diff --git a/app/components/UI/Predict/hooks/usePredictMarketData.test.tsx b/app/components/UI/Predict/hooks/usePredictMarketData.test.tsx
index 23d9b0c84dc..6396f2c70a4 100644
--- a/app/components/UI/Predict/hooks/usePredictMarketData.test.tsx
+++ b/app/components/UI/Predict/hooks/usePredictMarketData.test.tsx
@@ -1,4 +1,9 @@
-import { renderHook, act, waitFor } from '@testing-library/react-native';
+import {
+  renderHook,
+  act,
+  waitFor,
+  cleanup,
+} from '@testing-library/react-native';
 import DevLogger from '../../../../core/SDKConnect/utils/DevLogger';
 import Engine from '../../../../core/Engine';
 import { usePredictMarketData } from './usePredictMarketData';
@@ -137,7 +142,16 @@ describe('usePredictMarketData', () => {
     });
   });
 
-  afterEach(() => {
+  afterEach(async () => {
+    // Force-unmount any hooks left over from the test so their pending
+    // promises / state-setters don't leak into the next test (e.g. the
+    // "marks fetching when enabled becomes true" case below uses a
+    // never-resolving promise; without cleanup the hook stays mounted
+    // and the worker can be force-killed by jest's watchdog under load,
+    // showing up as an unrelated `waitFor` timeout in a sibling test).
+    await act(async () => {
+      cleanup();
+    });
     jest.clearAllMocks();
   });
 
@@ -147,6 +161,31 @@ describe('usePredictMarketData', () => {
     expect(mockGetMarkets).not.toHaveBeenCalled();
   });
 
+  it('marks fetching when enabled becomes true before async fetch settles (no empty flash)', () => {
+    mockGetMarkets.mockImplementation(
+      () =>
+        new Promise<PredictMarket[]>((_resolve) => {
+          /* unresolved until test ends */
+        }),
+    );
+
+    const { result, rerender, unmount } = renderHook(
+      ({ enabled }: { enabled: boolean }) => usePredictMarketData({ enabled }),
+      { initialProps: { enabled: false } },
+    );
+
+    expect(result.current.isFetching).toBe(false);
+
+    rerender({ enabled: true });
+
+    expect(result.current.isFetching).toBe(true);
+    expect(result.current.marketData).toEqual([]);
+
+    // Explicitly release the hook so the never-resolving promise above
+    // doesn't keep an in-flight fetch alive across tests.
+    unmount();
+  });
+
   it('should fetch market data successfully', async () => {
     mockGetMarkets.mockResolvedValue(mockMarketData);
 
diff --git a/app/components/UI/Predict/hooks/usePredictMarketData.tsx b/app/components/UI/Predict/hooks/usePredictMarketData.tsx
index ba974c51e31..0b88c4f49d2 100644
--- a/app/components/UI/Predict/hooks/usePredictMarketData.tsx
+++ b/app/components/UI/Predict/hooks/usePredictMarketData.tsx
@@ -1,6 +1,12 @@
 /* eslint-disable react/prop-types */
 
-import { useCallback, useEffect, useState, useRef } from 'react';
+import {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useState,
+  useRef,
+} from 'react';
 import Engine from '../../../../core/Engine';
 import { DevLogger } from '../../../../core/SDKConnect/utils/DevLogger';
 import Logger from '../../../../util/Logger';
@@ -52,6 +58,18 @@ export const usePredictMarketData = (
 
   const currentCategoryRef = useRef(category);
   const currentOffsetRef = useRef(currentOffset);
+  const prevEnabledRef = useRef(enabled);
+
+  /**
+   * When `enabled` goes from false → true (e.g. All Sports pill), avoid one painted frame
+   * with empty data and `isFetching` still false from the disabled path before `useEffect` fetch runs.
+   */
+  useLayoutEffect(() => {
+    if (enabled && !prevEnabledRef.current) {
+      setIsLoading(true);
+    }
+    prevEnabledRef.current = enabled;
+  }, [enabled]);
 
   useEffect(() => {
     currentCategoryRef.current = category;
diff --git a/app/components/UI/Predict/hooks/usePredictPositions.test.ts b/app/components/UI/Predict/hooks/usePredictPositions.test.ts
index 4c80ce6de69..5d94210e9f6 100644
--- a/app/components/UI/Predict/hooks/usePredictPositions.test.ts
+++ b/app/components/UI/Predict/hooks/usePredictPositions.test.ts
@@ -34,6 +34,10 @@ jest.mock('react-redux', () => ({
   useSelector: (selector: () => unknown) => selector(),
 }));
 
+jest.mock('./usePredictLivePositions', () => ({
+  usePredictLivePositions: jest.fn(),
+}));
+
 const mockGetPositions = jest.fn<
   Promise<PredictPosition[]>,
   [{ address: string }]
@@ -91,11 +95,16 @@ const createWrapper = () => {
   return { Wrapper, queryClient };
 };
 
+const mockUsePredictLivePositions = jest.requireMock(
+  './usePredictLivePositions',
+).usePredictLivePositions as jest.Mock;
+
 describe('usePredictPositions', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockEnsurePolygonNetworkExists.mockResolvedValue(undefined);
     mockGetPositions.mockResolvedValue([]);
+    mockUsePredictLivePositions.mockImplementation(() => undefined);
   });
 
   it('returns empty positions when query returns no positions', async () => {
@@ -154,6 +163,13 @@ describe('usePredictPositions', () => {
     });
 
     expect(result.current.data).toEqual([activePosition]);
+    expect(mockUsePredictLivePositions).toHaveBeenLastCalledWith(
+      [activePosition],
+      {
+        enabled: false,
+        cacheAddress: MOCK_ADDRESS,
+      },
+    );
   });
 
   it('returns only claimable positions when claimable is true', async () => {
@@ -176,6 +192,13 @@ describe('usePredictPositions', () => {
     });
 
     expect(result.current.data).toEqual([claimablePosition]);
+    expect(mockUsePredictLivePositions).toHaveBeenLastCalledWith(
+      [claimablePosition],
+      {
+        enabled: false,
+        cacheAddress: MOCK_ADDRESS,
+      },
+    );
   });
 
   it('filters positions by marketId', async () => {
@@ -220,6 +243,10 @@ describe('usePredictPositions', () => {
     expect(mockGetPositions).not.toHaveBeenCalled();
     expect(result.current.data).toBeUndefined();
     expect(result.current.isFetching).toBe(false);
+    expect(mockUsePredictLivePositions).toHaveBeenLastCalledWith([], {
+      enabled: false,
+      cacheAddress: MOCK_ADDRESS,
+    });
   });
 
   it('returns query error message when query fails', async () => {
@@ -371,4 +398,94 @@ describe('usePredictPositions', () => {
       expect(result.current.data).toEqual([parentPosition]);
     });
   });
+
+  it('updates returned data through cache sync while keeping claimable rows unchanged', async () => {
+    const { Wrapper } = createWrapper();
+    const activePosition = createPosition('active-cache-sync', {
+      claimable: false,
+      currentValue: 100,
+      cashPnl: 8,
+      percentPnl: 12,
+    });
+    const claimablePosition = createPosition('claimable-cache-sync', {
+      claimable: true,
+      currentValue: 40,
+      cashPnl: 30,
+      percentPnl: 300,
+      marketId: 'market-claimable',
+    });
+    mockGetPositions.mockResolvedValue([activePosition, claimablePosition]);
+
+    mockUsePredictLivePositions.mockImplementation(
+      (
+        positions: PredictPosition[],
+        options?: { enabled?: boolean; cacheAddress?: string },
+      ) => {
+        const { useEffect } = jest.requireActual('react');
+        const { useQueryClient } = jest.requireActual('@tanstack/react-query');
+        const queryClient = useQueryClient();
+
+        useEffect(() => {
+          if (!options?.enabled || !options.cacheAddress) {
+            return;
+          }
+
+          queryClient.setQueryData(
+            ['predict', 'positions', options.cacheAddress],
+            (cachedPositions: PredictPosition[] | undefined) => {
+              if (!cachedPositions) {
+                return cachedPositions;
+              }
+
+              let hasChanges = false;
+
+              const nextPositions = cachedPositions.map(
+                (position: PredictPosition) => {
+                  if (position.id !== activePosition.id || position.claimable) {
+                    return position;
+                  }
+
+                  if (
+                    position.currentValue === 150 &&
+                    position.cashPnl === 58 &&
+                    position.percentPnl === 63
+                  ) {
+                    return position;
+                  }
+
+                  hasChanges = true;
+
+                  return {
+                    ...position,
+                    currentValue: 150,
+                    cashPnl: 58,
+                    percentPnl: 63,
+                  };
+                },
+              );
+
+              return hasChanges ? nextPositions : cachedPositions;
+            },
+          );
+        }, [options?.cacheAddress, options?.enabled, queryClient, positions]);
+      },
+    );
+
+    const { result } = renderHook(
+      () => usePredictPositions({ livePriceUpdates: true }),
+      { wrapper: Wrapper },
+    );
+
+    await waitFor(() => {
+      expect(result.current.data).toEqual([
+        expect.objectContaining({
+          id: activePosition.id,
+          currentValue: 150,
+          cashPnl: 58,
+          percentPnl: 63,
+        }),
+        claimablePosition,
+      ]);
+    });
+  });
 });
diff --git a/app/components/UI/Predict/hooks/usePredictPositions.ts b/app/components/UI/Predict/hooks/usePredictPositions.ts
index ca1ce9fd36e..ac3e7ca5ef8 100644
--- a/app/components/UI/Predict/hooks/usePredictPositions.ts
+++ b/app/components/UI/Predict/hooks/usePredictPositions.ts
@@ -3,11 +3,13 @@ import { useQuery, useQueryClient } from '@tanstack/react-query';
 import { useSelector } from 'react-redux';
 import type { PredictPosition } from '../types';
 import { usePredictNetworkManagement } from './usePredictNetworkManagement';
+import { usePredictLivePositions } from './usePredictLivePositions';
 import { getEvmAccountFromSelectedAccountGroup } from '../utils/accounts';
 import { predictQueries } from '../queries';
 import { selectSelectedAccountGroupId } from '../../../../selectors/multichainAccounts/accountTreeController';
 
 const OPTIMISTIC_POLL_INTERVAL = 2_000;
+const EMPTY_POSITIONS: PredictPosition[] = [];
 
 interface UsePredictPositionsOptions {
   enabled?: boolean;
@@ -15,6 +17,7 @@ interface UsePredictPositionsOptions {
   claimable?: boolean;
   marketId?: string;
   childMarketIds?: string[];
+  livePriceUpdates?: boolean;
 }
 
 function buildSelect(
@@ -51,6 +54,7 @@ export function usePredictPositions(options: UsePredictPositionsOptions = {}) {
     claimable,
     marketId,
     childMarketIds,
+    livePriceUpdates = false,
   } = options;
 
   const { ensurePolygonNetworkExists } = usePredictNetworkManagement();
@@ -74,7 +78,7 @@ export function usePredictPositions(options: UsePredictPositionsOptions = {}) {
     (p: PredictPosition) => p.optimistic,
   );
 
-  return useQuery({
+  const query = useQuery({
     ...queryOpts,
     enabled,
     refetchInterval: hasOptimistic
@@ -82,4 +86,11 @@ export function usePredictPositions(options: UsePredictPositionsOptions = {}) {
       : (refetchInterval ?? false),
     select: buildSelect(claimable, marketId, childMarketIds),
   });
+
+  usePredictLivePositions(query.data ?? EMPTY_POSITIONS, {
+    enabled: enabled && livePriceUpdates,
+    cacheAddress: address,
+  });
+
+  return query;
 }
diff --git a/app/components/UI/Predict/hooks/usePredictToastRegistrations.test.tsx b/app/components/UI/Predict/hooks/usePredictToastRegistrations.test.tsx
index 121c6143308..0721c9f2260 100644
--- a/app/components/UI/Predict/hooks/usePredictToastRegistrations.test.tsx
+++ b/app/components/UI/Predict/hooks/usePredictToastRegistrations.test.tsx
@@ -918,7 +918,7 @@ describe('usePredictToastRegistrations', () => {
       );
     });
 
-    it('suppresses the error toast when bottom sheet flag is ON and provider is mounted', () => {
+    it('suppresses the failure toast when bottom sheet flag is ON and provider is mounted (state-based trigger handles it)', () => {
       mockBottomSheetEnabled = true;
       mockProviderMounted = true;
       const handler = getHandler();
@@ -935,7 +935,7 @@ describe('usePredictToastRegistrations', () => {
       expect(showToast).not.toHaveBeenCalled();
     });
 
-    it('still shows the error toast when flag is ON but provider is not mounted', () => {
+    it('shows the plain failure toast when bottom sheet flag is ON but provider is not mounted (fallback)', () => {
       mockBottomSheetEnabled = true;
       mockProviderMounted = false;
       const handler = getHandler();
@@ -949,12 +949,16 @@ describe('usePredictToastRegistrations', () => {
         showToast,
       );
 
-      expect(showToast).toHaveBeenCalled();
+      expect(showToast).toHaveBeenCalledTimes(1);
+      expect(showToast).toHaveBeenCalledWith(
+        expect.not.objectContaining({
+          linkButtonOptions: expect.anything(),
+        }),
+      );
     });
 
-    it('still shows the error toast when flag is OFF even with provider mounted', () => {
+    it('shows the legacy plain failure toast when bottom sheet flag is OFF', () => {
       mockBottomSheetEnabled = false;
-      mockProviderMounted = true;
       const handler = getHandler();
 
       handler(
@@ -966,7 +970,12 @@ describe('usePredictToastRegistrations', () => {
         showToast,
       );
 
-      expect(showToast).toHaveBeenCalled();
+      expect(showToast).toHaveBeenCalledTimes(1);
+      expect(showToast).toHaveBeenCalledWith(
+        expect.not.objectContaining({
+          linkButtonOptions: expect.anything(),
+        }),
+      );
     });
   });
 });
diff --git a/app/components/UI/Predict/hooks/usePredictToastRegistrations.tsx b/app/components/UI/Predict/hooks/usePredictToastRegistrations.tsx
index aa2efc990db..84d345a9580 100644
--- a/app/components/UI/Predict/hooks/usePredictToastRegistrations.tsx
+++ b/app/components/UI/Predict/hooks/usePredictToastRegistrations.tsx
@@ -367,9 +367,10 @@ export const usePredictToastRegistrations = (): ToastRegistration[] => {
         }
 
         if (status === 'failed') {
-          // When the BottomSheet flow is on AND the provider is mounted,
-          // the provider auto-reopens the buy sheet with an inline error
-          // banner so we suppress the toast to avoid duplicate UI.
+          // When the bottom-sheet flow is on and the provider is mounted,
+          // the provider's state-based trigger (in PredictPreviewSheetContext)
+          // surfaces a persistent Retry toast for the same error. Skip here
+          // to avoid double-firing.
           if (bottomSheetEnabled && isPredictSheetProviderMounted()) {
             return;
           }
diff --git a/app/components/UI/Predict/providers/polymarket/WebSocketManager.test.ts b/app/components/UI/Predict/providers/polymarket/WebSocketManager.test.ts
index 9ded1b0bd71..775b51b8b02 100644
--- a/app/components/UI/Predict/providers/polymarket/WebSocketManager.test.ts
+++ b/app/components/UI/Predict/providers/polymarket/WebSocketManager.test.ts
@@ -525,6 +525,58 @@ describe('WebSocketManager', () => {
         }),
       );
     });
+
+    it('does not unsubscribe overlapping tokens still needed by another subscription', () => {
+      const manager = WebSocketManager.getInstance();
+      const homepageCallback = jest.fn();
+      const marketDetailsCallback = jest.fn();
+
+      manager.subscribeToMarketPrices(['token1', 'token2'], homepageCallback);
+      const unsubscribeMarketDetails = manager.subscribeToMarketPrices(
+        ['token1'],
+        marketDetailsCallback,
+      );
+      mockWebSocketInstances[0].simulateOpen();
+      mockWebSocketInstances[0].send.mockClear();
+
+      unsubscribeMarketDetails();
+
+      expect(mockWebSocketInstances[0].send).not.toHaveBeenCalledWith(
+        JSON.stringify({
+          operation: 'unsubscribe',
+          assets_ids: ['token1'],
+        }),
+      );
+    });
+
+    it('only unsubscribes tokens no longer needed by remaining subscriptions', () => {
+      const manager = WebSocketManager.getInstance();
+      const callback1 = jest.fn();
+      const callback2 = jest.fn();
+
+      manager.subscribeToMarketPrices(['token1', 'token2'], callback1);
+      const unsubscribe = manager.subscribeToMarketPrices(
+        ['token2', 'token3'],
+        callback2,
+      );
+      mockWebSocketInstances[0].simulateOpen();
+      mockWebSocketInstances[0].send.mockClear();
+
+      unsubscribe();
+
+      expect(mockWebSocketInstances[0].send).toHaveBeenCalledWith(
+        JSON.stringify({
+          operation: 'unsubscribe',
+          assets_ids: ['token3'],
+        }),
+      );
+      expect(mockWebSocketInstances[0].send).not.toHaveBeenCalledWith(
+        JSON.stringify({
+          operation: 'unsubscribe',
+          assets_ids: ['token2', 'token3'],
+        }),
+      );
+    });
   });
 
   describe('crypto price subscriptions', () => {
diff --git a/app/components/UI/Predict/providers/polymarket/WebSocketManager.ts b/app/components/UI/Predict/providers/polymarket/WebSocketManager.ts
index 32854b837a1..935e7c2628d 100644
--- a/app/components/UI/Predict/providers/polymarket/WebSocketManager.ts
+++ b/app/components/UI/Predict/providers/polymarket/WebSocketManager.ts
@@ -306,7 +306,14 @@ export class WebSocketManager {
         callbacks.delete(callback);
         if (callbacks.size === 0) {
           this.priceSubscriptions.delete(subscriptionKey);
-          this.sendMarketUnsubscribe(tokenIds);
+          const remainingTokenIds = this.getSubscribedMarketTokenIds();
+          const tokenIdsToUnsubscribe = tokenIds.filter(
+            (tokenId) => !remainingTokenIds.has(tokenId),
+          );
+
+          if (tokenIdsToUnsubscribe.length > 0) {
+            this.sendMarketUnsubscribe(tokenIdsToUnsubscribe);
+          }
         }
       }
 
@@ -449,12 +456,23 @@ export class WebSocketManager {
     );
   }
 
-  private resubscribeAllMarkets(): void {
-    const allTokenIds = new Set<string>();
+  private getSubscribedMarketTokenIds(): Set<string> {
+    const subscribedTokenIds = new Set<string>();
+
     this.priceSubscriptions.forEach((_, key) => {
-      key.split(',').forEach((id) => allTokenIds.add(id));
+      key.split(',').forEach((tokenId) => {
+        if (tokenId) {
+          subscribedTokenIds.add(tokenId);
+        }
+      });
     });
 
+    return subscribedTokenIds;
+  }
+
+  private resubscribeAllMarkets(): void {
+    const allTokenIds = this.getSubscribedMarketTokenIds();
+
     if (allTokenIds.size > 0) {
       this.sendMarketSubscribe(Array.from(allTokenIds));
     }
diff --git a/app/components/UI/Predict/providers/polymarket/constants.ts b/app/components/UI/Predict/providers/polymarket/constants.ts
index e302a31e5d7..56d34f5e0f6 100644
--- a/app/components/UI/Predict/providers/polymarket/constants.ts
+++ b/app/components/UI/Predict/providers/polymarket/constants.ts
@@ -89,10 +89,10 @@ export const COLLATERAL_ONRAMP_ADDRESS =
   '0x93070a847efEf7F70739046A929D47a521F5B8ee';
 
 export const CTF_COLLATERAL_ADAPTER_ADDRESS =
-  '0xADa100874d00e3331D00F2007a9c336a65009718';
+  '0xAdA100Db00Ca00073811820692005400218FcE1f';
 
 export const NEG_RISK_CTF_COLLATERAL_ADAPTER_ADDRESS =
-  '0xAdA200001000ef00D07553cEE7006808F895c6F1';
+  '0xadA2005600Dec949baf300f4C6120000bDB6eAab';
 
 export const POLYGON_PUSD_CAIP_ASSET_ID =
   `${POLYGON_MAINNET_CAIP_CHAIN_ID}/erc20:${MATIC_CONTRACTS_V2.collateral}` as const;
diff --git a/app/components/UI/Predict/providers/polymarket/utils.ts b/app/components/UI/Predict/providers/polymarket/utils.ts
index cd0204275ff..08c7a18fc69 100644
--- a/app/components/UI/Predict/providers/polymarket/utils.ts
+++ b/app/components/UI/Predict/providers/polymarket/utils.ts
@@ -976,6 +976,9 @@ export const fetchEventsFromPolymarketApi = async (
 
     queryParamsEvents = `${limitParam}&${active}&${archived}&${closed}&${ascending}&${offsetParam}&${liquidity}&${volume}`;
     queryParamsEvents += categoryTagMap[category];
+    if (customQueryParams) {
+      queryParamsEvents += `&${customQueryParams}`;
+    }
   }
 
   const limitPerType = `limit_per_type=${limit}`;
diff --git a/app/components/UI/Predict/types/index.ts b/app/components/UI/Predict/types/index.ts
index 31f0b8ee3d4..fa4e975816d 100644
--- a/app/components/UI/Predict/types/index.ts
+++ b/app/components/UI/Predict/types/index.ts
@@ -183,7 +183,8 @@ export type PredictSportsLeague =
   | 'bol1'
   | 'itc'
   | 'dfb'
-  | 'cde';
+  | 'cde'
+  | 'fifwc';
 
 // Game status
 export type PredictGameStatus = 'scheduled' | 'ongoing' | 'ended';
diff --git a/app/components/UI/Predict/utils/gameParser.ts b/app/components/UI/Predict/utils/gameParser.ts
index 7d7c4860768..9a3c50d53a2 100644
--- a/app/components/UI/Predict/utils/gameParser.ts
+++ b/app/components/UI/Predict/utils/gameParser.ts
@@ -207,6 +207,11 @@ const LEAGUE_SLUG_CONFIGS: Record<PredictSportsLeague, LeagueSlugConfig> = {
     teamOrder: 'home-away',
     tagSlug: 'coupe-de-france',
   },
+  fifwc: {
+    pattern: /^fifwc-([a-z0-9]+)-([a-z0-9]+)-(\d{4}-\d{2}-\d{2})$/,
+    teamOrder: 'home-away',
+    tagSlug: 'fifa-world-cup',
+  },
 };
 
 export type TeamLookup = (
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.test.tsx b/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.test.tsx
index ee5073613c8..0f1f551d571 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.test.tsx
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.test.tsx
@@ -24,6 +24,13 @@ let mockFakOrdersEnabled = false;
 let mockIsPreviewCalculating = false;
 let mockIsPlacingOrder = false;
 let mockErrorMessage: string | undefined;
+let mockErrorMessageSource:
+  | 'preview'
+  | 'below_minimum'
+  | 'insufficient_balance'
+  | 'blocking_pay_alert'
+  | 'order_error'
+  | undefined;
 let mockBuyErrorBanner: {
   variant: 'price_changed' | 'order_failed';
   title: string;
@@ -155,6 +162,8 @@ jest.mock('./hooks/usePredictBuyInfo', () => ({
 
 let mockIsCurrentTokenInsufficient = false;
 let mockHasAlternativeBalance = false;
+let mockIsPaymentSelectorNavigationLocked = false;
+const mockLockPaymentSelectorNavigation = jest.fn();
 
 jest.mock('./hooks/usePredictBuyConditions', () => ({
   usePredictBuyConditions: () => ({
@@ -167,12 +176,15 @@ jest.mock('./hooks/usePredictBuyConditions', () => ({
     isCurrentTokenInsufficient: mockIsCurrentTokenInsufficient,
     hasAlternativeBalance: mockHasAlternativeBalance,
     maxBetAmount: 50,
+    isPaymentSelectorNavigationLocked: mockIsPaymentSelectorNavigationLocked,
+    lockPaymentSelectorNavigation: mockLockPaymentSelectorNavigation,
   }),
 }));
 
 jest.mock('./hooks/usePredictBuyError', () => ({
   usePredictBuyError: () => ({
     errorMessage: mockErrorMessage,
+    errorMessageSource: mockErrorMessageSource,
     buyErrorBanner: mockBuyErrorBanner,
     isOrderNotFilled: false,
     resetOrderNotFilled: mockResetOrderNotFilled,
@@ -314,16 +326,24 @@ jest.mock('./components/PredictPayWithAnyTokenInfo', () => {
 });
 
 jest.mock('./components/PredictPayWithRow', () => {
-  const { Text } = jest.requireActual('react-native');
+  const { Pressable, Text } = jest.requireActual('react-native');
   return {
     PredictPayWithRow: ({
       disabled,
       variant,
+      onPaymentSelectorOpen,
     }: {
       disabled?: boolean;
       variant?: string;
+      onPaymentSelectorOpen?: () => void;
     }) => (
-      <Text testID="predict-pay-with-row">{`disabled-${String(disabled)} variant-${variant ?? 'default'}`}</Text>
+      <Pressable
+        testID="predict-pay-with-row"
+        disabled={disabled}
+        onPress={onPaymentSelectorOpen}
+      >
+        <Text>{`disabled-${String(disabled)} variant-${variant ?? 'default'}`}</Text>
+      </Pressable>
     ),
   };
 });
@@ -406,9 +426,11 @@ describe('PredictBuyWithAnyToken', () => {
     mockIsPreviewCalculating = false;
     mockIsPlacingOrder = false;
     mockErrorMessage = undefined;
+    mockErrorMessageSource = undefined;
     mockBuyErrorBanner = null;
     mockIsCurrentTokenInsufficient = false;
     mockHasAlternativeBalance = false;
+    mockIsPaymentSelectorNavigationLocked = false;
     mockUseSelector.mockImplementation((selector) => {
       if (typeof selector === 'function') {
         return selector({
@@ -476,6 +498,27 @@ describe('PredictBuyWithAnyToken', () => {
     );
   });
 
+  it('locks the buy button when the payment selector opens and unlocks one second after focus returns', () => {
+    renderWithProvider(<PredictBuyWithAnyToken />);
+
+    fireEvent.press(screen.getByTestId('predict-pay-with-row'));
+
+    expect(mockLockPaymentSelectorNavigation).toHaveBeenCalledTimes(1);
+  });
+
+  it('uses the payment selector lock condition to disable the buy button and pay row', () => {
+    mockIsPaymentSelectorNavigationLocked = true;
+
+    renderWithProvider(<PredictBuyWithAnyToken />);
+
+    expect(screen.getByTestId('predict-buy-action-button')).toHaveTextContent(
+      /button-disabled-true/,
+    );
+    expect(screen.getByTestId('predict-pay-with-row')).toHaveTextContent(
+      /disabled-true/,
+    );
+  });
+
   describe('sheet mode', () => {
     const sheetProps = {
       mode: 'sheet' as const,
@@ -662,6 +705,7 @@ describe('PredictBuyWithAnyToken', () => {
       expect(mockNavigate).toHaveBeenCalledWith(
         Routes.CONFIRMATION_PAY_WITH_MODAL,
       );
+      expect(mockLockPaymentSelectorNavigation).toHaveBeenCalledTimes(1);
       expect(mockHandleConfirm).not.toHaveBeenCalled();
     });
 
@@ -771,10 +815,11 @@ describe('PredictBuyWithAnyToken', () => {
       expect(mockNavigate).not.toHaveBeenCalled();
     });
 
-    it('suppresses error text in Change Payment Method mode', () => {
+    it('suppresses insufficient balance helper text in Change Payment Method mode', () => {
       mockIsCurrentTokenInsufficient = true;
       mockHasAlternativeBalance = true;
       mockErrorMessage = 'Not enough funds';
+      mockErrorMessageSource = 'insufficient_balance';
 
       renderWithProvider(<PredictBuyWithAnyToken {...sheetProps} />);
 
@@ -783,10 +828,11 @@ describe('PredictBuyWithAnyToken', () => {
       );
     });
 
-    it('suppresses error text in Add Funds mode', () => {
+    it('suppresses insufficient balance helper text in Add Funds mode', () => {
       mockIsCurrentTokenInsufficient = true;
       mockHasAlternativeBalance = false;
       mockErrorMessage = 'Not enough funds';
+      mockErrorMessageSource = 'insufficient_balance';
 
       renderWithProvider(<PredictBuyWithAnyToken {...sheetProps} />);
 
@@ -794,5 +840,37 @@ describe('PredictBuyWithAnyToken', () => {
         'no-error',
       );
     });
+
+    it('keeps transaction pay alert text visible in Change Payment Method mode', () => {
+      mockIsCurrentTokenInsufficient = true;
+      mockHasAlternativeBalance = true;
+      mockErrorMessage = 'Add less or use a different token';
+      mockErrorMessageSource = 'blocking_pay_alert';
+
+      renderWithProvider(<PredictBuyWithAnyToken {...sheetProps} />);
+
+      expect(screen.getByTestId('predict-buy-error')).toHaveTextContent(
+        'Add less or use a different token',
+      );
+    });
+
+    it('keeps transaction pay alert text visible even when a sheet banner exists', () => {
+      mockErrorMessage = 'Add less or use a different token';
+      mockErrorMessageSource = 'blocking_pay_alert';
+      mockBuyErrorBanner = {
+        variant: 'order_failed',
+        title: 'Order failed',
+        description: 'Please retry',
+      };
+
+      renderWithProvider(<PredictBuyWithAnyToken {...sheetProps} />);
+
+      expect(screen.getByTestId('predict-buy-error')).toHaveTextContent(
+        'Add less or use a different token',
+      );
+      expect(
+        screen.getByTestId('predict-buy-preview-order-failed-banner'),
+      ).toBeOnTheScreen();
+    });
   });
 });
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.tsx b/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.tsx
index 4e0837547c5..421d193935c 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.tsx
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/PredictBuyWithAnyToken.tsx
@@ -68,6 +68,52 @@ import {
   predictBuyPreviewSessionRef,
 } from '../PredictBuyPreview/PredictBuyPreview';
 
+interface BuyActionButtonStateParams {
+  isPaymentSelectorNavigationLocked: boolean;
+  isBannerActive: boolean;
+  isChangePaymentMode: boolean;
+  isAddFundsMode: boolean;
+  isRetrying: boolean;
+  hasPreview: boolean;
+  canPlaceBet: boolean;
+}
+
+const getBuyActionButtonState = ({
+  isPaymentSelectorNavigationLocked,
+  isBannerActive,
+  isChangePaymentMode,
+  isAddFundsMode,
+  isRetrying,
+  hasPreview,
+  canPlaceBet,
+}: BuyActionButtonStateParams) => {
+  if (isPaymentSelectorNavigationLocked) {
+    return {
+      disabled: true,
+      reducedOpacity: true,
+    };
+  }
+
+  if (!isBannerActive && (isChangePaymentMode || isAddFundsMode)) {
+    return {
+      disabled: false,
+      reducedOpacity: false,
+    };
+  }
+
+  if (isBannerActive) {
+    return {
+      disabled: isRetrying || !hasPreview,
+      reducedOpacity: !hasPreview,
+    };
+  }
+
+  return {
+    disabled: !canPlaceBet,
+    reducedOpacity: !canPlaceBet,
+  };
+};
+
 const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
   const tw = useTailwind();
   const keypadRef = useRef<PredictKeypadHandles>(null);
@@ -186,6 +232,8 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
     hasAlternativeBalance,
     maxBetAmount,
     isPaySystemSettling,
+    isPaymentSelectorNavigationLocked,
+    lockPaymentSelectorNavigation,
   } = usePredictBuyConditions({
     currentValue,
     preview,
@@ -193,12 +241,12 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
     isUserInputChange,
     isConfirming,
     totalPayForPredictBalance,
-    isInputFocused,
     hasBlockingPayAlerts,
   });
 
   const {
     errorMessage,
+    errorMessageSource,
     buyErrorBanner,
     isOrderNotFilled,
     resetOrderNotFilled,
@@ -227,8 +275,9 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
   );
 
   const handleChangePaymentMethod = useCallback(() => {
+    lockPaymentSelectorNavigation();
     navigation.navigate(Routes.CONFIRMATION_PAY_WITH_MODAL);
-  }, [navigation]);
+  }, [lockPaymentSelectorNavigation, navigation]);
 
   const handleAddFunds = useCallback(() => {
     if (isSheetMode) {
@@ -297,6 +346,10 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
   }, [isSheetMode, isBannerActive, isInputFocused, setIsInputFocused]);
 
   const handleBuyButtonPress = useCallback(() => {
+    if (isPaymentSelectorNavigationLocked) {
+      return;
+    }
+
     if (isBannerActive) {
       handleRetryWithBestPrice();
       return;
@@ -312,6 +365,7 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
     handleConfirm();
   }, [
     isBannerActive,
+    isPaymentSelectorNavigationLocked,
     isChangePaymentMode,
     isAddFundsMode,
     handleRetryWithBestPrice,
@@ -336,6 +390,26 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
     ? { twClassName: 'bg-background-default' }
     : { style: tw.style('flex-1 bg-background-default') };
 
+  const {
+    disabled: isBuyActionButtonDisabled,
+    reducedOpacity: showBuyActionButtonReducedOpacity,
+  } = getBuyActionButtonState({
+    isPaymentSelectorNavigationLocked,
+    isBannerActive,
+    isChangePaymentMode,
+    isAddFundsMode,
+    isRetrying,
+    hasPreview: Boolean(preview),
+    canPlaceBet,
+  });
+  const shouldSuppressInlineError =
+    (isChangePaymentMode || isAddFundsMode) &&
+    errorMessageSource === 'insufficient_balance';
+  const shouldRenderInlineError =
+    !isSheetMode ||
+    !buyErrorBanner ||
+    errorMessageSource === 'blocking_pay_alert';
+
   return (
     <Wrapper {...wrapperProps}>
       {!isSheetMode && (
@@ -396,16 +470,17 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
               hideAvailableBalance={false}
             />
             {payWithAnyTokenEnabled && (
-              <PredictPayWithRow disabled={isPlacingOrder} />
+              <PredictPayWithRow
+                disabled={isPlacingOrder || isPaymentSelectorNavigationLocked}
+                onPaymentSelectorOpen={lockPaymentSelectorNavigation}
+              />
             )}
           </Box>
         </ScrollView>
       )}
-      {!(isSheetMode && buyErrorBanner) && (
+      {shouldRenderInlineError && (
         <PredictBuyError
-          errorMessage={
-            isChangePaymentMode || isAddFundsMode ? undefined : errorMessage
-          }
+          errorMessage={shouldSuppressInlineError ? undefined : errorMessage}
         />
       )}
       {!isSheetMode && (
@@ -431,9 +506,10 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
         )}
         {payWithAnyTokenEnabled && isSheetMode && (
           <PredictPayWithRow
-            disabled={isPlacingOrder}
+            disabled={isPlacingOrder || isPaymentSelectorNavigationLocked}
             variant="row"
             availableBalance={availableBalanceDisplay}
+            onPaymentSelectorOpen={lockPaymentSelectorNavigation}
           />
         )}
         <PredictFeeSummary
@@ -459,20 +535,8 @@ const PredictBuyWithAnyToken = (props: PredictBuyPreviewProps) => {
         <PredictBuyActionButton
           isLoading={isPlacingOrder || (isBannerActive && isRetrying)}
           onPress={handleBuyButtonPress}
-          disabled={
-            !isBannerActive && (isChangePaymentMode || isAddFundsMode)
-              ? false
-              : isBannerActive
-                ? isRetrying || !preview
-                : !canPlaceBet
-          }
-          showReducedOpacity={
-            !isBannerActive && (isChangePaymentMode || isAddFundsMode)
-              ? false
-              : isBannerActive
-                ? !preview
-                : !canPlaceBet
-          }
+          disabled={isBuyActionButtonDisabled}
+          showReducedOpacity={showBuyActionButtonReducedOpacity}
           outcomeTokenTitle={outcomeToken?.title}
           sharePrice={preview?.sharePrice ?? outcomeToken?.price ?? 0}
           isSheetMode={isSheetMode}
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithAnyTokenInfo/PredictPayWithAnyTokenInfo.test.tsx b/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithAnyTokenInfo/PredictPayWithAnyTokenInfo.test.tsx
index 1736e95ae32..0bd8502a04d 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithAnyTokenInfo/PredictPayWithAnyTokenInfo.test.tsx
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithAnyTokenInfo/PredictPayWithAnyTokenInfo.test.tsx
@@ -385,6 +385,37 @@ describe('PredictPayWithAnyTokenInfo', () => {
       expect(mockUpdatePendingAmount).not.toHaveBeenCalled();
     });
 
+    it('re-emits the same amount when the active transaction changes', () => {
+      mockActiveTransactionMeta = { id: 'tx-1' };
+      mockAmountHuman = '100';
+
+      const { rerender } = render(
+        <PredictPayWithAnyTokenInfo
+          currentValue={100}
+          preview={defaultPreview}
+          isInputFocused={false}
+        />,
+      );
+
+      expect(mockUpdatePendingAmount).toHaveBeenCalledWith('100');
+      expect(mockUpdateTokenAmountCallback).toHaveBeenCalledWith('100');
+
+      mockUpdatePendingAmount.mockClear();
+      mockUpdateTokenAmountCallback.mockClear();
+      mockActiveTransactionMeta = { id: 'tx-2' };
+
+      rerender(
+        <PredictPayWithAnyTokenInfo
+          currentValue={100}
+          preview={defaultPreview}
+          isInputFocused={false}
+        />,
+      );
+
+      expect(mockUpdatePendingAmount).toHaveBeenCalledWith('100');
+      expect(mockUpdateTokenAmountCallback).toHaveBeenCalledWith('100');
+    });
+
     it('updates deposit amount when value changes after unfocus', () => {
       mockActiveTransactionMeta = { id: 'tx-1' };
 
@@ -628,6 +659,62 @@ describe('PredictPayWithAnyTokenInfo', () => {
     });
   });
 
+  describe('payment token transitions', () => {
+    it('does not re-emit the same token amount after Predict balance', () => {
+      mockIsPredictBalanceSelected = false;
+      mockSelectedPaymentToken = {
+        address: '0xabc123',
+        chainId: '0x1',
+      };
+      mockActiveTransactionMeta = { id: 'tx-1' };
+      mockAmountHuman = '100';
+
+      const { rerender } = render(
+        <PredictPayWithAnyTokenInfo
+          currentValue={100}
+          preview={defaultPreview}
+          isInputFocused={false}
+        />,
+      );
+
+      expect(mockUpdatePendingAmount).toHaveBeenCalledWith('100');
+      expect(mockUpdateTokenAmountCallback).toHaveBeenCalledWith('100');
+
+      jest.clearAllMocks();
+      mockIsPredictBalanceSelected = true;
+      mockSelectedPaymentToken = undefined;
+
+      rerender(
+        <PredictPayWithAnyTokenInfo
+          currentValue={100}
+          preview={defaultPreview}
+          isInputFocused={false}
+        />,
+      );
+
+      expect(mockUpdatePendingAmount).not.toHaveBeenCalled();
+      expect(mockUpdateTokenAmountCallback).not.toHaveBeenCalled();
+
+      jest.clearAllMocks();
+      mockIsPredictBalanceSelected = false;
+      mockSelectedPaymentToken = {
+        address: '0xAbC123',
+        chainId: '0X1',
+      };
+
+      rerender(
+        <PredictPayWithAnyTokenInfo
+          currentValue={100}
+          preview={defaultPreview}
+          isInputFocused={false}
+        />,
+      );
+
+      expect(mockUpdatePendingAmount).not.toHaveBeenCalled();
+      expect(mockUpdateTokenAmountCallback).not.toHaveBeenCalled();
+    });
+  });
+
   describe('setPayToken effect', () => {
     it('calls setPayToken when selected token is not applied', () => {
       mockActiveTransactionMeta = { id: 'tx-1' };
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithAnyTokenInfo/PredictPayWithAnyTokenInfo.tsx b/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithAnyTokenInfo/PredictPayWithAnyTokenInfo.tsx
index 1d1ac21d6ce..44db3ee4934 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithAnyTokenInfo/PredictPayWithAnyTokenInfo.tsx
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithAnyTokenInfo/PredictPayWithAnyTokenInfo.tsx
@@ -89,39 +89,68 @@ function PredictPayWithAnyTokenInfoInner({
   }, [canTriggerDepositAmountCalculation, computedDepositAmount]);
 
   const hasValidDepositAmount = useMemo(
-    () => depositAmount !== '' && transactionMeta,
-    [depositAmount, transactionMeta],
+    () =>
+      !isPredictBalanceSelected &&
+      depositAmount !== '' &&
+      Boolean(transactionMeta),
+    [depositAmount, isPredictBalanceSelected, transactionMeta],
   );
 
-  const lastEmittedDepositRef = useRef('');
-  const lastEmittedAmountHumanRef = useRef('');
+  const emissionKey = useMemo(() => {
+    const selectedTokenAddress =
+      selectedPaymentToken?.address?.toLowerCase() ?? '';
+    const selectedTokenChainId =
+      selectedPaymentToken?.chainId?.toLowerCase() ?? '';
+
+    return `${transactionMeta?.id ?? ''}:${selectedTokenAddress}:${selectedTokenChainId}`;
+  }, [
+    selectedPaymentToken?.address,
+    selectedPaymentToken?.chainId,
+    transactionMeta?.id,
+  ]);
+
+  const lastEmittedDepositRef = useRef({ key: '', value: '' });
+  const lastEmittedAmountHumanRef = useRef({ key: '', value: '' });
 
   useEffect(() => {
+    const lastEmittedDeposit = lastEmittedDepositRef.current;
+
     if (
       !hasValidDepositAmount ||
-      depositAmount === lastEmittedDepositRef.current
+      (depositAmount === lastEmittedDeposit.value &&
+        emissionKey === lastEmittedDeposit.key)
     ) {
       return;
     }
-    lastEmittedDepositRef.current = depositAmount;
+    lastEmittedDepositRef.current = {
+      key: emissionKey,
+      value: depositAmount,
+    };
     updatePendingAmount(depositAmount);
     EngineService.flushState();
-  }, [depositAmount, hasValidDepositAmount, updatePendingAmount]);
+  }, [depositAmount, emissionKey, hasValidDepositAmount, updatePendingAmount]);
 
   useEffect(() => {
+    const lastEmittedAmountHuman = lastEmittedAmountHumanRef.current;
+
     if (
       !amountHuman ||
       amountHuman === '0' ||
       !hasValidDepositAmount ||
-      amountHuman === lastEmittedAmountHumanRef.current
+      (amountHuman === lastEmittedAmountHuman.value &&
+        emissionKey === lastEmittedAmountHuman.key)
     ) {
       return;
     }
-    lastEmittedAmountHumanRef.current = amountHuman;
+    lastEmittedAmountHumanRef.current = {
+      key: emissionKey,
+      value: amountHuman,
+    };
     updateTokenAmountCallback(amountHuman);
     EngineService.flushState();
   }, [
     amountHuman,
+    emissionKey,
     updateTokenAmountCallback,
     depositAmount,
     hasValidDepositAmount,
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithRow/PredictPayWithRow.test.tsx b/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithRow/PredictPayWithRow.test.tsx
index 747385940d2..5cd14184088 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithRow/PredictPayWithRow.test.tsx
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithRow/PredictPayWithRow.test.tsx
@@ -165,6 +165,24 @@ describe('PredictPayWithRow', () => {
     );
   });
 
+  it('calls onPaymentSelectorOpen before navigating to pay-with modal', () => {
+    const callOrder: string[] = [];
+    const onPaymentSelectorOpen = jest.fn(() => callOrder.push('lock'));
+    mockNavigate.mockImplementation(() => callOrder.push('navigate'));
+
+    renderWithProvider(
+      <PredictPayWithRow onPaymentSelectorOpen={onPaymentSelectorOpen} />,
+    );
+
+    fireEvent.press(screen.getByText('Pay with USDC'));
+
+    expect(onPaymentSelectorOpen).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenCalledWith(
+      Routes.CONFIRMATION_PAY_WITH_MODAL,
+    );
+    expect(callOrder).toStrictEqual(['lock', 'navigate']);
+  });
+
   it('does not navigate when disabled prop is true', () => {
     renderWithProvider(<PredictPayWithRow disabled />);
 
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithRow/PredictPayWithRow.tsx b/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithRow/PredictPayWithRow.tsx
index 929956cc78b..44bd7d28144 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithRow/PredictPayWithRow.tsx
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/components/PredictPayWithRow/PredictPayWithRow.tsx
@@ -39,6 +39,7 @@ interface PredictPayWithRowProps {
   chevronRight?: boolean;
   variant?: PredictPayWithRowVariant;
   availableBalance?: string;
+  onPaymentSelectorOpen?: () => void;
 }
 
 export function PredictPayWithRow({
@@ -46,6 +47,7 @@ export function PredictPayWithRow({
   chevronRight = false,
   variant = 'pill',
   availableBalance,
+  onPaymentSelectorOpen,
 }: PredictPayWithRowProps) {
   usePredictDefaultPaymentToken();
   const navigation = useNavigation();
@@ -66,8 +68,9 @@ export function PredictPayWithRow({
 
   const handlePress = useCallback(() => {
     if (!canEdit) return;
+    onPaymentSelectorOpen?.();
     navigation.navigate(Routes.CONFIRMATION_PAY_WITH_MODAL);
-  }, [canEdit, navigation]);
+  }, [canEdit, navigation, onPaymentSelectorOpen]);
 
   const label = strings('confirm.label.pay_with');
   const displaySymbol = showPredictBalance
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 b6220e1309d..b3b84580fc6 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.test.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.test.ts
@@ -1,6 +1,10 @@
 import { act, renderHook } from '@testing-library/react-native';
 import { usePredictBuyConditions } from './usePredictBuyConditions';
 import { ActiveOrderState, OrderPreview } from '../../../types';
+import {
+  PAYMENT_SELECTOR_NAVIGATION_SAFETY_UNLOCK_MS,
+  PAYMENT_SELECTOR_NAVIGATION_UNLOCK_DELAY_MS,
+} from '../../../constants/transactions';
 
 let mockIsBalanceLoading = false;
 let mockAvailableBalance = 100;
@@ -24,6 +28,29 @@ let mockAvailableTokens: {
 let mockPredictBalance = 0;
 let mockQuotes: unknown[] = [];
 const mockResetSelectedPaymentToken = jest.fn();
+const mockNavigationListeners: Record<string, Set<() => void>> = {};
+const mockAddListener = jest.fn((eventName: string, callback: () => void) => {
+  if (!mockNavigationListeners[eventName]) {
+    mockNavigationListeners[eventName] = new Set();
+  }
+
+  mockNavigationListeners[eventName].add(callback);
+
+  return () => {
+    mockNavigationListeners[eventName]?.delete(callback);
+  };
+});
+const mockEmitNavigationEvent = (eventName: string) => {
+  mockNavigationListeners[eventName]?.forEach((callback) => callback());
+};
+const mockNavigation = {
+  addListener: mockAddListener,
+};
+
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: () => mockNavigation,
+}));
 
 jest.mock('./usePredictBuyAvailableBalance', () => ({
   usePredictBuyAvailableBalance: () => ({
@@ -91,14 +118,16 @@ const defaultParams = {
   isPreviewCalculating: false,
   isUserInputChange: false,
   isConfirming: false,
-  totalPayForPredictBalance: 0,
-  isInputFocused: false,
+  totalPayForPredictBalance: 10.5,
   hasBlockingPayAlerts: false,
 };
 
 describe('usePredictBuyConditions', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    Object.keys(mockNavigationListeners).forEach((eventName) => {
+      delete mockNavigationListeners[eventName];
+    });
     mockIsBalanceLoading = false;
     mockAvailableBalance = 100;
     mockActiveOrder = null;
@@ -115,9 +144,80 @@ describe('usePredictBuyConditions', () => {
   });
 
   afterEach(() => {
+    jest.useRealTimers();
     jest.restoreAllMocks();
   });
 
+  describe('payment selector navigation lock', () => {
+    it('locks immediately and unlocks one second after focus returns from the selector', () => {
+      jest.useFakeTimers();
+
+      const { result } = renderHook(() =>
+        usePredictBuyConditions(defaultParams),
+      );
+
+      expect(result.current.isPaymentSelectorNavigationLocked).toBe(false);
+      expect(result.current.canPlaceBet).toBe(true);
+
+      act(() => {
+        result.current.lockPaymentSelectorNavigation();
+      });
+
+      expect(result.current.isPaymentSelectorNavigationLocked).toBe(true);
+      expect(result.current.canPlaceBet).toBe(false);
+
+      act(() => {
+        mockEmitNavigationEvent('blur');
+        mockEmitNavigationEvent('focus');
+      });
+
+      act(() => {
+        jest.advanceTimersByTime(
+          PAYMENT_SELECTOR_NAVIGATION_UNLOCK_DELAY_MS - 1,
+        );
+      });
+
+      expect(result.current.isPaymentSelectorNavigationLocked).toBe(true);
+
+      act(() => {
+        jest.advanceTimersByTime(1);
+      });
+
+      expect(result.current.isPaymentSelectorNavigationLocked).toBe(false);
+      expect(result.current.canPlaceBet).toBe(true);
+    });
+
+    it('unlocks after the safety timeout when navigation events do not fire', () => {
+      jest.useFakeTimers();
+
+      const { result } = renderHook(() =>
+        usePredictBuyConditions(defaultParams),
+      );
+
+      act(() => {
+        result.current.lockPaymentSelectorNavigation();
+      });
+
+      expect(result.current.isPaymentSelectorNavigationLocked).toBe(true);
+      expect(result.current.canPlaceBet).toBe(false);
+
+      act(() => {
+        jest.advanceTimersByTime(
+          PAYMENT_SELECTOR_NAVIGATION_SAFETY_UNLOCK_MS - 1,
+        );
+      });
+
+      expect(result.current.isPaymentSelectorNavigationLocked).toBe(true);
+
+      act(() => {
+        jest.advanceTimersByTime(1);
+      });
+
+      expect(result.current.isPaymentSelectorNavigationLocked).toBe(false);
+      expect(result.current.canPlaceBet).toBe(true);
+    });
+  });
+
   describe('isBelowMinimum', () => {
     it('returns true when currentValue is between 0 and MINIMUM_BET', () => {
       const { result } = renderHook(() =>
@@ -704,7 +804,7 @@ describe('usePredictBuyConditions', () => {
     });
 
     it('is true immediately after an ERC20 token is selected (synchronous — no 1-frame gap)', () => {
-      // isPaySystemSettling is derived synchronously from lastSettledTokenAddress,
+      // isPaySystemSettling is derived synchronously from lastSettledTokenKey,
       // so it is true from the very first render after the token identity changes.
       mockIsPredictBalanceSelected = false;
       mockSelectedPaymentToken = { address: '0xDAI', chainId: '1' };
@@ -899,6 +999,35 @@ describe('usePredictBuyConditions', () => {
       expect(result.current.isPaySystemSettling).toBe(true);
     });
 
+    it('resets to true when the same ERC20 address is selected on a different chain', () => {
+      mockIsPredictBalanceSelected = false;
+      mockSelectedPaymentToken = { address: '0xUSDC', chainId: '0x1' };
+      mockIsPayQuoteLoading = true;
+      mockIsPayTotalsLoading = true;
+      mockQuotes = [];
+
+      const { result, rerender } = renderHook(() =>
+        usePredictBuyConditions({ ...defaultParams, currentValue: 1 }),
+      );
+
+      act(() => {
+        mockIsPayQuoteLoading = false;
+        mockIsPayTotalsLoading = false;
+        mockQuotes = [{ id: 'q1' }];
+      });
+      rerender({});
+      expect(result.current.isPaySystemSettling).toBe(false);
+
+      act(() => {
+        mockSelectedPaymentToken = { address: '0xUSDC', chainId: '0x2' };
+        mockQuotes = [];
+      });
+      rerender({});
+
+      expect(result.current.isPaySystemSettling).toBe(true);
+      expect(result.current.canPlaceBet).toBe(false);
+    });
+
     it('keeps canPlaceBet false while settling, even if all other conditions are met', () => {
       mockIsPredictBalanceSelected = false;
       mockSelectedPaymentToken = { address: '0xDAI', chainId: '1' };
@@ -913,7 +1042,7 @@ describe('usePredictBuyConditions', () => {
       expect(result.current.canPlaceBet).toBe(false);
     });
 
-    it('resets settling when switching back to Predict balance', () => {
+    it('keeps the same token settled when switching through Predict balance without changing amount', () => {
       mockIsPredictBalanceSelected = false;
       mockSelectedPaymentToken = { address: '0xUSDC', chainId: '1' };
       mockIsPayQuoteLoading = true;
@@ -933,7 +1062,7 @@ describe('usePredictBuyConditions', () => {
       rerender({});
       expect(result.current.isPaySystemSettling).toBe(false);
 
-      // Switch back to Predict balance — resets lastSettledTokenAddress
+      // Switch back to Predict balance — keeps the settled payment key.
       act(() => {
         mockIsPredictBalanceSelected = true;
         mockSelectedPaymentToken = null;
@@ -941,13 +1070,59 @@ describe('usePredictBuyConditions', () => {
       rerender({});
       expect(result.current.isPaySystemSettling).toBe(false);
 
-      // Re-select USDC — must settle again (quotes may need re-fetching)
+      // Re-select USDC for the same amount — can reuse the existing quote state.
       act(() => {
         mockIsPredictBalanceSelected = false;
         mockSelectedPaymentToken = { address: '0xUSDC', chainId: '1' };
       });
       rerender({});
+      expect(result.current.isPaySystemSettling).toBe(false);
+      expect(result.current.canPlaceBet).toBe(true);
+    });
+
+    it('settles again when the same token is re-selected after the amount changes', () => {
+      mockIsPredictBalanceSelected = false;
+      mockSelectedPaymentToken = { address: '0xUSDC', chainId: '1' };
+      mockIsPayQuoteLoading = true;
+      mockIsPayTotalsLoading = true;
+      mockQuotes = [];
+
+      const { result, rerender } = renderHook(
+        ({
+          totalPayForPredictBalance,
+        }: {
+          totalPayForPredictBalance: number;
+        }) =>
+          usePredictBuyConditions({
+            ...defaultParams,
+            currentValue: 1,
+            totalPayForPredictBalance,
+          }),
+        { initialProps: { totalPayForPredictBalance: 10.5 } },
+      );
+
+      act(() => {
+        mockIsPayQuoteLoading = false;
+        mockIsPayTotalsLoading = false;
+        mockQuotes = [{ id: 'q1' }];
+      });
+      rerender({ totalPayForPredictBalance: 10.5 });
+      expect(result.current.isPaySystemSettling).toBe(false);
+
+      act(() => {
+        mockIsPredictBalanceSelected = true;
+        mockSelectedPaymentToken = null;
+      });
+      rerender({ totalPayForPredictBalance: 10.5 });
+
+      act(() => {
+        mockIsPredictBalanceSelected = false;
+        mockSelectedPaymentToken = { address: '0xUSDC', chainId: '1' };
+      });
+      rerender({ totalPayForPredictBalance: 11 });
+
       expect(result.current.isPaySystemSettling).toBe(true);
+      expect(result.current.canPlaceBet).toBe(false);
     });
   });
 
@@ -989,23 +1164,8 @@ describe('usePredictBuyConditions', () => {
     });
   });
 
-  describe('selected payment token reset effect', () => {
-    it('resets the selected token when predict balance covers the total and input is not focused', () => {
-      mockPredictBalance = 20;
-      mockIsPredictBalanceSelected = false;
-
-      renderHook(() =>
-        usePredictBuyConditions({
-          ...defaultParams,
-          totalPayForPredictBalance: 20,
-          isInputFocused: false,
-        }),
-      );
-
-      expect(mockResetSelectedPaymentToken).toHaveBeenCalledTimes(1);
-    });
-
-    it('does not reset the selected token while the input is focused', () => {
+  describe('manual payment token selection', () => {
+    it('does not reset the selected token after initialization, even when Predict balance covers the total', () => {
       mockPredictBalance = 20;
       mockIsPredictBalanceSelected = false;
 
@@ -1013,22 +1173,6 @@ describe('usePredictBuyConditions', () => {
         usePredictBuyConditions({
           ...defaultParams,
           totalPayForPredictBalance: 20,
-          isInputFocused: true,
-        }),
-      );
-
-      expect(mockResetSelectedPaymentToken).not.toHaveBeenCalled();
-    });
-
-    it('does not reset the selected token when predict balance is already selected', () => {
-      mockPredictBalance = 20;
-      mockIsPredictBalanceSelected = true;
-
-      renderHook(() =>
-        usePredictBuyConditions({
-          ...defaultParams,
-          totalPayForPredictBalance: 20,
-          isInputFocused: false,
         }),
       );
 
@@ -1043,7 +1187,6 @@ describe('usePredictBuyConditions', () => {
         usePredictBuyConditions({
           ...defaultParams,
           totalPayForPredictBalance: 20,
-          isInputFocused: false,
         }),
       );
 
@@ -1058,7 +1201,6 @@ describe('usePredictBuyConditions', () => {
         usePredictBuyConditions({
           ...defaultParams,
           totalPayForPredictBalance: 0,
-          isInputFocused: false,
         }),
       );
 
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.ts b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.ts
index e528fe076de..fcf06a2624e 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyConditions.ts
@@ -1,12 +1,17 @@
 import { BigNumber } from 'bignumber.js';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useNavigation } from '@react-navigation/native';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import {
   useIsTransactionPayLoading,
   useIsTransactionPayQuoteLoading,
   useTransactionPayQuotes,
 } from '../../../../../Views/confirmations/hooks/pay/useTransactionPayData';
 import { useTransactionPayAvailableTokens } from '../../../../../Views/confirmations/hooks/pay/useTransactionPayAvailableTokens';
-import { MINIMUM_BET } from '../../../constants/transactions';
+import {
+  MINIMUM_BET,
+  PAYMENT_SELECTOR_NAVIGATION_SAFETY_UNLOCK_MS,
+  PAYMENT_SELECTOR_NAVIGATION_UNLOCK_DELAY_MS,
+} from '../../../constants/transactions';
 import { usePredictBalance } from '../../../hooks/usePredictBalance';
 import { usePredictDeposit } from '../../../hooks/usePredictDeposit';
 import { usePredictPaymentToken } from '../../../hooks/usePredictPaymentToken';
@@ -20,7 +25,6 @@ interface UsePredictBuyConditionsParams {
   isUserInputChange: boolean;
   isConfirming: boolean;
   totalPayForPredictBalance: number;
-  isInputFocused: boolean;
   hasBlockingPayAlerts: boolean;
 }
 
@@ -31,20 +35,17 @@ export const usePredictBuyConditions = ({
   isUserInputChange,
   isConfirming,
   totalPayForPredictBalance,
-  isInputFocused,
   hasBlockingPayAlerts,
 }: UsePredictBuyConditionsParams) => {
+  const navigation = useNavigation();
   const { isBalanceLoading, availableBalance } =
     usePredictBuyAvailableBalance();
   const isPayTotalsLoading = useIsTransactionPayLoading();
   const isPayQuoteLoading = useIsTransactionPayQuoteLoading();
   const quotes = useTransactionPayQuotes();
   const { isDepositPending } = usePredictDeposit();
-  const {
-    isPredictBalanceSelected,
-    selectedPaymentToken,
-    resetSelectedPaymentToken,
-  } = usePredictPaymentToken();
+  const { isPredictBalanceSelected, selectedPaymentToken } =
+    usePredictPaymentToken();
   const { data: predictBalance = 0 } = usePredictBalance();
   const { availableTokens } = useTransactionPayAvailableTokens();
 
@@ -57,22 +58,116 @@ export const usePredictBuyConditions = ({
   // falsely mark a loading cycle as "seen" — which would cause a premature
   // settling exit (Bug 3).
   const hasSeenLoadingRef = useRef(false);
+  const [
+    isPaymentSelectorNavigationLocked,
+    setIsPaymentSelectorNavigationLocked,
+  ] = useState(false);
+  const isPaymentSelectorNavigationLockedRef = useRef(false);
+  const didBlurAfterPaymentSelectorOpenRef = useRef(false);
+  const paymentSelectorUnlockTimerRef = useRef<ReturnType<
+    typeof setTimeout
+  > | null>(null);
 
-  // Tracks the address of the last ERC20 token for which a full quote-loading
-  // cycle has completed. Compared synchronously each render to derive
-  // `isPaySystemSettling` — true from the very first render after the token
-  // identity changes, with no one-frame gap (Bug 1).
-  const [lastSettledTokenAddress, setLastSettledTokenAddress] = useState<
+  const clearPaymentSelectorUnlockTimer = useCallback(() => {
+    if (paymentSelectorUnlockTimerRef.current) {
+      clearTimeout(paymentSelectorUnlockTimerRef.current);
+      paymentSelectorUnlockTimerRef.current = null;
+    }
+  }, []);
+
+  const updatePaymentSelectorNavigationLock = useCallback(
+    (isLocked: boolean) => {
+      isPaymentSelectorNavigationLockedRef.current = isLocked;
+      setIsPaymentSelectorNavigationLocked(isLocked);
+    },
+    [],
+  );
+
+  const unlockPaymentSelectorNavigation = useCallback(() => {
+    clearPaymentSelectorUnlockTimer();
+    didBlurAfterPaymentSelectorOpenRef.current = false;
+    updatePaymentSelectorNavigationLock(false);
+  }, [clearPaymentSelectorUnlockTimer, updatePaymentSelectorNavigationLock]);
+
+  const lockPaymentSelectorNavigation = useCallback(() => {
+    clearPaymentSelectorUnlockTimer();
+    didBlurAfterPaymentSelectorOpenRef.current = false;
+    updatePaymentSelectorNavigationLock(true);
+    paymentSelectorUnlockTimerRef.current = setTimeout(
+      unlockPaymentSelectorNavigation,
+      PAYMENT_SELECTOR_NAVIGATION_SAFETY_UNLOCK_MS,
+    );
+  }, [
+    clearPaymentSelectorUnlockTimer,
+    unlockPaymentSelectorNavigation,
+    updatePaymentSelectorNavigationLock,
+  ]);
+
+  useEffect(() => {
+    const scheduleUnlock = () => {
+      clearPaymentSelectorUnlockTimer();
+      paymentSelectorUnlockTimerRef.current = setTimeout(() => {
+        unlockPaymentSelectorNavigation();
+      }, PAYMENT_SELECTOR_NAVIGATION_UNLOCK_DELAY_MS);
+    };
+
+    const unsubscribeBlur = navigation.addListener('blur', () => {
+      if (isPaymentSelectorNavigationLockedRef.current) {
+        didBlurAfterPaymentSelectorOpenRef.current = true;
+      }
+    });
+
+    const unsubscribeFocus = navigation.addListener('focus', () => {
+      if (
+        isPaymentSelectorNavigationLockedRef.current &&
+        didBlurAfterPaymentSelectorOpenRef.current
+      ) {
+        scheduleUnlock();
+      }
+    });
+
+    return () => {
+      unsubscribeBlur();
+      unsubscribeFocus();
+      clearPaymentSelectorUnlockTimer();
+    };
+  }, [
+    clearPaymentSelectorUnlockTimer,
+    navigation,
+    unlockPaymentSelectorNavigation,
+  ]);
+
+  const selectedPaymentTokenKey = useMemo(() => {
+    if (!selectedPaymentToken?.address || !selectedPaymentToken?.chainId) {
+      return null;
+    }
+
+    return `${selectedPaymentToken.chainId.toLowerCase()}:${selectedPaymentToken.address.toLowerCase()}`;
+  }, [selectedPaymentToken?.address, selectedPaymentToken?.chainId]);
+
+  const selectedPaymentSettlingKey = useMemo(() => {
+    if (!selectedPaymentTokenKey) {
+      return null;
+    }
+
+    return `${selectedPaymentTokenKey}:${totalPayForPredictBalance}`;
+  }, [selectedPaymentTokenKey, totalPayForPredictBalance]);
+
+  // Tracks the token/amount pair for which a full quote-loading cycle has
+  // completed. Keeping the amount in the key makes same-token amount changes
+  // settle again, while preserving same-token same-amount quotes across a brief
+  // Predict-balance selection.
+  const [lastSettledPaymentKey, setLastSettledPaymentKey] = useState<
     string | null
   >(null);
 
   // Synchronous derivation: true from the very first render after the selected
-  // token changes. No effects needed to flip a boolean flag, so there is no
-  // one-frame window where the CTA flashes incorrectly (Bug 1 fixed).
+  // token or amount changes. No effects needed to flip a boolean flag, so there
+  // is no one-frame window where the CTA flashes incorrectly (Bug 1 fixed).
   const isPaySystemSettling =
     !isPredictBalanceSelected &&
-    selectedPaymentToken !== null &&
-    selectedPaymentToken?.address !== lastSettledTokenAddress;
+    selectedPaymentSettlingKey !== null &&
+    selectedPaymentSettlingKey !== lastSettledPaymentKey;
 
   const isBalancePulsing = useMemo(
     () => isDepositPending && isPredictBalanceSelected,
@@ -149,23 +244,22 @@ export const usePredictBuyConditions = ({
     const quotesPresent = (quotes?.length ?? 0) > 0;
     if (quotesPresent || !isPayFeesLoading) {
       hasSeenLoadingRef.current = false;
-      setLastSettledTokenAddress(selectedPaymentToken?.address ?? null);
+      setLastSettledPaymentKey(selectedPaymentSettlingKey);
     }
   }, [
     isPaySystemSettling,
     isPayQuoteLoading,
     isPayFeesLoading,
     quotes,
-    selectedPaymentToken,
+    selectedPaymentSettlingKey,
   ]);
 
-  // Effect 3 — reset when switching back to Predict balance so that returning
-  // to any ERC20 always requires a fresh settling cycle (quotes may need
-  // re-fetching).
+  // Effect 3 — stop any in-flight settling observation when switching back to
+  // Predict balance. Keep the settled payment key so selecting the same token
+  // for the same amount can reuse the existing quote state immediately.
   useEffect(() => {
     if (isPredictBalanceSelected) {
       hasSeenLoadingRef.current = false;
-      setLastSettledTokenAddress(null);
     }
   }, [isPredictBalanceSelected]);
 
@@ -230,7 +324,8 @@ export const usePredictBuyConditions = ({
       !isRateLimited &&
       !isBalanceLoading &&
       !isPayFeesLoading &&
-      !hasBlockingPayAlerts,
+      !hasBlockingPayAlerts &&
+      !isPaymentSelectorNavigationLocked,
     [
       isPaySystemSettling,
       isConfirming,
@@ -241,6 +336,7 @@ export const usePredictBuyConditions = ({
       isBalanceLoading,
       isPayFeesLoading,
       hasBlockingPayAlerts,
+      isPaymentSelectorNavigationLocked,
     ],
   );
 
@@ -249,23 +345,6 @@ export const usePredictBuyConditions = ({
     [isPreviewCalculating, isUserInputChange],
   );
 
-  useEffect(() => {
-    if (
-      !isPredictBalanceSelected &&
-      !isInputFocused &&
-      totalPayForPredictBalance > 0 &&
-      predictBalance >= totalPayForPredictBalance
-    ) {
-      resetSelectedPaymentToken();
-    }
-  }, [
-    isInputFocused,
-    isPredictBalanceSelected,
-    predictBalance,
-    resetSelectedPaymentToken,
-    totalPayForPredictBalance,
-  ]);
-
   return {
     isBelowMinimum,
     isInsufficientBalance,
@@ -278,5 +357,7 @@ export const usePredictBuyConditions = ({
     isPayFeesLoading,
     isBalancePulsing,
     isPaySystemSettling,
+    isPaymentSelectorNavigationLocked,
+    lockPaymentSelectorNavigation,
   };
 };
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyError.test.ts b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyError.test.ts
index eb5313c18e0..079f5a5ac17 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyError.test.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyError.test.ts
@@ -8,6 +8,8 @@ const mockClearOrderError = jest.fn();
 let mockActiveOrder: { error?: string } | null = null;
 let mockIsBalanceLoading = false;
 let mockIsPredictBalanceSelected = true;
+let mockSelectedPaymentToken: { address: string; chainId: string } | null =
+  null;
 
 jest.mock('../../../hooks/usePredictActiveOrder', () => ({
   usePredictActiveOrder: () => ({
@@ -26,6 +28,7 @@ jest.mock('../../../hooks/usePredictBalance', () => ({
 jest.mock('../../../hooks/usePredictPaymentToken', () => ({
   usePredictPaymentToken: () => ({
     isPredictBalanceSelected: mockIsPredictBalanceSelected,
+    selectedPaymentToken: mockSelectedPaymentToken,
   }),
 }));
 
@@ -124,6 +127,7 @@ describe('usePredictBuyError', () => {
     mockActiveOrder = null;
     mockIsBalanceLoading = false;
     mockIsPredictBalanceSelected = true;
+    mockSelectedPaymentToken = null;
   });
 
   describe('errorResult', () => {
@@ -219,6 +223,26 @@ describe('usePredictBuyError', () => {
       expect(result.current.errorMessage).toBe(
         'Insufficient payment token balance',
       );
+      expect(result.current.errorMessageSource).toBe('blocking_pay_alert');
+    });
+
+    it('keeps the pay token balance alert visible while pay fees are loading', () => {
+      mockActiveOrder = { error: 'order failed' };
+      mockIsPredictBalanceSelected = false;
+
+      const { result } = renderHook(() =>
+        usePredictBuyError({
+          ...defaultParams,
+          isPayFeesLoading: true,
+          blockingPayAlertMessage: 'Insufficient payment token balance',
+        }),
+      );
+
+      expect(mockGetPlaceOrderErrorOutcome).not.toHaveBeenCalled();
+      expect(result.current.errorMessage).toBe(
+        'Insufficient payment token balance',
+      );
+      expect(result.current.errorMessageSource).toBe('blocking_pay_alert');
     });
 
     it('returns undefined when activeOrder has no error', () => {
@@ -241,6 +265,7 @@ describe('usePredictBuyError', () => {
       );
 
       expect(result.current.errorMessage).toBe('Preview failed');
+      expect(result.current.errorMessageSource).toBe('preview');
     });
 
     it('returns previewError even when other error conditions exist', () => {
@@ -285,6 +310,7 @@ describe('usePredictBuyError', () => {
       expect(result.current.errorMessage).toBe(
         'Not enough funds. You can use up to $50.00, or try a different token.',
       );
+      expect(result.current.errorMessageSource).toBe('insufficient_balance');
     });
 
     it('returns generic no funds message when maxBetAmount < MINIMUM_BET', () => {
@@ -299,6 +325,7 @@ describe('usePredictBuyError', () => {
       expect(result.current.errorMessage).toBe(
         'Not enough funds. Try a different token.',
       );
+      expect(result.current.errorMessageSource).toBe('insufficient_balance');
     });
 
     it('returns undefined when no error conditions exist', () => {
@@ -373,6 +400,7 @@ describe('usePredictBuyError', () => {
       expect(result.current.errorMessage).toBe(
         'Insufficient payment token balance',
       );
+      expect(result.current.errorMessageSource).toBe('blocking_pay_alert');
       expect(result.current.buyErrorBanner).toBeNull();
     });
   });
@@ -547,6 +575,82 @@ describe('usePredictBuyError', () => {
       );
     });
 
+    it('persists order_failed banner when activeOrder error is cleared by controller refresh', () => {
+      mockActiveOrder = { error: 'something broke' };
+      mockGetPlaceOrderErrorOutcome.mockReturnValue({
+        status: 'error',
+        error: 'parsed message',
+      });
+
+      const { result, rerender } = renderHook(() =>
+        usePredictBuyError(defaultParams),
+      );
+
+      expect(result.current.buyErrorBanner).toEqual(
+        expect.objectContaining({ variant: 'order_failed' }),
+      );
+
+      mockActiveOrder = null;
+      rerender({});
+
+      expect(result.current.buyErrorBanner).toEqual(
+        expect.objectContaining({ variant: 'order_failed' }),
+      );
+    });
+
+    it('clears a persisted order_failed banner when clearBuyErrorBanner is called', () => {
+      mockActiveOrder = { error: 'something broke' };
+      mockGetPlaceOrderErrorOutcome.mockReturnValue({
+        status: 'error',
+        error: 'parsed message',
+      });
+
+      const { result, rerender } = renderHook(() =>
+        usePredictBuyError(defaultParams),
+      );
+
+      mockActiveOrder = null;
+      rerender({});
+      expect(result.current.buyErrorBanner).toEqual(
+        expect.objectContaining({ variant: 'order_failed' }),
+      );
+
+      act(() => {
+        result.current.clearBuyErrorBanner();
+      });
+
+      expect(result.current.buyErrorBanner).toBeNull();
+    });
+
+    it('clears a persisted order_failed banner when the selected payment token changes', () => {
+      mockIsPredictBalanceSelected = false;
+      mockSelectedPaymentToken = { address: '0xTokenA', chainId: '0x1' };
+      mockActiveOrder = { error: 'something broke' };
+      mockGetPlaceOrderErrorOutcome.mockReturnValue({
+        status: 'error',
+        error: 'parsed message',
+      });
+
+      const { result, rerender } = renderHook(() =>
+        usePredictBuyError(defaultParams),
+      );
+
+      expect(result.current.buyErrorBanner).toEqual(
+        expect.objectContaining({ variant: 'order_failed' }),
+      );
+
+      mockActiveOrder = null;
+      rerender({});
+      expect(result.current.buyErrorBanner).toEqual(
+        expect.objectContaining({ variant: 'order_failed' }),
+      );
+
+      mockSelectedPaymentToken = { address: '0xTokenB', chainId: '0x1' };
+      rerender({});
+
+      expect(result.current.buyErrorBanner).toBeNull();
+    });
+
     it('falls back to outcomeTokenPrice for price_changed body when preview is null', () => {
       mockActiveOrder = { error: 'BUY_ORDER_NOT_FULLY_FILLED' };
       mockGetPlaceOrderErrorOutcome.mockReturnValue({
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyError.ts b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyError.ts
index 1a3f94ae3f4..602d0881e65 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyError.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyError.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { strings } from '../../../../../../../locales/i18n';
 import { MINIMUM_BET } from '../../../constants/transactions';
 import { usePredictActiveOrder } from '../../../hooks/usePredictActiveOrder';
@@ -15,6 +15,29 @@ export interface PredictBuyErrorBannerData {
   description: string;
 }
 
+export type PredictBuyErrorMessageSource =
+  | 'preview'
+  | 'below_minimum'
+  | 'insufficient_balance'
+  | 'blocking_pay_alert'
+  | 'order_error';
+
+type PredictBuyErrorResult =
+  | {
+      status: 'error';
+      error: string;
+      source: 'blocking_pay_alert' | 'order_error';
+    }
+  | {
+      status: 'order_not_filled';
+      source: 'order_error';
+    };
+
+interface PredictBuyErrorMessageData {
+  message: string;
+  source: PredictBuyErrorMessageSource;
+}
+
 interface UsePredictBuyInfoParams {
   preview?: OrderPreview | null;
   previewError: string | null;
@@ -49,28 +72,71 @@ export const usePredictBuyError = ({
   const { activeOrder, clearOrderError } = usePredictActiveOrder();
   const { isBalanceLoading } = usePredictBuyAvailableBalance();
   const [isOrderNotFilled, setIsOrderNotFilled] = useState(false);
-  const { isPredictBalanceSelected } = usePredictPaymentToken();
+  const [persistedBuyErrorBanner, setPersistedBuyErrorBanner] =
+    useState<PredictBuyErrorBannerData | null>(null);
+  const { isPredictBalanceSelected, selectedPaymentToken } =
+    usePredictPaymentToken();
+  const selectedPaymentTokenKey = useMemo(() => {
+    if (isPredictBalanceSelected) {
+      return 'predict-balance';
+    }
 
-  const errorResult = useMemo(() => {
-    if (isBalanceLoading || isPlacingOrder || isConfirming || !preview) {
-      return undefined;
+    if (!selectedPaymentToken?.address || !selectedPaymentToken?.chainId) {
+      return 'external-token:unknown';
     }
 
-    const ready = !isPayFeesLoading && !isPredictBalanceSelected;
+    return `${selectedPaymentToken.chainId.toLowerCase()}:${selectedPaymentToken.address.toLowerCase()}`;
+  }, [
+    isPredictBalanceSelected,
+    selectedPaymentToken?.address,
+    selectedPaymentToken?.chainId,
+  ]);
+  const previousSelectedPaymentTokenKeyRef = useRef(selectedPaymentTokenKey);
 
-    if (ready && !!blockingPayAlertMessage) {
+  const errorResult = useMemo<PredictBuyErrorResult | undefined>(() => {
+    if (
+      !isPlacingOrder &&
+      !isConfirming &&
+      !isPredictBalanceSelected &&
+      !!blockingPayAlertMessage
+    ) {
       return {
         status: 'error',
         error: blockingPayAlertMessage,
+        source: 'blocking_pay_alert',
       };
     }
 
-    return activeOrder?.error
-      ? getPlaceOrderErrorOutcome({
-          error: activeOrder?.error,
-          orderParams: { preview },
-        })
-      : undefined;
+    if (
+      isBalanceLoading ||
+      isPlacingOrder ||
+      isConfirming ||
+      !preview ||
+      isPayFeesLoading
+    ) {
+      return undefined;
+    }
+
+    if (!activeOrder?.error) {
+      return undefined;
+    }
+
+    const orderError = getPlaceOrderErrorOutcome({
+      error: activeOrder?.error,
+      orderParams: { preview },
+    });
+
+    if (
+      orderError.status !== 'error' &&
+      orderError.status !== 'order_not_filled'
+    ) {
+      return undefined;
+    }
+
+    return {
+      ...orderError,
+      source: 'order_error',
+    };
   }, [
     isBalanceLoading,
     isPlacingOrder,
@@ -82,18 +148,26 @@ export const usePredictBuyError = ({
     activeOrder?.error,
   ]);
 
-  const errorMessage = useMemo(() => {
+  const errorMessageData = useMemo<
+    PredictBuyErrorMessageData | undefined
+  >(() => {
     if (previewError) {
-      return previewError;
+      return {
+        message: previewError,
+        source: 'preview',
+      };
     }
 
     if (isBelowMinimum) {
-      return strings('predict.order.prediction_minimum_bet', {
-        amount: formatPrice(MINIMUM_BET, {
-          minimumDecimals: 2,
-          maximumDecimals: 2,
+      return {
+        message: strings('predict.order.prediction_minimum_bet', {
+          amount: formatPrice(MINIMUM_BET, {
+            minimumDecimals: 2,
+            maximumDecimals: 2,
+          }),
         }),
-      });
+        source: 'below_minimum',
+      };
     }
 
     if (isInsufficientBalance) {
@@ -101,11 +175,16 @@ export const usePredictBuyError = ({
         minimumDecimals: 2,
         maximumDecimals: 2,
       });
-      return maxBetAmount >= MINIMUM_BET
-        ? strings('predict.order.prediction_insufficient_funds_try_token', {
-            amount: formattedMax,
-          })
-        : strings('predict.order.no_funds_enough_try_token');
+
+      return {
+        message:
+          maxBetAmount >= MINIMUM_BET
+            ? strings('predict.order.prediction_insufficient_funds_try_token', {
+                amount: formattedMax,
+              })
+            : strings('predict.order.no_funds_enough_try_token'),
+        source: 'insufficient_balance',
+      };
     }
 
     if (!errorResult) {
@@ -129,7 +208,11 @@ export const usePredictBuyError = ({
       if (bannerWouldSuppress) {
         return undefined;
       }
-      return errorResult.error;
+
+      return {
+        message: errorResult.error,
+        source: errorResult.source,
+      };
     }
 
     return undefined;
@@ -145,68 +228,97 @@ export const usePredictBuyError = ({
     isSheetMode,
   ]);
 
-  const buyErrorBanner = useMemo<PredictBuyErrorBannerData | null>(() => {
-    // Inline banners are a sheet-mode-only surface. In legacy full-screen
-    // mode the equivalent error is surfaced via `errorMessage` instead.
-    if (!isSheetMode) {
-      return null;
-    }
+  const currentBuyErrorBanner =
+    useMemo<PredictBuyErrorBannerData | null>(() => {
+      // Inline banners are a sheet-mode-only surface. In legacy full-screen
+      // mode the equivalent error is surfaced via `errorMessage` instead.
+      if (!isSheetMode) {
+        return null;
+      }
 
-    if (isPlacingOrder || isConfirming) {
-      return null;
-    }
+      if (isPlacingOrder || isConfirming) {
+        return null;
+      }
 
-    if (!activeOrder?.error) {
-      return null;
-    }
+      if (!activeOrder?.error) {
+        return null;
+      }
 
-    if (blockingPayAlertMessage && !isPredictBalanceSelected) {
-      return null;
-    }
+      if (blockingPayAlertMessage && !isPredictBalanceSelected) {
+        return null;
+      }
 
-    const orderError = getPlaceOrderErrorOutcome({
-      error: activeOrder.error,
-      orderParams: { preview } as PlaceOrderParams,
-    });
+      const orderError = getPlaceOrderErrorOutcome({
+        error: activeOrder.error,
+        orderParams: { preview } as PlaceOrderParams,
+      });
+
+      if (!orderError) {
+        return null;
+      }
+
+      if (orderError.status === 'order_not_filled') {
+        const fallbackPrice = preview?.sharePrice ?? outcomeTokenPrice ?? 0;
+        return {
+          variant: 'price_changed',
+          title: strings('predict.order.price_changed_title'),
+          description: strings('predict.order.price_changed_body', {
+            price: formatCents(fallbackPrice),
+          }),
+        };
+      }
+
+      if (orderError.status === 'error') {
+        return {
+          variant: 'order_failed',
+          title: strings('predict.order.order_failed_title'),
+          description: strings('predict.order.order_failed_body'),
+        };
+      }
 
-    if (!orderError) {
       return null;
-    }
+    }, [
+      activeOrder?.error,
+      preview,
+      outcomeTokenPrice,
+      isPlacingOrder,
+      isConfirming,
+      blockingPayAlertMessage,
+      isPredictBalanceSelected,
+      isSheetMode,
+    ]);
 
-    if (orderError.status === 'order_not_filled') {
-      const fallbackPrice = preview?.sharePrice ?? outcomeTokenPrice ?? 0;
-      return {
-        variant: 'price_changed',
-        title: strings('predict.order.price_changed_title'),
-        description: strings('predict.order.price_changed_body', {
-          price: formatCents(fallbackPrice),
-        }),
-      };
+  useEffect(() => {
+    if (currentBuyErrorBanner) {
+      setPersistedBuyErrorBanner(currentBuyErrorBanner);
     }
+  }, [currentBuyErrorBanner]);
 
-    if (orderError.status === 'error') {
-      return {
-        variant: 'order_failed',
-        title: strings('predict.order.order_failed_title'),
-        description: strings('predict.order.order_failed_body'),
-      };
+  useEffect(() => {
+    if (
+      previousSelectedPaymentTokenKeyRef.current === selectedPaymentTokenKey
+    ) {
+      return;
     }
 
-    return null;
-  }, [
-    activeOrder?.error,
-    preview,
-    outcomeTokenPrice,
-    isPlacingOrder,
-    isConfirming,
-    blockingPayAlertMessage,
-    isPredictBalanceSelected,
-    isSheetMode,
-  ]);
+    previousSelectedPaymentTokenKeyRef.current = selectedPaymentTokenKey;
+    setPersistedBuyErrorBanner(null);
+  }, [selectedPaymentTokenKey]);
+
+  const shouldSuppressBuyErrorBanner =
+    !isSheetMode ||
+    isPlacingOrder ||
+    isConfirming ||
+    Boolean(blockingPayAlertMessage && !isPredictBalanceSelected);
+
+  const buyErrorBanner =
+    currentBuyErrorBanner ??
+    (shouldSuppressBuyErrorBanner ? null : persistedBuyErrorBanner);
 
   const clearBuyErrorBanner = useCallback(() => {
     clearOrderError();
     setIsOrderNotFilled(false);
+    setPersistedBuyErrorBanner(null);
   }, [clearOrderError]);
 
   const resetOrderNotFilled = clearBuyErrorBanner;
@@ -218,7 +330,8 @@ export const usePredictBuyError = ({
   }, [errorResult]);
 
   return {
-    errorMessage,
+    errorMessage: errorMessageData?.message,
+    errorMessageSource: errorMessageData?.source,
     buyErrorBanner,
     isOrderNotFilled,
     resetOrderNotFilled,
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyInfo.test.ts b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyInfo.test.ts
index 979da0c6466..2ee667f8172 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyInfo.test.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyInfo.test.ts
@@ -25,6 +25,7 @@ jest.mock('../../../hooks/usePredictPaymentToken', () => ({
 jest.mock(
   '../../../../../Views/confirmations/hooks/pay/useTransactionPayData',
   () => ({
+    useTransactionPayQuotes: () => [],
     useTransactionPayTotals: () => mockPayTotals,
   }),
 );
@@ -174,7 +175,7 @@ describe('usePredictBuyInfo', () => {
       expect(result.current.depositFee).toBe(2.0);
     });
 
-    it('returns 0 when there is an insufficient pay token balance alert', () => {
+    it('includes depositFee in total when there is an insufficient pay token balance alert', () => {
       mockIsPredictBalanceSelected = false;
       mockPayTotals = {
         fees: {
@@ -189,10 +190,12 @@ describe('usePredictBuyInfo', () => {
 
       const { result } = renderHook(() => usePredictBuyInfo(defaultParams));
 
-      expect(result.current.depositFee).toBe(0);
+      expect(result.current.hasBlockingPayAlerts).toBe(true);
+      expect(result.current.depositFee).toBe(5);
+      expect(result.current.total).toBe(110);
     });
 
-    it('keeps the last accepted deposit fee while confirming', () => {
+    it('returns 0 while confirming when pay totals no longer include fees', () => {
       mockIsPredictBalanceSelected = false;
       mockPayTotals = {
         fees: {
@@ -215,10 +218,10 @@ describe('usePredictBuyInfo', () => {
 
       rerender({ ...defaultParams, isConfirming: true });
 
-      expect(result.current.depositFee).toBe(5);
+      expect(result.current.depositFee).toBe(0);
     });
 
-    it('clears the accepted deposit fee after confirming ends', () => {
+    it('returns 0 after confirming ends when pay totals no longer include fees', () => {
       mockIsPredictBalanceSelected = false;
       mockPayTotals = {
         fees: {
@@ -243,6 +246,34 @@ describe('usePredictBuyInfo', () => {
 
       expect(result.current.depositFee).toBe(0);
     });
+
+    it('does not show stale deposit fee when switching back to Predict balance while confirming', () => {
+      mockIsPredictBalanceSelected = false;
+      mockPayTotals = {
+        fees: {
+          provider: { usd: 1.5 },
+          sourceNetwork: { estimate: { usd: 2.5 } },
+          targetNetwork: { usd: 1.0 },
+        },
+      };
+
+      const { result, rerender } = renderHook(
+        (params: typeof defaultParams) => usePredictBuyInfo(params),
+        {
+          initialProps: { ...defaultParams, isConfirming: true },
+        },
+      );
+
+      expect(result.current.depositFee).toBe(5);
+      expect(result.current.total).toBe(110);
+
+      mockIsPredictBalanceSelected = true;
+
+      rerender({ ...defaultParams, isConfirming: true });
+
+      expect(result.current.depositFee).toBe(0);
+      expect(result.current.total).toBe(105);
+    });
   });
 
   describe('total', () => {
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyInfo.ts b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyInfo.ts
index ef19b367929..9620ad5288b 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyInfo.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictBuyInfo.ts
@@ -1,5 +1,5 @@
 import { BigNumber } from 'bignumber.js';
-import { useEffect, useMemo, useState } from 'react';
+import { useMemo } from 'react';
 import { useTransactionPayTotals } from '../../../../../Views/confirmations/hooks/pay/useTransactionPayData';
 import { usePredictPaymentToken } from '../../../hooks/usePredictPaymentToken';
 import { OrderPreview } from '../../../types';
@@ -40,8 +40,6 @@ export const usePredictBuyInfo = ({
     [blockingPayAlerts],
   );
 
-  const [acceptedDepositFee, setAcceptedDepositFee] = useState(0);
-
   const totalPayForPredictBalance = useMemo(
     () =>
       currentValue +
@@ -50,31 +48,14 @@ export const usePredictBuyInfo = ({
     [currentValue, preview?.fees?.providerFee, preview?.fees?.metamaskFee],
   );
 
-  const computedDepositFee = useMemo(() => {
-    if (isPredictBalanceSelected || !payTotals?.fees || hasBlockingPayAlerts)
-      return 0;
+  const depositFee = useMemo(() => {
+    if (isPredictBalanceSelected || !payTotals?.fees) return 0;
     const { provider, sourceNetwork, targetNetwork } = payTotals.fees;
     return new BigNumber(provider?.usd ?? 0)
       .plus(sourceNetwork?.estimate?.usd ?? 0)
       .plus(targetNetwork?.usd ?? 0)
       .toNumber();
-  }, [isPredictBalanceSelected, payTotals?.fees, hasBlockingPayAlerts]);
-
-  useEffect(() => {
-    if (computedDepositFee > 0) {
-      setAcceptedDepositFee(computedDepositFee);
-    }
-  }, [computedDepositFee]);
-
-  useEffect(() => {
-    if (!isConfirming) {
-      setAcceptedDepositFee(0);
-    }
-  }, [isConfirming]);
-
-  const fallbackDepositFee = isConfirming ? acceptedDepositFee : 0;
-  const depositFee =
-    computedDepositFee > 0 ? computedDepositFee : fallbackDepositFee;
+  }, [isPredictBalanceSelected, payTotals?.fees]);
 
   const rewardsFeeAmount =
     isPlacingOrder || previewError ? undefined : (preview?.fees?.totalFee ?? 0);
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictDefaultPaymentToken.test.ts b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictDefaultPaymentToken.test.ts
index aed2b1e0bdc..8827c659bb2 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictDefaultPaymentToken.test.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictDefaultPaymentToken.test.ts
@@ -192,14 +192,25 @@ describe('usePredictDefaultPaymentToken', () => {
     expect(mockOnPaymentTokenChange).not.toHaveBeenCalled();
   });
 
-  it('falls back to predict balance when tokens array is empty', () => {
+  it('waits for account tokens before falling back or auto-selecting', () => {
     mockPredictBalance = 0.5;
     mockTokens = [];
 
-    renderHook(() => usePredictDefaultPaymentToken());
+    const { rerender } = renderHook(() => usePredictDefaultPaymentToken());
 
     expect(mockOnPaymentTokenChange).not.toHaveBeenCalled();
-    expect(mockResetSelectedPaymentToken).toHaveBeenCalledTimes(1);
+    expect(mockResetSelectedPaymentToken).not.toHaveBeenCalled();
+
+    mockTokens = [
+      createEvmErc20Token({ address: '0x1', symbol: 'USDC', fiatBalance: 100 }),
+    ];
+
+    rerender({});
+
+    expect(mockOnPaymentTokenChange).toHaveBeenCalledWith(
+      expect.objectContaining({ address: '0x1', symbol: 'USDC' }),
+    );
+    expect(mockResetSelectedPaymentToken).not.toHaveBeenCalled();
   });
 
   it('falls back to predict balance when no tokens have positive fiat balance', () => {
@@ -286,6 +297,43 @@ describe('usePredictDefaultPaymentToken', () => {
     expect(mockOnPaymentTokenChange).toHaveBeenCalledTimes(1);
   });
 
+  it('does not auto-select again when the same sheet returns to PREVIEW after a manual Predict balance selection', () => {
+    mockPredictBalance = 0.5;
+    mockTokens = [
+      createEvmErc20Token({ address: '0x1', symbol: 'USDC', fiatBalance: 100 }),
+    ];
+
+    const { rerender } = renderHook(() => usePredictDefaultPaymentToken());
+
+    expect(mockOnPaymentTokenChange).toHaveBeenCalledTimes(1);
+
+    mockActiveOrder = { state: ActiveOrderState.PAY_WITH_ANY_TOKEN };
+    rerender({});
+
+    mockActiveOrder = { state: ActiveOrderState.PREVIEW };
+    rerender({});
+
+    expect(mockOnPaymentTokenChange).toHaveBeenCalledTimes(1);
+    expect(mockResetSelectedPaymentToken).not.toHaveBeenCalled();
+  });
+
+  it('still initializes when the active order reaches PREVIEW for the first time', () => {
+    mockPredictBalance = 0.5;
+    mockActiveOrder = { state: ActiveOrderState.DEPOSITING };
+    mockTokens = [
+      createEvmErc20Token({ address: '0x1', symbol: 'USDC', fiatBalance: 100 }),
+    ];
+
+    const { rerender } = renderHook(() => usePredictDefaultPaymentToken());
+
+    expect(mockOnPaymentTokenChange).not.toHaveBeenCalled();
+
+    mockActiveOrder = { state: ActiveOrderState.PREVIEW };
+    rerender({});
+
+    expect(mockOnPaymentTokenChange).toHaveBeenCalledTimes(1);
+  });
+
   it('skips non-EVM or non-ERC20 tokens when auto-selecting', () => {
     mockPredictBalance = 0.5;
     mockTokens = [
diff --git a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictDefaultPaymentToken.ts b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictDefaultPaymentToken.ts
index 9efdce700b1..b1676acdc3c 100644
--- a/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictDefaultPaymentToken.ts
+++ b/app/components/UI/Predict/views/PredictBuyWithAnyToken/hooks/usePredictDefaultPaymentToken.ts
@@ -10,11 +10,10 @@ import { ActiveOrderState } from '../../../types';
 import { isTestNet } from '../../../../../../util/networks';
 
 /**
- * Initializes the payment token selection on the buy screen. Waits for
- * the active order to reach PREVIEW state (after initPayWithAnyToken),
- * then either resets to Predict balance or auto-selects the token with
- * the highest fiat balance when Predict balance is below MINIMUM_BET.
- * Resets when the order leaves PREVIEW so it re-runs for the next market.
+ * Initializes the payment token selection once per mounted buy sheet. Waits
+ * for the active order to reach PREVIEW state (after initPayWithAnyToken),
+ * then either resets to Predict balance or auto-selects the token with the
+ * highest fiat balance when Predict balance is below MINIMUM_BET.
  */
 export function usePredictDefaultPaymentToken() {
   const { data: predictBalance, isLoading: isBalanceLoading } =
@@ -24,24 +23,15 @@ export function usePredictDefaultPaymentToken() {
   const { activeOrder } = usePredictActiveOrder();
   const tokens = useAccountTokens();
   const hasInitializedRef = useRef(false);
-  const prevOrderRef = useRef(activeOrder);
-
-  useEffect(() => {
-    if (activeOrder !== prevOrderRef.current) {
-      prevOrderRef.current = activeOrder;
-      hasInitializedRef.current = false;
-    }
-  }, [activeOrder]);
 
   useEffect(() => {
     if (hasInitializedRef.current) return;
     if (isBalanceLoading) return;
     if (activeOrder?.state !== ActiveOrderState.PREVIEW) return;
 
-    hasInitializedRef.current = true;
-
     const balance = predictBalance ?? 0;
     if (balance >= MINIMUM_BET) {
+      hasInitializedRef.current = true;
       resetSelectedPaymentToken();
       return;
     }
@@ -58,8 +48,14 @@ export function usePredictDefaultPaymentToken() {
     );
 
     if (bestToken) {
+      hasInitializedRef.current = true;
       onPaymentTokenChange(bestToken);
     } else {
+      if (tokens.length === 0) {
+        return;
+      }
+
+      hasInitializedRef.current = true;
       resetSelectedPaymentToken();
     }
   }, [
diff --git a/app/components/UI/Predict/views/PredictFeed/PredictFeed.test.tsx b/app/components/UI/Predict/views/PredictFeed/PredictFeed.test.tsx
index edb94687527..c905e01ae5b 100644
--- a/app/components/UI/Predict/views/PredictFeed/PredictFeed.test.tsx
+++ b/app/components/UI/Predict/views/PredictFeed/PredictFeed.test.tsx
@@ -1012,4 +1012,58 @@ describe('PredictFeed', () => {
       expect(queryByPlaceholderText('Search prediction markets')).toBeNull();
     });
   });
+
+  describe('hideHeader prop', () => {
+    it('renders header nav by default when hideHeader is not provided', () => {
+      const { getByTestId } = render(<PredictFeed />);
+
+      expect(
+        getByTestId(PredictMarketListSelectorsIDs.BACK_BUTTON),
+      ).toBeOnTheScreen();
+      expect(
+        getByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON),
+      ).toBeOnTheScreen();
+    });
+
+    it('hides header nav when hideHeader is true', () => {
+      const { queryByTestId } = render(<PredictFeed hideHeader />);
+
+      expect(
+        queryByTestId(PredictMarketListSelectorsIDs.BACK_BUTTON),
+      ).toBeNull();
+      expect(queryByTestId(PredictSearchSelectorsIDs.SEARCH_BUTTON)).toBeNull();
+    });
+
+    it('still renders container, tabs, and pager when hideHeader is true', () => {
+      const { getByTestId } = render(<PredictFeed hideHeader />);
+
+      expect(
+        getByTestId(PredictMarketListSelectorsIDs.CONTAINER),
+      ).toBeOnTheScreen();
+      expect(getByTestId(PredictFeedSelectorsIDs.TABS)).toBeOnTheScreen();
+      expect(
+        getByTestId(PredictFeedMockSelectorsIDs.PAGER_VIEW),
+      ).toBeOnTheScreen();
+    });
+  });
+
+  describe('onHeaderHiddenChange prop', () => {
+    it('passes onHeaderHiddenChange callback to useFeedScrollManager', () => {
+      const onHeaderHiddenChange = jest.fn();
+
+      render(<PredictFeed onHeaderHiddenChange={onHeaderHiddenChange} />);
+
+      expect(mockUseFeedScrollManager).toHaveBeenCalledWith(
+        expect.objectContaining({ onHeaderHiddenChange }),
+      );
+    });
+
+    it('passes undefined to useFeedScrollManager when onHeaderHiddenChange is not provided', () => {
+      render(<PredictFeed />);
+
+      expect(mockUseFeedScrollManager).toHaveBeenCalledWith(
+        expect.objectContaining({ onHeaderHiddenChange: undefined }),
+      );
+    });
+  });
 });
diff --git a/app/components/UI/Predict/views/PredictFeed/PredictFeed.tsx b/app/components/UI/Predict/views/PredictFeed/PredictFeed.tsx
index 0af8040f78d..be9135bcf0a 100644
--- a/app/components/UI/Predict/views/PredictFeed/PredictFeed.tsx
+++ b/app/components/UI/Predict/views/PredictFeed/PredictFeed.tsx
@@ -20,10 +20,8 @@ import {
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import {
   Box,
-  Icon,
-  IconColor,
+  HeaderStandard,
   IconName,
-  IconSize,
   Text,
   TextColor,
   TextVariant,
@@ -87,7 +85,6 @@ import {
   TabItem,
   TabsBar,
 } from '../../../../../component-library/components-temp/Tabs';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import HeaderSearch, {
   HeaderSearchVariant,
 } from '../../../../../component-library/components-temp/HeaderSearch';
@@ -615,7 +612,19 @@ const PredictSearchOverlay: React.FC<PredictSearchOverlayProps> = ({
   );
 };
 
-const PredictFeed: React.FC = () => {
+interface PredictFeedProps {
+  hideHeader?: boolean;
+  onHeaderHiddenChange?: (hidden: boolean) => void;
+  walletHeaderTranslateY?: SharedValue<number>;
+  walletHeaderHeight?: number;
+}
+
+const PredictFeed: React.FC<PredictFeedProps> = ({
+  hideHeader = false,
+  onHeaderHiddenChange,
+  walletHeaderTranslateY,
+  walletHeaderHeight,
+}) => {
   const {
     tabs,
     activeIndex,
@@ -646,10 +655,7 @@ const PredictFeed: React.FC = () => {
       navigation.goBack();
     } else {
       navigation.navigate(Routes.WALLET.HOME, {
-        screen: Routes.WALLET.TAB_STACK_FLOW,
-        params: {
-          screen: Routes.WALLET_VIEW,
-        },
+        screen: Routes.WALLET_VIEW,
       });
     }
   }, [navigation]);
@@ -695,6 +701,9 @@ const PredictFeed: React.FC = () => {
     headerRef,
     tabBarRef,
     setActiveIndex,
+    onHeaderHiddenChange,
+    walletHeaderTranslateY,
+    walletHeaderHeight,
   });
 
   const handleTabPress = useCallback(
@@ -731,29 +740,31 @@ const PredictFeed: React.FC = () => {
         twClassName="flex-1"
         style={{ backgroundColor: colors.background.default }}
       >
-        <Box
-          style={tw.style('z-20', {
-            backgroundColor: colors.background.default,
-          })}
-        >
-          <HeaderCompactStandard
-            includesTopInset
-            title={strings('wallet.predict')}
-            onBack={handleBackPress}
-            backButtonProps={{
-              testID: PredictMarketListSelectorsIDs.BACK_BUTTON,
-            }}
-            endButtonIconProps={[
-              {
-                iconName: IconName.Search,
-                onPress: showSearch,
-                testID: PredictSearchSelectorsIDs.SEARCH_BUTTON,
-              },
-            ]}
-          />
-        </Box>
+        {!hideHeader && (
+          <Box
+            style={tw.style('z-20', {
+              backgroundColor: colors.background.default,
+            })}
+          >
+            <HeaderStandard
+              includesTopInset
+              title={strings('wallet.predict')}
+              onBack={handleBackPress}
+              backButtonProps={{
+                testID: PredictMarketListSelectorsIDs.BACK_BUTTON,
+              }}
+              endButtonIconProps={[
+                {
+                  iconName: IconName.Search,
+                  onPress: showSearch,
+                  testID: PredictSearchSelectorsIDs.SEARCH_BUTTON,
+                },
+              ]}
+            />
+          </Box>
+        )}
 
-        <Box twClassName="flex-1 relative">
+        <Box twClassName="flex-1 relative overflow-hidden">
           <AnimatedHeader
             headerTranslateY={headerTranslateY}
             headerHeight={headerHeight}
diff --git a/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.test.tsx b/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.test.tsx
index 851ce1c2098..de562391a54 100644
--- a/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.test.tsx
+++ b/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.test.tsx
@@ -211,6 +211,10 @@ jest.mock('../../hooks/usePredictPositions', () => ({
   })),
 }));
 
+jest.mock('../../hooks/usePredictLivePositions', () => ({
+  usePredictLivePositions: jest.fn(),
+}));
+
 jest.mock('../../hooks/usePredictBalance', () => ({
   usePredictBalance: jest.fn(() => ({
     data: 100,
@@ -562,6 +566,9 @@ function setupPredictMarketDetailsTest(
   const { usePredictPositions } = jest.requireMock(
     '../../hooks/usePredictPositions',
   );
+  const { usePredictLivePositions } = jest.requireMock(
+    '../../hooks/usePredictLivePositions',
+  );
   const { usePredictEligibility } = jest.requireMock(
     '../../hooks/usePredictEligibility',
   );
@@ -624,6 +631,7 @@ function setupPredictMarketDetailsTest(
     ({ claimable }: { claimable?: boolean }) =>
       claimable ? claimablePositionsHook : activePositionsHook,
   );
+  usePredictLivePositions.mockImplementation(() => undefined);
 
   // Set up usePredictOrderPreview mock to return preview data matching position currentValue
   mockUsePredictOrderPreview.mockImplementation(
diff --git a/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.tsx b/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.tsx
index 334846bcc7d..cc71c676b94 100644
--- a/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.tsx
+++ b/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.tsx
@@ -129,6 +129,7 @@ const PredictMarketDetails: React.FC<PredictMarketDetailsProps> = () => {
     childMarketIds: market?.childMarketIds,
     claimable: false,
     enabled: !isMarketLoading && Boolean(resolvedMarketId),
+    livePriceUpdates: true,
   });
 
   // "claimable" positions
@@ -391,17 +392,15 @@ const PredictMarketDetails: React.FC<PredictMarketDetailsProps> = () => {
       edges={['left', 'right', 'bottom']}
       testID={PredictMarketDetailsSelectorsIDs.SCREEN}
     >
-      <Box twClassName="px-3 gap-4">
-        <PredictMarketDetailsHeader
-          isLoading={isMarketLoading}
-          market={market}
-          title={title}
-          image={image}
-          titleLineCount={titleLineCount}
-          insetsTop={insets.top}
-          onBackPress={handleBackPress}
-        />
-      </Box>
+      <PredictMarketDetailsHeader
+        isLoading={isMarketLoading}
+        market={market}
+        title={title}
+        image={image}
+        titleLineCount={titleLineCount}
+        insetsTop={insets.top}
+        onBackPress={handleBackPress}
+      />
 
       <ScrollView
         testID={PredictMarketDetailsSelectorsIDs.SCROLLABLE_TAB_VIEW}
@@ -481,21 +480,19 @@ const PredictMarketDetails: React.FC<PredictMarketDetailsProps> = () => {
         )}
       </ScrollView>
 
-      <Box twClassName="px-3 bg-default border-t border-muted">
-        <PredictMarketDetailsActions
-          isClaimablePositionsLoading={isClaimablePositionsLoading}
-          hasPositivePnl={hasPositivePnl}
-          marketStatus={market?.status as PredictMarketStatus | undefined}
-          singleOutcomeMarket={singleOutcomeMarket}
-          isMarketLoading={isMarketLoading}
-          market={market}
-          openOutcomes={openOutcomes}
-          yesPercentage={yesPercentage}
-          onClaimPress={handleClaimPress}
-          onBuyPress={handleBuyPress}
-          isClaimPending={isClaimPending}
-        />
-      </Box>
+      <PredictMarketDetailsActions
+        isClaimablePositionsLoading={isClaimablePositionsLoading}
+        hasPositivePnl={hasPositivePnl}
+        marketStatus={market?.status as PredictMarketStatus | undefined}
+        singleOutcomeMarket={singleOutcomeMarket}
+        isMarketLoading={isMarketLoading}
+        market={market}
+        openOutcomes={openOutcomes}
+        yesPercentage={yesPercentage}
+        onClaimPress={handleClaimPress}
+        onBuyPress={handleBuyPress}
+        isClaimPending={isClaimPending}
+      />
       {isFeeExemption && (
         <Box
           style={tw`absolute inset-x-0 bottom-4 pb-3`}
diff --git a/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsActions/PredictMarketDetailsActions.tsx b/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsActions/PredictMarketDetailsActions.tsx
index 21a5b9f6fe6..c9f55a77aac 100644
--- a/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsActions/PredictMarketDetailsActions.tsx
+++ b/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsActions/PredictMarketDetailsActions.tsx
@@ -95,99 +95,94 @@ const PredictMarketDetailsActions = memo(
       );
     };
 
-    return (
-      <>
-        {(() => {
-          if (!isClaimablePositionsLoading && hasPositivePnl) {
-            return (
-              <PredictClaimButton
-                onPress={onClaimPress}
-                isLoading={isClaimPending}
-                testID={PredictMarketDetailsSelectorsIDs.CLAIM_WINNINGS_BUTTON}
-              />
-            );
-          }
+    const content = (() => {
+      if (!isClaimablePositionsLoading && hasPositivePnl) {
+        return (
+          <PredictClaimButton
+            onPress={onClaimPress}
+            isLoading={isClaimPending}
+            testID={PredictMarketDetailsSelectorsIDs.CLAIM_WINNINGS_BUTTON}
+          />
+        );
+      }
+
+      if (marketStatus === PredictMarketStatus.OPEN && singleOutcomeMarket) {
+        const firstOpenOutcome = openOutcomes[0];
+        const yesToken =
+          firstOpenOutcome?.tokens?.[0] ?? market?.outcomes?.[0]?.tokens?.[0];
+        const noToken =
+          firstOpenOutcome?.tokens?.[1] ?? market?.outcomes?.[0]?.tokens?.[1];
+        const yesTitle = yesToken?.title ?? '';
+        const noTitle = noToken?.title ?? '';
+        const useStackedLabels =
+          shouldUseStackedActionButtonLabel(yesTitle) ||
+          shouldUseStackedActionButtonLabel(noTitle);
+        const getActionButtonStyle = (backgroundClassName: string) =>
+          tw.style(
+            'flex-1',
+            backgroundClassName,
+            useStackedLabels && {
+              height: 'auto',
+              minHeight: TALL_ACTION_BUTTON_MIN_HEIGHT,
+              paddingVertical: 8,
+            },
+          );
+        return (
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            justifyContent={BoxJustifyContent.Between}
+            alignItems={BoxAlignItems.Center}
+            twClassName="w-full mt-4 gap-3"
+          >
+            <Button
+              variant={ButtonVariants.Secondary}
+              size={ButtonSize.Lg}
+              width={ButtonWidthTypes.Full}
+              style={getActionButtonStyle('bg-success-muted')}
+              label={renderActionButtonLabel({
+                title: yesTitle,
+                price: yesPercentage,
+                color: TextColor.SuccessDefault,
+                useStackedLabels,
+              })}
+              onPress={() => {
+                if (yesToken) {
+                  onBuyPress(yesToken);
+                }
+              }}
+            />
+            <Button
+              variant={ButtonVariants.Secondary}
+              size={ButtonSize.Lg}
+              width={ButtonWidthTypes.Full}
+              style={getActionButtonStyle('bg-error-muted')}
+              label={renderActionButtonLabel({
+                title: noTitle,
+                price: 100 - yesPercentage,
+                color: TextColor.ErrorDefault,
+                useStackedLabels,
+              })}
+              onPress={() => {
+                if (noToken) {
+                  onBuyPress(noToken);
+                }
+              }}
+            />
+          </Box>
+        );
+      }
 
-          if (
-            marketStatus === PredictMarketStatus.OPEN &&
-            singleOutcomeMarket
-          ) {
-            // use openOutcomes for real-time (CLOB) prices
-            const firstOpenOutcome = openOutcomes[0];
-            const yesToken =
-              firstOpenOutcome?.tokens?.[0] ??
-              market?.outcomes?.[0]?.tokens?.[0];
-            const noToken =
-              firstOpenOutcome?.tokens?.[1] ??
-              market?.outcomes?.[0]?.tokens?.[1];
-            const yesTitle = yesToken?.title ?? '';
-            const noTitle = noToken?.title ?? '';
-            const useStackedLabels =
-              shouldUseStackedActionButtonLabel(yesTitle) ||
-              shouldUseStackedActionButtonLabel(noTitle);
-            const getActionButtonStyle = (backgroundClassName: string) =>
-              tw.style(
-                'flex-1',
-                backgroundClassName,
-                useStackedLabels && {
-                  height: 'auto',
-                  minHeight: TALL_ACTION_BUTTON_MIN_HEIGHT,
-                  paddingVertical: 8,
-                },
-              );
-            return (
-              <Box
-                flexDirection={BoxFlexDirection.Row}
-                justifyContent={BoxJustifyContent.Between}
-                alignItems={BoxAlignItems.Center}
-                twClassName="w-full mt-4 gap-3"
-              >
-                <Button
-                  variant={ButtonVariants.Secondary}
-                  size={ButtonSize.Lg}
-                  width={ButtonWidthTypes.Full}
-                  style={getActionButtonStyle('bg-success-muted')}
-                  label={renderActionButtonLabel({
-                    title: yesTitle,
-                    price: yesPercentage,
-                    color: TextColor.SuccessDefault,
-                    useStackedLabels,
-                  })}
-                  onPress={() => {
-                    if (yesToken) {
-                      onBuyPress(yesToken);
-                    }
-                  }}
-                />
-                <Button
-                  variant={ButtonVariants.Secondary}
-                  size={ButtonSize.Lg}
-                  width={ButtonWidthTypes.Full}
-                  style={getActionButtonStyle('bg-error-muted')}
-                  label={renderActionButtonLabel({
-                    title: noTitle,
-                    price: 100 - yesPercentage,
-                    color: TextColor.ErrorDefault,
-                    useStackedLabels,
-                  })}
-                  onPress={() => {
-                    if (noToken) {
-                      onBuyPress(noToken);
-                    }
-                  }}
-                />
-              </Box>
-            );
-          }
+      if (isMarketLoading) {
+        return <PredictDetailsButtonsSkeleton />;
+      }
+
+      return null;
+    })();
 
-          // Show skeleton buttons while loading
-          if (isMarketLoading) {
-            return <PredictDetailsButtonsSkeleton />;
-          }
+    if (!content) return null;
 
-          return null;
-        })()}
-      </>
+    return (
+      <Box twClassName="px-3 bg-default border-t border-muted">{content}</Box>
     );
   },
 );
diff --git a/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsHeader/PredictMarketDetailsHeader.tsx b/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsHeader/PredictMarketDetailsHeader.tsx
index cca4c71f879..438e05acc3e 100644
--- a/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsHeader/PredictMarketDetailsHeader.tsx
+++ b/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsHeader/PredictMarketDetailsHeader.tsx
@@ -52,35 +52,33 @@ const PredictMarketDetailsHeader = memo(
       <Box
         flexDirection={BoxFlexDirection.Row}
         alignItems={BoxAlignItems.Start}
-        twClassName="gap-3 pb-4"
+        twClassName="gap-3 pb-4 px-3"
         style={{ paddingTop: insetsTop + 12 }}
       >
-        <Box twClassName="flex-row items-center gap-3 px-1">
-          <Pressable
-            onPress={onBackPress}
-            hitSlop={12}
-            accessibilityRole="button"
-            accessibilityLabel={strings('predict.buttons.back')}
-            style={tw.style('items-center justify-center rounded-full')}
-            testID={PredictMarketDetailsSelectorsIDs.BACK_BUTTON}
-          >
-            <Icon
-              name={IconName.ArrowLeft}
-              size={IconSize.Lg}
-              color={colors.icon.default}
+        <Pressable
+          onPress={onBackPress}
+          hitSlop={12}
+          accessibilityRole="button"
+          accessibilityLabel={strings('predict.buttons.back')}
+          style={tw.style('items-center justify-center rounded-full')}
+          testID={PredictMarketDetailsSelectorsIDs.BACK_BUTTON}
+        >
+          <Icon
+            name={IconName.ArrowLeft}
+            size={IconSize.Lg}
+            color={colors.icon.default}
+          />
+        </Pressable>
+        <Box twClassName="w-10 h-10 rounded-lg bg-muted overflow-hidden">
+          {image || market?.image ? (
+            <Image
+              source={{ uri: image || market?.image }}
+              style={tw.style('w-full h-full')}
+              resizeMode="cover"
             />
-          </Pressable>
-          <Box twClassName="w-10 h-10 rounded-lg bg-muted overflow-hidden">
-            {image || market?.image ? (
-              <Image
-                source={{ uri: image || market?.image }}
-                style={tw.style('w-full h-full')}
-                resizeMode="cover"
-              />
-            ) : (
-              <Box twClassName="w-full h-full bg-muted" />
-            )}
-          </Box>
+          ) : (
+            <Box twClassName="w-full h-full bg-muted" />
+          )}
         </Box>
         <Box
           twClassName="flex-1 min-h-[40px]"
@@ -93,9 +91,7 @@ const PredictMarketDetailsHeader = memo(
             {title || market?.title || ''}
           </Text>
         </Box>
-        <Box twClassName="pr-2">
-          <PredictShareButton marketId={market?.id} marketSlug={market?.slug} />
-        </Box>
+        <PredictShareButton marketId={market?.id} marketSlug={market?.slug} />
       </Box>
     );
   },
diff --git a/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsOutcomes/PredictMarketDetailsOutcomes.tsx b/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsOutcomes/PredictMarketDetailsOutcomes.tsx
index 950531ae21b..e9cadbd0c89 100644
--- a/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsOutcomes/PredictMarketDetailsOutcomes.tsx
+++ b/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsOutcomes/PredictMarketDetailsOutcomes.tsx
@@ -66,7 +66,7 @@ const PredictMarketDetailsOutcomes = memo(
     const { colors } = useTheme();
 
     if (!market) {
-      return <Box />;
+      return null;
     }
 
     // Closed market with single outcome (binary)
diff --git a/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsStatus/PredictMarketDetailsStatus.tsx b/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsStatus/PredictMarketDetailsStatus.tsx
index b5ce861d411..4a9f53cc356 100644
--- a/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsStatus/PredictMarketDetailsStatus.tsx
+++ b/app/components/UI/Predict/views/PredictMarketDetails/components/PredictMarketDetailsStatus/PredictMarketDetailsStatus.tsx
@@ -33,74 +33,70 @@ const PredictMarketDetailsStatus = memo(
 
     return (
       <Box twClassName="gap-2">
-        <Box flexDirection={BoxFlexDirection.Column} twClassName="gap-2">
-          {winningOutcomeToken && !multipleOpenOutcomesPartiallyResolved && (
-            <Box
-              flexDirection={BoxFlexDirection.Row}
-              alignItems={BoxAlignItems.Center}
-              twClassName="gap-2"
-            >
-              {resolutionStatus === 'resolved' ? (
-                <>
-                  <Icon
-                    name={IconName.CheckBold}
-                    size={IconSize.Md}
-                    color={colors.text.alternative}
-                  />
-                  <Text
-                    variant={TextVariant.BodyMd}
-                    twClassName="font-medium"
-                    color={TextColor.TextAlternative}
-                  >
-                    {strings('predict.market_details.market_resulted_to', {
-                      outcome: winningOutcomeToken.title,
-                    })}
-                  </Text>
-                </>
-              ) : (
-                <>
-                  <Icon
-                    name={IconName.CheckBold}
-                    size={IconSize.Md}
-                    color={colors.text.alternative}
-                  />
-                  <Text
-                    variant={TextVariant.BodyMd}
-                    twClassName="font-medium"
-                    color={TextColor.TextAlternative}
-                  >
-                    {strings('predict.market_details.market_ended_on', {
-                      outcome: winningOutcomeToken.title,
-                    })}
-                  </Text>
-                </>
-              )}
-            </Box>
-          )}
-          {marketStatus === PredictMarketStatus.CLOSED &&
-            resolutionStatus !== 'resolved' && (
-              <Box
-                flexDirection={BoxFlexDirection.Row}
-                alignItems={BoxAlignItems.Center}
-                twClassName="gap-2"
-              >
+        {winningOutcomeToken && !multipleOpenOutcomesPartiallyResolved && (
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="gap-2"
+          >
+            {resolutionStatus === 'resolved' ? (
+              <>
+                <Icon
+                  name={IconName.CheckBold}
+                  size={IconSize.Md}
+                  color={colors.text.alternative}
+                />
+                <Text
+                  variant={TextVariant.BodyMd}
+                  twClassName="font-medium"
+                  color={TextColor.TextAlternative}
+                >
+                  {strings('predict.market_details.market_resulted_to', {
+                    outcome: winningOutcomeToken.title,
+                  })}
+                </Text>
+              </>
+            ) : (
+              <>
                 <Icon
-                  name={IconName.Clock}
+                  name={IconName.CheckBold}
                   size={IconSize.Md}
-                  color={colors.text.default}
+                  color={colors.text.alternative}
                 />
                 <Text
                   variant={TextVariant.BodyMd}
                   twClassName="font-medium"
-                  color={TextColor.TextDefault}
+                  color={TextColor.TextAlternative}
                 >
-                  {strings(
-                    'predict.market_details.waiting_for_final_resolution',
-                  )}
+                  {strings('predict.market_details.market_ended_on', {
+                    outcome: winningOutcomeToken.title,
+                  })}
                 </Text>
-              </Box>
+              </>
             )}
-        </Box>
+          </Box>
+        )}
+        {marketStatus === PredictMarketStatus.CLOSED &&
+          resolutionStatus !== 'resolved' && (
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              twClassName="gap-2"
+            >
+              <Icon
+                name={IconName.Clock}
+                size={IconSize.Md}
+                color={colors.text.default}
+              />
+              <Text
+                variant={TextVariant.BodyMd}
+                twClassName="font-medium"
+                color={TextColor.TextDefault}
+              >
+                {strings('predict.market_details.waiting_for_final_resolution')}
+              </Text>
+            </Box>
+          )}
       </Box>
     );
   },
diff --git a/app/components/UI/QRHardware/AnimatedQRScanner.test.tsx b/app/components/UI/QRHardware/AnimatedQRScanner.test.tsx
index dcea683f588..598cecd55e2 100644
--- a/app/components/UI/QRHardware/AnimatedQRScanner.test.tsx
+++ b/app/components/UI/QRHardware/AnimatedQRScanner.test.tsx
@@ -5,13 +5,17 @@ import AnimatedQRScannerModal from './AnimatedQRScanner';
 import { QrScanRequestType } from '@metamask/eth-qr-keyring';
 import { URRegistryDecoder } from '@keystonehq/ur-decoder';
 import { MetaMetricsEvents } from '../../../core/Analytics';
+import type { JsonMap } from '../../../core/Analytics/MetaMetrics.types';
 import { SUPPORTED_UR_TYPE } from '../../../constants/qr';
 import { HardwareDeviceTypes } from '../../../constants/keyringTypes';
+import { QRHardwareScanErrorType } from '../../../core/HardwareWallet/errors';
 
 const mockTrackEvent = jest.fn();
 const mockCreateEventBuilder = jest.fn();
 const mockBuild = jest.fn();
-const mockAddProperties = jest.fn(() => ({ build: mockBuild }));
+const mockAddProperties = jest.fn<{ build: typeof mockBuild }, [JsonMap]>(
+  (_properties) => ({ build: mockBuild }),
+);
 
 import {
   getCapturedCallbacks,
@@ -81,9 +85,17 @@ const mockURRegistryDecoder = URRegistryDecoder as jest.MockedClass<
   typeof URRegistryDecoder
 >;
 
+const expectCapturedCallback = <TCallback,>(
+  callback: TCallback | null,
+): NonNullable<TCallback> => {
+  expect(callback).toEqual(expect.any(Function));
+  return callback as NonNullable<TCallback>;
+};
+
 describe('AnimatedQRScannerModal - Metrics', () => {
   const mockOnScanSuccess = jest.fn();
   const mockOnScanError = jest.fn();
+  const mockOnQRHardwareScanError = jest.fn();
   const mockHideModal = jest.fn();
   const mockPauseQRCode = jest.fn();
 
@@ -92,10 +104,30 @@ describe('AnimatedQRScannerModal - Metrics', () => {
     purpose: QrScanRequestType.PAIR,
     onScanSuccess: mockOnScanSuccess,
     onScanError: mockOnScanError,
+    onQRHardwareScanError: undefined,
     hideModal: mockHideModal,
     pauseQRCode: mockPauseQRCode,
   };
 
+  type CapturedOnCodeScanned = NonNullable<
+    ReturnType<typeof getCapturedCallbacks>['onCodeScanned']
+  >;
+  type QRScannerCodes = Parameters<CapturedOnCodeScanned>[0];
+
+  const mockOnCodeScanned = async (codes: QRScannerCodes) => {
+    await waitFor(() => {
+      const callbacks = getCapturedCallbacks();
+      expect(callbacks.onCodeScanned).not.toBeNull();
+    });
+
+    const callbacks = getCapturedCallbacks();
+    const onCodeScanned = expectCapturedCallback(callbacks.onCodeScanned);
+
+    await act(async () => {
+      await onCodeScanned(codes);
+    });
+  };
+
   beforeEach(() => {
     jest.clearAllMocks();
     mockBuild.mockReturnValue({});
@@ -114,11 +146,7 @@ describe('AnimatedQRScannerModal - Metrics', () => {
       });
 
       const callbacks = getCapturedCallbacks();
-      if (!callbacks.onError) {
-        throw new Error('onError callback is null');
-      }
-
-      const onError = callbacks.onError;
+      const onError = expectCapturedCallback(callbacks.onError);
       const mockError = new Error('Camera initialization failed');
       await act(async () => {
         await onError(mockError);
@@ -130,6 +158,7 @@ describe('AnimatedQRScannerModal - Metrics', () => {
         );
         expect(mockAddProperties).toHaveBeenCalledWith({
           error: 'Camera initialization failed',
+          is_ur_format: false,
           device_model: 'MockDevice',
           device_type: HardwareDeviceTypes.QR,
         });
@@ -149,11 +178,7 @@ describe('AnimatedQRScannerModal - Metrics', () => {
       });
 
       const callbacks = getCapturedCallbacks();
-      if (!callbacks.onError) {
-        throw new Error('onError callback is null');
-      }
-
-      const onError = callbacks.onError;
+      const onError = expectCapturedCallback(callbacks.onError);
       await act(async () => {
         await onError(null as unknown as Error);
       });
@@ -174,11 +199,7 @@ describe('AnimatedQRScannerModal - Metrics', () => {
       });
 
       const callbacks = getCapturedCallbacks();
-      if (!callbacks.onError) {
-        throw new Error('onError callback is null');
-      }
-
-      const onError = callbacks.onError;
+      const onError = expectCapturedCallback(callbacks.onError);
       await act(async () => {
         await onError(null as unknown as Error);
       });
@@ -192,6 +213,67 @@ describe('AnimatedQRScannerModal - Metrics', () => {
   });
 
   describe('QR Code Scanning Metrics', () => {
+    it('shows non-UR pairing error state for non-UR QR codes', async () => {
+      const { getByText } = render(
+        <AnimatedQRScannerModal {...defaultProps} />,
+      );
+
+      await mockOnCodeScanned([{ value: 'https://metamask.io', type: 'qr' }]);
+
+      await waitFor(() => {
+        expect(mockAddProperties).toHaveBeenCalledWith({
+          error: 'Scanned QR code is not in UR format',
+          error_category: QRHardwareScanErrorType.NonURQrScanned,
+          is_ur_format: false,
+          device_model: 'MockDevice',
+          device_type: HardwareDeviceTypes.QR,
+        });
+        expect(mockOnScanError).not.toHaveBeenCalled();
+        expect(
+          getByText(
+            'hardware_wallet.qr_scan_errors.non_ur_qr_scanned.pair.title',
+          ),
+        ).toBeOnTheScreen();
+        expect(
+          getByText(
+            'hardware_wallet.qr_scan_errors.non_ur_qr_scanned.pair.body',
+          ),
+        ).toBeOnTheScreen();
+      });
+    });
+
+    it('shows non-UR signing error state for non-UR QR codes', async () => {
+      const { getByText } = render(
+        <AnimatedQRScannerModal
+          {...defaultProps}
+          purpose={QrScanRequestType.SIGN}
+        />,
+      );
+
+      await mockOnCodeScanned([{ value: 'https://metamask.io', type: 'qr' }]);
+
+      await waitFor(() => {
+        expect(mockAddProperties).toHaveBeenCalledWith({
+          error: 'Scanned QR code is not in UR format',
+          error_category: QRHardwareScanErrorType.NonURQrScanned,
+          is_ur_format: false,
+          device_model: 'MockDevice',
+          device_type: HardwareDeviceTypes.QR,
+        });
+        expect(mockOnScanError).not.toHaveBeenCalled();
+        expect(
+          getByText(
+            'hardware_wallet.qr_scan_errors.non_ur_qr_scanned.sign.title',
+          ),
+        ).toBeOnTheScreen();
+        expect(
+          getByText(
+            'hardware_wallet.qr_scan_errors.non_ur_qr_scanned.sign.body',
+          ),
+        ).toBeOnTheScreen();
+      });
+    });
+
     it('tracks metrics when UR decoder reports an error', async () => {
       const mockDecoderInstance = {
         receivePart: jest.fn(),
@@ -206,22 +288,13 @@ describe('AnimatedQRScannerModal - Metrics', () => {
         () => mockDecoderInstance as unknown as URRegistryDecoder,
       );
 
-      render(<AnimatedQRScannerModal {...defaultProps} />);
-
-      await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
-      });
-
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
+      const { getByText } = render(
+        <AnimatedQRScannerModal {...defaultProps} />,
+      );
 
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([{ value: 'mock-qr-data', type: 'qr' }]);
-      });
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-hdkey/mock-part', type: 'qr' },
+      ]);
 
       await waitFor(() => {
         expect(mockCreateEventBuilder).toHaveBeenCalledWith(
@@ -229,13 +302,19 @@ describe('AnimatedQRScannerModal - Metrics', () => {
         );
         expect(mockAddProperties).toHaveBeenCalledWith({
           error: 'Invalid UR format',
+          error_category: QRHardwareScanErrorType.URDecodeError,
+          is_ur_format: true,
           device_model: 'MockDevice',
           device_type: HardwareDeviceTypes.QR,
         });
         expect(mockTrackEvent).toHaveBeenCalledWith({});
-        expect(mockOnScanError).toHaveBeenCalledWith(
-          'transaction.unknown_qr_code',
-        );
+        expect(mockOnScanError).not.toHaveBeenCalled();
+        expect(
+          getByText('hardware_wallet.qr_scan_errors.ur_decode_error.title'),
+        ).toBeOnTheScreen();
+        expect(
+          getByText('hardware_wallet.qr_scan_errors.ur_decode_error.body'),
+        ).toBeOnTheScreen();
       });
     });
 
@@ -256,22 +335,13 @@ describe('AnimatedQRScannerModal - Metrics', () => {
         () => mockDecoderInstance as unknown as URRegistryDecoder,
       );
 
-      render(<AnimatedQRScannerModal {...defaultProps} />);
-
-      await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
-      });
-
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
+      const { getByText } = render(
+        <AnimatedQRScannerModal {...defaultProps} />,
+      );
 
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([{ value: 'mock-qr-data', type: 'qr' }]);
-      });
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-account/mock-part', type: 'qr' },
+      ]);
 
       await waitFor(() => {
         expect(mockCreateEventBuilder).toHaveBeenCalledWith(
@@ -279,14 +349,20 @@ describe('AnimatedQRScannerModal - Metrics', () => {
         );
         expect(mockAddProperties).toHaveBeenCalledWith({
           received_ur_type: SUPPORTED_UR_TYPE.ETH_SIGNATURE,
-          error: 'invalid `sync` qr code',
+          error: 'Received UR type is not valid for pairing flow',
+          error_category: QRHardwareScanErrorType.WrongURType,
+          is_ur_format: true,
           device_model: 'MockDevice',
           device_type: HardwareDeviceTypes.QR,
         });
         expect(mockTrackEvent).toHaveBeenCalledWith({});
-        expect(mockOnScanError).toHaveBeenCalledWith(
-          'transaction.invalid_qr_code_sync',
-        );
+        expect(mockOnScanError).not.toHaveBeenCalled();
+        expect(
+          getByText('hardware_wallet.qr_scan_errors.wrong_ur_type.pair.title'),
+        ).toBeOnTheScreen();
+        expect(
+          getByText('hardware_wallet.qr_scan_errors.wrong_ur_type.pair.body'),
+        ).toBeOnTheScreen();
       });
     });
 
@@ -307,45 +383,41 @@ describe('AnimatedQRScannerModal - Metrics', () => {
         () => mockDecoderInstance as unknown as URRegistryDecoder,
       );
 
-      render(
+      const { getByText } = render(
         <AnimatedQRScannerModal
           {...defaultProps}
           purpose={QrScanRequestType.SIGN}
         />,
       );
 
-      await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
-      });
-
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
-
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([{ value: 'mock-qr-data', type: 'qr' }]);
-      });
+      await mockOnCodeScanned([
+        { value: 'ur:eth-signature/mock-part', type: 'qr' },
+      ]);
 
       await waitFor(() => {
         expect(mockCreateEventBuilder).toHaveBeenCalledWith(
           MetaMetricsEvents.HARDWARE_WALLET_ERROR,
         );
         expect(mockAddProperties).toHaveBeenCalledWith({
-          error: 'invalid `sign` qr code',
+          error: 'Received UR type is not valid for signing flow',
+          error_category: QRHardwareScanErrorType.WrongURType,
+          is_ur_format: true,
+          received_ur_type: SUPPORTED_UR_TYPE.CRYPTO_HDKEY,
           device_model: 'MockDevice',
           device_type: HardwareDeviceTypes.QR,
         });
         expect(mockTrackEvent).toHaveBeenCalledWith({});
-        expect(mockOnScanError).toHaveBeenCalledWith(
-          'transaction.invalid_qr_code_sign',
-        );
+        expect(mockOnScanError).not.toHaveBeenCalled();
+        expect(
+          getByText('hardware_wallet.qr_scan_errors.wrong_ur_type.sign.title'),
+        ).toBeOnTheScreen();
+        expect(
+          getByText('hardware_wallet.qr_scan_errors.wrong_ur_type.sign.body'),
+        ).toBeOnTheScreen();
       });
     });
 
-    it('tracks metrics for unknown QR code exception', async () => {
+    it('tracks metrics for scan exceptions using the thrown exception message', async () => {
       const mockDecoderInstance = {
         receivePart: jest.fn(() => {
           throw new Error('Unexpected decoding error');
@@ -361,41 +433,140 @@ describe('AnimatedQRScannerModal - Metrics', () => {
         () => mockDecoderInstance as unknown as URRegistryDecoder,
       );
 
-      render(<AnimatedQRScannerModal {...defaultProps} />);
-
-      await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
-      });
-
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
+      const { getByText } = render(
+        <AnimatedQRScannerModal {...defaultProps} />,
+      );
 
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([{ value: 'mock-qr-data', type: 'qr' }]);
-      });
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-hdkey/mock-part', type: 'qr' },
+      ]);
 
       await waitFor(() => {
         expect(mockCreateEventBuilder).toHaveBeenCalledWith(
           MetaMetricsEvents.HARDWARE_WALLET_ERROR,
         );
         expect(mockAddProperties).toHaveBeenCalledWith({
-          error: 'transaction.unknown_qr_code',
+          error: 'Unexpected decoding error',
+          error_category: QRHardwareScanErrorType.ScanException,
+          is_ur_format: true,
           device_model: 'MockDevice',
           device_type: HardwareDeviceTypes.QR,
         });
         expect(mockTrackEvent).toHaveBeenCalledWith({});
-        expect(mockOnScanError).toHaveBeenCalledWith(
-          'transaction.unknown_qr_code',
+        expect(mockOnScanError).not.toHaveBeenCalled();
+        expect(
+          getByText('hardware_wallet.qr_scan_errors.ur_decode_error.title'),
+        ).toBeOnTheScreen();
+      });
+    });
+
+    it('surfaces QR hardware scan errors without waiting for analytics', async () => {
+      const { withQrKeyring } = jest.requireMock(
+        '../../../core/QrKeyring/QrKeyring',
+      );
+      withQrKeyring.mockImplementationOnce(() => new Promise(() => undefined));
+
+      render(
+        <AnimatedQRScannerModal
+          {...defaultProps}
+          onQRHardwareScanError={mockOnQRHardwareScanError}
+        />,
+      );
+
+      await mockOnCodeScanned([{ value: 'not-a-ur', type: 'qr' }]);
+
+      expect(mockOnQRHardwareScanError).toHaveBeenCalledWith(
+        expect.objectContaining({
+          message: 'Scanned QR code is not in UR format',
+        }),
+      );
+      expect(mockTrackEvent).not.toHaveBeenCalled();
+    });
+
+    it('resumes scanning after forwarding an existing inline error to an external callback', async () => {
+      const validDecoderInstance = {
+        receivePart: jest.fn(),
+        getProgress: jest.fn(() => 1),
+        isError: jest.fn(() => false),
+        isSuccess: jest.fn(() => true),
+        resultError: jest.fn(),
+        resultUR: jest.fn(() => ({
+          type: SUPPORTED_UR_TYPE.CRYPTO_HDKEY,
+          cbor: Buffer.from([]),
+        })),
+      };
+
+      mockURRegistryDecoder.mockImplementation(
+        () => validDecoderInstance as unknown as URRegistryDecoder,
+      );
+
+      const { getByText, queryByText, rerender } = render(
+        <AnimatedQRScannerModal {...defaultProps} />,
+      );
+
+      await mockOnCodeScanned([{ value: 'not-a-ur', type: 'qr' }]);
+
+      await waitFor(() => {
+        expect(
+          getByText(
+            'hardware_wallet.qr_scan_errors.non_ur_qr_scanned.pair.title',
+          ),
+        ).toBeOnTheScreen();
+      });
+
+      rerender(
+        <AnimatedQRScannerModal
+          {...defaultProps}
+          onQRHardwareScanError={mockOnQRHardwareScanError}
+        />,
+      );
+
+      await waitFor(() => {
+        expect(mockOnQRHardwareScanError).toHaveBeenCalledWith(
+          expect.objectContaining({
+            message: 'Scanned QR code is not in UR format',
+          }),
         );
+        expect(
+          queryByText(
+            'hardware_wallet.qr_scan_errors.non_ur_qr_scanned.pair.title',
+          ),
+        ).toBeNull();
+      });
+
+      await mockOnCodeScanned([{ value: 'ur:crypto-hdkey/1-1', type: 'qr' }]);
+
+      await waitFor(() => {
+        expect(mockOnScanSuccess).toHaveBeenCalledWith({
+          type: SUPPORTED_UR_TYPE.CRYPTO_HDKEY,
+          cbor: Buffer.from([]),
+        });
       });
     });
 
-    it('successfully scans valid QR code without tracking error metrics', async () => {
-      const mockDecoderInstance = {
+    it('invokes QR hardware scan error callback once for repeated error frames', async () => {
+      render(
+        <AnimatedQRScannerModal
+          {...defaultProps}
+          onQRHardwareScanError={mockOnQRHardwareScanError}
+        />,
+      );
+
+      await mockOnCodeScanned([{ value: 'not-a-ur', type: 'qr' }]);
+
+      await waitFor(() => {
+        expect(mockOnQRHardwareScanError).toHaveBeenCalledTimes(1);
+        expect(mockAddProperties).toHaveBeenCalledTimes(1);
+      });
+
+      await mockOnCodeScanned([{ value: 'not-a-ur', type: 'qr' }]);
+
+      expect(mockOnQRHardwareScanError).toHaveBeenCalledTimes(1);
+      expect(mockAddProperties).toHaveBeenCalledTimes(1);
+    });
+
+    it('reopens the scanner when try again is pressed', async () => {
+      const validDecoderInstance = {
         receivePart: jest.fn(),
         getProgress: jest.fn(() => 1),
         isError: jest.fn(() => false),
@@ -408,26 +579,79 @@ describe('AnimatedQRScannerModal - Metrics', () => {
       };
 
       mockURRegistryDecoder.mockImplementation(
-        () => mockDecoderInstance as unknown as URRegistryDecoder,
+        () => validDecoderInstance as unknown as URRegistryDecoder,
       );
 
-      render(<AnimatedQRScannerModal {...defaultProps} />);
+      const { getByText } = render(
+        <AnimatedQRScannerModal {...defaultProps} />,
+      );
+
+      await mockOnCodeScanned([{ value: 'not-a-ur', type: 'qr' }]);
 
       await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
+        expect(
+          getByText(
+            'hardware_wallet.qr_scan_errors.non_ur_qr_scanned.pair.title',
+          ),
+        ).toBeOnTheScreen();
       });
 
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
+      fireEvent.press(getByText('hardware_wallet.common.try_again'));
 
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([{ value: 'mock-qr-data', type: 'qr' }]);
+      await mockOnCodeScanned([{ value: 'ur:crypto-hdkey/1-1', type: 'qr' }]);
+
+      await waitFor(() => {
+        expect(mockOnScanSuccess).toHaveBeenCalledWith({
+          type: SUPPORTED_UR_TYPE.CRYPTO_HDKEY,
+          cbor: Buffer.from([]),
+        });
+      });
+    });
+
+    it('opens support article when learn more is pressed', async () => {
+      const openUrlSpy = jest
+        .spyOn(Linking, 'openURL')
+        .mockResolvedValue(undefined);
+      const { getByText } = render(
+        <AnimatedQRScannerModal {...defaultProps} />,
+      );
+
+      await mockOnCodeScanned([{ value: 'not-a-ur', type: 'qr' }]);
+
+      fireEvent.press(getByText('hardware_wallet.common.learn_more'));
+
+      await waitFor(() => {
+        expect(openUrlSpy).toHaveBeenCalledWith(
+          'https://support.metamask.io/more-web3/wallets/hardware-wallet-hub/#qr-codean-gapped-wallets',
+        );
       });
 
+      openUrlSpy.mockRestore();
+    });
+
+    it('successfully scans valid QR code without tracking error metrics', async () => {
+      const mockDecoderInstance = {
+        receivePart: jest.fn(),
+        getProgress: jest.fn(() => 1),
+        isError: jest.fn(() => false),
+        isSuccess: jest.fn(() => true),
+        resultError: jest.fn(),
+        resultUR: jest.fn(() => ({
+          type: SUPPORTED_UR_TYPE.CRYPTO_HDKEY,
+          cbor: Buffer.from([]),
+        })),
+      };
+
+      mockURRegistryDecoder.mockImplementation(
+        () => mockDecoderInstance as unknown as URRegistryDecoder,
+      );
+
+      render(<AnimatedQRScannerModal {...defaultProps} />);
+
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-hdkey/mock-part', type: 'qr' },
+      ]);
+
       await waitFor(() => {
         expect(mockOnScanSuccess).toHaveBeenCalledWith({
           type: SUPPORTED_UR_TYPE.CRYPTO_HDKEY,
@@ -454,20 +678,9 @@ describe('AnimatedQRScannerModal - Metrics', () => {
 
       render(<AnimatedQRScannerModal {...defaultProps} visible={false} />);
 
-      await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
-      });
-
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
-
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([{ value: 'mock-qr-data', type: 'qr' }]);
-      });
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-hdkey/mock-part', type: 'qr' },
+      ]);
 
       await waitFor(() => {
         expect(mockDecoderInstance.receivePart).not.toHaveBeenCalled();
@@ -493,20 +706,7 @@ describe('AnimatedQRScannerModal - Metrics', () => {
 
       render(<AnimatedQRScannerModal {...defaultProps} />);
 
-      await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
-      });
-
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
-
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([]);
-      });
+      await mockOnCodeScanned([]);
 
       await waitFor(() => {
         expect(mockDecoderInstance.receivePart).not.toHaveBeenCalled();
@@ -532,20 +732,9 @@ describe('AnimatedQRScannerModal - Metrics', () => {
 
       render(<AnimatedQRScannerModal {...defaultProps} />);
 
-      await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
-      });
-
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
-
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([{ value: null as unknown as string, type: 'qr' }]);
-      });
+      await mockOnCodeScanned([
+        { value: null as unknown as string, type: 'qr' },
+      ]);
 
       await waitFor(() => {
         expect(mockDecoderInstance.receivePart).not.toHaveBeenCalled();
@@ -571,20 +760,7 @@ describe('AnimatedQRScannerModal - Metrics', () => {
 
       render(<AnimatedQRScannerModal {...defaultProps} />);
 
-      await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
-      });
-
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
-
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([{ value: '', type: 'qr' }]);
-      });
+      await mockOnCodeScanned([{ value: '', type: 'qr' }]);
 
       await waitFor(() => {
         expect(mockDecoderInstance.receivePart).not.toHaveBeenCalled();
@@ -763,20 +939,9 @@ describe('AnimatedQRScannerModal - Metrics', () => {
 
       render(<AnimatedQRScannerModal {...defaultProps} />);
 
-      await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
-      });
-
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
-
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([{ value: 'mock-qr-data', type: 'qr' }]);
-      });
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-hdkey/mock-part', type: 'qr' },
+      ]);
 
       await waitFor(() => {
         expect(mockAddProperties).toHaveBeenCalledWith(
@@ -785,6 +950,7 @@ describe('AnimatedQRScannerModal - Metrics', () => {
             device_type: HardwareDeviceTypes.QR,
           }),
         );
+        expect(mockTrackEvent).toHaveBeenCalledWith({});
       });
     });
 
@@ -811,11 +977,7 @@ describe('AnimatedQRScannerModal - Metrics', () => {
       });
 
       const callbacks = getCapturedCallbacks();
-      if (!callbacks.onError) {
-        throw new Error('onError callback is null');
-      }
-
-      const onError = callbacks.onError;
+      const onError = expectCapturedCallback(callbacks.onError);
       const mockError = new Error('Camera error');
       await act(async () => {
         await onError(mockError);
@@ -824,6 +986,7 @@ describe('AnimatedQRScannerModal - Metrics', () => {
       await waitFor(() => {
         expect(mockAddProperties).toHaveBeenCalledWith({
           error: 'Camera error',
+          is_ur_format: false,
           device_model: 'Unknown',
           device_type: HardwareDeviceTypes.QR,
         });
@@ -852,30 +1015,230 @@ describe('AnimatedQRScannerModal - Metrics', () => {
 
       render(<AnimatedQRScannerModal {...defaultProps} />);
 
-      await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
-      });
-
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
-
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([{ value: 'mock-qr-data', type: 'qr' }]);
-      });
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-hdkey/mock-part', type: 'qr' },
+      ]);
 
       await waitFor(() => {
         expect(mockAddProperties).toHaveBeenCalledWith({
           error: 'Decoder error',
+          error_category: QRHardwareScanErrorType.URDecodeError,
+          is_ur_format: true,
           device_model: 'Unknown',
           device_type: HardwareDeviceTypes.QR,
         });
-        expect(mockOnScanError).toHaveBeenCalledWith(
-          'transaction.unknown_qr_code',
+        expect(mockOnScanError).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('buildQrHardwareWalletErrorAnalyticsProperties', () => {
+    it('includes received_ur_type when error_category is wrong_ur_type', async () => {
+      const mockDecoderInstance = {
+        receivePart: jest.fn(),
+        getProgress: jest.fn(() => 1),
+        isError: jest.fn(() => false),
+        isSuccess: jest.fn(() => true),
+        resultError: jest.fn(),
+        resultUR: jest.fn(() => ({
+          type: SUPPORTED_UR_TYPE.ETH_SIGNATURE,
+          cbor: Buffer.from([]),
+        })),
+      };
+
+      mockURRegistryDecoder.mockImplementation(
+        () => mockDecoderInstance as unknown as URRegistryDecoder,
+      );
+
+      render(<AnimatedQRScannerModal {...defaultProps} />);
+
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-account/mock-part', type: 'qr' },
+      ]);
+
+      await waitFor(() => {
+        expect(mockAddProperties).toHaveBeenCalledWith(
+          expect.objectContaining({
+            error_category: QRHardwareScanErrorType.WrongURType,
+            received_ur_type: SUPPORTED_UR_TYPE.ETH_SIGNATURE,
+          }),
+        );
+      });
+    });
+
+    it('omits received_ur_type when error_category is not wrong_ur_type', async () => {
+      const mockDecoderInstance = {
+        receivePart: jest.fn(),
+        getProgress: jest.fn(() => 0.5),
+        isError: jest.fn(() => true),
+        isSuccess: jest.fn(() => false),
+        resultError: jest.fn(() => 'Decode failed'),
+        resultUR: jest.fn(),
+      };
+
+      mockURRegistryDecoder.mockImplementation(
+        () => mockDecoderInstance as unknown as URRegistryDecoder,
+      );
+
+      render(<AnimatedQRScannerModal {...defaultProps} />);
+
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-hdkey/mock-part', type: 'qr' },
+      ]);
+
+      await waitFor(() => {
+        const calls = mockAddProperties.mock.calls;
+        const lastCall = calls[calls.length - 1]?.[0];
+        expect(lastCall?.error_category).not.toBe(
+          QRHardwareScanErrorType.WrongURType,
         );
+        expect(lastCall).not.toHaveProperty('received_ur_type');
+      });
+    });
+  });
+
+  describe('Scan Exception Edge Cases', () => {
+    it('handles non-Error thrown values in scan exception', async () => {
+      const mockDecoderInstance = {
+        receivePart: jest.fn(() => {
+          throw 'string error';
+        }),
+        getProgress: jest.fn(() => 0),
+        isError: jest.fn(() => false),
+        isSuccess: jest.fn(() => false),
+        resultError: jest.fn(),
+        resultUR: jest.fn(),
+      };
+
+      mockURRegistryDecoder.mockImplementation(
+        () => mockDecoderInstance as unknown as URRegistryDecoder,
+      );
+
+      render(<AnimatedQRScannerModal {...defaultProps} />);
+
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-hdkey/mock-part', type: 'qr' },
+      ]);
+
+      await waitFor(() => {
+        expect(mockAddProperties).toHaveBeenCalledWith(
+          expect.objectContaining({
+            error: 'string error',
+            error_category: QRHardwareScanErrorType.ScanException,
+            is_ur_format: true,
+          }),
+        );
+      });
+    });
+
+    it('handles Error thrown values in scan exception', async () => {
+      const mockDecoderInstance = {
+        receivePart: jest.fn(() => {
+          throw new Error('custom error message');
+        }),
+        getProgress: jest.fn(() => 0),
+        isError: jest.fn(() => false),
+        isSuccess: jest.fn(() => false),
+        resultError: jest.fn(),
+        resultUR: jest.fn(),
+      };
+
+      mockURRegistryDecoder.mockImplementation(
+        () => mockDecoderInstance as unknown as URRegistryDecoder,
+      );
+
+      render(<AnimatedQRScannerModal {...defaultProps} />);
+
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-hdkey/mock-part', type: 'qr' },
+      ]);
+
+      await waitFor(() => {
+        expect(mockAddProperties).toHaveBeenCalledWith(
+          expect.objectContaining({
+            error: 'custom error message',
+            error_category: QRHardwareScanErrorType.ScanException,
+          }),
+        );
+      });
+    });
+  });
+
+  describe('onModalHideComplete', () => {
+    it('calls onModalHideComplete when modal is hidden', async () => {
+      const mockOnModalHideComplete = jest.fn();
+      const propsHidden = {
+        ...defaultProps,
+        visible: false,
+        onModalHideComplete: mockOnModalHideComplete,
+      };
+      const propsVisible = {
+        ...defaultProps,
+        visible: true,
+        onModalHideComplete: mockOnModalHideComplete,
+      };
+
+      const { rerender } = render(<AnimatedQRScannerModal {...propsVisible} />);
+      expect(mockOnModalHideComplete).not.toHaveBeenCalled();
+
+      mockPauseQRCode.mockClear();
+      rerender(<AnimatedQRScannerModal {...propsHidden} />);
+
+      await waitFor(
+        () => {
+          expect(mockOnModalHideComplete).toHaveBeenCalledTimes(1);
+        },
+        { timeout: 2000 },
+      );
+    });
+
+    it('completes hide flow when onModalHideComplete is not provided', async () => {
+      const propsHidden = { ...defaultProps, visible: false };
+      const propsVisible = { ...defaultProps, visible: true };
+
+      const { rerender } = render(<AnimatedQRScannerModal {...propsHidden} />);
+
+      rerender(<AnimatedQRScannerModal {...propsVisible} />);
+
+      await waitFor(
+        () => {
+          expect(mockPauseQRCode).toHaveBeenCalledWith(true);
+        },
+        { timeout: 2000 },
+      );
+
+      mockPauseQRCode.mockClear();
+      rerender(<AnimatedQRScannerModal {...propsHidden} />);
+
+      await waitFor(
+        () => {
+          expect(mockPauseQRCode).toHaveBeenCalledWith(false);
+        },
+        { timeout: 2000 },
+      );
+    });
+  });
+
+  describe('showScannerError without onQRHardwareScanError callback', () => {
+    it('renders inline error UI when onQRHardwareScanError is not provided', async () => {
+      const { getByText, getByTestId } = render(
+        <AnimatedQRScannerModal {...defaultProps} />,
+      );
+
+      await mockOnCodeScanned([{ value: 'not-a-ur', type: 'qr' }]);
+
+      await waitFor(() => {
+        expect(
+          getByText(
+            'hardware_wallet.qr_scan_errors.non_ur_qr_scanned.pair.title',
+          ),
+        ).toBeOnTheScreen();
+        expect(
+          getByTestId('qr-scanner-error-learn-more-button'),
+        ).toBeOnTheScreen();
+        expect(
+          getByTestId('qr-scanner-error-try-again-button'),
+        ).toBeOnTheScreen();
       });
     });
   });
@@ -968,22 +1331,20 @@ describe('AnimatedQRScannerModal - Metrics', () => {
       const propsVisible = { ...defaultProps, visible: true };
       const propsHidden = { ...defaultProps, visible: false };
 
-      const { rerender } = render(<AnimatedQRScannerModal {...propsVisible} />);
+      const { queryByText, rerender } = render(
+        <AnimatedQRScannerModal {...propsVisible} />,
+      );
 
       // Simulate scanning to set progress
-      await waitFor(() => {
-        const callbacks = getCapturedCallbacks();
-        expect(callbacks.onCodeScanned).not.toBeNull();
-      });
-
-      const callbacks = getCapturedCallbacks();
-      if (!callbacks.onCodeScanned) {
-        throw new Error('onCodeScanned callback is null');
-      }
+      await mockOnCodeScanned([
+        { value: 'ur:crypto-hdkey/mock-part', type: 'qr' },
+      ]);
 
-      const onCodeScanned = callbacks.onCodeScanned;
-      await act(async () => {
-        await onCodeScanned([{ value: 'mock-qr-data', type: 'qr' }]);
+      await waitFor(() => {
+        expect(mockDecoderInstance.receivePart).toHaveBeenCalledWith(
+          'ur:crypto-hdkey/mock-part',
+        );
+        expect(queryByText('qr_scanner.scanning 50%')).not.toBeNull();
       });
 
       // Hide modal to trigger reset
@@ -1000,6 +1361,7 @@ describe('AnimatedQRScannerModal - Metrics', () => {
 
       await waitFor(() => {
         expect(mockPauseQRCode).toHaveBeenCalledWith(true);
+        expect(queryByText('qr_scanner.scanning 50%')).toBeNull();
       });
     });
   });
diff --git a/app/components/UI/QRHardware/AnimatedQRScanner.tsx b/app/components/UI/QRHardware/AnimatedQRScanner.tsx
index ea159eb16cc..ab42bf8d0ef 100644
--- a/app/components/UI/QRHardware/AnimatedQRScanner.tsx
+++ b/app/components/UI/QRHardware/AnimatedQRScanner.tsx
@@ -43,6 +43,39 @@ import Icon, {
 import { QrScanRequestType } from '@metamask/eth-qr-keyring';
 import { withQrKeyring } from '../../../core/QrKeyring/QrKeyring';
 import { HardwareDeviceTypes } from '../../../constants/keyringTypes';
+import {
+  createQRHardwareScanError,
+  getQRHardwareScanErrorTitle,
+  type QRHardwareScanError,
+  QRHardwareScanErrorType,
+} from '../../../core/HardwareWallet/errors';
+
+/**
+ * Builds {@link MetaMetricsEvents.HARDWARE_WALLET_ERROR} properties for QR hardware flows.
+ *
+ * - `error_category` — set for decode / scan pipeline failures (not for native camera errors).
+ * - `received_ur_type` — only when `error_category` is `wrong_ur_type` (decoded UR type mismatch).
+ * - `is_ur_format` — whether the scanned payload (trimmed) starts with `ur:` (case-insensitive).
+ */
+function buildQrHardwareWalletErrorAnalyticsProperties(options: {
+  error: string;
+  error_category?: QRHardwareScanErrorType;
+  is_ur_format: boolean;
+  received_ur_type?: string;
+}): Record<string, unknown> {
+  const { error, error_category, is_ur_format, received_ur_type } = options;
+  const payload: Record<string, unknown> = {
+    error,
+    is_ur_format,
+  };
+  if (error_category !== undefined) {
+    payload.error_category = error_category;
+  }
+  if (error_category === QRHardwareScanErrorType.WrongURType) {
+    payload.received_ur_type = received_ur_type ?? '';
+  }
+  return payload;
+}
 
 const createStyles = (theme: Theme) =>
   StyleSheet.create({
@@ -141,31 +174,91 @@ const createStyles = (theme: Theme) =>
       textAlign: 'center',
       ...fontStyles.normal,
     },
+    errorContainer: {
+      flex: 1,
+      justifyContent: 'center',
+      paddingHorizontal: 24,
+    },
+    errorTitle: {
+      color: theme.brandColors.white,
+      fontSize: 28,
+      lineHeight: 36,
+      textAlign: 'center',
+      marginBottom: 16,
+      ...fontStyles.bold,
+    },
+    errorBody: {
+      color: theme.brandColors.white,
+      fontSize: 16,
+      lineHeight: 24,
+      textAlign: 'center',
+      ...fontStyles.normal,
+    },
+    errorFooter: {
+      marginTop: 32,
+      gap: 12,
+    },
+    errorButton: {
+      minHeight: 52,
+      borderRadius: 26,
+      justifyContent: 'center',
+      alignItems: 'center',
+      paddingHorizontal: 24,
+      paddingVertical: 14,
+    },
+    errorButtonPrimary: {
+      backgroundColor: theme.brandColors.white,
+    },
+    errorButtonSecondary: {
+      borderWidth: 1,
+      borderColor: theme.brandColors.white,
+    },
+    errorButtonPrimaryText: {
+      color: theme.brandColors.black,
+      fontSize: 16,
+      ...fontStyles.bold,
+    },
+    errorButtonSecondaryText: {
+      color: theme.brandColors.white,
+      fontSize: 16,
+      ...fontStyles.bold,
+    },
   });
 
 const frameImage = require('../../../images/frame.png'); // eslint-disable-line import-x/no-commonjs
+const QR_HARDWARE_LEARN_MORE_URL =
+  'https://support.metamask.io/more-web3/wallets/hardware-wallet-hub/#qr-codean-gapped-wallets';
 
 interface AnimatedQRScannerProps {
   visible: boolean;
   purpose: QrScanRequestType;
   onScanSuccess: (ur: UR) => void;
   onScanError: (error: string) => void;
+  onQRHardwareScanError?: (error: QRHardwareScanError) => void;
   hideModal: () => void;
   pauseQRCode?: (x: boolean) => void;
+  onModalHideComplete?: () => void;
 }
 
 const AnimatedQRScannerModal = (props: AnimatedQRScannerProps) => {
   const {
     visible,
     onScanError,
+    onQRHardwareScanError,
     purpose,
     onScanSuccess,
     hideModal,
     pauseQRCode,
+    onModalHideComplete,
   } = props;
 
   const [urDecoder, setURDecoder] = useState(new URRegistryDecoder());
   const [progress, setProgress] = useState(0);
+  const [scanError, setScanError] = useState<QRHardwareScanError | null>(null);
+
+  const scanErrorActiveRef = useRef(false);
+  const onQRHardwareScanErrorRef = useRef(onQRHardwareScanError);
+  onQRHardwareScanErrorRef.current = onQRHardwareScanError;
   const theme = useTheme();
   const { trackEvent, createEventBuilder } = useAnalytics();
   const styles = createStyles(theme);
@@ -221,11 +314,17 @@ const AnimatedQRScannerModal = (props: AnimatedQRScannerProps) => {
     };
   }, [refreshCameraPermission, visible]);
 
-  const reset = useCallback(() => {
+  const resetDecoder = useCallback(() => {
     setURDecoder(new URRegistryDecoder());
     setProgress(0);
   }, []);
 
+  const reset = useCallback(() => {
+    scanErrorActiveRef.current = false;
+    resetDecoder();
+    setScanError(null);
+  }, [resetDecoder]);
+
   // Helper to send analytics with device name
   const sendErrorAnalytics = useCallback(
     async (properties: Record<string, unknown>) => {
@@ -257,64 +356,129 @@ const AnimatedQRScannerModal = (props: AnimatedQRScannerProps) => {
     [trackEvent, createEventBuilder],
   );
 
+  useEffect(() => {
+    if (scanError && onQRHardwareScanErrorRef.current) {
+      const errorCallback = onQRHardwareScanErrorRef.current;
+      scanErrorActiveRef.current = false;
+      setScanError(null);
+      errorCallback(scanError);
+    }
+  }, [onQRHardwareScanError, scanError]);
+
   const onError = useCallback(
     async (error: Error) => {
       if (onScanError && error) {
-        sendErrorAnalytics({ error: error.message });
+        sendErrorAnalytics(
+          buildQrHardwareWalletErrorAnalyticsProperties({
+            error: error.message,
+            is_ur_format: false,
+          }),
+        );
         onScanError(error.message);
       }
     },
     [onScanError, sendErrorAnalytics],
   );
 
+  const showScannerError = useCallback(
+    async (error: QRHardwareScanError) => {
+      if (scanErrorActiveRef.current) {
+        return;
+      }
+
+      scanErrorActiveRef.current = true;
+      resetDecoder();
+
+      const errorCallback = onQRHardwareScanErrorRef.current;
+      if (errorCallback) {
+        errorCallback(error);
+      } else {
+        setScanError(error);
+      }
+
+      sendErrorAnalytics(
+        buildQrHardwareWalletErrorAnalyticsProperties({
+          error: error.message,
+          error_category: error.metadata.qrHardwareScanErrorType,
+          is_ur_format: error.metadata.isUrFormat,
+          received_ur_type: error.metadata.receivedUrType,
+        }),
+      ).catch(() => undefined);
+    },
+    [resetDecoder, sendErrorAnalytics],
+  );
+
   const onBarCodeRead = useCallback(
     async (codes: Code[]) => {
-      if (!visible || !codes.length) {
+      if (!visible || scanErrorActiveRef.current || !codes.length) {
         return;
       }
       const response = { data: codes[0].value };
       if (!response.data) {
         return;
       }
+      const content = response.data.trim();
+      const isUrFormat = content.toLowerCase().startsWith('ur:');
 
       try {
-        const content = response.data;
+        if (!isUrFormat) {
+          await showScannerError(
+            createQRHardwareScanError({
+              errorType: QRHardwareScanErrorType.NonURQrScanned,
+              purpose,
+              isUrFormat: false,
+            }),
+          );
+          return;
+        }
+
         urDecoder.receivePart(content);
         setProgress(Math.ceil(urDecoder.getProgress() * 100));
 
         if (urDecoder.isError()) {
-          sendErrorAnalytics({ error: urDecoder.resultError() });
-          onScanError(strings('transaction.unknown_qr_code'));
+          await showScannerError(
+            createQRHardwareScanError({
+              errorType: QRHardwareScanErrorType.URDecodeError,
+              purpose,
+              technicalMessage: urDecoder.resultError(),
+              isUrFormat: true,
+            }),
+          );
         } else if (urDecoder.isSuccess()) {
           const ur = urDecoder.resultUR();
           if (expectedURTypes.includes(ur.type)) {
             onScanSuccess(ur);
             setProgress(0);
             setURDecoder(new URRegistryDecoder());
-          } else if (purpose === QrScanRequestType.PAIR) {
-            sendErrorAnalytics({
-              received_ur_type: ur.type,
-              error: 'invalid `sync` qr code',
-            });
-            onScanError(strings('transaction.invalid_qr_code_sync'));
           } else {
-            sendErrorAnalytics({ error: 'invalid `sign` qr code' });
-            onScanError(strings('transaction.invalid_qr_code_sign'));
+            await showScannerError(
+              createQRHardwareScanError({
+                errorType: QRHardwareScanErrorType.WrongURType,
+                purpose,
+                receivedUrType: ur.type,
+                isUrFormat: true,
+              }),
+            );
           }
         }
       } catch (e) {
-        sendErrorAnalytics({ error: strings('transaction.unknown_qr_code') });
-        onScanError(strings('transaction.unknown_qr_code'));
+        await showScannerError(
+          createQRHardwareScanError({
+            errorType: QRHardwareScanErrorType.ScanException,
+            purpose,
+            technicalMessage: e instanceof Error ? e.message : String(e),
+            isUrFormat,
+          }),
+        );
       }
     },
     [
       visible,
       urDecoder,
-      onScanError,
       expectedURTypes,
       purpose,
       onScanSuccess,
-      sendErrorAnalytics,
+      showScannerError,
     ],
   );
 
@@ -336,6 +500,19 @@ const AnimatedQRScannerModal = (props: AnimatedQRScannerProps) => {
     [purpose, styles],
   );
 
+  const errorTitle = useMemo(
+    () => (scanError ? getQRHardwareScanErrorTitle(scanError) : null),
+    [scanError],
+  );
+
+  const handleLearnMore = useCallback(() => {
+    Linking.openURL(QR_HARDWARE_LEARN_MORE_URL);
+  }, []);
+
+  const handleTryAgain = useCallback(() => {
+    reset();
+  }, [reset]);
+
   return (
     <Modal
       isVisible={visible}
@@ -345,39 +522,77 @@ const AnimatedQRScannerModal = (props: AnimatedQRScannerProps) => {
       onModalHide={() => {
         reset();
         pauseQRCode?.(false);
+        onModalHideComplete?.();
       }}
       onModalWillShow={() => pauseQRCode?.(true)}
     >
       <View style={styles.container}>
         {cameraDevice && hasPermission ? (
           <>
-            <Camera
-              style={styles.preview}
-              device={cameraDevice}
-              isActive={visible}
-              codeScanner={codeScanner}
-              torch="off"
-              onError={onError}
-            />
-            {/* Overlay layout matching other QR scanner */}
-            <View style={styles.overlayContainerColumn}>
-              <View style={styles.overlay} />
-
-              <View style={styles.overlayContainerRow}>
-                {hintText}
-                <View style={styles.overlay} />
-                <Image source={frameImage} style={styles.frame} />
-                <View style={styles.overlay} />
-              </View>
+            {!scanError ? (
+              <>
+                <Camera
+                  style={styles.preview}
+                  device={cameraDevice}
+                  isActive={visible}
+                  codeScanner={codeScanner}
+                  torch="off"
+                  onError={onError}
+                />
+                {/* Overlay layout matching other QR scanner */}
+                <View style={styles.overlayContainerColumn}>
+                  <View style={styles.overlay} />
+
+                  <View style={styles.overlayContainerRow}>
+                    {hintText}
+                    <View style={styles.overlay} />
+                    <Image source={frameImage} style={styles.frame} />
+                    <View style={styles.overlay} />
+                  </View>
 
-              <View style={styles.overlay}>
-                {progress > 0 && (
-                  <Text style={styles.scanningText}>{`${strings(
-                    'qr_scanner.scanning',
-                  )} ${progress ? `${progress.toString()}%` : ''}`}</Text>
-                )}
+                  <View style={styles.overlay}>
+                    {progress > 0 && (
+                      <Text style={styles.scanningText}>{`${strings(
+                        'qr_scanner.scanning',
+                      )} ${progress ? `${progress.toString()}%` : ''}`}</Text>
+                    )}
+                  </View>
+                </View>
+              </>
+            ) : (
+              <View style={styles.innerView}>
+                <View style={styles.errorContainer}>
+                  {errorTitle ? (
+                    <Text style={styles.errorTitle}>{errorTitle}</Text>
+                  ) : null}
+                  {scanError.userMessage ? (
+                    <Text style={styles.errorBody}>
+                      {scanError.userMessage}
+                    </Text>
+                  ) : null}
+                  <View style={styles.errorFooter}>
+                    <TouchableOpacity
+                      style={[styles.errorButton, styles.errorButtonSecondary]}
+                      onPress={handleLearnMore}
+                      testID="qr-scanner-error-learn-more-button"
+                    >
+                      <Text style={styles.errorButtonSecondaryText}>
+                        {strings('hardware_wallet.common.learn_more')}
+                      </Text>
+                    </TouchableOpacity>
+                    <TouchableOpacity
+                      style={[styles.errorButton, styles.errorButtonPrimary]}
+                      onPress={handleTryAgain}
+                      testID="qr-scanner-error-try-again-button"
+                    >
+                      <Text style={styles.errorButtonPrimaryText}>
+                        {strings('hardware_wallet.common.try_again')}
+                      </Text>
+                    </TouchableOpacity>
+                  </View>
+                </View>
               </View>
-            </View>
+            )}
             {/* Close button */}
             <TouchableOpacity style={styles.closeIcon} onPress={hideModal}>
               <Icon name={IconName.Close} size={IconSize.Xl} />
diff --git a/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.tsx b/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.tsx
index 4e6887cdcf7..437caae587b 100644
--- a/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.tsx
+++ b/app/components/UI/Ramp/Views/BuildQuote/BuildQuote.tsx
@@ -69,6 +69,7 @@ import {
 
 import TruncatedError from '../../components/TruncatedError';
 import { PROVIDER_LINKS } from '../../Aggregator/types';
+import { failSession } from '../../headless/sessionRegistry';
 const BAILED_ORDER_STATUSES = new Set<RampsOrderStatus>([
   RampsOrderStatus.Precreated,
   RampsOrderStatus.IdExpired,
@@ -159,10 +160,24 @@ function BuildQuote() {
 
   useEffect(() => {
     if (params?.nativeFlowError) {
+      if (
+        params.headlessSessionId &&
+        failSession(
+          params.headlessSessionId,
+          {
+            code: 'AUTH_FAILED',
+            message: params.nativeFlowError,
+          },
+          'AUTH_FAILED',
+        )
+      ) {
+        navigation.setParams({ nativeFlowError: undefined });
+        return;
+      }
       setRampsError(params.nativeFlowError);
       navigation.setParams({ nativeFlowError: undefined });
     }
-  }, [params?.nativeFlowError, navigation]);
+  }, [params?.headlessSessionId, params?.nativeFlowError, navigation]);
 
   const {
     userRegion,
@@ -627,6 +642,9 @@ function BuildQuote() {
         assetId: selectedToken?.assetId ?? '',
       });
     } catch (err) {
+      if (failSession(params?.headlessSessionId, err)) {
+        return;
+      }
       setRampsError((err as Error).message);
     } finally {
       setIsContinueLoading(false);
@@ -642,6 +660,7 @@ function BuildQuote() {
     selectedPaymentMethod?.id,
     rampRoutingDecision,
     userRegion?.regionCode,
+    params?.headlessSessionId,
     trackEvent,
     createEventBuilder,
     continueWithQuote,
diff --git a/app/components/UI/Ramp/Views/Checkout/Checkout.test.tsx b/app/components/UI/Ramp/Views/Checkout/Checkout.test.tsx
index 9572760e6b0..8d4f519e825 100644
--- a/app/components/UI/Ramp/Views/Checkout/Checkout.test.tsx
+++ b/app/components/UI/Ramp/Views/Checkout/Checkout.test.tsx
@@ -55,6 +55,12 @@ jest.mock('../../utils/v2OrderToast', () => ({
   showV2OrderToast: jest.fn(),
 }));
 
+jest.mock('../../headless/sessionRegistry', () => ({
+  getSession: jest.fn(),
+  closeSession: jest.fn(),
+  failSession: jest.fn(),
+}));
+
 jest.mock('../../../../../util/Logger', () => ({
   error: jest.fn(),
   log: jest.fn(),
@@ -607,4 +613,233 @@ describe('Checkout', () => {
       );
     });
   });
+
+  describe('headless session flow', () => {
+    const mockGetSession = jest.requireMock('../../headless/sessionRegistry')
+      .getSession as jest.Mock;
+    const mockCloseSession = jest.requireMock('../../headless/sessionRegistry')
+      .closeSession as jest.Mock;
+    const mockFailSession = jest.requireMock('../../headless/sessionRegistry')
+      .failSession as jest.Mock;
+    const showV2OrderToastMock = jest.requireMock('../../utils/v2OrderToast')
+      .showV2OrderToast as jest.Mock;
+
+    const mockOrder = {
+      providerOrderId: 'headless-order-1',
+      cryptoCurrency: { symbol: 'ETH' },
+      cryptoAmount: '0.5',
+      status: 'Pending',
+    };
+
+    const callbackFlowParams = {
+      url: 'https://provider.example.com/checkout',
+      providerName: 'Test Provider',
+      providerCode: 'moonpay',
+      walletAddress: '0xdeadbeef',
+      headlessSessionId: 'hs-1',
+    };
+
+    let mockParentPop: jest.Mock;
+
+    beforeEach(() => {
+      mockGetSession.mockReset();
+      mockCloseSession.mockReset();
+      mockFailSession.mockReset();
+      mockParentPop = jest.fn();
+      mockNavigation.getParent.mockReturnValue({ pop: mockParentPop });
+      mockGetOrderFromCallback.mockResolvedValue(mockOrder);
+      mockUseRampsUnifiedV2Enabled.mockReturnValue(true);
+    });
+
+    it('fires onOrderCreated, closes the session, and pops the ramp stack when a live session is present', async () => {
+      const onOrderCreated = jest.fn();
+      mockGetSession.mockReturnValue({
+        id: 'hs-1',
+        status: 'continued',
+        callbacks: {
+          onOrderCreated,
+          onError: jest.fn(),
+          onClose: jest.fn(),
+        },
+      });
+      mockUseParams.mockReturnValue(callbackFlowParams);
+
+      const { getByTestId } = renderWithProvider(<Checkout />, {}, true, false);
+
+      await act(async () => {
+        fireEvent.press(getByTestId('trigger-callback-navigation'));
+      });
+
+      await waitFor(() => {
+        expect(onOrderCreated).toHaveBeenCalledWith('headless-order-1');
+      });
+      expect(mockCloseSession).toHaveBeenCalledWith('hs-1', {
+        reason: 'completed',
+      });
+      expect(mockParentPop).toHaveBeenCalled();
+      expect(mockNavigation.reset).not.toHaveBeenCalled();
+      expect(showV2OrderToastMock).not.toHaveBeenCalled();
+    });
+
+    it('still adds the order to Redux and dispatches protect-wallet when headless', async () => {
+      mockGetSession.mockReturnValue({
+        id: 'hs-1',
+        status: 'continued',
+        callbacks: {
+          onOrderCreated: jest.fn(),
+          onError: jest.fn(),
+          onClose: jest.fn(),
+        },
+      });
+      mockUseParams.mockReturnValue(callbackFlowParams);
+
+      const { getByTestId } = renderWithProvider(<Checkout />, {}, true, false);
+
+      await act(async () => {
+        fireEvent.press(getByTestId('trigger-callback-navigation'));
+      });
+
+      await waitFor(() => {
+        expect(mockAddOrder).toHaveBeenCalledWith(mockOrder);
+      });
+      expect(mockDispatch).toHaveBeenCalledWith({
+        type: 'PROTECT_WALLET_MODAL_VISIBLE',
+      });
+    });
+
+    it('swallows consumer onOrderCreated errors and still closes + pops', async () => {
+      const Logger = jest.requireMock('../../../../../util/Logger') as {
+        error: jest.Mock;
+      };
+      const throwingCallback = jest.fn(() => {
+        throw new Error('consumer bug');
+      });
+      mockGetSession.mockReturnValue({
+        id: 'hs-1',
+        status: 'continued',
+        callbacks: {
+          onOrderCreated: throwingCallback,
+          onError: jest.fn(),
+          onClose: jest.fn(),
+        },
+      });
+      mockUseParams.mockReturnValue(callbackFlowParams);
+
+      const { getByTestId } = renderWithProvider(<Checkout />, {}, true, false);
+
+      await act(async () => {
+        fireEvent.press(getByTestId('trigger-callback-navigation'));
+      });
+
+      await waitFor(() => {
+        expect(throwingCallback).toHaveBeenCalled();
+      });
+      expect(Logger.error).toHaveBeenCalledWith(
+        expect.any(Error),
+        'UnifiedCheckout: onOrderCreated callback threw',
+      );
+      expect(mockCloseSession).toHaveBeenCalledWith('hs-1', {
+        reason: 'completed',
+      });
+      expect(mockParentPop).toHaveBeenCalled();
+    });
+
+    it('surfaces callback processing failures through onError and skips the ErrorView', async () => {
+      mockUseParams.mockReturnValue(callbackFlowParams);
+      mockGetOrderFromCallback.mockRejectedValueOnce(
+        new Error('callback failed'),
+      );
+      mockFailSession.mockReturnValue({
+        code: 'UNKNOWN',
+        message: 'callback failed',
+      });
+
+      const { getByTestId, queryByText } = renderWithProvider(
+        <Checkout />,
+        {},
+        true,
+        false,
+      );
+
+      await act(async () => {
+        fireEvent.press(getByTestId('trigger-callback-navigation'));
+      });
+
+      await waitFor(() => {
+        expect(mockFailSession).toHaveBeenCalledWith('hs-1', expect.any(Error));
+      });
+      expect(mockParentPop).toHaveBeenCalled();
+      expect(showV2OrderToastMock).not.toHaveBeenCalled();
+      expect(queryByText('callback failed')).toBeNull();
+    });
+
+    it('surfaces provider WebView HTTP errors through onError when headless', async () => {
+      mockUseParams.mockReturnValue(callbackFlowParams);
+      mockFailSession.mockReturnValue({
+        code: 'UNKNOWN',
+        message: 'fiat_on_ramp_aggregator.webview_received_error',
+      });
+
+      const { getByTestId } = renderWithProvider(<Checkout />, {}, true, false);
+
+      await act(async () => {
+        fireEvent.press(getByTestId('trigger-http-error-main-uri'));
+      });
+
+      expect(mockFailSession).toHaveBeenCalledWith('hs-1', expect.any(Error));
+      expect(mockParentPop).toHaveBeenCalled();
+    });
+
+    it('falls back to the regular reset + toast when session id is present but session is missing from registry', async () => {
+      mockGetSession.mockReturnValue(undefined);
+      mockUseParams.mockReturnValue(callbackFlowParams);
+
+      const { getByTestId } = renderWithProvider(<Checkout />, {}, true, false);
+
+      await act(async () => {
+        fireEvent.press(getByTestId('trigger-callback-navigation'));
+      });
+
+      await waitFor(() => {
+        expect(showV2OrderToastMock).toHaveBeenCalledWith(
+          expect.objectContaining({ orderId: 'headless-order-1' }),
+        );
+      });
+      expect(mockNavigation.reset).toHaveBeenCalledWith(
+        expect.objectContaining({
+          routes: [
+            expect.objectContaining({
+              params: expect.objectContaining({
+                orderId: 'headless-order-1',
+              }),
+            }),
+          ],
+        }),
+      );
+      expect(mockCloseSession).not.toHaveBeenCalled();
+      expect(mockParentPop).not.toHaveBeenCalled();
+    });
+
+    it('takes the regular non-headless path when headlessSessionId is absent', async () => {
+      mockUseParams.mockReturnValue({
+        url: 'https://provider.example.com/checkout',
+        providerName: 'Test Provider',
+        providerCode: 'moonpay',
+        walletAddress: '0xdeadbeef',
+      });
+
+      const { getByTestId } = renderWithProvider(<Checkout />, {}, true, false);
+
+      await act(async () => {
+        fireEvent.press(getByTestId('trigger-callback-navigation'));
+      });
+
+      await waitFor(() => {
+        expect(mockNavigation.reset).toHaveBeenCalled();
+      });
+      expect(showV2OrderToastMock).toHaveBeenCalled();
+      expect(mockCloseSession).not.toHaveBeenCalled();
+      expect(mockParentPop).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/app/components/UI/Ramp/Views/Checkout/Checkout.tsx b/app/components/UI/Ramp/Views/Checkout/Checkout.tsx
index 6e9242f429c..0dcc8437aa3 100644
--- a/app/components/UI/Ramp/Views/Checkout/Checkout.tsx
+++ b/app/components/UI/Ramp/Views/Checkout/Checkout.tsx
@@ -27,6 +27,11 @@ import {
 import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import useRampsUnifiedV2Enabled from '../../hooks/useRampsUnifiedV2Enabled';
 import { showV2OrderToast } from '../../utils/v2OrderToast';
+import {
+  closeSession,
+  failSession,
+  getSession,
+} from '../../headless/sessionRegistry';
 import { useStyles } from '../../../../hooks/useStyles';
 import styleSheet from './Checkout.styles';
 import Device from '../../../../../util/device';
@@ -56,6 +61,14 @@ interface CheckoutParams {
   providerType?: FIAT_ORDER_PROVIDERS;
   /** Optional callback invoked on navigation state changes after URL de-duplication (e.g. redirect URLs). */
   onNavigationStateChange?: (navState: { url: string }) => void;
+  /**
+   * When set, Checkout is participating in a headless buy session. On
+   * successful callback the screen fires the session's `onOrderCreated`
+   * callback, closes the session, and pops the ramp stack instead of
+   * resetting to `RAMPS_ORDER_DETAILS`. The `showV2OrderToast` surface is
+   * also suppressed — headless consumers drive their own UI.
+   */
+  headlessSessionId?: string;
 }
 
 export const createCheckoutNavDetails = createNavigationDetails<CheckoutParams>(
@@ -87,6 +100,7 @@ const Checkout = () => {
     network,
     userAgent,
     onNavigationStateChange,
+    headlessSessionId,
   } = params ?? {};
   const effectiveOrderId = (orderIdParam ?? customOrderId)?.trim() || null;
 
@@ -110,6 +124,18 @@ const Checkout = () => {
     }
   }, [uri, createEventBuilder, trackEvent, rampRoutingDecision]);
 
+  const failHeadlessCheckout = useCallback(
+    (checkoutError: unknown) => {
+      if (!failSession(headlessSessionId, checkoutError)) {
+        return false;
+      }
+      // @ts-expect-error navigation prop mismatch
+      navigation.getParent()?.pop();
+      return true;
+    },
+    [headlessSessionId, navigation],
+  );
+
   useEffect(() => {
     // For external-browser flows (e.g. PayPal), addPrecreatedOrder is called in
     // BuildQuote; the user never reaches Checkout. For WebView flows,
@@ -178,6 +204,26 @@ const Checkout = () => {
         addOrder(rampsOrder);
         dispatch(protectWalletModalVisible());
 
+        // Headless mode: hand the orderId to the consumer, close the
+        // session, and unwind out of the ramp stack so the caller regains
+        // foreground. Skip the toast + RAMPS_ORDER_DETAILS reset — both
+        // are user-facing UI the headless consumer didn't ask for.
+        const session = getSession(headlessSessionId);
+        if (headlessSessionId && session) {
+          try {
+            session.callbacks.onOrderCreated(rampsOrder.providerOrderId);
+          } catch (callbackError) {
+            Logger.error(
+              callbackError as Error,
+              'UnifiedCheckout: onOrderCreated callback threw',
+            );
+          }
+          closeSession(headlessSessionId, { reason: 'completed' });
+          // @ts-expect-error navigation prop mismatch
+          navigation.getParent()?.pop();
+          return;
+        }
+
         if (isV2Enabled) {
           showV2OrderToast({
             orderId: rampsOrder.providerOrderId,
@@ -204,6 +250,9 @@ const Checkout = () => {
         Logger.error(navError as Error, {
           message: 'UnifiedCheckout: error handling callback',
         });
+        if (failHeadlessCheckout(navError)) {
+          return;
+        }
         setError((navError as Error)?.message);
       }
     },
@@ -217,6 +266,8 @@ const Checkout = () => {
       getOrderFromCallback,
       isV2Enabled,
       params?.cryptocurrency,
+      headlessSessionId,
+      failHeadlessCheckout,
     ],
   );
 
@@ -313,6 +364,9 @@ const Checkout = () => {
                 'fiat_on_ramp_aggregator.webview_received_error',
                 { code: nativeEvent.statusCode },
               );
+              if (failHeadlessCheckout(new Error(webviewHttpError))) {
+                return;
+              }
               setError(webviewHttpError);
             } else {
               Logger.log(
diff --git a/app/components/UI/Ramp/Views/HeadlessHost/HeadlessHost.test.tsx b/app/components/UI/Ramp/Views/HeadlessHost/HeadlessHost.test.tsx
index 898358b451f..67d2031d98a 100644
--- a/app/components/UI/Ramp/Views/HeadlessHost/HeadlessHost.test.tsx
+++ b/app/components/UI/Ramp/Views/HeadlessHost/HeadlessHost.test.tsx
@@ -348,6 +348,25 @@ describe('HeadlessHost', () => {
       expect(screen.getByText('quote expired')).toBeOnTheScreen();
     });
 
+    it('surfaces limit failures as onError(LIMIT_EXCEEDED, ...)', async () => {
+      const limitError = new Error('Daily limit exceeded');
+      limitError.name = 'LimitExceededError';
+      mockContinueWithQuote.mockRejectedValueOnce(limitError);
+      const quote = buildNativeQuote();
+      const session = seedSession(quote);
+      const callbacks = session.callbacks;
+      renderHost({ headlessSessionId: session.id });
+      await waitFor(() => {
+        expect(callbacks.onError).toHaveBeenCalledWith({
+          code: 'LIMIT_EXCEEDED',
+          message: 'Daily limit exceeded',
+        });
+      });
+      expect(callbacks.onClose).toHaveBeenCalledWith({ reason: 'unknown' });
+      expect(getSession(session.id)).toBeUndefined();
+      expect(screen.getByText('Daily limit exceeded')).toBeOnTheScreen();
+    });
+
     it('does not run the continueWithQuote rejection path after unmount', async () => {
       let rejectDeferred: ((error: Error) => void) | undefined;
       mockContinueWithQuote.mockImplementation(
diff --git a/app/components/UI/Ramp/Views/HeadlessHost/HeadlessHost.tsx b/app/components/UI/Ramp/Views/HeadlessHost/HeadlessHost.tsx
index 313c1da6685..22a843f8170 100644
--- a/app/components/UI/Ramp/Views/HeadlessHost/HeadlessHost.tsx
+++ b/app/components/UI/Ramp/Views/HeadlessHost/HeadlessHost.tsx
@@ -27,7 +27,7 @@ import Logger from '../../../../../util/Logger';
 // Going through the barrel would leave the registry exports `undefined`
 // at evaluation time inside this module.
 import {
-  closeSession,
+  failSession,
   getSession,
   setStatus,
 } from '../../headless/sessionRegistry';
@@ -132,26 +132,17 @@ function HeadlessHost() {
     if (!nativeFlowError) {
       return;
     }
-    const liveSession = getSession(headlessSessionId);
-    if (!liveSession) {
-      return;
-    }
-    setErrorMessage(nativeFlowError);
-    try {
-      liveSession.callbacks.onError({
-        code: 'AUTH_FAILED',
-        message: nativeFlowError,
-      });
-    } catch (e) {
-      Logger.error(e as Error, 'HeadlessHost: onError callback threw');
-    }
-    closeSession(
+    const headlessError = failSession(
       headlessSessionId,
-      { reason: 'unknown' },
       {
-        terminalStatus: 'failed',
+        code: 'AUTH_FAILED',
+        message: nativeFlowError,
       },
+      'AUTH_FAILED',
     );
+    if (headlessError) {
+      setErrorMessage(headlessError.message ?? nativeFlowError);
+    }
   }, [nativeFlowError, headlessSessionId]);
 
   // Process the session. Uses `useEffect` (not `useFocusEffect`) so that
@@ -202,25 +193,11 @@ function HeadlessHost() {
     if (!chainId) {
       const message = `HeadlessHost: invalid assetId "${currentSession.params.assetId}"`;
       Logger.error(new Error(message));
-      try {
-        currentSession.callbacks.onError({
-          code: 'UNKNOWN',
-          message,
-        });
-      } catch (e) {
-        Logger.error(e as Error, 'HeadlessHost: onError callback threw');
-      }
       // closeSession alone does not trigger a re-render; without setState the
       // render-time `session` ref stays truthy and the loader would spin
       // forever. Surface the same message in UI as other error paths.
       setErrorMessage(message);
-      closeSession(
-        headlessSessionId,
-        { reason: 'unknown' },
-        {
-          terminalStatus: 'failed',
-        },
-      );
+      failSession(headlessSessionId, { code: 'UNKNOWN', message });
       return;
     }
     // Defer until walletAddress resolves — avoids calling continueWithQuote
@@ -270,22 +247,8 @@ function HeadlessHost() {
       if (!liveSession) {
         return;
       }
-      setErrorMessage(message);
-      try {
-        liveSession.callbacks.onError({
-          code: 'UNKNOWN',
-          message,
-        });
-      } catch (e) {
-        Logger.error(e as Error, 'HeadlessHost: onError callback threw');
-      }
-      closeSession(
-        headlessSessionId,
-        { reason: 'unknown' },
-        {
-          terminalStatus: 'failed',
-        },
-      );
+      const headlessError = failSession(headlessSessionId, error);
+      setErrorMessage(headlessError?.message ?? message);
     });
     return () => {
       cancelled = true;
diff --git a/app/components/UI/Ramp/headless/PLAN.md b/app/components/UI/Ramp/headless/PLAN.md
index b247b1dbbf6..b85630e161b 100644
--- a/app/components/UI/Ramp/headless/PLAN.md
+++ b/app/components/UI/Ramp/headless/PLAN.md
@@ -13,8 +13,8 @@
 - [x] **Phase 4c** — Make `useContinueWithQuote` headless-ready — extend `ContinueWithQuoteContext` with optional overrides so callers without controller state (the Host) can drive it from a `Quote`
 - [x] **Phase 5 (revised)** — Quote-first headless start path — `startHeadlessBuy({ quote, redirectUrl? })` creates a session carrying the quote, navigates to Headless Host, Host calls `continueWithQuote(quote, ctx)` and re-orchestrates after auth loops
 - [ ] **Phase 5b (deferred)** — `startHeadlessBuy({ assetId, amount, paymentMethodId, providerId? })` "open BuildQuote / Host fetches quotes" mode — picked up after the quote-first path is stable
-- [ ] **Phase 6** — Bypass order-processing redirect in Transak/aggregator routing when headless; fire `onOrderCreated` and end session
-- [ ] **Phase 7** — Extract UI-coupled error/limit surfacing; route errors through `onError` as typed `HeadlessBuyError`
+- [x] **Phase 6** — Bypass order-processing redirect in Transak/aggregator routing when headless; fire `onOrderCreated` and end session
+- [x] **Phase 7** — Extract UI-coupled error/limit surfacing; route errors through `onError` as typed `HeadlessBuyError`
 - [ ] **Phase 8** — Cancellation + `onClose` semantics (including user-dismissed detection)
 - [ ] **Phase 9** — Expose `getOrder` / `refreshOrder` from hook and show in playground
 - [ ] **Phase 10** — Playground polish — event log, input persistence, aggregator/native presets
diff --git a/app/components/UI/Ramp/headless/sessionRegistry.test.ts b/app/components/UI/Ramp/headless/sessionRegistry.test.ts
index 78222812c41..74b36ea39cb 100644
--- a/app/components/UI/Ramp/headless/sessionRegistry.test.ts
+++ b/app/components/UI/Ramp/headless/sessionRegistry.test.ts
@@ -3,9 +3,11 @@ import {
   closeSession,
   createSession,
   endSession,
+  failSession,
   getActiveSessionId,
   getSession,
   setStatus,
+  toHeadlessBuyError,
 } from './sessionRegistry';
 import type { HeadlessBuyCallbacks, HeadlessBuyParams } from './types';
 import type { Quote } from '../types';
@@ -185,4 +187,77 @@ describe('sessionRegistry', () => {
       expect(getActiveSessionId()).toBeUndefined();
     });
   });
+
+  describe('toHeadlessBuyError', () => {
+    it('preserves explicit headless error codes and details', () => {
+      expect(
+        toHeadlessBuyError({
+          code: 'LIMIT_EXCEEDED',
+          message: 'Daily limit exceeded',
+          details: { period: 'daily' },
+        }),
+      ).toEqual({
+        code: 'LIMIT_EXCEEDED',
+        message: 'Daily limit exceeded',
+        details: { period: 'daily' },
+      });
+    });
+
+    it('maps LimitExceededError instances to LIMIT_EXCEEDED', () => {
+      const error = new Error('Daily limit exceeded');
+      error.name = 'LimitExceededError';
+      expect(toHeadlessBuyError(error)).toEqual({
+        code: 'LIMIT_EXCEEDED',
+        message: 'Daily limit exceeded',
+      });
+    });
+
+    it('falls back to UNKNOWN for regular errors', () => {
+      expect(toHeadlessBuyError(new Error('provider failed'))).toEqual({
+        code: 'UNKNOWN',
+        message: 'provider failed',
+      });
+    });
+  });
+
+  describe('failSession', () => {
+    it('fires onError then onClose and removes the session', () => {
+      const callbacks = buildCallbacks();
+      const session = createSession(baseParams, callbacks);
+
+      const headlessError = failSession(session.id, {
+        code: 'QUOTE_FAILED',
+        message: 'Quote expired',
+      });
+
+      expect(headlessError).toEqual({
+        code: 'QUOTE_FAILED',
+        message: 'Quote expired',
+        details: undefined,
+      });
+      expect(callbacks.onError).toHaveBeenCalledWith(headlessError);
+      expect(callbacks.onClose).toHaveBeenCalledWith({ reason: 'unknown' });
+      expect(session.status).toBe('failed');
+      expect(getSession(session.id)).toBeUndefined();
+    });
+
+    it('logs onError failures but still closes the session', () => {
+      const callbacks = {
+        ...buildCallbacks(),
+        onError: jest.fn(() => {
+          throw new Error('consumer onError boom');
+        }),
+      };
+      const session = createSession(baseParams, callbacks);
+
+      failSession(session.id, new Error('provider failed'));
+
+      expect(mockLoggerError).toHaveBeenCalledWith(
+        expect.any(Error),
+        'headless sessionRegistry: onError callback threw',
+      );
+      expect(callbacks.onClose).toHaveBeenCalledWith({ reason: 'unknown' });
+      expect(getSession(session.id)).toBeUndefined();
+    });
+  });
 });
diff --git a/app/components/UI/Ramp/headless/sessionRegistry.ts b/app/components/UI/Ramp/headless/sessionRegistry.ts
index 2f7f354b79c..586e303337f 100644
--- a/app/components/UI/Ramp/headless/sessionRegistry.ts
+++ b/app/components/UI/Ramp/headless/sessionRegistry.ts
@@ -3,17 +3,86 @@ import type {
   CloseSessionOptions,
   HeadlessBuyCallbacks,
   HeadlessBuyCloseInfo,
+  HeadlessBuyError,
+  HeadlessBuyErrorCode,
   HeadlessBuyParams,
   HeadlessSession,
   HeadlessSessionStatus,
 } from './types';
 
+const HEADLESS_BUY_ERROR_CODES: ReadonlySet<HeadlessBuyErrorCode> = new Set([
+  'NO_QUOTES',
+  'LIMIT_EXCEEDED',
+  'KYC_REQUIRED',
+  'AUTH_FAILED',
+  'QUOTE_FAILED',
+  'USER_CANCELLED',
+  'UNKNOWN',
+]);
+
 function isTerminalSessionStatus(status: HeadlessSessionStatus): boolean {
   return (
     status === 'completed' || status === 'cancelled' || status === 'failed'
   );
 }
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null;
+}
+
+function isHeadlessBuyErrorCode(value: unknown): value is HeadlessBuyErrorCode {
+  return (
+    typeof value === 'string' &&
+    HEADLESS_BUY_ERROR_CODES.has(value as HeadlessBuyErrorCode)
+  );
+}
+
+function getErrorMessage(error: unknown): string | undefined {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  if (isRecord(error) && typeof error.message === 'string') {
+    return error.message;
+  }
+  if (typeof error === 'string') {
+    return error;
+  }
+  return undefined;
+}
+
+export function toHeadlessBuyError(
+  error: unknown,
+  fallbackCode: HeadlessBuyErrorCode = 'UNKNOWN',
+): HeadlessBuyError {
+  if (isRecord(error)) {
+    const explicitCode = isHeadlessBuyErrorCode(error.headlessBuyErrorCode)
+      ? error.headlessBuyErrorCode
+      : isHeadlessBuyErrorCode(error.code)
+        ? error.code
+        : undefined;
+
+    if (explicitCode) {
+      return {
+        code: explicitCode,
+        message: getErrorMessage(error),
+        details: isRecord(error.details) ? error.details : undefined,
+      };
+    }
+  }
+
+  if (error instanceof Error && error.name === 'LimitExceededError') {
+    return {
+      code: 'LIMIT_EXCEEDED',
+      message: error.message,
+    };
+  }
+
+  return {
+    code: fallbackCode,
+    message: getErrorMessage(error),
+  };
+}
+
 /**
  * Module-level registry that holds the live headless buy sessions. Sessions
  * carry non-serializable callbacks and therefore cannot live in Redux nor in
@@ -158,6 +227,42 @@ export function closeSession(
   }
 }
 
+/**
+ * Idempotent "fail and notify" for unrecoverable headless errors. It turns
+ * thrown/native errors into the public HeadlessBuyError shape, fires `onError`,
+ * then terminates the session through `closeSession`.
+ */
+export function failSession(
+  id: string | undefined,
+  error: unknown,
+  fallbackCode: HeadlessBuyErrorCode = 'UNKNOWN',
+): HeadlessBuyError | undefined {
+  if (!id) {
+    return undefined;
+  }
+  const session = sessions.get(id);
+  if (!session) {
+    return undefined;
+  }
+  const headlessError = toHeadlessBuyError(error, fallbackCode);
+  try {
+    session.callbacks.onError(headlessError);
+  } catch (e) {
+    Logger.error(
+      e instanceof Error ? e : new Error(String(e)),
+      'headless sessionRegistry: onError callback threw',
+    );
+  }
+  closeSession(
+    id,
+    { reason: 'unknown' },
+    {
+      terminalStatus: 'failed',
+    },
+  );
+  return headlessError;
+}
+
 /**
  * Test-only helper. Resets registry state between tests so they do not leak
  * sessions into one another.
diff --git a/app/components/UI/Ramp/headless/types.ts b/app/components/UI/Ramp/headless/types.ts
index 4cd3a276dcb..c2eec400413 100644
--- a/app/components/UI/Ramp/headless/types.ts
+++ b/app/components/UI/Ramp/headless/types.ts
@@ -149,15 +149,17 @@ export interface HeadlessBuyCallbacks {
  * the UI normally renders. Phase 3 only uses `UNKNOWN`; later phases route
  * limit/auth/etc. errors through it.
  */
+export type HeadlessBuyErrorCode =
+  | 'NO_QUOTES'
+  | 'LIMIT_EXCEEDED'
+  | 'KYC_REQUIRED'
+  | 'AUTH_FAILED'
+  | 'QUOTE_FAILED'
+  | 'USER_CANCELLED'
+  | 'UNKNOWN';
+
 export interface HeadlessBuyError {
-  code:
-    | 'NO_QUOTES'
-    | 'LIMIT_EXCEEDED'
-    | 'KYC_REQUIRED'
-    | 'AUTH_FAILED'
-    | 'QUOTE_FAILED'
-    | 'USER_CANCELLED'
-    | 'UNKNOWN';
+  code: HeadlessBuyErrorCode;
   message?: string;
   details?: Record<string, unknown>;
 }
diff --git a/app/components/UI/Ramp/hooks/useContinueWithQuote.ts b/app/components/UI/Ramp/hooks/useContinueWithQuote.ts
index 11da1371b2a..6ffa4419430 100644
--- a/app/components/UI/Ramp/hooks/useContinueWithQuote.ts
+++ b/app/components/UI/Ramp/hooks/useContinueWithQuote.ts
@@ -328,6 +328,7 @@ export function useContinueWithQuote(
             currency: effectiveCurrency,
             cryptocurrency: effectiveCryptoSymbol,
             orderId: buyWidget.orderId?.trim() || undefined,
+            headlessSessionId: ctx.headlessSessionId,
           }),
         );
       } catch (error) {
diff --git a/app/components/UI/Ramp/hooks/useTransakRouting.test.ts b/app/components/UI/Ramp/hooks/useTransakRouting.test.ts
index 612e73994cf..d766852dce9 100644
--- a/app/components/UI/Ramp/hooks/useTransakRouting.test.ts
+++ b/app/components/UI/Ramp/hooks/useTransakRouting.test.ts
@@ -4,15 +4,24 @@ import { useTransakRouting } from './useTransakRouting';
 
 const mockNavigate = jest.fn();
 const mockReset = jest.fn();
+const mockParentPop = jest.fn();
+const mockGetParent = jest.fn(() => ({ pop: mockParentPop }));
 
 jest.mock('@react-navigation/native', () => ({
   ...jest.requireActual('@react-navigation/native'),
   useNavigation: () => ({
     navigate: mockNavigate,
     reset: mockReset,
+    getParent: mockGetParent,
   }),
 }));
 
+jest.mock('../headless/sessionRegistry', () => ({
+  getSession: jest.fn(),
+  closeSession: jest.fn(),
+  failSession: jest.fn(),
+}));
+
 const MOCK_WALLET_ADDRESS = '0xabcdef1234567890';
 
 jest.mock('react-redux', () => ({
@@ -1039,11 +1048,11 @@ describe('useTransakRouting', () => {
   describe('navigateToKycWebview', () => {
     it('resets navigation stack with KycProcessing behind the webview', () => {
       const { result } = renderHook(() => useTransakRouting());
-      const mockQuote = { id: 'quote-789' } as unknown as TransakBuyQuote;
+      const kycQuote = { id: 'quote-789' } as unknown as TransakBuyQuote;
 
       act(() => {
         result.current.navigateToKycWebview({
-          quote: mockQuote,
+          quote: kycQuote,
           kycUrl: 'https://kyc.example.com',
           workFlowRunId: 'wf-456',
           amount: 30,
@@ -1067,7 +1076,7 @@ describe('useTransakRouting', () => {
                 url: 'https://kyc.example.com',
                 providerName: 'Transak',
                 workFlowRunId: 'wf-456',
-                quote: mockQuote,
+                quote: kycQuote,
                 amount: 30,
               }),
             }),
@@ -1375,4 +1384,318 @@ describe('useTransakRouting', () => {
       expect(mockAddOrder).not.toHaveBeenCalled();
     });
   });
+
+  describe('headless session flow', () => {
+    const mockGetSession = jest.requireMock('../headless/sessionRegistry')
+      .getSession as jest.Mock;
+    const mockCloseSession = jest.requireMock('../headless/sessionRegistry')
+      .closeSession as jest.Mock;
+    const mockFailSession = jest.requireMock('../headless/sessionRegistry')
+      .failSession as jest.Mock;
+    const mockShowV2OrderToast = jest.requireMock('../utils/v2OrderToast')
+      .showV2OrderToast as jest.Mock;
+
+    const HEADLESS_CONFIG = {
+      baseRoute: 'RampHeadlessHost',
+      baseRouteParams: { headlessSessionId: 'hs-1' },
+    };
+
+    const depositOrder = {
+      id: 'order-hs',
+      providerOrderId: 'order-hs',
+      provider: 'transak-native',
+      walletAddress: MOCK_WALLET_ADDRESS,
+      paymentDetails: {},
+    };
+
+    const refreshedOrder = {
+      providerOrderId: 'order-hs',
+      cryptoCurrency: { symbol: 'ETH' },
+      cryptoAmount: '0.05',
+      status: 'Pending',
+      fiatAmount: 100,
+      exchangeRate: 2000,
+      networkFees: 0,
+      partnerFees: 0,
+      totalFeesFiat: 0,
+      paymentMethod: { id: 'card' },
+      network: { chainId: '1', name: 'Ethereum' },
+      fiatCurrency: { symbol: 'USD' },
+    };
+
+    const runApprovedFlowHeadless = async () => {
+      mockGetUserDetails.mockResolvedValue({
+        firstName: 'John',
+        lastName: 'Doe',
+        mobileNumber: '+1',
+        dob: '1990-01-01',
+        address: {},
+      });
+      mockGetKycRequirement.mockResolvedValue({
+        status: 'APPROVED',
+        kycType: 'SIMPLE',
+      });
+      mockGetUserLimits.mockResolvedValue({
+        remaining: { '1': 10000, '30': 50000, '365': 200000 },
+      });
+      mockRequestOtt.mockResolvedValue({ ott: 'test-ott' });
+      mockGeneratePaymentWidgetUrl.mockReturnValue(
+        'https://payment.example.com',
+      );
+
+      const { result } = renderHook(() => useTransakRouting(HEADLESS_CONFIG));
+
+      await act(async () => {
+        await result.current.routeAfterAuthentication(
+          mockQuote as never,
+          mockQuote.fiatAmount,
+        );
+      });
+
+      return capturedHandleNavigationStateChange;
+    };
+
+    beforeEach(() => {
+      mockGetSession.mockReset();
+      mockCloseSession.mockReset();
+      mockFailSession.mockReset();
+      mockParentPop.mockReset();
+      mockGetOrder.mockResolvedValue(depositOrder);
+      mockRefreshOrder.mockResolvedValue(refreshedOrder);
+    });
+
+    it('fires onOrderCreated, closes the session, and pops the ramp stack when a live session is present', async () => {
+      const onOrderCreated = jest.fn();
+      mockGetSession.mockReturnValue({
+        id: 'hs-1',
+        status: 'continued',
+        callbacks: {
+          onOrderCreated,
+          onError: jest.fn(),
+          onClose: jest.fn(),
+        },
+      });
+
+      const handler = await runApprovedFlowHeadless();
+      expect(handler).not.toBeNull();
+      if (!handler) return;
+
+      await act(async () => {
+        await handler({
+          url: 'https://redirect.example.com?orderId=order-hs',
+        });
+      });
+
+      expect(onOrderCreated).toHaveBeenCalledWith('order-hs');
+      expect(mockCloseSession).toHaveBeenCalledWith('hs-1', {
+        reason: 'completed',
+      });
+      expect(mockParentPop).toHaveBeenCalled();
+      expect(mockReset).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          routes: [expect.objectContaining({ name: 'RampsOrderDetails' })],
+        }),
+      );
+      expect(mockShowV2OrderToast).not.toHaveBeenCalled();
+    });
+
+    it('still adds the order and tracks the transaction event when headless', async () => {
+      mockGetSession.mockReturnValue({
+        id: 'hs-1',
+        status: 'continued',
+        callbacks: {
+          onOrderCreated: jest.fn(),
+          onError: jest.fn(),
+          onClose: jest.fn(),
+        },
+      });
+
+      const handler = await runApprovedFlowHeadless();
+      expect(handler).not.toBeNull();
+      if (!handler) return;
+
+      await act(async () => {
+        await handler({
+          url: 'https://redirect.example.com?orderId=order-hs',
+        });
+      });
+
+      expect(mockAddOrder).toHaveBeenCalledWith(
+        expect.objectContaining({ providerOrderId: 'order-hs' }),
+      );
+      expect(mockTrackEvent).toHaveBeenCalledWith(
+        'RAMPS_TRANSACTION_CONFIRMED',
+        expect.objectContaining({ ramp_type: 'DEPOSIT' }),
+      );
+    });
+
+    it('swallows consumer onOrderCreated errors and still closes + pops', async () => {
+      const Logger = jest.requireMock('../../../../util/Logger');
+      const mockLoggerError = Logger.error as jest.Mock;
+      const throwingCallback = jest.fn(() => {
+        throw new Error('consumer bug');
+      });
+      mockGetSession.mockReturnValue({
+        id: 'hs-1',
+        status: 'continued',
+        callbacks: {
+          onOrderCreated: throwingCallback,
+          onError: jest.fn(),
+          onClose: jest.fn(),
+        },
+      });
+
+      const handler = await runApprovedFlowHeadless();
+      expect(handler).not.toBeNull();
+      if (!handler) return;
+
+      await act(async () => {
+        await handler({
+          url: 'https://redirect.example.com?orderId=order-hs',
+        });
+      });
+
+      expect(throwingCallback).toHaveBeenCalled();
+      expect(mockLoggerError).toHaveBeenCalledWith(
+        expect.any(Error),
+        'useTransakRouting: onOrderCreated callback threw',
+      );
+      expect(mockCloseSession).toHaveBeenCalledWith('hs-1', {
+        reason: 'completed',
+      });
+      expect(mockParentPop).toHaveBeenCalled();
+    });
+
+    it('preserves LIMIT_EXCEEDED errors for the Headless Host to surface as data', async () => {
+      mockGetUserDetails.mockResolvedValue({
+        firstName: 'John',
+        address: {},
+      });
+      mockGetKycRequirement.mockResolvedValue({
+        status: 'APPROVED',
+        kycType: 'SIMPLE',
+      });
+      mockGetUserLimits.mockResolvedValue({
+        remaining: { '1': 50, '30': 50000, '365': 200000 },
+      });
+
+      const { result } = renderHook(() => useTransakRouting(HEADLESS_CONFIG));
+
+      await expect(
+        act(async () => {
+          await result.current.routeAfterAuthentication(
+            mockQuote as never,
+            mockQuote.fiatAmount,
+          );
+        }),
+      ).rejects.toMatchObject({
+        name: 'LimitExceededError',
+        headlessBuyErrorCode: 'LIMIT_EXCEEDED',
+      });
+
+      expect(mockShowV2OrderToast).not.toHaveBeenCalled();
+      expect(mockFailSession).not.toHaveBeenCalled();
+    });
+
+    it('surfaces headless checkout processing failures through onError and skips toasts', async () => {
+      const handler = await runApprovedFlowHeadless();
+      expect(handler).not.toBeNull();
+      if (!handler) return;
+
+      mockGetOrder.mockRejectedValue(new Error('Network error'));
+      mockFailSession.mockReturnValue({
+        code: 'UNKNOWN',
+        message: 'Network error',
+      });
+
+      await act(async () => {
+        await handler({
+          url: 'https://redirect.example.com?orderId=order-hs',
+        });
+      });
+
+      expect(mockFailSession).toHaveBeenCalledWith('hs-1', expect.any(Error));
+      expect(mockShowV2OrderToast).not.toHaveBeenCalled();
+      expect(mockParentPop).toHaveBeenCalled();
+    });
+
+    it('routes manual bank transfer order success through headless callbacks without showing a toast', async () => {
+      const onOrderCreated = jest.fn();
+      mockGetSession.mockReturnValue({
+        id: 'hs-1',
+        status: 'continued',
+        callbacks: {
+          onOrderCreated,
+          onError: jest.fn(),
+          onClose: jest.fn(),
+        },
+      });
+      mockSelectedPaymentMethod = {
+        id: '/payments/bank-transfer',
+        isManualBankTransfer: true,
+      };
+      mockGetUserDetails.mockResolvedValue({
+        firstName: 'John',
+        lastName: 'Doe',
+        mobileNumber: '+1',
+        dob: '1990-01-01',
+        address: {},
+      });
+      mockGetKycRequirement.mockResolvedValue({
+        status: 'APPROVED',
+        kycType: 'SIMPLE',
+      });
+      mockGetUserLimits.mockResolvedValue({
+        remaining: { '1': 10000, '30': 50000, '365': 200000 },
+      });
+      mockTransakCreateOrder.mockResolvedValue(depositOrder);
+      mockRefreshOrder.mockResolvedValue(refreshedOrder);
+
+      const { result } = renderHook(() => useTransakRouting(HEADLESS_CONFIG));
+
+      await act(async () => {
+        await result.current.routeAfterAuthentication(
+          mockQuote as never,
+          mockQuote.fiatAmount,
+        );
+      });
+
+      expect(onOrderCreated).toHaveBeenCalledWith('order-hs');
+      expect(mockCloseSession).toHaveBeenCalledWith('hs-1', {
+        reason: 'completed',
+      });
+      expect(mockShowV2OrderToast).not.toHaveBeenCalled();
+      expect(mockParentPop).toHaveBeenCalled();
+    });
+
+    it('falls back to the regular order-details reset + toast when session id is present but session is missing from registry', async () => {
+      mockGetSession.mockReturnValue(undefined);
+
+      const handler = await runApprovedFlowHeadless();
+      expect(handler).not.toBeNull();
+      if (!handler) return;
+
+      await act(async () => {
+        await handler({
+          url: 'https://redirect.example.com?orderId=order-hs',
+        });
+      });
+
+      expect(mockShowV2OrderToast).toHaveBeenCalledWith(
+        expect.objectContaining({ orderId: 'order-hs' }),
+      );
+      expect(mockReset).toHaveBeenCalledWith(
+        expect.objectContaining({
+          index: 0,
+          routes: [
+            expect.objectContaining({
+              params: expect.objectContaining({ orderId: 'order-hs' }),
+            }),
+          ],
+        }),
+      );
+      expect(mockCloseSession).not.toHaveBeenCalled();
+      expect(mockParentPop).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/app/components/UI/Ramp/hooks/useTransakRouting.ts b/app/components/UI/Ramp/hooks/useTransakRouting.ts
index fa406d75ad7..5319a7e41f8 100644
--- a/app/components/UI/Ramp/hooks/useTransakRouting.ts
+++ b/app/components/UI/Ramp/hooks/useTransakRouting.ts
@@ -28,6 +28,11 @@ import useRampAccountAddress from './useRampAccountAddress';
 import { isHttpUnauthorized } from '../utils/isHttpUnauthorized';
 import { parseUserFacingError } from '../utils/parseUserFacingError';
 import { useRampsOrders } from './useRampsOrders';
+import {
+  closeSession,
+  failSession,
+  getSession,
+} from '../headless/sessionRegistry';
 
 interface RampStackParamList {
   /** `baseRouteParams` (e.g. `headlessSessionId`) are merged onto this route in resets — see `navigateToVerifyIdentityCallback`. */
@@ -68,9 +73,14 @@ interface RampStackParamList {
 }
 
 class LimitExceededError extends Error {
-  constructor(message: string) {
+  readonly headlessBuyErrorCode = 'LIMIT_EXCEEDED';
+
+  readonly details?: Record<string, unknown>;
+
+  constructor(message: string, details?: Record<string, unknown>) {
     super(message);
     this.name = 'LimitExceededError';
+    this.details = details;
   }
 }
 
@@ -99,6 +109,14 @@ interface UseTransakRoutingConfig {
 export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
   const baseRoute = config?.baseRoute;
   const baseRouteParams = config?.baseRouteParams;
+  // Headless-mode marker extracted from the caller's config. When the
+  // Host wires `baseRouteParams: { headlessSessionId }` through, this
+  // lets post-checkout success paths hand the orderId to the session's
+  // `onOrderCreated` callback and unwind the ramp stack instead of
+  // resetting to `RAMPS_ORDER_DETAILS`.
+  const headlessSessionId = (
+    baseRouteParams as { headlessSessionId?: string } | undefined
+  )?.headlessSessionId;
   // Composes the stack base entry used by `navigation.reset` calls below.
   // - When the caller didn't override `baseRoute`, we keep BuildQuote as the
   //   base and merge the per-call `amount` (so the input is pre-filled when
@@ -185,6 +203,11 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
               period: 'daily',
               remaining: `${dailyLimit} ${fiatCurrency}`,
             }),
+            {
+              period: 'daily',
+              remaining: dailyLimit,
+              currency: fiatCurrency,
+            },
           );
         }
 
@@ -194,6 +217,11 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
               period: 'monthly',
               remaining: `${monthlyLimit} ${fiatCurrency}`,
             }),
+            {
+              period: 'monthly',
+              remaining: monthlyLimit,
+              currency: fiatCurrency,
+            },
           );
         }
 
@@ -203,6 +231,11 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
               period: 'yearly',
               remaining: `${yearlyLimit} ${fiatCurrency}`,
             }),
+            {
+              period: 'yearly',
+              remaining: yearlyLimit,
+              currency: fiatCurrency,
+            },
           );
         }
       } catch (error) {
@@ -287,6 +320,26 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
 
   const navigateToOrderProcessingCallback = useCallback(
     ({ orderId }: { orderId: string }) => {
+      // 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.
+      const session = getSession(headlessSessionId);
+      if (headlessSessionId && session) {
+        try {
+          session.callbacks.onOrderCreated(orderId);
+        } catch (callbackError) {
+          Logger.error(
+            callbackError as Error,
+            'useTransakRouting: onOrderCreated callback threw',
+          );
+        }
+        closeSession(headlessSessionId, { reason: 'completed' });
+        // @ts-expect-error `pop` exists on the parent stack navigator at
+        // runtime but is not surfaced on the generic `NavigationProp`
+        // type returned by `getParent()`.
+        navigation.getParent()?.pop();
+        return;
+      }
       navigation.reset({
         index: 0,
         routes: [
@@ -297,7 +350,7 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
         ],
       });
     },
-    [navigation],
+    [navigation, headlessSessionId],
   );
 
   const navigateToAdditionalVerificationCallback = useCallback(
@@ -366,12 +419,18 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
           paymentDetails: depositOrder.paymentDetails,
         });
 
-        showV2OrderToast({
-          orderId: rampsOrder.providerOrderId,
-          cryptocurrency: rampsOrder.cryptoCurrency?.symbol ?? '',
-          cryptoAmount: rampsOrder.cryptoAmount,
-          status: rampsOrder.status,
-        });
+        // Suppress the toast when a headless session is driving this
+        // flow — the consumer handles its own notification UI. Keep
+        // `addOrder` and the analytics event in both modes so Redux
+        // state + telemetry parity is preserved.
+        if (!getSession(headlessSessionId)) {
+          showV2OrderToast({
+            orderId: rampsOrder.providerOrderId,
+            cryptocurrency: rampsOrder.cryptoCurrency?.symbol ?? '',
+            cryptoAmount: rampsOrder.cryptoAmount,
+            status: rampsOrder.status,
+          });
+        }
 
         navigateToOrderProcessingCallback({
           orderId: rampsOrder.providerOrderId,
@@ -400,6 +459,12 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
         Logger.error(error as Error, {
           message: 'useTransakRouting: Failed to process order after checkout',
         });
+        if (failSession(headlessSessionId, error)) {
+          // @ts-expect-error `pop` exists on the parent stack navigator at
+          // runtime but is not surfaced on the generic `NavigationProp`
+          // type returned by `getParent()`.
+          navigation.getParent()?.pop();
+        }
       }
     },
     [
@@ -410,6 +475,8 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
       navigateToOrderProcessingCallback,
       regionIsoCode,
       trackEvent,
+      headlessSessionId,
+      navigation,
     ],
   );
 
@@ -528,6 +595,13 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
                   paymentDetails: depositOrder.paymentDetails,
                 });
 
+                if (getSession(headlessSessionId)) {
+                  navigateToOrderProcessingCallback({
+                    orderId: rampsOrder.providerOrderId,
+                  });
+                  return true;
+                }
+
                 showV2OrderToast({
                   orderId: rampsOrder.providerOrderId,
                   cryptocurrency: rampsOrder.cryptoCurrency?.symbol ?? '',
@@ -564,6 +638,9 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
               }
               return true;
             } catch (error) {
+              if (error instanceof LimitExceededError) {
+                throw error;
+              }
               throw new Error(
                 parseUserFacingError(
                   error,
@@ -687,6 +764,8 @@ export const useTransakRouting = (config?: UseTransakRoutingConfig) => {
       addOrder,
       refreshOrder,
       navigateToBankDetailsCallback,
+      navigateToOrderProcessingCallback,
+      headlessSessionId,
       navigateToWebviewModalCallback,
       navigateToKycProcessingCallback,
       submitPurposeOfUsageForm,
diff --git a/app/components/UI/Rewards/RewardsNavigator.test.tsx b/app/components/UI/Rewards/RewardsNavigator.test.tsx
index d3f86824efe..b824e326b1c 100644
--- a/app/components/UI/Rewards/RewardsNavigator.test.tsx
+++ b/app/components/UI/Rewards/RewardsNavigator.test.tsx
@@ -200,6 +200,10 @@ const mockSetOptions = jest.fn();
 const mockSetParams = jest.fn();
 const mockIsFocused = jest.fn();
 const mockReactReduxDispatch = jest.fn();
+const mockUseNavigationState = jest.fn(
+  (selector: (state: unknown) => unknown): unknown =>
+    selector({ routes: [{}], index: 0 }),
+);
 
 jest.mock('@react-navigation/native', () => {
   const actual = jest.requireActual('@react-navigation/native');
@@ -211,6 +215,8 @@ jest.mock('@react-navigation/native', () => {
       setParams: mockSetParams,
     }),
     useIsFocused: () => mockIsFocused(),
+    useNavigationState: (selector: (state: unknown) => unknown) =>
+      mockUseNavigationState(selector),
   };
 });
 
@@ -249,6 +255,39 @@ jest.mock('./hooks/useReferralDetails', () => ({
   }),
 }));
 
+// Mock useRewardsNotificationsNudge hook
+const mockShowEnableNotificationsNudge = jest.fn(() => false);
+const mockCloseEnableNotificationsNudge = jest.fn();
+jest.mock('./hooks/useRewardsNotificationsNudge', () => ({
+  useRewardsNotificationsNudge: jest.fn(() => ({
+    areNotificationsEnabled: true,
+    canPromptToEnableNotifications: false,
+    shouldPromptToEnableNotifications: false,
+    showEnableNotificationsNudge: mockShowEnableNotificationsNudge,
+    closeEnableNotificationsNudge: mockCloseEnableNotificationsNudge,
+    runAfterNotificationsEnabled: jest.fn(),
+  })),
+}));
+
+// Mock useRewardsToast hook
+const mockNavigatorShowToast = jest.fn();
+const mockSuccessToast = jest.fn(() => ({ variant: 'success' }));
+jest.mock('./hooks/useRewardsToast', () => ({
+  __esModule: true,
+  default: jest.fn(() => ({
+    showToast: mockNavigatorShowToast,
+    RewardsToastOptions: {
+      success: mockSuccessToast,
+      error: jest.fn(),
+      loading: jest.fn(),
+      entriesClosed: jest.fn(),
+      enableNotificationsNudge: jest.fn(),
+      outcomeWinner: jest.fn(),
+      outcomeNonWinner: jest.fn(),
+    },
+  })),
+}));
+
 // Mock useRewardsVersionGuard hook
 jest.mock('./hooks/useRewardsVersionGuard', () => ({
   __esModule: true,
@@ -280,6 +319,7 @@ import {
 import { setPendingDeeplink } from '../../../reducers/rewards';
 import { useSeasonStatus } from './hooks/useSeasonStatus';
 import { useGeoRewardsMetadata } from './hooks/useGeoRewardsMetadata';
+import { useRewardsNotificationsNudge } from './hooks/useRewardsNotificationsNudge';
 
 const mockSelectRewardsSubscriptionId =
   selectRewardsSubscriptionId as jest.MockedFunction<
@@ -301,6 +341,10 @@ const mockUseSeasonStatus = useSeasonStatus as jest.MockedFunction<
 const mockUseGeoRewardsMetadata = useGeoRewardsMetadata as jest.MockedFunction<
   typeof useGeoRewardsMetadata
 >;
+const mockUseRewardsNotificationsNudge =
+  useRewardsNotificationsNudge as jest.MockedFunction<
+    typeof useRewardsNotificationsNudge
+  >;
 
 describe('RewardsNavigator', () => {
   let store: ReturnType<typeof configureStore>;
@@ -813,4 +857,355 @@ describe('RewardsNavigator', () => {
       });
     });
   });
+
+  describe('Notification nudge behavior', () => {
+    beforeEach(() => {
+      mockSelectRewardsSubscriptionId.mockReturnValue('test-subscription-id');
+      mockSelectPendingDeeplink.mockReturnValue(null);
+      mockSelectIsRewardsVersionBlocked.mockReturnValue(false);
+      mockUseSeasonStatus.mockReturnValue({ fetchSeasonStatus: jest.fn() });
+      mockUseGeoRewardsMetadata.mockReturnValue({
+        fetchGeoRewardsMetadata: jest.fn(),
+      });
+    });
+
+    it('does not show nudge when canPromptToEnableNotifications is false', async () => {
+      mockUseRewardsNotificationsNudge.mockReturnValue({
+        areNotificationsEnabled: false,
+        canPromptToEnableNotifications: false,
+        shouldPromptToEnableNotifications: false,
+        showEnableNotificationsNudge: mockShowEnableNotificationsNudge,
+        closeEnableNotificationsNudge: mockCloseEnableNotificationsNudge,
+        runAfterNotificationsEnabled: jest.fn(),
+      });
+      mockUseNavigationState.mockImplementation(
+        (selector: (state: unknown) => unknown) =>
+          selector({
+            routes: [
+              {
+                state: {
+                  routes: [{ name: Routes.REWARDS_CAMPAIGNS_VIEW }],
+                  index: 0,
+                },
+              },
+            ],
+            index: 0,
+          }),
+      );
+
+      renderWithNavigation(<RewardsNavigator />);
+
+      await waitFor(() => expect(true).toBe(true));
+      expect(mockShowEnableNotificationsNudge).not.toHaveBeenCalled();
+    });
+
+    it('does not show nudge when notifications are already enabled', async () => {
+      mockUseRewardsNotificationsNudge.mockReturnValue({
+        areNotificationsEnabled: true,
+        canPromptToEnableNotifications: true,
+        shouldPromptToEnableNotifications: false,
+        showEnableNotificationsNudge: mockShowEnableNotificationsNudge,
+        closeEnableNotificationsNudge: mockCloseEnableNotificationsNudge,
+        runAfterNotificationsEnabled: jest.fn(),
+      });
+      mockUseNavigationState.mockImplementation(
+        (selector: (state: unknown) => unknown) =>
+          selector({
+            routes: [
+              {
+                state: {
+                  routes: [{ name: Routes.REWARDS_CAMPAIGNS_VIEW }],
+                  index: 0,
+                },
+              },
+            ],
+            index: 0,
+          }),
+      );
+
+      renderWithNavigation(<RewardsNavigator />);
+
+      await waitFor(() => expect(true).toBe(true));
+      expect(mockShowEnableNotificationsNudge).not.toHaveBeenCalled();
+    });
+
+    it('does not show nudge when not on a campaign route', async () => {
+      mockUseRewardsNotificationsNudge.mockReturnValue({
+        areNotificationsEnabled: false,
+        canPromptToEnableNotifications: true,
+        shouldPromptToEnableNotifications: true,
+        showEnableNotificationsNudge: mockShowEnableNotificationsNudge,
+        closeEnableNotificationsNudge: mockCloseEnableNotificationsNudge,
+        runAfterNotificationsEnabled: jest.fn(),
+      });
+      mockUseNavigationState.mockImplementation(
+        (selector: (state: unknown) => unknown) =>
+          selector({
+            routes: [
+              {
+                state: {
+                  routes: [{ name: Routes.REWARDS_DASHBOARD }],
+                  index: 0,
+                },
+              },
+            ],
+            index: 0,
+          }),
+      );
+
+      renderWithNavigation(<RewardsNavigator />);
+
+      await waitFor(() => expect(true).toBe(true));
+      expect(mockShowEnableNotificationsNudge).not.toHaveBeenCalled();
+    });
+
+    it('does not show nudge when showEnableNotificationsNudge returns false', async () => {
+      mockUseRewardsNotificationsNudge.mockReturnValue({
+        areNotificationsEnabled: false,
+        canPromptToEnableNotifications: true,
+        shouldPromptToEnableNotifications: true,
+        showEnableNotificationsNudge: mockShowEnableNotificationsNudge,
+        closeEnableNotificationsNudge: mockCloseEnableNotificationsNudge,
+        runAfterNotificationsEnabled: jest.fn(),
+      });
+      mockShowEnableNotificationsNudge.mockReturnValue(false);
+      mockUseNavigationState.mockImplementation(
+        (selector: (state: unknown) => unknown) =>
+          selector({
+            routes: [
+              {
+                state: {
+                  routes: [{ name: Routes.REWARDS_CAMPAIGNS_VIEW }],
+                  index: 0,
+                },
+              },
+            ],
+            index: 0,
+          }),
+      );
+
+      renderWithNavigation(<RewardsNavigator />);
+
+      await waitFor(() => {
+        expect(mockShowEnableNotificationsNudge).toHaveBeenCalledTimes(1);
+      });
+      expect(mockCloseEnableNotificationsNudge).not.toHaveBeenCalled();
+    });
+
+    it('shows nudge on campaign route and closes it when navigating away', async () => {
+      mockUseRewardsNotificationsNudge.mockReturnValue({
+        areNotificationsEnabled: false,
+        canPromptToEnableNotifications: true,
+        shouldPromptToEnableNotifications: true,
+        showEnableNotificationsNudge: mockShowEnableNotificationsNudge,
+        closeEnableNotificationsNudge: mockCloseEnableNotificationsNudge,
+        runAfterNotificationsEnabled: jest.fn(),
+      });
+      mockShowEnableNotificationsNudge.mockReturnValue(true);
+      mockUseNavigationState.mockImplementation(
+        (selector: (state: unknown) => unknown) =>
+          selector({
+            routes: [
+              {
+                state: {
+                  routes: [{ name: Routes.REWARDS_CAMPAIGNS_VIEW }],
+                  index: 0,
+                },
+              },
+            ],
+            index: 0,
+          }),
+      );
+
+      const { rerender } = renderWithNavigation(<RewardsNavigator />);
+
+      await waitFor(() => {
+        expect(mockShowEnableNotificationsNudge).toHaveBeenCalledTimes(1);
+      });
+
+      // Navigate away to a non-campaign route
+      mockUseNavigationState.mockImplementation(
+        (selector: (state: unknown) => unknown) =>
+          selector({
+            routes: [
+              {
+                state: {
+                  routes: [{ name: Routes.REWARDS_DASHBOARD }],
+                  index: 0,
+                },
+              },
+            ],
+            index: 0,
+          }),
+      );
+
+      await act(async () => {
+        rerender(buildNavWrapper(<RewardsNavigator />));
+      });
+
+      expect(mockCloseEnableNotificationsNudge).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not show nudge again when session flag is already set', async () => {
+      mockUseRewardsNotificationsNudge.mockReturnValue({
+        areNotificationsEnabled: false,
+        canPromptToEnableNotifications: true,
+        shouldPromptToEnableNotifications: true,
+        showEnableNotificationsNudge: mockShowEnableNotificationsNudge,
+        closeEnableNotificationsNudge: mockCloseEnableNotificationsNudge,
+        runAfterNotificationsEnabled: jest.fn(),
+      });
+      mockUseNavigationState.mockImplementation(
+        (selector: (state: unknown) => unknown) =>
+          selector({
+            routes: [
+              {
+                state: {
+                  routes: [{ name: Routes.REWARDS_CAMPAIGNS_VIEW }],
+                  index: 0,
+                },
+              },
+            ],
+            index: 0,
+          }),
+      );
+
+      renderWithNavigation(<RewardsNavigator />);
+
+      await waitFor(() => expect(true).toBe(true));
+      // sessionNotificationsNudgeShown was set true by the previous test
+      expect(mockShowEnableNotificationsNudge).not.toHaveBeenCalled();
+    });
+
+    it('evaluates route conditions for ONDO campaign route', async () => {
+      mockUseRewardsNotificationsNudge.mockReturnValue({
+        areNotificationsEnabled: false,
+        canPromptToEnableNotifications: true,
+        shouldPromptToEnableNotifications: true,
+        showEnableNotificationsNudge: mockShowEnableNotificationsNudge,
+        closeEnableNotificationsNudge: mockCloseEnableNotificationsNudge,
+        runAfterNotificationsEnabled: jest.fn(),
+      });
+      mockUseNavigationState.mockImplementation(
+        (selector: (state: unknown) => unknown) =>
+          selector({
+            routes: [
+              {
+                state: {
+                  routes: [{ name: Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW }],
+                  index: 0,
+                },
+              },
+            ],
+            index: 0,
+          }),
+      );
+
+      renderWithNavigation(<RewardsNavigator />);
+
+      await waitFor(() => expect(true).toBe(true));
+      // session flag already set — nudge not reshown, but route conditions were evaluated
+      expect(mockShowEnableNotificationsNudge).not.toHaveBeenCalled();
+    });
+
+    it('evaluates route conditions for SeasonOne campaign route', async () => {
+      mockUseRewardsNotificationsNudge.mockReturnValue({
+        areNotificationsEnabled: false,
+        canPromptToEnableNotifications: true,
+        shouldPromptToEnableNotifications: true,
+        showEnableNotificationsNudge: mockShowEnableNotificationsNudge,
+        closeEnableNotificationsNudge: mockCloseEnableNotificationsNudge,
+        runAfterNotificationsEnabled: jest.fn(),
+      });
+      mockUseNavigationState.mockImplementation(
+        (selector: (state: unknown) => unknown) =>
+          selector({
+            routes: [
+              {
+                state: {
+                  routes: [
+                    {
+                      name: Routes.REWARDS_SEASON_ONE_CAMPAIGN_DETAILS_VIEW,
+                    },
+                  ],
+                  index: 0,
+                },
+              },
+            ],
+            index: 0,
+          }),
+      );
+
+      renderWithNavigation(<RewardsNavigator />);
+
+      await waitFor(() => expect(true).toBe(true));
+      expect(mockShowEnableNotificationsNudge).not.toHaveBeenCalled();
+    });
+
+    it('evaluates route conditions for Perps Trading campaign route', async () => {
+      mockUseRewardsNotificationsNudge.mockReturnValue({
+        areNotificationsEnabled: false,
+        canPromptToEnableNotifications: true,
+        shouldPromptToEnableNotifications: true,
+        showEnableNotificationsNudge: mockShowEnableNotificationsNudge,
+        closeEnableNotificationsNudge: mockCloseEnableNotificationsNudge,
+        runAfterNotificationsEnabled: jest.fn(),
+      });
+      mockUseNavigationState.mockImplementation(
+        (selector: (state: unknown) => unknown) =>
+          selector({
+            routes: [
+              {
+                state: {
+                  routes: [
+                    {
+                      name: Routes.REWARDS_PERPS_TRADING_CAMPAIGN_DETAILS_VIEW,
+                    },
+                  ],
+                  index: 0,
+                },
+              },
+            ],
+            index: 0,
+          }),
+      );
+
+      renderWithNavigation(<RewardsNavigator />);
+
+      await waitFor(() => expect(true).toBe(true));
+      expect(mockShowEnableNotificationsNudge).not.toHaveBeenCalled();
+    });
+
+    it('calls success toast when onNotificationsEnabled callback fires', async () => {
+      let capturedCallback: (() => void) | undefined;
+      mockUseRewardsNotificationsNudge.mockImplementation(
+        (options: { onNotificationsEnabled?: () => void } = {}) => {
+          capturedCallback = options.onNotificationsEnabled;
+          return {
+            areNotificationsEnabled: false,
+            canPromptToEnableNotifications: true,
+            shouldPromptToEnableNotifications: true,
+            showEnableNotificationsNudge: mockShowEnableNotificationsNudge,
+            closeEnableNotificationsNudge: mockCloseEnableNotificationsNudge,
+            runAfterNotificationsEnabled: jest.fn(),
+          };
+        },
+      );
+
+      renderWithNavigation(<RewardsNavigator />);
+
+      await waitFor(() => {
+        expect(capturedCallback).toBeDefined();
+      });
+
+      act(() => {
+        capturedCallback?.();
+      });
+
+      expect(mockNavigatorShowToast).toHaveBeenCalledTimes(1);
+      expect(mockSuccessToast).toHaveBeenCalledWith(
+        'rewards.notifications_nudge.success',
+      );
+    });
+  });
 });
diff --git a/app/components/UI/Rewards/RewardsNavigator.tsx b/app/components/UI/Rewards/RewardsNavigator.tsx
index 4ed5495738c..77ab123834e 100644
--- a/app/components/UI/Rewards/RewardsNavigator.tsx
+++ b/app/components/UI/Rewards/RewardsNavigator.tsx
@@ -16,6 +16,9 @@ import OndoCampaignRwaSelectorView from './Views/OndoCampaignRwaSelectorView';
 import OndoCampaignPortfolioView from './Views/OndoCampaignPortfolioView';
 import OndoCampaignStatsView from './Views/OndoCampaignStatsView';
 import CampaignTourStepView from './Views/CampaignTourStepView';
+import PerpsTradingCampaignDetailsView from './Views/PerpsTradingCampaignDetailsView';
+import PerpsTradingCampaignLeaderboardView from './Views/PerpsTradingCampaignLeaderboardView';
+import PerpsTradingCampaignStatsView from './Views/PerpsTradingCampaignStatsView';
 import { useDispatch, useSelector } from 'react-redux';
 import { selectRewardsSubscriptionId } from '../../../selectors/rewards';
 import {
@@ -24,14 +27,19 @@ import {
 } from '../../../reducers/rewards/selectors';
 import { setPendingDeeplink } from '../../../reducers/rewards';
 import { useCandidateSubscriptionId } from './hooks/useCandidateSubscriptionId';
-import { useNavigation } from '@react-navigation/native';
+import { useNavigation, useNavigationState } from '@react-navigation/native';
 import { useTheme } from '../../../util/theme';
 import useRewardsVersionGuard from './hooks/useRewardsVersionGuard';
 import RewardsUpdateRequired from './components/RewardsUpdateRequired/RewardsUpdateRequired';
 import { useSeasonStatus } from './hooks/useSeasonStatus';
 import { useGeoRewardsMetadata } from './hooks/useGeoRewardsMetadata';
 import { useReferralDetails } from './hooks/useReferralDetails';
+import { useRewardsNotificationsNudge } from './hooks/useRewardsNotificationsNudge';
+import useRewardsToast from './hooks/useRewardsToast';
+import { strings } from '../../../../locales/i18n';
+import PerpsTradingCampaignWinningView from './Views/PerpsTradingCampaignWinningView';
 
+let sessionNotificationsNudgeShown = false;
 const Stack = createStackNavigator();
 
 const RewardsNavigator: React.FC = () => {
@@ -66,6 +74,83 @@ const RewardsNavigator: React.FC = () => {
   // Fetch referral details so referral code is available across all rewards screens
   useReferralDetails();
 
+  const { showToast, RewardsToastOptions } = useRewardsToast();
+
+  const nudgeToastActiveRef = useRef(false);
+
+  const {
+    areNotificationsEnabled,
+    canPromptToEnableNotifications,
+    showEnableNotificationsNudge,
+    closeEnableNotificationsNudge,
+  } = useRewardsNotificationsNudge({
+    onNotificationsEnabled: () => {
+      showToast(
+        RewardsToastOptions.success(
+          strings('rewards.notifications_nudge.success'),
+        ),
+      );
+    },
+  });
+
+  const activeRewardsRoute = useNavigationState((state) => {
+    const currentTabRoute = state.routes[state.index];
+    const stackState = currentTabRoute?.state;
+    const stackIndex =
+      typeof stackState?.index === 'number' ? stackState.index : 0;
+    return stackState?.routes[stackIndex]?.name;
+  });
+
+  useEffect(() => {
+    if (!canPromptToEnableNotifications) {
+      return;
+    }
+    if (areNotificationsEnabled) {
+      return;
+    }
+
+    const isOnCampaignRoute =
+      activeRewardsRoute === Routes.REWARDS_CAMPAIGNS_VIEW ||
+      activeRewardsRoute === Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW ||
+      activeRewardsRoute === Routes.REWARDS_SEASON_ONE_CAMPAIGN_DETAILS_VIEW ||
+      activeRewardsRoute === Routes.REWARDS_PERPS_TRADING_CAMPAIGN_DETAILS_VIEW;
+
+    if (!isOnCampaignRoute) {
+      // Explicitly close the nudge when navigating away — don't rely solely on
+      // the effect cleanup, which can miss fires when the nested navigator state
+      // change doesn't propagate up to useNavigationState in time.
+      if (nudgeToastActiveRef.current) {
+        nudgeToastActiveRef.current = false;
+        closeEnableNotificationsNudge();
+      }
+      return;
+    }
+
+    if (sessionNotificationsNudgeShown) {
+      return;
+    }
+
+    const didShowNudge = showEnableNotificationsNudge();
+    if (!didShowNudge) {
+      return;
+    }
+    sessionNotificationsNudgeShown = true;
+    nudgeToastActiveRef.current = true;
+
+    return () => {
+      if (nudgeToastActiveRef.current) {
+        nudgeToastActiveRef.current = false;
+        closeEnableNotificationsNudge();
+      }
+    };
+  }, [
+    activeRewardsRoute,
+    areNotificationsEnabled,
+    canPromptToEnableNotifications,
+    closeEnableNotificationsNudge,
+    showEnableNotificationsNudge,
+  ]);
+
   // Determine initial route - always start with onboarding intro step initially
   const getInitialRoute = () => {
     // If user has already opted in and has a valid subscription candidate ID, go to dashboard
@@ -92,6 +177,8 @@ const RewardsNavigator: React.FC = () => {
         navigation.navigate(Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW);
       } else if (pendingDeeplink?.campaign === 'season1') {
         navigation.navigate(Routes.REWARDS_SEASON_ONE_CAMPAIGN_DETAILS_VIEW);
+      } else if (pendingDeeplink?.campaign === 'perps-comp') {
+        navigation.navigate(Routes.REWARDS_PERPS_TRADING_CAMPAIGN_DETAILS_VIEW);
       } else if (pendingDeeplink?.page === 'musd') {
         navigation.navigate(Routes.REWARDS_MUSD_CALCULATOR_VIEW);
       } else if (pendingDeeplink?.page === 'benefits') {
@@ -194,6 +281,26 @@ const RewardsNavigator: React.FC = () => {
             component={OndoCampaignStatsView}
             options={{ headerShown: false }}
           />
+          <Stack.Screen
+            name={Routes.REWARDS_PERPS_TRADING_CAMPAIGN_DETAILS_VIEW}
+            component={PerpsTradingCampaignDetailsView}
+            options={{ headerShown: false }}
+          />
+          <Stack.Screen
+            name={Routes.REWARDS_PERPS_TRADING_CAMPAIGN_LEADERBOARD}
+            component={PerpsTradingCampaignLeaderboardView}
+            options={{ headerShown: false }}
+          />
+          <Stack.Screen
+            name={Routes.REWARDS_PERPS_TRADING_CAMPAIGN_STATS}
+            component={PerpsTradingCampaignStatsView}
+            options={{ headerShown: false }}
+          />
+          <Stack.Screen
+            name={Routes.REWARDS_PERPS_TRADING_CAMPAIGN_WINNING_VIEW}
+            component={PerpsTradingCampaignWinningView}
+            options={{ headerShown: false }}
+          />
         </>
       ) : null}
     </Stack.Navigator>
diff --git a/app/components/UI/Rewards/Views/BenefitFullView.test.tsx b/app/components/UI/Rewards/Views/BenefitFullView.test.tsx
index 75009130555..0db9abe04f0 100644
--- a/app/components/UI/Rewards/Views/BenefitFullView.test.tsx
+++ b/app/components/UI/Rewards/Views/BenefitFullView.test.tsx
@@ -69,27 +69,6 @@ jest.mock('@metamask/design-system-twrnc-preset', () => ({
   useTailwind: () => ({ style: (...args: unknown[]) => args }),
 }));
 
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { Pressable, Text, View } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({ title, onBack }: { title: string; onBack: () => void }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header' },
-          ReactActual.createElement(Text, null, title),
-          ReactActual.createElement(Pressable, {
-            onPress: onBack,
-            testID: 'header-back-button',
-          }),
-        ),
-    };
-  },
-);
-
 jest.mock('../../../Views/ErrorBoundary', () => ({
   __esModule: true,
   default: ({ children }: { children: React.ReactNode }) => children,
@@ -104,6 +83,7 @@ jest.mock('react-native-safe-area-context', () => {
       testID,
     }: React.PropsWithChildren<{ testID?: string }>) =>
       ReactActual.createElement(View, { testID }, children),
+    useSafeAreaInsets: () => ({ top: 0, bottom: 0, left: 0, right: 0 }),
   };
 });
 
diff --git a/app/components/UI/Rewards/Views/BenefitFullView.tsx b/app/components/UI/Rewards/Views/BenefitFullView.tsx
index b1853bb4396..7c753028ed4 100644
--- a/app/components/UI/Rewards/Views/BenefitFullView.tsx
+++ b/app/components/UI/Rewards/Views/BenefitFullView.tsx
@@ -18,12 +18,12 @@ import {
   Text,
   TextColor,
   TextVariant,
+  HeaderStandard,
 } from '@metamask/design-system-react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { BenefitFullViewRouteProp } from './BenefitFullView.types.ts';
 import { REWARDS_VIEW_SELECTORS } from './RewardsView.constants.ts';
 import { formatDateRemaining } from '../utils/formatUtils.ts';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import { strings } from '../../../../../locales/i18n';
 import ErrorBoundary from '../../../Views/ErrorBoundary';
 import Routes from '../../../../constants/navigation/Routes.ts';
@@ -80,7 +80,7 @@ const BenefitFullView = () => {
         style={tw.style('flex-1')}
         testID={REWARDS_VIEW_SELECTORS.DETAIL_BENEFIT_VIEW}
       >
-        <HeaderCompactStandard
+        <HeaderStandard
           title={strings('rewards.benefits.title_claim')}
           onBack={() => navigation.goBack()}
           backButtonProps={{ testID: 'header-back-button' }}
diff --git a/app/components/UI/Rewards/Views/BenefitsFullView.test.tsx b/app/components/UI/Rewards/Views/BenefitsFullView.test.tsx
index 6a264ef0548..03a0df12148 100644
--- a/app/components/UI/Rewards/Views/BenefitsFullView.test.tsx
+++ b/app/components/UI/Rewards/Views/BenefitsFullView.test.tsx
@@ -43,32 +43,6 @@ jest.mock('@metamask/design-system-twrnc-preset', () => ({
   useTailwind: () => ({ style: (...args: unknown[]) => args }),
 }));
 
-jest.mock('@metamask/design-system-react-native', () => {
-  const actual = jest.requireActual('@metamask/design-system-react-native');
-  return { ...actual };
-});
-
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { Pressable, Text, View } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({ title, onBack }: { title: string; onBack: () => void }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header' },
-          ReactActual.createElement(Text, null, title),
-          ReactActual.createElement(Pressable, {
-            onPress: onBack,
-            testID: 'header-back-button',
-          }),
-        ),
-    };
-  },
-);
-
 jest.mock('../../../Views/ErrorBoundary', () => ({
   __esModule: true,
   default: ({ children }: { children: React.ReactNode }) => children,
@@ -123,6 +97,7 @@ jest.mock('react-native-safe-area-context', () => {
       testID,
     }: React.PropsWithChildren<{ testID?: string }>) =>
       ReactActual.createElement(View, { testID }, children),
+    useSafeAreaInsets: () => ({ top: 0, bottom: 0, left: 0, right: 0 }),
   };
 });
 
diff --git a/app/components/UI/Rewards/Views/BenefitsFullView.tsx b/app/components/UI/Rewards/Views/BenefitsFullView.tsx
index 203be93c6ea..2c997eb01de 100644
--- a/app/components/UI/Rewards/Views/BenefitsFullView.tsx
+++ b/app/components/UI/Rewards/Views/BenefitsFullView.tsx
@@ -1,4 +1,8 @@
-import { Text, TextVariant } from '@metamask/design-system-react-native';
+import {
+  HeaderStandard,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
 import React, { useState } from 'react';
 import useTrackRewardsPageView from '../hooks/useTrackRewardsPageView';
 import { strings } from '../../../../../locales/i18n';
@@ -12,7 +16,6 @@ import { useBenefits } from '../hooks/useBenefits.ts';
 import { SubscriptionBenefitDto } from '../../../../core/Engine/controllers/rewards-controller/types.ts';
 import BenefitCard from '../components/Benefits/BenefitCard.tsx';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import { useNavigation } from '@react-navigation/native';
 import ErrorBoundary from '../../../Views/ErrorBoundary';
 import TheMiracleFooter from '../components/Benefits/TheMiracleFooter.tsx';
@@ -59,7 +62,7 @@ const BenefitsFullView = () => {
         style={tw.style('flex-1 bg-default')}
         testID={REWARDS_VIEW_SELECTORS.LIST_BENEFIT_VIEW}
       >
-        <HeaderCompactStandard
+        <HeaderStandard
           title={strings('rewards.benefits.title')}
           onBack={() => navigation.goBack()}
           backButtonProps={{ testID: 'header-back-button' }}
diff --git a/app/components/UI/Rewards/Views/CampaignMechanicsView.test.tsx b/app/components/UI/Rewards/Views/CampaignMechanicsView.test.tsx
index 35a43e0b51f..35c0303788d 100644
--- a/app/components/UI/Rewards/Views/CampaignMechanicsView.test.tsx
+++ b/app/components/UI/Rewards/Views/CampaignMechanicsView.test.tsx
@@ -16,36 +16,10 @@ jest.mock('@react-navigation/native', () => ({
   useRoute: () => ({ params: { campaignId: 'campaign-1' } }),
 }));
 
-jest.mock('@metamask/design-system-react-native', () => {
-  const actual = jest.requireActual('@metamask/design-system-react-native');
-  return { ...actual };
-});
-
 jest.mock('@metamask/design-system-twrnc-preset', () => ({
   useTailwind: () => ({ style: (...args: unknown[]) => args }),
 }));
 
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Text, Pressable } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({ title, onBack }: { title: string; onBack: () => void }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header' },
-          ReactActual.createElement(Text, null, title),
-          ReactActual.createElement(Pressable, {
-            onPress: onBack,
-            testID: 'header-back-button',
-          }),
-        ),
-    };
-  },
-);
-
 jest.mock('../../../Views/ErrorBoundary', () => {
   const ReactActual = jest.requireActual('react');
   return {
@@ -151,7 +125,7 @@ describe('CampaignMechanicsView', () => {
 
   it('navigates back when the back button is pressed', () => {
     const { getByTestId } = render(<CampaignMechanicsView />);
-    fireEvent.press(getByTestId('header-back-button'));
+    fireEvent.press(getByTestId('campaign-mechanics-back-button'));
     expect(mockGoBack).toHaveBeenCalledTimes(1);
   });
 
diff --git a/app/components/UI/Rewards/Views/CampaignMechanicsView.tsx b/app/components/UI/Rewards/Views/CampaignMechanicsView.tsx
index 5043ee7331a..a89f0752919 100644
--- a/app/components/UI/Rewards/Views/CampaignMechanicsView.tsx
+++ b/app/components/UI/Rewards/Views/CampaignMechanicsView.tsx
@@ -1,10 +1,9 @@
 import React, { useMemo } from 'react';
 import { ScrollView } from 'react-native';
 import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
-import { Box } from '@metamask/design-system-react-native';
+import { Box, HeaderStandard } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import ErrorBoundary from '../../../Views/ErrorBoundary';
 import CampaignHowItWorks from '../components/Campaigns/CampaignHowItWorks';
 import ContentfulRichText, {
@@ -54,7 +53,7 @@ const CampaignMechanicsView: React.FC = () => {
         style={tw.style('flex-1 bg-default')}
         testID={CAMPAIGN_MECHANICS_TEST_IDS.CONTAINER}
       >
-        <HeaderCompactStandard
+        <HeaderStandard
           title={strings('rewards.campaign_mechanics.title')}
           onBack={() => navigation.goBack()}
           backButtonProps={{ testID: 'campaign-mechanics-back-button' }}
diff --git a/app/components/UI/Rewards/Views/CampaignTourStepView.tsx b/app/components/UI/Rewards/Views/CampaignTourStepView.tsx
index 7dc70bfa7b5..81e81f80205 100644
--- a/app/components/UI/Rewards/Views/CampaignTourStepView.tsx
+++ b/app/components/UI/Rewards/Views/CampaignTourStepView.tsx
@@ -28,6 +28,7 @@ import {
 import ScrollableTabView from '@tommasini/react-native-scrollable-tab-view';
 import { selectCampaignById } from '../../../../reducers/rewards/selectors';
 import Routes from '../../../../constants/navigation/Routes';
+import { CampaignType } from '../../../../core/Engine/controllers/rewards-controller/types';
 import ProgressIndicator from '../components/Onboarding/ProgressIndicator';
 import CampaignTourStep, {
   CAMPAIGN_TOUR_STEP_TEST_IDS,
@@ -63,13 +64,19 @@ const CampaignTourStepView: React.FC = () => {
     typeof ScrollableTabView & { goToPage: (page: number) => void }
   >(null);
 
+  const campaignType = campaign?.type;
+
   const navigateToDetails = useCallback(() => {
+    const detailsRoute =
+      campaignType === CampaignType.PERPS_TRADING
+        ? Routes.REWARDS_PERPS_TRADING_CAMPAIGN_DETAILS_VIEW
+        : Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW;
     navigation.dispatch(
-      StackActions.replace(Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW, {
+      StackActions.replace(detailsRoute, {
         campaignId,
       }),
     );
-  }, [navigation, campaignId]);
+  }, [navigation, campaignId, campaignType]);
 
   const currentStep = tour?.[currentTab];
   const isLastStep = tour ? currentTab === tour.length - 1 : false;
diff --git a/app/components/UI/Rewards/Views/CampaignWinningView.test.tsx b/app/components/UI/Rewards/Views/CampaignWinningView.test.tsx
new file mode 100644
index 00000000000..afbc489f176
--- /dev/null
+++ b/app/components/UI/Rewards/Views/CampaignWinningView.test.tsx
@@ -0,0 +1,297 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import { Linking } from 'react-native';
+import Clipboard from '@react-native-clipboard/clipboard';
+import CampaignWinningView, {
+  CampaignWinningViewProps,
+} from './CampaignWinningView';
+import useTrackRewardsPageView from '../hooks/useTrackRewardsPageView';
+
+jest.mock('../../../../images/rewards/campaign_winning.png', () => ({
+  __esModule: true,
+  default: 1,
+}));
+
+const mockGoBack = jest.fn();
+const mockNavigate = jest.fn();
+
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({ goBack: mockGoBack, navigate: mockNavigate }),
+}));
+
+jest.mock('@metamask/design-system-twrnc-preset', () => {
+  const tw = (...args: unknown[]) => args;
+  tw.style = (...args: unknown[]) => args;
+  return { useTailwind: () => tw };
+});
+
+jest.mock('react-native/Libraries/Utilities/useWindowDimensions', () => ({
+  default: () => ({ width: 390, height: 844 }),
+}));
+
+jest.mock('react-native-safe-area-context', () => {
+  const actual = jest.requireActual('react-native-safe-area-context');
+  return {
+    ...actual,
+    useSafeAreaInsets: () => ({ top: 44, bottom: 34, left: 0, right: 0 }),
+  };
+});
+
+jest.mock('../../../Views/ErrorBoundary', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ({ children }: { children: React.ReactNode }) =>
+      ReactActual.createElement(View, null, children),
+  };
+});
+
+jest.mock('../hooks/useTrackRewardsPageView', () => ({
+  __esModule: true,
+  default: jest.fn(),
+}));
+
+jest.mock('../../../../core/Analytics', () => ({
+  MetaMetricsEvents: {
+    REWARDS_PAGE_BUTTON_CLICKED: 'REWARDS_PAGE_BUTTON_CLICKED',
+  },
+}));
+
+jest.mock('../utils', () => ({
+  RewardsMetricsButtons: {
+    COPY_WINNER_VERIFICATION_CODE: 'copy_winner_verification_code',
+  },
+}));
+
+const mockTrackEvent = jest.fn();
+const mockBuild = jest.fn(() => ({}));
+jest.mock('../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: () => ({
+      addProperties: () => ({ build: mockBuild }),
+    }),
+  }),
+}));
+
+jest.mock('../components/ReferralDetails/CopyableField', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View, Text, Pressable } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ({
+      label,
+      value,
+      onCopy,
+    }: {
+      label: string;
+      value?: string | null;
+      onCopy?: () => void;
+    }) =>
+      ReactActual.createElement(
+        View,
+        { testID: 'copyable-field' },
+        ReactActual.createElement(Text, null, label),
+        ReactActual.createElement(
+          Text,
+          { testID: 'copyable-value' },
+          value ?? '',
+        ),
+        ReactActual.createElement(Pressable, {
+          testID: 'copyable-trigger',
+          onPress: onCopy,
+        }),
+      ),
+  };
+});
+
+jest.mock('../../../../../locales/i18n', () => ({
+  strings: jest.fn(
+    (
+      key: string,
+      params?: {
+        code?: string;
+        campaignName?: string;
+        email?: string;
+      },
+    ) => {
+      if (
+        key === 'rewards.campaign_winning.mail_subject' &&
+        params?.campaignName
+      )
+        return `${params.campaignName} prize claim`;
+      if (key === 'rewards.campaign_winning.mail_body' && params?.code)
+        return `My winning code: ${params.code}`;
+      if (
+        key === 'rewards.campaign_winning.email_instructions' &&
+        params?.email
+      )
+        return `Email ${params.email} with your code`;
+      const map: Record<string, string> = {
+        'rewards.campaign_winning.you_won': 'You won',
+        'rewards.campaign_winning.open_mail': 'Open mail',
+        'rewards.campaign_winning.skip_for_now': 'Skip for now',
+        'rewards.campaign_winning.winning_code': 'Winning code',
+        'rewards.campaign_winning.close_a11y': 'Close',
+      };
+      return map[key] ?? key;
+    },
+  ),
+}));
+
+const PRIZE_EMAIL = 'test@consensys.net';
+const CAMPAIGN_NAME = 'Test Campaign';
+const CAMPAIGN_ID = 'campaign-test-1';
+const WINNING_CODE = 'WIN-123';
+const mockUseTrackRewardsPageView =
+  useTrackRewardsPageView as jest.MockedFunction<
+    typeof useTrackRewardsPageView
+  >;
+
+const defaultProps: CampaignWinningViewProps = {
+  testID: 'test-winning-view',
+  viewName: 'TestWinningView',
+  prizeEmail: PRIZE_EMAIL,
+  campaignName: CAMPAIGN_NAME,
+  campaignId: CAMPAIGN_ID,
+  analyticsPageType: 'test_campaign_winning',
+  winningCode: WINNING_CODE,
+  hasOutcomeLoaded: true,
+  isLoading: false,
+  rankDisplay: null,
+};
+
+describe('CampaignWinningView', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the main container with the provided testID', () => {
+    const { getByTestId } = render(<CampaignWinningView {...defaultProps} />);
+    expect(getByTestId('test-winning-view')).toBeTruthy();
+  });
+
+  it('renders "You won" text', () => {
+    const { getByText } = render(<CampaignWinningView {...defaultProps} />);
+    expect(getByText('You won')).toBeTruthy();
+  });
+
+  it('renders email instructions with the prizeEmail', () => {
+    const { getByText } = render(<CampaignWinningView {...defaultProps} />);
+    expect(getByText(`Email ${PRIZE_EMAIL} with your code`)).toBeTruthy();
+  });
+
+  it('tracks page view with the campaign id', () => {
+    render(<CampaignWinningView {...defaultProps} />);
+    expect(mockUseTrackRewardsPageView).toHaveBeenCalledWith({
+      page_type: 'test_campaign_winning',
+      campaign_id: CAMPAIGN_ID,
+    });
+  });
+
+  it('renders rank and result display when provided', () => {
+    const { getByText } = render(
+      <CampaignWinningView
+        {...defaultProps}
+        rankDisplay="3rd"
+        resultDisplay="+12.34%"
+      />,
+    );
+    expect(getByText('3rd')).toBeTruthy();
+    expect(getByText('+12.34%')).toBeTruthy();
+  });
+
+  it('calls goBack when Skip for now is pressed', () => {
+    const { getByText } = render(<CampaignWinningView {...defaultProps} />);
+    fireEvent.press(getByText('Skip for now'));
+    expect(mockGoBack).toHaveBeenCalledTimes(1);
+  });
+
+  it('calls goBack when Close button is pressed', () => {
+    const { getByLabelText } = render(
+      <CampaignWinningView {...defaultProps} />,
+    );
+    fireEvent.press(getByLabelText('Close'));
+    expect(mockGoBack).toHaveBeenCalledTimes(1);
+  });
+
+  it('copies winning code and fires analytics when copy is triggered', () => {
+    const setStringSpy = jest.spyOn(Clipboard, 'setString');
+    const { getByTestId } = render(<CampaignWinningView {...defaultProps} />);
+    fireEvent.press(getByTestId('copyable-trigger'));
+    expect(setStringSpy).toHaveBeenCalledWith(WINNING_CODE);
+    expect(mockTrackEvent).toHaveBeenCalled();
+    setStringSpy.mockRestore();
+  });
+
+  it('opens mailto with the correct email and code when Open mail is pressed', async () => {
+    const openSpy = jest.spyOn(Linking, 'openURL').mockResolvedValue(undefined);
+    const { getByText } = render(<CampaignWinningView {...defaultProps} />);
+    fireEvent.press(getByText('Open mail'));
+    expect(openSpy).toHaveBeenCalled();
+    const url = openSpy.mock.calls[0][0] as string;
+    expect(url).toContain(`mailto:${PRIZE_EMAIL}`);
+    expect(url).toContain(encodeURIComponent(WINNING_CODE));
+    openSpy.mockRestore();
+  });
+
+  it('navigates to fallback route when outcome loads without a winning code', () => {
+    const fallbackRoute = {
+      route: 'CampaignDetails',
+      params: { campaignId: CAMPAIGN_ID },
+    };
+
+    render(
+      <CampaignWinningView
+        {...defaultProps}
+        winningCode={null}
+        hasOutcomeLoaded
+        isLoading={false}
+        fallbackRoute={fallbackRoute}
+      />,
+    );
+
+    expect(mockNavigate).toHaveBeenCalledWith(
+      fallbackRoute.route,
+      fallbackRoute.params,
+    );
+    expect(mockGoBack).not.toHaveBeenCalled();
+  });
+
+  it('falls back to goBack when outcome loads without a winning code and no fallback route is provided', () => {
+    render(
+      <CampaignWinningView
+        {...defaultProps}
+        winningCode={null}
+        hasOutcomeLoaded
+        isLoading={false}
+      />,
+    );
+    expect(mockGoBack).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not call goBack before outcome has loaded', () => {
+    render(
+      <CampaignWinningView
+        {...defaultProps}
+        winningCode={null}
+        hasOutcomeLoaded={false}
+        isLoading={false}
+      />,
+    );
+    expect(mockGoBack).not.toHaveBeenCalled();
+  });
+
+  it('does not call goBack while still loading', () => {
+    render(
+      <CampaignWinningView
+        {...defaultProps}
+        winningCode={null}
+        hasOutcomeLoaded
+        isLoading
+      />,
+    );
+    expect(mockGoBack).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/Rewards/Views/CampaignWinningView.tsx b/app/components/UI/Rewards/Views/CampaignWinningView.tsx
new file mode 100644
index 00000000000..8eb65c54a01
--- /dev/null
+++ b/app/components/UI/Rewards/Views/CampaignWinningView.tsx
@@ -0,0 +1,267 @@
+import React, { useCallback, useEffect } from 'react';
+import { Image, Linking, ScrollView, useWindowDimensions } from 'react-native';
+import Clipboard from '@react-native-clipboard/clipboard';
+import {
+  useNavigation,
+  type NavigationProp,
+  type ParamListBase,
+} from '@react-navigation/native';
+import {
+  SafeAreaView,
+  useSafeAreaInsets,
+} from 'react-native-safe-area-context';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  Box,
+  BoxFlexDirection,
+  Button,
+  ButtonSize,
+  ButtonVariant,
+  ButtonIcon,
+  ButtonIconSize,
+  IconName,
+  Skeleton,
+  Text,
+  TextColor,
+  TextVariant,
+  FontWeight,
+} from '@metamask/design-system-react-native';
+import ErrorBoundary from '../../../Views/ErrorBoundary';
+import useTrackRewardsPageView from '../hooks/useTrackRewardsPageView';
+import { strings } from '../../../../../locales/i18n';
+import CopyableField from '../components/ReferralDetails/CopyableField';
+import { RewardsMetricsButtons } from '../utils';
+import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
+import campaignWinningHero from '../../../../images/rewards/campaign_winning.png';
+
+const HERO_HEIGHT_RATIO = 0.5;
+
+export interface CampaignWinningViewProps {
+  testID: string;
+  viewName: string;
+  prizeEmail: string;
+  campaignName: string;
+  campaignId: string;
+  analyticsPageType: string;
+  winningCode: string | null;
+  hasOutcomeLoaded: boolean;
+  isLoading: boolean;
+  rankDisplay: string | null;
+  resultDisplay?: string | null;
+  isRankLoading?: boolean;
+  isResultLoading?: boolean;
+  fallbackRoute?: {
+    route: string;
+    params?: object;
+  };
+}
+
+const CampaignWinningView: React.FC<CampaignWinningViewProps> = ({
+  testID,
+  viewName,
+  prizeEmail,
+  campaignName,
+  campaignId,
+  analyticsPageType,
+  winningCode,
+  hasOutcomeLoaded,
+  isLoading,
+  rankDisplay,
+  resultDisplay = null,
+  isRankLoading = false,
+  isResultLoading = false,
+  fallbackRoute,
+}) => {
+  const tw = useTailwind();
+  const { height: windowHeight } = useWindowDimensions();
+  const heroHeight = windowHeight * HERO_HEIGHT_RATIO;
+  const insets = useSafeAreaInsets();
+  const navigation = useNavigation<NavigationProp<ParamListBase>>();
+  const { trackEvent, createEventBuilder } = useAnalytics();
+
+  useTrackRewardsPageView({
+    page_type: analyticsPageType,
+    campaign_id: campaignId,
+  });
+
+  useEffect(() => {
+    if (!isLoading && hasOutcomeLoaded && winningCode === null) {
+      if (fallbackRoute) {
+        navigation.navigate(fallbackRoute.route, fallbackRoute.params);
+        return;
+      }
+      navigation.goBack();
+    }
+  }, [isLoading, hasOutcomeLoaded, winningCode, fallbackRoute, navigation]);
+
+  const onDismiss = useCallback(() => {
+    navigation.goBack();
+  }, [navigation]);
+
+  const handleCopyWinningCode = useCallback(() => {
+    if (winningCode) {
+      Clipboard.setString(winningCode);
+      trackEvent(
+        createEventBuilder(MetaMetricsEvents.REWARDS_PAGE_BUTTON_CLICKED)
+          .addProperties({
+            button_type: RewardsMetricsButtons.COPY_WINNER_VERIFICATION_CODE,
+          })
+          .build(),
+      );
+    }
+  }, [winningCode, trackEvent, createEventBuilder]);
+
+  const handleOpenMail = useCallback(async () => {
+    const baseSubject = strings('rewards.campaign_winning.mail_subject', {
+      campaignName,
+    });
+    const subject = winningCode
+      ? `${baseSubject} - ${winningCode}`
+      : baseSubject;
+    const body = strings('rewards.campaign_winning.mail_body', {
+      code: winningCode || '—',
+    });
+    const url = `mailto:${prizeEmail}?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`;
+    try {
+      await Linking.openURL(url);
+    } catch {
+      // no-op: device may not have a mail handler
+    }
+  }, [winningCode, prizeEmail, campaignName]);
+
+  return (
+    <ErrorBoundary navigation={navigation} view={viewName}>
+      <SafeAreaView
+        edges={['bottom']}
+        style={tw.style('flex-1 bg-default')}
+        testID={testID}
+      >
+        <ScrollView
+          style={tw.style('flex-1')}
+          contentContainerStyle={tw.style('grow pb-6 gap-2 items-center')}
+          keyboardShouldPersistTaps="handled"
+        >
+          <Box
+            flexDirection={BoxFlexDirection.Column}
+            twClassName="relative w-full overflow-hidden"
+            style={{ height: heroHeight }}
+          >
+            <Image
+              source={campaignWinningHero}
+              style={tw.style('absolute inset-0 h-full w-full')}
+              resizeMode="cover"
+              accessibilityIgnoresInvertColors
+            />
+            <Box
+              style={{ paddingTop: insets.top + 8 }}
+              twClassName="absolute right-4 top-0 z-10"
+            >
+              <ButtonIcon
+                iconName={IconName.Close}
+                size={ButtonIconSize.Md}
+                onPress={onDismiss}
+                accessibilityLabel={strings(
+                  'rewards.campaign_winning.close_a11y',
+                )}
+                twClassName="bg-default-muted rounded-full"
+              />
+            </Box>
+          </Box>
+
+          <Box
+            flexDirection={BoxFlexDirection.Column}
+            twClassName="w-full flex-1 gap-2 items-center px-4"
+          >
+            <Box
+              flexDirection={BoxFlexDirection.Column}
+              twClassName="w-full flex-1 items-center justify-center gap-4 px-4"
+            >
+              <Text
+                variant={TextVariant.HeadingMd}
+                fontWeight={FontWeight.Medium}
+                color={TextColor.TextAlternative}
+                twClassName="text-center"
+              >
+                {strings('rewards.campaign_winning.you_won')}
+              </Text>
+
+              <Box
+                flexDirection={BoxFlexDirection.Column}
+                twClassName="items-center w-full"
+              >
+                {rankDisplay !== null ? (
+                  <Text
+                    variant={TextVariant.HeadingMd}
+                    fontWeight={FontWeight.Medium}
+                    color={TextColor.TextDefault}
+                    style={tw.style('text-[64px] leading-[72px]')}
+                    twClassName="text-center"
+                  >
+                    {rankDisplay}
+                  </Text>
+                ) : isRankLoading ? (
+                  <Skeleton style={tw.style('h-8 w-36 rounded-lg')} />
+                ) : null}
+
+                {resultDisplay !== null ? (
+                  <Text
+                    variant={TextVariant.HeadingMd}
+                    fontWeight={FontWeight.Medium}
+                    color={TextColor.SuccessDefault}
+                    twClassName="text-center"
+                  >
+                    {resultDisplay}
+                  </Text>
+                ) : isResultLoading ? (
+                  <Skeleton style={tw.style('h-6 w-28 rounded-lg')} />
+                ) : null}
+              </Box>
+
+              <Text
+                variant={TextVariant.BodySm}
+                color={TextColor.TextAlternative}
+                twClassName="text-center px-8"
+              >
+                {strings('rewards.campaign_winning.email_instructions', {
+                  email: prizeEmail,
+                })}
+              </Text>
+            </Box>
+
+            <Box twClassName="w-full max-w-md">
+              <CopyableField
+                value={winningCode}
+                valueLoading={isLoading}
+                onCopy={handleCopyWinningCode}
+              />
+            </Box>
+
+            <Box twClassName="w-full max-w-md pt-2">
+              <Button
+                variant={ButtonVariant.Primary}
+                size={ButtonSize.Lg}
+                isFullWidth
+                onPress={handleOpenMail}
+              >
+                {strings('rewards.campaign_winning.open_mail')}
+              </Button>
+            </Box>
+
+            <Button
+              variant={ButtonVariant.Tertiary}
+              size={ButtonSize.Lg}
+              isFullWidth
+              textProps={{ color: TextColor.TextDefault }}
+              onPress={onDismiss}
+            >
+              {strings('rewards.campaign_winning.skip_for_now')}
+            </Button>
+          </Box>
+        </ScrollView>
+      </SafeAreaView>
+    </ErrorBoundary>
+  );
+};
+
+export default CampaignWinningView;
diff --git a/app/components/UI/Rewards/Views/CampaignsView.test.tsx b/app/components/UI/Rewards/Views/CampaignsView.test.tsx
index 0bca5c0bfef..8baa68c8091 100644
--- a/app/components/UI/Rewards/Views/CampaignsView.test.tsx
+++ b/app/components/UI/Rewards/Views/CampaignsView.test.tsx
@@ -6,6 +6,8 @@ import {
   CampaignType,
 } from '../../../../core/Engine/controllers/rewards-controller/types';
 import { useRewardCampaigns } from '../hooks/useRewardCampaigns';
+import { useOndoOutcomeToast } from '../hooks/useOndoOutcomeToast';
+import { usePerpsTradingCampaignEndedOutcomeToast } from '../hooks/usePerpsTradingCampaignEndedOutcomeToast';
 import { REWARDS_VIEW_SELECTORS } from './RewardsView.constants';
 
 const mockGoBack = jest.fn();
@@ -13,11 +15,6 @@ jest.mock('@react-navigation/native', () => ({
   useNavigation: () => ({ goBack: mockGoBack }),
 }));
 
-jest.mock('@metamask/design-system-react-native', () => {
-  const actual = jest.requireActual('@metamask/design-system-react-native');
-  return { ...actual };
-});
-
 jest.mock('@metamask/design-system-twrnc-preset', () => ({
   useTailwind: () => ({ style: (...args: unknown[]) => args }),
 }));
@@ -30,11 +27,18 @@ const mockUseRewardCampaigns = useRewardCampaigns as jest.MockedFunction<
 jest.mock('../hooks/useOndoOutcomeToast', () => ({
   useOndoOutcomeToast: jest.fn(),
 }));
-import { useOndoOutcomeToast } from '../hooks/useOndoOutcomeToast';
 const mockUseOndoOutcomeToast = useOndoOutcomeToast as jest.MockedFunction<
   typeof useOndoOutcomeToast
 >;
 
+jest.mock('../hooks/usePerpsTradingCampaignEndedOutcomeToast', () => ({
+  usePerpsTradingCampaignEndedOutcomeToast: jest.fn(),
+}));
+const mockUsePerpsTradingCampaignEndedOutcomeToast =
+  usePerpsTradingCampaignEndedOutcomeToast as jest.MockedFunction<
+    typeof usePerpsTradingCampaignEndedOutcomeToast
+  >;
+
 jest.mock('../components/Campaigns/CampaignsGroup', () => {
   const ReactActual = jest.requireActual('react');
   const { View, Text } = jest.requireActual('react-native');
@@ -93,27 +97,6 @@ jest.mock('../components/RewardsErrorBanner', () => {
   };
 });
 
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Text, Pressable } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({ title, onBack }: { title: string; onBack: () => void }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header' },
-          ReactActual.createElement(Text, null, title),
-          ReactActual.createElement(Pressable, {
-            onPress: onBack,
-            testID: 'header-back-button',
-          }),
-        ),
-    };
-  },
-);
-
 jest.mock('../../../Views/ErrorBoundary', () => {
   const ReactActual = jest.requireActual('react');
   return {
@@ -173,7 +156,6 @@ describe('CampaignsView', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockUseRewardCampaigns.mockReturnValue(hookDefaults);
-    mockUseOndoOutcomeToast.mockReturnValue(undefined);
   });
 
   it('renders the header with the correct title', () => {
@@ -185,6 +167,15 @@ describe('CampaignsView', () => {
     expect(getByText('Campaigns')).toBeOnTheScreen();
   });
 
+  it('mounts campaign outcome toast hooks on render', () => {
+    render(<CampaignsView />);
+
+    expect(mockUseOndoOutcomeToast).toHaveBeenCalledTimes(1);
+    expect(mockUsePerpsTradingCampaignEndedOutcomeToast).toHaveBeenCalledTimes(
+      1,
+    );
+  });
+
   it('navigates back when the back button is pressed', () => {
     const { getByTestId } = render(<CampaignsView />);
 
@@ -374,11 +365,4 @@ describe('CampaignsView', () => {
       expect(queryByText('Refreshing...')).toBeNull();
     });
   });
-
-  describe('hook integration', () => {
-    it('calls useOndoOutcomeToast on render', () => {
-      render(<CampaignsView />);
-      expect(mockUseOndoOutcomeToast).toHaveBeenCalledTimes(1);
-    });
-  });
 });
diff --git a/app/components/UI/Rewards/Views/CampaignsView.tsx b/app/components/UI/Rewards/Views/CampaignsView.tsx
index b4b89d1ec1d..c47181cdbc2 100644
--- a/app/components/UI/Rewards/Views/CampaignsView.tsx
+++ b/app/components/UI/Rewards/Views/CampaignsView.tsx
@@ -9,18 +9,19 @@ import {
   TextVariant,
   BoxFlexDirection,
   BoxAlignItems,
+  HeaderStandard,
   Skeleton,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import ErrorBoundary from '../../../Views/ErrorBoundary';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import { useRewardCampaigns } from '../hooks/useRewardCampaigns';
-import { useOndoOutcomeToast } from '../hooks/useOndoOutcomeToast';
 import RewardsErrorBanner from '../components/RewardsErrorBanner';
 import { REWARDS_VIEW_SELECTORS } from './RewardsView.constants';
 import CampaignsGroup from '../components/Campaigns/CampaignsGroup';
 import { strings } from '../../../../../locales/i18n';
+import { useOndoOutcomeToast } from '../hooks/useOndoOutcomeToast';
+import { usePerpsTradingCampaignEndedOutcomeToast } from '../hooks/usePerpsTradingCampaignEndedOutcomeToast';
 
 /**
  * CampaignsView displays all campaigns organized by status:
@@ -31,9 +32,10 @@ import { strings } from '../../../../../locales/i18n';
 const CampaignsView: React.FC = () => {
   const tw = useTailwind();
   const navigation = useNavigation();
-  useOndoOutcomeToast();
   const { categorizedCampaigns, isLoading, hasError, fetchCampaigns } =
     useRewardCampaigns();
+  useOndoOutcomeToast();
+  usePerpsTradingCampaignEndedOutcomeToast();
 
   useTrackRewardsPageView({ page_type: 'campaigns_overview' });
 
@@ -108,7 +110,7 @@ const CampaignsView: React.FC = () => {
         style={tw.style('flex-1 bg-default')}
         testID={REWARDS_VIEW_SELECTORS.CAMPAIGNS_VIEW}
       >
-        <HeaderCompactStandard
+        <HeaderStandard
           title={strings('rewards.campaigns_view.title')}
           onBack={() => navigation.goBack()}
           backButtonProps={{ testID: 'header-back-button' }}
diff --git a/app/components/UI/Rewards/Views/MusdCalculatorView.test.tsx b/app/components/UI/Rewards/Views/MusdCalculatorView.test.tsx
index afccd990c34..26bc16781ec 100644
--- a/app/components/UI/Rewards/Views/MusdCalculatorView.test.tsx
+++ b/app/components/UI/Rewards/Views/MusdCalculatorView.test.tsx
@@ -29,26 +29,6 @@ jest.mock('../../../Views/ErrorBoundary', () => ({
   default: ({ children }: { children: React.ReactNode }) => children,
 }));
 
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Pressable } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({ onBack }: { title: string; onBack: () => void }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header' },
-          ReactActual.createElement(Pressable, {
-            onPress: onBack,
-            testID: 'header-back-button',
-          }),
-        ),
-    };
-  },
-);
-
 jest.mock('../components/Tabs/MusdCalculatorTab/MusdCalculatorTab', () => {
   const ReactActual = jest.requireActual('react');
   const { View } = jest.requireActual('react-native');
diff --git a/app/components/UI/Rewards/Views/MusdCalculatorView.tsx b/app/components/UI/Rewards/Views/MusdCalculatorView.tsx
index 1fa1f09275e..562b6c5301b 100644
--- a/app/components/UI/Rewards/Views/MusdCalculatorView.tsx
+++ b/app/components/UI/Rewards/Views/MusdCalculatorView.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
+import { HeaderStandard } from '@metamask/design-system-react-native';
 import { useNavigation } from '@react-navigation/native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import ErrorBoundary from '../../../Views/ErrorBoundary';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import MusdCalculatorTab from '../components/Tabs/MusdCalculatorTab/MusdCalculatorTab';
 import { strings } from '../../../../../locales/i18n';
 import useTrackRewardsPageView from '../hooks/useTrackRewardsPageView';
@@ -20,9 +20,10 @@ const MusdCalculatorView: React.FC = () => {
         edges={{ top: 'additive' }}
         style={tw.style('flex-1 bg-default')}
       >
-        <HeaderCompactStandard
+        <HeaderStandard
           title={strings('rewards.musd.page_title')}
           onBack={() => navigation.goBack()}
+          backButtonProps={{ testID: 'header-back-button' }}
         />
         <MusdCalculatorTab />
       </SafeAreaView>
diff --git a/app/components/UI/Rewards/Views/OndoCampaignDetailsView.test.tsx b/app/components/UI/Rewards/Views/OndoCampaignDetailsView.test.tsx
index f51095950e9..3ffe4a385b8 100644
--- a/app/components/UI/Rewards/Views/OndoCampaignDetailsView.test.tsx
+++ b/app/components/UI/Rewards/Views/OndoCampaignDetailsView.test.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
-import { render, fireEvent } from '@testing-library/react-native';
+import { render, fireEvent, act } from '@testing-library/react-native';
 import OndoCampaignDetailsView, {
   CAMPAIGN_DETAILS_TEST_IDS,
+  resetOndoCampaignDetailsSessionAutoNavigationForTests,
 } from './OndoCampaignDetailsView';
-import { CAMPAIGN_STATS_SUMMARY_TEST_IDS } from '../components/Campaigns/CampaignStatsSummary';
+import { ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS } from '../components/Campaigns/OndoCampaignStatsSummary';
 import { ONDO_PRIZE_POOL_TEST_IDS } from '../components/Campaigns/OndoPrizePool';
 import { CAMPAIGN_CTA_TEST_IDS } from '../components/Campaigns/CampaignOptInCta';
 import { CAMPAIGN_ENDED_STATS_TEST_IDS } from '../components/Campaigns/CampaignEndedStats';
@@ -19,7 +20,12 @@ import { useGetOndoPortfolioPosition } from '../hooks/useGetOndoPortfolioPositio
 import { useGetOndoCampaignDeposits } from '../hooks/useGetOndoCampaignDeposits';
 import { useOndoCampaignParticipantOutcome } from '../hooks/useOndoCampaignParticipantOutcome';
 import Routes from '../../../../constants/navigation/Routes';
-
+import { useSelector } from 'react-redux';
+import { selectReferralCode } from '../../../../reducers/rewards/selectors';
+import {
+  selectIsMetamaskNotificationsEnabled,
+  selectIsMetaMaskPushNotificationsEnabled,
+} from '../../../../selectors/notifications';
 const mockGoBack = jest.fn();
 const mockNavigate = jest.fn();
 const mockRouteState: { params: { campaignId?: string } } = {
@@ -41,11 +47,12 @@ jest.mock('@metamask/design-system-react-native', () => {
   const actual = jest.requireActual('@metamask/design-system-react-native');
   const ReactActual = jest.requireActual('react');
   const { View } = jest.requireActual('react-native');
-  // Skeleton is absent from the installed design-system version; stub it so
-  // the loading-state render doesn't throw "Element type is invalid".
   const Skeleton = (props: Record<string, unknown>) =>
     ReactActual.createElement(View, { testID: 'skeleton', ...props });
-  return { ...actual, Skeleton };
+  return {
+    ...actual,
+    Skeleton,
+  };
 });
 
 jest.mock('@metamask/design-system-twrnc-preset', () => ({
@@ -58,42 +65,6 @@ jest.mock('@metamask/design-system-twrnc-preset', () => ({
   },
 }));
 
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Text, Pressable } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({
-        title,
-        onBack,
-        endButtonIconProps,
-      }: {
-        title: string;
-        onBack: () => void;
-        endButtonIconProps?: { testID?: string; onPress?: () => void }[];
-      }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header' },
-          ReactActual.createElement(Text, null, title),
-          ReactActual.createElement(Pressable, {
-            onPress: onBack,
-            testID: 'header-back-button',
-          }),
-          ...(endButtonIconProps ?? []).map((btn, i) =>
-            ReactActual.createElement(Pressable, {
-              key: i,
-              onPress: btn.onPress,
-              testID: btn.testID ?? `end-button-${i}`,
-            }),
-          ),
-        ),
-    };
-  },
-);
-
 jest.mock('../../../Views/ErrorBoundary', () => {
   const ReactActual = jest.requireActual('react');
   return {
@@ -153,18 +124,17 @@ jest.mock('../components/Campaigns/CampaignEndedStats', () => {
   };
 });
 
-const mockCampaignStatsSummary = jest.fn();
-jest.mock('../components/Campaigns/CampaignStatsSummary', () => {
+const mockOndoCampaignStatsSummary = jest.fn();
+jest.mock('../components/Campaigns/OndoCampaignStatsSummary', () => {
   const ReactActual = jest.requireActual('react');
   const { View } = jest.requireActual('react-native');
-  const { CAMPAIGN_STATS_SUMMARY_TEST_IDS: actualTestIds } = jest.requireActual(
-    '../components/Campaigns/CampaignStatsSummary',
-  );
+  const { ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS: actualTestIds } =
+    jest.requireActual('../components/Campaigns/OndoCampaignStatsSummary');
   return {
     __esModule: true,
-    CAMPAIGN_STATS_SUMMARY_TEST_IDS: actualTestIds,
+    ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS: actualTestIds,
     default: (props: Record<string, unknown>) => {
-      mockCampaignStatsSummary(props);
+      mockOndoCampaignStatsSummary(props);
       return ReactActual.createElement(View, {
         testID: actualTestIds.CONTAINER,
       });
@@ -172,18 +142,6 @@ jest.mock('../components/Campaigns/CampaignStatsSummary', () => {
   };
 });
 
-jest.mock('../hooks/useRewardsToast', () => ({
-  __esModule: true,
-  default: () => ({
-    showToast: jest.fn(),
-    RewardsToastOptions: {
-      success: jest.fn(),
-      error: jest.fn(),
-      entriesClosed: jest.fn(() => ({ variant: 'icon' })),
-    },
-  }),
-}));
-
 jest.mock('../hooks/useCampaignGeoRestriction', () => ({
   __esModule: true,
   default: () => ({ isGeoRestricted: false, isGeoLoading: false }),
@@ -316,7 +274,7 @@ jest.mock('../components/Campaigns/OndoPrizePool', () => {
 });
 
 jest.mock('react-redux', () => ({
-  useSelector: jest.fn(() => null),
+  useSelector: jest.fn(),
 }));
 
 const mockIsTokenTradingOpen = jest.fn(() => true);
@@ -512,6 +470,7 @@ jest.mock('../../../../../locales/i18n', () => ({
       'rewards.campaign_details.competition_closed_description':
         'Entries are now closed',
       'rewards.ondo_campaign_portfolio.view_activity': 'View activity',
+      'rewards.notifications_nudge.turn_on_button': 'Turn on',
     };
     return translations[key] || key;
   },
@@ -555,8 +514,21 @@ const hookDefaults = {
 describe('OndoCampaignDetailsView', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    resetOndoCampaignDetailsSessionAutoNavigationForTests();
+    (useSelector as jest.Mock).mockImplementation((selector: unknown) => {
+      if (selector === selectReferralCode) {
+        return null;
+      }
+      if (selector === selectIsMetamaskNotificationsEnabled) {
+        return true;
+      }
+      if (selector === selectIsMetaMaskPushNotificationsEnabled) {
+        return true;
+      }
+      return null;
+    });
     mockIsTokenTradingOpen.mockReturnValue(true);
-    mockCampaignStatsSummary.mockReset();
+    mockOndoCampaignStatsSummary.mockReset();
     mockUseRewardCampaigns.mockReturnValue(hookDefaults);
     mockUseGetCampaignParticipantStatus.mockReturnValue({
       status: null,
@@ -763,7 +735,7 @@ describe('OndoCampaignDetailsView', () => {
       expect(queryByTestId('campaign-how-it-works')).toBeNull();
     });
 
-    it('renders CampaignStatsSummary when user has portfolio positions', () => {
+    it('renders OndoCampaignStatsSummary when user has portfolio positions', () => {
       mockUseRewardCampaigns.mockReturnValue({
         ...hookDefaults,
         campaigns: [createTestCampaign()],
@@ -783,11 +755,11 @@ describe('OndoCampaignDetailsView', () => {
       });
       const { getByTestId } = render(<OndoCampaignDetailsView />);
       expect(
-        getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
+        getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
       ).toBeDefined();
     });
 
-    it('does not render CampaignStatsSummary when participant has no positions', () => {
+    it('does not render OndoCampaignStatsSummary when participant has no positions', () => {
       mockUseRewardCampaigns.mockReturnValue({
         ...hookDefaults,
         campaigns: [createTestCampaign()],
@@ -800,7 +772,7 @@ describe('OndoCampaignDetailsView', () => {
       });
       const { queryByTestId } = render(<OndoCampaignDetailsView />);
       expect(
-        queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
+        queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
       ).toBeNull();
     });
   });
@@ -940,7 +912,7 @@ describe('OndoCampaignDetailsView', () => {
   });
 
   describe('stats summary and leaderboard', () => {
-    it('shows CampaignStatsSummary when participant is opted in with positions', () => {
+    it('shows OndoCampaignStatsSummary when participant is opted in with positions', () => {
       mockUseRewardCampaigns.mockReturnValue({
         ...hookDefaults,
         campaigns: [createTestCampaign()],
@@ -960,18 +932,18 @@ describe('OndoCampaignDetailsView', () => {
       });
       const { getByTestId } = render(<OndoCampaignDetailsView />);
       expect(
-        getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
+        getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
       ).toBeDefined();
     });
 
-    it('does not show CampaignStatsSummary when not opted in and campaign is active', () => {
+    it('does not show OndoCampaignStatsSummary when not opted in and campaign is active', () => {
       mockUseRewardCampaigns.mockReturnValue({
         ...hookDefaults,
         campaigns: [createTestCampaign()],
       });
       const { queryByTestId } = render(<OndoCampaignDetailsView />);
       expect(
-        queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
+        queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
       ).toBeNull();
     });
 
@@ -995,7 +967,7 @@ describe('OndoCampaignDetailsView', () => {
       );
       expect(getByTestId('ondo-leaderboard')).toBeDefined();
       expect(
-        queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
+        queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
       ).toBeNull();
     });
 
@@ -1048,7 +1020,7 @@ describe('OndoCampaignDetailsView', () => {
         campaigns: [createTestCampaign()],
       });
       const { getByTestId } = render(<OndoCampaignDetailsView />);
-      fireEvent.press(getByTestId('header-back-button'));
+      fireEvent.press(getByTestId('campaign-details-back-button'));
       expect(mockGoBack).toHaveBeenCalledTimes(1);
     });
 
@@ -1166,7 +1138,7 @@ describe('OndoCampaignDetailsView', () => {
     });
   });
 
-  describe('ineligible state — isIneligible prop passed to CampaignStatsSummary', () => {
+  describe('ineligible state — isIneligible prop passed to OndoCampaignStatsSummary', () => {
     const setupWithPositions = () => {
       mockUseGetCampaignParticipantStatus.mockReturnValue({
         status: { optedIn: true, participantCount: 1 },
@@ -1201,7 +1173,7 @@ describe('OndoCampaignDetailsView', () => {
       });
       setupWithPositions();
       render(<OndoCampaignDetailsView />);
-      expect(mockCampaignStatsSummary).toHaveBeenCalledWith(
+      expect(mockOndoCampaignStatsSummary).toHaveBeenCalledWith(
         expect.objectContaining({ isIneligible: true }),
       );
     });
@@ -1224,7 +1196,7 @@ describe('OndoCampaignDetailsView', () => {
       });
       setupWithPositions();
       render(<OndoCampaignDetailsView />);
-      expect(mockCampaignStatsSummary).toHaveBeenCalledWith(
+      expect(mockOndoCampaignStatsSummary).toHaveBeenCalledWith(
         expect.objectContaining({ isIneligible: false }),
       );
     });
@@ -1266,7 +1238,7 @@ describe('OndoCampaignDetailsView', () => {
         refetch: jest.fn(),
       });
       render(<OndoCampaignDetailsView />);
-      expect(mockCampaignStatsSummary).toHaveBeenCalledWith(
+      expect(mockOndoCampaignStatsSummary).toHaveBeenCalledWith(
         expect.objectContaining({ isIneligible: false }),
       );
     });
@@ -1439,10 +1411,10 @@ describe('OndoCampaignDetailsView', () => {
       );
     });
 
-    it('passes winner outcome props to CampaignStatsSummary when campaign is complete', () => {
+    it('passes winner outcome props to OndoCampaignStatsSummary when campaign is complete', () => {
       setupWinner();
       render(<OndoCampaignDetailsView />);
-      expect(mockCampaignStatsSummary).toHaveBeenCalledWith(
+      expect(mockOndoCampaignStatsSummary).toHaveBeenCalledWith(
         expect.objectContaining({
           isCampaignComplete: true,
           outcomeStatus: 'pending',
@@ -1451,7 +1423,7 @@ describe('OndoCampaignDetailsView', () => {
       );
     });
 
-    it('passes no outcome status to CampaignStatsSummary when user has no outcome', () => {
+    it('passes no outcome status to OndoCampaignStatsSummary when user has no outcome', () => {
       mockUseRewardCampaigns.mockReturnValue({
         ...hookDefaults,
         campaigns: [
@@ -1473,7 +1445,7 @@ describe('OndoCampaignDetailsView', () => {
       });
       render(<OndoCampaignDetailsView />);
       expect(
-        mockCampaignStatsSummary.mock.calls.at(-1)?.[0]?.outcomeStatus,
+        mockOndoCampaignStatsSummary.mock.calls.at(-1)?.[0]?.outcomeStatus,
       ).toBeUndefined();
     });
 
@@ -1482,7 +1454,7 @@ describe('OndoCampaignDetailsView', () => {
       mockNavigate.mockClear();
       render(<OndoCampaignDetailsView />);
       const onWinnerPress =
-        mockCampaignStatsSummary.mock.calls.at(-1)?.[0]?.onWinnerPress;
+        mockOndoCampaignStatsSummary.mock.calls.at(-1)?.[0]?.onWinnerPress;
       expect(typeof onWinnerPress).toBe('function');
       onWinnerPress();
       expect(mockNavigate).toHaveBeenCalledWith(
diff --git a/app/components/UI/Rewards/Views/OndoCampaignDetailsView.tsx b/app/components/UI/Rewards/Views/OndoCampaignDetailsView.tsx
index 86dcef335d4..71cc64d0855 100644
--- a/app/components/UI/Rewards/Views/OndoCampaignDetailsView.tsx
+++ b/app/components/UI/Rewards/Views/OndoCampaignDetailsView.tsx
@@ -20,7 +20,7 @@ import {
   BoxAlignItems,
   BoxFlexDirection,
   BoxJustifyContent,
-  FontWeight,
+  HeaderStandard,
   Icon,
   IconColor,
   IconName,
@@ -28,12 +28,10 @@ import {
   Skeleton,
   Text,
   TextButton,
-  TextColor,
   TextVariant,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import ErrorBoundary from '../../../Views/ErrorBoundary';
 import CampaignStatus from '../components/Campaigns/CampaignStatus';
 import CampaignHowItWorks from '../components/Campaigns/CampaignHowItWorks';
@@ -42,8 +40,8 @@ import OndoPortfolio from '../components/Campaigns/OndoPortfolio';
 import OndoAccountPickerSheet from '../components/Campaigns/OndoAccountPickerSheet';
 import OndoCampaignCTA from '../components/Campaigns/OndoCampaignCTA';
 import OndoNotEligibleSheet from '../components/Campaigns/OndoNotEligibleSheet';
-import CampaignStatsSummary from '../components/Campaigns/CampaignStatsSummary';
 import CampaignEndedStats from '../components/Campaigns/CampaignEndedStats';
+import OndoCampaignStatsSummary from '../components/Campaigns/OndoCampaignStatsSummary';
 import OndoPrizePool from '../components/Campaigns/OndoPrizePool';
 import { getCampaignStatus } from '../components/Campaigns/CampaignTile.utils';
 import RewardsErrorBanner from '../components/RewardsErrorBanner';
@@ -61,7 +59,11 @@ import {
   CampaignType,
   OndoCampaignHowItWorks,
 } from '../../../../core/Engine/controllers/rewards-controller/types';
-import { getTierMinNetDeposit } from '../components/Campaigns/OndoLeaderboard.utils';
+import {
+  buildLeaderboardUserPosition,
+  getCampaignTierNames,
+  getTierMinNetDeposit,
+} from '../components/Campaigns/OndoLeaderboard.utils';
 import { isCampaignIneligible } from '../utils/ondoCampaignConstants';
 import useTrackRewardsPageView from '../hooks/useTrackRewardsPageView';
 
@@ -77,7 +79,6 @@ export const CAMPAIGN_DETAILS_TEST_IDS = {
 
 const sessionUpcomingRedirectCampaignIds = new Set<string>();
 const sessionWinningViewAutoNavCampaignIds = new Set<string>();
-
 export function resetOndoCampaignDetailsSessionAutoNavigationForTests(): void {
   sessionUpcomingRedirectCampaignIds.clear();
   sessionWinningViewAutoNavCampaignIds.clear();
@@ -223,20 +224,10 @@ const OndoCampaignDetailsView: React.FC = () => {
     defaultTier: leaderboardPosition?.projectedTier,
   });
 
-  const tierNames = useMemo(
-    () => campaign?.details?.tiers?.map((t) => t.name) ?? [],
-    [campaign],
-  );
+  const tierNames = useMemo(() => getCampaignTierNames(campaign), [campaign]);
 
   const leaderboardUserPosition = useMemo(
-    () =>
-      leaderboardPosition
-        ? {
-            projectedTier: leaderboardPosition.projectedTier,
-            rank: leaderboardPosition.rank,
-            neighbors: leaderboardPosition.neighbors ?? [],
-          }
-        : null,
+    () => buildLeaderboardUserPosition(leaderboardPosition),
     [leaderboardPosition],
   );
 
@@ -305,7 +296,7 @@ const OndoCampaignDetailsView: React.FC = () => {
         style={tw.style('flex-1 bg-default')}
         testID={CAMPAIGN_DETAILS_TEST_IDS.CONTAINER}
       >
-        <HeaderCompactStandard
+        <HeaderStandard
           title={campaign?.name ?? ''}
           onBack={() => navigation.goBack()}
           backButtonProps={{ testID: 'campaign-details-back-button' }}
@@ -414,7 +405,7 @@ const OndoCampaignDetailsView: React.FC = () => {
                         />
                       </Box>
                     </Pressable>
-                    <CampaignStatsSummary
+                    <OndoCampaignStatsSummary
                       leaderboardPosition={leaderboardPosition}
                       portfolioSummary={portfolioData?.summary ?? null}
                       leaderboard={{
@@ -519,7 +510,7 @@ const OndoCampaignDetailsView: React.FC = () => {
                       <Box
                         flexDirection={BoxFlexDirection.Row}
                         alignItems={BoxAlignItems.Center}
-                        twClassName="gap-2 mb-4 px-4"
+                        twClassName="gap-2 px-4 mb-1"
                       >
                         <Text variant={TextVariant.HeadingMd}>
                           {strings('rewards.ondo_campaign_leaderboard.title')}
diff --git a/app/components/UI/Rewards/Views/OndoCampaignPortfolioView.test.tsx b/app/components/UI/Rewards/Views/OndoCampaignPortfolioView.test.tsx
index 40abb02f4de..b1ef57681cd 100644
--- a/app/components/UI/Rewards/Views/OndoCampaignPortfolioView.test.tsx
+++ b/app/components/UI/Rewards/Views/OndoCampaignPortfolioView.test.tsx
@@ -21,32 +21,10 @@ jest.mock('@react-navigation/native', () => ({
   useRoute: () => ({ params: { campaignId: 'campaign-1' } }),
 }));
 
-jest.mock('@metamask/design-system-react-native', () => {
-  const actual = jest.requireActual('@metamask/design-system-react-native');
-  return { ...actual };
-});
-
 jest.mock('@metamask/design-system-twrnc-preset', () => ({
   useTailwind: () => ({ style: (...args: unknown[]) => args }),
 }));
 
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Text } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({ title }: { title: string }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header' },
-          ReactActual.createElement(Text, null, title),
-        ),
-    };
-  },
-);
-
 jest.mock('../../../Views/ErrorBoundary', () => {
   const ReactActual = jest.requireActual('react');
   return {
diff --git a/app/components/UI/Rewards/Views/OndoCampaignPortfolioView.tsx b/app/components/UI/Rewards/Views/OndoCampaignPortfolioView.tsx
index 7f5d17774f7..031ded151e1 100644
--- a/app/components/UI/Rewards/Views/OndoCampaignPortfolioView.tsx
+++ b/app/components/UI/Rewards/Views/OndoCampaignPortfolioView.tsx
@@ -10,6 +10,7 @@ import {
 
 import {
   Box,
+  HeaderStandard,
   IconName,
   Skeleton,
   Text,
@@ -18,7 +19,6 @@ import {
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import ErrorBoundary from '../../../Views/ErrorBoundary';
 import OndoActivityRow from '../components/Campaigns/OndoActivityRow';
 import RewardsErrorBanner from '../components/RewardsErrorBanner';
@@ -182,7 +182,7 @@ const OndoCampaignPortfolioView: React.FC = () => {
         style={tw.style('flex-1 bg-default')}
         testID={CAMPAIGN_PORTFOLIO_TEST_IDS.CONTAINER}
       >
-        <HeaderCompactStandard
+        <HeaderStandard
           title={strings('rewards.ondo_campaign_portfolio.activity_title')}
           titleProps={{ variant: TextVariant.HeadingSm }}
           onBack={() => navigation.goBack()}
diff --git a/app/components/UI/Rewards/Views/OndoCampaignRwaSelectorView.test.tsx b/app/components/UI/Rewards/Views/OndoCampaignRwaSelectorView.test.tsx
index 90700c27a10..6722d074598 100644
--- a/app/components/UI/Rewards/Views/OndoCampaignRwaSelectorView.test.tsx
+++ b/app/components/UI/Rewards/Views/OndoCampaignRwaSelectorView.test.tsx
@@ -71,57 +71,6 @@ jest.mock('@metamask/design-system-twrnc-preset', () => {
   };
 });
 
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Pressable } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({
-        title,
-        onBack,
-        onClose,
-        backButtonProps,
-        endButtonIconProps,
-        testID,
-      }: {
-        title: React.ReactNode;
-        onBack?: () => void;
-        onClose?: () => void;
-        backButtonProps?: { onPress?: () => void };
-        endButtonIconProps?: {
-          onPress?: () => void;
-          testID?: string;
-        }[];
-        testID?: string;
-      }) =>
-        ReactActual.createElement(
-          View,
-          { testID: testID ?? 'header' },
-          ReactActual.createElement(Pressable, {
-            onPress: backButtonProps?.onPress ?? onBack ?? onClose,
-            testID: 'header-back-button',
-          }),
-          typeof title === 'string'
-            ? ReactActual.createElement(
-                jest.requireActual('react-native').Text,
-                { testID: 'header-title' },
-                title,
-              )
-            : title,
-          ...(endButtonIconProps ?? []).map((iconProps, index) =>
-            ReactActual.createElement(Pressable, {
-              key: `end-icon-${index}`,
-              onPress: iconProps.onPress,
-              testID: iconProps.testID ?? 'search-toggle',
-            }),
-          ),
-        ),
-    };
-  },
-);
-
 jest.mock('../../../Views/ErrorBoundary', () => {
   const ReactActual = jest.requireActual('react');
   return {
@@ -427,7 +376,7 @@ describe('OndoCampaignRwaSelectorView', () => {
 
   it('navigates back when back button is pressed', () => {
     const { getByTestId } = render(<OndoCampaignRwaSelectorView />);
-    fireEvent.press(getByTestId('header-back-button'));
+    fireEvent.press(getByTestId('ondo-rwa-selector-header-back-button'));
     expect(mockGoBack).toHaveBeenCalledTimes(1);
   });
 
diff --git a/app/components/UI/Rewards/Views/OndoCampaignStatsView.test.tsx b/app/components/UI/Rewards/Views/OndoCampaignStatsView.test.tsx
index e64e908b2cc..f8e1fa665fd 100644
--- a/app/components/UI/Rewards/Views/OndoCampaignStatsView.test.tsx
+++ b/app/components/UI/Rewards/Views/OndoCampaignStatsView.test.tsx
@@ -72,50 +72,22 @@ jest.mock('react-native-safe-area-context', () => {
 
 jest.mock('@metamask/design-system-react-native', () => {
   const actual = jest.requireActual('@metamask/design-system-react-native');
-  return { ...actual };
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    ...actual,
+    Skeleton: ({ children }: { children?: React.ReactNode }) =>
+      ReactActual.createElement(View, { testID: 'skeleton' }, children),
+  };
 });
 
 jest.mock('@metamask/design-system-twrnc-preset', () => ({
-  useTailwind: () => ({ style: (...args: unknown[]) => args }),
-}));
-
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Text, Pressable } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({
-        title,
-        onBack,
-        backButtonProps,
-        endButtonIconProps,
-      }: {
-        title: string;
-        onBack: () => void;
-        backButtonProps?: { testID?: string };
-        endButtonIconProps?: { testID?: string; onPress?: () => void }[];
-      }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header' },
-          ReactActual.createElement(Text, null, title),
-          ReactActual.createElement(Pressable, {
-            onPress: onBack,
-            testID: backButtonProps?.testID ?? 'header-back-button',
-          }),
-          ...(endButtonIconProps ?? []).map((btn, index) =>
-            ReactActual.createElement(Pressable, {
-              key: `end-${String(index)}`,
-              onPress: btn.onPress,
-              testID: btn.testID ?? `header-end-button-${String(index)}`,
-            }),
-          ),
-        ),
-    };
+  useTailwind: () => {
+    const tw = (...args: unknown[]) => args;
+    tw.style = (...args: unknown[]) => args;
+    return tw;
   },
-);
+}));
 
 jest.mock('../../../Views/ErrorBoundary', () => {
   const ReactActual = jest.requireActual('react');
@@ -186,6 +158,9 @@ jest.mock('../utils/formatUtils', () => ({
       minimumFractionDigits: 2,
       maximumFractionDigits: 2,
     })}`,
+  formatRewardsTimeOnly: () => '12:00 PM',
+  getPortfolioReturnColor: (pnl?: string) =>
+    pnl && parseFloat(pnl) < 0 ? 'errorDefault' : 'textDefault',
 }));
 
 // Mock Engine to prevent @metamask/social-controllers resolution chain
@@ -432,7 +407,9 @@ describe('OndoCampaignStatsView', () => {
       hasError: false,
     });
     const { getByText } = render(<OndoCampaignStatsView />);
-    const title = getByText('rewards.ondo_outcome_banner.winner_pending.title');
+    const title = getByText(
+      'rewards.campaign_outcome_banner.winner_pending.title',
+    );
     fireEvent.press(title);
     expect(mockNavigate).toHaveBeenCalledWith(
       Routes.REWARDS_ONDO_CAMPAIGN_WINNING_VIEW,
@@ -462,7 +439,7 @@ describe('OndoCampaignStatsView', () => {
     });
     const { queryByText } = render(<OndoCampaignStatsView />);
     expect(
-      queryByText('rewards.ondo_outcome_banner.winner_pending.title'),
+      queryByText('rewards.campaign_outcome_banner.winner_pending.title'),
     ).toBeNull();
   });
 
@@ -1011,7 +988,9 @@ describe('OndoCampaignStatsView', () => {
       hasError: false,
     });
     const { getByText } = render(<OndoCampaignStatsView />);
-    const title = getByText('rewards.ondo_outcome_banner.winner_pending.title');
+    const title = getByText(
+      'rewards.campaign_outcome_banner.winner_pending.title',
+    );
     fireEvent.press(title);
     expect(mockNavigate).toHaveBeenCalledWith(
       Routes.REWARDS_ONDO_CAMPAIGN_WINNING_VIEW,
@@ -1041,3 +1020,50 @@ describe('OndoCampaignStatsView', () => {
     ).toBeDefined();
   });
 });
+
+describe('OndoCampaignStatsView — last updated', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseGetCampaignParticipantStatus.mockReturnValue({
+      status: { optedIn: true, participantCount: 1 },
+      isLoading: false,
+      hasError: false,
+      refetch: jest.fn(),
+    });
+    mockUseGetOndoPortfolioPosition.mockReturnValue({
+      portfolio: null,
+      isLoading: false,
+      hasError: false,
+      hasFetched: false,
+      refetch: jest.fn(),
+    });
+    mockUseGetOndoLeaderboard.mockReturnValue(leaderboardDefaults);
+    mockUseOndoCampaignParticipantOutcome.mockReturnValue({
+      outcome: null,
+      isLoading: false,
+      hasError: false,
+    });
+    mockRewardsState.campaigns = [createTestCampaign()];
+  });
+
+  it('shows last updated timestamp when position has computedAt', () => {
+    mockUseGetOndoLeaderboardPosition.mockReturnValue({
+      ...positionDefaults,
+      position: makeQualifiedPosition({
+        computedAt: '2024-03-20T12:00:00.000Z',
+      }),
+    });
+    const { getByText } = render(<OndoCampaignStatsView />);
+    expect(
+      getByText(/rewards\.ondo_campaign_leaderboard\.updated_at/),
+    ).toBeDefined();
+  });
+
+  it('does not show last updated timestamp when position is null', () => {
+    mockUseGetOndoLeaderboardPosition.mockReturnValue(positionDefaults);
+    const { queryByText } = render(<OndoCampaignStatsView />);
+    expect(
+      queryByText(/rewards\.ondo_campaign_leaderboard\.updated_at/),
+    ).toBeNull();
+  });
+});
diff --git a/app/components/UI/Rewards/Views/OndoCampaignStatsView.tsx b/app/components/UI/Rewards/Views/OndoCampaignStatsView.tsx
index 877d213e111..520d10dfafd 100644
--- a/app/components/UI/Rewards/Views/OndoCampaignStatsView.tsx
+++ b/app/components/UI/Rewards/Views/OndoCampaignStatsView.tsx
@@ -14,28 +14,22 @@ import {
   TextColor,
   TextVariant,
 } from '@metamask/design-system-react-native';
-import { OndoGmCampaignOutcomeBanner } from '../components/Campaigns/OndoCampaignOutcomeBanners';
-import { getCampaignMechanicsButtonProps } from '../utils/campaignHeaderUtils';
+import { CampaignOutcomeBanner } from '../components/Campaigns/CampaignOutcomeBanners';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import ErrorBoundary from '../../../Views/ErrorBoundary';
+import CampaignViewHeader from '../components/Campaigns/CampaignViewHeader';
 import {
   StatCell,
-  CAMPAIGN_STATS_SUMMARY_TEST_IDS,
-} from '../components/Campaigns/CampaignStatsSummary';
+  ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS,
+} from '../components/Campaigns/OndoCampaignStatsSummary';
 import LeaderboardPositionHeader from '../components/Campaigns/LeaderboardPositionHeader';
 import RewardsErrorBanner from '../components/RewardsErrorBanner';
-import {
-  formatTierDisplayName,
-  getTierMinNetDeposit,
-} from '../components/Campaigns/OndoLeaderboard.utils';
+import { getTierMinNetDeposit } from '../components/Campaigns/OndoLeaderboard.utils';
 import { strings } from '../../../../../locales/i18n';
-import { formatPercentChange, formatUsd } from '../utils/formatUtils';
-import {
-  ONDO_GM_REQUIRED_QUALIFIED_DAYS,
-  isCampaignIneligible,
-} from '../utils/ondoCampaignConstants';
+import { formatUsd, formatRewardsTimeOnly } from '../utils/formatUtils';
+import { ONDO_GM_REQUIRED_QUALIFIED_DAYS } from '../utils/ondoCampaignConstants';
+import { useOndoLeaderboardPositionDisplay } from '../hooks/useOndoLeaderboardPositionDisplay';
 import { useOndoCampaignParticipantOutcome } from '../hooks/useOndoCampaignParticipantOutcome';
 import { useGetOndoLeaderboardPosition } from '../hooks/useGetOndoLeaderboardPosition';
 import { useGetOndoPortfolioPosition } from '../hooks/useGetOndoPortfolioPosition';
@@ -53,6 +47,7 @@ type OndoCampaignStatsRouteParams = {
 
 export const ONDO_CAMPAIGN_STATS_VIEW_TEST_IDS = {
   CONTAINER: 'ondo-campaign-stats-view-container',
+  LAST_COMPUTED: 'ondo-campaign-stats-view-last-computed',
 } as const;
 
 const CheckIcon: React.FC = () => (
@@ -109,25 +104,21 @@ const OndoCampaignStatsView: React.FC = () => {
   const leaderboardError = hasLeaderboardPositionError && !leaderboardPosition;
   const portfolioError = hasPortfolioError && !portfolioData;
 
-  const isPending =
-    leaderboardPosition != null && !leaderboardPosition.qualified;
-  const isQualified =
-    leaderboardPosition != null && leaderboardPosition.qualified;
-
-  const isIneligible = useMemo(
-    () => isCampaignIneligible(campaign, leaderboardPosition?.qualified),
-    [campaign, leaderboardPosition],
-  );
-
-  const returnValue = portfolioData?.summary
-    ? formatPercentChange(portfolioData.summary.portfolioPnlPercent)
-    : '-';
-
-  const returnColor = portfolioData?.summary
-    ? parseFloat(portfolioData.summary.portfolioPnlPercent) < 0
-      ? TextColor.ErrorDefault
-      : TextColor.SuccessDefault
-    : TextColor.TextDefault;
+  const {
+    isCampaignComplete,
+    isPending,
+    isQualified,
+    isIneligible,
+    rankValue,
+    tierValue,
+    returnValue: returnValueRaw,
+    returnColor,
+  } = useOndoLeaderboardPositionDisplay({
+    campaign,
+    position: leaderboardPosition,
+    portfolioPnlPercent: portfolioData?.summary?.portfolioPnlPercent,
+  });
+  const returnValue = returnValueRaw ?? '-';
 
   const marketValue = portfolioData?.summary
     ? formatUsd(portfolioData.summary.totalCurrentValue)
@@ -145,16 +136,6 @@ const OndoCampaignStatsView: React.FC = () => {
     ? formatUsd(portfolioData.summary.totalCashedOut)
     : '-';
 
-  const rankValue =
-    isIneligible || !leaderboardPosition
-      ? '-'
-      : String(leaderboardPosition.rank).padStart(2, '0');
-
-  const tierValue =
-    isIneligible || !leaderboardPosition
-      ? '-'
-      : formatTierDisplayName(leaderboardPosition.projectedTier);
-
   const daysHeldValue = leaderboardPosition
     ? `${Math.min(
         leaderboardPosition.qualifiedDays,
@@ -187,9 +168,6 @@ const OndoCampaignStatsView: React.FC = () => {
     daysRemaining > 0 &&
     tierMinDeposit != null;
 
-  const isCampaignComplete =
-    campaign != null && getCampaignStatus(campaign) === 'complete';
-
   const { outcome: participantOutcome } = useOndoCampaignParticipantOutcome(
     isCampaignComplete && isOptedIn ? campaignId : undefined,
   );
@@ -208,20 +186,12 @@ const OndoCampaignStatsView: React.FC = () => {
         style={tw.style('flex-1 bg-default')}
         testID={ONDO_CAMPAIGN_STATS_VIEW_TEST_IDS.CONTAINER}
       >
-        <HeaderCompactStandard
+        <CampaignViewHeader
           title={strings('rewards.ondo_campaign_stats.title')}
-          titleProps={{ variant: TextVariant.HeadingSm }}
-          onBack={() => navigation.goBack()}
-          backButtonProps={{ testID: 'ondo-campaign-stats-back-button' }}
-          endButtonIconProps={getCampaignMechanicsButtonProps(
-            campaign != null,
-            () =>
-              navigation.navigate(Routes.REWARDS_CAMPAIGN_MECHANICS, {
-                campaignId,
-              }),
-            'campaign-stats-mechanics-button',
-          )}
-          includesTopInset
+          backButtonTestID="ondo-campaign-stats-back-button"
+          mechanicsButtonTestID="campaign-stats-mechanics-button"
+          hasCampaign={campaign != null}
+          campaignId={campaignId}
         />
 
         <ScrollView
@@ -314,7 +284,7 @@ const OndoCampaignStatsView: React.FC = () => {
 
             {/* ── Outcome banner (campaign ended) ── */}
             {isCampaignComplete && participantOutcome && (
-              <OndoGmCampaignOutcomeBanner
+              <CampaignOutcomeBanner
                 outcomeStatus={participantOutcome.outcomeStatus}
                 winnerVerificationCode={
                   participantOutcome.winnerVerificationCode
@@ -377,7 +347,9 @@ const OndoCampaignStatsView: React.FC = () => {
             {!isCampaignComplete && isIneligible && (
               <Box
                 twClassName="bg-muted rounded-xl p-4 mt-2 gap-2"
-                testID={CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER}
+                testID={
+                  ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER
+                }
               >
                 <Text
                   variant={TextVariant.BodyMd}
@@ -397,6 +369,20 @@ const OndoCampaignStatsView: React.FC = () => {
               </Box>
             )}
 
+            {/* ── Last updated ── */}
+            {leaderboardPosition?.computedAt && (
+              <Text
+                variant={TextVariant.BodySm}
+                color={TextColor.TextAlternative}
+              >
+                {strings('rewards.ondo_campaign_leaderboard.updated_at', {
+                  time: formatRewardsTimeOnly(
+                    new Date(leaderboardPosition.computedAt),
+                  ),
+                })}
+              </Text>
+            )}
+
             {/* ── Error banner ── */}
             {(leaderboardError || portfolioError) && (
               <RewardsErrorBanner
diff --git a/app/components/UI/Rewards/Views/OndoCampaignWinningView.test.tsx b/app/components/UI/Rewards/Views/OndoCampaignWinningView.test.tsx
index a5057d900fe..71207e2a07e 100644
--- a/app/components/UI/Rewards/Views/OndoCampaignWinningView.test.tsx
+++ b/app/components/UI/Rewards/Views/OndoCampaignWinningView.test.tsx
@@ -1,412 +1,172 @@
 import React from 'react';
-import { render, fireEvent, act } from '@testing-library/react-native';
-import { Linking } from 'react-native';
-import Clipboard from '@react-native-clipboard/clipboard';
+import { render } from '@testing-library/react-native';
 import OndoCampaignWinningView, {
   ONDO_CAMPAIGN_WINNING_VIEW_TEST_IDS,
 } from './OndoCampaignWinningView';
-import { useGetOndoLeaderboardPosition } from '../hooks/useGetOndoLeaderboardPosition';
 import { useOndoCampaignParticipantOutcome } from '../hooks/useOndoCampaignParticipantOutcome';
+import { useGetOndoLeaderboardPosition } from '../hooks/useGetOndoLeaderboardPosition';
+import CampaignWinningView from './CampaignWinningView';
 import Routes from '../../../../constants/navigation/Routes';
 
-jest.mock('../../../../images/rewards/campaign_winning.png', () => ({
-  __esModule: true,
-  default: 1,
-}));
-
-const mockGoBack = jest.fn();
-
-const mockNavigate = jest.fn();
-
-jest.mock('@react-navigation/native', () => ({
-  useNavigation: () => ({ goBack: mockGoBack, navigate: mockNavigate }),
-  useRoute: () => ({
-    params: { campaignId: 'campaign-ondo-1', campaignName: 'Ondo Campaign' },
-  }),
-}));
-
-jest.mock('@metamask/design-system-twrnc-preset', () => {
-  const tw = (...args: unknown[]) => args;
-  tw.style = (...args: unknown[]) => args;
-  return { useTailwind: () => tw };
-});
-
-jest.mock('react-native-safe-area-context', () => {
-  const actual = jest.requireActual('react-native-safe-area-context');
-  return {
-    ...actual,
-    useSafeAreaInsets: () => ({ top: 44, bottom: 34, left: 0, right: 0 }),
-  };
-});
-
-jest.mock('../hooks/useOndoCampaignParticipantOutcome', () => ({
-  useOndoCampaignParticipantOutcome: jest.fn(),
-}));
-
-const mockUseOndoCampaignParticipantOutcome =
-  useOndoCampaignParticipantOutcome as jest.MockedFunction<
-    typeof useOndoCampaignParticipantOutcome
-  >;
-
-jest.mock('../../../Views/ErrorBoundary', () => {
+jest.mock('./CampaignWinningView', () => {
   const ReactActual = jest.requireActual('react');
   const { View } = jest.requireActual('react-native');
   return {
     __esModule: true,
-    default: ({ children }: { children: React.ReactNode }) =>
-      ReactActual.createElement(View, null, children),
+    default: jest.fn(({ testID }: { testID: string }) =>
+      ReactActual.createElement(View, { testID }),
+    ),
   };
 });
 
-jest.mock('../hooks/useTrackRewardsPageView', () => ({
-  __esModule: true,
-  default: jest.fn(),
-}));
-
-jest.mock('../../../../core/Analytics', () => ({
-  MetaMetricsEvents: {
-    REWARDS_PAGE_BUTTON_CLICKED: 'REWARDS_PAGE_BUTTON_CLICKED',
-  },
-}));
-
-jest.mock('../utils', () => ({
-  RewardsMetricsButtons: {
-    COPY_REFERRAL_CODE: 'copy_referral_code',
-  },
-}));
-
-const mockTrackEvent = jest.fn();
-const mockBuild = jest.fn(() => ({}));
-jest.mock('../../../hooks/useAnalytics/useAnalytics', () => ({
-  useAnalytics: () => ({
-    trackEvent: mockTrackEvent,
-    createEventBuilder: () => ({
-      addProperties: () => ({ build: mockBuild }),
-    }),
-  }),
+jest.mock('../hooks/useOndoCampaignParticipantOutcome', () => ({
+  useOndoCampaignParticipantOutcome: jest.fn(),
 }));
 
-const mockPosition = {
-  projectedTier: 'MID',
-  rank: 3,
-  totalInTier: 100,
-  rateOfReturn: 0.2823,
-  currentUsdValue: 2000,
-  totalUsdDeposited: 1000,
-  netDeposit: 900,
-  qualifiedDays: 10,
-  qualified: true,
-  neighbors: [],
-  computedAt: '2024-01-01T00:00:00.000Z',
-};
-
 jest.mock('../hooks/useGetOndoLeaderboardPosition', () => ({
   useGetOndoLeaderboardPosition: jest.fn(),
 }));
 
-const mockUseGetOndoLeaderboardPosition =
-  useGetOndoLeaderboardPosition as jest.MockedFunction<
-    typeof useGetOndoLeaderboardPosition
-  >;
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({ goBack: jest.fn(), navigate: jest.fn() }),
+  useRoute: () => ({
+    params: { campaignId: 'campaign-ondo-1', campaignName: 'Ondo Campaign' },
+  }),
+}));
 
-jest.mock('../components/ReferralDetails/CopyableField', () => {
-  const ReactActual = jest.requireActual('react');
-  const { View, Text, Pressable } = jest.requireActual('react-native');
-  return {
-    __esModule: true,
-    default: ({
-      label,
-      value,
-      onCopy,
-    }: {
-      label: string;
-      value?: string | null;
-      onCopy?: () => void;
-    }) =>
-      ReactActual.createElement(
-        View,
-        { testID: 'copyable-field' },
-        ReactActual.createElement(Text, null, label),
-        ReactActual.createElement(
-          Text,
-          { testID: 'copyable-value' },
-          value ?? '',
-        ),
-        ReactActual.createElement(Pressable, {
-          testID: 'copyable-trigger',
-          onPress: onCopy,
-        }),
-      ),
-  };
+jest.mock('@metamask/design-system-twrnc-preset', () => {
+  const tw = (...args: unknown[]) => args;
+  tw.style = (...args: unknown[]) => args;
+  return { useTailwind: () => tw };
 });
 
-jest.mock('../../../../../locales/i18n', () => ({
-  strings: jest.fn(
-    (key: string, params?: { place?: string; code?: string }) => {
-      const map: Record<string, string> = {
-        'rewards.ondo_campaign_winning.you_won': 'You won',
-        'rewards.ondo_campaign_winning.email_instructions':
-          'Email ondocampaign@consensys.net with your code to claim your prize.',
-        'rewards.ondo_campaign_winning.open_mail': 'Open mail',
-        'rewards.ondo_campaign_winning.skip_for_now': 'Skip for now',
-        'rewards.ondo_campaign_winning.mail_subject':
-          'Ondo campaign prize claim',
-        'rewards.ondo_campaign_winning.mail_body': `My winning code: ${params?.code ?? ''}`,
-        'rewards.ondo_campaign_winning.winning_code': 'Winning code',
-        'rewards.ondo_campaign_winning.close_a11y': 'Close',
-        'rewards.ondo_campaign_winning.error_title':
-          'Could not load your winning code',
-        'rewards.ondo_campaign_winning.error_description':
-          'Something went wrong while fetching your code. Please try again later or contact support.',
-        'rewards.ondo_campaign_winning.error_retry': 'Try again',
-      };
-      if (key === 'rewards.ondo_campaign_winning.rank_label' && params?.place) {
-        return `${params.place} place`;
-      }
-      return map[key] ?? key;
-    },
-  ),
-}));
+const mockUseOutcome = useOndoCampaignParticipantOutcome as jest.MockedFunction<
+  typeof useOndoCampaignParticipantOutcome
+>;
+const mockUsePosition = useGetOndoLeaderboardPosition as jest.MockedFunction<
+  typeof useGetOndoLeaderboardPosition
+>;
+const mockCampaignWinningView = CampaignWinningView as jest.MockedFunction<
+  typeof CampaignWinningView
+>;
 
 describe('OndoCampaignWinningView', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    mockUseGetOndoLeaderboardPosition.mockReturnValue({
-      position: mockPosition,
-      isLoading: false,
-      hasError: false,
-      hasFetched: true,
-      refetch: jest.fn(),
-    });
-    mockUseOndoCampaignParticipantOutcome.mockReturnValue({
+    mockUseOutcome.mockReturnValue({
       outcome: {
         subscriptionId: 'sub-1',
         outcomeStatus: 'pending',
-        winnerVerificationCode: 'LVL346',
+        winnerVerificationCode: 'ONDO-WIN-99',
       },
       isLoading: false,
       hasError: false,
     });
+    mockUsePosition.mockReturnValue({
+      position: null,
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
   });
 
-  it('renders the main container', () => {
+  it('renders the container with the Ondo testID', () => {
     const { getByTestId } = render(<OndoCampaignWinningView />);
     expect(
       getByTestId(ONDO_CAMPAIGN_WINNING_VIEW_TEST_IDS.CONTAINER),
     ).toBeTruthy();
   });
 
-  it('shows you won, rank place, and rate from leaderboard position', () => {
-    const { getByText } = render(<OndoCampaignWinningView />);
-    expect(getByText('You won')).toBeTruthy();
-    expect(getByText('3rd place')).toBeTruthy();
-    expect(getByText('+28.23%')).toBeTruthy();
-  });
-
-  it('calls goBack when Skip for now is pressed', () => {
-    const { getByText } = render(<OndoCampaignWinningView />);
-    fireEvent.press(getByText('Skip for now'));
-    expect(mockGoBack).toHaveBeenCalledTimes(1);
-  });
-
-  it('calls goBack when close is pressed', () => {
-    const { getByLabelText } = render(<OndoCampaignWinningView />);
-    fireEvent.press(getByLabelText('Close'));
-    expect(mockGoBack).toHaveBeenCalledTimes(1);
-  });
-
-  it('copies referral code and tracks analytics when copy is triggered', () => {
-    const setStringSpy = jest.spyOn(Clipboard, 'setString');
-    const { getByTestId } = render(<OndoCampaignWinningView />);
-    fireEvent.press(getByTestId('copyable-trigger'));
-    expect(setStringSpy).toHaveBeenCalledWith('LVL346');
-    expect(mockTrackEvent).toHaveBeenCalled();
-  });
-
-  it('opens mailto when Open mail is pressed', async () => {
-    const openSpy = jest.spyOn(Linking, 'openURL').mockResolvedValue(undefined);
-    const { getByText } = render(<OndoCampaignWinningView />);
-    fireEvent.press(getByText('Open mail'));
-    expect(openSpy).toHaveBeenCalled();
-    const url = openSpy.mock.calls[0][0] as string;
-    expect(url).toContain('mailto:ondocampaign@consensys.net');
-    expect(url).toContain(encodeURIComponent('LVL346'));
-    openSpy.mockRestore();
-  });
-
-  describe('auto-redirect when user is not a winner', () => {
-    it('navigates to details view when outcome loaded but has no winner code', () => {
-      mockUseOndoCampaignParticipantOutcome.mockReturnValue({
-        outcome: {
-          subscriptionId: 'sub-1',
-          outcomeStatus: 'pending',
-          winnerVerificationCode: null,
-        },
-        isLoading: false,
-        hasError: false,
-      });
-      render(<OndoCampaignWinningView />);
-      expect(mockNavigate).toHaveBeenCalledWith(
-        Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW,
-        { campaignId: 'campaign-ondo-1' },
-      );
-    });
-
-    it('does not navigate while outcome is still loading', () => {
-      mockUseOndoCampaignParticipantOutcome.mockReturnValue({
-        outcome: null,
-        isLoading: true,
-        hasError: false,
-      });
-      render(<OndoCampaignWinningView />);
-      expect(mockNavigate).not.toHaveBeenCalled();
-    });
-
-    it('does not navigate when outcome is null after load', () => {
-      mockUseOndoCampaignParticipantOutcome.mockReturnValue({
-        outcome: null,
-        isLoading: false,
-        hasError: false,
-      });
-      render(<OndoCampaignWinningView />);
-      expect(mockNavigate).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('loading states', () => {
-    it('shows CopyableField once winning code has loaded', () => {
-      const { getByTestId } = render(<OndoCampaignWinningView />);
-      expect(getByTestId('copyable-field')).toBeTruthy();
-    });
-
-    it('shows the primary CTA in loading state while outcome is loading', () => {
-      mockUseOndoCampaignParticipantOutcome.mockReturnValue({
-        outcome: null,
-        isLoading: true,
-        hasError: false,
-      });
-      const openSpy = jest
-        .spyOn(Linking, 'openURL')
-        .mockResolvedValue(undefined);
-      const { getByText } = render(<OndoCampaignWinningView />);
-      fireEvent.press(getByText('Open mail'));
-      expect(openSpy).not.toHaveBeenCalled();
-      openSpy.mockRestore();
-    });
-
-    it('does not show the primary CTA in loading state once code has loaded', () => {
-      const openSpy = jest
-        .spyOn(Linking, 'openURL')
-        .mockResolvedValue(undefined);
-      const { getByText } = render(<OndoCampaignWinningView />);
-      fireEvent.press(getByText('Open mail'));
-      expect(openSpy).toHaveBeenCalledTimes(1);
-      openSpy.mockRestore();
-    });
-
-    it('hides rank and rate text while position is loading', () => {
-      mockUseGetOndoLeaderboardPosition.mockReturnValue({
-        position: null,
-        isLoading: true,
-        hasError: false,
-        hasFetched: false,
-        refetch: jest.fn(),
-      });
-      const { queryByText } = render(<OndoCampaignWinningView />);
-      expect(queryByText('3rd place')).toBeNull();
-      expect(queryByText('+28.23%')).toBeNull();
-    });
-  });
-
-  describe('error states', () => {
-    it('hides the rank/rate section entirely when position fails to load', () => {
-      mockUseGetOndoLeaderboardPosition.mockReturnValue({
-        position: null,
+  it('passes correct Ondo-specific props to CampaignWinningView', () => {
+    render(<OndoCampaignWinningView />);
+    expect(mockCampaignWinningView).toHaveBeenCalledWith(
+      expect.objectContaining({
+        testID: ONDO_CAMPAIGN_WINNING_VIEW_TEST_IDS.CONTAINER,
+        prizeEmail: 'ondocampaign@consensys.net',
+        campaignName: 'Ondo Campaign',
+        campaignId: 'campaign-ondo-1',
+        analyticsPageType: 'ondo_campaign_winning',
+        winningCode: 'ONDO-WIN-99',
+        hasOutcomeLoaded: true,
         isLoading: false,
-        hasError: true,
-        hasFetched: true,
-        refetch: jest.fn(),
-      });
-      const { queryByText } = render(<OndoCampaignWinningView />);
-      expect(queryByText('3rd place')).toBeNull();
-      expect(queryByText('+28.23%')).toBeNull();
-    });
-
-    it('hides the rank/rate section when position is null and not loading', () => {
-      mockUseGetOndoLeaderboardPosition.mockReturnValue({
-        position: null,
-        isLoading: false,
-        hasError: false,
-        hasFetched: true,
-        refetch: jest.fn(),
-      });
-      const { queryByText } = render(<OndoCampaignWinningView />);
-      expect(queryByText('3rd place')).toBeNull();
-      expect(queryByText('+28.23%')).toBeNull();
-    });
+        rankDisplay: null,
+        resultDisplay: null,
+        isRankLoading: false,
+        isResultLoading: false,
+        fallbackRoute: {
+          route: Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW,
+          params: { campaignId: 'campaign-ondo-1' },
+        },
+      }),
+      {},
+    );
   });
 
-  it('does not throw when mailto openURL rejects', async () => {
-    const openSpy = jest
-      .spyOn(Linking, 'openURL')
-      .mockRejectedValue(new Error('no mail app'));
-    const { getByText } = render(<OndoCampaignWinningView />);
-    await act(async () => {
-      fireEvent.press(getByText('Open mail'));
+  it('passes winningCode as null when outcome has no code', () => {
+    mockUseOutcome.mockReturnValue({
+      outcome: {
+        subscriptionId: 'sub-1',
+        outcomeStatus: 'finalized',
+        winnerVerificationCode: null,
+      },
+      isLoading: false,
+      hasError: false,
     });
-    expect(openSpy).toHaveBeenCalled();
-    openSpy.mockRestore();
+    render(<OndoCampaignWinningView />);
+    expect(mockCampaignWinningView).toHaveBeenCalledWith(
+      expect.objectContaining({
+        winningCode: null,
+        hasOutcomeLoaded: true,
+      }),
+      {},
+    );
   });
 
-  describe('mailto URL construction', () => {
-    it('appends the winning code to the mail subject', async () => {
-      const openSpy = jest
-        .spyOn(Linking, 'openURL')
-        .mockResolvedValue(undefined);
-      const { getByText } = render(<OndoCampaignWinningView />);
-      fireEvent.press(getByText('Open mail'));
-      const url = openSpy.mock.calls[0][0] as string;
-      expect(url).toContain(
-        encodeURIComponent('Ondo campaign prize claim - LVL346'),
-      );
-      openSpy.mockRestore();
-    });
-
-    it('uses base subject without code when winningCode is null', async () => {
-      mockUseOndoCampaignParticipantOutcome.mockReturnValue({
-        outcome: {
-          subscriptionId: 'sub-1',
-          outcomeStatus: 'pending',
-          winnerVerificationCode: null,
-        },
-        isLoading: false,
-        hasError: false,
-      });
-      const openSpy = jest
-        .spyOn(Linking, 'openURL')
-        .mockResolvedValue(undefined);
-      const { getByText } = render(<OndoCampaignWinningView />);
-      fireEvent.press(getByText('Open mail'));
-      const url = openSpy.mock.calls[0][0] as string;
-      expect(url).toContain(encodeURIComponent('Ondo campaign prize claim'));
-      expect(url).not.toContain(' - ');
-      openSpy.mockRestore();
+  it('does not mark outcome as loaded until the outcome exists', () => {
+    mockUseOutcome.mockReturnValue({
+      outcome: null,
+      isLoading: false,
+      hasError: false,
     });
+    render(<OndoCampaignWinningView />);
+    expect(mockCampaignWinningView).toHaveBeenCalledWith(
+      expect.objectContaining({
+        winningCode: null,
+        hasOutcomeLoaded: false,
+      }),
+      {},
+    );
   });
 
-  it('does not copy to clipboard when winning code is null', () => {
-    mockUseOndoCampaignParticipantOutcome.mockReturnValue({
+  it('passes rank and result display when position is available', () => {
+    mockUseOutcome.mockReturnValue({
       outcome: {
         subscriptionId: 'sub-1',
         outcomeStatus: 'pending',
-        winnerVerificationCode: null,
+        winnerVerificationCode: 'ONDO-WIN-99',
+        tierRank: 3,
       },
       isLoading: false,
       hasError: false,
     });
-    const setStringSpy = jest.spyOn(Clipboard, 'setString');
-    const { getByTestId } = render(<OndoCampaignWinningView />);
-    fireEvent.press(getByTestId('copyable-trigger'));
-    expect(setStringSpy).not.toHaveBeenCalled();
+    mockUsePosition.mockReturnValue({
+      position: { rank: 9, rateOfReturn: 0.1234 } as never,
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+
+    render(<OndoCampaignWinningView />);
+    expect(mockCampaignWinningView).toHaveBeenCalledWith(
+      expect.objectContaining({
+        rankDisplay: '3rd',
+        resultDisplay: '+12.34%',
+        isRankLoading: false,
+        isResultLoading: false,
+      }),
+      {},
+    );
   });
 });
diff --git a/app/components/UI/Rewards/Views/OndoCampaignWinningView.tsx b/app/components/UI/Rewards/Views/OndoCampaignWinningView.tsx
index 59b3434babe..7e40d530493 100644
--- a/app/components/UI/Rewards/Views/OndoCampaignWinningView.tsx
+++ b/app/components/UI/Rewards/Views/OndoCampaignWinningView.tsx
@@ -1,45 +1,13 @@
-import React, { useCallback, useEffect, useMemo } from 'react';
-import { Image, Linking, ScrollView, StyleSheet } from 'react-native';
-import Clipboard from '@react-native-clipboard/clipboard';
-import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
-import {
-  SafeAreaView,
-  useSafeAreaInsets,
-} from 'react-native-safe-area-context';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import {
-  Box,
-  BoxFlexDirection,
-  Button,
-  ButtonSize,
-  ButtonVariant,
-  ButtonIcon,
-  ButtonIconSize,
-  IconName,
-  Skeleton,
-  Text,
-  TextColor,
-  TextVariant,
-} from '@metamask/design-system-react-native';
-import ErrorBoundary from '../../../Views/ErrorBoundary';
-import useTrackRewardsPageView from '../hooks/useTrackRewardsPageView';
+import React, { useMemo } from 'react';
+import { useRoute, RouteProp } from '@react-navigation/native';
 import { useOndoCampaignParticipantOutcome } from '../hooks/useOndoCampaignParticipantOutcome';
-import Routes from '../../../../constants/navigation/Routes';
-import { strings } from '../../../../../locales/i18n';
-import CopyableField from '../components/ReferralDetails/CopyableField';
 import { formatOrdinalRank, formatPercentChange } from '../utils/formatUtils';
-import { RewardsMetricsButtons } from '../utils';
-import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
-import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { useGetOndoLeaderboardPosition } from '../hooks/useGetOndoLeaderboardPosition';
-import campaignWinningHero from '../../../../images/rewards/campaign_winning.png';
+import CampaignWinningView from './CampaignWinningView';
+import Routes from '../../../../constants/navigation/Routes';
 
 const PRIZE_EMAIL = 'ondocampaign@consensys.net';
 
-const styles = StyleSheet.create({
-  heroBox: { aspectRatio: 1 },
-});
-
 // ParamListBase requires an index signature, which interfaces don't support
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 type OndoCampaignWinningRouteParams = {
@@ -51,15 +19,11 @@ export const ONDO_CAMPAIGN_WINNING_VIEW_TEST_IDS = {
 } as const;
 
 const OndoCampaignWinningView: React.FC = () => {
-  const tw = useTailwind();
-  const insets = useSafeAreaInsets();
-  const navigation = useNavigation();
-  const { trackEvent, createEventBuilder } = useAnalytics();
   const route =
     useRoute<
       RouteProp<OndoCampaignWinningRouteParams, 'RewardsOndoCampaignWinning'>
     >();
-  const { campaignId } = route.params;
+  const { campaignId, campaignName = '' } = route.params;
 
   const { position, isLoading: positionLoading } =
     useGetOndoLeaderboardPosition(campaignId);
@@ -68,186 +32,41 @@ const OndoCampaignWinningView: React.FC = () => {
     useOndoCampaignParticipantOutcome(campaignId);
   const winningCode = outcome?.winnerVerificationCode ?? null;
 
-  useEffect(() => {
-    if (!isOutcomeLoading && outcome && !winningCode) {
-      navigation.navigate(Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW, {
-        campaignId,
-      });
-    }
-  }, [isOutcomeLoading, outcome, winningCode, campaignId, navigation]);
-
-  useTrackRewardsPageView({
-    page_type: 'ondo_campaign_winning',
-    campaign_id: campaignId,
-  });
-
-  const onDismiss = () => navigation.goBack();
-
-  const handleCopyWinningCode = useCallback(() => {
-    if (winningCode) {
-      Clipboard.setString(winningCode);
-      trackEvent(
-        createEventBuilder(MetaMetricsEvents.REWARDS_PAGE_BUTTON_CLICKED)
-          .addProperties({
-            button_type: RewardsMetricsButtons.COPY_REFERRAL_CODE,
-          })
-          .build(),
-      );
-    }
-  }, [winningCode, trackEvent, createEventBuilder]);
-
-  const handleOpenMail = useCallback(async () => {
-    const baseSubject = strings('rewards.ondo_campaign_winning.mail_subject');
-    const subject = winningCode
-      ? `${baseSubject} - ${winningCode}`
-      : baseSubject;
-    const body = strings('rewards.ondo_campaign_winning.mail_body', {
-      code: winningCode || '—',
-    });
-    const url = `mailto:${PRIZE_EMAIL}?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`;
-    try {
-      await Linking.openURL(url);
-    } catch {
-      // no-op: device may not have a mail handler
-    }
-  }, [winningCode]);
-
   const rankDisplay = useMemo(() => {
-    if (!position) return null;
-    return strings('rewards.ondo_campaign_winning.rank_label', {
-      place: formatOrdinalRank(position.rank),
-    });
-  }, [position]);
+    if (!outcome?.tierRank) return null;
+    return formatOrdinalRank(outcome.tierRank);
+  }, [outcome]);
 
-  const rateDisplay = useMemo(() => {
+  const resultDisplay = useMemo(() => {
     if (!position) return null;
     return formatPercentChange(position.rateOfReturn);
   }, [position]);
 
-  return (
-    <ErrorBoundary navigation={navigation} view="OndoCampaignWinningView">
-      <SafeAreaView
-        edges={['bottom']}
-        style={tw.style('flex-1 bg-default')}
-        testID={ONDO_CAMPAIGN_WINNING_VIEW_TEST_IDS.CONTAINER}
-      >
-        <ScrollView
-          style={tw.style('flex-1')}
-          contentContainerStyle={tw.style('grow pb-6 items-center')}
-          keyboardShouldPersistTaps="handled"
-        >
-          <Box
-            flexDirection={BoxFlexDirection.Column}
-            twClassName="relative w-full overflow-hidden"
-            style={styles.heroBox}
-          >
-            <Image
-              source={campaignWinningHero}
-              style={tw.style('absolute inset-0 h-full w-full')}
-              resizeMode="cover"
-              accessibilityIgnoresInvertColors
-            />
-            <Box
-              style={{ paddingTop: insets.top + 8 }}
-              twClassName="absolute right-4 top-0 z-10"
-            >
-              <ButtonIcon
-                iconName={IconName.Close}
-                size={ButtonIconSize.Md}
-                onPress={onDismiss}
-                accessibilityLabel={strings(
-                  'rewards.ondo_campaign_winning.close_a11y',
-                )}
-                twClassName="bg-default-muted rounded-full"
-              />
-            </Box>
-          </Box>
-
-          <Box
-            flexDirection={BoxFlexDirection.Column}
-            twClassName="w-full gap-6 items-center px-4"
-          >
-            <Text
-              variant={TextVariant.HeadingMd}
-              color={TextColor.TextAlternative}
-              twClassName="text-center"
-            >
-              {strings('rewards.ondo_campaign_winning.you_won')}
-            </Text>
-
-            {(positionLoading || position) && (
-              <Box
-                flexDirection={BoxFlexDirection.Column}
-                twClassName="items-center gap-1 w-full px-4"
-              >
-                {rankDisplay !== null ? (
-                  <Text
-                    variant={TextVariant.HeadingMd}
-                    color={TextColor.SuccessDefault}
-                    twClassName="text-center"
-                  >
-                    {rankDisplay}
-                  </Text>
-                ) : (
-                  <Skeleton style={tw.style('h-8 w-36 rounded-lg')} />
-                )}
-
-                {rateDisplay !== null ? (
-                  <Text
-                    variant={TextVariant.BodyMd}
-                    color={TextColor.SuccessDefault}
-                    twClassName="text-center"
-                  >
-                    {rateDisplay}
-                  </Text>
-                ) : (
-                  <Skeleton style={tw.style('h-6 w-28 rounded-lg')} />
-                )}
-              </Box>
-            )}
-
-            <Text
-              variant={TextVariant.BodySm}
-              color={TextColor.TextAlternative}
-              twClassName="text-center px-10"
-            >
-              {strings('rewards.ondo_campaign_winning.email_instructions')}
-            </Text>
-
-            <Box twClassName="w-full max-w-md">
-              <CopyableField
-                label={strings('rewards.ondo_campaign_winning.winning_code')}
-                value={winningCode}
-                valueLoading={isOutcomeLoading}
-                onCopy={handleCopyWinningCode}
-              />
-            </Box>
-
-            <Box twClassName="w-full max-w-md">
-              <Button
-                variant={ButtonVariant.Primary}
-                size={ButtonSize.Lg}
-                isFullWidth
-                isLoading={isOutcomeLoading && !winningCode}
-                onPress={handleOpenMail}
-              >
-                {strings('rewards.ondo_campaign_winning.open_mail')}
-              </Button>
-            </Box>
+  const fallbackRoute = useMemo(
+    () => ({
+      route: Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW,
+      params: { campaignId },
+    }),
+    [campaignId],
+  );
 
-            <Button
-              variant={ButtonVariant.Tertiary}
-              size={ButtonSize.Lg}
-              isFullWidth
-              textProps={{ color: TextColor.TextDefault }}
-              onPress={onDismiss}
-            >
-              {strings('rewards.ondo_campaign_winning.skip_for_now')}
-            </Button>
-          </Box>
-        </ScrollView>
-      </SafeAreaView>
-    </ErrorBoundary>
+  return (
+    <CampaignWinningView
+      testID={ONDO_CAMPAIGN_WINNING_VIEW_TEST_IDS.CONTAINER}
+      viewName="OndoCampaignWinningView"
+      prizeEmail={PRIZE_EMAIL}
+      campaignName={campaignName}
+      campaignId={campaignId}
+      analyticsPageType="ondo_campaign_winning"
+      winningCode={winningCode}
+      hasOutcomeLoaded={Boolean(outcome)}
+      isLoading={isOutcomeLoading}
+      rankDisplay={rankDisplay}
+      resultDisplay={resultDisplay}
+      isRankLoading={isOutcomeLoading}
+      isResultLoading={positionLoading}
+      fallbackRoute={fallbackRoute}
+    />
   );
 };
 
diff --git a/app/components/UI/Rewards/Views/OndoLeaderboardView.test.tsx b/app/components/UI/Rewards/Views/OndoLeaderboardView.test.tsx
index 98ff10ef4b7..00e2ed571e8 100644
--- a/app/components/UI/Rewards/Views/OndoLeaderboardView.test.tsx
+++ b/app/components/UI/Rewards/Views/OndoLeaderboardView.test.tsx
@@ -11,49 +11,31 @@ import { useGetOndoCampaignDeposits } from '../hooks/useGetOndoCampaignDeposits'
 import { useGetCampaignParticipantStatus } from '../hooks/useGetCampaignParticipantStatus';
 
 const mockGoBack = jest.fn();
+const mockNavigate = jest.fn();
 
 jest.mock('@react-navigation/native', () => ({
-  useNavigation: () => ({ goBack: mockGoBack }),
+  useNavigation: () => ({ goBack: mockGoBack, navigate: mockNavigate }),
   useRoute: () => ({ params: { campaignId: 'campaign-ondo-123' } }),
 }));
 
 jest.mock('@metamask/design-system-react-native', () => {
   const actual = jest.requireActual('@metamask/design-system-react-native');
-  return { ...actual };
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    ...actual,
+    Skeleton: ({ children }: { children?: React.ReactNode }) =>
+      ReactActual.createElement(View, { testID: 'skeleton' }, children),
+  };
 });
 
 jest.mock('@metamask/design-system-twrnc-preset', () => ({
-  useTailwind: () => ({ style: (...args: unknown[]) => args }),
-}));
-
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Text, Pressable } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({
-        title,
-        onBack,
-        backButtonProps,
-      }: {
-        title: string;
-        onBack: () => void;
-        backButtonProps?: { testID?: string };
-      }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header' },
-          ReactActual.createElement(Text, null, title),
-          ReactActual.createElement(Pressable, {
-            onPress: onBack,
-            testID: backButtonProps?.testID ?? 'header-back-button',
-          }),
-        ),
-    };
+  useTailwind: () => {
+    const tw = (...args: unknown[]) => args;
+    tw.style = (...args: unknown[]) => args;
+    return tw;
   },
-);
+}));
 
 jest.mock('react-redux', () => ({
   useSelector: jest.fn(),
@@ -76,6 +58,9 @@ const mockOndoLeaderboard = jest.fn();
 jest.mock('../components/Campaigns/OndoLeaderboard', () => {
   const ReactActual = jest.requireActual('react');
   const { View } = jest.requireActual('react-native');
+  const { CAMPAIGN_LEADERBOARD_TEST_IDS } = jest.requireActual<
+    typeof import('../components/Campaigns/OndoLeaderboard')
+  >('../components/Campaigns/OndoLeaderboard');
   return {
     __esModule: true,
     default: (props: Record<string, unknown>) => {
@@ -84,9 +69,15 @@ jest.mock('../components/Campaigns/OndoLeaderboard', () => {
         testID: 'campaign-leaderboard',
       });
     },
+    CAMPAIGN_LEADERBOARD_TEST_IDS,
   };
 });
 
+jest.mock('../utils/formatUtils', () => ({
+  ...jest.requireActual('../utils/formatUtils'),
+  formatRewardsTimeOnly: () => '12:00 PM',
+}));
+
 jest.mock('../components/Campaigns/OndoLeaderboard.utils', () => ({
   formatTierDisplayName: (tier: string) => tier,
   getTierMinNetDeposit: jest.fn(
@@ -97,8 +88,42 @@ jest.mock('../components/Campaigns/OndoLeaderboard.utils', () => ({
       tiers?.find((t: { name: string }) => t.name === name)?.minNetDeposit ??
       null,
   ),
+  getCampaignTierNames: (
+    campaign:
+      | { details?: { tiers?: { name: string }[] } | null }
+      | null
+      | undefined,
+  ) => campaign?.details?.tiers?.map((t: { name: string }) => t.name) ?? [],
+  buildLeaderboardUserPosition: (
+    position: {
+      projectedTier: string;
+      rank: number;
+      neighbors: unknown[];
+    } | null,
+  ) =>
+    position
+      ? {
+          projectedTier: position.projectedTier,
+          rank: position.rank,
+          neighbors: position.neighbors,
+        }
+      : null,
+}));
+
+// Mock Engine to prevent @metamask/assets-controller resolution chain
+jest.mock('../../../../core/Engine/Engine', () => ({
+  __esModule: true,
+  default: {
+    context: {},
+    controllerMessenger: {
+      subscribe: jest.fn(),
+      unsubscribe: jest.fn(),
+    },
+  },
 }));
 
+jest.mock('../../../hooks/useAnalytics/useAnalytics');
+
 jest.mock('../hooks/useGetOndoLeaderboard');
 jest.mock('../hooks/useGetOndoLeaderboardPosition');
 jest.mock('../hooks/useGetOndoPortfolioPosition');
@@ -217,6 +242,86 @@ describe('OndoLeaderboardView', () => {
     expect(getByTestId('campaign-leaderboard')).toBeDefined();
   });
 
+  it('passes hideTierHeader=true to OndoLeaderboard', () => {
+    render(<OndoLeaderboardView />);
+    expect(mockOndoLeaderboard).toHaveBeenCalledWith(
+      expect.objectContaining({ hideTierHeader: true }),
+    );
+  });
+
+  it('renders the tier selector row when selectedTier is set', () => {
+    const { getByTestId } = render(<OndoLeaderboardView />);
+    expect(
+      getByTestId(ONDO_LEADERBOARD_VIEW_TEST_IDS.TIER_SELECTOR),
+    ).toBeDefined();
+  });
+
+  it('does not render tier selector when selectedTier is null', () => {
+    mockUseGetOndoLeaderboard.mockReturnValue({
+      ...hookDefaults,
+      selectedTier: null,
+    });
+    const { queryByTestId } = render(<OndoLeaderboardView />);
+    expect(
+      queryByTestId(ONDO_LEADERBOARD_VIEW_TEST_IDS.TIER_SELECTOR),
+    ).toBeNull();
+  });
+
+  it('shows the last updated timestamp when computedAt is present', () => {
+    const { getByText } = render(<OndoLeaderboardView />);
+    expect(
+      getByText('rewards.ondo_campaign_leaderboard.updated_at'),
+    ).toBeDefined();
+  });
+
+  it('does not show the last updated timestamp when computedAt is null', () => {
+    mockUseGetOndoLeaderboard.mockReturnValue({
+      ...hookDefaults,
+      computedAt: null,
+    });
+    const { queryByText } = render(<OndoLeaderboardView />);
+    expect(
+      queryByText('rewards.ondo_campaign_leaderboard.updated_at'),
+    ).toBeNull();
+  });
+
+  it('opens the tier selector modal when the tier button is pressed with multiple tiers', () => {
+    const { getByTestId } = render(<OndoLeaderboardView />);
+    fireEvent.press(getByTestId(ONDO_LEADERBOARD_VIEW_TEST_IDS.TIER_SELECTOR));
+    expect(mockNavigate).toHaveBeenCalledWith(
+      expect.anything(),
+      expect.objectContaining({
+        selectedValue: 'STARTER',
+      }),
+    );
+  });
+
+  it('does not open the tier selector modal when only one tier exists', () => {
+    mockUseGetOndoLeaderboard.mockReturnValue({
+      ...hookDefaults,
+      selectedTier: 'STARTER',
+    });
+    mockUseSelector.mockImplementation((selector: (s: unknown) => unknown) =>
+      selector({
+        rewards: {
+          referralCode: null,
+          campaigns: [
+            {
+              ...mockCampaign,
+              details: {
+                ...mockCampaign.details,
+                tiers: [{ name: 'STARTER', minNetDeposit: 500 }],
+              },
+            },
+          ],
+        },
+      }),
+    );
+    const { getByTestId } = render(<OndoLeaderboardView />);
+    fireEvent.press(getByTestId(ONDO_LEADERBOARD_VIEW_TEST_IDS.TIER_SELECTOR));
+    expect(mockNavigate).not.toHaveBeenCalled();
+  });
+
   it('renders Your position section with rank and tier when position exists', () => {
     mockUseGetOndoLeaderboardPosition.mockReturnValue({
       ...positionDefaults,
@@ -360,6 +465,91 @@ describe('OndoLeaderboardView', () => {
     );
   });
 
+  const qualifiedPosition = {
+    rank: 5,
+    projectedTier: 'STARTER',
+    qualified: true,
+    qualifiedDays: 10,
+    totalInTier: 100,
+    rateOfReturn: 0.1,
+    currentUsdValue: 12500,
+    totalUsdDeposited: 10000,
+    netDeposit: 8500,
+    neighbors: [],
+    computedAt: '2024-01-01T00:00:00Z',
+  };
+
+  it('computes returnValue when portfolioData has a summary', () => {
+    mockUseGetCampaignParticipantStatus.mockReturnValue({
+      status: { optedIn: true, participantCount: 1 },
+      isLoading: false,
+      hasError: false,
+      refetch: jest.fn(),
+    });
+    mockUseGetOndoPortfolioPosition.mockReturnValue({
+      portfolio: {
+        positions: [],
+        computedAt: '2024-01-01T00:00:00Z',
+        summary: {
+          portfolioPnlPercent: '0.05',
+          totalCurrentValue: '12500',
+          totalBookValue: '12000',
+          totalUsdDeposited: '10000',
+          netDeposit: '10000',
+          totalCashedOut: '0',
+          portfolioPnl: '500',
+        },
+      },
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+    const { getByTestId } = render(<OndoLeaderboardView />);
+    expect(getByTestId(ONDO_LEADERBOARD_VIEW_TEST_IDS.CONTAINER)).toBeDefined();
+  });
+
+  it('uses empty entries and zero totalParticipants when selectedTierData is null', () => {
+    mockUseGetOndoLeaderboard.mockReturnValue({
+      ...hookDefaults,
+      selectedTierData: null,
+    });
+    render(<OndoLeaderboardView />);
+    expect(mockOndoLeaderboard).toHaveBeenCalledWith(
+      expect.objectContaining({ entries: [], totalParticipants: 0 }),
+    );
+  });
+
+  it('computes prizePoolValue when deposits are loaded', () => {
+    mockUseGetOndoLeaderboardPosition.mockReturnValue({
+      ...positionDefaults,
+      position: qualifiedPosition,
+    });
+    mockUseGetOndoCampaignDeposits.mockReturnValue({
+      deposits: { totalUsdDeposited: '5000' },
+      isLoading: false,
+      hasError: false,
+      refetch: jest.fn(),
+    });
+    const { getByTestId } = render(<OndoLeaderboardView />);
+    expect(getByTestId(ONDO_LEADERBOARD_VIEW_TEST_IDS.CONTAINER)).toBeDefined();
+  });
+
+  it('shows loading state for prize pool when deposits are being fetched', () => {
+    mockUseGetOndoLeaderboardPosition.mockReturnValue({
+      ...positionDefaults,
+      position: qualifiedPosition,
+    });
+    mockUseGetOndoCampaignDeposits.mockReturnValue({
+      deposits: null,
+      isLoading: true,
+      hasError: false,
+      refetch: jest.fn(),
+    });
+    const { getByTestId } = render(<OndoLeaderboardView />);
+    expect(getByTestId(ONDO_LEADERBOARD_VIEW_TEST_IDS.CONTAINER)).toBeDefined();
+  });
+
   describe('isCampaignComplete behavior', () => {
     const completeCampaign = {
       ...mockCampaign,
diff --git a/app/components/UI/Rewards/Views/OndoLeaderboardView.tsx b/app/components/UI/Rewards/Views/OndoLeaderboardView.tsx
index cb5b065c5d1..fd965e88005 100644
--- a/app/components/UI/Rewards/Views/OndoLeaderboardView.tsx
+++ b/app/components/UI/Rewards/Views/OndoLeaderboardView.tsx
@@ -1,8 +1,16 @@
-import React, { useMemo } from 'react';
-import { ScrollView } from 'react-native';
+import React, { useCallback, useMemo } from 'react';
+import { Pressable, ScrollView } from 'react-native';
 import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
 import {
   Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
   Text,
   TextColor,
   TextVariant,
@@ -10,20 +18,24 @@ import {
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useSelector } from 'react-redux';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
+import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
 import ErrorBoundary from '../../../Views/ErrorBoundary';
+import CampaignViewHeader from '../components/Campaigns/CampaignViewHeader';
 import OndoLeaderboard from '../components/Campaigns/OndoLeaderboard';
 import LeaderboardPositionHeader from '../components/Campaigns/LeaderboardPositionHeader';
-import { formatTierDisplayName } from '../components/Campaigns/OndoLeaderboard.utils';
+import {
+  buildLeaderboardUserPosition,
+  formatTierDisplayName,
+  getCampaignTierNames,
+} from '../components/Campaigns/OndoLeaderboard.utils';
+import { formatRewardsTimeOnly, formatUsd } from '../utils/formatUtils';
 import { useGetOndoLeaderboard } from '../hooks/useGetOndoLeaderboard';
 import { useGetOndoLeaderboardPosition } from '../hooks/useGetOndoLeaderboardPosition';
 import { useGetOndoPortfolioPosition } from '../hooks/useGetOndoPortfolioPosition';
 import { useGetOndoCampaignDeposits } from '../hooks/useGetOndoCampaignDeposits';
 import { useGetCampaignParticipantStatus } from '../hooks/useGetCampaignParticipantStatus';
-import { getCurrentPrize } from '../components/Campaigns/OndoPrizePool';
-import { formatPercentChange, formatUsd } from '../utils/formatUtils';
-import { isCampaignIneligible } from '../utils/ondoCampaignConstants';
-import { getCampaignStatus } from '../components/Campaigns/CampaignTile.utils';
+import { useOndoLeaderboardPositionDisplay } from '../hooks/useOndoLeaderboardPositionDisplay';
 import { strings } from '../../../../../locales/i18n';
 import Routes from '../../../../constants/navigation/Routes';
 import {
@@ -31,7 +43,8 @@ import {
   selectCampaignById,
 } from '../../../../reducers/rewards/selectors';
 import useTrackRewardsPageView from '../hooks/useTrackRewardsPageView';
-import { getCampaignMechanicsButtonProps } from '../utils/campaignHeaderUtils';
+import { computePrizePoolProgress } from '../utils/prizePoolUtils';
+import { BREAKPOINTS } from '../components/Campaigns/OndoPrizePool';
 
 // ParamListBase requires an index signature, which interfaces don't support
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
@@ -41,6 +54,7 @@ type OndoLeaderboardRouteParams = {
 
 export const ONDO_LEADERBOARD_VIEW_TEST_IDS = {
   CONTAINER: 'ondo-leaderboard-view-container',
+  TIER_SELECTOR: 'ondo-leaderboard-view-tier-selector',
 } as const;
 
 const OndoLeaderboardView: React.FC = () => {
@@ -55,6 +69,7 @@ const OndoLeaderboardView: React.FC = () => {
     [campaignId],
   );
   const campaign = useSelector(selectCampaign);
+  const { trackEvent, createEventBuilder } = useAnalytics();
 
   useTrackRewardsPageView({
     page_type: 'ondo_campaign_leaderboard',
@@ -74,29 +89,29 @@ const OndoLeaderboardView: React.FC = () => {
   const { deposits, isLoading: isDepositsLoading } =
     useGetOndoCampaignDeposits(campaignId);
 
-  const isCampaignComplete =
-    campaign != null && getCampaignStatus(campaign) === 'complete';
-
-  const isPending = position != null && !position.qualified;
-  const isQualified = position != null && position.qualified;
-
-  const isIneligible = useMemo(
-    () => isCampaignIneligible(campaign, position?.qualified),
-    [campaign, position],
-  );
-
-  const returnValue = portfolioData?.summary
-    ? formatPercentChange(portfolioData.summary.portfolioPnlPercent)
-    : undefined;
-
-  const returnColor = portfolioData?.summary
-    ? parseFloat(portfolioData.summary.portfolioPnlPercent) < 0
-      ? TextColor.ErrorDefault
-      : TextColor.SuccessDefault
-    : TextColor.TextDefault;
+  const {
+    isCampaignComplete,
+    isPending,
+    isQualified,
+    isIneligible,
+    rankValue,
+    tierValue,
+    returnValue,
+    returnColor,
+  } = useOndoLeaderboardPositionDisplay({
+    campaign,
+    position,
+    portfolioPnlPercent: portfolioData?.summary?.portfolioPnlPercent,
+  });
 
   const prizePoolValue = deposits?.totalUsdDeposited
-    ? formatUsd(getCurrentPrize(parseFloat(deposits.totalUsdDeposited)))
+    ? formatUsd(
+        computePrizePoolProgress(
+          BREAKPOINTS,
+          parseFloat(deposits.totalUsdDeposited),
+          (m) => m.deposit,
+        ).currentPrize,
+      )
     : undefined;
 
   const {
@@ -104,38 +119,55 @@ const OndoLeaderboardView: React.FC = () => {
     selectedTier,
     selectedTierData,
     setSelectedTier,
+    computedAt,
     isLoading: isLeaderboardLoading,
     hasError: hasLeaderboardError,
     isLeaderboardNotYetComputed,
+    computedAt: leaderboardComputedAt,
     refetch: refetchLeaderboard,
   } = useGetOndoLeaderboard(campaignId, {
     defaultTier: position?.projectedTier,
   });
 
-  const tierNames = useMemo(
-    () => campaign?.details?.tiers?.map((t) => t.name) ?? [],
-    [campaign],
-  );
+  const tierNames = useMemo(() => getCampaignTierNames(campaign), [campaign]);
 
-  const leaderboardUserPosition = useMemo(
+  const tierOptions = useMemo(
     () =>
-      position
-        ? {
-            projectedTier: position.projectedTier,
-            rank: position.rank,
-            neighbors: position.neighbors ?? [],
-          }
-        : null,
-    [position],
+      tierNames.map((name) => ({
+        key: name,
+        value: name,
+        label: formatTierDisplayName(name),
+      })),
+    [tierNames],
   );
 
-  const rankValue =
-    isIneligible || !position ? '-' : String(position.rank).padStart(2, '0');
+  const openTierSelector = useCallback(() => {
+    trackEvent(
+      createEventBuilder(MetaMetricsEvents.REWARDS_PAGE_BUTTON_CLICKED)
+        .addProperties({
+          button_type: 'ondo_campaign_leaderboard_tier_select',
+        })
+        .build(),
+    );
+    navigation.navigate(Routes.MODAL.REWARDS_SELECT_SHEET, {
+      title: strings('rewards.ondo_campaign_leaderboard.select_tier'),
+      options: tierOptions,
+      selectedValue: selectedTier,
+      onSelect: setSelectedTier,
+    });
+  }, [
+    navigation,
+    tierOptions,
+    selectedTier,
+    setSelectedTier,
+    trackEvent,
+    createEventBuilder,
+  ]);
 
-  const tierValue =
-    isIneligible || !position
-      ? '-'
-      : formatTierDisplayName(position.projectedTier);
+  const leaderboardUserPosition = useMemo(
+    () => buildLeaderboardUserPosition(position),
+    [position],
+  );
 
   return (
     <ErrorBoundary navigation={navigation} view="OndoLeaderboardView">
@@ -144,20 +176,12 @@ const OndoLeaderboardView: React.FC = () => {
         style={tw.style('flex-1 bg-default')}
         testID={ONDO_LEADERBOARD_VIEW_TEST_IDS.CONTAINER}
       >
-        <HeaderCompactStandard
+        <CampaignViewHeader
           title={strings('rewards.ondo_campaign_leaderboard.title')}
-          titleProps={{ variant: TextVariant.HeadingSm }}
-          onBack={() => navigation.goBack()}
-          backButtonProps={{ testID: 'ondo-leaderboard-back-button' }}
-          endButtonIconProps={getCampaignMechanicsButtonProps(
-            campaign != null,
-            () =>
-              navigation.navigate(Routes.REWARDS_CAMPAIGN_MECHANICS, {
-                campaignId,
-              }),
-            'leaderboard-mechanics-button',
-          )}
-          includesTopInset
+          backButtonTestID="ondo-leaderboard-back-button"
+          mechanicsButtonTestID="leaderboard-mechanics-button"
+          hasCampaign={campaign != null}
+          campaignId={campaignId}
         />
 
         <ScrollView
@@ -166,42 +190,89 @@ const OndoLeaderboardView: React.FC = () => {
         >
           {/* User position */}
           {position && (
-            <>
-              <Box twClassName="p-4">
-                <LeaderboardPositionHeader
-                  rank={rankValue}
-                  tier={tierValue}
-                  isLoading={isPositionLoading}
-                  isPending={!isCampaignComplete && isPending}
-                  isQualified={isQualified}
-                  isIneligible={!isCampaignComplete && isIneligible}
-                  showReturn
-                  returnValue={returnValue}
-                  returnColor={returnColor}
-                  showPrizePool
-                  prizePoolValue={prizePoolValue}
-                  prizePoolLoading={isDepositsLoading && !deposits}
-                />
-              </Box>
-              <Box twClassName="my-1 border-b border-border-muted" />
-            </>
+            <Box twClassName="p-4">
+              <LeaderboardPositionHeader
+                rank={rankValue}
+                tier={tierValue}
+                isLoading={isPositionLoading}
+                isPending={!isCampaignComplete && isPending}
+                isQualified={isQualified}
+                isIneligible={!isCampaignComplete && isIneligible}
+                showReturn
+                returnValue={returnValue}
+                returnColor={returnColor}
+                showPrizePool
+                prizePoolValue={prizePoolValue}
+                prizePoolLoading={isDepositsLoading && !deposits}
+              />
+            </Box>
           )}
+
+          {/* Divider */}
+          <Box twClassName="my-1 border-b border-border-muted" />
+
+          {/* Tier selector + last updated row */}
+          {selectedTier && (
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              justifyContent={BoxJustifyContent.Between}
+              twClassName="px-4 py-3"
+            >
+              <Pressable
+                onPress={tierNames.length > 1 ? openTierSelector : undefined}
+                testID={ONDO_LEADERBOARD_VIEW_TEST_IDS.TIER_SELECTOR}
+              >
+                <Box
+                  flexDirection={BoxFlexDirection.Row}
+                  alignItems={BoxAlignItems.Center}
+                  twClassName="border border-border-default rounded-full px-3 py-1 gap-1"
+                >
+                  <Text
+                    variant={TextVariant.BodySm}
+                    fontWeight={FontWeight.Medium}
+                  >
+                    {formatTierDisplayName(selectedTier)}
+                  </Text>
+                  {tierNames.length > 1 && (
+                    <Icon
+                      name={IconName.ArrowDown}
+                      size={IconSize.Xs}
+                      color={IconColor.IconDefault}
+                    />
+                  )}
+                </Box>
+              </Pressable>
+              {computedAt && (
+                <Text
+                  variant={TextVariant.BodySm}
+                  color={TextColor.TextAlternative}
+                >
+                  {strings('rewards.ondo_campaign_leaderboard.updated_at', {
+                    time: formatRewardsTimeOnly(new Date(computedAt)),
+                  })}
+                </Text>
+              )}
+            </Box>
+          )}
+
           {/* Full leaderboard */}
-          <Box twClassName="py-4">
+          <Box twClassName="pb-4">
             <OndoLeaderboard
               tierNames={tierNames}
               selectedTier={selectedTier}
               onTierChange={setSelectedTier}
+              currentUserReferralCode={referralCode}
               entries={selectedTierData?.entries ?? []}
               totalParticipants={selectedTierData?.totalParticipants ?? 0}
               isLoading={isLeaderboardLoading}
+              userPosition={leaderboardUserPosition}
               hasError={hasLeaderboardError}
               isLeaderboardNotYetComputed={isLeaderboardNotYetComputed}
               onRetry={refetchLeaderboard}
-              currentUserReferralCode={referralCode}
-              userPosition={leaderboardUserPosition}
               campaignId={campaignId}
               isCampaignComplete={isCampaignComplete}
+              hideTierHeader
             />
           </Box>
         </ScrollView>
diff --git a/app/components/UI/Rewards/Views/PerpsTradingCampaignDetailsView.test.tsx b/app/components/UI/Rewards/Views/PerpsTradingCampaignDetailsView.test.tsx
new file mode 100644
index 00000000000..5ab6a0e70aa
--- /dev/null
+++ b/app/components/UI/Rewards/Views/PerpsTradingCampaignDetailsView.test.tsx
@@ -0,0 +1,863 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import PerpsTradingCampaignDetailsView, {
+  PERPS_CAMPAIGN_DETAILS_TEST_IDS,
+  resetPerpsTradingCampaignDetailsSessionAutoNavigationForTests,
+} from './PerpsTradingCampaignDetailsView';
+import {
+  type CampaignDto,
+  CampaignType,
+  type PerpsTradingCampaignLeaderboardEntry,
+  type PerpsTradingCampaignLeaderboardPositionDto,
+  type PerpsTradingCampaignParticipantOutcomeDto,
+} from '../../../../core/Engine/controllers/rewards-controller/types';
+import { useRewardCampaigns } from '../hooks/useRewardCampaigns';
+import { useGetCampaignParticipantStatus } from '../hooks/useGetCampaignParticipantStatus';
+import { useGetPerpsTradingCampaignLeaderboard } from '../hooks/useGetPerpsTradingCampaignLeaderboard';
+import { useGetPerpsTradingCampaignLeaderboardPosition } from '../hooks/useGetPerpsTradingCampaignLeaderboardPosition';
+import { useGetPerpsTradingCampaignVolume } from '../hooks/useGetPerpsTradingCampaignVolume';
+import { usePerpsTradingCampaignParticipantOutcome } from '../hooks/usePerpsTradingCampaignParticipantOutcome';
+import Routes from '../../../../constants/navigation/Routes';
+
+const mockGoBack = jest.fn();
+const mockNavigate = jest.fn();
+
+const mockRouteState: { params: { campaignId?: string } } = {
+  params: { campaignId: 'perps-campaign-1' },
+};
+
+jest.mock('@react-navigation/native', () => ({
+  useFocusEffect: (callback: () => void) => callback(),
+  useNavigation: () => ({
+    goBack: mockGoBack,
+    navigate: mockNavigate,
+    addListener: jest.fn(() => jest.fn()),
+    isFocused: () => true,
+  }),
+  useRoute: () => mockRouteState,
+}));
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  const Skeleton = (props: Record<string, unknown>) =>
+    ReactActual.createElement(View, { testID: 'skeleton', ...props });
+  return { ...actual, Skeleton };
+});
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => {
+    const tw = () => ({});
+    tw.style = (..._args: unknown[]) => ({});
+    return tw;
+  },
+}));
+
+jest.mock(
+  '../../../../component-library/components-temp/HeaderCompactStandard',
+  () => {
+    const ReactActual = jest.requireActual('react');
+    const { View, Text, Pressable } = jest.requireActual('react-native');
+    return {
+      __esModule: true,
+      default: ({
+        title,
+        onBack,
+        endButtonIconProps,
+      }: {
+        title: string;
+        onBack: () => void;
+        endButtonIconProps?: { testID?: string; onPress?: () => void }[];
+      }) =>
+        ReactActual.createElement(
+          View,
+          { testID: 'header' },
+          ReactActual.createElement(Text, null, title),
+          ReactActual.createElement(Pressable, {
+            onPress: onBack,
+            testID: 'perps-details-back-button',
+          }),
+          ...(endButtonIconProps ?? []).map((btn, i) =>
+            ReactActual.createElement(Pressable, {
+              key: i,
+              onPress: btn.onPress,
+              testID: btn.testID ?? `end-button-${i}`,
+            }),
+          ),
+        ),
+    };
+  },
+);
+
+jest.mock('../../../Views/ErrorBoundary', () => {
+  const ReactActual = jest.requireActual('react');
+  return {
+    __esModule: true,
+    default: ({ children }: { children: React.ReactNode }) =>
+      ReactActual.createElement(ReactActual.Fragment, null, children),
+  };
+});
+
+jest.mock('react-native-safe-area-context', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    SafeAreaView: ({
+      children,
+      ...props
+    }: {
+      children: React.ReactNode;
+      testID?: string;
+      edges?: unknown;
+      style?: unknown;
+    }) => ReactActual.createElement(View, props, children),
+  };
+});
+
+jest.mock('../components/Campaigns/CampaignStatus', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View, Text } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ({ campaign }: { campaign: { name: string } }) =>
+      ReactActual.createElement(
+        View,
+        { testID: 'campaign-status' },
+        ReactActual.createElement(Text, null, campaign.name),
+      ),
+  };
+});
+
+jest.mock('../components/Campaigns/CampaignHowItWorks', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: () =>
+      ReactActual.createElement(View, { testID: 'campaign-how-it-works' }),
+  };
+});
+
+jest.mock('../components/Campaigns/CampaignOutcomeBanners', () => {
+  const ReactActual = jest.requireActual('react');
+  const { Pressable, Text } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    CampaignOutcomeBanner: ({
+      outcomeStatus,
+      winnerVerificationCode,
+      onWinnerPress,
+    }: {
+      outcomeStatus: string;
+      winnerVerificationCode: string | null | undefined;
+      onWinnerPress: () => void;
+    }) =>
+      ReactActual.createElement(
+        Pressable,
+        {
+          testID: `campaign-outcome-banner-${outcomeStatus}-${winnerVerificationCode ?? 'null'}`,
+          onPress: onWinnerPress,
+        },
+        ReactActual.createElement(Text, null, 'Campaign outcome'),
+      ),
+  };
+});
+
+jest.mock('../components/Campaigns/PerpsCampaignStatsSummary', () => {
+  const ReactActual = jest.requireActual('react');
+  const { Pressable, Text, View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ({
+      outcomeStatus,
+      winnerVerificationCode,
+      onWinnerPress,
+    }: {
+      outcomeStatus?: string;
+      winnerVerificationCode?: string | null;
+      onWinnerPress?: () => void;
+    }) =>
+      ReactActual.createElement(
+        View,
+        {
+          testID: 'perps-campaign-stats-summary-container',
+        },
+        outcomeStatus &&
+          onWinnerPress &&
+          ReactActual.createElement(
+            Pressable,
+            {
+              testID: `campaign-outcome-banner-${outcomeStatus}-${winnerVerificationCode ?? 'null'}`,
+              onPress: onWinnerPress,
+            },
+            ReactActual.createElement(Text, null, 'Campaign outcome'),
+          ),
+      ),
+  };
+});
+
+jest.mock('../components/Campaigns/PerpsTradingCampaignPrizePool', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: () =>
+      ReactActual.createElement(View, { testID: 'perps-prize-pool' }),
+  };
+});
+
+jest.mock('../components/Campaigns/PerpsTradingCampaignEndedStats', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: () =>
+      ReactActual.createElement(View, {
+        testID: 'perps-campaign-ended-stats',
+      }),
+  };
+});
+
+jest.mock('../components/Campaigns/PerpsTradingCampaignLeaderboard', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS: {
+      TOTAL_PARTICIPANTS: 'perps-campaign-leaderboard-total-participants',
+    },
+    default: () =>
+      ReactActual.createElement(View, { testID: 'perps-leaderboard' }),
+  };
+});
+
+jest.mock('../components/Campaigns/PerpsTradingCampaignCTA', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  const { getCampaignStatus } = jest.requireActual(
+    '../components/Campaigns/CampaignTile.utils',
+  ) as typeof import('../components/Campaigns/CampaignTile.utils');
+  return {
+    __esModule: true,
+    default: ({ campaign }: { campaign: CampaignDto }) =>
+      getCampaignStatus(campaign) === 'complete'
+        ? null
+        : ReactActual.createElement(View, { testID: 'perps-trading-cta' }),
+  };
+});
+
+jest.mock('../components/RewardsErrorBanner', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View, Text, Pressable } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ({
+      title,
+      onConfirm,
+      confirmButtonLabel,
+    }: {
+      title: string;
+      description: string;
+      onConfirm?: () => void;
+      confirmButtonLabel?: string;
+    }) =>
+      ReactActual.createElement(
+        View,
+        { testID: 'campaigns-load-error-banner' },
+        ReactActual.createElement(Text, null, title),
+        confirmButtonLabel &&
+          ReactActual.createElement(
+            Pressable,
+            { onPress: onConfirm, testID: 'campaigns-error-retry' },
+            ReactActual.createElement(Text, null, confirmButtonLabel),
+          ),
+      ),
+  };
+});
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../hooks/useRewardCampaigns');
+const mockUseRewardCampaigns = useRewardCampaigns as jest.MockedFunction<
+  typeof useRewardCampaigns
+>;
+
+jest.mock('../hooks/useGetCampaignParticipantStatus');
+const mockUseGetCampaignParticipantStatus =
+  useGetCampaignParticipantStatus as jest.MockedFunction<
+    typeof useGetCampaignParticipantStatus
+  >;
+
+jest.mock('../hooks/useGetPerpsTradingCampaignLeaderboard');
+const mockUseGetPerpsTradingCampaignLeaderboard =
+  useGetPerpsTradingCampaignLeaderboard as jest.MockedFunction<
+    typeof useGetPerpsTradingCampaignLeaderboard
+  >;
+
+jest.mock('../hooks/useGetPerpsTradingCampaignLeaderboardPosition');
+const mockUseGetPerpsTradingCampaignLeaderboardPosition =
+  useGetPerpsTradingCampaignLeaderboardPosition as jest.MockedFunction<
+    typeof useGetPerpsTradingCampaignLeaderboardPosition
+  >;
+
+jest.mock('../hooks/useGetPerpsTradingCampaignVolume');
+const mockUseGetPerpsTradingCampaignVolume =
+  useGetPerpsTradingCampaignVolume as jest.MockedFunction<
+    typeof useGetPerpsTradingCampaignVolume
+  >;
+
+jest.mock('../hooks/usePerpsTradingCampaignParticipantOutcome');
+const mockUsePerpsTradingCampaignParticipantOutcome =
+  usePerpsTradingCampaignParticipantOutcome as jest.MockedFunction<
+    typeof usePerpsTradingCampaignParticipantOutcome
+  >;
+
+import { useSelector } from 'react-redux';
+import { selectReferralCode } from '../../../../reducers/rewards/selectors';
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+
+const mockFetchCampaigns = jest.fn();
+
+function buildPerpsCampaign(overrides: Partial<CampaignDto> = {}): CampaignDto {
+  return {
+    id: 'perps-campaign-1',
+    type: CampaignType.PERPS_TRADING,
+    name: 'Perps Trading',
+    startDate: '2025-06-01T00:00:00.000Z',
+    endDate: '2026-12-31T23:59:59.999Z',
+    termsAndConditions: null,
+    excludedRegions: [],
+    details: null,
+    featured: true,
+    showUpcomingDate: false,
+    ...overrides,
+  };
+}
+
+function toMockLeaderboardPosition(
+  position: { rank: number; neighbors: unknown[] } | null,
+): PerpsTradingCampaignLeaderboardPositionDto | null {
+  if (!position) {
+    return null;
+  }
+  return {
+    rank: position.rank,
+    pnl: 0,
+    notionalVolume: 0,
+    marginDeployed: 0,
+    qualified: true,
+    neighbors: position.neighbors as PerpsTradingCampaignLeaderboardEntry[],
+    computedAt: '2025-08-15T12:00:00.000Z',
+  };
+}
+
+const defaultLeaderboardHook = {
+  leaderboard: {
+    campaignId: 'perps-campaign-1',
+    entries: [],
+    totalParticipants: 0,
+    computedAt: '2025-08-15T12:00:00.000Z',
+  },
+  isLoading: false,
+  hasError: false,
+  isLeaderboardNotYetComputed: false,
+  refetch: jest.fn(),
+};
+
+const defaultVolumeHook = {
+  volume: {
+    totalUsdVolume: '1000000',
+  },
+  isLoading: false,
+  hasError: false,
+  refetch: jest.fn(),
+};
+
+function setupHooks(
+  overrides: {
+    campaigns?: CampaignDto[];
+    isCampaignsLoading?: boolean;
+    hasCampaignsError?: boolean;
+    participant?: { optedIn: boolean };
+    position?: { rank: number; neighbors: unknown[] } | null;
+    isPositionLoading?: boolean;
+    totalParticipants?: number;
+    outcome?: PerpsTradingCampaignParticipantOutcomeDto | null;
+  } = {},
+) {
+  const {
+    campaigns = [buildPerpsCampaign()],
+    isCampaignsLoading = false,
+    hasCampaignsError = false,
+    participant = { optedIn: false },
+    position = null,
+    isPositionLoading = false,
+    totalParticipants: totalParticipantsOverride,
+    outcome = null,
+  } = overrides;
+
+  mockUseRewardCampaigns.mockReturnValue({
+    campaigns,
+    isLoading: isCampaignsLoading,
+    hasError: hasCampaignsError,
+    fetchCampaigns: mockFetchCampaigns,
+    categorizedCampaigns: { active: [], upcoming: [], previous: [] },
+    hasLoaded: true,
+  } as ReturnType<typeof useRewardCampaigns>);
+
+  mockUseGetCampaignParticipantStatus.mockReturnValue({
+    status: {
+      optedIn: participant.optedIn,
+      participantCount: 0,
+    },
+    isLoading: false,
+    hasError: false,
+    refetch: jest.fn(),
+  } as ReturnType<typeof useGetCampaignParticipantStatus>);
+
+  const leaderboard = {
+    ...defaultLeaderboardHook.leaderboard,
+    ...(totalParticipantsOverride !== undefined
+      ? { totalParticipants: totalParticipantsOverride }
+      : {}),
+  };
+
+  mockUseGetPerpsTradingCampaignLeaderboard.mockReturnValue({
+    ...defaultLeaderboardHook,
+    leaderboard,
+  } as ReturnType<typeof useGetPerpsTradingCampaignLeaderboard>);
+
+  mockUseGetPerpsTradingCampaignLeaderboardPosition.mockReturnValue({
+    position: toMockLeaderboardPosition(position),
+    isLoading: isPositionLoading,
+    hasError: false,
+    hasFetched: true,
+    refetch: jest.fn(),
+  } as ReturnType<typeof useGetPerpsTradingCampaignLeaderboardPosition>);
+
+  mockUseGetPerpsTradingCampaignVolume.mockReturnValue({
+    ...defaultVolumeHook,
+  } as ReturnType<typeof useGetPerpsTradingCampaignVolume>);
+
+  mockUsePerpsTradingCampaignParticipantOutcome.mockReturnValue({
+    outcome,
+    isLoading: false,
+    hasError: false,
+  } as ReturnType<typeof usePerpsTradingCampaignParticipantOutcome>);
+}
+
+jest.mock('../../../../../locales/i18n', () => ({
+  strings: (key: string, params?: { count?: string }) => {
+    if (
+      key === 'rewards.perps_trading_campaign.leaderboard_total_participants' &&
+      params?.count !== undefined
+    ) {
+      return `${params.count} participants`;
+    }
+    const map: Record<string, string> = {
+      'rewards.perps_trading_campaign.title': 'Perps Trading',
+      'rewards.perps_trading_campaign.stats_title': 'Stats',
+      'rewards.perps_trading_campaign.prize_pool_title': 'Prize pool',
+      'rewards.perps_trading_campaign.leaderboard_title': 'Leaderboard',
+      'rewards.campaigns_view.error_title': 'Error',
+      'rewards.campaigns_view.error_description': 'Try again',
+      'rewards.campaigns_view.retry_button': 'Retry',
+    };
+    return map[key] ?? key;
+  },
+}));
+
+describe('PerpsTradingCampaignDetailsView', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+    jest.setSystemTime(new Date('2025-08-15T12:00:00.000Z'));
+    jest.clearAllMocks();
+    resetPerpsTradingCampaignDetailsSessionAutoNavigationForTests();
+    mockRouteState.params = { campaignId: 'perps-campaign-1' };
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectReferralCode) {
+        return 'ref-code';
+      }
+      return undefined;
+    });
+    setupHooks();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('renders skeletons while campaigns load and no campaign resolved', () => {
+    setupHooks({ campaigns: [], isCampaignsLoading: true });
+    const { getAllByTestId, queryByTestId } = render(
+      <PerpsTradingCampaignDetailsView />,
+    );
+
+    expect(getAllByTestId('skeleton').length).toBeGreaterThanOrEqual(2);
+    expect(queryByTestId('campaign-status')).toBeNull();
+  });
+
+  it('renders campaigns error banner and retries fetchCampaigns', () => {
+    setupHooks({
+      campaigns: [],
+      isCampaignsLoading: false,
+      hasCampaignsError: true,
+    });
+    const { getByTestId } = render(<PerpsTradingCampaignDetailsView />);
+
+    fireEvent.press(getByTestId('campaigns-error-retry'));
+    expect(mockFetchCampaigns).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders header, campaign status, prize pool, leaderboard, and CTA for active opted-in campaign', () => {
+    setupHooks({ participant: { optedIn: true } });
+
+    const { getByTestId } = render(<PerpsTradingCampaignDetailsView />);
+
+    expect(
+      getByTestId(PERPS_CAMPAIGN_DETAILS_TEST_IDS.CONTAINER),
+    ).toBeDefined();
+    expect(getByTestId('header')).toBeDefined();
+    expect(getByTestId('campaign-status')).toBeDefined();
+    expect(getByTestId('perps-prize-pool')).toBeDefined();
+    expect(getByTestId('perps-leaderboard')).toBeDefined();
+    expect(getByTestId('perps-trading-cta')).toBeDefined();
+  });
+
+  it('shows the prize pool section for active non-opted-in users', () => {
+    const { getByTestId } = render(<PerpsTradingCampaignDetailsView />);
+    expect(getByTestId('perps-prize-pool')).toBeDefined();
+  });
+
+  it('hides How it works when the user is opted in and has a leaderboard position', () => {
+    setupHooks({
+      campaigns: [
+        buildPerpsCampaign({
+          details: {
+            howItWorks: {
+              title: 'How it works',
+              description: 'Test description',
+              steps: [],
+            },
+          },
+        }),
+      ],
+      participant: { optedIn: true },
+      position: { rank: 5, neighbors: [] },
+    });
+
+    const { queryByTestId } = render(<PerpsTradingCampaignDetailsView />);
+    expect(queryByTestId('campaign-how-it-works')).toBeNull();
+  });
+
+  it('shows How it works when opted in, no position, and position not loading', () => {
+    setupHooks({
+      campaigns: [
+        buildPerpsCampaign({
+          details: {
+            howItWorks: {
+              title: 'How it works',
+              description: 'Test description',
+              steps: [],
+            },
+          },
+        }),
+      ],
+      participant: { optedIn: true },
+      position: null,
+    });
+
+    const { getByTestId } = render(<PerpsTradingCampaignDetailsView />);
+    expect(getByTestId('campaign-how-it-works')).toBeDefined();
+  });
+
+  it('hides How it works while the leaderboard position is still loading for an opted-in user', () => {
+    setupHooks({
+      campaigns: [
+        buildPerpsCampaign({
+          details: {
+            howItWorks: {
+              title: 'How it works',
+              description: 'Test description',
+              steps: [],
+            },
+          },
+        }),
+      ],
+      participant: { optedIn: true },
+      position: null,
+      isPositionLoading: true,
+    });
+
+    const { queryByTestId } = render(<PerpsTradingCampaignDetailsView />);
+    expect(queryByTestId('campaign-how-it-works')).toBeNull();
+  });
+
+  it('shows How it works when active, user is not opted in, and details include howItWorks', () => {
+    setupHooks({
+      campaigns: [
+        buildPerpsCampaign({
+          details: {
+            howItWorks: {
+              title: 'How it works',
+              description: 'Test description',
+              steps: [],
+            },
+          },
+        }),
+      ],
+    });
+
+    const { getByTestId } = render(<PerpsTradingCampaignDetailsView />);
+    expect(getByTestId('campaign-how-it-works')).toBeDefined();
+  });
+
+  it('shows stats header when user has a leaderboard position', () => {
+    setupHooks({
+      participant: { optedIn: true },
+      position: { rank: 3, neighbors: [] },
+    });
+
+    const { getByTestId } = render(<PerpsTradingCampaignDetailsView />);
+    expect(getByTestId('perps-campaign-stats-summary-container')).toBeDefined();
+  });
+
+  it('navigates to stats when stats header row is pressed and user has a position', () => {
+    setupHooks({
+      participant: { optedIn: true },
+      position: { rank: 2, neighbors: [] },
+    });
+
+    const { getByText } = render(<PerpsTradingCampaignDetailsView />);
+
+    fireEvent.press(getByText('Stats'));
+    expect(mockNavigate).toHaveBeenCalledWith(
+      Routes.REWARDS_PERPS_TRADING_CAMPAIGN_STATS,
+      { campaignId: 'perps-campaign-1' },
+    );
+  });
+
+  it('navigates to full leaderboard and mechanics help', () => {
+    const { getByText, getByTestId } = render(
+      <PerpsTradingCampaignDetailsView />,
+    );
+
+    fireEvent.press(getByText('Leaderboard'));
+    expect(mockNavigate).toHaveBeenCalledWith(
+      Routes.REWARDS_PERPS_TRADING_CAMPAIGN_LEADERBOARD,
+      { campaignId: 'perps-campaign-1' },
+    );
+
+    fireEvent.press(getByTestId('perps-details-mechanics-button'));
+    expect(mockNavigate).toHaveBeenCalledWith(
+      Routes.REWARDS_CAMPAIGN_MECHANICS,
+      { campaignId: 'perps-campaign-1' },
+    );
+  });
+
+  it('complete campaign for non-opted-in user shows leaderboard, prize pool, and ended stats and hides CTA', () => {
+    setupHooks({
+      campaigns: [
+        buildPerpsCampaign({
+          startDate: '2024-01-01T00:00:00.000Z',
+          endDate: '2025-01-01T00:00:00.000Z',
+        }),
+      ],
+    });
+
+    const { getByTestId, queryByTestId } = render(
+      <PerpsTradingCampaignDetailsView />,
+    );
+
+    expect(getByTestId('perps-leaderboard')).toBeDefined();
+    expect(queryByTestId('perps-campaign-stats-summary-container')).toBeNull();
+    expect(getByTestId('perps-prize-pool')).toBeDefined();
+    expect(getByTestId('perps-campaign-ended-stats')).toBeDefined();
+    expect(queryByTestId('perps-trading-cta')).toBeNull();
+  });
+
+  it('complete campaign for opted-in user (no leaderboard position) shows ended stats and prize pool', () => {
+    setupHooks({
+      campaigns: [
+        buildPerpsCampaign({
+          startDate: '2024-01-01T00:00:00.000Z',
+          endDate: '2025-01-01T00:00:00.000Z',
+        }),
+      ],
+      participant: { optedIn: true },
+      position: null,
+    });
+
+    const { getByTestId, queryByTestId } = render(
+      <PerpsTradingCampaignDetailsView />,
+    );
+
+    expect(getByTestId('perps-campaign-ended-stats')).toBeDefined();
+    expect(getByTestId('perps-prize-pool')).toBeDefined();
+    expect(queryByTestId('perps-campaign-stats-summary-container')).toBeNull();
+  });
+
+  it('shows outcome banner for completed opted-in participants and navigates winners to winning view', () => {
+    setupHooks({
+      campaigns: [
+        buildPerpsCampaign({
+          startDate: '2024-01-01T00:00:00.000Z',
+          endDate: '2025-01-01T00:00:00.000Z',
+        }),
+      ],
+      participant: { optedIn: true },
+      position: { rank: 3, neighbors: [] },
+      outcome: {
+        subscriptionId: 'subscription-id',
+        outcomeStatus: 'pending',
+        winnerVerificationCode: 'PERPS-WINNER-123',
+        rank: 3,
+      },
+    });
+
+    const { getByTestId } = render(<PerpsTradingCampaignDetailsView />);
+
+    fireEvent.press(
+      getByTestId('campaign-outcome-banner-pending-PERPS-WINNER-123'),
+    );
+    expect(mockNavigate).toHaveBeenCalledWith(
+      Routes.REWARDS_PERPS_TRADING_CAMPAIGN_WINNING_VIEW,
+      {
+        campaignId: 'perps-campaign-1',
+        campaignName: 'Perps Trading',
+      },
+    );
+  });
+
+  it('auto-navigates once to winning view for a completed pending winner outcome', () => {
+    setupHooks({
+      campaigns: [
+        buildPerpsCampaign({
+          startDate: '2024-01-01T00:00:00.000Z',
+          endDate: '2025-01-01T00:00:00.000Z',
+        }),
+      ],
+      participant: { optedIn: true },
+      position: { rank: 3, neighbors: [] },
+      outcome: {
+        subscriptionId: 'subscription-id',
+        outcomeStatus: 'pending',
+        winnerVerificationCode: 'PERPS-WINNER-123',
+        rank: 3,
+      },
+    });
+
+    const { rerender } = render(<PerpsTradingCampaignDetailsView />);
+
+    expect(mockNavigate).toHaveBeenCalledWith(
+      Routes.REWARDS_PERPS_TRADING_CAMPAIGN_WINNING_VIEW,
+      {
+        campaignId: 'perps-campaign-1',
+        campaignName: 'Perps Trading',
+      },
+    );
+
+    mockNavigate.mockClear();
+    rerender(<PerpsTradingCampaignDetailsView />);
+    expect(mockNavigate).not.toHaveBeenCalled();
+  });
+
+  it('does not auto-navigate for finalized outcomes', () => {
+    setupHooks({
+      campaigns: [
+        buildPerpsCampaign({
+          startDate: '2024-01-01T00:00:00.000Z',
+          endDate: '2025-01-01T00:00:00.000Z',
+        }),
+      ],
+      participant: { optedIn: true },
+      position: { rank: 3, neighbors: [] },
+      outcome: {
+        subscriptionId: 'subscription-id',
+        outcomeStatus: 'finalized',
+        winnerVerificationCode: 'PERPS-WINNER-123',
+        rank: 3,
+      },
+    });
+
+    render(<PerpsTradingCampaignDetailsView />);
+
+    expect(mockNavigate).not.toHaveBeenCalledWith(
+      Routes.REWARDS_PERPS_TRADING_CAMPAIGN_WINNING_VIEW,
+      expect.any(Object),
+    );
+  });
+
+  it('shows outcome banner inside the ended stats section for opted-in users with no leaderboard position', () => {
+    setupHooks({
+      campaigns: [
+        buildPerpsCampaign({
+          startDate: '2024-01-01T00:00:00.000Z',
+          endDate: '2025-01-01T00:00:00.000Z',
+        }),
+      ],
+      participant: { optedIn: true },
+      position: null,
+      outcome: {
+        subscriptionId: 'subscription-id',
+        outcomeStatus: 'finalized',
+        winnerVerificationCode: null,
+      },
+    });
+
+    const { getByTestId, queryByTestId } = render(
+      <PerpsTradingCampaignDetailsView />,
+    );
+
+    expect(queryByTestId('perps-campaign-stats-summary-container')).toBeNull();
+    expect(getByTestId('perps-campaign-ended-stats')).toBeDefined();
+    expect(getByTestId('campaign-outcome-banner-finalized-null')).toBeDefined();
+  });
+
+  it('displays total participant count when the leaderboard reports participants', () => {
+    setupHooks({ totalParticipants: 1500 });
+
+    const { getByText, getByTestId } = render(
+      <PerpsTradingCampaignDetailsView />,
+    );
+
+    expect(
+      getByTestId('perps-campaign-leaderboard-total-participants'),
+    ).toBeDefined();
+    expect(getByText('1,500 participants')).toBeDefined();
+  });
+
+  it('hides the prize pool section for upcoming campaigns', () => {
+    setupHooks({
+      campaigns: [
+        buildPerpsCampaign({
+          startDate: '2026-01-01T00:00:00.000Z',
+          endDate: '2027-12-31T23:59:59.999Z',
+        }),
+      ],
+    });
+
+    const { queryByTestId } = render(<PerpsTradingCampaignDetailsView />);
+    expect(queryByTestId('perps-prize-pool')).toBeNull();
+  });
+
+  it('resolves campaign by PERPS_TRADING type when route has no campaignId', () => {
+    mockRouteState.params = {};
+    setupHooks({
+      campaigns: [buildPerpsCampaign({ id: 'resolved-by-type' })],
+    });
+
+    const { getByTestId } = render(<PerpsTradingCampaignDetailsView />);
+    expect(getByTestId('campaign-status')).toBeDefined();
+
+    fireEvent.press(getByTestId('perps-details-mechanics-button'));
+    expect(mockNavigate).toHaveBeenCalledWith(
+      Routes.REWARDS_CAMPAIGN_MECHANICS,
+      { campaignId: 'resolved-by-type' },
+    );
+  });
+});
diff --git a/app/components/UI/Rewards/Views/PerpsTradingCampaignDetailsView.tsx b/app/components/UI/Rewards/Views/PerpsTradingCampaignDetailsView.tsx
new file mode 100644
index 00000000000..14032c9d1db
--- /dev/null
+++ b/app/components/UI/Rewards/Views/PerpsTradingCampaignDetailsView.tsx
@@ -0,0 +1,458 @@
+import React, { useCallback, useMemo } from 'react';
+import { Pressable, ScrollView } from 'react-native';
+import {
+  useFocusEffect,
+  useNavigation,
+  useRoute,
+  RouteProp,
+} from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Skeleton,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { SafeAreaView } from 'react-native-safe-area-context';
+import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
+import ErrorBoundary from '../../../Views/ErrorBoundary';
+import CampaignStatus from '../components/Campaigns/CampaignStatus';
+import CampaignHowItWorks from '../components/Campaigns/CampaignHowItWorks';
+import PerpsTradingCampaignLeaderboard, {
+  PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS,
+} from '../components/Campaigns/PerpsTradingCampaignLeaderboard';
+import PerpsTradingCampaignPrizePool from '../components/Campaigns/PerpsTradingCampaignPrizePool';
+import PerpsTradingCampaignCTA from '../components/Campaigns/PerpsTradingCampaignCTA';
+import PerpsCampaignStatsSummary from '../components/Campaigns/PerpsCampaignStatsSummary';
+import PerpsTradingCampaignEndedStats from '../components/Campaigns/PerpsTradingCampaignEndedStats';
+import { CampaignOutcomeBanner } from '../components/Campaigns/CampaignOutcomeBanners';
+import { getCampaignStatus } from '../components/Campaigns/CampaignTile.utils';
+import { useGetCampaignParticipantStatus } from '../hooks/useGetCampaignParticipantStatus';
+import { useGetPerpsTradingCampaignLeaderboard } from '../hooks/useGetPerpsTradingCampaignLeaderboard';
+import { useGetPerpsTradingCampaignLeaderboardPosition } from '../hooks/useGetPerpsTradingCampaignLeaderboardPosition';
+import { useGetPerpsTradingCampaignVolume } from '../hooks/useGetPerpsTradingCampaignVolume';
+import { usePerpsTradingCampaignParticipantOutcome } from '../hooks/usePerpsTradingCampaignParticipantOutcome';
+import { useRewardCampaigns } from '../hooks/useRewardCampaigns';
+import { strings } from '../../../../../locales/i18n';
+import Routes from '../../../../constants/navigation/Routes';
+import {
+  CampaignType,
+  OndoCampaignHowItWorks,
+} from '../../../../core/Engine/controllers/rewards-controller/types';
+import { selectReferralCode } from '../../../../reducers/rewards/selectors';
+import { getCampaignMechanicsButtonProps } from '../utils/campaignHeaderUtils';
+import RewardsErrorBanner from '../components/RewardsErrorBanner';
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+type PerpsTradingCampaignDetailsRouteParams = {
+  RewardsPerpsTradingCampaignDetails: { campaignId?: string };
+};
+
+export const PERPS_CAMPAIGN_DETAILS_TEST_IDS = {
+  CONTAINER: 'perps-campaign-details-container',
+} as const;
+
+const sessionWinningViewAutoNavCampaignIds = new Set<string>();
+export function resetPerpsTradingCampaignDetailsSessionAutoNavigationForTests(): void {
+  sessionWinningViewAutoNavCampaignIds.clear();
+}
+
+const PerpsTradingCampaignDetailsView: React.FC = () => {
+  const tw = useTailwind();
+  const navigation = useNavigation();
+  const route =
+    useRoute<
+      RouteProp<
+        PerpsTradingCampaignDetailsRouteParams,
+        'RewardsPerpsTradingCampaignDetails'
+      >
+    >();
+  const routeCampaignId = route.params?.campaignId;
+  const referralCode = useSelector(selectReferralCode);
+
+  const {
+    campaigns,
+    isLoading: isCampaignsLoading,
+    hasError: hasCampaignsError,
+    fetchCampaigns,
+  } = useRewardCampaigns();
+
+  const campaign = useMemo(
+    () =>
+      campaigns.find((c) =>
+        routeCampaignId
+          ? c.id === routeCampaignId
+          : c.type === CampaignType.PERPS_TRADING,
+      ) ?? null,
+    [campaigns, routeCampaignId],
+  );
+
+  const effectiveCampaignId = routeCampaignId ?? campaign?.id ?? '';
+
+  const {
+    status: participantStatusData,
+    isLoading: isParticipantStatusLoading,
+  } = useGetCampaignParticipantStatus(effectiveCampaignId || undefined);
+
+  const isOptedIn = participantStatusData?.optedIn === true;
+  const campaignStatus = campaign ? getCampaignStatus(campaign) : null;
+  const isActive = campaignStatus === 'active';
+  const isComplete = campaignStatus === 'complete';
+
+  const {
+    leaderboard,
+    isLoading: isLeaderboardLoading,
+    hasError: hasLeaderboardError,
+    isLeaderboardNotYetComputed,
+    refetch: refetchLeaderboard,
+  } = useGetPerpsTradingCampaignLeaderboard(effectiveCampaignId || undefined);
+
+  const { position, isLoading: isPositionLoading } =
+    useGetPerpsTradingCampaignLeaderboardPosition(
+      isOptedIn ? effectiveCampaignId || undefined : undefined,
+    );
+  const { outcome: participantOutcome } =
+    usePerpsTradingCampaignParticipantOutcome(
+      isComplete && isOptedIn ? effectiveCampaignId || undefined : undefined,
+    );
+
+  const {
+    volume,
+    isLoading: isVolumeLoading,
+    hasError: hasVolumeError,
+    refetch: refetchVolume,
+  } = useGetPerpsTradingCampaignVolume(effectiveCampaignId || undefined);
+
+  const leaderboardUserPosition = useMemo(
+    () =>
+      position
+        ? { rank: position.rank, neighbors: position.neighbors ?? [] }
+        : null,
+    [position],
+  );
+
+  const hasPosition = Boolean(leaderboardUserPosition);
+  const totalParticipants = leaderboard?.totalParticipants ?? 0;
+
+  const {
+    showHowItWorksSection,
+    showStatsSummarySection,
+    showPrizePoolSection,
+    showLeaderboardSection,
+    showCampaignEndedStats,
+  } = useMemo(() => {
+    if (!campaign) {
+      return {
+        showHowItWorksSection: false,
+        showStatsSummarySection: false,
+        showPrizePoolSection: false,
+        showLeaderboardSection: false,
+        showCampaignEndedStats: false,
+      };
+    }
+
+    const showEndedStats =
+      isComplete && !isParticipantStatusLoading && (!isOptedIn || !hasPosition);
+
+    return {
+      showHowItWorksSection:
+        Boolean(campaign.details?.howItWorks) &&
+        isActive &&
+        (!isOptedIn || (!hasPosition && !isPositionLoading)),
+      showStatsSummarySection: hasPosition,
+      showPrizePoolSection: isActive || isComplete,
+      showLeaderboardSection: true,
+      showCampaignEndedStats: showEndedStats,
+    };
+  }, [
+    campaign,
+    isActive,
+    isComplete,
+    isOptedIn,
+    isParticipantStatusLoading,
+    hasPosition,
+    isPositionLoading,
+  ]);
+
+  const navigateToLeaderboard = useCallback(() => {
+    if (!effectiveCampaignId) return;
+    navigation.navigate(Routes.REWARDS_PERPS_TRADING_CAMPAIGN_LEADERBOARD, {
+      campaignId: effectiveCampaignId,
+    });
+  }, [navigation, effectiveCampaignId]);
+
+  const navigateToStats = useCallback(() => {
+    if (!effectiveCampaignId) return;
+    navigation.navigate(Routes.REWARDS_PERPS_TRADING_CAMPAIGN_STATS, {
+      campaignId: effectiveCampaignId,
+    });
+  }, [navigation, effectiveCampaignId]);
+
+  const navigateToWinningView = useCallback(() => {
+    if (!effectiveCampaignId) return;
+    navigation.navigate(Routes.REWARDS_PERPS_TRADING_CAMPAIGN_WINNING_VIEW, {
+      campaignId: effectiveCampaignId,
+      campaignName: campaign?.name ?? '',
+    });
+  }, [navigation, effectiveCampaignId, campaign]);
+
+  useFocusEffect(
+    useCallback(() => {
+      if (
+        !sessionWinningViewAutoNavCampaignIds.has(effectiveCampaignId) &&
+        campaign &&
+        isComplete &&
+        participantOutcome?.winnerVerificationCode &&
+        participantOutcome?.outcomeStatus === 'pending' &&
+        effectiveCampaignId
+      ) {
+        sessionWinningViewAutoNavCampaignIds.add(effectiveCampaignId);
+        navigateToWinningView();
+      }
+    }, [
+      campaign,
+      effectiveCampaignId,
+      isComplete,
+      navigateToWinningView,
+      participantOutcome,
+    ]),
+  );
+
+  const navigateToMechanics = useCallback(() => {
+    if (!effectiveCampaignId) return;
+    navigation.navigate(Routes.REWARDS_CAMPAIGN_MECHANICS, {
+      campaignId: effectiveCampaignId,
+    });
+  }, [navigation, effectiveCampaignId]);
+
+  return (
+    <ErrorBoundary
+      navigation={navigation}
+      view="PerpsTradingCampaignDetailsView"
+    >
+      <SafeAreaView
+        edges={{ bottom: 'additive' }}
+        style={tw.style('flex-1 bg-default')}
+        testID={PERPS_CAMPAIGN_DETAILS_TEST_IDS.CONTAINER}
+      >
+        <HeaderCompactStandard
+          title={strings('rewards.perps_trading_campaign.title')}
+          titleProps={{ variant: TextVariant.HeadingSm }}
+          onBack={() => navigation.goBack()}
+          backButtonProps={{ testID: 'perps-details-back-button' }}
+          endButtonIconProps={getCampaignMechanicsButtonProps(
+            campaign != null,
+            navigateToMechanics,
+            'perps-details-mechanics-button',
+          )}
+          includesTopInset
+        />
+
+        <ScrollView
+          showsVerticalScrollIndicator={false}
+          contentContainerStyle={tw.style('pb-4')}
+        >
+          {isCampaignsLoading && !campaign && (
+            <Box twClassName="px-4 pt-4 gap-4">
+              <Skeleton style={tw.style('h-48 rounded-xl')} />
+              <Skeleton style={tw.style('h-32 rounded-xl')} />
+            </Box>
+          )}
+
+          {!isCampaignsLoading && hasCampaignsError && !campaign && (
+            <Box twClassName="px-4 pt-4">
+              <RewardsErrorBanner
+                title={strings('rewards.campaigns_view.error_title')}
+                description={strings(
+                  'rewards.campaigns_view.error_description',
+                )}
+                onConfirm={fetchCampaigns}
+                confirmButtonLabel={strings(
+                  'rewards.campaigns_view.retry_button',
+                )}
+              />
+            </Box>
+          )}
+
+          {campaign && (
+            <>
+              <CampaignStatus campaign={campaign} optedIn={isOptedIn} />
+
+              {showHowItWorksSection && (
+                <Box twClassName="p-4">
+                  <CampaignHowItWorks
+                    howItWorks={
+                      campaign.details?.howItWorks as OndoCampaignHowItWorks
+                    }
+                  />
+                </Box>
+              )}
+
+              {showCampaignEndedStats && (
+                <Box twClassName="p-4 gap-4">
+                  <PerpsTradingCampaignEndedStats
+                    leaderboard={leaderboard}
+                    totalNotionalVolume={volume?.totalUsdVolume ?? null}
+                    isLeaderboardLoading={isLeaderboardLoading}
+                    isVolumeLoading={isVolumeLoading}
+                    hasLeaderboardError={hasLeaderboardError}
+                    hasVolumeError={hasVolumeError}
+                    onRetryLeaderboard={refetchLeaderboard}
+                    onRetryVolume={refetchVolume}
+                  />
+                  {isOptedIn && participantOutcome?.outcomeStatus != null && (
+                    <CampaignOutcomeBanner
+                      outcomeStatus={participantOutcome.outcomeStatus}
+                      winnerVerificationCode={
+                        participantOutcome.winnerVerificationCode ?? null
+                      }
+                      onWinnerPress={navigateToWinningView}
+                    />
+                  )}
+                </Box>
+              )}
+
+              {showStatsSummarySection && (
+                <Box twClassName="p-4">
+                  <Pressable onPress={navigateToStats}>
+                    <Box
+                      flexDirection={BoxFlexDirection.Row}
+                      alignItems={BoxAlignItems.Center}
+                      twClassName="gap-2 mb-3"
+                    >
+                      <Text
+                        variant={TextVariant.HeadingMd}
+                        fontWeight={FontWeight.Bold}
+                      >
+                        {strings('rewards.perps_trading_campaign.stats_title')}
+                      </Text>
+                      <Icon
+                        name={IconName.ArrowRight}
+                        size={IconSize.Md}
+                        color={IconColor.IconAlternative}
+                      />
+                    </Box>
+                  </Pressable>
+                  <PerpsCampaignStatsSummary
+                    leaderboardPosition={position}
+                    leaderboard={leaderboard}
+                    isCampaignComplete={isComplete}
+                    outcomeStatus={participantOutcome?.outcomeStatus}
+                    winnerVerificationCode={
+                      participantOutcome?.winnerVerificationCode ?? null
+                    }
+                    onWinnerPress={navigateToWinningView}
+                  />
+                </Box>
+              )}
+
+              {showPrizePoolSection && (
+                <>
+                  <Box twClassName="my-1 border-b border-border-muted" />
+                  <Box twClassName="p-4">
+                    <Text
+                      variant={TextVariant.HeadingMd}
+                      fontWeight={FontWeight.Bold}
+                      twClassName="mb-1"
+                    >
+                      {strings(
+                        'rewards.perps_trading_campaign.prize_pool_title',
+                      )}
+                    </Text>
+                    <PerpsTradingCampaignPrizePool
+                      totalNotionalVolume={volume?.totalUsdVolume ?? null}
+                      isLoading={isVolumeLoading}
+                      hasError={hasVolumeError}
+                      refetch={refetchVolume}
+                    />
+                  </Box>
+                </>
+              )}
+
+              {showLeaderboardSection && (
+                <>
+                  <Box twClassName="my-1 border-b border-border-muted" />
+                  <Box twClassName="py-4">
+                    <Pressable onPress={navigateToLeaderboard}>
+                      <Box
+                        flexDirection={BoxFlexDirection.Row}
+                        alignItems={BoxAlignItems.Center}
+                        twClassName="px-4 gap-2 mb-1"
+                      >
+                        <Text
+                          variant={TextVariant.HeadingMd}
+                          fontWeight={FontWeight.Bold}
+                        >
+                          {strings(
+                            'rewards.perps_trading_campaign.leaderboard_title',
+                          )}
+                        </Text>
+                        <Icon
+                          name={IconName.ArrowRight}
+                          size={IconSize.Md}
+                          color={IconColor.IconAlternative}
+                        />
+                      </Box>
+                    </Pressable>
+                    <Box
+                      twClassName="px-4 gap-0.5 mb-2"
+                      testID={
+                        PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS.TOTAL_PARTICIPANTS
+                      }
+                    >
+                      {totalParticipants > 0 && (
+                        <Text
+                          variant={TextVariant.BodySm}
+                          color={TextColor.TextAlternative}
+                        >
+                          {strings(
+                            'rewards.perps_trading_campaign.leaderboard_total_participants',
+                            { count: totalParticipants.toLocaleString() },
+                          )}
+                        </Text>
+                      )}
+                    </Box>
+                    <PerpsTradingCampaignLeaderboard
+                      entries={leaderboard?.entries ?? []}
+                      isLoading={isLeaderboardLoading}
+                      hasError={hasLeaderboardError}
+                      isLeaderboardNotYetComputed={isLeaderboardNotYetComputed}
+                      onRetry={refetchLeaderboard}
+                      currentUserReferralCode={referralCode}
+                      userPosition={leaderboardUserPosition}
+                      maxEntries={5}
+                      campaignId={effectiveCampaignId}
+                      isCampaignComplete={isComplete}
+                    />
+                  </Box>
+                </>
+              )}
+            </>
+          )}
+        </ScrollView>
+
+        {/* Bottom CTA */}
+        {campaign && (
+          <PerpsTradingCampaignCTA
+            campaign={campaign}
+            participantStatus={{
+              status: participantStatusData ?? null,
+              isLoading: isParticipantStatusLoading,
+            }}
+          />
+        )}
+      </SafeAreaView>
+    </ErrorBoundary>
+  );
+};
+
+export default PerpsTradingCampaignDetailsView;
diff --git a/app/components/UI/Rewards/Views/PerpsTradingCampaignLeaderboardView.test.tsx b/app/components/UI/Rewards/Views/PerpsTradingCampaignLeaderboardView.test.tsx
new file mode 100644
index 00000000000..b4a0ce8bccd
--- /dev/null
+++ b/app/components/UI/Rewards/Views/PerpsTradingCampaignLeaderboardView.test.tsx
@@ -0,0 +1,305 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import PerpsTradingCampaignLeaderboardView, {
+  PERPS_CAMPAIGN_LEADERBOARD_VIEW_TEST_IDS,
+} from './PerpsTradingCampaignLeaderboardView';
+import { useGetPerpsTradingCampaignLeaderboard } from '../hooks/useGetPerpsTradingCampaignLeaderboard';
+import { useGetPerpsTradingCampaignLeaderboardPosition } from '../hooks/useGetPerpsTradingCampaignLeaderboardPosition';
+import { useGetCampaignParticipantStatus } from '../hooks/useGetCampaignParticipantStatus';
+import {
+  CampaignType,
+  type PerpsTradingCampaignLeaderboardPositionDto,
+} from '../../../../core/Engine/controllers/rewards-controller/types';
+
+const mockGoBack = jest.fn();
+const mockPerpsLeaderboard = jest.fn();
+const mockPerpsStatsHeader = jest.fn();
+
+const CAMPAIGN_ID = 'perps-lb-campaign-1';
+
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({ goBack: mockGoBack, navigate: jest.fn() }),
+  useRoute: () => ({
+    params: { campaignId: CAMPAIGN_ID },
+  }),
+}));
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  return { ...actual };
+});
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => {
+    const tw = () => ({});
+    tw.style = (..._args: unknown[]) => ({});
+    return tw;
+  },
+}));
+
+jest.mock(
+  '../../../../component-library/components-temp/HeaderCompactStandard',
+  () => {
+    const ReactActual = jest.requireActual('react');
+    const { View, Text, Pressable } = jest.requireActual('react-native');
+    return {
+      __esModule: true,
+      default: ({
+        title,
+        onBack,
+        backButtonProps,
+      }: {
+        title: string;
+        onBack: () => void;
+        backButtonProps?: { testID?: string };
+      }) =>
+        ReactActual.createElement(
+          View,
+          { testID: 'perps-lb-header' },
+          ReactActual.createElement(Text, null, title),
+          ReactActual.createElement(Pressable, {
+            onPress: onBack,
+            testID: backButtonProps?.testID ?? 'perps-lb-back',
+          }),
+        ),
+    };
+  },
+);
+
+jest.mock('../../../Views/ErrorBoundary', () => {
+  const ReactActual = jest.requireActual('react');
+  return {
+    __esModule: true,
+    default: ({ children }: { children: React.ReactNode }) =>
+      ReactActual.createElement(ReactActual.Fragment, null, children),
+  };
+});
+
+jest.mock('react-native-safe-area-context', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    SafeAreaView: ({
+      children,
+      ...props
+    }: {
+      children: React.ReactNode;
+      testID?: string;
+    }) => ReactActual.createElement(View, props, children),
+  };
+});
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+  useDispatch: jest.fn(() => jest.fn()),
+}));
+
+jest.mock('../components/Campaigns/PerpsTradingCampaignLeaderboard', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: (props: Record<string, unknown>) => {
+      mockPerpsLeaderboard(props);
+      return ReactActual.createElement(View, {
+        testID: 'perps-leaderboard-mock',
+      });
+    },
+  };
+});
+
+jest.mock('../components/Campaigns/PerpsTradingCampaignStatsHeader', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: (props: Record<string, unknown>) => {
+      mockPerpsStatsHeader(props);
+      return ReactActual.createElement(View, {
+        testID: 'perps-lb-stats-header-mock',
+      });
+    },
+  };
+});
+
+jest.mock('../hooks/useGetPerpsTradingCampaignLeaderboard');
+jest.mock('../hooks/useGetPerpsTradingCampaignLeaderboardPosition');
+jest.mock('../hooks/useGetCampaignParticipantStatus');
+
+jest.mock('../../../../../locales/i18n', () => ({
+  strings: (key: string) => key,
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockUseGetLeaderboard =
+  useGetPerpsTradingCampaignLeaderboard as jest.MockedFunction<
+    typeof useGetPerpsTradingCampaignLeaderboard
+  >;
+const mockUseGetPosition =
+  useGetPerpsTradingCampaignLeaderboardPosition as jest.MockedFunction<
+    typeof useGetPerpsTradingCampaignLeaderboardPosition
+  >;
+const mockUseGetParticipant =
+  useGetCampaignParticipantStatus as jest.MockedFunction<
+    typeof useGetCampaignParticipantStatus
+  >;
+
+const basePosition: PerpsTradingCampaignLeaderboardPositionDto = {
+  rank: 4,
+  pnl: 1000,
+  notionalVolume: 10_000,
+  marginDeployed: 2000,
+  qualified: true,
+  neighbors: [],
+  computedAt: '2025-01-01T00:00:00.000Z',
+};
+
+const leaderboardHookDefaults = {
+  leaderboard: {
+    campaignId: CAMPAIGN_ID,
+    computedAt: '2025-01-01T00:00:00.000Z',
+    entries: [{ rank: 1, referralCode: 'A', pnl: 1, qualified: true }],
+    totalParticipants: 50,
+  },
+  isLoading: false,
+  hasError: false,
+  isLeaderboardNotYetComputed: false,
+  refetch: jest.fn(),
+};
+
+const mockCampaign = {
+  id: CAMPAIGN_ID,
+  type: CampaignType.PERPS_TRADING,
+  name: 'Perps Test',
+  startDate: '2024-01-01T00:00:00Z',
+  endDate: '2099-12-31T23:59:59Z',
+  termsAndConditions: null,
+  excludedRegions: [],
+  featured: false,
+  details: { howItWorks: { title: '', description: '', steps: [] } },
+};
+
+const mockState = {
+  rewards: {
+    referralCode: 'REFCODE99',
+    campaigns: [mockCampaign],
+  },
+};
+
+describe('PerpsTradingCampaignLeaderboardView', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSelector.mockImplementation((selector: (s: unknown) => unknown) =>
+      selector(mockState),
+    );
+    mockUseGetParticipant.mockReturnValue({
+      status: { optedIn: false, participantCount: 0 },
+      isLoading: false,
+      hasError: false,
+      refetch: jest.fn(),
+    });
+    mockUseGetLeaderboard.mockReturnValue(leaderboardHookDefaults);
+    mockUseGetPosition.mockReturnValue({
+      position: null,
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+  });
+
+  it('renders with the correct container testID', () => {
+    const { getByTestId } = render(<PerpsTradingCampaignLeaderboardView />);
+    expect(
+      getByTestId(PERPS_CAMPAIGN_LEADERBOARD_VIEW_TEST_IDS.CONTAINER),
+    ).toBeDefined();
+  });
+
+  it('navigates back when the back button is pressed', () => {
+    const { getByTestId } = render(<PerpsTradingCampaignLeaderboardView />);
+    fireEvent.press(getByTestId('perps-leaderboard-back-button'));
+    expect(mockGoBack).toHaveBeenCalled();
+  });
+
+  it('fetches leaderboard with route campaignId', () => {
+    render(<PerpsTradingCampaignLeaderboardView />);
+    expect(mockUseGetLeaderboard).toHaveBeenCalledWith(CAMPAIGN_ID);
+  });
+
+  it('does not render the stats header when the user is not opted in', () => {
+    const { queryByTestId } = render(<PerpsTradingCampaignLeaderboardView />);
+    expect(queryByTestId('perps-lb-stats-header-mock')).toBeNull();
+  });
+
+  it('passes undefined to position hook when not opted in', () => {
+    render(<PerpsTradingCampaignLeaderboardView />);
+    expect(mockUseGetPosition).toHaveBeenCalledWith(undefined);
+  });
+
+  it('renders the stats header and passes campaignId to position hook when opted in', () => {
+    mockUseGetParticipant.mockReturnValue({
+      status: { optedIn: true, participantCount: 10 },
+      isLoading: false,
+      hasError: false,
+      refetch: jest.fn(),
+    });
+    mockUseGetPosition.mockReturnValue({
+      position: basePosition,
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+
+    const { getByTestId } = render(<PerpsTradingCampaignLeaderboardView />);
+    expect(getByTestId('perps-lb-stats-header-mock')).toBeDefined();
+    expect(mockUseGetPosition).toHaveBeenCalledWith(CAMPAIGN_ID);
+    expect(mockPerpsStatsHeader).toHaveBeenCalledWith(
+      expect.objectContaining({
+        position: basePosition,
+        isLoading: false,
+      }),
+    );
+  });
+
+  it('passes leaderboard data and user position to PerpsTradingCampaignLeaderboard', () => {
+    mockUseGetParticipant.mockReturnValue({
+      status: { optedIn: true, participantCount: 10 },
+      isLoading: false,
+      hasError: false,
+      refetch: jest.fn(),
+    });
+    mockUseGetPosition.mockReturnValue({
+      position: basePosition,
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+
+    render(<PerpsTradingCampaignLeaderboardView />);
+    expect(mockPerpsLeaderboard).toHaveBeenCalledWith(
+      expect.objectContaining({
+        entries: leaderboardHookDefaults.leaderboard?.entries,
+        isLoading: leaderboardHookDefaults.isLoading,
+        hasError: leaderboardHookDefaults.hasError,
+        isLeaderboardNotYetComputed:
+          leaderboardHookDefaults.isLeaderboardNotYetComputed,
+        currentUserReferralCode: 'REFCODE99',
+        userPosition: {
+          rank: basePosition.rank,
+          neighbors: basePosition.neighbors,
+        },
+        campaignId: CAMPAIGN_ID,
+        onRetry: leaderboardHookDefaults.refetch,
+        isCampaignComplete: false,
+      }),
+    );
+  });
+
+  it('renders the leaderboard section', () => {
+    const { getByTestId } = render(<PerpsTradingCampaignLeaderboardView />);
+    expect(getByTestId('perps-leaderboard-mock')).toBeDefined();
+  });
+});
diff --git a/app/components/UI/Rewards/Views/PerpsTradingCampaignLeaderboardView.tsx b/app/components/UI/Rewards/Views/PerpsTradingCampaignLeaderboardView.tsx
new file mode 100644
index 00000000000..b601329431d
--- /dev/null
+++ b/app/components/UI/Rewards/Views/PerpsTradingCampaignLeaderboardView.tsx
@@ -0,0 +1,143 @@
+import React, { useMemo } from 'react';
+import { ScrollView } from 'react-native';
+import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
+import { Box, TextVariant } from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { SafeAreaView } from 'react-native-safe-area-context';
+import { useSelector } from 'react-redux';
+import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
+import ErrorBoundary from '../../../Views/ErrorBoundary';
+import PerpsTradingCampaignLeaderboard from '../components/Campaigns/PerpsTradingCampaignLeaderboard';
+import PerpsTradingCampaignStatsHeader from '../components/Campaigns/PerpsTradingCampaignStatsHeader';
+import { useGetPerpsTradingCampaignLeaderboard } from '../hooks/useGetPerpsTradingCampaignLeaderboard';
+import { useGetPerpsTradingCampaignLeaderboardPosition } from '../hooks/useGetPerpsTradingCampaignLeaderboardPosition';
+import { useGetCampaignParticipantStatus } from '../hooks/useGetCampaignParticipantStatus';
+import { strings } from '../../../../../locales/i18n';
+import Routes from '../../../../constants/navigation/Routes';
+import {
+  selectReferralCode,
+  selectCampaignById,
+} from '../../../../reducers/rewards/selectors';
+import { getCampaignMechanicsButtonProps } from '../utils/campaignHeaderUtils';
+import { getCampaignStatus } from '../components/Campaigns/CampaignTile.utils';
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+type PerpsTradingCampaignLeaderboardRouteParams = {
+  RewardsPerpsTradingCampaignLeaderboard: { campaignId: string };
+};
+
+export const PERPS_CAMPAIGN_LEADERBOARD_VIEW_TEST_IDS = {
+  CONTAINER: 'perps-campaign-leaderboard-view-container',
+} as const;
+
+const PerpsTradingCampaignLeaderboardView: React.FC = () => {
+  const tw = useTailwind();
+  const navigation = useNavigation();
+  const route =
+    useRoute<
+      RouteProp<
+        PerpsTradingCampaignLeaderboardRouteParams,
+        'RewardsPerpsTradingCampaignLeaderboard'
+      >
+    >();
+  const { campaignId } = route.params;
+  const referralCode = useSelector(selectReferralCode);
+
+  const selectCampaign = useMemo(
+    () => selectCampaignById(campaignId),
+    [campaignId],
+  );
+  const campaign = useSelector(selectCampaign);
+
+  const { status: participantStatus } =
+    useGetCampaignParticipantStatus(campaignId);
+  const isOptedIn = participantStatus?.optedIn === true;
+
+  const { position, isLoading: isPositionLoading } =
+    useGetPerpsTradingCampaignLeaderboardPosition(
+      isOptedIn ? campaignId : undefined,
+    );
+
+  const {
+    leaderboard,
+    isLoading: isLeaderboardLoading,
+    hasError: hasLeaderboardError,
+    isLeaderboardNotYetComputed,
+    refetch: refetchLeaderboard,
+  } = useGetPerpsTradingCampaignLeaderboard(campaignId);
+
+  const leaderboardUserPosition = useMemo(
+    () =>
+      position
+        ? { rank: position.rank, neighbors: position.neighbors ?? [] }
+        : null,
+    [position],
+  );
+
+  const isCampaignComplete =
+    campaign != null && getCampaignStatus(campaign) === 'complete';
+
+  return (
+    <ErrorBoundary
+      navigation={navigation}
+      view="PerpsTradingCampaignLeaderboardView"
+    >
+      <SafeAreaView
+        edges={{ bottom: 'additive' }}
+        style={tw.style('flex-1 bg-default')}
+        testID={PERPS_CAMPAIGN_LEADERBOARD_VIEW_TEST_IDS.CONTAINER}
+      >
+        <HeaderCompactStandard
+          title={strings('rewards.perps_trading_campaign.leaderboard_title')}
+          titleProps={{ variant: TextVariant.HeadingSm }}
+          onBack={() => navigation.goBack()}
+          backButtonProps={{ testID: 'perps-leaderboard-back-button' }}
+          endButtonIconProps={getCampaignMechanicsButtonProps(
+            campaign != null,
+            () =>
+              navigation.navigate(Routes.REWARDS_CAMPAIGN_MECHANICS, {
+                campaignId,
+              }),
+            'perps-leaderboard-mechanics-button',
+          )}
+          includesTopInset
+        />
+        <ScrollView
+          showsVerticalScrollIndicator={false}
+          contentContainerStyle={tw.style('pb-4')}
+        >
+          {/* User position header */}
+          {isOptedIn && (
+            <>
+              <Box twClassName="p-4">
+                <PerpsTradingCampaignStatsHeader
+                  position={position}
+                  isLoading={isPositionLoading}
+                  isCampaignComplete={isCampaignComplete}
+                />
+              </Box>
+              <Box twClassName="my-1 border-b border-border-muted" />
+            </>
+          )}
+
+          {/* Full leaderboard */}
+          <Box twClassName="py-4">
+            <PerpsTradingCampaignLeaderboard
+              entries={leaderboard?.entries ?? []}
+              isLoading={isLeaderboardLoading}
+              hasError={hasLeaderboardError}
+              isLeaderboardNotYetComputed={isLeaderboardNotYetComputed}
+              onRetry={refetchLeaderboard}
+              currentUserReferralCode={referralCode}
+              userPosition={leaderboardUserPosition}
+              campaignId={campaignId}
+              isCampaignComplete={isCampaignComplete}
+            />
+          </Box>
+        </ScrollView>
+      </SafeAreaView>
+    </ErrorBoundary>
+  );
+};
+
+export default PerpsTradingCampaignLeaderboardView;
diff --git a/app/components/UI/Rewards/Views/PerpsTradingCampaignStatsView.test.tsx b/app/components/UI/Rewards/Views/PerpsTradingCampaignStatsView.test.tsx
new file mode 100644
index 00000000000..64fbed6e9ad
--- /dev/null
+++ b/app/components/UI/Rewards/Views/PerpsTradingCampaignStatsView.test.tsx
@@ -0,0 +1,433 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import PerpsTradingCampaignStatsView, {
+  PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS,
+} from './PerpsTradingCampaignStatsView';
+import { useGetPerpsTradingCampaignLeaderboardPosition } from '../hooks/useGetPerpsTradingCampaignLeaderboardPosition';
+import { useGetCampaignParticipantStatus } from '../hooks/useGetCampaignParticipantStatus';
+import { usePerpsTradingCampaignParticipantOutcome } from '../hooks/usePerpsTradingCampaignParticipantOutcome';
+import {
+  CampaignType,
+  type PerpsTradingCampaignLeaderboardPositionDto,
+} from '../../../../core/Engine/controllers/rewards-controller/types';
+import Routes from '../../../../constants/navigation/Routes';
+
+const mockGoBack = jest.fn();
+const mockNavigate = jest.fn();
+const mockPerpsStatsHeader = jest.fn();
+
+const CAMPAIGN_ID = 'perps-stats-campaign-1';
+
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({ goBack: mockGoBack, navigate: mockNavigate }),
+  useRoute: () => ({
+    params: { campaignId: CAMPAIGN_ID },
+  }),
+}));
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  const Skeleton = (props: Record<string, unknown>) =>
+    ReactActual.createElement(View, { testID: 'skeleton', ...props });
+  return { ...actual, Skeleton };
+});
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => {
+    const tw = () => ({});
+    tw.style = (..._args: unknown[]) => ({});
+    return tw;
+  },
+}));
+
+jest.mock(
+  '../../../../component-library/components-temp/HeaderCompactStandard',
+  () => {
+    const ReactActual = jest.requireActual('react');
+    const { View, Text, Pressable } = jest.requireActual('react-native');
+    return {
+      __esModule: true,
+      default: ({
+        title,
+        onBack,
+        backButtonProps,
+        endButtonIconProps,
+      }: {
+        title: string;
+        onBack: () => void;
+        backButtonProps?: { testID?: string };
+        endButtonIconProps?: { testID?: string; onPress?: () => void }[];
+      }) =>
+        ReactActual.createElement(
+          View,
+          { testID: 'perps-stats-header' },
+          ReactActual.createElement(Text, null, title),
+          ReactActual.createElement(Pressable, {
+            onPress: onBack,
+            testID: backButtonProps?.testID ?? 'perps-stats-back',
+          }),
+          ...(endButtonIconProps ?? []).map((btn, i) =>
+            ReactActual.createElement(Pressable, {
+              key: i,
+              onPress: btn.onPress,
+              testID: btn.testID,
+            }),
+          ),
+        ),
+    };
+  },
+);
+
+jest.mock('../../../Views/ErrorBoundary', () => {
+  const ReactActual = jest.requireActual('react');
+  return {
+    __esModule: true,
+    default: ({ children }: { children: React.ReactNode }) =>
+      ReactActual.createElement(ReactActual.Fragment, null, children),
+  };
+});
+
+jest.mock('react-native-safe-area-context', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    SafeAreaView: ({
+      children,
+      ...props
+    }: {
+      children: React.ReactNode;
+      testID?: string;
+    }) => ReactActual.createElement(View, props, children),
+  };
+});
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+  useDispatch: jest.fn(() => jest.fn()),
+}));
+
+jest.mock('../components/Campaigns/PerpsTradingCampaignStatsHeader', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: (props: Record<string, unknown>) => {
+      mockPerpsStatsHeader(props);
+      return ReactActual.createElement(View, {
+        testID: 'perps-stats-header-mock',
+      });
+    },
+  };
+});
+
+jest.mock('../utils/formatUtils', () => ({
+  formatSignedUsd: (value: number) => `SIGNED_USD_${String(value)}`,
+  formatUsd: (value: number) => `USD_${String(value)}`,
+  formatRewardsTimeOnly: () => 'TIME_STUB',
+}));
+
+jest.mock('../components/RewardsErrorBanner', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ({ testID }: { testID?: string }) =>
+      ReactActual.createElement(View, {
+        testID: testID ?? 'rewards-error-banner',
+      }),
+  };
+});
+
+jest.mock('../hooks/useGetPerpsTradingCampaignLeaderboardPosition');
+jest.mock('../hooks/useGetCampaignParticipantStatus');
+jest.mock('../hooks/usePerpsTradingCampaignParticipantOutcome', () => ({
+  usePerpsTradingCampaignParticipantOutcome: jest.fn(() => ({
+    outcome: null,
+    isLoading: false,
+    hasError: false,
+  })),
+}));
+
+jest.mock('../../../../../locales/i18n', () => ({
+  strings: (key: string) => key,
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockUseGetPosition =
+  useGetPerpsTradingCampaignLeaderboardPosition as jest.MockedFunction<
+    typeof useGetPerpsTradingCampaignLeaderboardPosition
+  >;
+const mockUseGetParticipant =
+  useGetCampaignParticipantStatus as jest.MockedFunction<
+    typeof useGetCampaignParticipantStatus
+  >;
+const mockUsePerpsTradingCampaignParticipantOutcome =
+  usePerpsTradingCampaignParticipantOutcome as jest.MockedFunction<
+    typeof usePerpsTradingCampaignParticipantOutcome
+  >;
+
+const basePosition: PerpsTradingCampaignLeaderboardPositionDto = {
+  rank: 4,
+  pnl: 1500.25,
+  notionalVolume: 30_000,
+  marginDeployed: 2000,
+  qualified: true,
+  neighbors: [],
+  computedAt: '2025-01-01T00:00:00.000Z',
+};
+
+const mockCampaign = {
+  id: CAMPAIGN_ID,
+  type: CampaignType.PERPS_TRADING,
+  name: 'Perps Stats Test',
+  startDate: '2024-01-01T00:00:00Z',
+  endDate: '2099-12-31T23:59:59Z',
+  termsAndConditions: null,
+  excludedRegions: [],
+  featured: false,
+  details: { howItWorks: { title: '', description: '', steps: [] } },
+};
+
+const mockState = {
+  rewards: {
+    campaigns: [mockCampaign],
+  },
+};
+
+describe('PerpsTradingCampaignStatsView', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSelector.mockImplementation((selector: (s: unknown) => unknown) =>
+      selector(mockState),
+    );
+    mockUseGetParticipant.mockReturnValue({
+      status: { optedIn: true, participantCount: 5 },
+      isLoading: false,
+      hasError: false,
+      refetch: jest.fn(),
+    });
+    mockUsePerpsTradingCampaignParticipantOutcome.mockReturnValue({
+      outcome: null,
+      isLoading: false,
+      hasError: false,
+    });
+    mockUseGetPosition.mockReturnValue({
+      position: basePosition,
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+  });
+
+  it('renders with the correct container testID', () => {
+    const { getByTestId } = render(<PerpsTradingCampaignStatsView />);
+    expect(
+      getByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.CONTAINER),
+    ).toBeDefined();
+  });
+
+  it('navigates back when the back button is pressed', () => {
+    const { getByTestId } = render(<PerpsTradingCampaignStatsView />);
+    fireEvent.press(getByTestId('perps-stats-back-button'));
+    expect(mockGoBack).toHaveBeenCalled();
+  });
+
+  it('navigates to campaign mechanics when the header mechanics button is pressed', () => {
+    const { getByTestId } = render(<PerpsTradingCampaignStatsView />);
+    fireEvent.press(getByTestId('perps-stats-mechanics-button'));
+    expect(mockNavigate).toHaveBeenCalledWith(
+      Routes.REWARDS_CAMPAIGN_MECHANICS,
+      { campaignId: CAMPAIGN_ID },
+    );
+  });
+
+  it('passes position to stats header with PnL and computed-at hidden', () => {
+    render(<PerpsTradingCampaignStatsView />);
+    expect(mockPerpsStatsHeader).toHaveBeenCalledWith(
+      expect.objectContaining({
+        position: basePosition,
+        isLoading: false,
+        showPnl: false,
+        showComputedAt: false,
+      }),
+    );
+  });
+
+  it('passes undefined to position hook when not opted in', () => {
+    mockUseGetParticipant.mockReturnValue({
+      status: { optedIn: false, participantCount: 0 },
+      isLoading: false,
+      hasError: false,
+      refetch: jest.fn(),
+    });
+    mockUseGetPosition.mockReturnValue({
+      position: null,
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+    render(<PerpsTradingCampaignStatsView />);
+    expect(mockUseGetPosition).toHaveBeenCalledWith(undefined);
+  });
+
+  it('renders performance section labels and stat testIDs when opted in with position', () => {
+    const { getByTestId, getByText } = render(
+      <PerpsTradingCampaignStatsView />,
+    );
+    expect(
+      getByText('rewards.perps_trading_campaign.performance_title'),
+    ).toBeDefined();
+    expect(
+      getByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.PERFORMANCE_PNL),
+    ).toBeDefined();
+    expect(
+      getByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.PERFORMANCE_VOLUME),
+    ).toBeDefined();
+    expect(
+      getByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.PERFORMANCE_MARGIN),
+    ).toBeDefined();
+  });
+
+  it('shows last-computed when position has a timestamp', () => {
+    const { getByTestId } = render(<PerpsTradingCampaignStatsView />);
+    const el = getByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.LAST_COMPUTED);
+    expect(el.props.children).toBe(
+      'rewards.perps_trading_campaign.last_updated',
+    );
+  });
+
+  it('hides last-computed when there is no position', () => {
+    mockUseGetPosition.mockReturnValue({
+      position: null,
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+    const { queryByTestId } = render(<PerpsTradingCampaignStatsView />);
+    expect(
+      queryByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.LAST_COMPUTED),
+    ).toBeNull();
+  });
+
+  it("shows You're qualified card under performance when active and user is qualified", () => {
+    const { getByTestId, queryByTestId } = render(
+      <PerpsTradingCampaignStatsView />,
+    );
+    expect(
+      getByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.QUALIFIED_CARD),
+    ).toBeDefined();
+    expect(
+      queryByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.QUALIFY_FOR_RANK_CARD),
+    ).toBeNull();
+  });
+
+  it('hides volume and margin StatCells when campaign is complete (only PnL remains)', () => {
+    const completeCampaign = {
+      ...mockCampaign,
+      endDate: '2020-01-01T00:00:00Z',
+    };
+    mockUseSelector.mockImplementation((selector: (s: unknown) => unknown) =>
+      selector({
+        rewards: { campaigns: [completeCampaign] },
+      }),
+    );
+    const { getByTestId, queryByTestId } = render(
+      <PerpsTradingCampaignStatsView />,
+    );
+    expect(
+      getByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.PERFORMANCE_PNL),
+    ).toBeDefined();
+    expect(
+      queryByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.PERFORMANCE_VOLUME),
+    ).toBeNull();
+    expect(
+      queryByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.PERFORMANCE_MARGIN),
+    ).toBeNull();
+  });
+
+  it('hides qualification cards when campaign is complete and shows last-computed after performance when position exists', () => {
+    const completeCampaign = {
+      ...mockCampaign,
+      endDate: '2020-01-01T00:00:00Z',
+    };
+    mockUseSelector.mockImplementation((selector: (s: unknown) => unknown) =>
+      selector({
+        rewards: { campaigns: [completeCampaign] },
+      }),
+    );
+    const { getByTestId, queryByTestId } = render(
+      <PerpsTradingCampaignStatsView />,
+    );
+    expect(
+      queryByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.QUALIFIED_CARD),
+    ).toBeNull();
+    expect(
+      queryByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.QUALIFY_FOR_RANK_CARD),
+    ).toBeNull();
+    const last = getByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.LAST_COMPUTED);
+    const qualified = queryByTestId(
+      PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.QUALIFIED_CARD,
+    );
+    expect(qualified).toBeNull();
+    expect(last).toBeDefined();
+  });
+
+  it('shows Qualify for rank card when pending and notional is below threshold', () => {
+    mockUseGetPosition.mockReturnValue({
+      position: {
+        ...basePosition,
+        qualified: false,
+        notionalVolume: 5_000,
+        marginDeployed: 500,
+      },
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+    const { getByTestId, queryByTestId } = render(
+      <PerpsTradingCampaignStatsView />,
+    );
+    expect(
+      getByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.QUALIFY_FOR_RANK_CARD),
+    ).toBeDefined();
+    expect(
+      queryByTestId(PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.QUALIFIED_CARD),
+    ).toBeNull();
+  });
+
+  it('shows error banner when hasError is true and no position data', () => {
+    mockUseGetPosition.mockReturnValue({
+      position: null,
+      isLoading: false,
+      hasError: true,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+    const { getByTestId } = render(<PerpsTradingCampaignStatsView />);
+    expect(getByTestId('rewards-error-banner')).toBeDefined();
+  });
+
+  it('hides error banner when hasError is false', () => {
+    const { queryByTestId } = render(<PerpsTradingCampaignStatsView />);
+    expect(queryByTestId('rewards-error-banner')).toBeNull();
+  });
+
+  it('hides error banner when there is an error but position data is already loaded', () => {
+    mockUseGetPosition.mockReturnValue({
+      position: basePosition,
+      isLoading: false,
+      hasError: true,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+    const { queryByTestId } = render(<PerpsTradingCampaignStatsView />);
+    expect(queryByTestId('rewards-error-banner')).toBeNull();
+  });
+});
diff --git a/app/components/UI/Rewards/Views/PerpsTradingCampaignStatsView.tsx b/app/components/UI/Rewards/Views/PerpsTradingCampaignStatsView.tsx
new file mode 100644
index 00000000000..73df3b431f5
--- /dev/null
+++ b/app/components/UI/Rewards/Views/PerpsTradingCampaignStatsView.tsx
@@ -0,0 +1,306 @@
+import React, { useCallback, useMemo } from 'react';
+import { ScrollView } from 'react-native';
+import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { SafeAreaView } from 'react-native-safe-area-context';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  FontWeight,
+  Icon,
+  IconName,
+  IconColor,
+  IconSize,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useSelector } from 'react-redux';
+import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
+import ErrorBoundary from '../../../Views/ErrorBoundary';
+import RewardsErrorBanner from '../components/RewardsErrorBanner';
+import PerpsTradingCampaignStatsHeader from '../components/Campaigns/PerpsTradingCampaignStatsHeader';
+import { StatCell } from '../components/Campaigns/OndoCampaignStatsSummary';
+import { useGetPerpsTradingCampaignLeaderboardPosition } from '../hooks/useGetPerpsTradingCampaignLeaderboardPosition';
+import { useGetCampaignParticipantStatus } from '../hooks/useGetCampaignParticipantStatus';
+import { strings } from '../../../../../locales/i18n';
+import Routes from '../../../../constants/navigation/Routes';
+import { selectCampaignById } from '../../../../reducers/rewards/selectors';
+import { getCampaignMechanicsButtonProps } from '../utils/campaignHeaderUtils';
+import { PERPS_QUALIFICATION_NOTIONAL_USD } from '../utils/perpsCampaignConstants';
+import {
+  formatRewardsTimeOnly,
+  formatSignedUsd,
+  formatUsd,
+} from '../utils/formatUtils';
+import { getCampaignStatus } from '../components/Campaigns/CampaignTile.utils';
+import { CampaignOutcomeBanner } from '../components/Campaigns/CampaignOutcomeBanners';
+import { usePerpsTradingCampaignParticipantOutcome } from '../hooks/usePerpsTradingCampaignParticipantOutcome';
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+type PerpsTradingCampaignStatsRouteParams = {
+  RewardsPerpsTradingCampaignStats: { campaignId: string };
+};
+
+export const PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS = {
+  CONTAINER: 'perps-campaign-stats-view-container',
+  PERFORMANCE_PNL: 'perps-campaign-stats-view-performance-pnl',
+  PERFORMANCE_VOLUME: 'perps-campaign-stats-view-performance-volume',
+  PERFORMANCE_MARGIN: 'perps-campaign-stats-view-performance-margin',
+  QUALIFIED_CARD: 'perps-campaign-stats-view-qualified-card',
+  QUALIFY_FOR_RANK_CARD: 'perps-campaign-stats-view-qualify-for-rank-card',
+  LAST_COMPUTED: 'perps-campaign-stats-view-last-computed',
+} as const;
+
+const CheckIcon: React.FC = () => (
+  <Icon
+    name={IconName.Check}
+    size={IconSize.Sm}
+    color={IconColor.SuccessDefault}
+  />
+);
+
+const PerpsTradingCampaignStatsView: React.FC = () => {
+  const tw = useTailwind();
+  const navigation = useNavigation();
+  const route =
+    useRoute<
+      RouteProp<
+        PerpsTradingCampaignStatsRouteParams,
+        'RewardsPerpsTradingCampaignStats'
+      >
+    >();
+  const { campaignId } = route.params;
+
+  const selectCampaign = useMemo(
+    () => selectCampaignById(campaignId),
+    [campaignId],
+  );
+  const campaign = useSelector(selectCampaign);
+
+  const { status: participantStatusData } =
+    useGetCampaignParticipantStatus(campaignId);
+  const isOptedIn = participantStatusData?.optedIn === true;
+
+  const { position, isLoading, hasError, refetch } =
+    useGetPerpsTradingCampaignLeaderboardPosition(
+      isOptedIn ? campaignId : undefined,
+    );
+
+  const pnlValue = position ? formatSignedUsd(position.pnl) : '—';
+  const pnlColor = position
+    ? position.pnl >= 0
+      ? TextColor.SuccessDefault
+      : TextColor.ErrorDefault
+    : TextColor.TextDefault;
+
+  const volumeValue = position ? formatUsd(position.notionalVolume) : '—';
+  const marginValue = position ? formatUsd(position.marginDeployed) : '—';
+  const isQualified = position != null && position.qualified;
+  const isPending = position != null && !position.qualified;
+
+  const isCampaignComplete =
+    campaign != null && getCampaignStatus(campaign) === 'complete';
+
+  const notionalGap = position
+    ? Math.max(0, PERPS_QUALIFICATION_NOTIONAL_USD - position.notionalVolume)
+    : 0;
+
+  const showQualifiedCard =
+    !isCampaignComplete && isQualified && position != null;
+
+  const showQualifyForRankCard =
+    !isCampaignComplete && isPending && position != null && notionalGap > 0;
+
+  const positionError = hasError && !position;
+
+  const { outcome: participantOutcome } =
+    usePerpsTradingCampaignParticipantOutcome(
+      isCampaignComplete && isOptedIn ? campaignId : undefined,
+    );
+
+  const navigateToWinningView = useCallback(() => {
+    navigation.navigate(Routes.REWARDS_PERPS_TRADING_CAMPAIGN_WINNING_VIEW, {
+      campaignId,
+      campaignName: campaign?.name ?? '',
+    });
+  }, [navigation, campaignId, campaign]);
+
+  return (
+    <ErrorBoundary navigation={navigation} view="PerpsTradingCampaignStatsView">
+      <SafeAreaView
+        edges={{ bottom: 'additive' }}
+        style={tw.style('flex-1 bg-default')}
+        testID={PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.CONTAINER}
+      >
+        <HeaderCompactStandard
+          title={strings('rewards.perps_trading_campaign.stats_title')}
+          titleProps={{ variant: TextVariant.HeadingSm }}
+          onBack={() => navigation.goBack()}
+          backButtonProps={{ testID: 'perps-stats-back-button' }}
+          endButtonIconProps={getCampaignMechanicsButtonProps(
+            campaign != null,
+            () =>
+              navigation.navigate(Routes.REWARDS_CAMPAIGN_MECHANICS, {
+                campaignId,
+              }),
+            'perps-stats-mechanics-button',
+          )}
+          includesTopInset
+        />
+        <ScrollView
+          showsVerticalScrollIndicator={false}
+          contentContainerStyle={tw.style('pb-4')}
+        >
+          <Box twClassName="p-4">
+            <PerpsTradingCampaignStatsHeader
+              position={position}
+              isLoading={isLoading}
+              showComputedAt={false}
+              showPnl={false}
+              isCampaignComplete={isCampaignComplete}
+            />
+          </Box>
+          <Box twClassName="my-1 border-b border-border-muted" />
+          <Box twClassName="p-4 gap-3">
+            <Text variant={TextVariant.HeadingMd}>
+              {strings('rewards.perps_trading_campaign.performance_title')}
+            </Text>
+
+            <Box flexDirection={BoxFlexDirection.Row}>
+              <StatCell
+                label={strings('rewards.perps_trading_campaign.label_pnl')}
+                value={pnlValue}
+                isLoading={isLoading}
+                valueColor={pnlColor}
+                testID={PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.PERFORMANCE_PNL}
+              />
+              <Box twClassName="flex-1" />
+            </Box>
+
+            {!isCampaignComplete && (
+              <Box flexDirection={BoxFlexDirection.Row}>
+                <StatCell
+                  label={strings('rewards.perps_trading_campaign.label_volume')}
+                  value={volumeValue}
+                  isLoading={isLoading}
+                  suffix={isQualified ? <CheckIcon /> : undefined}
+                  testID={PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.PERFORMANCE_VOLUME}
+                />
+                <StatCell
+                  label={strings('rewards.perps_trading_campaign.label_margin')}
+                  value={marginValue}
+                  isLoading={isLoading}
+                  suffix={isQualified ? <CheckIcon /> : undefined}
+                  testID={PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.PERFORMANCE_MARGIN}
+                />
+              </Box>
+            )}
+
+            {showQualifiedCard && (
+              <Box
+                twClassName="bg-muted rounded-xl p-4 gap-2"
+                testID={PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.QUALIFIED_CARD}
+              >
+                <Text
+                  variant={TextVariant.BodyMd}
+                  fontWeight={FontWeight.Medium}
+                >
+                  {strings(
+                    'rewards.perps_trading_campaign.stats_qualified_title',
+                  )}
+                </Text>
+                <Text
+                  variant={TextVariant.BodySm}
+                  color={TextColor.TextAlternative}
+                >
+                  {strings(
+                    'rewards.perps_trading_campaign.stats_qualified_description',
+                  )}
+                </Text>
+              </Box>
+            )}
+
+            {showQualifyForRankCard && (
+              <Box
+                twClassName="bg-muted rounded-xl p-4 gap-2"
+                testID={
+                  PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.QUALIFY_FOR_RANK_CARD
+                }
+              >
+                <Box
+                  flexDirection={BoxFlexDirection.Row}
+                  alignItems={BoxAlignItems.Center}
+                  twClassName="gap-2"
+                >
+                  <Text
+                    variant={TextVariant.BodyMd}
+                    fontWeight={FontWeight.Medium}
+                  >
+                    {strings(
+                      'rewards.perps_trading_campaign.stats_qualify_for_rank_title',
+                    )}
+                  </Text>
+                </Box>
+                <Text
+                  variant={TextVariant.BodySm}
+                  color={TextColor.TextAlternative}
+                >
+                  {strings(
+                    'rewards.perps_trading_campaign.stats_qualify_for_rank_description',
+                    {
+                      notionalRemaining: formatUsd(notionalGap),
+                    },
+                  )}
+                </Text>
+              </Box>
+            )}
+
+            {/* ── Last updated ── */}
+            {position?.computedAt && (
+              <Text
+                variant={TextVariant.BodySm}
+                color={TextColor.TextAlternative}
+                testID={PERPS_CAMPAIGN_STATS_VIEW_TEST_IDS.LAST_COMPUTED}
+              >
+                {strings('rewards.perps_trading_campaign.last_updated', {
+                  time: formatRewardsTimeOnly(new Date(position.computedAt)),
+                })}
+              </Text>
+            )}
+
+            {/* ── Outcome banner (campaign ended) ── */}
+            {isCampaignComplete && participantOutcome && (
+              <CampaignOutcomeBanner
+                outcomeStatus={participantOutcome.outcomeStatus}
+                winnerVerificationCode={
+                  participantOutcome.winnerVerificationCode
+                }
+                onWinnerPress={navigateToWinningView}
+              />
+            )}
+
+            {/* ── Error banner ── */}
+            {positionError && (
+              <RewardsErrorBanner
+                title={strings(
+                  'rewards.perps_trading_campaign.stats_error_title',
+                )}
+                description={strings(
+                  'rewards.perps_trading_campaign.stats_error_description',
+                )}
+                onConfirm={refetch}
+                confirmButtonLabel={strings(
+                  'rewards.perps_trading_campaign.stats_retry',
+                )}
+              />
+            )}
+          </Box>
+        </ScrollView>
+      </SafeAreaView>
+    </ErrorBoundary>
+  );
+};
+
+export default PerpsTradingCampaignStatsView;
diff --git a/app/components/UI/Rewards/Views/PerpsTradingCampaignWinningView.test.tsx b/app/components/UI/Rewards/Views/PerpsTradingCampaignWinningView.test.tsx
new file mode 100644
index 00000000000..13fe1dc93b3
--- /dev/null
+++ b/app/components/UI/Rewards/Views/PerpsTradingCampaignWinningView.test.tsx
@@ -0,0 +1,206 @@
+import React from 'react';
+import { render } from '@testing-library/react-native';
+import PerpsTradingCampaignWinningView, {
+  PERPS_TRADING_CAMPAIGN_WINNING_VIEW_TEST_IDS,
+} from './PerpsTradingCampaignWinningView';
+import { usePerpsTradingCampaignParticipantOutcome } from '../hooks/usePerpsTradingCampaignParticipantOutcome';
+import { useGetPerpsTradingCampaignLeaderboardPosition } from '../hooks/useGetPerpsTradingCampaignLeaderboardPosition';
+import CampaignWinningView from './CampaignWinningView';
+import Routes from '../../../../constants/navigation/Routes';
+
+jest.mock('./CampaignWinningView', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: jest.fn(({ testID }: { testID: string }) =>
+      ReactActual.createElement(View, { testID }),
+    ),
+  };
+});
+
+jest.mock('../hooks/usePerpsTradingCampaignParticipantOutcome', () => ({
+  usePerpsTradingCampaignParticipantOutcome: jest.fn(),
+}));
+
+jest.mock('../hooks/useGetPerpsTradingCampaignLeaderboardPosition', () => ({
+  useGetPerpsTradingCampaignLeaderboardPosition: jest.fn(),
+}));
+
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({ goBack: jest.fn(), navigate: jest.fn() }),
+  useRoute: () => ({
+    params: { campaignId: 'campaign-perps-1', campaignName: 'Perps Campaign' },
+  }),
+}));
+
+jest.mock('@metamask/design-system-twrnc-preset', () => {
+  const tw = (...args: unknown[]) => args;
+  tw.style = (...args: unknown[]) => args;
+  return { useTailwind: () => tw };
+});
+
+const mockUseOutcome =
+  usePerpsTradingCampaignParticipantOutcome as jest.MockedFunction<
+    typeof usePerpsTradingCampaignParticipantOutcome
+  >;
+const mockUsePosition =
+  useGetPerpsTradingCampaignLeaderboardPosition as jest.MockedFunction<
+    typeof useGetPerpsTradingCampaignLeaderboardPosition
+  >;
+const mockCampaignWinningView = CampaignWinningView as jest.MockedFunction<
+  typeof CampaignWinningView
+>;
+
+describe('PerpsTradingCampaignWinningView', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseOutcome.mockReturnValue({
+      outcome: {
+        subscriptionId: 'sub-1',
+        outcomeStatus: 'pending',
+        winnerVerificationCode: 'PERPS-WIN-99',
+        rank: 3,
+      },
+      isLoading: false,
+      hasError: false,
+    });
+    mockUsePosition.mockReturnValue({
+      position: {
+        rank: 3,
+        pnl: 1500.25,
+        notionalVolume: 30000,
+        marginDeployed: 1200,
+        qualified: true,
+        neighbors: [],
+        computedAt: '2025-08-15T12:00:00.000Z',
+      },
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+  });
+
+  it('renders the container with the Perps testID', () => {
+    const { getByTestId } = render(<PerpsTradingCampaignWinningView />);
+    expect(
+      getByTestId(PERPS_TRADING_CAMPAIGN_WINNING_VIEW_TEST_IDS.CONTAINER),
+    ).toBeTruthy();
+  });
+
+  it('passes correct Perps-specific props to CampaignWinningView', () => {
+    render(<PerpsTradingCampaignWinningView />);
+    expect(mockCampaignWinningView).toHaveBeenCalledWith(
+      expect.objectContaining({
+        testID: PERPS_TRADING_CAMPAIGN_WINNING_VIEW_TEST_IDS.CONTAINER,
+        prizeEmail: 'perpscampaign@consensys.net',
+        campaignName: 'Perps Campaign',
+        campaignId: 'campaign-perps-1',
+        analyticsPageType: 'perps_trading_campaign_winning',
+        winningCode: 'PERPS-WIN-99',
+        hasOutcomeLoaded: true,
+        isLoading: false,
+        rankDisplay: '3rd',
+        resultDisplay: '+$1,500.25',
+        isRankLoading: false,
+        isResultLoading: false,
+        fallbackRoute: {
+          route: Routes.REWARDS_PERPS_TRADING_CAMPAIGN_DETAILS_VIEW,
+          params: { campaignId: 'campaign-perps-1' },
+        },
+      }),
+      {},
+    );
+  });
+
+  it('passes winningCode as null when outcome has no code', () => {
+    mockUseOutcome.mockReturnValue({
+      outcome: {
+        subscriptionId: 'sub-1',
+        outcomeStatus: 'finalized',
+        winnerVerificationCode: null,
+        rank: 21,
+      },
+      isLoading: false,
+      hasError: false,
+    });
+    render(<PerpsTradingCampaignWinningView />);
+    expect(mockCampaignWinningView).toHaveBeenCalledWith(
+      expect.objectContaining({
+        winningCode: null,
+        hasOutcomeLoaded: true,
+      }),
+      {},
+    );
+  });
+
+  it('does not mark outcome as loaded until the outcome exists', () => {
+    mockUseOutcome.mockReturnValue({
+      outcome: null,
+      isLoading: false,
+      hasError: false,
+    });
+    render(<PerpsTradingCampaignWinningView />);
+    expect(mockCampaignWinningView).toHaveBeenCalledWith(
+      expect.objectContaining({
+        winningCode: null,
+        hasOutcomeLoaded: false,
+      }),
+      {},
+    );
+  });
+
+  it('passes rankDisplay when rank is available', () => {
+    render(<PerpsTradingCampaignWinningView />);
+    expect(mockCampaignWinningView).toHaveBeenCalledWith(
+      expect.objectContaining({
+        rankDisplay: '3rd',
+        isRankLoading: false,
+        isResultLoading: false,
+      }),
+      {},
+    );
+  });
+
+  it('passes rank from outcome and no result when position is unavailable', () => {
+    mockUsePosition.mockReturnValue({
+      position: null,
+      isLoading: false,
+      hasError: false,
+      hasFetched: true,
+      refetch: jest.fn(),
+    });
+    render(<PerpsTradingCampaignWinningView />);
+    expect(mockCampaignWinningView).toHaveBeenCalledWith(
+      expect.objectContaining({
+        rankDisplay: '3rd',
+        resultDisplay: null,
+        isRankLoading: false,
+        isResultLoading: false,
+      }),
+      {},
+    );
+  });
+
+  it('does not pass rankDisplay when outcome has no rank', () => {
+    mockUseOutcome.mockReturnValue({
+      outcome: {
+        subscriptionId: 'sub-1',
+        outcomeStatus: 'pending',
+        winnerVerificationCode: 'CODE',
+        rank: null,
+      },
+      isLoading: false,
+      hasError: false,
+    });
+    render(<PerpsTradingCampaignWinningView />);
+    expect(mockCampaignWinningView).toHaveBeenCalledWith(
+      expect.objectContaining({
+        rankDisplay: null,
+        isRankLoading: false,
+      }),
+      {},
+    );
+  });
+});
diff --git a/app/components/UI/Rewards/Views/PerpsTradingCampaignWinningView.tsx b/app/components/UI/Rewards/Views/PerpsTradingCampaignWinningView.tsx
new file mode 100644
index 00000000000..f2a95fbd700
--- /dev/null
+++ b/app/components/UI/Rewards/Views/PerpsTradingCampaignWinningView.tsx
@@ -0,0 +1,80 @@
+import React, { useMemo } from 'react';
+import { useRoute, RouteProp } from '@react-navigation/native';
+import { usePerpsTradingCampaignParticipantOutcome } from '../hooks/usePerpsTradingCampaignParticipantOutcome';
+import { formatOrdinalRank, formatSignedUsd } from '../utils/formatUtils';
+import { useGetPerpsTradingCampaignLeaderboardPosition } from '../hooks/useGetPerpsTradingCampaignLeaderboardPosition';
+import CampaignWinningView from './CampaignWinningView';
+import Routes from '../../../../constants/navigation/Routes';
+
+const PRIZE_EMAIL = 'perpscampaign@consensys.net';
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+type PerpsTradingCampaignWinningRouteParams = {
+  RewardsPerpsTradingCampaignWinning: {
+    campaignId: string;
+    campaignName: string;
+  };
+};
+
+export const PERPS_TRADING_CAMPAIGN_WINNING_VIEW_TEST_IDS = {
+  CONTAINER: 'perps-trading-campaign-winning-view-container',
+} as const;
+
+const PerpsTradingCampaignWinningView: React.FC = () => {
+  const route =
+    useRoute<
+      RouteProp<
+        PerpsTradingCampaignWinningRouteParams,
+        'RewardsPerpsTradingCampaignWinning'
+      >
+    >();
+  const { campaignId, campaignName } = route.params;
+
+  const { outcome, isLoading: isOutcomeLoading } =
+    usePerpsTradingCampaignParticipantOutcome(campaignId);
+  const winningCode = outcome?.winnerVerificationCode ?? null;
+
+  const { position, isLoading: positionLoading } =
+    useGetPerpsTradingCampaignLeaderboardPosition(campaignId);
+
+  const rankDisplay = useMemo(() => {
+    if (!outcome?.rank) {
+      return null;
+    }
+    return formatOrdinalRank(outcome.rank);
+  }, [outcome]);
+
+  const resultDisplay = useMemo(() => {
+    if (!position) return null;
+    return formatSignedUsd(position.pnl);
+  }, [position]);
+
+  const fallbackRoute = useMemo(
+    () => ({
+      route: Routes.REWARDS_PERPS_TRADING_CAMPAIGN_DETAILS_VIEW,
+      params: { campaignId },
+    }),
+    [campaignId],
+  );
+
+  return (
+    <CampaignWinningView
+      testID={PERPS_TRADING_CAMPAIGN_WINNING_VIEW_TEST_IDS.CONTAINER}
+      viewName="PerpsTradingCampaignWinningView"
+      prizeEmail={PRIZE_EMAIL}
+      campaignName={campaignName}
+      campaignId={campaignId}
+      analyticsPageType="perps_trading_campaign_winning"
+      winningCode={winningCode}
+      hasOutcomeLoaded={Boolean(outcome)}
+      isLoading={isOutcomeLoading}
+      rankDisplay={rankDisplay}
+      resultDisplay={resultDisplay}
+      isRankLoading={isOutcomeLoading}
+      isResultLoading={positionLoading}
+      fallbackRoute={fallbackRoute}
+    />
+  );
+};
+
+export default PerpsTradingCampaignWinningView;
diff --git a/app/components/UI/Rewards/Views/RewardsDashboard.test.tsx b/app/components/UI/Rewards/Views/RewardsDashboard.test.tsx
index 1c5b6ff9fdb..27ccd54e53f 100644
--- a/app/components/UI/Rewards/Views/RewardsDashboard.test.tsx
+++ b/app/components/UI/Rewards/Views/RewardsDashboard.test.tsx
@@ -4,6 +4,8 @@ import { useSelector } from 'react-redux';
 import RewardsDashboard from './RewardsDashboard';
 import Routes from '../../../../constants/navigation/Routes';
 import { REWARDS_VIEW_SELECTORS } from './RewardsView.constants';
+import { useOndoOutcomeToast } from '../hooks/useOndoOutcomeToast';
+import { usePerpsTradingCampaignEndedOutcomeToast } from '../hooks/usePerpsTradingCampaignEndedOutcomeToast';
 
 // Mock dependencies
 jest.mock('react-redux', () => ({
@@ -91,26 +93,6 @@ const mockAddProperties = jest.fn(() => ({ build: mockBuild }));
 
 jest.mock('../../../hooks/useAnalytics/useAnalytics');
 
-// Mock Toast component
-jest.mock('../../../../component-library/components/Toast', () => {
-  const ReactActual = jest.requireActual('react');
-  return {
-    __esModule: true,
-    default: ReactActual.forwardRef(
-      (
-        _props: Record<string, unknown>,
-        ref: React.Ref<{ showToast: jest.Mock }>,
-      ) => {
-        ReactActual.useImperativeHandle(ref, () => ({
-          showToast: jest.fn(),
-          closeToast: jest.fn(),
-        }));
-        return ReactActual.createElement(ReactActual.Fragment, null, 'Toast');
-      },
-    ),
-  };
-});
-
 // Mock i18n
 jest.mock('../../../../../locales/i18n', () => ({
   strings: jest.fn((key: string) => {
@@ -190,6 +172,10 @@ jest.mock('../hooks/useOndoOutcomeToast', () => ({
   useOndoOutcomeToast: jest.fn(),
 }));
 
+jest.mock('../hooks/usePerpsTradingCampaignEndedOutcomeToast', () => ({
+  usePerpsTradingCampaignEndedOutcomeToast: jest.fn(),
+}));
+
 // Import mocked hooks
 import { useRewardOptinSummary } from '../hooks/useRewardOptinSummary';
 import { useRewardDashboardModals } from '../hooks/useRewardDashboardModals';
@@ -206,6 +192,13 @@ const mockUseRewardDashboardModals =
 const mockUseBulkLinkState = useBulkLinkState as jest.MockedFunction<
   typeof useBulkLinkState
 >;
+const mockUseOndoOutcomeToast = useOndoOutcomeToast as jest.MockedFunction<
+  typeof useOndoOutcomeToast
+>;
+const mockUsePerpsTradingCampaignEndedOutcomeToast =
+  usePerpsTradingCampaignEndedOutcomeToast as jest.MockedFunction<
+    typeof usePerpsTradingCampaignEndedOutcomeToast
+  >;
 
 describe('RewardsDashboard', () => {
   const mockShowUnlinkedAccountsModal = jest.fn();
@@ -340,6 +333,15 @@ describe('RewardsDashboard', () => {
       expect(getByText('Rewards')).toBeTruthy();
     });
 
+    it('mounts campaign outcome toast hooks on render', () => {
+      render(<RewardsDashboard />);
+
+      expect(mockUseOndoOutcomeToast).toHaveBeenCalledTimes(1);
+      expect(
+        mockUsePerpsTradingCampaignEndedOutcomeToast,
+      ).toHaveBeenCalledTimes(1);
+    });
+
     it('renders all child components', () => {
       // Act
       const { getByTestId } = render(<RewardsDashboard />);
diff --git a/app/components/UI/Rewards/Views/RewardsDashboard.tsx b/app/components/UI/Rewards/Views/RewardsDashboard.tsx
index bee49e20a23..3613bd3a6d5 100644
--- a/app/components/UI/Rewards/Views/RewardsDashboard.tsx
+++ b/app/components/UI/Rewards/Views/RewardsDashboard.tsx
@@ -21,9 +21,6 @@ import {
   RewardsDashboardModalType,
 } from '../hooks/useRewardDashboardModals';
 import { useBulkLinkState } from '../hooks/useBulkLinkState';
-import { useOndoOutcomeToast } from '../hooks/useOndoOutcomeToast';
-import Toast from '../../../../component-library/components/Toast';
-import { ToastRef } from '../../../../component-library/components/Toast/Toast.types';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
 import useTrackRewardsPageView from '../hooks/useTrackRewardsPageView';
@@ -32,11 +29,12 @@ import CampaignsPreview from '../components/Campaigns/CampaignsPreview';
 import EarnRewardsPreview from '../components/EarnRewards/EarnRewardsPreview';
 import BenefitsPreview from '../components/Benefits/BenefitsPreview.tsx';
 import { ScrollView } from 'react-native';
+import { useOndoOutcomeToast } from '../hooks/useOndoOutcomeToast';
+import { usePerpsTradingCampaignEndedOutcomeToast } from '../hooks/usePerpsTradingCampaignEndedOutcomeToast';
 
 const RewardsDashboard: React.FC = () => {
   const tw = useTailwind();
   const navigation = useNavigation();
-  const toastRef = useRef<ToastRef>(null);
   const subscriptionId = useSelector(selectRewardsSubscriptionId);
   const activeTab = useSelector(selectActiveTab);
   const { trackEvent, createEventBuilder } = useAnalytics();
@@ -44,6 +42,8 @@ const RewardsDashboard: React.FC = () => {
 
   useTrackRewardsPageView({ page_type: 'home' });
   useOndoOutcomeToast();
+  usePerpsTradingCampaignEndedOutcomeToast();
+
   const hideUnlinkedAccountsBanner = useSelector(
     selectHideUnlinkedAccountsBanner,
   );
@@ -217,7 +217,6 @@ const RewardsDashboard: React.FC = () => {
           </Box>
         </ScrollView>
       </SafeAreaView>
-      <Toast ref={toastRef} />
     </ErrorBoundary>
   );
 };
diff --git a/app/components/UI/Rewards/Views/RewardsReferralView.test.tsx b/app/components/UI/Rewards/Views/RewardsReferralView.test.tsx
index 6b29ccff6e5..e932cfdbf2a 100644
--- a/app/components/UI/Rewards/Views/RewardsReferralView.test.tsx
+++ b/app/components/UI/Rewards/Views/RewardsReferralView.test.tsx
@@ -22,11 +22,6 @@ jest.mock('@metamask/design-system-twrnc-preset', () => ({
   useTailwind: () => ({ style: (...args: unknown[]) => args }),
 }));
 
-jest.mock('@metamask/design-system-react-native', () => {
-  const actual = jest.requireActual('@metamask/design-system-react-native');
-  return { ...actual };
-});
-
 import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
 import {
   createMockUseAnalyticsHook,
@@ -51,27 +46,6 @@ jest.mock('../../../../../locales/i18n', () => ({
   },
 }));
 
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Text, Pressable } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({ title, onBack }: { title: string; onBack: () => void }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header' },
-          ReactActual.createElement(Text, null, title),
-          ReactActual.createElement(Pressable, {
-            onPress: onBack,
-            testID: 'header-back-button',
-          }),
-        ),
-    };
-  },
-);
-
 jest.mock('../../../Views/ErrorBoundary', () => ({
   __esModule: true,
   default: ({
diff --git a/app/components/UI/Rewards/Views/RewardsReferralView.tsx b/app/components/UI/Rewards/Views/RewardsReferralView.tsx
index 0149cdb08e4..705643b21fa 100644
--- a/app/components/UI/Rewards/Views/RewardsReferralView.tsx
+++ b/app/components/UI/Rewards/Views/RewardsReferralView.tsx
@@ -10,10 +10,10 @@ import {
   Button,
   ButtonSize,
   ButtonVariant,
+  HeaderStandard,
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../../locales/i18n';
 import ErrorBoundary from '../../../Views/ErrorBoundary';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import ReferralDetails from '../components/ReferralDetails/ReferralDetails';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
@@ -66,7 +66,7 @@ const ReferralRewardsView: React.FC = () => {
         edges={{ bottom: 'additive' }}
         style={tw.style('flex-1 bg-default')}
       >
-        <HeaderCompactStandard
+        <HeaderStandard
           title={strings('rewards.referral_title')}
           onBack={() => navigation.goBack()}
           backButtonProps={{ testID: 'header-back-button' }}
diff --git a/app/components/UI/Rewards/Views/RewardsSettingsView.test.tsx b/app/components/UI/Rewards/Views/RewardsSettingsView.test.tsx
index 39c084f1089..1e48c2b1a52 100644
--- a/app/components/UI/Rewards/Views/RewardsSettingsView.test.tsx
+++ b/app/components/UI/Rewards/Views/RewardsSettingsView.test.tsx
@@ -223,7 +223,7 @@ describe('RewardsSettingsView', () => {
       expect(getByTestId(REWARDS_SETTINGS_SAFE_AREA_TEST_ID)).toBeOnTheScreen();
     });
 
-    it('renders HeaderCompactStandard with settings title', () => {
+    it('renders HeaderStandard with settings title', () => {
       const { getByText } = renderWithNavigation(<RewardsSettingsView />);
 
       expect(getByText('Settings')).toBeOnTheScreen();
diff --git a/app/components/UI/Rewards/Views/RewardsSettingsView.tsx b/app/components/UI/Rewards/Views/RewardsSettingsView.tsx
index 0c7ca9a8ac4..9177947936a 100644
--- a/app/components/UI/Rewards/Views/RewardsSettingsView.tsx
+++ b/app/components/UI/Rewards/Views/RewardsSettingsView.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useNavigation } from '@react-navigation/native';
-import { Box } from '@metamask/design-system-react-native';
+import { Box, HeaderStandard } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { strings } from '../../../../../locales/i18n';
@@ -8,7 +8,6 @@ import ErrorBoundary from '../../../Views/ErrorBoundary';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
 import useTrackRewardsPageView from '../hooks/useTrackRewardsPageView';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import RewardSettingsAccountGroupList from '../components/Settings/RewardSettingsAccountGroupList';
 import RewardsInfoBanner from '../components/RewardsInfoBanner';
 import LinkedOffDeviceAccountsSheet from '../components/Settings/LinkedOffDeviceAccountsSheet';
@@ -52,7 +51,7 @@ const RewardsSettingsView: React.FC = () => {
         style={tw.style('flex-1 bg-default')}
         testID={REWARDS_SETTINGS_SAFE_AREA_TEST_ID}
       >
-        <HeaderCompactStandard
+        <HeaderStandard
           title={strings('rewards.settings.title')}
           onBack={() => navigation.goBack()}
           backButtonProps={{ testID: 'header-back-button' }}
diff --git a/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.test.tsx b/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.test.tsx
index b69d665482d..3ad94aa278b 100644
--- a/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.test.tsx
+++ b/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.test.tsx
@@ -14,36 +14,10 @@ jest.mock('@react-navigation/native', () => ({
   useRoute: () => ({ params: { campaignId: 'campaign-1' } }),
 }));
 
-jest.mock('@metamask/design-system-react-native', () => {
-  const actual = jest.requireActual('@metamask/design-system-react-native');
-  return { ...actual };
-});
-
 jest.mock('@metamask/design-system-twrnc-preset', () => ({
   useTailwind: () => ({ style: (...args: unknown[]) => args }),
 }));
 
-jest.mock(
-  '../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Text, Pressable } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({ title, onBack }: { title: string; onBack: () => void }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header' },
-          ReactActual.createElement(Text, null, title),
-          ReactActual.createElement(Pressable, {
-            onPress: onBack,
-            testID: 'header-back-button',
-          }),
-        ),
-    };
-  },
-);
-
 jest.mock('../../../Views/ErrorBoundary', () => {
   const ReactActual = jest.requireActual('react');
   return {
@@ -279,7 +253,7 @@ describe('SeasonOneCampaignDetailsView', () => {
         campaigns: [createTestCampaign()],
       });
       const { getByTestId } = render(<SeasonOneCampaignDetailsView />);
-      fireEvent.press(getByTestId('header-back-button'));
+      fireEvent.press(getByTestId('season-one-campaign-details-back-button'));
       expect(mockGoBack).toHaveBeenCalledTimes(1);
     });
   });
diff --git a/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.tsx b/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.tsx
index e771ad0b6d1..f7e71080e66 100644
--- a/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.tsx
+++ b/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.tsx
@@ -1,10 +1,13 @@
 import React, { useMemo } from 'react';
+import {
+  HeaderStandard,
+  Box,
+  Skeleton,
+} from '@metamask/design-system-react-native';
 import { ScrollView } from 'react-native';
 import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
-import { Box, Skeleton } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import ErrorBoundary from '../../../Views/ErrorBoundary';
 import PreviousSeasonSummary from '../components/PreviousSeason/PreviousSeasonSummary';
 import RewardsErrorBanner from '../components/RewardsErrorBanner';
@@ -52,7 +55,8 @@ const SeasonOneCampaignDetailsView: React.FC = () => {
         edges={{ bottom: 'additive' }}
         style={tw.style('flex-1 bg-default')}
       >
-        <HeaderCompactStandard
+        <HeaderStandard
+          testID="header"
           title={campaign?.name ?? ''}
           onBack={() => navigation.goBack()}
           backButtonProps={{
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignEndedStats.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignEndedStats.tsx
index 59b768e2f23..d9cfefa4068 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignEndedStats.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignEndedStats.tsx
@@ -8,7 +8,7 @@ import {
   TextVariant,
 } from '@metamask/design-system-react-native';
 import type { CampaignLeaderboardDto } from '../../../../../core/Engine/controllers/rewards-controller/types';
-import { StatCell } from './CampaignStatsSummary';
+import { StatCell } from './OndoCampaignStatsSummary';
 import RewardsErrorBanner from '../RewardsErrorBanner';
 import { strings } from '../../../../../../locales/i18n';
 import { formatCompactUsd, formatPercentChange } from '../../utils/formatUtils';
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignLeaderboard.test.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignLeaderboard.test.tsx
new file mode 100644
index 00000000000..bcf271f5968
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignLeaderboard.test.tsx
@@ -0,0 +1,153 @@
+import React from 'react';
+import { render } from '@testing-library/react-native';
+import { Skeleton } from '@metamask/design-system-react-native';
+import {
+  CampaignLeaderboardEntryRow,
+  CampaignLeaderboardNeighborSeparator,
+  CampaignLeaderboardSkeleton,
+  CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS,
+} from './CampaignLeaderboard';
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const ReactActual = jest.requireActual('react');
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  const { View } = jest.requireActual('react-native');
+  /** Avoid Skeleton Animated/act noise while keeping type identity for row counts. */
+  function SkeletonMock(props: object) {
+    return ReactActual.createElement(View, props);
+  }
+  SkeletonMock.displayName = 'Skeleton';
+  return {
+    ...actual,
+    Skeleton: SkeletonMock,
+  };
+});
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({ style: (...args: unknown[]) => args }),
+}));
+
+jest.mock('../../../../../images/rewards/crown.svg', () => 'CrownIcon');
+
+jest.mock('./OndoCampaignStatsSummary', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    PendingTag: ({ testID }: { testID?: string }) =>
+      ReactActual.createElement(View, { testID }),
+  };
+});
+
+const IDS = CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS;
+
+const baseEntry = {
+  rank: 7,
+  referralCode: 'USER01',
+  qualified: true,
+};
+
+describe('CampaignLeaderboardEntryRow', () => {
+  it('renders padded rank, referral code, and formatted metric', () => {
+    const formatPrimaryMetric = jest.fn(() => '+12.5%');
+    const isPositivePrimaryMetric = jest.fn(() => true);
+
+    const { getByText } = render(
+      <CampaignLeaderboardEntryRow
+        entry={baseEntry}
+        formatPrimaryMetric={formatPrimaryMetric}
+        isPositivePrimaryMetric={isPositivePrimaryMetric}
+      />,
+    );
+
+    expect(getByText('07')).toBeDefined();
+    expect(getByText('USER01')).toBeDefined();
+    expect(getByText('+12.5%')).toBeDefined();
+    expect(formatPrimaryMetric).toHaveBeenCalledWith(baseEntry);
+    expect(isPositivePrimaryMetric).toHaveBeenCalledWith(baseEntry);
+  });
+
+  it('sets row testID from shared ENTRY_ROW and rank', () => {
+    const { getByTestId } = render(
+      <CampaignLeaderboardEntryRow
+        entry={{ ...baseEntry, rank: 3 }}
+        formatPrimaryMetric={() => 'm'}
+        isPositivePrimaryMetric={() => true}
+      />,
+    );
+
+    expect(getByTestId(`${IDS.ENTRY_ROW}-3`)).toBeDefined();
+  });
+
+  it('shows pending tag when current user is unqualified and campaign is active', () => {
+    const { getByTestId } = render(
+      <CampaignLeaderboardEntryRow
+        entry={{ ...baseEntry, qualified: false }}
+        isCurrentUser
+        formatPrimaryMetric={() => '$0.00'}
+        isPositivePrimaryMetric={() => false}
+      />,
+    );
+
+    expect(getByTestId(IDS.PENDING_TAG)).toBeDefined();
+  });
+
+  it('hides pending tag when campaign is complete', () => {
+    const { queryByTestId } = render(
+      <CampaignLeaderboardEntryRow
+        entry={{ ...baseEntry, qualified: false }}
+        isCurrentUser
+        isCampaignComplete
+        formatPrimaryMetric={() => '$0.00'}
+        isPositivePrimaryMetric={() => false}
+      />,
+    );
+
+    expect(queryByTestId(IDS.PENDING_TAG)).toBeNull();
+  });
+
+  it('hides pending tag when row is not the current user', () => {
+    const { queryByTestId } = render(
+      <CampaignLeaderboardEntryRow
+        entry={{ ...baseEntry, qualified: false }}
+        isCurrentUser={false}
+        formatPrimaryMetric={() => '$0.00'}
+        isPositivePrimaryMetric={() => false}
+      />,
+    );
+
+    expect(queryByTestId(IDS.PENDING_TAG)).toBeNull();
+  });
+});
+
+describe('CampaignLeaderboardSkeleton', () => {
+  it('uses shared LOADING testID', () => {
+    const { getByTestId } = render(<CampaignLeaderboardSkeleton />);
+
+    expect(getByTestId(IDS.LOADING)).toBeDefined();
+  });
+
+  it('renders default skeleton row count (10 rows × 3 skeletons each)', () => {
+    const { UNSAFE_getAllByType } = render(<CampaignLeaderboardSkeleton />);
+
+    expect(UNSAFE_getAllByType(Skeleton)).toHaveLength(30);
+  });
+
+  it('respects skeletonRowCount', () => {
+    const { UNSAFE_getAllByType } = render(
+      <CampaignLeaderboardSkeleton skeletonRowCount={4} />,
+    );
+
+    expect(UNSAFE_getAllByType(Skeleton)).toHaveLength(12);
+  });
+});
+
+describe('CampaignLeaderboardNeighborSeparator', () => {
+  it('uses shared NEIGHBOR_SEPARATOR testID and ellipsis label', () => {
+    const { getByTestId, getByText } = render(
+      <CampaignLeaderboardNeighborSeparator />,
+    );
+
+    expect(getByTestId(IDS.NEIGHBOR_SEPARATOR)).toBeDefined();
+    expect(getByText('•••')).toBeDefined();
+  });
+});
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignLeaderboard.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignLeaderboard.tsx
new file mode 100644
index 00000000000..45b9fa6eb2e
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignLeaderboard.tsx
@@ -0,0 +1,177 @@
+import React from 'react';
+import {
+  Box,
+  BoxFlexDirection,
+  BoxAlignItems,
+  BoxJustifyContent,
+  Text,
+  TextColor,
+  TextVariant,
+  FontWeight,
+  Skeleton,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import CrownIcon from '../../../../../images/rewards/crown.svg';
+import { PendingTag } from './OndoCampaignStatsSummary';
+
+/** Shared testIDs for leaderboard rows, pending tag, separator, and skeleton (Ondo + Perps). */
+export const CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS = {
+  ENTRY_ROW: 'campaign-leaderboard-entry-row',
+  PENDING_TAG: 'campaign-leaderboard-pending-tag',
+  NEIGHBOR_SEPARATOR: 'campaign-leaderboard-neighbor-separator',
+  LOADING: 'campaign-leaderboard-loading',
+} as const;
+
+/** Fields required to render a campaign leaderboard row (Ondo, Perps, etc.). */
+export interface CampaignLeaderboardRowEntry {
+  rank: number;
+  referralCode: string;
+  qualified: boolean;
+}
+
+export interface CampaignLeaderboardEntryRowProps<
+  T extends CampaignLeaderboardRowEntry,
+> {
+  entry: T;
+  isCurrentUser?: boolean;
+  showCrown?: boolean;
+  /** When true, hides the pending tag for the current user’s row (campaign ended). */
+  isCampaignComplete?: boolean;
+  formatPrimaryMetric: (entry: T) => string;
+  isPositivePrimaryMetric: (entry: T) => boolean;
+}
+
+export function CampaignLeaderboardEntryRow<
+  T extends CampaignLeaderboardRowEntry,
+>({
+  entry,
+  isCurrentUser = false,
+  showCrown = false,
+  isCampaignComplete = false,
+  formatPrimaryMetric,
+  isPositivePrimaryMetric,
+}: CampaignLeaderboardEntryRowProps<T>) {
+  const isPositive = isPositivePrimaryMetric(entry);
+  const textColor = isCurrentUser
+    ? isPositive
+      ? TextColor.SuccessDefault
+      : TextColor.ErrorDefault
+    : TextColor.TextDefault;
+  const isPending = !entry.qualified;
+  const rowBg = isCurrentUser
+    ? isPending
+      ? 'bg-muted'
+      : isPositive
+        ? 'bg-success-muted'
+        : 'bg-error-muted'
+    : '';
+
+  const showPendingTag = isCurrentUser && isPending && !isCampaignComplete;
+
+  return (
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      alignItems={BoxAlignItems.Center}
+      justifyContent={BoxJustifyContent.Between}
+      twClassName={`py-2 px-4 ${rowBg}`}
+      testID={`${CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.ENTRY_ROW}-${entry.rank}`}
+    >
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        twClassName="gap-3"
+      >
+        <Text variant={TextVariant.BodyMd} color={textColor} twClassName="w-8">
+          {String(entry.rank).padStart(2, '0')}
+        </Text>
+        <Box twClassName="flex-row items-center gap-1">
+          <Text
+            variant={TextVariant.BodyMd}
+            fontWeight={FontWeight.Medium}
+            color={textColor}
+          >
+            {entry.referralCode}
+          </Text>
+          {showCrown && entry.rank <= 5 && (
+            <CrownIcon name="crown" width={14} height={14} />
+          )}
+        </Box>
+        {showPendingTag && (
+          <PendingTag
+            testID={CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.PENDING_TAG}
+          />
+        )}
+      </Box>
+      <Text
+        variant={TextVariant.BodyMd}
+        fontWeight={FontWeight.Medium}
+        color={textColor}
+      >
+        {formatPrimaryMetric(entry)}
+      </Text>
+    </Box>
+  );
+}
+
+export interface CampaignLeaderboardSkeletonProps {
+  /** Number of placeholder rows (default 10; Perps uses 5). */
+  skeletonRowCount?: number;
+}
+
+const DEFAULT_SKELETON_ROW_COUNT = 10;
+
+export const CampaignLeaderboardSkeleton: React.FC<
+  CampaignLeaderboardSkeletonProps
+> = ({ skeletonRowCount = DEFAULT_SKELETON_ROW_COUNT }) => {
+  const tw = useTailwind();
+  const rows = Array.from(
+    { length: skeletonRowCount },
+    (_, index) => index + 1,
+  );
+
+  return (
+    <Box testID={CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.LOADING}>
+      <Box twClassName="rounded-xl overflow-hidden">
+        {rows.map((i) => (
+          <Box key={i}>
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              justifyContent={BoxJustifyContent.Between}
+              alignItems={BoxAlignItems.Center}
+              twClassName="py-1 px-4"
+            >
+              <Box
+                flexDirection={BoxFlexDirection.Row}
+                alignItems={BoxAlignItems.Center}
+                twClassName="gap-3"
+              >
+                <Skeleton style={tw.style('h-5 w-8 rounded')} />
+                <Skeleton style={tw.style('h-5 w-20 rounded')} />
+              </Box>
+              <Skeleton style={tw.style('h-5 w-16 rounded')} />
+            </Box>
+          </Box>
+        ))}
+      </Box>
+    </Box>
+  );
+};
+
+export const CampaignLeaderboardNeighborSeparator: React.FC = () => (
+  <Box
+    flexDirection={BoxFlexDirection.Row}
+    alignItems={BoxAlignItems.Center}
+    twClassName="py-1"
+    testID={CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.NEIGHBOR_SEPARATOR}
+  >
+    <Box twClassName="flex-1 border-b border-border-muted" />
+    <Text
+      variant={TextVariant.BodyMd}
+      color={TextColor.TextAlternative}
+      twClassName="px-3"
+    >
+      •••
+    </Text>
+    <Box twClassName="flex-1 border-b border-border-muted" />
+  </Box>
+);
diff --git a/app/components/UI/Rewards/components/Campaigns/OndoCampaignOutcomeBanners.test.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignOutcomeBanners.test.tsx
similarity index 67%
rename from app/components/UI/Rewards/components/Campaigns/OndoCampaignOutcomeBanners.test.tsx
rename to app/components/UI/Rewards/components/Campaigns/CampaignOutcomeBanners.test.tsx
index 0b623fd0e53..56d7c49a5ba 100644
--- a/app/components/UI/Rewards/components/Campaigns/OndoCampaignOutcomeBanners.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignOutcomeBanners.test.tsx
@@ -5,8 +5,8 @@ import {
   WinnerFinalizedBanner,
   ParticipantFinalizedBanner,
   ParticipantPendingBanner,
-  OndoGmCampaignOutcomeBanner,
-} from './OndoCampaignOutcomeBanners';
+  CampaignOutcomeBanner,
+} from './CampaignOutcomeBanners';
 
 jest.mock('../../../../../../locales/i18n', () => ({
   strings: (key: string) => key,
@@ -28,13 +28,13 @@ jest.mock('../RewardsInfoBanner', () => {
 });
 
 describe('WinnerPendingBanner', () => {
-  it('renders title and description', () => {
+  it('renders title and description using consolidated locale keys', () => {
     const { getByText } = render(<WinnerPendingBanner onPress={jest.fn()} />);
     expect(
-      getByText('rewards.ondo_outcome_banner.winner_pending.title'),
+      getByText('rewards.campaign_outcome_banner.winner_pending.title'),
     ).toBeDefined();
     expect(
-      getByText('rewards.ondo_outcome_banner.winner_pending.description'),
+      getByText('rewards.campaign_outcome_banner.winner_pending.description'),
     ).toBeDefined();
   });
 
@@ -43,7 +43,7 @@ describe('WinnerPendingBanner', () => {
       <WinnerPendingBanner onPress={jest.fn()} />,
     );
     expect(
-      getByLabelText('rewards.ondo_outcome_banner.winner_pending.a11y'),
+      getByLabelText('rewards.campaign_outcome_banner.winner_pending.a11y'),
     ).toBeDefined();
   });
 
@@ -53,51 +53,53 @@ describe('WinnerPendingBanner', () => {
       <WinnerPendingBanner onPress={onPress} />,
     );
     fireEvent.press(
-      getByLabelText('rewards.ondo_outcome_banner.winner_pending.a11y'),
+      getByLabelText('rewards.campaign_outcome_banner.winner_pending.a11y'),
     );
     expect(onPress).toHaveBeenCalledTimes(1);
   });
 });
 
 describe('WinnerFinalizedBanner', () => {
-  it('renders with winner_finalized strings', () => {
+  it('renders with consolidated winner_finalized strings', () => {
     const { getByText } = render(<WinnerFinalizedBanner />);
     expect(
-      getByText('rewards.ondo_outcome_banner.winner_finalized.title'),
+      getByText('rewards.campaign_outcome_banner.winner_finalized.title'),
     ).toBeDefined();
     expect(
-      getByText('rewards.ondo_outcome_banner.winner_finalized.description'),
+      getByText('rewards.campaign_outcome_banner.winner_finalized.description'),
     ).toBeDefined();
   });
 });
 
 describe('ParticipantFinalizedBanner', () => {
-  it('renders with participant_finalized strings', () => {
+  it('renders with consolidated participant_finalized strings', () => {
     const { getByText } = render(<ParticipantFinalizedBanner />);
     expect(
-      getByText('rewards.ondo_outcome_banner.participant_finalized.title'),
+      getByText('rewards.campaign_outcome_banner.participant_finalized.title'),
     ).toBeDefined();
     expect(
       getByText(
-        'rewards.ondo_outcome_banner.participant_finalized.description',
+        'rewards.campaign_outcome_banner.participant_finalized.description',
       ),
     ).toBeDefined();
   });
 });
 
 describe('ParticipantPendingBanner', () => {
-  it('renders with participant_pending strings', () => {
+  it('renders with consolidated participant_pending strings', () => {
     const { getByText } = render(<ParticipantPendingBanner />);
     expect(
-      getByText('rewards.ondo_outcome_banner.participant_pending.title'),
+      getByText('rewards.campaign_outcome_banner.participant_pending.title'),
     ).toBeDefined();
     expect(
-      getByText('rewards.ondo_outcome_banner.participant_pending.description'),
+      getByText(
+        'rewards.campaign_outcome_banner.participant_pending.description',
+      ),
     ).toBeDefined();
   });
 });
 
-describe('OndoGmCampaignOutcomeBanner', () => {
+describe('CampaignOutcomeBanner', () => {
   const onWinnerPress = jest.fn();
 
   beforeEach(() => {
@@ -106,83 +108,83 @@ describe('OndoGmCampaignOutcomeBanner', () => {
 
   it('renders WinnerPendingBanner when winner code is present and status is pending', () => {
     const { getByLabelText } = render(
-      <OndoGmCampaignOutcomeBanner
+      <CampaignOutcomeBanner
         outcomeStatus="pending"
         winnerVerificationCode="LVL346"
         onWinnerPress={onWinnerPress}
       />,
     );
     expect(
-      getByLabelText('rewards.ondo_outcome_banner.winner_pending.a11y'),
+      getByLabelText('rewards.campaign_outcome_banner.winner_pending.a11y'),
     ).toBeDefined();
   });
 
   it('renders WinnerFinalizedBanner when winner code is present and status is finalized', () => {
     const { getByText, queryByLabelText } = render(
-      <OndoGmCampaignOutcomeBanner
+      <CampaignOutcomeBanner
         outcomeStatus="finalized"
         winnerVerificationCode="LVL346"
         onWinnerPress={onWinnerPress}
       />,
     );
     expect(
-      getByText('rewards.ondo_outcome_banner.winner_finalized.title'),
+      getByText('rewards.campaign_outcome_banner.winner_finalized.title'),
     ).toBeDefined();
     expect(
-      queryByLabelText('rewards.ondo_outcome_banner.winner_pending.a11y'),
+      queryByLabelText('rewards.campaign_outcome_banner.winner_pending.a11y'),
     ).toBeNull();
   });
 
   it('renders ParticipantFinalizedBanner when no code and status is finalized', () => {
     const { getByText } = render(
-      <OndoGmCampaignOutcomeBanner
+      <CampaignOutcomeBanner
         outcomeStatus="finalized"
         winnerVerificationCode={null}
         onWinnerPress={onWinnerPress}
       />,
     );
     expect(
-      getByText('rewards.ondo_outcome_banner.participant_finalized.title'),
+      getByText('rewards.campaign_outcome_banner.participant_finalized.title'),
     ).toBeDefined();
   });
 
   it('renders ParticipantPendingBanner when no code and status is pending', () => {
     const { getByText } = render(
-      <OndoGmCampaignOutcomeBanner
+      <CampaignOutcomeBanner
         outcomeStatus="pending"
         winnerVerificationCode={null}
         onWinnerPress={onWinnerPress}
       />,
     );
     expect(
-      getByText('rewards.ondo_outcome_banner.participant_pending.title'),
+      getByText('rewards.campaign_outcome_banner.participant_pending.title'),
     ).toBeDefined();
   });
 
   it('renders ParticipantPendingBanner when winnerVerificationCode is undefined', () => {
     const { getByText } = render(
-      <OndoGmCampaignOutcomeBanner
+      <CampaignOutcomeBanner
         outcomeStatus="pending"
         winnerVerificationCode={undefined}
         onWinnerPress={onWinnerPress}
       />,
     );
     expect(
-      getByText('rewards.ondo_outcome_banner.participant_pending.title'),
+      getByText('rewards.campaign_outcome_banner.participant_pending.title'),
     ).toBeDefined();
   });
 
   it('calls onWinnerPress when WinnerPendingBanner is pressed', () => {
     const mockOnWinnerPress = jest.fn();
     const { getByLabelText } = render(
-      <OndoGmCampaignOutcomeBanner
+      <CampaignOutcomeBanner
         outcomeStatus="pending"
         winnerVerificationCode="LVL346"
         onWinnerPress={mockOnWinnerPress}
       />,
     );
     fireEvent.press(
-      getByLabelText('rewards.ondo_outcome_banner.winner_pending.a11y'),
+      getByLabelText('rewards.campaign_outcome_banner.winner_pending.a11y'),
     );
     expect(mockOnWinnerPress).toHaveBeenCalledTimes(1);
   });
diff --git a/app/components/UI/Rewards/components/Campaigns/OndoCampaignOutcomeBanners.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignOutcomeBanners.tsx
similarity index 53%
rename from app/components/UI/Rewards/components/Campaigns/OndoCampaignOutcomeBanners.tsx
rename to app/components/UI/Rewards/components/Campaigns/CampaignOutcomeBanners.tsx
index 5127253bbb7..3402bca2d41 100644
--- a/app/components/UI/Rewards/components/Campaigns/OndoCampaignOutcomeBanners.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignOutcomeBanners.tsx
@@ -15,7 +15,7 @@ import {
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../../../locales/i18n';
 import RewardsInfoBanner from '../RewardsInfoBanner';
-import type { OndoGmCampaignParticipantOutcomeStatus } from '../../../../../core/Engine/controllers/rewards-controller/types';
+import type { CampaignParticipantOutcomeStatus } from '../../../../../core/Engine/controllers/rewards-controller/types';
 
 export interface WinnerPendingBannerProps {
   onPress: () => void;
@@ -25,7 +25,7 @@ export const WinnerPendingBanner = React.memo<WinnerPendingBannerProps>(
   ({ onPress }) => (
     <Pressable
       accessibilityLabel={strings(
-        'rewards.ondo_outcome_banner.winner_pending.a11y',
+        'rewards.campaign_outcome_banner.winner_pending.a11y',
       )}
       onPress={onPress}
     >
@@ -36,10 +36,12 @@ export const WinnerPendingBanner = React.memo<WinnerPendingBannerProps>(
       >
         <Box twClassName="flex-1 gap-0.5">
           <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
-            {strings('rewards.ondo_outcome_banner.winner_pending.title')}
+            {strings('rewards.campaign_outcome_banner.winner_pending.title')}
           </Text>
           <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
-            {strings('rewards.ondo_outcome_banner.winner_pending.description')}
+            {strings(
+              'rewards.campaign_outcome_banner.winner_pending.description',
+            )}
           </Text>
         </Box>
         <Icon
@@ -54,46 +56,47 @@ export const WinnerPendingBanner = React.memo<WinnerPendingBannerProps>(
 
 export const WinnerFinalizedBanner = React.memo(() => (
   <RewardsInfoBanner
-    title={strings('rewards.ondo_outcome_banner.winner_finalized.title')}
+    title={strings('rewards.campaign_outcome_banner.winner_finalized.title')}
     description={strings(
-      'rewards.ondo_outcome_banner.winner_finalized.description',
+      'rewards.campaign_outcome_banner.winner_finalized.description',
     )}
   />
 ));
 
 export const ParticipantFinalizedBanner = React.memo(() => (
   <RewardsInfoBanner
-    title={strings('rewards.ondo_outcome_banner.participant_finalized.title')}
+    title={strings(
+      'rewards.campaign_outcome_banner.participant_finalized.title',
+    )}
     description={strings(
-      'rewards.ondo_outcome_banner.participant_finalized.description',
+      'rewards.campaign_outcome_banner.participant_finalized.description',
     )}
   />
 ));
 
 export const ParticipantPendingBanner = React.memo(() => (
   <RewardsInfoBanner
-    title={strings('rewards.ondo_outcome_banner.participant_pending.title')}
+    title={strings('rewards.campaign_outcome_banner.participant_pending.title')}
     description={strings(
-      'rewards.ondo_outcome_banner.participant_pending.description',
+      'rewards.campaign_outcome_banner.participant_pending.description',
     )}
   />
 ));
 
-export interface OndoGmCampaignOutcomeBannerProps {
-  outcomeStatus: OndoGmCampaignParticipantOutcomeStatus;
+export interface CampaignOutcomeBannerProps {
+  outcomeStatus: CampaignParticipantOutcomeStatus;
   winnerVerificationCode: string | null | undefined;
   onWinnerPress: () => void;
 }
 
-export const OndoGmCampaignOutcomeBanner =
-  React.memo<OndoGmCampaignOutcomeBannerProps>(
-    ({ outcomeStatus, winnerVerificationCode, onWinnerPress }) => {
-      const hasCode = Boolean(winnerVerificationCode);
-      const isFinalized = outcomeStatus === 'finalized';
-      if (hasCode && !isFinalized)
-        return <WinnerPendingBanner onPress={onWinnerPress} />;
-      if (hasCode && isFinalized) return <WinnerFinalizedBanner />;
-      if (isFinalized) return <ParticipantFinalizedBanner />;
-      return <ParticipantPendingBanner />;
-    },
-  );
+export const CampaignOutcomeBanner = React.memo<CampaignOutcomeBannerProps>(
+  ({ outcomeStatus, winnerVerificationCode, onWinnerPress }) => {
+    const hasCode = Boolean(winnerVerificationCode);
+    const isFinalized = outcomeStatus === 'finalized';
+    if (hasCode && !isFinalized)
+      return <WinnerPendingBanner onPress={onWinnerPress} />;
+    if (hasCode && isFinalized) return <WinnerFinalizedBanner />;
+    if (isFinalized) return <ParticipantFinalizedBanner />;
+    return <ParticipantPendingBanner />;
+  },
+);
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignReminder.test.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignReminder.test.tsx
new file mode 100644
index 00000000000..d9b27232060
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignReminder.test.tsx
@@ -0,0 +1,345 @@
+import React from 'react';
+import { render, fireEvent, waitFor, act } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import CampaignReminder from './CampaignReminder';
+import {
+  buildCampaignReminderCompositeKey,
+  reminderStorageKeyForComposite,
+} from '../../hooks/useCampaignReminderActions';
+import {
+  type CampaignDto,
+  CampaignType,
+} from '../../../../../core/Engine/controllers/rewards-controller/types';
+import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import { selectRewardsSubscriptionId } from '../../../../../selectors/rewards';
+import {
+  selectIsMetamaskNotificationsEnabled,
+  selectIsMetaMaskPushNotificationsEnabled,
+} from '../../../../../selectors/notifications';
+import { isNotificationsFeatureEnabled } from '../../../../../util/notifications/constants';
+
+const mockTrackEvent = jest.fn();
+const mockCreateEventBuilder = jest.fn();
+const mockShowToast = jest.fn();
+const mockEnableNotifications = jest.fn();
+const mockEnableNotificationsNudge = jest.fn(
+  (linkButtonOptions: { label: string; onPress: () => Promise<void> }) => ({
+    variant: 'Plain',
+    hasNoTimeout: true,
+    linkButtonOptions,
+    closeButtonOptions: {
+      onPress: jest.fn(),
+    },
+  }),
+);
+let mockEnableNotificationsLoading = false;
+
+const TEST_REWARDS_SUBSCRIPTION_ID = 'test-rewards-sub-id';
+
+const mockGetItemSync = jest.fn((_key: string): string | null => null);
+const mockSetItem = jest.fn(
+  (_key: string, _value: string): Promise<void> => Promise.resolve(),
+);
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(),
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+
+jest.mock('../../../../../store/storage-wrapper', () => ({
+  __esModule: true,
+  default: {
+    getItemSync: (key: string) => mockGetItemSync(key),
+    setItem: (key: string, value: string) => mockSetItem(key, value),
+  },
+}));
+
+jest.mock('../../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: jest.fn(() => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  })),
+}));
+
+jest.mock('../../hooks/useRewardsToast', () => ({
+  __esModule: true,
+  default: jest.fn(() => ({
+    showToast: mockShowToast,
+    RewardsToastOptions: {
+      success: jest.fn((title: string, subtitle?: string) => ({
+        variant: 'success',
+        title,
+        subtitle,
+      })),
+      error: jest.fn((title: string, subtitle?: string) => ({
+        variant: 'error',
+        title,
+        subtitle,
+      })),
+      enableNotificationsNudge: mockEnableNotificationsNudge,
+      loading: jest.fn((title: string, subtitle?: string) => ({
+        variant: 'loading',
+        title,
+        subtitle,
+      })),
+      entriesClosed: jest.fn(),
+    },
+  })),
+}));
+
+jest.mock('../../../../../util/notifications/hooks/useNotifications', () => ({
+  useEnableNotifications: jest.fn(() => ({
+    enableNotifications: mockEnableNotifications,
+    loading: mockEnableNotificationsLoading,
+  })),
+}));
+
+jest.mock('../../../../../util/notifications/constants', () => ({
+  isNotificationsFeatureEnabled: jest.fn(() => true),
+}));
+
+jest.mock(
+  '../../../../../util/notifications/services/NotificationService',
+  () => ({
+    __esModule: true,
+    default: { openSystemSettings: jest.fn() },
+    getPushPermission: jest.fn().mockResolvedValue('authorized'),
+  }),
+);
+
+jest.mock('../../../../../images/rewards/notification.svg', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: () =>
+      ReactActual.createElement(View, { testID: 'campaign-reminder-svg' }),
+  };
+});
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  return { ...actual };
+});
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({ style: (...args: unknown[]) => args }),
+}));
+
+jest.mock('../../../../../../locales/i18n', () => ({
+  strings: (key: string) => {
+    const translations: Record<string, string> = {
+      'rewards.campaign.up_next': 'Up next',
+      'rewards.campaign.notify_me': 'Notify me',
+      'rewards.campaign.remind_me_success_toast': 'We will notify you.',
+      'rewards.campaign.remind_me_save_error': 'Save failed.',
+      'rewards.notifications_nudge.turn_on_button': 'Turn on',
+      'rewards.notifications_nudge.loading': 'Enabling notifications...',
+      'rewards.notifications_nudge.loading_description':
+        'This may take a moment.',
+      'rewards.notifications_nudge.enable_error':
+        'Failed to enable notifications',
+    };
+    return translations[key] || key;
+  },
+}));
+
+const createTestCampaign = (overrides = {}): CampaignDto => ({
+  id: 'campaign-reminder-1',
+  type: CampaignType.ONDO_HOLDING,
+  name: 'Preview Campaign',
+  startDate: '2028-01-01T00:00:00.000Z',
+  endDate: '2028-12-31T23:59:59.999Z',
+  termsAndConditions: null,
+  excludedRegions: [],
+  details: null,
+  featured: true,
+  showUpcomingDate: false,
+  ...overrides,
+});
+
+function mockSelectors({ notificationsEnabled = true } = {}) {
+  mockUseSelector.mockImplementation((selector) => {
+    if (selector === selectRewardsSubscriptionId) {
+      return TEST_REWARDS_SUBSCRIPTION_ID;
+    }
+    if (
+      selector === selectIsMetamaskNotificationsEnabled ||
+      selector === selectIsMetaMaskPushNotificationsEnabled
+    ) {
+      return notificationsEnabled;
+    }
+    return undefined;
+  });
+}
+
+describe('CampaignReminder', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockEnableNotifications.mockResolvedValue(undefined);
+    mockEnableNotificationsLoading = false;
+    mockGetItemSync.mockReturnValue(null);
+    mockSetItem.mockResolvedValue(undefined);
+    mockSelectors();
+    mockCreateEventBuilder.mockImplementation(() => {
+      const builder = {
+        addProperties: jest.fn(),
+        build: jest.fn(() => ({})),
+      };
+      (builder.addProperties as jest.Mock).mockReturnValue(builder);
+      return builder;
+    });
+    (isNotificationsFeatureEnabled as jest.Mock).mockReturnValue(true);
+  });
+
+  it('renders up next label and campaign name', async () => {
+    const campaign = createTestCampaign({ name: 'My Upcoming Campaign' });
+    const { getByText, getByTestId } = render(
+      <CampaignReminder campaign={campaign} />,
+    );
+
+    await waitFor(() => {
+      expect(
+        getByTestId('campaign-reminder-notify-campaign-reminder-1'),
+      ).toBeOnTheScreen();
+    });
+    expect(getByText('Up next')).toBeOnTheScreen();
+    expect(getByText('My Upcoming Campaign')).toBeOnTheScreen();
+    expect(getByText('Notify me')).toBeOnTheScreen();
+  });
+
+  it('tracks reminder subscribed when Notify me is pressed', async () => {
+    const campaign = createTestCampaign({ id: 'cr-analytics' });
+    const { getByTestId } = render(<CampaignReminder campaign={campaign} />);
+
+    await waitFor(() => {
+      expect(
+        getByTestId('campaign-reminder-notify-cr-analytics'),
+      ).toBeOnTheScreen();
+    });
+
+    await act(async () => {
+      fireEvent.press(getByTestId('campaign-reminder-notify-cr-analytics'));
+    });
+
+    const compositeKey = buildCampaignReminderCompositeKey(
+      TEST_REWARDS_SUBSCRIPTION_ID,
+      'cr-analytics',
+    );
+    expect(mockSetItem).toHaveBeenCalledWith(
+      reminderStorageKeyForComposite(compositeKey),
+      '1',
+    );
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.REWARDS_CAMPAIGN_REMINDER_SUBSCRIBED,
+    );
+    expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+    expect(mockShowToast).toHaveBeenCalledTimes(1);
+  });
+
+  it('prompts for notifications and tracks only after push notifications are enabled', async () => {
+    let notificationsEnabled = false;
+    mockSelectors({ notificationsEnabled });
+    const campaign = createTestCampaign({ id: 'cr-notifications' });
+    const { getByTestId, rerender } = render(
+      <CampaignReminder campaign={campaign} />,
+    );
+
+    await waitFor(() => {
+      expect(
+        getByTestId('campaign-reminder-notify-cr-notifications'),
+      ).toBeOnTheScreen();
+    });
+
+    await act(async () => {
+      fireEvent.press(getByTestId('campaign-reminder-notify-cr-notifications'));
+    });
+
+    expect(mockEnableNotificationsNudge).toHaveBeenCalledWith(
+      expect.objectContaining({
+        label: 'Turn on',
+        onPress: expect.any(Function),
+      }),
+    );
+    expect(mockSetItem).not.toHaveBeenCalled();
+    expect(mockTrackEvent).not.toHaveBeenCalled();
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+    expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
+
+    notificationsEnabled = true;
+    mockSelectors({ notificationsEnabled });
+    rerender(<CampaignReminder campaign={campaign} />);
+
+    await waitFor(() => {
+      const compositeKey = buildCampaignReminderCompositeKey(
+        TEST_REWARDS_SUBSCRIPTION_ID,
+        'cr-notifications',
+      );
+      expect(mockSetItem).toHaveBeenCalledWith(
+        reminderStorageKeyForComposite(compositeKey),
+        '1',
+      );
+    });
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.REWARDS_CAMPAIGN_REMINDER_SUBSCRIBED,
+    );
+    expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not show Notify me when the notifications feature flag is off', async () => {
+    (isNotificationsFeatureEnabled as jest.Mock).mockReturnValue(false);
+    const campaign = createTestCampaign({ id: 'cr-feature-off' });
+    const { queryByTestId } = render(<CampaignReminder campaign={campaign} />);
+
+    await waitFor(() => {
+      expect(
+        queryByTestId('campaign-reminder-notify-cr-feature-off'),
+      ).toBeNull();
+    });
+    expect(mockShowToast).not.toHaveBeenCalled();
+  });
+
+  it('shows Notify me CTA when notifications are disabled even if reminder was already stored', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    mockGetItemSync.mockReturnValue('1');
+    const campaign = createTestCampaign({ id: 'cr-re-subscribe' });
+    const { getByTestId } = render(<CampaignReminder campaign={campaign} />);
+
+    await waitFor(() => {
+      expect(
+        getByTestId('campaign-reminder-notify-cr-re-subscribe'),
+      ).toBeOnTheScreen();
+    });
+  });
+
+  it('does not show Notify me CTA when notifications are enabled and reminder is already stored', async () => {
+    mockSelectors({ notificationsEnabled: true });
+    mockGetItemSync.mockReturnValue('1');
+    const campaign = createTestCampaign({ id: 'cr-already-stored' });
+    const { queryByTestId } = render(<CampaignReminder campaign={campaign} />);
+
+    await waitFor(() => {
+      expect(
+        queryByTestId('campaign-reminder-notify-cr-already-stored'),
+      ).toBeNull();
+    });
+  });
+});
+
+describe('campaign reminder storage helpers', () => {
+  describe('reminderStorageKeyForComposite', () => {
+    it('prefixes composite key for isolated MMKV rows', () => {
+      expect(reminderStorageKeyForComposite('sub-1:camp-2')).toBe(
+        'rewards_campaign_reminder_subscribed::sub-1:camp-2',
+      );
+    });
+  });
+});
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignReminder.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignReminder.tsx
new file mode 100644
index 00000000000..6a4e79440cf
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignReminder.tsx
@@ -0,0 +1,100 @@
+import React from 'react';
+import { Pressable } from 'react-native';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  Text,
+  TextColor,
+  TextVariant,
+  FontWeight,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { useTheme } from '../../../../../util/theme';
+import NotificationIcon from '../../../../../images/rewards/notification.svg';
+import type { CampaignDto } from '../../../../../core/Engine/controllers/rewards-controller/types';
+import { strings } from '../../../../../../locales/i18n';
+import { isCampaignTypeSupported } from './CampaignTile.utils';
+import { useCampaignReminderActions } from '../../hooks/useCampaignReminderActions';
+
+interface CampaignReminderProps {
+  campaign: CampaignDto;
+}
+
+/**
+ * Compact preview row for an upcoming featured campaign: label, name, and
+ * the same reminder flow as {@link CampaignTile}.
+ */
+const CampaignReminder: React.FC<CampaignReminderProps> = ({ campaign }) => {
+  const tw = useTailwind();
+  const { colors } = useTheme();
+  const reminderEnabled = isCampaignTypeSupported(campaign.type);
+  const { showRemindMeCta, handleRemindMePress } = useCampaignReminderActions(
+    campaign,
+    reminderEnabled,
+  );
+
+  return (
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      alignItems={BoxAlignItems.Center}
+      justifyContent={BoxJustifyContent.Between}
+      twClassName="rounded-xl bg-muted p-4 gap-3"
+      testID={`campaign-reminder-${campaign.id}`}
+    >
+      <Box
+        flexDirection={BoxFlexDirection.Column}
+        twClassName="min-w-0 flex-1 shrink gap-0.5"
+      >
+        <Text
+          variant={TextVariant.BodySm}
+          color={TextColor.TextAlternative}
+          fontWeight={FontWeight.Medium}
+        >
+          {strings('rewards.campaign.up_next')}
+        </Text>
+        <Text
+          variant={TextVariant.HeadingSm}
+          color={TextColor.TextDefault}
+          fontWeight={FontWeight.Medium}
+          numberOfLines={2}
+        >
+          {campaign.name}
+        </Text>
+      </Box>
+      {showRemindMeCta && (
+        <Pressable
+          onPress={() => {
+            handleRemindMePress().catch(() => undefined);
+          }}
+          testID={`campaign-reminder-notify-${campaign.id}`}
+          accessibilityRole="button"
+          accessibilityLabel={strings('rewards.campaign.notify_me')}
+          style={({ pressed }) =>
+            tw.style(
+              'flex-row items-center gap-1.5 rounded-lg px-4 py-3 bg-background-muted',
+              pressed && 'opacity-70',
+            )
+          }
+        >
+          <NotificationIcon
+            name="notification"
+            width={20}
+            height={20}
+            color={colors.icon.default}
+          />
+          <Text
+            variant={TextVariant.BodySm}
+            color={TextColor.TextDefault}
+            fontWeight={FontWeight.Medium}
+          >
+            {strings('rewards.campaign.notify_me')}
+          </Text>
+        </Pressable>
+      )}
+    </Box>
+  );
+};
+
+export default CampaignReminder;
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignTile.test.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignTile.test.tsx
index bf9ecc38339..e99df8af487 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignTile.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignTile.test.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
-import { render, fireEvent } from '@testing-library/react-native';
+import { render, fireEvent, waitFor, act } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
 import CampaignTile from './CampaignTile';
+import { reminderStorageKeyForComposite } from '../../hooks/useCampaignReminderActions';
 import {
   type CampaignDto,
   CampaignType,
@@ -11,8 +13,97 @@ import {
 } from './CampaignTile.utils';
 import useGetCampaignParticipantStatus from '../../hooks/useGetCampaignParticipantStatus';
 import Routes from '../../../../../constants/navigation/Routes';
+import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import { selectRewardsSubscriptionId } from '../../../../../selectors/rewards';
+import {
+  selectIsMetamaskNotificationsEnabled,
+  selectIsMetaMaskPushNotificationsEnabled,
+} from '../../../../../selectors/notifications';
+import { isNotificationsFeatureEnabled } from '../../../../../util/notifications/constants';
 
 const mockNavigate = jest.fn();
+const mockTrackEvent = jest.fn();
+const mockCreateEventBuilder = jest.fn();
+const mockShowToast = jest.fn();
+const mockEnableNotifications = jest.fn();
+const mockEnableNotificationsNudge = jest.fn(
+  (linkButtonOptions: { label: string; onPress: () => Promise<void> }) => ({
+    variant: 'Plain',
+    hasNoTimeout: true,
+    linkButtonOptions,
+    closeButtonOptions: {
+      onPress: jest.fn(),
+    },
+  }),
+);
+let mockEnableNotificationsLoading = false;
+
+const TEST_REWARDS_SUBSCRIPTION_ID = 'test-rewards-sub-id';
+
+const mockGetItemSync = jest.fn((_key: string): string | null => null);
+const mockSetItem = jest.fn(
+  (_key: string, _value: string): Promise<void> => Promise.resolve(),
+);
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(),
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+
+jest.mock('../../../../../store/storage-wrapper', () => ({
+  __esModule: true,
+  default: {
+    getItemSync: (key: string) => mockGetItemSync(key),
+    setItem: (key: string, value: string) => mockSetItem(key, value),
+  },
+}));
+
+jest.mock('../../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: jest.fn(() => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  })),
+}));
+
+jest.mock('../../hooks/useRewardsToast', () => ({
+  __esModule: true,
+  default: jest.fn(() => ({
+    showToast: mockShowToast,
+    RewardsToastOptions: {
+      success: jest.fn((title: string, subtitle?: string) => ({
+        variant: 'success',
+        title,
+        subtitle,
+      })),
+      error: jest.fn((title: string, subtitle?: string) => ({
+        variant: 'error',
+        title,
+        subtitle,
+      })),
+      enableNotificationsNudge: mockEnableNotificationsNudge,
+      entriesClosed: jest.fn(),
+      loading: jest.fn((title: string, subtitle?: string) => ({
+        variant: 'loading',
+        title,
+        subtitle,
+      })),
+    },
+  })),
+}));
+
+jest.mock('../../../../../util/notifications/hooks/useNotifications', () => ({
+  useEnableNotifications: jest.fn(() => ({
+    enableNotifications: mockEnableNotifications,
+    loading: mockEnableNotificationsLoading,
+  })),
+}));
+
+jest.mock('../../../../../util/notifications/constants', () => ({
+  isNotificationsFeatureEnabled: jest.fn(() => true),
+}));
+
 jest.mock('@react-navigation/native', () => ({
   useNavigation: jest.fn().mockReturnValue({
     navigate: (...args: unknown[]) => mockNavigate(...args),
@@ -58,6 +149,10 @@ jest.mock('../../../../../../locales/i18n', () => ({
     const translations: Record<string, string> = {
       'rewards.campaign.enter': 'Enter',
       'rewards.campaign.entered': 'Entered',
+      'rewards.campaign.notify_me': 'Notify me',
+      'rewards.campaign.remind_me_success_toast': 'We will notify you.',
+      'rewards.campaign.remind_me_save_error': 'Save failed.',
+      'rewards.notifications_nudge.turn_on_button': 'Turn on',
     };
     return translations[key] || key;
   },
@@ -89,6 +184,31 @@ function setupParticipantStatus(optedIn: boolean) {
 describe('CampaignTile', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockEnableNotifications.mockResolvedValue(undefined);
+    mockEnableNotificationsLoading = false;
+    mockGetItemSync.mockReturnValue(null);
+    mockSetItem.mockResolvedValue(undefined);
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectRewardsSubscriptionId) {
+        return TEST_REWARDS_SUBSCRIPTION_ID;
+      }
+      if (
+        selector === selectIsMetamaskNotificationsEnabled ||
+        selector === selectIsMetaMaskPushNotificationsEnabled
+      ) {
+        return true;
+      }
+      return undefined;
+    });
+    mockCreateEventBuilder.mockImplementation(() => {
+      const builder = {
+        addProperties: jest.fn(),
+        build: jest.fn(),
+      };
+      builder.addProperties.mockImplementation(() => builder);
+      builder.build.mockImplementation(() => ({ category: 'test-event' }));
+      return builder;
+    });
     (getCampaignStatusInfo as jest.Mock).mockReturnValue({
       status: 'active',
       statusLabel: 'Active',
@@ -96,6 +216,7 @@ describe('CampaignTile', () => {
       dateLabelIcon: 'Clock',
     });
     (isCampaignTypeSupported as jest.Mock).mockReturnValue(true);
+    (isNotificationsFeatureEnabled as jest.Mock).mockReturnValue(true);
     mockUseGetCampaignParticipantStatus.mockReturnValue({
       status: null,
       isLoading: false,
@@ -493,4 +614,358 @@ describe('CampaignTile', () => {
       );
     });
   });
+
+  describe('campaign reminder', () => {
+    it('shows Notify me for upcoming supported campaign', async () => {
+      (getCampaignStatusInfo as jest.Mock).mockReturnValue({
+        status: 'upcoming',
+        statusLabel: 'Coming soon',
+        dateLabel: 'Starts June 1',
+        dateLabelIcon: 'Speed',
+      });
+      const campaign = createTestCampaign({
+        id: 'camp-upcoming-remind',
+        type: CampaignType.ONDO_HOLDING,
+        startDate: '2028-06-01T12:00:00.000Z',
+      });
+
+      const { getByTestId, getByLabelText } = render(
+        <CampaignTile campaign={campaign} />,
+      );
+
+      await waitFor(() => {
+        expect(
+          getByTestId('campaign-tile-remind-me-camp-upcoming-remind'),
+        ).toBeTruthy();
+      });
+      expect(getByLabelText('Notify me')).toBeTruthy();
+    });
+
+    it('does not show Notify me for upcoming unsupported campaign type', () => {
+      (isCampaignTypeSupported as jest.Mock).mockReturnValue(false);
+      (getCampaignStatusInfo as jest.Mock).mockReturnValue({
+        status: 'upcoming',
+        statusLabel: 'Coming soon',
+        dateLabel: 'Starts June 1',
+        dateLabelIcon: 'Speed',
+      });
+      const campaign = createTestCampaign({
+        id: 'camp-upcoming-unsupported',
+        type: 'UNKNOWN_TYPE' as CampaignType,
+      });
+
+      const { queryByTestId } = render(<CampaignTile campaign={campaign} />);
+
+      expect(
+        queryByTestId('campaign-tile-remind-me-camp-upcoming-unsupported'),
+      ).toBeNull();
+    });
+
+    it('tracks reminder subscribed and shows toast when Notify me is pressed', async () => {
+      (getCampaignStatusInfo as jest.Mock).mockReturnValue({
+        status: 'upcoming',
+        statusLabel: 'Coming soon',
+        dateLabel: 'Starts June 1',
+        dateLabelIcon: 'Speed',
+      });
+      const campaign = createTestCampaign({
+        id: 'camp-remind-analytics',
+        type: CampaignType.PERPS_TRADING,
+        startDate: '2028-07-15T00:00:00.000Z',
+      });
+
+      const { getByTestId } = render(<CampaignTile campaign={campaign} />);
+      await waitFor(() => {
+        expect(
+          getByTestId('campaign-tile-remind-me-camp-remind-analytics'),
+        ).toBeTruthy();
+      });
+
+      await act(async () => {
+        fireEvent.press(
+          getByTestId('campaign-tile-remind-me-camp-remind-analytics'),
+        );
+      });
+
+      expect(mockSetItem).toHaveBeenCalledWith(
+        reminderStorageKeyForComposite(
+          `${TEST_REWARDS_SUBSCRIPTION_ID}:camp-remind-analytics`,
+        ),
+        '1',
+      );
+      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+        MetaMetricsEvents.REWARDS_CAMPAIGN_REMINDER_SUBSCRIBED,
+      );
+      const builder = mockCreateEventBuilder.mock.results[0]?.value as {
+        addProperties: jest.Mock;
+      };
+      expect(builder.addProperties).toHaveBeenCalledWith({
+        campaign_id: 'camp-remind-analytics',
+        campaign_starts_at: '2028-07-15T00:00:00.000Z',
+      });
+      expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+      expect(mockShowToast).toHaveBeenCalledTimes(1);
+    });
+
+    it('prompts for notifications and tracks only after push notifications are enabled', async () => {
+      let notificationsEnabled = false;
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectRewardsSubscriptionId) {
+          return TEST_REWARDS_SUBSCRIPTION_ID;
+        }
+        if (
+          selector === selectIsMetamaskNotificationsEnabled ||
+          selector === selectIsMetaMaskPushNotificationsEnabled
+        ) {
+          return notificationsEnabled;
+        }
+        return undefined;
+      });
+      (getCampaignStatusInfo as jest.Mock).mockReturnValue({
+        status: 'upcoming',
+        statusLabel: 'Coming soon',
+        dateLabel: 'Starts June 1',
+        dateLabelIcon: 'Speed',
+      });
+      const campaign = createTestCampaign({
+        id: 'camp-remind-notifications',
+        type: CampaignType.PERPS_TRADING,
+        startDate: '2028-07-15T00:00:00.000Z',
+      });
+
+      const { getByTestId, rerender } = render(
+        <CampaignTile campaign={campaign} />,
+      );
+      await waitFor(() => {
+        expect(
+          getByTestId('campaign-tile-remind-me-camp-remind-notifications'),
+        ).toBeTruthy();
+      });
+
+      await act(async () => {
+        fireEvent.press(
+          getByTestId('campaign-tile-remind-me-camp-remind-notifications'),
+        );
+      });
+
+      expect(mockEnableNotificationsNudge).toHaveBeenCalledWith(
+        expect.objectContaining({
+          label: 'Turn on',
+          onPress: expect.any(Function),
+        }),
+      );
+      expect(mockSetItem).not.toHaveBeenCalled();
+      expect(mockTrackEvent).not.toHaveBeenCalled();
+
+      const linkButtonOptions = mockEnableNotificationsNudge.mock
+        .calls[0][0] as {
+        onPress: () => Promise<void>;
+      };
+      await act(async () => {
+        await linkButtonOptions.onPress();
+      });
+      expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
+
+      notificationsEnabled = true;
+      rerender(<CampaignTile campaign={campaign} />);
+
+      await waitFor(() => {
+        expect(mockSetItem).toHaveBeenCalledWith(
+          reminderStorageKeyForComposite(
+            `${TEST_REWARDS_SUBSCRIPTION_ID}:camp-remind-notifications`,
+          ),
+          '1',
+        );
+      });
+      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+        MetaMetricsEvents.REWARDS_CAMPAIGN_REMINDER_SUBSCRIBED,
+      );
+      expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+    });
+
+    it('cancels pending reminder subscription when the notifications nudge is dismissed', async () => {
+      let notificationsEnabled = false;
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectRewardsSubscriptionId) {
+          return TEST_REWARDS_SUBSCRIPTION_ID;
+        }
+        if (
+          selector === selectIsMetamaskNotificationsEnabled ||
+          selector === selectIsMetaMaskPushNotificationsEnabled
+        ) {
+          return notificationsEnabled;
+        }
+        return undefined;
+      });
+      (getCampaignStatusInfo as jest.Mock).mockReturnValue({
+        status: 'upcoming',
+        statusLabel: 'Coming soon',
+        dateLabel: 'Starts June 1',
+        dateLabelIcon: 'Speed',
+      });
+      const campaign = createTestCampaign({
+        id: 'camp-dismiss-nudge',
+        type: CampaignType.PERPS_TRADING,
+        startDate: '2028-07-15T00:00:00.000Z',
+      });
+
+      const { getByTestId, rerender } = render(
+        <CampaignTile campaign={campaign} />,
+      );
+      await waitFor(() => {
+        expect(
+          getByTestId('campaign-tile-remind-me-camp-dismiss-nudge'),
+        ).toBeTruthy();
+      });
+
+      await act(async () => {
+        fireEvent.press(
+          getByTestId('campaign-tile-remind-me-camp-dismiss-nudge'),
+        );
+      });
+
+      const toastConfig = mockShowToast.mock.calls[0][0] as {
+        closeButtonOptions: { onPress: () => void };
+      };
+      act(() => {
+        toastConfig.closeButtonOptions.onPress();
+      });
+
+      notificationsEnabled = true;
+      rerender(<CampaignTile campaign={campaign} />);
+
+      expect(mockSetItem).not.toHaveBeenCalled();
+      expect(mockTrackEvent).not.toHaveBeenCalled();
+    });
+
+    it('does not show Notify me when the notifications feature flag is off', async () => {
+      (isNotificationsFeatureEnabled as jest.Mock).mockReturnValue(false);
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectRewardsSubscriptionId) {
+          return TEST_REWARDS_SUBSCRIPTION_ID;
+        }
+        if (
+          selector === selectIsMetamaskNotificationsEnabled ||
+          selector === selectIsMetaMaskPushNotificationsEnabled
+        ) {
+          return true;
+        }
+        return undefined;
+      });
+      (getCampaignStatusInfo as jest.Mock).mockReturnValue({
+        status: 'upcoming',
+        statusLabel: 'Coming soon',
+        dateLabel: 'Starts June 1',
+        dateLabelIcon: 'Speed',
+      });
+      const campaign = createTestCampaign({
+        id: 'camp-cannot-prompt',
+        type: CampaignType.PERPS_TRADING,
+      });
+
+      const { queryByTestId } = render(<CampaignTile campaign={campaign} />);
+
+      await waitFor(() => {
+        expect(
+          queryByTestId('campaign-tile-remind-me-camp-cannot-prompt'),
+        ).toBeNull();
+      });
+      expect(mockShowToast).not.toHaveBeenCalled();
+    });
+
+    it('does not show Notify me when storage already has subscription:campaign composite', async () => {
+      mockGetItemSync.mockImplementation((key: string) =>
+        key ===
+        reminderStorageKeyForComposite(
+          `${TEST_REWARDS_SUBSCRIPTION_ID}:camp-already-reminded`,
+        )
+          ? '1'
+          : null,
+      );
+      (getCampaignStatusInfo as jest.Mock).mockReturnValue({
+        status: 'upcoming',
+        statusLabel: 'Coming soon',
+        dateLabel: 'Starts June 1',
+        dateLabelIcon: 'Speed',
+      });
+      const campaign = createTestCampaign({
+        id: 'camp-already-reminded',
+        type: CampaignType.ONDO_HOLDING,
+      });
+
+      const { queryByTestId } = render(<CampaignTile campaign={campaign} />);
+
+      await waitFor(() => {
+        expect(
+          queryByTestId('campaign-tile-remind-me-camp-already-reminded'),
+        ).toBeNull();
+      });
+    });
+
+    it('hides Notify me CTA after a successful subscribe', async () => {
+      (getCampaignStatusInfo as jest.Mock).mockReturnValue({
+        status: 'upcoming',
+        statusLabel: 'Coming soon',
+        dateLabel: 'Starts June 1',
+        dateLabelIcon: 'Speed',
+      });
+      const campaign = createTestCampaign({
+        id: 'camp-hide-after',
+        type: CampaignType.ONDO_HOLDING,
+        startDate: '2028-08-01T00:00:00.000Z',
+      });
+
+      const { getByTestId, queryByTestId } = render(
+        <CampaignTile campaign={campaign} />,
+      );
+      await waitFor(() => {
+        expect(
+          getByTestId('campaign-tile-remind-me-camp-hide-after'),
+        ).toBeTruthy();
+      });
+
+      await act(async () => {
+        fireEvent.press(getByTestId('campaign-tile-remind-me-camp-hide-after'));
+      });
+
+      await waitFor(() => {
+        expect(
+          queryByTestId('campaign-tile-remind-me-camp-hide-after'),
+        ).toBeNull();
+      });
+    });
+
+    it('shows error toast when storage setItem fails', async () => {
+      mockSetItem.mockRejectedValueOnce(new Error('disk full'));
+      (getCampaignStatusInfo as jest.Mock).mockReturnValue({
+        status: 'upcoming',
+        statusLabel: 'Coming soon',
+        dateLabel: 'Starts June 1',
+        dateLabelIcon: 'Speed',
+      });
+      const campaign = createTestCampaign({
+        id: 'camp-save-fail',
+        type: CampaignType.ONDO_HOLDING,
+        startDate: '2028-09-01T00:00:00.000Z',
+      });
+
+      const { getByTestId } = render(<CampaignTile campaign={campaign} />);
+      await waitFor(() => {
+        expect(
+          getByTestId('campaign-tile-remind-me-camp-save-fail'),
+        ).toBeTruthy();
+      });
+
+      await act(async () => {
+        fireEvent.press(getByTestId('campaign-tile-remind-me-camp-save-fail'));
+      });
+
+      expect(mockTrackEvent).not.toHaveBeenCalled();
+      expect(mockShowToast).toHaveBeenCalledWith(
+        expect.objectContaining({
+          title: 'Save failed.',
+        }),
+      );
+    });
+  });
 });
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignTile.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignTile.tsx
index 7ab6130bad2..9d717e57db3 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignTile.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignTile.tsx
@@ -13,6 +13,8 @@ import {
   FontWeight,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { useTheme } from '../../../../../util/theme';
+import NotificationIcon from '../../../../../images/rewards/notification.svg';
 import {
   CampaignType,
   type CampaignDto,
@@ -23,6 +25,7 @@ import {
 } from './CampaignTile.utils';
 import { strings } from '../../../../../../locales/i18n';
 import useGetCampaignParticipantStatus from '../../hooks/useGetCampaignParticipantStatus';
+import { useCampaignReminderActions } from '../../hooks/useCampaignReminderActions';
 
 interface CampaignTileProps {
   campaign: CampaignDto;
@@ -39,12 +42,14 @@ interface CampaignTileProps {
  * Tapping behavior is determined by campaign type:
  * - ONDO_HOLDING: navigates to Ondo campaign details
  * - SEASON_1: navigates to season one campaign details
+ * - PERPS_TRADING: navigates to Perps Trading campaign details
  * - Unsupported types: non-interactive unless onPress is provided
  * - With onPress: executes custom handler regardless of type
  */
 const CampaignTile: React.FC<CampaignTileProps> = ({ campaign, onPress }) => {
   const tw = useTailwind();
   const colorScheme = useColorScheme();
+  const { colors } = useTheme();
   const navigation = useNavigation();
 
   const {
@@ -55,7 +60,9 @@ const CampaignTile: React.FC<CampaignTileProps> = ({ campaign, onPress }) => {
 
   const { status: participantStatus, isLoading: isParticipantStatusLoading } =
     useGetCampaignParticipantStatus(
-      campaignStatus === 'active' && campaign.type === CampaignType.ONDO_HOLDING
+      campaignStatus === 'active' &&
+        (campaign.type === CampaignType.ONDO_HOLDING ||
+          campaign.type === CampaignType.PERPS_TRADING)
         ? campaign.id
         : undefined,
     );
@@ -64,6 +71,14 @@ const CampaignTile: React.FC<CampaignTileProps> = ({ campaign, onPress }) => {
     campaignStatus !== 'upcoming' &&
     (onPress != null || isCampaignTypeSupported(campaign.type));
 
+  const reminderFeatureEnabled =
+    campaignStatus === 'upcoming' && isCampaignTypeSupported(campaign.type);
+
+  const { showRemindMeCta, handleRemindMePress } = useCampaignReminderActions(
+    campaign,
+    reminderFeatureEnabled,
+  );
+
   const shouldShowDateLabel =
     campaignStatus !== 'upcoming' || campaign.showUpcomingDate;
 
@@ -98,92 +113,131 @@ const CampaignTile: React.FC<CampaignTileProps> = ({ campaign, onPress }) => {
       navigation.navigate(Routes.REWARDS_SEASON_ONE_CAMPAIGN_DETAILS_VIEW, {
         campaignId: campaign.id,
       });
+    } else if (campaign.type === CampaignType.PERPS_TRADING) {
+      if (shouldShowTour) {
+        navigation.navigate(Routes.REWARDS_CAMPAIGN_TOUR_STEP, {
+          campaignId: campaign.id,
+        });
+      } else {
+        navigation.navigate(
+          Routes.REWARDS_PERPS_TRADING_CAMPAIGN_DETAILS_VIEW,
+          {
+            campaignId: campaign.id,
+          },
+        );
+      }
     }
   };
 
   return (
-    <Pressable
-      onPress={handlePress}
-      disabled={!isInteractive}
-      style={({ pressed }) =>
-        tw.style(
-          'rounded-xl overflow-hidden h-50 bg-muted',
-          pressed && isInteractive && 'opacity-70',
-        )
-      }
-      testID={`campaign-tile-${campaign.id}`}
-    >
-      <ImageBackground
-        source={{ uri: backgroundImageUrl }}
-        resizeMode="cover"
-        style={tw.style('flex-1')}
-        testID="campaign-tile-background"
+    <Box twClassName="h-50 rounded-xl overflow-hidden bg-muted">
+      <Pressable
+        onPress={handlePress}
+        disabled={!isInteractive}
+        style={({ pressed }) =>
+          tw.style('absolute inset-0', pressed && isInteractive && 'opacity-70')
+        }
+        testID={`campaign-tile-${campaign.id}`}
       >
-        <Box
-          flexDirection={BoxFlexDirection.Column}
-          justifyContent={BoxJustifyContent.End}
-          twClassName="p-4 flex-1"
+        <ImageBackground
+          source={{ uri: backgroundImageUrl }}
+          resizeMode="cover"
+          style={tw.style('flex-1')}
+          testID="campaign-tile-background"
         >
           <Box
-            flexDirection={BoxFlexDirection.Row}
-            alignItems={BoxAlignItems.Center}
-            twClassName="gap-1"
-            testID="campaign-tile-status-label"
+            flexDirection={BoxFlexDirection.Column}
+            justifyContent={BoxJustifyContent.End}
+            twClassName="p-4 flex-1"
           >
-            {participantStatus?.optedIn === true ? (
-              <Text
-                variant={TextVariant.BodySm}
-                color={TextColor.SuccessDefault}
-                fontWeight={FontWeight.Medium}
-                testID="campaign-tile-entered-label"
-              >
-                {strings('rewards.campaign.entered')}
-              </Text>
-            ) : (
-              <Text
-                variant={TextVariant.BodySm}
-                color={
-                  colorScheme === 'dark'
-                    ? TextColor.SuccessDefault
-                    : TextColor.OverlayInverse
-                }
-                fontWeight={FontWeight.Medium}
-              >
-                {statusLabel}
-              </Text>
-            )}
-            {shouldShowDateLabel && (
-              <>
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              twClassName="gap-1"
+              testID="campaign-tile-status-label"
+            >
+              {participantStatus?.optedIn === true ? (
                 <Text
                   variant={TextVariant.BodySm}
-                  color={TextColor.OverlayInverse}
+                  color={TextColor.SuccessDefault}
                   fontWeight={FontWeight.Medium}
+                  testID="campaign-tile-entered-label"
                 >
-                  •
+                  {strings('rewards.campaign.entered')}
                 </Text>
+              ) : (
                 <Text
                   variant={TextVariant.BodySm}
-                  color={TextColor.OverlayInverse}
+                  color={
+                    colorScheme === 'dark'
+                      ? TextColor.SuccessDefault
+                      : TextColor.OverlayInverse
+                  }
                   fontWeight={FontWeight.Medium}
-                  testID="campaign-tile-date-info"
                 >
-                  {dateLabel}
+                  {statusLabel}
                 </Text>
-              </>
-            )}
-          </Box>
+              )}
+              {shouldShowDateLabel && (
+                <>
+                  <Text
+                    variant={TextVariant.BodySm}
+                    color={TextColor.OverlayInverse}
+                    fontWeight={FontWeight.Medium}
+                  >
+                    •
+                  </Text>
+                  <Text
+                    variant={TextVariant.BodySm}
+                    color={TextColor.OverlayInverse}
+                    fontWeight={FontWeight.Medium}
+                    testID="campaign-tile-date-info"
+                  >
+                    {dateLabel}
+                  </Text>
+                </>
+              )}
+            </Box>
 
-          <Text
-            variant={TextVariant.HeadingLg}
-            color={TextColor.OverlayInverse}
-            twClassName="font-bold"
-            testID="campaign-tile-name"
-          >
-            {campaign.name}
-          </Text>
-        </Box>
-      </ImageBackground>
-    </Pressable>
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              twClassName="gap-2"
+            >
+              <Box twClassName="min-w-0 flex-1 shrink">
+                <Text
+                  variant={TextVariant.HeadingLg}
+                  color={TextColor.OverlayInverse}
+                  twClassName="font-bold"
+                  testID="campaign-tile-name"
+                >
+                  {campaign.name}
+                </Text>
+              </Box>
+              {showRemindMeCta && (
+                <Pressable
+                  onPress={() => {
+                    handleRemindMePress().catch(() => undefined);
+                  }}
+                  testID={`campaign-tile-remind-me-${campaign.id}`}
+                  accessibilityRole="button"
+                  accessibilityLabel={strings('rewards.campaign.notify_me')}
+                  hitSlop={12}
+                  style={({ pressed }) => tw.style(pressed && 'opacity-70')}
+                >
+                  <NotificationIcon
+                    name="notification"
+                    width={24}
+                    height={24}
+                    color={colors.overlay.inverse}
+                  />
+                </Pressable>
+              )}
+            </Box>
+          </Box>
+        </ImageBackground>
+      </Pressable>
+    </Box>
   );
 };
 
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.test.ts b/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.test.ts
index c218339c001..ce6d77de59c 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.test.ts
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.test.ts
@@ -23,6 +23,8 @@ jest.mock('@metamask/design-system-react-native', () => ({
 }));
 
 jest.mock('../../../../../../locales/i18n', () => ({
+  __esModule: true,
+  default: { locale: 'en-US' },
   strings: jest.fn((key: string, params?: Record<string, string>) =>
     params ? `${key}:${JSON.stringify(params)}` : key,
   ),
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.ts b/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.ts
index 24ba71b85fa..9c665255eb3 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.ts
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.ts
@@ -4,7 +4,8 @@ import {
   type CampaignDto,
   type CampaignStatus,
 } from '../../../../../core/Engine/controllers/rewards-controller/types';
-import { strings } from '../../../../../../locales/i18n';
+import I18n, { strings } from '../../../../../../locales/i18n';
+import { getIntlDateTimeFormatter } from '../../../../../util/intl';
 
 /**
  * Set of campaign types that have full UI support (details view, opt-in, etc.)
@@ -12,6 +13,7 @@ import { strings } from '../../../../../../locales/i18n';
 const SUPPORTED_CAMPAIGN_TYPES = new Set<CampaignType>([
   CampaignType.ONDO_HOLDING,
   CampaignType.SEASON_1,
+  CampaignType.PERPS_TRADING,
 ]);
 
 /**
@@ -52,32 +54,18 @@ export function getCampaignStatus(campaign: CampaignDto): CampaignStatus {
   return 'complete';
 }
 
-const MONTHS = [
-  'January',
-  'February',
-  'March',
-  'April',
-  'May',
-  'June',
-  'July',
-  'August',
-  'September',
-  'October',
-  'November',
-  'December',
-];
-
 /**
- * Formats a date for display in campaign tiles.
+ * Formats a date for display in campaign tiles (localized month and day).
  *
  * @param date - The date to format
- * @returns Formatted date string (e.g., "March 15")
+ * @param locale - BCP 47 locale; defaults to the app locale
+ * @returns Formatted date string (e.g., "March 15" in en-US)
  */
-function formatCampaignDate(date: Date): string {
-  const month = MONTHS[date.getMonth()];
-  const day = date.getDate();
-
-  return `${month} ${day}`;
+function formatCampaignDate(date: Date, locale: string = I18n.locale): string {
+  return getIntlDateTimeFormatter(locale, {
+    month: 'long',
+    day: 'numeric',
+  }).format(date);
 }
 
 /**
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignViewHeader.test.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignViewHeader.test.tsx
new file mode 100644
index 00000000000..1d189553915
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignViewHeader.test.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import CampaignViewHeader from './CampaignViewHeader';
+
+const mockGoBack = jest.fn();
+const mockNavigate = jest.fn();
+
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({
+    goBack: mockGoBack,
+    navigate: mockNavigate,
+  }),
+}));
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({ style: (...args: unknown[]) => args }),
+}));
+
+jest.mock('../../../../../constants/navigation/Routes', () => ({
+  REWARDS_CAMPAIGN_MECHANICS: 'REWARDS_CAMPAIGN_MECHANICS',
+}));
+
+const defaultProps = {
+  title: 'Test Title',
+  backButtonTestID: 'test-back-button',
+  mechanicsButtonTestID: 'test-mechanics-button',
+  hasCampaign: true,
+  campaignId: 'campaign-123',
+};
+
+describe('CampaignViewHeader', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the title', () => {
+    const { getByText } = render(<CampaignViewHeader {...defaultProps} />);
+    expect(getByText('Test Title')).toBeDefined();
+  });
+
+  it('calls goBack when back button is pressed', () => {
+    const { getByTestId } = render(<CampaignViewHeader {...defaultProps} />);
+    fireEvent.press(getByTestId('test-back-button'));
+    expect(mockGoBack).toHaveBeenCalledTimes(1);
+  });
+
+  it('shows mechanics button when hasCampaign is true', () => {
+    const { getByTestId } = render(<CampaignViewHeader {...defaultProps} />);
+    expect(getByTestId('test-mechanics-button')).toBeDefined();
+  });
+
+  it('hides mechanics button when hasCampaign is false', () => {
+    const { queryByTestId } = render(
+      <CampaignViewHeader {...defaultProps} hasCampaign={false} />,
+    );
+    expect(queryByTestId('test-mechanics-button')).toBeNull();
+  });
+
+  it('navigates to campaign mechanics when mechanics button is pressed', () => {
+    const { getByTestId } = render(<CampaignViewHeader {...defaultProps} />);
+    fireEvent.press(getByTestId('test-mechanics-button'));
+    expect(mockNavigate).toHaveBeenCalledWith('REWARDS_CAMPAIGN_MECHANICS', {
+      campaignId: 'campaign-123',
+    });
+  });
+});
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignViewHeader.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignViewHeader.tsx
new file mode 100644
index 00000000000..0886cd71a08
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignViewHeader.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import { useNavigation } from '@react-navigation/native';
+import {
+  HeaderStandard,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import Routes from '../../../../../constants/navigation/Routes';
+import { getCampaignMechanicsButtonProps } from '../../utils/campaignHeaderUtils';
+
+interface CampaignViewHeaderProps {
+  title: string;
+  backButtonTestID: string;
+  mechanicsButtonTestID: string;
+  hasCampaign: boolean;
+  campaignId: string;
+}
+
+const CampaignViewHeader: React.FC<CampaignViewHeaderProps> = ({
+  title,
+  backButtonTestID,
+  mechanicsButtonTestID,
+  hasCampaign,
+  campaignId,
+}) => {
+  const navigation = useNavigation();
+  return (
+    <HeaderStandard
+      title={title}
+      titleProps={{ variant: TextVariant.HeadingSm }}
+      onBack={() => navigation.goBack()}
+      backButtonProps={{ testID: backButtonTestID }}
+      endButtonIconProps={getCampaignMechanicsButtonProps(
+        hasCampaign,
+        () =>
+          navigation.navigate(Routes.REWARDS_CAMPAIGN_MECHANICS, {
+            campaignId,
+          }),
+        mechanicsButtonTestID,
+      )}
+      includesTopInset
+    />
+  );
+};
+
+export default CampaignViewHeader;
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.test.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.test.tsx
index c1e99e97edc..46ee81c88df 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.test.tsx
@@ -57,6 +57,20 @@ jest.mock('./CampaignTile', () => {
   };
 });
 
+jest.mock('./CampaignReminder', () => {
+  const ReactActual = jest.requireActual('react');
+  const { Text } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ({ campaign }: { campaign: CampaignDto }) =>
+      ReactActual.createElement(
+        Text,
+        { testID: `campaign-reminder-${campaign.id}` },
+        `Reminder:${campaign.name}`,
+      ),
+  };
+});
+
 jest.mock('../../../../../../locales/i18n', () => ({
   strings: (key: string) => {
     const translations: Record<string, string> = {
@@ -68,6 +82,7 @@ jest.mock('../../../../../../locales/i18n', () => ({
 
 const now = new Date();
 const futureDate = new Date(now.getTime() + 30 * 24 * 60 * 60 * 1000);
+const furtherFutureDate = new Date(now.getTime() + 90 * 24 * 60 * 60 * 1000);
 const pastDate = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000);
 
 const createTestCampaign = (
@@ -205,7 +220,7 @@ describe('CampaignsPreview', () => {
     expect(queryByTestId('campaign-tile-non-featured')).toBeNull();
   });
 
-  it('renders only the first featured campaign when multiple exist', () => {
+  it('renders all featured active campaigns when multiple exist', () => {
     const firstCampaign = createTestCampaign({
       id: 'first-1',
       name: 'First Campaign',
@@ -225,15 +240,34 @@ describe('CampaignsPreview', () => {
       campaigns: [firstCampaign, secondCampaign],
     });
 
-    const { getByTestId, queryByTestId, getAllByTestId } = render(
-      <CampaignsPreview />,
-    );
+    const { getByTestId, getAllByTestId } = render(<CampaignsPreview />);
 
     expect(getByTestId('campaign-tile-first-1')).toBeOnTheScreen();
-    expect(queryByTestId('campaign-tile-second-1')).toBeNull();
+    expect(getByTestId('campaign-tile-second-1')).toBeOnTheScreen();
 
     const tiles = getAllByTestId(/^campaign-tile-/);
-    expect(tiles).toHaveLength(1);
+    expect(tiles).toHaveLength(2);
+  });
+
+  it('renders CampaignReminder for a featured upcoming campaign', () => {
+    const upcomingCampaign = createTestCampaign({
+      id: 'upcoming-featured',
+      name: 'Soon Campaign',
+      startDate: futureDate.toISOString(),
+      endDate: furtherFutureDate.toISOString(),
+      featured: true,
+    });
+    mockUseRewardCampaigns.mockReturnValue({
+      ...mockHookDefaults,
+      campaigns: [upcomingCampaign],
+    });
+
+    const { getByTestId, queryByTestId } = render(<CampaignsPreview />);
+
+    expect(
+      getByTestId('campaign-reminder-upcoming-featured'),
+    ).toBeOnTheScreen();
+    expect(queryByTestId('campaign-tile-upcoming-featured')).toBeNull();
   });
 
   it('renders SEASON_1 campaign type as interactive', () => {
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.tsx
index bd498349bb1..d553229cb57 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.tsx
@@ -20,12 +20,15 @@ import { REWARDS_VIEW_SELECTORS } from '../../Views/RewardsView.constants';
 import { strings } from '../../../../../../locales/i18n';
 import { useRewardCampaigns } from '../../hooks/useRewardCampaigns';
 import CampaignTile from './CampaignTile';
+import CampaignReminder from './CampaignReminder';
 import RewardsErrorBanner from '../RewardsErrorBanner';
 import type { CampaignDto } from '../../../../../core/Engine/controllers/rewards-controller/types';
+import { getCampaignStatus } from './CampaignTile.utils';
 
 /**
  * CampaignsPreview shows featured campaigns on the dashboard.
- * Only campaigns marked as featured are displayed, in the order returned by the API.
+ * All campaigns marked `featured` are displayed, in API order. Upcoming campaigns
+ * use {@link CampaignReminder}; active or complete campaigns use {@link CampaignTile}.
  */
 const CampaignsPreview: React.FC = () => {
   const tw = useTailwind();
@@ -34,12 +37,12 @@ const CampaignsPreview: React.FC = () => {
   const { campaigns, isLoading, hasError, hasLoaded, fetchCampaigns } =
     useRewardCampaigns();
 
-  const featuredCampaign = useMemo(
-    (): CampaignDto | undefined => (campaigns ?? []).find((c) => c.featured),
+  const featuredCampaigns = useMemo(
+    (): CampaignDto[] => (campaigns ?? []).filter((c) => c.featured),
     [campaigns],
   );
 
-  const hasFeaturedCampaigns = Boolean(featuredCampaign);
+  const hasFeaturedCampaigns = featuredCampaigns.length > 0;
 
   const handleNavigateToCampaigns = useCallback(() => {
     navigation.navigate(Routes.REWARDS_CAMPAIGNS_VIEW);
@@ -83,7 +86,13 @@ const CampaignsPreview: React.FC = () => {
         />
       )}
 
-      {featuredCampaign && <CampaignTile campaign={featuredCampaign} />}
+      {featuredCampaigns.map((campaign) =>
+        getCampaignStatus(campaign) === 'upcoming' ? (
+          <CampaignReminder key={campaign.id} campaign={campaign} />
+        ) : (
+          <CampaignTile key={campaign.id} campaign={campaign} />
+        ),
+      )}
     </Box>
   );
 };
diff --git a/app/components/UI/Rewards/components/Campaigns/LeaderboardPositionHeader.tsx b/app/components/UI/Rewards/components/Campaigns/LeaderboardPositionHeader.tsx
index 66db7e8a976..7ebb591e7c3 100644
--- a/app/components/UI/Rewards/components/Campaigns/LeaderboardPositionHeader.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/LeaderboardPositionHeader.tsx
@@ -14,7 +14,11 @@ import {
   TextVariant,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import { StatCell, PendingTag, IneligibleTag } from './CampaignStatsSummary';
+import {
+  StatCell,
+  PendingTag,
+  IneligibleTag,
+} from './OndoCampaignStatsSummary';
 import { strings } from '../../../../../../locales/i18n';
 
 export const LEADERBOARD_POSITION_HEADER_TEST_IDS = {
@@ -23,6 +27,7 @@ export const LEADERBOARD_POSITION_HEADER_TEST_IDS = {
   RETURN_VALUE: 'leaderboard-position-header-return',
   TIER_VALUE: 'leaderboard-position-header-tier',
   PRIZE_POOL_VALUE: 'leaderboard-position-header-prize-pool',
+  COMPUTED_AT: 'leaderboard-position-header-computed-at',
   PENDING_TAG: 'leaderboard-position-header-pending-tag',
   INELIGIBLE_TAG: 'leaderboard-position-header-ineligible-tag',
   QUALIFIED_ICON: 'leaderboard-position-header-qualified-icon',
@@ -41,6 +46,8 @@ interface LeaderboardPositionHeaderProps {
   showPrizePool?: boolean;
   prizePoolValue?: string;
   prizePoolLoading?: boolean;
+  showComputedAt?: boolean;
+  computedAt?: string | null;
 }
 
 const LeaderboardPositionHeader: React.FC<LeaderboardPositionHeaderProps> = ({
@@ -58,6 +65,7 @@ const LeaderboardPositionHeader: React.FC<LeaderboardPositionHeaderProps> = ({
   prizePoolLoading = false,
 }) => {
   const tw = useTailwind();
+  const showSubtextRow = showReturn && Boolean(returnValue);
 
   return (
     <Box
@@ -95,7 +103,12 @@ const LeaderboardPositionHeader: React.FC<LeaderboardPositionHeaderProps> = ({
         </Box>
 
         {isLoading ? (
-          <Skeleton style={tw.style('h-9 w-28 rounded')} />
+          <>
+            <Skeleton style={tw.style('h-9 w-28 rounded')} />
+            {showSubtextRow && (
+              <Skeleton style={tw.style('mt-1 h-4 w-full max-w-xs rounded')} />
+            )}
+          </>
         ) : (
           <>
             <Text
@@ -105,15 +118,25 @@ const LeaderboardPositionHeader: React.FC<LeaderboardPositionHeaderProps> = ({
             >
               {rank}
             </Text>
-            {showReturn && returnValue && (
-              <Text
-                variant={TextVariant.BodySm}
-                color={returnColor}
-                fontWeight={FontWeight.Medium}
-                testID={LEADERBOARD_POSITION_HEADER_TEST_IDS.RETURN_VALUE}
+            {showSubtextRow && (
+              <Box
+                flexDirection={BoxFlexDirection.Row}
+                alignItems={BoxAlignItems.Center}
+                twClassName="mt-1 w-full"
               >
-                {returnValue}
-              </Text>
+                <Box twClassName="min-w-0 flex-1">
+                  {showReturn && returnValue && (
+                    <Text
+                      variant={TextVariant.BodySm}
+                      color={returnColor}
+                      fontWeight={FontWeight.Medium}
+                      testID={LEADERBOARD_POSITION_HEADER_TEST_IDS.RETURN_VALUE}
+                    >
+                      {returnValue}
+                    </Text>
+                  )}
+                </Box>
+              </Box>
             )}
           </>
         )}
diff --git a/app/components/UI/Rewards/components/Campaigns/OndoActivityRow.test.tsx b/app/components/UI/Rewards/components/Campaigns/OndoActivityRow.test.tsx
index 18be482b848..ce0013ce0bb 100644
--- a/app/components/UI/Rewards/components/Campaigns/OndoActivityRow.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/OndoActivityRow.test.tsx
@@ -104,6 +104,18 @@ describe('OndoActivityRow', () => {
     expect(getByText('—')).toBeDefined();
   });
 
+  it('renders rebalance entry USD without a plus sign for positive amounts', () => {
+    const { getByText } = render(
+      <OndoActivityRow
+        entry={createEntry({ type: 'REBALANCE', usdAmount: '5000.000000' })}
+      />,
+    );
+
+    expect(getByText('Rebalance')).toBeDefined();
+    // formatUsd (rebalance) has no '+'; deposit/withdraw still use mocked formatSignedUsd
+    expect(getByText(/^\$5,000/)).toBeDefined();
+  });
+
   it('renders external outflow entry with shortened destAddress', () => {
     const { getByText } = render(
       <OndoActivityRow
@@ -123,7 +135,7 @@ describe('OndoActivityRow', () => {
   it('renders token symbols in detail line', () => {
     const { getByText } = render(<OndoActivityRow entry={createEntry()} />);
 
-    expect(getByText('USDC → AAPLon')).toBeDefined();
+    expect(getByText('USDC → AAPLON')).toBeDefined();
   });
 
   it('renders only source token when destToken is null', () => {
diff --git a/app/components/UI/Rewards/components/Campaigns/OndoActivityRow.tsx b/app/components/UI/Rewards/components/Campaigns/OndoActivityRow.tsx
index 9f95a2836ec..3c2a556f620 100644
--- a/app/components/UI/Rewards/components/Campaigns/OndoActivityRow.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/OndoActivityRow.tsx
@@ -29,6 +29,7 @@ import {
   formatRewardsDate,
   formatRewardsTimeOnly,
   formatSignedUsd,
+  formatUsd,
   getChainHex,
   shortenAddress,
 } from '../../utils/formatUtils';
@@ -49,7 +50,25 @@ const LABEL_KEY_MAP: Record<ActivityEntryType, string> = {
 };
 
 const tokenLabel = (token: ActivityTokenDto): string =>
-  token.tokenSymbol || token.tokenName;
+  token.tokenSymbol.toUpperCase() || token.tokenName;
+
+/** Rebalance USD is not portfolio P&L; omit the '+' used for signed inflows/outflows. */
+const formatActivityUsd = (
+  usdAmount: OndoGmActivityEntryDto['usdAmount'],
+  entryType: ActivityEntryType,
+): string => {
+  if (entryType !== 'REBALANCE') {
+    return formatSignedUsd(usdAmount);
+  }
+  if (usdAmount === null) {
+    return '—';
+  }
+  const num = typeof usdAmount === 'number' ? usdAmount : parseFloat(usdAmount);
+  if (Number.isNaN(num)) {
+    return '—';
+  }
+  return formatUsd(usdAmount);
+};
 
 interface OndoActivityRowProps {
   entry: OndoGmActivityEntryDto;
@@ -123,7 +142,7 @@ const OndoActivityRow: React.FC<OndoActivityRowProps> = ({
             {label}
           </Text>
           <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
-            {formatSignedUsd(entry.usdAmount)}
+            {formatActivityUsd(entry.usdAmount, entryType)}
           </Text>
         </Box>
 
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignStatsSummary.test.tsx b/app/components/UI/Rewards/components/Campaigns/OndoCampaignStatsSummary.test.tsx
similarity index 77%
rename from app/components/UI/Rewards/components/Campaigns/CampaignStatsSummary.test.tsx
rename to app/components/UI/Rewards/components/Campaigns/OndoCampaignStatsSummary.test.tsx
index 41ee6d2e016..9926b195451 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignStatsSummary.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/OndoCampaignStatsSummary.test.tsx
@@ -2,12 +2,12 @@ import React from 'react';
 import { render, fireEvent } from '@testing-library/react-native';
 import { Text as RNText } from 'react-native';
 import { TextColor } from '@metamask/design-system-react-native';
-import CampaignStatsSummary, {
+import OndoCampaignStatsSummary, {
   IneligibleTag,
   PendingTag,
   StatCell,
-  CAMPAIGN_STATS_SUMMARY_TEST_IDS,
-} from './CampaignStatsSummary';
+  ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS,
+} from './OndoCampaignStatsSummary';
 import type {
   CampaignLeaderboardPositionDto,
   OndoGmPortfolioSummaryDto,
@@ -28,12 +28,12 @@ jest.mock('@metamask/design-system-twrnc-preset', () => ({
   useTailwind: () => ({ style: (...args: unknown[]) => args }),
 }));
 
-jest.mock('./OndoCampaignOutcomeBanners', () => {
+jest.mock('./CampaignOutcomeBanners', () => {
   const ReactActual = jest.requireActual('react');
   const { View } = jest.requireActual('react-native');
   return {
     __esModule: true,
-    OndoGmCampaignOutcomeBanner: ({
+    CampaignOutcomeBanner: ({
       outcomeStatus,
       winnerVerificationCode,
     }: {
@@ -168,67 +168,69 @@ const baseProps = {
   },
 };
 
-describe('CampaignStatsSummary', () => {
+describe('OndoCampaignStatsSummary', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   it('renders all stats when both position and summary are provided', () => {
-    const { getByTestId } = render(<CampaignStatsSummary {...baseProps} />);
+    const { getByTestId } = render(<OndoCampaignStatsSummary {...baseProps} />);
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER),
     ).toBeDefined();
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN).props.children,
     ).toBe('+7.01%');
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props
+        .children,
     ).toBe('$13,057.58');
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK).props.children,
     ).toBe('05');
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER).props.children,
     ).toBe('Silver');
   });
 
   it('displays dash for rank and tier when leaderboard position is null but return from portfolio', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary {...baseProps} leaderboardPosition={null} />,
+      <OndoCampaignStatsSummary {...baseProps} leaderboardPosition={null} />,
     );
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN).props.children,
     ).toBe('+7.01%');
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK).props.children,
     ).toBe('-');
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER).props.children,
     ).toBe('-');
   });
 
   it('displays dash for return when portfolio summary is null', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary {...baseProps} portfolioSummary={null} />,
+      <OndoCampaignStatsSummary {...baseProps} portfolioSummary={null} />,
     );
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN).props.children,
     ).toBe('-');
   });
 
   it('displays dash for market value when portfolio summary is null', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary {...baseProps} portfolioSummary={null} />,
+      <OndoCampaignStatsSummary {...baseProps} portfolioSummary={null} />,
     );
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props
+        .children,
     ).toBe('-');
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK).props.children,
     ).toBe('05');
   });
 
@@ -240,7 +242,7 @@ describe('CampaignStatsSummary', () => {
     };
 
     const { getByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={null}
         portfolioSummary={negativePortfolio}
@@ -248,26 +250,29 @@ describe('CampaignStatsSummary', () => {
     );
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props.color,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props
+        .color,
     ).toBe(TextColor.ErrorDefault);
   });
 
   it('uses success color for market value when portfolioPnl is positive', () => {
-    const { getByTestId } = render(<CampaignStatsSummary {...baseProps} />);
+    const { getByTestId } = render(<OndoCampaignStatsSummary {...baseProps} />);
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props.color,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props
+        .color,
     ).toBe(TextColor.SuccessDefault);
   });
 
   it('omits valueColor for market value when portfolioSummary is null', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary {...baseProps} portfolioSummary={null} />,
+      <OndoCampaignStatsSummary {...baseProps} portfolioSummary={null} />,
     );
 
     // Returns '-' and uses the StatCell default color (TextDefault)
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props
+        .children,
     ).toBe('-');
   });
 
@@ -278,14 +283,14 @@ describe('CampaignStatsSummary', () => {
     };
 
     const { getByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         portfolioSummary={negativeSummary}
       />,
     );
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN).props.children,
     ).toBe('-5.00%');
   });
 
@@ -299,39 +304,39 @@ describe('CampaignStatsSummary', () => {
     };
 
     const { getByTestId, getAllByText } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={pendingPosition}
       />,
     );
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.PENDING_TAG),
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.PENDING_TAG),
     ).toBeOnTheScreen();
     expect(getAllByText('Pending')).toHaveLength(1);
   });
 
   it('renders check icon on rank cell and no Pending tags when qualified is true', () => {
     const { getByTestId, queryAllByText, queryByTestId } = render(
-      <CampaignStatsSummary {...baseProps} />,
+      <OndoCampaignStatsSummary {...baseProps} />,
     );
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.QUALIFIED_TAG),
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.QUALIFIED_TAG),
     ).toBeOnTheScreen();
     expect(queryAllByText('Pending')).toHaveLength(0);
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.PENDING_TAG),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.PENDING_TAG),
     ).toBeNull();
   });
 
   it('does not render tags when leaderboardPosition is null', () => {
     const { queryByTestId } = render(
-      <CampaignStatsSummary {...baseProps} leaderboardPosition={null} />,
+      <OndoCampaignStatsSummary {...baseProps} leaderboardPosition={null} />,
     );
 
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.PENDING_TAG),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.PENDING_TAG),
     ).toBeNull();
   });
 
@@ -339,7 +344,7 @@ describe('CampaignStatsSummary', () => {
 
   it('shows skeletons for leaderboard cells when leaderboard is loading with no data', () => {
     const { queryByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={null}
         leaderboard={{ ...baseProps.leaderboard, isLoading: true }}
@@ -347,27 +352,29 @@ describe('CampaignStatsSummary', () => {
     );
 
     // Return and market value still render since portfolio is fine
-    expect(queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN)).toBeDefined();
-    expect(queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK)).toBeNull();
-    expect(queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER)).toBeNull();
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN),
+    ).toBeDefined();
+    expect(queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK)).toBeNull();
+    expect(queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER)).toBeNull();
+    expect(
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE),
     ).toBeDefined();
   });
 
   it('shows stale leaderboard data instead of skeletons when loading with existing data', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboard={{ ...baseProps.leaderboard, isLoading: true }}
       />,
     );
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN).props.children,
     ).toBe('+7.01%');
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK).props.children,
     ).toBe('05');
   });
 
@@ -375,7 +382,7 @@ describe('CampaignStatsSummary', () => {
 
   it('shows skeleton for market value cell when portfolio is loading with no data', () => {
     const { queryByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         portfolioSummary={null}
         portfolio={{ ...baseProps.portfolio, isLoading: true }}
@@ -383,24 +390,29 @@ describe('CampaignStatsSummary', () => {
     );
 
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE),
     ).toBeNull();
     // Return also shows skeleton since it now comes from portfolio
-    expect(queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN)).toBeNull();
+    expect(
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN),
+    ).toBeNull();
     // Leaderboard cells still render
-    expect(queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK)).toBeDefined();
+    expect(
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK),
+    ).toBeDefined();
   });
 
   it('shows stale market value data instead of skeleton when loading with existing data', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         portfolio={{ ...baseProps.portfolio, isLoading: true }}
       />,
     );
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE).props
+        .children,
     ).toBe('$13,057.58');
   });
 
@@ -408,7 +420,7 @@ describe('CampaignStatsSummary', () => {
 
   it('shows all skeletons when both sources are loading with no data', () => {
     const { queryByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={null}
         portfolioSummary={null}
@@ -417,19 +429,21 @@ describe('CampaignStatsSummary', () => {
       />,
     );
 
-    expect(queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN)).toBeNull();
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN),
+    ).toBeNull();
+    expect(
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE),
     ).toBeNull();
-    expect(queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK)).toBeNull();
-    expect(queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER)).toBeNull();
+    expect(queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK)).toBeNull();
+    expect(queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER)).toBeNull();
   });
 
   // ── Leaderboard error ─────────────────────────────────────────────
 
   it('shows stats error banner when leaderboard fails with no data', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={null}
         leaderboard={{ ...baseProps.leaderboard, hasError: true }}
@@ -437,13 +451,13 @@ describe('CampaignStatsSummary', () => {
     );
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR),
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR),
     ).toBeDefined();
   });
 
   it('calls both refetches on stats error retry when leaderboard fails', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={null}
         leaderboard={{ ...baseProps.leaderboard, hasError: true }}
@@ -451,7 +465,7 @@ describe('CampaignStatsSummary', () => {
     );
 
     fireEvent.press(
-      getByTestId(`${CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR}-retry`),
+      getByTestId(`${ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR}-retry`),
     );
     expect(mockLeaderboardRefetch).toHaveBeenCalledTimes(1);
     expect(mockPortfolioRefetch).toHaveBeenCalledTimes(1);
@@ -459,14 +473,14 @@ describe('CampaignStatsSummary', () => {
 
   it('hides stats error when stale leaderboard data exists', () => {
     const { queryByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboard={{ ...baseProps.leaderboard, hasError: true }}
       />,
     );
 
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR),
     ).toBeNull();
   });
 
@@ -474,7 +488,7 @@ describe('CampaignStatsSummary', () => {
 
   it('shows stats error banner when portfolio fails with no data', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         portfolioSummary={null}
         portfolio={{ ...baseProps.portfolio, hasError: true }}
@@ -482,13 +496,13 @@ describe('CampaignStatsSummary', () => {
     );
 
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR),
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR),
     ).toBeDefined();
   });
 
   it('calls both refetches on stats error retry when portfolio fails', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         portfolioSummary={null}
         portfolio={{ ...baseProps.portfolio, hasError: true }}
@@ -496,7 +510,7 @@ describe('CampaignStatsSummary', () => {
     );
 
     fireEvent.press(
-      getByTestId(`${CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR}-retry`),
+      getByTestId(`${ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR}-retry`),
     );
     expect(mockPortfolioRefetch).toHaveBeenCalledTimes(1);
     expect(mockLeaderboardRefetch).toHaveBeenCalledTimes(1);
@@ -506,7 +520,7 @@ describe('CampaignStatsSummary', () => {
 
   it('shows a single stats error banner when both sources fail with no data', () => {
     const { getAllByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={null}
         portfolioSummary={null}
@@ -516,7 +530,7 @@ describe('CampaignStatsSummary', () => {
     );
 
     expect(
-      getAllByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR),
+      getAllByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR),
     ).toHaveLength(1);
   });
 
@@ -529,21 +543,21 @@ describe('CampaignStatsSummary', () => {
       qualifiedDays: 0,
     };
     const { getByTestId, getAllByText } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={pendingPosition}
         isIneligible
       />,
     );
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.INELIGIBLE_TAG),
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.INELIGIBLE_TAG),
     ).toBeOnTheScreen();
     expect(getAllByText('Ineligible')).toHaveLength(1);
   });
 
   it('shows dash for rank and tier when isIneligible=true even with leaderboard data', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={{
           ...MOCK_POSITION,
@@ -554,16 +568,16 @@ describe('CampaignStatsSummary', () => {
       />,
     );
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK).props.children,
     ).toBe('-');
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER).props.children,
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER).props.children,
     ).toBe('-');
   });
 
   it('shows not-eligible banner when isIneligible=true', () => {
     const { getByTestId, getByText } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={{
           ...MOCK_POSITION,
@@ -574,14 +588,14 @@ describe('CampaignStatsSummary', () => {
       />,
     );
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER),
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER),
     ).toBeOnTheScreen();
     expect(getByText('Not eligible')).toBeOnTheScreen();
   });
 
   it('hides pending tags when isIneligible=true', () => {
     const { queryAllByText } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={{
           ...MOCK_POSITION,
@@ -596,7 +610,7 @@ describe('CampaignStatsSummary', () => {
 
   it('does not show ineligible tags when isIneligible=false', () => {
     const { queryAllByText, queryByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={{
           ...MOCK_POSITION,
@@ -608,14 +622,16 @@ describe('CampaignStatsSummary', () => {
     );
     expect(queryAllByText('Ineligible')).toHaveLength(0);
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER),
     ).toBeNull();
   });
 
   it('does not show not-eligible banner when isIneligible defaults to false', () => {
-    const { queryByTestId } = render(<CampaignStatsSummary {...baseProps} />);
+    const { queryByTestId } = render(
+      <OndoCampaignStatsSummary {...baseProps} />,
+    );
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER),
     ).toBeNull();
   });
 
@@ -623,10 +639,14 @@ describe('CampaignStatsSummary', () => {
 
   it('hides IneligibleTag from rank cell suffix when isCampaignComplete=true', () => {
     const { queryByTestId } = render(
-      <CampaignStatsSummary {...baseProps} isIneligible isCampaignComplete />,
+      <OndoCampaignStatsSummary
+        {...baseProps}
+        isIneligible
+        isCampaignComplete
+      />,
     );
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.INELIGIBLE_TAG),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.INELIGIBLE_TAG),
     ).toBeNull();
   });
 
@@ -637,20 +657,20 @@ describe('CampaignStatsSummary', () => {
       qualifiedDays: 3,
     };
     const { queryByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={pendingPosition}
         isCampaignComplete
       />,
     );
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.PENDING_TAG),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.PENDING_TAG),
     ).toBeNull();
   });
 
   it('hides qualified card when isCampaignComplete=true', () => {
     const { queryByText } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         tierMinDeposit={1000}
         isCampaignComplete
@@ -661,10 +681,14 @@ describe('CampaignStatsSummary', () => {
 
   it('hides not-eligible banner when isCampaignComplete=true', () => {
     const { queryByTestId } = render(
-      <CampaignStatsSummary {...baseProps} isIneligible isCampaignComplete />,
+      <OndoCampaignStatsSummary
+        {...baseProps}
+        isIneligible
+        isCampaignComplete
+      />,
     );
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER),
     ).toBeNull();
   });
 
@@ -675,7 +699,7 @@ describe('CampaignStatsSummary', () => {
       qualifiedDays: 4,
     };
     const { queryByText } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={pendingPosition}
         tierMinDeposit={1000}
@@ -687,25 +711,25 @@ describe('CampaignStatsSummary', () => {
 
   it('hides market value cell when isCampaignComplete=true', () => {
     const { queryByTestId } = render(
-      <CampaignStatsSummary {...baseProps} isCampaignComplete />,
+      <OndoCampaignStatsSummary {...baseProps} isCampaignComplete />,
     );
     expect(
-      queryByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE),
+      queryByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE),
     ).toBeNull();
   });
 
   it('shows market value cell when isCampaignComplete=false', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary {...baseProps} isCampaignComplete={false} />,
+      <OndoCampaignStatsSummary {...baseProps} isCampaignComplete={false} />,
     );
     expect(
-      getByTestId(CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE),
+      getByTestId(ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE),
     ).toBeDefined();
   });
 
   it('shows outcome banner when isCampaignComplete=true and outcome is provided', () => {
     const { getByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         isCampaignComplete
         outcomeStatus="pending"
@@ -718,7 +742,7 @@ describe('CampaignStatsSummary', () => {
 
   it('does not show outcome banner when isCampaignComplete=false', () => {
     const { queryByTestId } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         isCampaignComplete={false}
         outcomeStatus="pending"
@@ -731,7 +755,7 @@ describe('CampaignStatsSummary', () => {
 
   it('shows the qualified explainer card when qualified and tierMinDeposit is set', () => {
     const { getByText } = render(
-      <CampaignStatsSummary {...baseProps} tierMinDeposit={2500} />,
+      <OndoCampaignStatsSummary {...baseProps} tierMinDeposit={2500} />,
     );
     expect(getByText('You are qualified')).toBeOnTheScreen();
     expect(getByText(/Qualified copy/)).toBeOnTheScreen();
@@ -744,7 +768,7 @@ describe('CampaignStatsSummary', () => {
       qualifiedDays: 4,
     };
     const { getByText } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={pendingPosition}
         tierMinDeposit={1000}
@@ -761,7 +785,7 @@ describe('CampaignStatsSummary', () => {
       qualifiedDays: 10,
     };
     const { queryByText } = render(
-      <CampaignStatsSummary
+      <OndoCampaignStatsSummary
         {...baseProps}
         leaderboardPosition={pendingPosition}
         tierMinDeposit={1000}
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignStatsSummary.tsx b/app/components/UI/Rewards/components/Campaigns/OndoCampaignStatsSummary.tsx
similarity index 90%
rename from app/components/UI/Rewards/components/Campaigns/CampaignStatsSummary.tsx
rename to app/components/UI/Rewards/components/Campaigns/OndoCampaignStatsSummary.tsx
index fe4cbe86555..fd21c22ee46 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignStatsSummary.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/OndoCampaignStatsSummary.tsx
@@ -24,7 +24,7 @@ import { formatPercentChange, formatUsd } from '../../utils/formatUtils';
 import { ONDO_GM_REQUIRED_QUALIFIED_DAYS } from '../../utils/ondoCampaignConstants';
 import { formatTierDisplayName } from './OndoLeaderboard.utils';
 import RewardsErrorBanner from '../RewardsErrorBanner';
-import { OndoGmCampaignOutcomeBanner } from './OndoCampaignOutcomeBanners';
+import { CampaignOutcomeBanner } from './CampaignOutcomeBanners';
 
 const CELL_STYLE = { flex: 1 } as const;
 
@@ -78,7 +78,7 @@ export const StatCell: React.FC<StatCellProps> = ({
   );
 };
 
-export const CAMPAIGN_STATS_SUMMARY_TEST_IDS = {
+export const ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS = {
   CONTAINER: 'campaign-stats-summary-container',
   RETURN: 'campaign-stats-summary-return',
   MARKET_VALUE: 'campaign-stats-summary-market-value',
@@ -121,7 +121,7 @@ interface DataSourceState {
   refetch: () => void;
 }
 
-interface CampaignStatsSummaryProps {
+interface OndoCampaignStatsSummaryProps {
   leaderboardPosition: CampaignLeaderboardPositionDto | null;
   portfolioSummary: OndoGmPortfolioSummaryDto | null;
   leaderboard: DataSourceState;
@@ -136,7 +136,7 @@ interface CampaignStatsSummaryProps {
   onWinnerPress?: () => void;
 }
 
-const CampaignStatsSummary: React.FC<CampaignStatsSummaryProps> = ({
+const OndoCampaignStatsSummary: React.FC<OndoCampaignStatsSummaryProps> = ({
   leaderboardPosition,
   portfolioSummary,
   leaderboard,
@@ -184,29 +184,32 @@ const CampaignStatsSummary: React.FC<CampaignStatsSummaryProps> = ({
       : formatTierDisplayName(leaderboardPosition.projectedTier);
 
   return (
-    <Box twClassName="gap-3" testID={CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER}>
+    <Box
+      twClassName="gap-3"
+      testID={ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER}
+    >
       {/* Rank | Tier */}
       <Box flexDirection={BoxFlexDirection.Row}>
         <StatCell
           label={strings('rewards.ondo_campaign_stats.label_rank')}
           value={rankValue}
           isLoading={leaderboardLoading}
-          testID={CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK}
+          testID={ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK}
           suffix={
             !isCampaignComplete && isIneligible ? (
               <IneligibleTag
-                testID={CAMPAIGN_STATS_SUMMARY_TEST_IDS.INELIGIBLE_TAG}
+                testID={ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.INELIGIBLE_TAG}
               />
             ) : !isCampaignComplete && isPending ? (
               <PendingTag
-                testID={CAMPAIGN_STATS_SUMMARY_TEST_IDS.PENDING_TAG}
+                testID={ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.PENDING_TAG}
               />
             ) : isQualified ? (
               <Icon
                 name={IconName.Check}
                 size={IconSize.Sm}
                 color={IconColor.SuccessDefault}
-                testID={CAMPAIGN_STATS_SUMMARY_TEST_IDS.QUALIFIED_TAG}
+                testID={ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.QUALIFIED_TAG}
               />
             ) : undefined
           }
@@ -215,7 +218,7 @@ const CampaignStatsSummary: React.FC<CampaignStatsSummaryProps> = ({
           label={strings('rewards.ondo_campaign_stats.label_tier')}
           value={tierValue}
           isLoading={leaderboardLoading}
-          testID={CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER}
+          testID={ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.TIER}
         />
       </Box>
 
@@ -226,7 +229,7 @@ const CampaignStatsSummary: React.FC<CampaignStatsSummaryProps> = ({
           value={returnValue}
           isLoading={portfolioLoading}
           valueColor={returnColor}
-          testID={CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN}
+          testID={ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RETURN}
         />
         {!isCampaignComplete && (
           <StatCell
@@ -234,14 +237,14 @@ const CampaignStatsSummary: React.FC<CampaignStatsSummaryProps> = ({
             value={marketValue}
             isLoading={portfolioLoading}
             valueColor={returnColor}
-            testID={CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE}
+            testID={ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARKET_VALUE}
           />
         )}
       </Box>
 
       {/* Outcome banner (campaign ended) */}
       {isCampaignComplete && outcomeStatus != null && onWinnerPress != null && (
-        <OndoGmCampaignOutcomeBanner
+        <CampaignOutcomeBanner
           outcomeStatus={outcomeStatus}
           winnerVerificationCode={winnerVerificationCode ?? null}
           onWinnerPress={onWinnerPress}
@@ -272,7 +275,7 @@ const CampaignStatsSummary: React.FC<CampaignStatsSummaryProps> = ({
       {!isCampaignComplete && isIneligible && (
         <Box
           twClassName="bg-muted rounded-xl p-4 mt-2 gap-2"
-          testID={CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER}
+          testID={ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOT_ELIGIBLE_BANNER}
         >
           <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
             {strings('rewards.ondo_campaign_stats.not_eligible_title')}
@@ -337,11 +340,11 @@ const CampaignStatsSummary: React.FC<CampaignStatsSummaryProps> = ({
             portfolio.refetch();
           }}
           confirmButtonLabel={strings('rewards.ondo_campaign_stats.retry')}
-          testID={CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR}
+          testID={ONDO_CAMPAIGN_STATS_SUMMARY_TEST_IDS.STATS_ERROR}
         />
       )}
     </Box>
   );
 };
 
-export default CampaignStatsSummary;
+export default OndoCampaignStatsSummary;
diff --git a/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.tsx b/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.tsx
index 5990d411c7f..43c1aa1b231 100644
--- a/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.tsx
@@ -8,23 +8,21 @@ import {
   BoxFlexDirection,
   BoxAlignItems,
   BoxJustifyContent,
-  Icon,
-  IconColor,
-  IconName,
-  IconSize,
   Text,
   TextColor,
   TextVariant,
   FontWeight,
-  Skeleton,
 } from '@metamask/design-system-react-native';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import type { CampaignLeaderboardEntry } from '../../../../../core/Engine/controllers/rewards-controller/types';
 import { strings } from '../../../../../../locales/i18n';
 import Routes from '../../../../../constants/navigation/Routes';
 import RewardsErrorBanner from '../RewardsErrorBanner';
-import CrownIcon from '../../../../../images/rewards/crown.svg';
-import { PendingTag } from './CampaignStatsSummary';
+import {
+  CampaignLeaderboardEntryRow,
+  CampaignLeaderboardNeighborSeparator,
+  CampaignLeaderboardSkeleton,
+  CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS,
+} from './CampaignLeaderboard';
 import {
   formatRateOfReturn,
   formatTierDisplayName,
@@ -34,13 +32,14 @@ export const CAMPAIGN_LEADERBOARD_TEST_IDS = {
   CONTAINER: 'campaign-leaderboard-container',
   TIER_TOGGLE: 'campaign-leaderboard-tier-toggle',
   LIST: 'campaign-leaderboard-list',
-  ENTRY_ROW: 'campaign-leaderboard-entry-row',
-  PENDING_TAG: 'campaign-leaderboard-pending-tag',
-  NEIGHBOR_SEPARATOR: 'campaign-leaderboard-neighbor-separator',
-  LOADING: 'campaign-leaderboard-loading',
+  ENTRY_ROW: CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.ENTRY_ROW,
+  PENDING_TAG: CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.PENDING_TAG,
+  NEIGHBOR_SEPARATOR: CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.NEIGHBOR_SEPARATOR,
+  LOADING: CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.LOADING,
   ERROR: 'campaign-leaderboard-error',
   EMPTY: 'campaign-leaderboard-empty',
   NOT_YET_COMPUTED: 'campaign-leaderboard-not-yet-computed',
+  LAST_COMPUTED: 'campaign-leaderboard-last-computed',
 } as const;
 
 const MAX_ENTRIES_LIMIT = 20;
@@ -72,139 +71,10 @@ interface CampaignLeaderboardProps {
   /** Campaign ID used for analytics tracking. */
   campaignId?: string;
   isCampaignComplete?: boolean;
+  /** When true, hides the participants + tier toggle header row (used when the view renders its own tier selector). */
+  hideTierHeader?: boolean;
 }
 
-/**
- * LeaderboardEntryRow displays a single leaderboard entry
- */
-const LeaderboardEntryRow: React.FC<{
-  entry: CampaignLeaderboardEntry;
-  isCurrentUser?: boolean;
-  showCrown?: boolean;
-  isCampaignComplete?: boolean;
-}> = ({
-  entry,
-  isCurrentUser = false,
-  showCrown = false,
-  isCampaignComplete = false,
-}) => {
-  const isPositiveReturn = entry.rateOfReturn >= 0;
-  const textColor = isCurrentUser
-    ? isPositiveReturn
-      ? TextColor.SuccessDefault
-      : TextColor.ErrorDefault
-    : TextColor.TextDefault;
-  const isPending = !entry.qualified;
-  const rowBg = isCurrentUser
-    ? isPending
-      ? 'bg-muted'
-      : isPositiveReturn
-        ? 'bg-success-muted'
-        : 'bg-error-muted'
-    : '';
-
-  return (
-    <Box
-      flexDirection={BoxFlexDirection.Row}
-      alignItems={BoxAlignItems.Center}
-      justifyContent={BoxJustifyContent.Between}
-      twClassName={`py-2 px-4 ${rowBg}`}
-      testID={`${CAMPAIGN_LEADERBOARD_TEST_IDS.ENTRY_ROW}-${entry.rank}`}
-    >
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Center}
-        twClassName="gap-3"
-      >
-        <Text variant={TextVariant.BodyMd} color={textColor} twClassName="w-8">
-          {String(entry.rank).padStart(2, '0')}
-        </Text>
-        <Box twClassName="flex-row items-center gap-1">
-          <Text
-            variant={TextVariant.BodyMd}
-            fontWeight={FontWeight.Medium}
-            color={textColor}
-          >
-            {entry.referralCode}
-          </Text>
-          {showCrown && entry.rank <= 5 && (
-            <CrownIcon name="crown" width={14} height={14} />
-          )}
-        </Box>
-        {isCurrentUser && isPending && !isCampaignComplete && (
-          <PendingTag testID={CAMPAIGN_LEADERBOARD_TEST_IDS.PENDING_TAG} />
-        )}
-      </Box>
-      <Text
-        variant={TextVariant.BodyMd}
-        fontWeight={FontWeight.Medium}
-        color={textColor}
-      >
-        {formatRateOfReturn(entry.rateOfReturn)}
-      </Text>
-    </Box>
-  );
-};
-
-/**
- * LeaderboardSkeleton displays loading skeleton for the leaderboard section
- */
-const LeaderboardSkeleton: React.FC = () => {
-  const tw = useTailwind();
-
-  return (
-    <Box testID={CAMPAIGN_LEADERBOARD_TEST_IDS.LOADING}>
-      {/* Leaderboard rows skeleton */}
-      <Box twClassName="rounded-xl overflow-hidden">
-        {[1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map((i) => (
-          <Box key={i}>
-            <Box
-              flexDirection={BoxFlexDirection.Row}
-              justifyContent={BoxJustifyContent.Between}
-              alignItems={BoxAlignItems.Center}
-              twClassName="py-1 px-4"
-            >
-              <Box
-                flexDirection={BoxFlexDirection.Row}
-                alignItems={BoxAlignItems.Center}
-                twClassName="gap-3"
-              >
-                <Skeleton style={tw.style('h-5 w-8 rounded')} />
-                <Skeleton style={tw.style('h-5 w-20 rounded')} />
-              </Box>
-              <Skeleton style={tw.style('h-5 w-16 rounded')} />
-            </Box>
-          </Box>
-        ))}
-      </Box>
-    </Box>
-  );
-};
-
-/**
- * OndoLeaderboard displays the leaderboard tiers and entries for a campaign.
- * Position-specific data (user rank, tier, deposited value) is handled separately
- * by the OndoLeaderboardPosition component.
- */
-const NeighborSeparator: React.FC = () => (
-  <Box
-    flexDirection={BoxFlexDirection.Row}
-    alignItems={BoxAlignItems.Center}
-    twClassName="py-1"
-    testID={CAMPAIGN_LEADERBOARD_TEST_IDS.NEIGHBOR_SEPARATOR}
-  >
-    <Box twClassName="flex-1 border-b border-border-muted" />
-    <Text
-      variant={TextVariant.BodyMd}
-      color={TextColor.TextAlternative}
-      twClassName="px-3"
-    >
-      •••
-    </Text>
-    <Box twClassName="flex-1 border-b border-border-muted" />
-  </Box>
-);
-
 const OndoLeaderboard: React.FC<CampaignLeaderboardProps> = ({
   tierNames,
   selectedTier,
@@ -220,6 +90,7 @@ const OndoLeaderboard: React.FC<CampaignLeaderboardProps> = ({
   userPosition,
   campaignId,
   isCampaignComplete = false,
+  hideTierHeader = false,
 }) => {
   const navigation = useNavigation();
   const { trackEvent, createEventBuilder } = useAnalytics();
@@ -306,7 +177,7 @@ const OndoLeaderboard: React.FC<CampaignLeaderboardProps> = ({
   );
 
   if (isLoading && entries.length === 0) {
-    return <LeaderboardSkeleton />;
+    return <CampaignLeaderboardSkeleton />;
   }
 
   if (hasError && entries.length === 0) {
@@ -360,72 +231,70 @@ const OndoLeaderboard: React.FC<CampaignLeaderboardProps> = ({
   return (
     <Box testID={CAMPAIGN_LEADERBOARD_TEST_IDS.CONTAINER}>
       {/* Participants + tier subtitle */}
-      {(totalParticipants > 0 || Boolean(selectedTierLabel)) && (
-        <Pressable
-          onPress={tierNames.length > 1 ? openTierSelector : undefined}
-          testID={CAMPAIGN_LEADERBOARD_TEST_IDS.TIER_TOGGLE}
-        >
-          <Box
-            flexDirection={BoxFlexDirection.Row}
-            alignItems={BoxAlignItems.Center}
-            twClassName="gap-2 mb-2 px-4"
+      {!hideTierHeader &&
+        (totalParticipants > 0 || Boolean(selectedTierLabel)) && (
+          <Pressable
+            onPress={tierNames.length > 1 ? openTierSelector : undefined}
+            testID={CAMPAIGN_LEADERBOARD_TEST_IDS.TIER_TOGGLE}
           >
-            {totalParticipants > 0 && (
-              <Text
-                variant={TextVariant.BodySm}
-                color={TextColor.SuccessDefault}
-              >
-                {strings(
-                  'rewards.ondo_campaign_leaderboard.total_participants',
-                  {
-                    count: totalParticipants.toLocaleString(),
-                  },
-                )}
-              </Text>
-            )}
-            {selectedTierLabel ? (
-              <>
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              twClassName="gap-2 mb-2 px-4"
+            >
+              {totalParticipants > 0 && (
+                <Text
+                  variant={TextVariant.BodySm}
+                  color={TextColor.SuccessDefault}
+                >
+                  {strings(
+                    'rewards.ondo_campaign_leaderboard.total_participants',
+                    {
+                      count: totalParticipants.toLocaleString(),
+                    },
+                  )}
+                </Text>
+              )}
+              {Boolean(selectedTierLabel) && (
                 <Text
                   variant={TextVariant.BodySm}
                   color={TextColor.TextAlternative}
                 >
                   {selectedTierLabel}
                 </Text>
-                {tierNames.length > 1 && (
-                  <Icon
-                    name={IconName.ArrowDown}
-                    size={IconSize.Sm}
-                    color={IconColor.IconAlternative}
-                  />
-                )}
-              </>
-            ) : null}
-          </Box>
-        </Pressable>
-      )}
+              )}
+            </Box>
+          </Pressable>
+        )}
 
       {/* Leaderboard list */}
       {visibleEntries.length > 0 ? (
         <Box testID={CAMPAIGN_LEADERBOARD_TEST_IDS.LIST}>
           {visibleEntries.map((entry) => (
-            <LeaderboardEntryRow
+            <CampaignLeaderboardEntryRow
               key={`${entry.rank}-${entry.referralCode}`}
               entry={entry}
               isCurrentUser={isCurrentUser(entry)}
               showCrown={!isPreview}
               isCampaignComplete={isCampaignComplete}
+              formatPrimaryMetric={(e) => formatRateOfReturn(e.rateOfReturn)}
+              isPositivePrimaryMetric={(e) => e.rateOfReturn >= 0}
             />
           ))}
           {showSplitView && userPosition && (
             <>
-              <NeighborSeparator />
+              <CampaignLeaderboardNeighborSeparator />
               {userPosition.neighbors.map((entry) => (
-                <LeaderboardEntryRow
+                <CampaignLeaderboardEntryRow
                   key={`neighbor-${entry.rank}-${entry.referralCode}`}
                   entry={entry}
                   isCurrentUser={isCurrentUser(entry)}
                   showCrown={!isPreview}
                   isCampaignComplete={isCampaignComplete}
+                  formatPrimaryMetric={(e) =>
+                    formatRateOfReturn(e.rateOfReturn)
+                  }
+                  isPositivePrimaryMetric={(e) => e.rateOfReturn >= 0}
                 />
               ))}
             </>
diff --git a/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.utils.test.ts b/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.utils.test.ts
index c6604c55c87..ef0a551d155 100644
--- a/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.utils.test.ts
+++ b/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.utils.test.ts
@@ -1,18 +1,27 @@
 import {
+  buildLeaderboardUserPosition,
   formatRateOfReturn,
-  formatComputedAt,
   formatTierDisplayName,
+  getCampaignTierNames,
   getTierMinNetDeposit,
 } from './OndoLeaderboard.utils';
+import type { CampaignLeaderboardPositionDto } from '../../../../../core/Engine/controllers/rewards-controller/types';
 
 jest.mock('../../../../../../locales/i18n', () => ({
-  strings: (key: string) => {
+  strings: (key: string, params?: Record<string, string>) => {
     const t: Record<string, string> = {
       'rewards.ondo_campaign_leaderboard.tier_starter': 'Bronze',
       'rewards.ondo_campaign_leaderboard.tier_mid': 'Silver',
       'rewards.ondo_campaign_leaderboard.tier_upper': 'Platinum',
+      'rewards.perps_trading_campaign.last_updated': 'Last updated: {{time}}',
     };
-    return t[key] ?? key;
+    let template = t[key] ?? key;
+    if (params) {
+      for (const [paramKey, value] of Object.entries(params)) {
+        template = template.split(`{{${paramKey}}}`).join(value);
+      }
+    }
+    return template;
   },
   default: { locale: 'en-US' },
 }));
@@ -44,35 +53,6 @@ describe('OndoLeaderboard.utils', () => {
     });
   });
 
-  describe('formatComputedAt', () => {
-    beforeEach(() => {
-      jest.useFakeTimers();
-      jest.setSystemTime(new Date('2024-03-20T12:00:00.000Z'));
-    });
-
-    afterEach(() => {
-      jest.useRealTimers();
-    });
-
-    it('returns empty string for null', () => {
-      expect(formatComputedAt(null)).toBe('');
-    });
-
-    it('returns empty string for empty string', () => {
-      expect(formatComputedAt('')).toBe('');
-    });
-
-    it('returns a non-empty string for a valid ISO timestamp', () => {
-      const result = formatComputedAt('2024-03-20T12:00:00.000Z');
-      expect(result).toBeTruthy();
-      expect(typeof result).toBe('string');
-    });
-
-    it('returns empty string for an unparseable value', () => {
-      expect(formatComputedAt('not-a-date')).toBe('');
-    });
-  });
-
   describe('formatTierDisplayName', () => {
     it('maps STARTER to Bronze', () => {
       expect(formatTierDisplayName('STARTER')).toBe('Bronze');
@@ -99,6 +79,81 @@ describe('OndoLeaderboard.utils', () => {
     });
   });
 
+  describe('getCampaignTierNames', () => {
+    it('returns empty array for null', () => {
+      expect(getCampaignTierNames(null)).toEqual([]);
+    });
+
+    it('returns empty array for undefined', () => {
+      expect(getCampaignTierNames(undefined)).toEqual([]);
+    });
+
+    it('returns empty array when details is null', () => {
+      expect(getCampaignTierNames({ details: null })).toEqual([]);
+    });
+
+    it('returns empty array when tiers is undefined', () => {
+      expect(getCampaignTierNames({ details: {} })).toEqual([]);
+    });
+
+    it('returns empty array for empty tiers', () => {
+      expect(getCampaignTierNames({ details: { tiers: [] } })).toEqual([]);
+    });
+
+    it('returns tier names for a campaign with tiers', () => {
+      const campaign = {
+        details: {
+          tiers: [
+            { name: 'STARTER', minNetDeposit: 500 },
+            { name: 'MID', minNetDeposit: 1000 },
+          ],
+        },
+      };
+      expect(getCampaignTierNames(campaign)).toEqual(['STARTER', 'MID']);
+    });
+  });
+
+  describe('buildLeaderboardUserPosition', () => {
+    const position: CampaignLeaderboardPositionDto = {
+      projectedTier: 'MID',
+      rank: 3,
+      totalInTier: 50,
+      rateOfReturn: 0.12,
+      currentUsdValue: 15000,
+      totalUsdDeposited: 12000,
+      netDeposit: 11000,
+      qualifiedDays: 14,
+      qualified: true,
+      neighbors: [
+        {
+          rank: 2,
+          referralCode: 'ABCDEF',
+          rateOfReturn: 0.13,
+          qualifiedDays: 14,
+          qualified: true,
+        },
+      ],
+      computedAt: '2024-03-20T12:00:00.000Z',
+    };
+
+    it('returns null for null input', () => {
+      expect(buildLeaderboardUserPosition(null)).toBeNull();
+    });
+
+    it('returns projectedTier, rank, and neighbors for a valid position', () => {
+      expect(buildLeaderboardUserPosition(position)).toEqual({
+        projectedTier: 'MID',
+        rank: 3,
+        neighbors: position.neighbors,
+      });
+    });
+
+    it('passes the neighbors array through unchanged', () => {
+      const result = buildLeaderboardUserPosition(position);
+      expect(result?.neighbors).toBe(position.neighbors);
+    });
+  });
+
   describe('getTierMinNetDeposit', () => {
     const tiers = [
       { name: 'STARTER', minNetDeposit: 500 },
diff --git a/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.utils.ts b/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.utils.ts
index 20b4692d541..bceab2d2e8d 100644
--- a/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.utils.ts
+++ b/app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.utils.ts
@@ -1,11 +1,12 @@
 import { strings } from '../../../../../../locales/i18n';
-import type { OndoCampaignTier } from '../../../../../core/Engine/controllers/rewards-controller/types';
+import type {
+  CampaignLeaderboardEntry,
+  CampaignLeaderboardPositionDto,
+  OndoCampaignTier,
+} from '../../../../../core/Engine/controllers/rewards-controller/types';
 
 // Re-export shared helpers so existing consumers keep working
-export {
-  formatPercentChange as formatRateOfReturn,
-  formatComputedAt,
-} from '../../utils/formatUtils';
+export { formatPercentChange as formatRateOfReturn } from '../../utils/formatUtils';
 
 // ── Tier display names ──────────────────────────────────────────────────
 
@@ -24,6 +25,28 @@ export const formatTierDisplayName = (tier: string): string => {
   return key ? strings(key) : tier;
 };
 
+export const getCampaignTierNames = (
+  campaign:
+    | { details?: { tiers?: OndoCampaignTier[] } | null }
+    | null
+    | undefined,
+): string[] => campaign?.details?.tiers?.map((t) => t.name) ?? [];
+
+export const buildLeaderboardUserPosition = (
+  position: CampaignLeaderboardPositionDto | null,
+): {
+  projectedTier: string;
+  rank: number;
+  neighbors: CampaignLeaderboardEntry[];
+} | null =>
+  position
+    ? {
+        projectedTier: position.projectedTier,
+        rank: position.rank,
+        neighbors: position.neighbors,
+      }
+    : null;
+
 /**
  * Looks up the minNetDeposit for a tier from campaign config tiers.
  * Returns null when the tier or config is missing.
diff --git a/app/components/UI/Rewards/components/Campaigns/OndoPortfolio.test.tsx b/app/components/UI/Rewards/components/Campaigns/OndoPortfolio.test.tsx
index eeb25e8ae7f..6db8aef4c69 100644
--- a/app/components/UI/Rewards/components/Campaigns/OndoPortfolio.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/OndoPortfolio.test.tsx
@@ -168,10 +168,6 @@ jest.mock('../../../../../util/ondoGeoRestrictions', () => ({
   isGeoRestricted: jest.fn(() => false),
 }));
 
-jest.mock('./OndoLeaderboard.utils', () => ({
-  formatComputedAt: jest.fn(),
-}));
-
 jest.mock('../../../../../images/rewards/rewards-no-positions.svg', () => {
   const ReactActual = jest.requireActual('react');
   const { View } = jest.requireActual('react-native');
diff --git a/app/components/UI/Rewards/components/Campaigns/OndoPrizePool.test.tsx b/app/components/UI/Rewards/components/Campaigns/OndoPrizePool.test.tsx
index 1cc026ed32c..bd1e1c9cb21 100644
--- a/app/components/UI/Rewards/components/Campaigns/OndoPrizePool.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/OndoPrizePool.test.tsx
@@ -1,9 +1,6 @@
 import React from 'react';
 import { render, fireEvent } from '@testing-library/react-native';
-import OndoPrizePool, {
-  ONDO_PRIZE_POOL_TEST_IDS,
-  getCurrentPrize,
-} from './OndoPrizePool';
+import OndoPrizePool, { ONDO_PRIZE_POOL_TEST_IDS } from './OndoPrizePool';
 
 jest.mock('@metamask/design-system-react-native', () => {
   const actual = jest.requireActual('@metamask/design-system-react-native');
@@ -218,40 +215,3 @@ describe('OndoPrizePool', () => {
     expect(mockRefetch).toHaveBeenCalledTimes(1);
   });
 });
-
-describe('getCurrentPrize', () => {
-  it('returns $25,000 for $0 deposits', () => {
-    expect(getCurrentPrize(0)).toBe(25_000);
-  });
-
-  it('returns $25,000 for deposits below $1.5M', () => {
-    expect(getCurrentPrize(500_000)).toBe(25_000);
-    expect(getCurrentPrize(1_499_999)).toBe(25_000);
-  });
-
-  it('returns $50,000 at exactly $1.5M', () => {
-    expect(getCurrentPrize(1_500_000)).toBe(50_000);
-  });
-
-  it('returns $50,000 for deposits between $1.5M and $3.5M', () => {
-    expect(getCurrentPrize(2_000_000)).toBe(50_000);
-    expect(getCurrentPrize(3_499_999)).toBe(50_000);
-  });
-
-  it('returns $75,000 at exactly $3.5M', () => {
-    expect(getCurrentPrize(3_500_000)).toBe(75_000);
-  });
-
-  it('returns $75,000 for deposits between $3.5M and $6M', () => {
-    expect(getCurrentPrize(4_500_000)).toBe(75_000);
-    expect(getCurrentPrize(5_999_999)).toBe(75_000);
-  });
-
-  it('returns $100,000 at exactly $6M', () => {
-    expect(getCurrentPrize(6_000_000)).toBe(100_000);
-  });
-
-  it('returns $100,000 for deposits above $6M', () => {
-    expect(getCurrentPrize(10_000_000)).toBe(100_000);
-  });
-});
diff --git a/app/components/UI/Rewards/components/Campaigns/OndoPrizePool.tsx b/app/components/UI/Rewards/components/Campaigns/OndoPrizePool.tsx
index a614713eb56..c734e835ff8 100644
--- a/app/components/UI/Rewards/components/Campaigns/OndoPrizePool.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/OndoPrizePool.tsx
@@ -13,6 +13,7 @@ import {
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import RewardsErrorBanner from '../RewardsErrorBanner';
 import { formatCompactUsd, formatUsd } from '../../utils/formatUtils';
+import { computePrizePoolProgress } from '../../utils/prizePoolUtils';
 import { strings } from '../../../../../../locales/i18n';
 
 export const ONDO_PRIZE_POOL_TEST_IDS = {
@@ -30,50 +31,6 @@ export const BREAKPOINTS = [
   { deposit: 6_000_000, prize: 100_000 },
 ] as const;
 
-export function getCurrentPrize(totalDeposited: number): number {
-  for (let i = BREAKPOINTS.length - 1; i >= 0; i--) {
-    if (totalDeposited >= BREAKPOINTS[i].deposit) {
-      return BREAKPOINTS[i].prize;
-    }
-  }
-  return BREAKPOINTS[0].prize;
-}
-
-function computeProgress(totalDeposited: number) {
-  let currentIndex = 0;
-  for (let i = BREAKPOINTS.length - 1; i >= 0; i--) {
-    if (totalDeposited >= BREAKPOINTS[i].deposit) {
-      currentIndex = i;
-      break;
-    }
-  }
-
-  const current = BREAKPOINTS[currentIndex];
-  const next = BREAKPOINTS[currentIndex + 1];
-
-  if (!next) {
-    return {
-      progress: 1,
-      currentPrize: current.prize,
-      nextPrize: null,
-      nextThreshold: current.deposit,
-      isMaxTier: true,
-    };
-  }
-
-  const rangeDeposit = next.deposit - current.deposit;
-  const progressInRange = totalDeposited - current.deposit;
-  const progress = Math.min(progressInRange / rangeDeposit, 1);
-
-  return {
-    progress,
-    currentPrize: current.prize,
-    nextPrize: next.prize,
-    nextThreshold: next.deposit,
-    isMaxTier: false,
-  };
-}
-
 interface OndoPrizePoolProps {
   totalUsdDeposited: string | null;
   isLoading: boolean;
@@ -103,7 +60,11 @@ const OndoPrizePool: React.FC<OndoPrizePoolProps> = ({
           isMaxTier: false,
         };
       }
-      return computeProgress(parseFloat(totalUsdDeposited));
+      return computePrizePoolProgress(
+        BREAKPOINTS,
+        parseFloat(totalUsdDeposited),
+        (m) => m.deposit,
+      );
     }, [totalUsdDeposited]);
 
   const progressPercent: `${number}%` = `${Math.round(progress * 100)}%`;
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsCampaignStatsSummary.test.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsCampaignStatsSummary.test.tsx
new file mode 100644
index 00000000000..071018490ea
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsCampaignStatsSummary.test.tsx
@@ -0,0 +1,280 @@
+import React from 'react';
+import { fireEvent, render } from '@testing-library/react-native';
+import { TextColor } from '@metamask/design-system-react-native';
+import PerpsCampaignStatsSummary, {
+  PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS,
+} from './PerpsCampaignStatsSummary';
+import type { PerpsTradingCampaignLeaderboardPositionDto } from '../../../../../core/Engine/controllers/rewards-controller/types';
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  const ReactActual = jest.requireActual('react');
+  const RN = jest.requireActual('react-native');
+  return {
+    ...actual,
+    Text: (props: Record<string, unknown>) =>
+      ReactActual.createElement(RN.Text, props, props.children),
+  };
+});
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({ style: (...args: unknown[]) => args }),
+}));
+
+jest.mock('../../../../../../locales/i18n', () => ({
+  strings: (key: string) => key,
+}));
+
+jest.mock('./CampaignOutcomeBanners', () => {
+  const ReactActual = jest.requireActual('react');
+  const { Pressable, Text } = jest.requireActual('react-native');
+  return {
+    CampaignOutcomeBanner: ({
+      outcomeStatus,
+      winnerVerificationCode,
+      onWinnerPress,
+    }: {
+      outcomeStatus: string;
+      winnerVerificationCode?: string | null;
+      onWinnerPress: () => void;
+    }) =>
+      ReactActual.createElement(
+        Pressable,
+        {
+          testID: `campaign-outcome-banner-${outcomeStatus}-${winnerVerificationCode ?? 'null'}`,
+          onPress: onWinnerPress,
+        },
+        ReactActual.createElement(Text, null, 'Campaign outcome'),
+      ),
+  };
+});
+
+const TEST_IDS = PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS;
+
+const mockLeaderboard = {
+  campaignId: 'c1',
+  computedAt: '2025-01-01T00:00:00.000Z',
+  entries: [],
+  totalParticipants: 0,
+};
+
+const basePosition: PerpsTradingCampaignLeaderboardPositionDto = {
+  rank: 7,
+  pnl: 1500.25,
+  notionalVolume: 30_000,
+  marginDeployed: 2000,
+  qualified: true,
+  neighbors: [],
+  computedAt: '2025-01-01T00:00:00.000Z',
+};
+
+describe('PerpsCampaignStatsSummary', () => {
+  it('renders container and four stat labels', () => {
+    const { getByTestId, getByText } = render(
+      <PerpsCampaignStatsSummary
+        leaderboardPosition={basePosition}
+        leaderboard={mockLeaderboard}
+      />,
+    );
+
+    expect(getByTestId(TEST_IDS.CONTAINER)).toBeDefined();
+    expect(
+      getByText('rewards.perps_trading_campaign.label_rank'),
+    ).toBeDefined();
+    expect(getByText('rewards.perps_trading_campaign.label_pnl')).toBeDefined();
+    expect(
+      getByText('rewards.perps_trading_campaign.label_volume'),
+    ).toBeDefined();
+    expect(
+      getByText('rewards.perps_trading_campaign.label_margin'),
+    ).toBeDefined();
+    expect(getByText('07')).toBeDefined();
+    expect(getByText('+$1,500.25')).toBeDefined();
+  });
+
+  it('uses success color for non-negative pnl', () => {
+    const { getByTestId } = render(
+      <PerpsCampaignStatsSummary
+        leaderboardPosition={basePosition}
+        leaderboard={mockLeaderboard}
+      />,
+    );
+    const pnlCell = getByTestId(TEST_IDS.PNL);
+    expect(pnlCell.props.color).toBe(TextColor.SuccessDefault);
+  });
+
+  it('uses error color for negative pnl', () => {
+    const { getByTestId } = render(
+      <PerpsCampaignStatsSummary
+        leaderboardPosition={{ ...basePosition, pnl: -100 }}
+        leaderboard={mockLeaderboard}
+      />,
+    );
+    const pnlCell = getByTestId(TEST_IDS.PNL);
+    expect(pnlCell.props.color).toBe(TextColor.ErrorDefault);
+  });
+
+  it('renders em dashes when position is null', () => {
+    const { getAllByText } = render(
+      <PerpsCampaignStatsSummary
+        leaderboardPosition={null}
+        leaderboard={null}
+      />,
+    );
+    expect(getAllByText('—').length).toBeGreaterThanOrEqual(4);
+  });
+
+  it('shows pending tag on rank when campaign is active and user is not qualified', () => {
+    const { getByTestId, queryByTestId } = render(
+      <PerpsCampaignStatsSummary
+        isCampaignComplete={false}
+        leaderboardPosition={{ ...basePosition, qualified: false }}
+        leaderboard={mockLeaderboard}
+      />,
+    );
+    expect(getByTestId(TEST_IDS.PENDING_TAG)).toBeDefined();
+    expect(queryByTestId(TEST_IDS.QUALIFIED_TAG)).toBeNull();
+  });
+
+  it('shows qualified check on rank when user is qualified', () => {
+    const { getByTestId, queryByTestId } = render(
+      <PerpsCampaignStatsSummary
+        isCampaignComplete={false}
+        leaderboardPosition={basePosition}
+        leaderboard={mockLeaderboard}
+      />,
+    );
+    expect(getByTestId(TEST_IDS.QUALIFIED_TAG)).toBeDefined();
+    expect(queryByTestId(TEST_IDS.PENDING_TAG)).toBeNull();
+  });
+
+  it('does not show pending tag on rank when campaign is complete and user is not qualified', () => {
+    const { queryByTestId } = render(
+      <PerpsCampaignStatsSummary
+        isCampaignComplete
+        leaderboardPosition={{ ...basePosition, qualified: false }}
+        leaderboard={mockLeaderboard}
+      />,
+    );
+    expect(queryByTestId(TEST_IDS.PENDING_TAG)).toBeNull();
+    expect(queryByTestId(TEST_IDS.QUALIFIED_TAG)).toBeNull();
+  });
+
+  it('shows qualified check when campaign is complete and user is qualified', () => {
+    const { getByTestId, queryByTestId } = render(
+      <PerpsCampaignStatsSummary
+        isCampaignComplete
+        leaderboardPosition={basePosition}
+        leaderboard={mockLeaderboard}
+      />,
+    );
+    expect(getByTestId(TEST_IDS.QUALIFIED_TAG)).toBeDefined();
+    expect(queryByTestId(TEST_IDS.PENDING_TAG)).toBeNull();
+  });
+
+  it("shows You're qualified card when campaign is active and user is qualified", () => {
+    const { getByTestId, queryByTestId } = render(
+      <PerpsCampaignStatsSummary
+        isCampaignComplete={false}
+        leaderboardPosition={basePosition}
+        leaderboard={mockLeaderboard}
+      />,
+    );
+    expect(getByTestId(TEST_IDS.QUALIFIED_CARD)).toBeDefined();
+    expect(queryByTestId(TEST_IDS.QUALIFY_FOR_RANK_CARD)).toBeNull();
+  });
+
+  it('hides volume and margin StatCells when campaign is complete (only rank and PnL remain)', () => {
+    const { queryByTestId, getByTestId } = render(
+      <PerpsCampaignStatsSummary
+        leaderboardPosition={basePosition}
+        leaderboard={mockLeaderboard}
+        isCampaignComplete
+      />,
+    );
+    expect(getByTestId(TEST_IDS.RANK)).toBeDefined();
+    expect(getByTestId(TEST_IDS.PNL)).toBeDefined();
+    expect(queryByTestId(TEST_IDS.NOTIONAL_VOLUME)).toBeNull();
+    expect(queryByTestId(TEST_IDS.MARGIN_DEPLOYED)).toBeNull();
+  });
+
+  it("hides You're qualified card when campaign is complete", () => {
+    const { queryByTestId } = render(
+      <PerpsCampaignStatsSummary
+        isCampaignComplete
+        leaderboardPosition={basePosition}
+        leaderboard={mockLeaderboard}
+      />,
+    );
+    expect(queryByTestId(TEST_IDS.QUALIFIED_CARD)).toBeNull();
+  });
+
+  it('shows Qualify for rank card when pending and below qualification thresholds', () => {
+    const { getByTestId, queryByTestId } = render(
+      <PerpsCampaignStatsSummary
+        isCampaignComplete={false}
+        leaderboardPosition={{
+          ...basePosition,
+          qualified: false,
+          notionalVolume: 5_000,
+          marginDeployed: 200,
+        }}
+        leaderboard={mockLeaderboard}
+      />,
+    );
+    expect(getByTestId(TEST_IDS.QUALIFY_FOR_RANK_CARD)).toBeDefined();
+    expect(queryByTestId(TEST_IDS.QUALIFIED_CARD)).toBeNull();
+  });
+
+  it('hides Qualify for rank card when notional volume already meets threshold even if still pending', () => {
+    const { queryByTestId } = render(
+      <PerpsCampaignStatsSummary
+        isCampaignComplete={false}
+        leaderboardPosition={{
+          ...basePosition,
+          qualified: false,
+          notionalVolume: 30_000,
+          marginDeployed: 2_000,
+        }}
+        leaderboard={mockLeaderboard}
+      />,
+    );
+    expect(queryByTestId(TEST_IDS.QUALIFY_FOR_RANK_CARD)).toBeNull();
+  });
+
+  it('shows outcome banner for complete campaigns and handles winner press', () => {
+    const onWinnerPress = jest.fn();
+    const { getByTestId } = render(
+      <PerpsCampaignStatsSummary
+        isCampaignComplete
+        leaderboardPosition={basePosition}
+        leaderboard={mockLeaderboard}
+        outcomeStatus="pending"
+        winnerVerificationCode="PERPS-WINNER-123"
+        onWinnerPress={onWinnerPress}
+      />,
+    );
+
+    fireEvent.press(
+      getByTestId('campaign-outcome-banner-pending-PERPS-WINNER-123'),
+    );
+    expect(onWinnerPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not show outcome banner before campaign completion', () => {
+    const { queryByTestId } = render(
+      <PerpsCampaignStatsSummary
+        isCampaignComplete={false}
+        leaderboardPosition={basePosition}
+        leaderboard={mockLeaderboard}
+        outcomeStatus="pending"
+        winnerVerificationCode="PERPS-WINNER-123"
+        onWinnerPress={jest.fn()}
+      />,
+    );
+
+    expect(
+      queryByTestId('campaign-outcome-banner-pending-PERPS-WINNER-123'),
+    ).toBeNull();
+  });
+});
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsCampaignStatsSummary.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsCampaignStatsSummary.tsx
new file mode 100644
index 00000000000..7c3c7a2fe49
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsCampaignStatsSummary.tsx
@@ -0,0 +1,205 @@
+import React from 'react';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import type {
+  CampaignParticipantOutcomeStatus,
+  PerpsTradingCampaignLeaderboardDto,
+  PerpsTradingCampaignLeaderboardPositionDto,
+} from '../../../../../core/Engine/controllers/rewards-controller/types';
+import { strings } from '../../../../../../locales/i18n';
+import { formatSignedUsd, formatUsd } from '../../utils/formatUtils';
+import { PERPS_QUALIFICATION_NOTIONAL_USD } from '../../utils/perpsCampaignConstants';
+import { PendingTag, StatCell } from './OndoCampaignStatsSummary';
+import { CampaignOutcomeBanner } from './CampaignOutcomeBanners';
+
+const PERPS_NOTIONAL_THRESHOLD_LABEL = formatUsd(
+  PERPS_QUALIFICATION_NOTIONAL_USD,
+);
+
+export const PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS = {
+  CONTAINER: 'perps-campaign-stats-summary-container',
+  RANK: 'perps-campaign-stats-summary-rank',
+  PNL: 'perps-campaign-stats-summary-pnl',
+  NOTIONAL_VOLUME: 'perps-campaign-stats-summary-notional-volume',
+  MARGIN_DEPLOYED: 'perps-campaign-stats-summary-margin-deployed',
+  PENDING_TAG: 'perps-campaign-stats-summary-pending-tag',
+  QUALIFIED_TAG: 'perps-campaign-stats-summary-qualified-tag',
+  QUALIFIED_CARD: 'perps-campaign-stats-summary-qualified-card',
+  QUALIFY_FOR_RANK_CARD: 'perps-campaign-stats-summary-qualify-for-rank-card',
+} as const;
+
+export interface PerpsCampaignStatsSummaryProps {
+  leaderboardPosition: PerpsTradingCampaignLeaderboardPositionDto | null;
+  /** Passed for future use (e.g. leaderboard-level metadata); stats values come from `leaderboardPosition`. */
+  leaderboard: PerpsTradingCampaignLeaderboardDto | null;
+  /** When false, pending (not yet qualified) users see a {@link PendingTag} next to rank. */
+  isCampaignComplete?: boolean;
+  outcomeStatus?: CampaignParticipantOutcomeStatus;
+  winnerVerificationCode?: string | null;
+  onWinnerPress?: () => void;
+}
+
+const PerpsCampaignStatsSummary: React.FC<PerpsCampaignStatsSummaryProps> = ({
+  leaderboardPosition,
+  leaderboard: _leaderboard,
+  isCampaignComplete = false,
+  outcomeStatus,
+  winnerVerificationCode,
+  onWinnerPress,
+}) => {
+  const isPending =
+    leaderboardPosition != null && !leaderboardPosition.qualified;
+  const isQualified =
+    leaderboardPosition != null && leaderboardPosition.qualified;
+
+  const rankDisplay = leaderboardPosition
+    ? String(leaderboardPosition.rank).padStart(2, '0')
+    : '—';
+
+  const pnlDisplay = leaderboardPosition
+    ? formatSignedUsd(leaderboardPosition.pnl)
+    : '—';
+
+  const pnlColor = leaderboardPosition
+    ? leaderboardPosition.pnl >= 0
+      ? TextColor.SuccessDefault
+      : TextColor.ErrorDefault
+    : TextColor.TextDefault;
+
+  const volumeDisplay = leaderboardPosition
+    ? formatUsd(leaderboardPosition.notionalVolume)
+    : '—';
+
+  const marginDisplay = leaderboardPosition
+    ? formatUsd(leaderboardPosition.marginDeployed)
+    : '—';
+
+  const notionalGap = leaderboardPosition
+    ? Math.max(
+        0,
+        PERPS_QUALIFICATION_NOTIONAL_USD - leaderboardPosition.notionalVolume,
+      )
+    : 0;
+
+  const showQualifiedCard =
+    !isCampaignComplete && isQualified && leaderboardPosition != null;
+
+  const showQualifyForRankCard =
+    !isCampaignComplete &&
+    isPending &&
+    leaderboardPosition != null &&
+    notionalGap > 0;
+
+  return (
+    <Box
+      twClassName="gap-3"
+      testID={PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS.CONTAINER}
+    >
+      <Box flexDirection={BoxFlexDirection.Row}>
+        <StatCell
+          label={strings('rewards.perps_trading_campaign.label_rank')}
+          value={rankDisplay}
+          testID={PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS.RANK}
+          suffix={
+            !isCampaignComplete && isPending ? (
+              <PendingTag
+                testID={PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS.PENDING_TAG}
+              />
+            ) : isQualified ? (
+              <Icon
+                name={IconName.Check}
+                size={IconSize.Sm}
+                color={IconColor.SuccessDefault}
+                testID={PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS.QUALIFIED_TAG}
+              />
+            ) : undefined
+          }
+        />
+        <StatCell
+          label={strings('rewards.perps_trading_campaign.label_pnl')}
+          value={pnlDisplay}
+          valueColor={pnlColor}
+          testID={PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS.PNL}
+        />
+      </Box>
+      {!isCampaignComplete && (
+        <Box flexDirection={BoxFlexDirection.Row}>
+          <StatCell
+            label={strings('rewards.perps_trading_campaign.label_volume')}
+            value={volumeDisplay}
+            testID={PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS.NOTIONAL_VOLUME}
+          />
+          <StatCell
+            label={strings('rewards.perps_trading_campaign.label_margin')}
+            value={marginDisplay}
+            testID={PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS.MARGIN_DEPLOYED}
+          />
+        </Box>
+      )}
+
+      {showQualifiedCard && (
+        <Box
+          twClassName="bg-muted rounded-xl p-4 mt-2 gap-2"
+          testID={PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS.QUALIFIED_CARD}
+        >
+          <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+            {strings('rewards.perps_trading_campaign.stats_qualified_title')}
+          </Text>
+          <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
+            {strings(
+              'rewards.perps_trading_campaign.stats_qualified_description',
+            )}
+          </Text>
+        </Box>
+      )}
+
+      {showQualifyForRankCard && (
+        <Box
+          twClassName="bg-muted rounded-xl p-4 mt-2 gap-2"
+          testID={PERPS_CAMPAIGN_STATS_SUMMARY_TEST_IDS.QUALIFY_FOR_RANK_CARD}
+        >
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="gap-2"
+          >
+            <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+              {strings(
+                'rewards.perps_trading_campaign.stats_qualify_for_rank_title',
+              )}
+            </Text>
+          </Box>
+          <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
+            {strings(
+              'rewards.perps_trading_campaign.stats_qualify_for_rank_description',
+              {
+                notionalRemaining: formatUsd(notionalGap),
+              },
+            )}
+          </Text>
+        </Box>
+      )}
+
+      {isCampaignComplete && outcomeStatus != null && onWinnerPress != null && (
+        <CampaignOutcomeBanner
+          outcomeStatus={outcomeStatus}
+          winnerVerificationCode={winnerVerificationCode ?? null}
+          onWinnerPress={onWinnerPress}
+        />
+      )}
+    </Box>
+  );
+};
+
+export default PerpsCampaignStatsSummary;
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignCTA.test.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignCTA.test.tsx
new file mode 100644
index 00000000000..45efd5f19a9
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignCTA.test.tsx
@@ -0,0 +1,210 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import PerpsTradingCampaignCTA from './PerpsTradingCampaignCTA';
+import { CAMPAIGN_CTA_TEST_IDS } from './CampaignOptInCta';
+import {
+  type CampaignDto,
+  CampaignType,
+} from '../../../../../core/Engine/controllers/rewards-controller/types';
+import { selectPerpsEligibility } from '../../../Perps/selectors/perpsController';
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  return { ...actual };
+});
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({ style: (...args: unknown[]) => args }),
+}));
+
+const mockHandleDeeplink = jest.fn();
+jest.mock('../../../../../core/DeeplinkManager', () => ({
+  handleDeeplink: (...args: unknown[]) => mockHandleDeeplink(...args),
+}));
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+const mockShowToast = jest.fn();
+const mockEntriesClosed = jest.fn(() => ({ variant: 'icon' }));
+
+jest.mock('../../hooks/useRewardsToast', () => ({
+  __esModule: true,
+  default: () => ({
+    showToast: mockShowToast,
+    RewardsToastOptions: {
+      success: jest.fn(),
+      error: jest.fn(),
+      entriesClosed: mockEntriesClosed,
+    },
+  }),
+}));
+
+jest.mock('./CampaignOptInSheet', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: () =>
+      ReactActual.createElement(View, { testID: 'campaign-opt-in-sheet' }),
+  };
+});
+
+jest.mock('../../../../../../locales/i18n', () => ({
+  strings: (key: string) => {
+    const map: Record<string, string> = {
+      'rewards.perps_trading_campaign.open_position_cta': 'Open Position',
+      'rewards.campaign_details.join_campaign': 'Join Campaign',
+      'rewards.campaign.geo_locked_cta': 'Geo locked',
+      'rewards.campaign.geo_locked_toast_title': 'Not available',
+      'rewards.campaign.geo_locked_toast_description': 'Region restricted',
+    };
+    return map[key] ?? key;
+  },
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+
+function buildCampaign(overrides: Partial<CampaignDto> = {}): CampaignDto {
+  return {
+    id: 'perps-campaign-1',
+    type: CampaignType.PERPS_TRADING,
+    name: 'Perps Trading Campaign',
+    startDate: '2025-06-01T00:00:00.000Z',
+    endDate: '2026-12-31T23:59:59.999Z',
+    termsAndConditions: null,
+    excludedRegions: [],
+    details: null,
+    featured: true,
+    showUpcomingDate: false,
+    ...overrides,
+  };
+}
+
+const notOptedIn = {
+  status: { optedIn: false, participantCount: 0 } as const,
+  isLoading: false,
+};
+
+const optedIn = {
+  status: { optedIn: true, participantCount: 1 } as const,
+  isLoading: false,
+};
+
+describe('PerpsTradingCampaignCTA', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+    jest.setSystemTime(new Date('2025-08-15T12:00:00.000Z'));
+    jest.clearAllMocks();
+    mockHandleDeeplink.mockResolvedValue(undefined);
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectPerpsEligibility) {
+        return true;
+      }
+      return undefined;
+    });
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('renders nothing while participant status is loading', () => {
+    const { queryByTestId } = render(
+      <PerpsTradingCampaignCTA
+        campaign={buildCampaign()}
+        participantStatus={{ status: null, isLoading: true }}
+      />,
+    );
+
+    expect(queryByTestId(CAMPAIGN_CTA_TEST_IDS.CTA_BUTTON)).toBeNull();
+  });
+
+  it('renders nothing when campaign is upcoming', () => {
+    const { queryByTestId } = render(
+      <PerpsTradingCampaignCTA
+        campaign={buildCampaign({
+          startDate: '2026-01-01T00:00:00.000Z',
+          endDate: '2026-12-31T23:59:59.999Z',
+        })}
+        participantStatus={notOptedIn}
+      />,
+    );
+
+    expect(queryByTestId(CAMPAIGN_CTA_TEST_IDS.CTA_BUTTON)).toBeNull();
+  });
+
+  it('renders nothing when campaign is complete', () => {
+    const { queryByTestId } = render(
+      <PerpsTradingCampaignCTA
+        campaign={buildCampaign({
+          startDate: '2024-01-01T00:00:00.000Z',
+          endDate: '2025-01-01T00:00:00.000Z',
+        })}
+        participantStatus={notOptedIn}
+      />,
+    );
+
+    expect(queryByTestId(CAMPAIGN_CTA_TEST_IDS.CTA_BUTTON)).toBeNull();
+  });
+
+  it('when opted in, shows Open Position and calls handleDeeplink with perps market-list URL', () => {
+    const { getByTestId, getByText } = render(
+      <PerpsTradingCampaignCTA
+        campaign={buildCampaign()}
+        participantStatus={optedIn}
+      />,
+    );
+
+    expect(getByText('Open Position')).toBeOnTheScreen();
+    fireEvent.press(getByTestId(CAMPAIGN_CTA_TEST_IDS.CTA_BUTTON));
+
+    expect(mockHandleDeeplink).toHaveBeenCalledWith({
+      uri: 'https://link.metamask.io/perps?screen=market-list',
+    });
+  });
+
+  it('when not opted in and geo-ineligible, shows geo locked CTA and toast on press', () => {
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectPerpsEligibility) {
+        return false;
+      }
+      return undefined;
+    });
+
+    const { getByTestId, getByText } = render(
+      <PerpsTradingCampaignCTA
+        campaign={buildCampaign()}
+        participantStatus={notOptedIn}
+      />,
+    );
+
+    expect(getByText('Geo locked')).toBeOnTheScreen();
+    fireEvent.press(getByTestId(CAMPAIGN_CTA_TEST_IDS.CTA_BUTTON));
+
+    expect(mockEntriesClosed).toHaveBeenCalledWith(
+      'Not available',
+      'Region restricted',
+    );
+    expect(mockShowToast).toHaveBeenCalledWith({ variant: 'icon' });
+    expect(mockHandleDeeplink).not.toHaveBeenCalled();
+  });
+
+  it('when not opted in and eligible, shows Join Campaign and opens opt-in sheet', () => {
+    const { getByTestId, getByText, queryByTestId } = render(
+      <PerpsTradingCampaignCTA
+        campaign={buildCampaign()}
+        participantStatus={notOptedIn}
+      />,
+    );
+
+    expect(queryByTestId('campaign-opt-in-sheet')).toBeNull();
+    expect(getByText('Join Campaign')).toBeOnTheScreen();
+
+    fireEvent.press(getByTestId(CAMPAIGN_CTA_TEST_IDS.CTA_BUTTON));
+
+    expect(getByTestId('campaign-opt-in-sheet')).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignCTA.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignCTA.tsx
new file mode 100644
index 00000000000..43f39e96ee0
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignCTA.tsx
@@ -0,0 +1,131 @@
+import React, { useCallback, useState } from 'react';
+import {
+  Box,
+  Button,
+  ButtonSize,
+  ButtonVariant,
+  IconName,
+} from '@metamask/design-system-react-native';
+import type { CampaignDto } from '../../../../../core/Engine/controllers/rewards-controller/types';
+import type { UseGetCampaignParticipantStatusResult } from '../../hooks/useGetCampaignParticipantStatus';
+import { getCampaignStatus } from './CampaignTile.utils';
+import { strings } from '../../../../../../locales/i18n';
+import CampaignOptInSheet from './CampaignOptInSheet';
+import { CAMPAIGN_CTA_TEST_IDS } from './CampaignOptInCta';
+import { selectPerpsEligibility } from '../../../Perps/selectors/perpsController';
+import { useSelector } from 'react-redux';
+import useRewardsToast from '../../hooks/useRewardsToast';
+import { handleDeeplink } from '../../../../../core/DeeplinkManager';
+
+interface PerpsTradingCampaignCTAProps {
+  campaign: CampaignDto;
+  participantStatus: Pick<
+    UseGetCampaignParticipantStatusResult,
+    'status' | 'isLoading'
+  >;
+}
+
+const PerpsTradingCampaignCTA: React.FC<PerpsTradingCampaignCTAProps> = ({
+  campaign,
+  participantStatus,
+}) => {
+  const { showToast, RewardsToastOptions } = useRewardsToast();
+  const isPerpsEligible = useSelector(selectPerpsEligibility);
+  const [isOptInSheetOpen, setIsOptInSheetOpen] = useState(false);
+
+  const campaignStatus = getCampaignStatus(campaign);
+  const isLoading = participantStatus.isLoading;
+  const isOptedIn = participantStatus?.status?.optedIn === true;
+
+  const handleGeoLockedPress = useCallback(() => {
+    showToast(
+      RewardsToastOptions.entriesClosed(
+        strings('rewards.campaign.geo_locked_toast_title'),
+        strings('rewards.campaign.geo_locked_toast_description'),
+      ),
+    );
+  }, [showToast, RewardsToastOptions]);
+
+  const handleJoinPress = useCallback(() => {
+    setIsOptInSheetOpen(true);
+  }, []);
+
+  const handleOpenPosition = useCallback(async () => {
+    await handleDeeplink({
+      uri: 'https://link.metamask.io/perps?screen=market-list',
+    });
+  }, []);
+
+  if (isLoading) {
+    return null;
+  }
+
+  // Campaign complete — no CTA (leaderboard section handles it)
+  if (campaignStatus === 'complete') {
+    return null;
+  }
+
+  if (campaignStatus !== 'active') {
+    return null;
+  }
+
+  // Opted in — show "Open Position"
+  if (isOptedIn) {
+    return (
+      <Box twClassName="p-4 mb-2">
+        <Button
+          variant={ButtonVariant.Primary}
+          size={ButtonSize.Lg}
+          isFullWidth
+          onPress={handleOpenPosition}
+          testID={CAMPAIGN_CTA_TEST_IDS.CTA_BUTTON}
+        >
+          {strings('rewards.perps_trading_campaign.open_position_cta')}
+        </Button>
+      </Box>
+    );
+  }
+
+  // Not opted in — geo-restricted
+  if (!isPerpsEligible) {
+    return (
+      <Box twClassName="p-4 mb-2">
+        <Button
+          variant={ButtonVariant.Primary}
+          size={ButtonSize.Lg}
+          isFullWidth
+          startIconName={IconName.Lock}
+          onPress={handleGeoLockedPress}
+          testID={CAMPAIGN_CTA_TEST_IDS.CTA_BUTTON}
+        >
+          {strings('rewards.campaign.geo_locked_cta')}
+        </Button>
+      </Box>
+    );
+  }
+
+  // Not opted in — eligible
+  return (
+    <>
+      <Box twClassName="p-4 mb-2">
+        <Button
+          variant={ButtonVariant.Primary}
+          size={ButtonSize.Lg}
+          isFullWidth
+          onPress={handleJoinPress}
+          testID={CAMPAIGN_CTA_TEST_IDS.CTA_BUTTON}
+        >
+          {strings('rewards.campaign_details.join_campaign')}
+        </Button>
+      </Box>
+      {isOptInSheetOpen && (
+        <CampaignOptInSheet
+          campaign={campaign}
+          onClose={() => setIsOptInSheetOpen(false)}
+        />
+      )}
+    </>
+  );
+};
+
+export default PerpsTradingCampaignCTA;
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignEndedStats.test.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignEndedStats.test.tsx
new file mode 100644
index 00000000000..f3cb469d9ea
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignEndedStats.test.tsx
@@ -0,0 +1,276 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import PerpsTradingCampaignEndedStats, {
+  PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS,
+} from './PerpsTradingCampaignEndedStats';
+import type {
+  PerpsTradingCampaignLeaderboardDto,
+  PerpsTradingCampaignLeaderboardEntry,
+} from '../../../../../core/Engine/controllers/rewards-controller/types';
+
+jest.mock('../RewardsErrorBanner', () => {
+  const ReactActual = jest.requireActual('react');
+  const RN = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: (props: { title: string; onConfirm: () => void }) =>
+      ReactActual.createElement(
+        RN.View,
+        { testID: 'rewards-error-banner' },
+        ReactActual.createElement(RN.Text, null, props.title),
+        ReactActual.createElement(RN.TouchableOpacity, {
+          testID: 'rewards-error-banner-retry',
+          onPress: props.onConfirm,
+        }),
+      ),
+  };
+});
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  const ReactActual = jest.requireActual('react');
+  const RN = jest.requireActual('react-native');
+  return {
+    ...actual,
+    Text: (props: Record<string, unknown>) =>
+      ReactActual.createElement(RN.Text, props, props.children),
+    Skeleton: (props: Record<string, unknown>) =>
+      ReactActual.createElement(RN.View, { testID: 'skeleton', ...props }),
+  };
+});
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({ style: (...args: unknown[]) => args }),
+}));
+
+jest.mock('../../../../../../locales/i18n', () => ({
+  strings: (key: string) => key,
+}));
+
+jest.mock('../../utils/formatUtils', () => ({
+  formatCompactUsd: (value: number) => `$${(value / 1_000_000).toFixed(1)}M`,
+  formatSignedUsd: (value: number) => {
+    const sign = value >= 0 ? '+' : '-';
+    const abs = Math.abs(value).toLocaleString();
+    return `${sign}$${abs}`;
+  },
+}));
+
+const makeEntry = (
+  rank: number,
+  pnl: number,
+  qualified = true,
+): PerpsTradingCampaignLeaderboardEntry => ({
+  rank,
+  referralCode: `T-${rank}`,
+  pnl,
+  qualified,
+});
+
+const makeLeaderboard = (
+  entriesCount: number,
+  totalParticipants?: number,
+  topPnl = 50_000,
+): PerpsTradingCampaignLeaderboardDto => {
+  const entries = Array.from({ length: entriesCount }, (_, i) =>
+    makeEntry(i + 1, topPnl - i * 1000),
+  );
+  return {
+    campaignId: 'perps-1',
+    computedAt: '2026-01-01T00:00:00Z',
+    totalParticipants: totalParticipants ?? entriesCount,
+    entries,
+  };
+};
+
+describe('PerpsTradingCampaignEndedStats', () => {
+  it('renders all four stat cells with correct values when leaderboard has 20+ entries', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignEndedStats
+        leaderboard={makeLeaderboard(25, 200, 80_000)}
+        totalNotionalVolume="27500000"
+        isLeaderboardLoading={false}
+        isVolumeLoading={false}
+      />,
+    );
+
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.CONTAINER),
+    ).toBeTruthy();
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOTAL_PARTICIPANTS).props
+        .children,
+    ).toBe((200).toLocaleString());
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOTAL_VOLUME).props
+        .children,
+    ).toBe('$27.5M');
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOP_PNL).props.children,
+    ).toBe('+$80,000');
+    // Leaderboard has 25 entries (>= 20) → fixed 20 winners
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.WINNERS).props.children,
+    ).toBe('20');
+  });
+
+  it('shows dash for winners when leaderboard has fewer than 20 entries', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignEndedStats
+        leaderboard={makeLeaderboard(15, 50)}
+        totalNotionalVolume="1000000"
+        isLeaderboardLoading={false}
+        isVolumeLoading={false}
+      />,
+    );
+
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.WINNERS).props.children,
+    ).toBe('-');
+  });
+
+  it('shows dashes when leaderboard and volume are null', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignEndedStats
+        leaderboard={null}
+        totalNotionalVolume={null}
+        isLeaderboardLoading={false}
+        isVolumeLoading={false}
+      />,
+    );
+
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOTAL_PARTICIPANTS).props
+        .children,
+    ).toBe('-');
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOTAL_VOLUME).props
+        .children,
+    ).toBe('-');
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOP_PNL).props.children,
+    ).toBe('-');
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.WINNERS).props.children,
+    ).toBe('-');
+  });
+
+  it('renders skeletons while data is loading', () => {
+    const { getAllByTestId } = render(
+      <PerpsTradingCampaignEndedStats
+        leaderboard={null}
+        totalNotionalVolume={null}
+        isLeaderboardLoading
+        isVolumeLoading
+      />,
+    );
+
+    const skeletons = getAllByTestId('skeleton');
+    expect(skeletons.length).toBeGreaterThanOrEqual(3);
+  });
+
+  it('handles a leaderboard with no entries (no top PnL)', () => {
+    const empty: PerpsTradingCampaignLeaderboardDto = {
+      campaignId: 'perps-1',
+      computedAt: '2026-01-01T00:00:00Z',
+      totalParticipants: 0,
+      entries: [],
+    };
+
+    const { getByTestId } = render(
+      <PerpsTradingCampaignEndedStats
+        leaderboard={empty}
+        totalNotionalVolume="0"
+        isLeaderboardLoading={false}
+        isVolumeLoading={false}
+      />,
+    );
+
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOTAL_PARTICIPANTS).props
+        .children,
+    ).toBe('0');
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOP_PNL).props.children,
+    ).toBe('-');
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.WINNERS).props.children,
+    ).toBe('-');
+  });
+
+  it('shows error banner when both sources fail and triggers both retries', () => {
+    const onRetryLeaderboard = jest.fn();
+    const onRetryVolume = jest.fn();
+
+    const { getByTestId } = render(
+      <PerpsTradingCampaignEndedStats
+        leaderboard={null}
+        totalNotionalVolume={null}
+        isLeaderboardLoading={false}
+        isVolumeLoading={false}
+        hasLeaderboardError
+        hasVolumeError
+        onRetryLeaderboard={onRetryLeaderboard}
+        onRetryVolume={onRetryVolume}
+      />,
+    );
+
+    expect(getByTestId('rewards-error-banner')).toBeTruthy();
+    fireEvent.press(getByTestId('rewards-error-banner-retry'));
+    expect(onRetryLeaderboard).toHaveBeenCalledTimes(1);
+    expect(onRetryVolume).toHaveBeenCalledTimes(1);
+  });
+
+  it('shows error banner when only leaderboard fails; volume still renders', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignEndedStats
+        leaderboard={null}
+        totalNotionalVolume="27500000"
+        isLeaderboardLoading={false}
+        isVolumeLoading={false}
+        hasLeaderboardError
+      />,
+    );
+
+    expect(getByTestId('rewards-error-banner')).toBeTruthy();
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOTAL_VOLUME).props
+        .children,
+    ).toBe('$27.5M');
+  });
+
+  it('does not render error banner when there are no errors', () => {
+    const { queryByTestId } = render(
+      <PerpsTradingCampaignEndedStats
+        leaderboard={makeLeaderboard(25, 100, 10_000)}
+        totalNotionalVolume="1000000"
+        isLeaderboardLoading={false}
+        isVolumeLoading={false}
+      />,
+    );
+
+    expect(queryByTestId('rewards-error-banner')).toBeNull();
+  });
+
+  it('renders negative top PnL with error color and a minus sign', () => {
+    const negativeTop: PerpsTradingCampaignLeaderboardDto = {
+      campaignId: 'perps-1',
+      computedAt: '2026-01-01T00:00:00Z',
+      totalParticipants: 1,
+      entries: [makeEntry(1, -5_000)],
+    };
+
+    const { getByTestId } = render(
+      <PerpsTradingCampaignEndedStats
+        leaderboard={negativeTop}
+        totalNotionalVolume="1000"
+        isLeaderboardLoading={false}
+        isVolumeLoading={false}
+      />,
+    );
+
+    expect(
+      getByTestId(PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOP_PNL).props.children,
+    ).toBe('-$5,000');
+  });
+});
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignEndedStats.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignEndedStats.tsx
new file mode 100644
index 00000000000..af3a1616288
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignEndedStats.tsx
@@ -0,0 +1,153 @@
+import React, { useMemo } from 'react';
+import {
+  Box,
+  BoxFlexDirection,
+  FontWeight,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import type { PerpsTradingCampaignLeaderboardDto } from '../../../../../core/Engine/controllers/rewards-controller/types';
+import { StatCell } from './OndoCampaignStatsSummary';
+import RewardsErrorBanner from '../RewardsErrorBanner';
+import { strings } from '../../../../../../locales/i18n';
+import { formatCompactUsd, formatSignedUsd } from '../../utils/formatUtils';
+
+const PERPS_WINNERS_CAP = 20;
+
+export const PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS = {
+  CONTAINER: 'perps-campaign-ended-stats-container',
+  TOTAL_PARTICIPANTS: 'perps-campaign-ended-stats-total-participants',
+  TOTAL_VOLUME: 'perps-campaign-ended-stats-total-volume',
+  TOP_PNL: 'perps-campaign-ended-stats-top-pnl',
+  WINNERS: 'perps-campaign-ended-stats-winners',
+} as const;
+
+interface PerpsTradingCampaignEndedStatsProps {
+  leaderboard: PerpsTradingCampaignLeaderboardDto | null;
+  totalNotionalVolume: string | null;
+  isLeaderboardLoading: boolean;
+  isVolumeLoading: boolean;
+  hasLeaderboardError?: boolean;
+  hasVolumeError?: boolean;
+  onRetryLeaderboard?: () => void;
+  onRetryVolume?: () => void;
+}
+
+const PerpsTradingCampaignEndedStats: React.FC<
+  PerpsTradingCampaignEndedStatsProps
+> = ({
+  leaderboard,
+  totalNotionalVolume,
+  isLeaderboardLoading,
+  isVolumeLoading,
+  hasLeaderboardError,
+  hasVolumeError,
+  onRetryLeaderboard,
+  onRetryVolume,
+}) => {
+  const stats = useMemo(() => {
+    if (!leaderboard) return null;
+
+    const entries = leaderboard.entries ?? [];
+    const totalParticipants = leaderboard.totalParticipants;
+    const topPnl =
+      entries.length > 0 ? Math.max(...entries.map((e) => e.pnl)) : null;
+    const hasFullLeaderboard = entries.length >= PERPS_WINNERS_CAP;
+    return { totalParticipants, topPnl, hasFullLeaderboard };
+  }, [leaderboard]);
+
+  const isLeaderboardSkeletonVisible = isLeaderboardLoading && !leaderboard;
+  const isVolumeSkeletonVisible = isVolumeLoading && !totalNotionalVolume;
+
+  const hasError =
+    (hasLeaderboardError && !leaderboard) ||
+    (hasVolumeError && !totalNotionalVolume);
+
+  const totalParticipantsValue = stats
+    ? stats.totalParticipants.toLocaleString()
+    : '-';
+
+  const totalVolumeValue = totalNotionalVolume
+    ? formatCompactUsd(parseFloat(totalNotionalVolume))
+    : '-';
+
+  const topPnlValue =
+    stats?.topPnl != null ? formatSignedUsd(stats.topPnl) : '-';
+
+  const topPnlColor =
+    stats?.topPnl != null && stats.topPnl >= 0
+      ? TextColor.SuccessDefault
+      : TextColor.ErrorDefault;
+
+  const winnersValue = stats?.hasFullLeaderboard
+    ? String(PERPS_WINNERS_CAP)
+    : '-';
+
+  return (
+    <Box
+      twClassName="gap-3"
+      testID={PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.CONTAINER}
+    >
+      <Text variant={TextVariant.HeadingMd} fontWeight={FontWeight.Bold}>
+        {strings('rewards.perps_trading_campaign.stats_title')}
+      </Text>
+      {hasError && (
+        <RewardsErrorBanner
+          title={strings('rewards.perps_trading_campaign.stats_error_title')}
+          description={strings(
+            'rewards.perps_trading_campaign.stats_error_description',
+          )}
+          onConfirm={() => {
+            onRetryLeaderboard?.();
+            onRetryVolume?.();
+          }}
+          confirmButtonLabel={strings(
+            'rewards.perps_trading_campaign.stats_retry',
+          )}
+        />
+      )}
+      <Box flexDirection={BoxFlexDirection.Row}>
+        <StatCell
+          label={strings(
+            'rewards.perps_trading_campaign.completed_label_total_participants',
+          )}
+          value={totalParticipantsValue}
+          isLoading={isLeaderboardSkeletonVisible}
+          testID={PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOTAL_PARTICIPANTS}
+        />
+        <StatCell
+          label={strings(
+            'rewards.perps_trading_campaign.completed_label_total_volume',
+          )}
+          value={totalVolumeValue}
+          isLoading={isVolumeSkeletonVisible}
+          testID={PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOTAL_VOLUME}
+        />
+      </Box>
+      <Box flexDirection={BoxFlexDirection.Row}>
+        <StatCell
+          label={strings(
+            'rewards.perps_trading_campaign.completed_label_top_pnl',
+          )}
+          value={topPnlValue}
+          isLoading={isLeaderboardSkeletonVisible}
+          valueColor={
+            stats?.topPnl != null ? topPnlColor : TextColor.TextDefault
+          }
+          testID={PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.TOP_PNL}
+        />
+        <StatCell
+          label={strings(
+            'rewards.perps_trading_campaign.completed_label_winners',
+          )}
+          value={winnersValue}
+          isLoading={isLeaderboardSkeletonVisible}
+          testID={PERPS_CAMPAIGN_ENDED_STATS_TEST_IDS.WINNERS}
+        />
+      </Box>
+    </Box>
+  );
+};
+
+export default PerpsTradingCampaignEndedStats;
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignLeaderboard.test.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignLeaderboard.test.tsx
new file mode 100644
index 00000000000..8b15a8f46ca
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignLeaderboard.test.tsx
@@ -0,0 +1,198 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import PerpsTradingCampaignLeaderboard, {
+  PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS,
+} from './PerpsTradingCampaignLeaderboard';
+import type { PerpsTradingCampaignLeaderboardEntry } from '../../../../../core/Engine/controllers/rewards-controller/types';
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  return { ...actual };
+});
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({ style: (...args: unknown[]) => args }),
+}));
+
+jest.mock('../../../../../../locales/i18n', () => ({
+  strings: (key: string) => key,
+}));
+
+jest.mock('../../utils/formatUtils', () => ({
+  formatSignedUsd: (value: number) => `$${value.toFixed(2)}`,
+}));
+
+jest.mock('../RewardsErrorBanner', () => {
+  const ReactActual = jest.requireActual('react');
+  return {
+    __esModule: true,
+    default: ({ children }: { children?: React.ReactNode }) =>
+      ReactActual.createElement(ReactActual.Fragment, null, children),
+  };
+});
+
+jest.mock('../../../../../images/rewards/crown.svg', () => 'CrownIcon');
+
+const mockNavigate = jest.fn();
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({
+    navigate: mockNavigate,
+  }),
+}));
+
+jest.mock('../../../../../constants/navigation/Routes', () => ({
+  __esModule: true,
+  default: {
+    BROWSER: { HOME: 'BrowserHome', VIEW: 'BrowserView' },
+  },
+}));
+
+const TEST_IDS = PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS;
+
+const createPerpsEntry = (
+  overrides: Partial<PerpsTradingCampaignLeaderboardEntry> = {},
+): PerpsTradingCampaignLeaderboardEntry => ({
+  rank: 1,
+  referralCode: 'REF001',
+  pnl: 100,
+  qualified: true,
+  ...overrides,
+});
+
+const defaultProps = {
+  entries: [
+    createPerpsEntry({ rank: 1, referralCode: 'A' }),
+    createPerpsEntry({ rank: 2, referralCode: 'B' }),
+  ],
+  isLoading: false,
+  hasError: false,
+};
+
+describe('PerpsTradingCampaignLeaderboard', () => {
+  beforeEach(() => {
+    mockNavigate.mockClear();
+  });
+
+  it('renders container and list with entry testIDs', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignLeaderboard {...defaultProps} />,
+    );
+    expect(getByTestId(TEST_IDS.CONTAINER)).toBeDefined();
+    expect(getByTestId(TEST_IDS.LIST)).toBeDefined();
+    expect(getByTestId(`${TEST_IDS.ENTRY_ROW}-1`)).toBeDefined();
+    expect(getByTestId(TEST_IDS.POWERED_BY)).toBeDefined();
+  });
+
+  it('navigates to in-app browser with HyperTracker attribution URL when brand is pressed', () => {
+    const { getByText } = render(
+      <PerpsTradingCampaignLeaderboard {...defaultProps} />,
+    );
+    fireEvent.press(
+      getByText(
+        'rewards.perps_trading_campaign.leaderboard_hypertracker_brand',
+      ),
+    );
+
+    expect(mockNavigate).toHaveBeenCalledWith(
+      'BrowserHome',
+      expect.objectContaining({
+        screen: 'BrowserView',
+        params: expect.objectContaining({
+          newTabUrl:
+            'https://hypertracker.io?utm_source=metamask&utm_medium=leaderboard&utm_campaign=partner-attribution',
+        }),
+      }),
+    );
+  });
+
+  describe('split view top count (preview vs full, ranks 21–22 vs other)', () => {
+    const tenEntries = Array.from({ length: 10 }, (_, i) =>
+      createPerpsEntry({
+        rank: i + 1,
+        referralCode: `S${String(i + 1).padStart(3, '0')}`,
+        pnl: 10 - i,
+      }),
+    );
+
+    it('preview mode shows top 3 then separator and neighbors when rank is outside range', () => {
+      const { getByTestId, queryByTestId } = render(
+        <PerpsTradingCampaignLeaderboard
+          {...defaultProps}
+          entries={tenEntries}
+          maxEntries={5}
+          currentUserReferralCode="USER"
+          userPosition={{
+            rank: 250,
+            neighbors: [
+              createPerpsEntry({ rank: 249, referralCode: 'N249' }),
+              createPerpsEntry({ rank: 250, referralCode: 'USER' }),
+              createPerpsEntry({ rank: 251, referralCode: 'N251' }),
+            ],
+          }}
+        />,
+      );
+
+      expect(getByTestId(`${TEST_IDS.ENTRY_ROW}-1`)).toBeDefined();
+      expect(getByTestId(`${TEST_IDS.ENTRY_ROW}-2`)).toBeDefined();
+      expect(getByTestId(`${TEST_IDS.ENTRY_ROW}-3`)).toBeDefined();
+      expect(queryByTestId(`${TEST_IDS.ENTRY_ROW}-4`)).toBeNull();
+      expect(getByTestId(TEST_IDS.NEIGHBOR_SEPARATOR)).toBeDefined();
+      expect(getByTestId(`${TEST_IDS.ENTRY_ROW}-250`)).toBeDefined();
+    });
+
+    const twentyFiveEntries = Array.from({ length: 25 }, (_, i) =>
+      createPerpsEntry({
+        rank: i + 1,
+        referralCode: `R${String(i + 1).padStart(3, '0')}`,
+        pnl: 1000 - i,
+      }),
+    );
+
+    it('full mode shows 18 top rows when user rank is 21 (reduced top strip)', () => {
+      const { getByTestId, queryByTestId } = render(
+        <PerpsTradingCampaignLeaderboard
+          {...defaultProps}
+          entries={twentyFiveEntries}
+          currentUserReferralCode="USER"
+          userPosition={{
+            rank: 21,
+            neighbors: [
+              createPerpsEntry({ rank: 20, referralCode: 'N020' }),
+              createPerpsEntry({ rank: 21, referralCode: 'USER' }),
+              createPerpsEntry({ rank: 22, referralCode: 'N022' }),
+            ],
+          }}
+        />,
+      );
+
+      expect(getByTestId(`${TEST_IDS.ENTRY_ROW}-1`)).toBeDefined();
+      expect(getByTestId(`${TEST_IDS.ENTRY_ROW}-18`)).toBeDefined();
+      expect(queryByTestId(`${TEST_IDS.ENTRY_ROW}-19`)).toBeNull();
+      expect(getByTestId(TEST_IDS.NEIGHBOR_SEPARATOR)).toBeDefined();
+      expect(getByTestId(`${TEST_IDS.ENTRY_ROW}-20`)).toBeDefined();
+    });
+
+    it('full mode shows 20 top rows when user rank is 23 (standard strip)', () => {
+      const { getByTestId, queryByTestId } = render(
+        <PerpsTradingCampaignLeaderboard
+          {...defaultProps}
+          entries={twentyFiveEntries}
+          currentUserReferralCode="USER"
+          userPosition={{
+            rank: 23,
+            neighbors: [
+              createPerpsEntry({ rank: 22, referralCode: 'N022' }),
+              createPerpsEntry({ rank: 23, referralCode: 'USER' }),
+              createPerpsEntry({ rank: 24, referralCode: 'N024' }),
+            ],
+          }}
+        />,
+      );
+
+      expect(getByTestId(`${TEST_IDS.ENTRY_ROW}-20`)).toBeDefined();
+      expect(queryByTestId(`${TEST_IDS.ENTRY_ROW}-21`)).toBeNull();
+      expect(getByTestId(TEST_IDS.NEIGHBOR_SEPARATOR)).toBeDefined();
+      expect(getByTestId(`${TEST_IDS.ENTRY_ROW}-22`)).toBeDefined();
+    });
+  });
+});
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignLeaderboard.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignLeaderboard.tsx
new file mode 100644
index 00000000000..8537bdc3051
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignLeaderboard.tsx
@@ -0,0 +1,240 @@
+import React, { useCallback, useMemo } from 'react';
+import { useNavigation } from '@react-navigation/native';
+import {
+  Box,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import type { PerpsTradingCampaignLeaderboardEntry } from '../../../../../core/Engine/controllers/rewards-controller/types';
+import { strings } from '../../../../../../locales/i18n';
+import RewardsErrorBanner from '../RewardsErrorBanner';
+import { formatSignedUsd } from '../../utils/formatUtils';
+import {
+  CampaignLeaderboardEntryRow,
+  CampaignLeaderboardNeighborSeparator,
+  CampaignLeaderboardSkeleton,
+  CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS,
+} from './CampaignLeaderboard';
+import Routes from '../../../../../constants/navigation/Routes';
+import { HYPERTRACKER_ATTRIBUTION_URL } from '../../utils/perpsCampaignConstants';
+
+export const PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS = {
+  CONTAINER: 'perps-campaign-leaderboard-container',
+  LIST: 'perps-campaign-leaderboard-list',
+  ENTRY_ROW: CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.ENTRY_ROW,
+  PENDING_TAG: CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.PENDING_TAG,
+  NEIGHBOR_SEPARATOR: CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.NEIGHBOR_SEPARATOR,
+  LOADING: CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS.LOADING,
+  ERROR: 'perps-campaign-leaderboard-error',
+  EMPTY: 'perps-campaign-leaderboard-empty',
+  NOT_YET_COMPUTED: 'perps-campaign-leaderboard-not-yet-computed',
+  TOTAL_PARTICIPANTS: 'perps-campaign-leaderboard-total-participants',
+  POWERED_BY: 'perps-campaign-leaderboard-powered-by',
+} as const;
+
+const MAX_ENTRIES_LIMIT = 20;
+const SPLIT_VIEW_TOP_COUNT_PREVIEW = 3;
+/** Ranks just below the first page: show one fewer top rows to keep split view from crowding the neighbor block. */
+const FULL_SPLIT_TOP_REDUCED_AT_RANKS: readonly number[] = [21, 22];
+
+interface UserPosition {
+  rank: number;
+  neighbors: PerpsTradingCampaignLeaderboardEntry[];
+}
+
+export interface PerpsTradingCampaignLeaderboardProps {
+  entries: PerpsTradingCampaignLeaderboardEntry[];
+  isLoading: boolean;
+  hasError: boolean;
+  isLeaderboardNotYetComputed?: boolean;
+  onRetry?: () => void;
+  currentUserReferralCode?: string | null;
+  maxEntries?: number;
+  userPosition?: UserPosition | null;
+  campaignId?: string;
+  isCampaignComplete?: boolean;
+}
+
+const PerpsTradingCampaignLeaderboard: React.FC<
+  PerpsTradingCampaignLeaderboardProps
+> = ({
+  entries,
+  isLoading,
+  hasError,
+  isLeaderboardNotYetComputed = false,
+  onRetry,
+  currentUserReferralCode,
+  maxEntries,
+  userPosition,
+  isCampaignComplete = false,
+}) => {
+  const navigation = useNavigation();
+
+  const handleHyperTrackerPress = useCallback(() => {
+    navigation.navigate(Routes.BROWSER.HOME, {
+      screen: Routes.BROWSER.VIEW,
+      params: {
+        newTabUrl: HYPERTRACKER_ATTRIBUTION_URL,
+        timestamp: Date.now(),
+      },
+    });
+  }, [navigation]);
+
+  const isPreview = maxEntries != null;
+
+  const effectiveMaxEntries =
+    maxEntries != null && maxEntries <= MAX_ENTRIES_LIMIT
+      ? maxEntries
+      : MAX_ENTRIES_LIMIT;
+
+  /** Top rows above the neighbor separator in split view (preview: 3; full: 18 for rank 21–22, else 20). */
+  const splitViewTopCount = useMemo(() => {
+    if (isPreview) {
+      return SPLIT_VIEW_TOP_COUNT_PREVIEW;
+    }
+    const rank = userPosition?.rank;
+    if (rank == null) {
+      return MAX_ENTRIES_LIMIT;
+    }
+    return FULL_SPLIT_TOP_REDUCED_AT_RANKS.includes(rank)
+      ? MAX_ENTRIES_LIMIT - 2
+      : MAX_ENTRIES_LIMIT;
+  }, [isPreview, userPosition?.rank]);
+
+  const showSplitView = useMemo(() => {
+    if (!userPosition) return false;
+    return (
+      userPosition.rank > effectiveMaxEntries &&
+      userPosition.neighbors.length > 0
+    );
+  }, [userPosition, effectiveMaxEntries]);
+
+  const visibleEntries = useMemo(() => {
+    if (showSplitView) {
+      return entries.slice(0, splitViewTopCount);
+    }
+    return entries.slice(0, effectiveMaxEntries);
+  }, [entries, effectiveMaxEntries, showSplitView, splitViewTopCount]);
+
+  const isCurrentUser = useCallback(
+    (entry: PerpsTradingCampaignLeaderboardEntry) =>
+      !!currentUserReferralCode &&
+      entry.referralCode === currentUserReferralCode,
+    [currentUserReferralCode],
+  );
+
+  if (isLoading && entries.length === 0) {
+    return <CampaignLeaderboardSkeleton skeletonRowCount={5} />;
+  }
+
+  if (hasError && entries.length === 0) {
+    return (
+      <Box twClassName="px-4">
+        <RewardsErrorBanner
+          title={strings(
+            'rewards.perps_trading_campaign.leaderboard_error_loading',
+          )}
+          description={strings(
+            'rewards.perps_trading_campaign.leaderboard_error_loading_description',
+          )}
+          onConfirm={onRetry}
+          confirmButtonLabel={strings(
+            'rewards.perps_trading_campaign.prize_pool_retry_button',
+          )}
+          testID={PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS.ERROR}
+        />
+      </Box>
+    );
+  }
+
+  if (isLeaderboardNotYetComputed && !isLoading && entries.length === 0) {
+    return (
+      <Box twClassName="p-4 items-center">
+        <Text
+          variant={TextVariant.BodyMd}
+          color={TextColor.TextAlternative}
+          twClassName="text-center"
+          testID={PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS.NOT_YET_COMPUTED}
+        >
+          {strings(
+            'rewards.perps_trading_campaign.leaderboard_not_yet_computed',
+          )}
+        </Text>
+      </Box>
+    );
+  }
+
+  if (entries.length === 0) {
+    return (
+      <Box twClassName="p-4 items-center">
+        <Text
+          variant={TextVariant.BodyMd}
+          color={TextColor.TextAlternative}
+          twClassName="text-center"
+          testID={PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS.EMPTY}
+        >
+          {strings(
+            'rewards.perps_trading_campaign.leaderboard_not_yet_computed',
+          )}
+        </Text>
+      </Box>
+    );
+  }
+
+  return (
+    <Box testID={PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS.CONTAINER}>
+      {/* Leaderboard list */}
+      <Box testID={PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS.LIST}>
+        {visibleEntries.map((entry) => (
+          <CampaignLeaderboardEntryRow
+            key={`${entry.rank}-${entry.referralCode}`}
+            entry={entry}
+            isCurrentUser={isCurrentUser(entry)}
+            showCrown={!isPreview}
+            isCampaignComplete={isCampaignComplete}
+            formatPrimaryMetric={(e) => formatSignedUsd(e.pnl)}
+            isPositivePrimaryMetric={(e) => e.pnl >= 0}
+          />
+        ))}
+        {showSplitView && userPosition && (
+          <>
+            <CampaignLeaderboardNeighborSeparator />
+            {userPosition.neighbors.map((entry) => (
+              <CampaignLeaderboardEntryRow
+                key={`neighbor-${entry.rank}-${entry.referralCode}`}
+                entry={entry}
+                isCurrentUser={isCurrentUser(entry)}
+                showCrown={!isPreview}
+                isCampaignComplete={isCampaignComplete}
+                formatPrimaryMetric={(e) => formatSignedUsd(e.pnl)}
+                isPositivePrimaryMetric={(e) => e.pnl >= 0}
+              />
+            ))}
+          </>
+        )}
+      </Box>
+      <Text
+        variant={TextVariant.BodySm}
+        color={TextColor.TextDefault}
+        twClassName="mt-4 px-4 w-full"
+        testID={PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS.POWERED_BY}
+      >
+        {strings(
+          'rewards.perps_trading_campaign.leaderboard_powered_by_prefix',
+        )}
+        <Text
+          variant={TextVariant.BodySm}
+          twClassName="text-primary-default"
+          onPress={handleHyperTrackerPress}
+        >
+          {strings(
+            'rewards.perps_trading_campaign.leaderboard_hypertracker_brand',
+          )}
+        </Text>
+      </Text>
+    </Box>
+  );
+};
+
+export default PerpsTradingCampaignLeaderboard;
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignPrizePool.test.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignPrizePool.test.tsx
new file mode 100644
index 00000000000..360a3b52187
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignPrizePool.test.tsx
@@ -0,0 +1,271 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import PerpsTradingCampaignPrizePool, {
+  PERPS_PRIZE_POOL_TEST_IDS,
+} from './PerpsTradingCampaignPrizePool';
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  return { ...actual };
+});
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({ style: (...args: unknown[]) => args }),
+}));
+
+jest.mock('../RewardsErrorBanner', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View, Text, Pressable } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ({
+      title,
+      onConfirm,
+      confirmButtonLabel,
+      testID,
+    }: {
+      title: string;
+      description: string;
+      onConfirm?: () => void;
+      confirmButtonLabel?: string;
+      testID?: string;
+    }) =>
+      ReactActual.createElement(
+        View,
+        { testID },
+        ReactActual.createElement(Text, null, title),
+        confirmButtonLabel &&
+          ReactActual.createElement(
+            Pressable,
+            { onPress: onConfirm, testID: `${testID}-retry` },
+            ReactActual.createElement(Text, null, confirmButtonLabel),
+          ),
+      ),
+  };
+});
+
+jest.mock('../../../../../../locales/i18n', () => ({
+  strings: (key: string, params?: Record<string, string>) => {
+    const t: Record<string, string> = {
+      'rewards.perps_trading_campaign.prize_pool_error_title':
+        'Prize pool unavailable',
+      'rewards.perps_trading_campaign.prize_pool_error_description':
+        'Could not load prize pool.',
+      'rewards.perps_trading_campaign.prize_pool_retry_button': 'Retry',
+      'rewards.perps_trading_campaign.prize_pool_current_label': 'Current',
+      'rewards.perps_trading_campaign.prize_pool_next_label': 'Next',
+      'rewards.perps_trading_campaign.prize_pool_volume_subtext':
+        '{{current}} of {{target}} volume',
+      'rewards.perps_trading_campaign.prize_pool_max_tier_subtext':
+        '{{maxThreshold}}+ volume — all milestones reached',
+      'rewards.perps_trading_campaign.prize_pool_max_badge': 'Max prize',
+    };
+    let result = t[key] ?? key;
+    if (params) {
+      Object.entries(params).forEach(([k, v]) => {
+        result = result.replace(`{{${k}}}`, v);
+      });
+    }
+    return result;
+  },
+  default: { locale: 'en-US' },
+}));
+
+jest.mock('../../utils/formatUtils', () => ({
+  formatUsd: (value: string | number) =>
+    `$${Number(value).toLocaleString('en-US', {
+      minimumFractionDigits: 2,
+      maximumFractionDigits: 2,
+    })}`,
+  formatCompactUsd: (value: number) => {
+    if (value >= 1_000_000) {
+      return `$${(value / 1_000_000).toFixed(1).replace(/\.0$/, '')}M`;
+    }
+    if (value >= 1_000) {
+      return `$${(value / 1_000).toFixed(0)}K`;
+    }
+    return `$${value}`;
+  },
+}));
+
+const mockRefetch = jest.fn();
+
+const baseProps = {
+  totalNotionalVolume: '7500000' as string | null,
+  isLoading: false,
+  hasError: false,
+  refetch: mockRefetch,
+};
+
+describe('PerpsTradingCampaignPrizePool', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders container, progress bar, and subtext when data is provided', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignPrizePool {...baseProps} />,
+    );
+
+    expect(getByTestId(PERPS_PRIZE_POOL_TEST_IDS.CONTAINER)).toBeDefined();
+    expect(getByTestId(PERPS_PRIZE_POOL_TEST_IDS.PROGRESS_BAR)).toBeDefined();
+    expect(getByTestId(PERPS_PRIZE_POOL_TEST_IDS.SUBTEXT)).toBeDefined();
+  });
+
+  it('shows current and next prize between $5M and $10M notional', () => {
+    const { getByText } = render(
+      <PerpsTradingCampaignPrizePool
+        {...baseProps}
+        totalNotionalVolume="7500000"
+      />,
+    );
+
+    expect(getByText('$15,000.00')).toBeDefined();
+    expect(getByText('$20,000.00')).toBeDefined();
+  });
+
+  it('computes 50% progress halfway between $5M and $10M volume', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignPrizePool
+        {...baseProps}
+        totalNotionalVolume="7500000"
+      />,
+    );
+
+    const progressBar = getByTestId(PERPS_PRIZE_POOL_TEST_IDS.PROGRESS_BAR);
+    const innerBar = progressBar.props.children;
+    expect(innerBar.props.style).toEqual({ width: '50%' });
+  });
+
+  it('shows max badge and full progress at $40M notional (top tier)', () => {
+    const { getByTestId, getByText, queryByText } = render(
+      <PerpsTradingCampaignPrizePool
+        {...baseProps}
+        totalNotionalVolume="40000000"
+      />,
+    );
+
+    expect(getByTestId(PERPS_PRIZE_POOL_TEST_IDS.MAX_BADGE)).toBeDefined();
+    expect(getByText('Max prize')).toBeDefined();
+    expect(getByText('$50,000.00')).toBeDefined();
+    expect(queryByText('Next')).toBeNull();
+
+    const progressBar = getByTestId(PERPS_PRIZE_POOL_TEST_IDS.PROGRESS_BAR);
+    const innerBar = progressBar.props.children;
+    expect(innerBar.props.style).toEqual({ width: '100%' });
+
+    const subtext = getByTestId(PERPS_PRIZE_POOL_TEST_IDS.SUBTEXT);
+    expect(subtext.props.children).toBe(
+      '$40M+ volume — all milestones reached',
+    );
+  });
+
+  it('does not show max badge below top tier', () => {
+    const { queryByTestId } = render(
+      <PerpsTradingCampaignPrizePool
+        {...baseProps}
+        totalNotionalVolume="10000000"
+      />,
+    );
+
+    expect(queryByTestId(PERPS_PRIZE_POOL_TEST_IDS.MAX_BADGE)).toBeNull();
+  });
+
+  it('with null volume and not loading, shows first-tier defaults ($10k → $15k)', () => {
+    const { getByText, getByTestId } = render(
+      <PerpsTradingCampaignPrizePool
+        {...baseProps}
+        totalNotionalVolume={null}
+        isLoading={false}
+      />,
+    );
+
+    expect(getByText('$10,000.00')).toBeDefined();
+    expect(getByText('$15,000.00')).toBeDefined();
+    const progressBar = getByTestId(PERPS_PRIZE_POOL_TEST_IDS.PROGRESS_BAR);
+    const innerBar = progressBar.props.children;
+    expect(innerBar.props.style).toEqual({ width: '0%' });
+  });
+
+  it('with zero notional string uses first milestone segment (0% in range to $5M)', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignPrizePool {...baseProps} totalNotionalVolume="0" />,
+    );
+
+    const progressBar = getByTestId(PERPS_PRIZE_POOL_TEST_IDS.PROGRESS_BAR);
+    const innerBar = progressBar.props.children;
+    expect(innerBar.props.style).toEqual({ width: '0%' });
+  });
+
+  it('shows skeleton when loading with no volume data', () => {
+    const { getByTestId, queryByTestId } = render(
+      <PerpsTradingCampaignPrizePool
+        {...baseProps}
+        totalNotionalVolume={null}
+        isLoading
+      />,
+    );
+
+    expect(getByTestId(PERPS_PRIZE_POOL_TEST_IDS.CONTAINER)).toBeDefined();
+    expect(queryByTestId(PERPS_PRIZE_POOL_TEST_IDS.PROGRESS_BAR)).toBeNull();
+    expect(queryByTestId(PERPS_PRIZE_POOL_TEST_IDS.SUBTEXT)).toBeNull();
+  });
+
+  it('shows stale content when loading but volume already exists', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignPrizePool {...baseProps} isLoading />,
+    );
+
+    expect(getByTestId(PERPS_PRIZE_POOL_TEST_IDS.PROGRESS_BAR)).toBeDefined();
+    expect(getByTestId(PERPS_PRIZE_POOL_TEST_IDS.SUBTEXT)).toBeDefined();
+  });
+
+  it('shows error banner when hasError and no volume data', () => {
+    const { getByTestId, queryByTestId } = render(
+      <PerpsTradingCampaignPrizePool
+        {...baseProps}
+        totalNotionalVolume={null}
+        hasError
+      />,
+    );
+
+    expect(getByTestId(PERPS_PRIZE_POOL_TEST_IDS.ERROR_BANNER)).toBeDefined();
+    expect(queryByTestId(PERPS_PRIZE_POOL_TEST_IDS.PROGRESS_BAR)).toBeNull();
+  });
+
+  it('hides error banner when hasError but stale volume exists', () => {
+    const { queryByTestId, getByTestId } = render(
+      <PerpsTradingCampaignPrizePool {...baseProps} hasError />,
+    );
+
+    expect(queryByTestId(PERPS_PRIZE_POOL_TEST_IDS.ERROR_BANNER)).toBeNull();
+    expect(getByTestId(PERPS_PRIZE_POOL_TEST_IDS.PROGRESS_BAR)).toBeDefined();
+  });
+
+  it('calls refetch when error retry is pressed', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignPrizePool
+        {...baseProps}
+        totalNotionalVolume={null}
+        hasError
+      />,
+    );
+
+    fireEvent.press(
+      getByTestId(`${PERPS_PRIZE_POOL_TEST_IDS.ERROR_BANNER}-retry`),
+    );
+    expect(mockRefetch).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders volume subtext with compact amounts', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignPrizePool
+        {...baseProps}
+        totalNotionalVolume="7500000"
+      />,
+    );
+
+    const subtext = getByTestId(PERPS_PRIZE_POOL_TEST_IDS.SUBTEXT);
+    expect(subtext.props.children).toBe('$7.5M of $10M volume');
+  });
+});
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignPrizePool.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignPrizePool.tsx
new file mode 100644
index 00000000000..c639cd74baa
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignPrizePool.tsx
@@ -0,0 +1,196 @@
+import React, { useMemo } from 'react';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  FontWeight,
+  Skeleton,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import RewardsErrorBanner from '../RewardsErrorBanner';
+import { formatCompactUsd, formatUsd } from '../../utils/formatUtils';
+import { computePrizePoolProgress } from '../../utils/prizePoolUtils';
+import { strings } from '../../../../../../locales/i18n';
+
+export const PERPS_PRIZE_POOL_TEST_IDS = {
+  CONTAINER: 'perps-prize-pool-container',
+  PROGRESS_BAR: 'perps-prize-pool-progress-bar',
+  MAX_BADGE: 'perps-prize-pool-max-badge',
+  SUBTEXT: 'perps-prize-pool-subtext',
+  ERROR_BANNER: 'perps-prize-pool-error-banner',
+} as const;
+
+// $10k base prize, scales by $5k per $5M notional volume, up to $50k at $40M
+export const PERPS_PRIZE_POOL_MILESTONES = [
+  { notionalVolume: 0, prize: 10_000 },
+  { notionalVolume: 5_000_000, prize: 15_000 },
+  { notionalVolume: 10_000_000, prize: 20_000 },
+  { notionalVolume: 15_000_000, prize: 25_000 },
+  { notionalVolume: 20_000_000, prize: 30_000 },
+  { notionalVolume: 25_000_000, prize: 35_000 },
+  { notionalVolume: 30_000_000, prize: 40_000 },
+  { notionalVolume: 35_000_000, prize: 45_000 },
+  { notionalVolume: 40_000_000, prize: 50_000 },
+] as const;
+
+interface PerpsTradingCampaignPrizePoolProps {
+  totalNotionalVolume: string | null;
+  isLoading: boolean;
+  hasError: boolean;
+  refetch: () => void;
+}
+
+const PerpsTradingCampaignPrizePool: React.FC<
+  PerpsTradingCampaignPrizePoolProps
+> = ({ totalNotionalVolume, isLoading, hasError, refetch }) => {
+  const tw = useTailwind();
+
+  const showSkeleton = isLoading && !totalNotionalVolume;
+  const showError = hasError && !totalNotionalVolume;
+
+  const { progress, currentPrize, nextPrize, nextThreshold, isMaxTier } =
+    useMemo(() => {
+      if (!totalNotionalVolume) {
+        return {
+          progress: 0,
+          currentPrize: PERPS_PRIZE_POOL_MILESTONES[0].prize,
+          nextPrize: PERPS_PRIZE_POOL_MILESTONES[1].prize as number | null,
+          nextThreshold: PERPS_PRIZE_POOL_MILESTONES[1].notionalVolume,
+          isMaxTier: false,
+        };
+      }
+      return computePrizePoolProgress(
+        PERPS_PRIZE_POOL_MILESTONES,
+        parseFloat(totalNotionalVolume),
+        (m) => m.notionalVolume,
+      );
+    }, [totalNotionalVolume]);
+
+  const progressPercent: `${number}%` = `${Math.round(progress * 100)}%`;
+  const currentVolume = totalNotionalVolume
+    ? parseFloat(totalNotionalVolume)
+    : 0;
+
+  if (showError) {
+    return (
+      <Box testID={PERPS_PRIZE_POOL_TEST_IDS.CONTAINER} twClassName="mt-2">
+        <RewardsErrorBanner
+          title={strings(
+            'rewards.perps_trading_campaign.prize_pool_error_title',
+          )}
+          description={strings(
+            'rewards.perps_trading_campaign.prize_pool_error_description',
+          )}
+          onConfirm={refetch}
+          confirmButtonLabel={strings(
+            'rewards.perps_trading_campaign.prize_pool_retry_button',
+          )}
+          testID={PERPS_PRIZE_POOL_TEST_IDS.ERROR_BANNER}
+        />
+      </Box>
+    );
+  }
+
+  if (showSkeleton) {
+    return (
+      <Box
+        twClassName="gap-2 mt-2"
+        testID={PERPS_PRIZE_POOL_TEST_IDS.CONTAINER}
+      >
+        <Skeleton style={tw.style('h-4 rounded-full')} />
+        <Skeleton style={tw.style('h-3 w-40 rounded')} />
+      </Box>
+    );
+  }
+
+  return (
+    <Box twClassName="gap-2 mt-2" testID={PERPS_PRIZE_POOL_TEST_IDS.CONTAINER}>
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        justifyContent={BoxJustifyContent.Between}
+      >
+        <Box>
+          <Text
+            variant={TextVariant.BodySm}
+            fontWeight={FontWeight.Medium}
+            color={TextColor.TextAlternative}
+          >
+            {strings('rewards.perps_trading_campaign.prize_pool_current_label')}
+          </Text>
+          <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+            {formatUsd(currentPrize)}
+          </Text>
+        </Box>
+        {isMaxTier ? (
+          <Box
+            alignItems={BoxAlignItems.End}
+            justifyContent={BoxJustifyContent.End}
+          >
+            <Box
+              twClassName="bg-success-muted rounded-[6px] px-1.5"
+              testID={PERPS_PRIZE_POOL_TEST_IDS.MAX_BADGE}
+            >
+              <Text
+                variant={TextVariant.BodyXs}
+                fontWeight={FontWeight.Medium}
+                color={TextColor.SuccessDefault}
+              >
+                {strings('rewards.perps_trading_campaign.prize_pool_max_badge')}
+              </Text>
+            </Box>
+          </Box>
+        ) : nextPrize !== null ? (
+          <Box alignItems={BoxAlignItems.End}>
+            <Text
+              variant={TextVariant.BodySm}
+              fontWeight={FontWeight.Medium}
+              color={TextColor.TextAlternative}
+            >
+              {strings('rewards.perps_trading_campaign.prize_pool_next_label')}
+            </Text>
+            <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+              {formatUsd(nextPrize)}
+            </Text>
+          </Box>
+        ) : null}
+      </Box>
+
+      <Box
+        twClassName="h-3 rounded-full bg-muted overflow-hidden"
+        testID={PERPS_PRIZE_POOL_TEST_IDS.PROGRESS_BAR}
+      >
+        <Box
+          twClassName="h-full rounded-full bg-success-default"
+          style={{ width: progressPercent }}
+        />
+      </Box>
+
+      <Text
+        variant={TextVariant.BodySm}
+        color={TextColor.TextAlternative}
+        testID={PERPS_PRIZE_POOL_TEST_IDS.SUBTEXT}
+      >
+        {isMaxTier
+          ? strings(
+              'rewards.perps_trading_campaign.prize_pool_max_tier_subtext',
+              {
+                maxThreshold: formatCompactUsd(nextThreshold),
+              },
+            )
+          : strings(
+              'rewards.perps_trading_campaign.prize_pool_volume_subtext',
+              {
+                current: formatCompactUsd(currentVolume),
+                target: formatCompactUsd(nextThreshold),
+              },
+            )}
+      </Text>
+    </Box>
+  );
+};
+
+export default PerpsTradingCampaignPrizePool;
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignStatsHeader.test.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignStatsHeader.test.tsx
new file mode 100644
index 00000000000..2894eaf9e28
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignStatsHeader.test.tsx
@@ -0,0 +1,172 @@
+import React from 'react';
+import { render } from '@testing-library/react-native';
+import { TextColor } from '@metamask/design-system-react-native';
+import PerpsTradingCampaignStatsHeader, {
+  PERPS_STATS_HEADER_TEST_IDS,
+} from './PerpsTradingCampaignStatsHeader';
+import type { PerpsTradingCampaignLeaderboardPositionDto } from '../../../../../core/Engine/controllers/rewards-controller/types';
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+  const ReactActual = jest.requireActual('react');
+  const RN = jest.requireActual('react-native');
+  return {
+    ...actual,
+    Text: (props: Record<string, unknown>) =>
+      ReactActual.createElement(RN.Text, props, props.children),
+  };
+});
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({ style: (...args: unknown[]) => args }),
+}));
+
+jest.mock('../../../../../../locales/i18n', () => ({
+  strings: (key: string) => key,
+}));
+
+jest.mock('../../utils/formatUtils', () => {
+  const fmt = (n: number) =>
+    n.toLocaleString('en-US', {
+      minimumFractionDigits: 2,
+      maximumFractionDigits: 2,
+    });
+  return {
+    formatSignedUsd: (value: number) => {
+      if (value < 0) {
+        return `-$${fmt(Math.abs(value))}`;
+      }
+      if (value > 0) {
+        return `+$${fmt(value)}`;
+      }
+      return '$0.00';
+    },
+    formatRewardsTimeOnly: () => 'time-stub',
+  };
+});
+
+const TEST_IDS = PERPS_STATS_HEADER_TEST_IDS;
+
+const basePosition: PerpsTradingCampaignLeaderboardPositionDto = {
+  rank: 7,
+  pnl: 1500.25,
+  notionalVolume: 30_000,
+  marginDeployed: 2000,
+  qualified: true,
+  neighbors: [],
+  computedAt: '2025-01-01T00:00:00.000Z',
+};
+
+describe('PerpsTradingCampaignStatsHeader', () => {
+  it('renders container and your-rank label', () => {
+    const { getByTestId, getByText } = render(
+      <PerpsTradingCampaignStatsHeader position={basePosition} />,
+    );
+    expect(getByTestId(TEST_IDS.CONTAINER)).toBeDefined();
+    expect(
+      getByText('rewards.perps_trading_campaign.label_your_rank'),
+    ).toBeDefined();
+  });
+
+  it('shows padded rank, positive PnL with success color, and qualified icon when qualified', () => {
+    const { getByTestId, getByText, queryByTestId } = render(
+      <PerpsTradingCampaignStatsHeader
+        position={basePosition}
+        isLoading={false}
+      />,
+    );
+    const rank = getByTestId(TEST_IDS.RANK_VALUE);
+    expect(rank.props.children).toBe('07');
+    const pnl = getByTestId(TEST_IDS.PNL_VALUE);
+    expect(pnl.props.color).toBe(TextColor.SuccessDefault);
+    expect(getByText('+$1,500.25', { exact: true })).toBeDefined();
+    expect(getByTestId(TEST_IDS.QUALIFIED_ICON)).toBeDefined();
+    expect(queryByTestId(TEST_IDS.PENDING_TAG)).toBeNull();
+  });
+
+  it('uses error color and minus sign in display for negative PnL', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignStatsHeader
+        position={{ ...basePosition, pnl: -100, qualified: true }}
+      />,
+    );
+    const pnl = getByTestId(TEST_IDS.PNL_VALUE);
+    expect(pnl.props.color).toBe(TextColor.ErrorDefault);
+  });
+
+  it('shows pending tag and no qualified icon when not qualified', () => {
+    const { getByTestId, queryByTestId } = render(
+      <PerpsTradingCampaignStatsHeader
+        position={{ ...basePosition, qualified: false }}
+      />,
+    );
+    expect(getByTestId(TEST_IDS.PENDING_TAG)).toBeDefined();
+    expect(queryByTestId(TEST_IDS.QUALIFIED_ICON)).toBeNull();
+  });
+
+  it('hides the pending tag when the campaign is complete', () => {
+    const { queryByTestId } = render(
+      <PerpsTradingCampaignStatsHeader
+        position={{ ...basePosition, qualified: false }}
+        isCampaignComplete
+      />,
+    );
+    expect(queryByTestId(TEST_IDS.PENDING_TAG)).toBeNull();
+  });
+
+  it('shows em dashes for rank and PnL when position is null', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignStatsHeader position={null} />,
+    );
+    const rank = getByTestId(TEST_IDS.RANK_VALUE);
+    const pnl = getByTestId(TEST_IDS.PNL_VALUE);
+    expect(rank.props.children).toBe('—');
+    expect(pnl.props.children).toBe('—');
+    expect(pnl.props.color).toBe(TextColor.TextDefault);
+  });
+
+  it('hides PnL and computed-at subtext when showPnl and showComputedAt are false', () => {
+    const { queryByTestId } = render(
+      <PerpsTradingCampaignStatsHeader
+        position={basePosition}
+        showPnl={false}
+        showComputedAt={false}
+      />,
+    );
+    expect(queryByTestId(TEST_IDS.PNL_VALUE)).toBeNull();
+    expect(queryByTestId(TEST_IDS.COMPUTED_AT)).toBeNull();
+  });
+
+  it('shows computed-at line when showComputedAt is true and position has a timestamp', () => {
+    const { getByTestId } = render(
+      <PerpsTradingCampaignStatsHeader
+        position={basePosition}
+        showPnl
+        showComputedAt
+      />,
+    );
+    const computed = getByTestId(TEST_IDS.COMPUTED_AT);
+    expect(computed.props.children).toBe(
+      'rewards.perps_trading_campaign.last_updated',
+    );
+  });
+
+  it('omits computed-at when formatted label is empty', () => {
+    const { queryByTestId } = render(
+      <PerpsTradingCampaignStatsHeader
+        position={{ ...basePosition, computedAt: '' }}
+        showComputedAt
+      />,
+    );
+    expect(queryByTestId(TEST_IDS.COMPUTED_AT)).toBeNull();
+  });
+
+  it('skips rank and PnL testIDs and shows loading skeletons when isLoading is true', () => {
+    const { queryByTestId, getByTestId } = render(
+      <PerpsTradingCampaignStatsHeader position={basePosition} isLoading />,
+    );
+    expect(getByTestId(TEST_IDS.CONTAINER)).toBeDefined();
+    expect(queryByTestId(TEST_IDS.RANK_VALUE)).toBeNull();
+    expect(queryByTestId(TEST_IDS.PNL_VALUE)).toBeNull();
+  });
+});
diff --git a/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignStatsHeader.tsx b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignStatsHeader.tsx
new file mode 100644
index 00000000000..31d3623c69b
--- /dev/null
+++ b/app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignStatsHeader.tsx
@@ -0,0 +1,152 @@
+import React from 'react';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Skeleton,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { PendingTag } from './OndoCampaignStatsSummary';
+import type { PerpsTradingCampaignLeaderboardPositionDto } from '../../../../../core/Engine/controllers/rewards-controller/types';
+import { strings } from '../../../../../../locales/i18n';
+import {
+  formatRewardsTimeOnly,
+  formatSignedUsd,
+} from '../../utils/formatUtils';
+
+export const PERPS_STATS_HEADER_TEST_IDS = {
+  CONTAINER: 'perps-stats-header-container',
+  RANK_VALUE: 'perps-stats-header-rank',
+  PNL_VALUE: 'perps-stats-header-pnl',
+  COMPUTED_AT: 'perps-stats-header-computed-at',
+  PENDING_TAG: 'perps-stats-header-pending-tag',
+  QUALIFIED_ICON: 'perps-stats-header-qualified-icon',
+} as const;
+
+interface PerpsTradingCampaignStatsHeaderProps {
+  position: PerpsTradingCampaignLeaderboardPositionDto | null;
+  isLoading?: boolean;
+  /** When true, shows PnL under the rank in BodySm (same pattern as return in LeaderboardPositionHeader). */
+  showPnl?: boolean;
+  /** When true, shows formatted `computedAt` time on the same row as PnL, right-aligned in alternative text color. */
+  showComputedAt?: boolean;
+  /** When true, suppresses the "Pending" tag — qualification is locked once the campaign ends. */
+  isCampaignComplete?: boolean;
+}
+
+const PerpsTradingCampaignStatsHeader: React.FC<
+  PerpsTradingCampaignStatsHeaderProps
+> = ({
+  position,
+  isLoading = false,
+  showPnl = true,
+  showComputedAt = true,
+  isCampaignComplete = false,
+}) => {
+  const tw = useTailwind();
+
+  const isPending = position != null && !position.qualified;
+  const isQualified = position != null && position.qualified;
+
+  const rankValue = position ? String(position.rank).padStart(2, '0') : '—';
+  const pnlValue = position ? formatSignedUsd(position.pnl) : '—';
+  const pnlColor = position
+    ? position.pnl >= 0
+      ? TextColor.SuccessDefault
+      : TextColor.ErrorDefault
+    : TextColor.TextDefault;
+
+  const computedAtLabel = position?.computedAt
+    ? strings('rewards.perps_trading_campaign.last_updated', {
+        time: formatRewardsTimeOnly(new Date(position.computedAt)),
+      })
+    : '';
+
+  const showSubtextRow = showPnl || showComputedAt;
+
+  return (
+    <Box twClassName="gap-4" testID={PERPS_STATS_HEADER_TEST_IDS.CONTAINER}>
+      <Box>
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          twClassName="gap-2"
+        >
+          <Text variant={TextVariant.HeadingMd}>
+            {strings('rewards.perps_trading_campaign.label_your_rank')}
+          </Text>
+          {isPending && !isCampaignComplete && (
+            <PendingTag testID={PERPS_STATS_HEADER_TEST_IDS.PENDING_TAG} />
+          )}
+          {isQualified && (
+            <Icon
+              name={IconName.Check}
+              size={IconSize.Sm}
+              color={IconColor.SuccessDefault}
+              testID={PERPS_STATS_HEADER_TEST_IDS.QUALIFIED_ICON}
+            />
+          )}
+        </Box>
+
+        {isLoading ? (
+          <>
+            <Skeleton style={tw.style('h-9 w-28 rounded')} />
+            {showSubtextRow && (
+              <Skeleton style={tw.style('mt-1 h-4 w-full max-w-xs rounded')} />
+            )}
+          </>
+        ) : (
+          <>
+            <Text
+              variant={TextVariant.DisplayLg}
+              fontWeight={FontWeight.Bold}
+              testID={PERPS_STATS_HEADER_TEST_IDS.RANK_VALUE}
+            >
+              {rankValue}
+            </Text>
+            {showSubtextRow && (
+              <Box
+                flexDirection={BoxFlexDirection.Row}
+                alignItems={BoxAlignItems.Center}
+                twClassName="w-full"
+              >
+                <Box twClassName="min-w-0 flex-1">
+                  {showPnl && (
+                    <Text
+                      variant={TextVariant.BodySm}
+                      color={pnlColor}
+                      fontWeight={FontWeight.Medium}
+                      testID={PERPS_STATS_HEADER_TEST_IDS.PNL_VALUE}
+                    >
+                      {pnlValue}
+                    </Text>
+                  )}
+                </Box>
+                {showComputedAt && computedAtLabel.length > 0 && (
+                  <Text
+                    variant={TextVariant.BodySm}
+                    color={TextColor.TextAlternative}
+                    fontWeight={FontWeight.Medium}
+                    testID={PERPS_STATS_HEADER_TEST_IDS.COMPUTED_AT}
+                  >
+                    {computedAtLabel}
+                  </Text>
+                )}
+              </Box>
+            )}
+          </>
+        )}
+      </Box>
+    </Box>
+  );
+};
+
+export default PerpsTradingCampaignStatsHeader;
diff --git a/app/components/UI/Rewards/components/EndOfSeasonClaimBottomSheet/EndOfSeasonClaimBottomSheet.test.tsx b/app/components/UI/Rewards/components/EndOfSeasonClaimBottomSheet/EndOfSeasonClaimBottomSheet.test.tsx
index c4115b1d46f..147dce239cb 100644
--- a/app/components/UI/Rewards/components/EndOfSeasonClaimBottomSheet/EndOfSeasonClaimBottomSheet.test.tsx
+++ b/app/components/UI/Rewards/components/EndOfSeasonClaimBottomSheet/EndOfSeasonClaimBottomSheet.test.tsx
@@ -146,6 +146,7 @@ jest.mock('@metamask/design-system-twrnc-preset', () => ({
 
 // Mock design system components
 jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
   const ReactActual = jest.requireActual('react');
   const { View, Text, TouchableOpacity } = jest.requireActual('react-native');
 
@@ -210,6 +211,7 @@ jest.mock('@metamask/design-system-react-native', () => {
     );
 
   return {
+    ...actual,
     Box,
     Text: TextComponent,
     Button,
@@ -274,40 +276,6 @@ jest.mock(
   },
 );
 
-// Mock HeaderCompactStandard
-jest.mock(
-  '../../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Text, TouchableOpacity } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({
-        title,
-        onClose,
-        closeButtonProps,
-      }: {
-        title?: React.ReactNode;
-        onClose?: () => void;
-        closeButtonProps?: { testID?: string };
-      }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'bottom-sheet-header' },
-          ReactActual.createElement(Text, {}, title),
-          ReactActual.createElement(
-            TouchableOpacity,
-            {
-              onPress: onClose,
-              testID: closeButtonProps?.testID ?? 'close-button',
-            },
-            ReactActual.createElement(Text, {}, 'Close'),
-          ),
-        ),
-    };
-  },
-);
-
 // Mock TextField
 jest.mock('../../../../../component-library/components/Form/TextField', () => {
   const ReactActual = jest.requireActual('react');
diff --git a/app/components/UI/Rewards/components/EndOfSeasonClaimBottomSheet/EndOfSeasonClaimBottomSheet.tsx b/app/components/UI/Rewards/components/EndOfSeasonClaimBottomSheet/EndOfSeasonClaimBottomSheet.tsx
index ed073861460..063c5979e08 100644
--- a/app/components/UI/Rewards/components/EndOfSeasonClaimBottomSheet/EndOfSeasonClaimBottomSheet.tsx
+++ b/app/components/UI/Rewards/components/EndOfSeasonClaimBottomSheet/EndOfSeasonClaimBottomSheet.tsx
@@ -26,6 +26,7 @@ import {
   Text,
   TextVariant,
   FontWeight,
+  HeaderStandard,
   Icon,
   IconName,
   IconSize,
@@ -33,7 +34,6 @@ import {
 } from '@metamask/design-system-react-native';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import { REWARDS_VIEW_SELECTORS } from '../../Views/RewardsView.constants';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import {
   ClaimRewardDto,
   SeasonRewardType,
@@ -513,7 +513,7 @@ const EndOfSeasonClaimBottomSheet = ({
       testID={REWARDS_VIEW_SELECTORS.CLAIM_MODAL}
       keyboardAvoidingViewEnabled={!needsKeyboardAvoiding}
     >
-      <HeaderCompactStandard
+      <HeaderStandard
         title={title}
         onClose={handleModalClose}
         closeButtonProps={{ testID: 'close-button' }}
diff --git a/app/components/UI/Rewards/components/Onboarding/OnboardingMainStep.tsx b/app/components/UI/Rewards/components/Onboarding/OnboardingMainStep.tsx
index 3f88884aacf..44b9d8720b6 100644
--- a/app/components/UI/Rewards/components/Onboarding/OnboardingMainStep.tsx
+++ b/app/components/UI/Rewards/components/Onboarding/OnboardingMainStep.tsx
@@ -328,18 +328,20 @@ const OnboardingMainStep: React.FC = () => {
           <TextField
             placeholder={strings('rewards.onboarding.referral_placeholder')}
             value={referralCode}
-            autoCapitalize="characters"
-            maxLength={6}
             onChangeText={handleReferralCodeChange}
             isDisabled={optinLoading}
             endAccessory={renderReferralIcon()}
-            testID="referral-input"
             isError={
               referralCode.length >= 6 &&
               !referralCodeIsValid &&
               !isValidatingReferralCode &&
               !isUnknownErrorReferralCode
             }
+            inputProps={{
+              autoCapitalize: 'characters',
+              maxLength: 6,
+              testID: 'referral-input',
+            }}
           />
           {referralCode.length >= 6 &&
             !referralCodeIsValid &&
diff --git a/app/components/UI/Rewards/components/Onboarding/__tests__/OnboardingMainStep.test.tsx b/app/components/UI/Rewards/components/Onboarding/__tests__/OnboardingMainStep.test.tsx
index 20d9dd57cea..041baf3da4c 100644
--- a/app/components/UI/Rewards/components/Onboarding/__tests__/OnboardingMainStep.test.tsx
+++ b/app/components/UI/Rewards/components/Onboarding/__tests__/OnboardingMainStep.test.tsx
@@ -210,14 +210,17 @@ jest.mock('@metamask/design-system-react-native', () => {
       onChangeText?: (text: string) => void;
       placeholder?: string;
       isDisabled?: boolean;
+      inputProps?: { testID?: string; [key: string]: unknown };
       [key: string]: unknown;
     }) => {
       const { TextInput: RNTextInput } = jest.requireActual('react-native');
+      const wrapperTestId = props.testID ?? 'text-field';
+      const inputTestId = props.inputProps?.testID ?? `${wrapperTestId}-input`;
       return ReactActual.createElement(
         View,
-        { testID: props.testID || 'text-field' },
+        { testID: wrapperTestId },
         ReactActual.createElement(RNTextInput, {
-          testID: `${props.testID || 'text-field'}-input`,
+          testID: inputTestId,
           value: props.value,
           onChangeText: props.onChangeText,
           placeholder: props.placeholder,
diff --git a/app/components/UI/Rewards/components/ReferralDetails/CopyableField.tsx b/app/components/UI/Rewards/components/ReferralDetails/CopyableField.tsx
index 7023d15b341..6bf5b7a0cc9 100644
--- a/app/components/UI/Rewards/components/ReferralDetails/CopyableField.tsx
+++ b/app/components/UI/Rewards/components/ReferralDetails/CopyableField.tsx
@@ -14,7 +14,7 @@ import {
 import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
 
 interface CopyableFieldProps {
-  label: string;
+  label?: string;
   value?: string | null;
   onCopy?: () => void;
   valueLoading?: boolean;
@@ -40,9 +40,11 @@ const CopyableField: React.FC<CopyableFieldProps> = ({
 
   return (
     <Box twClassName="flex-col gap-1">
-      <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
-        {label}
-      </Text>
+      {label && (
+        <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+          {label}
+        </Text>
+      )}
       <Box
         twClassName="flex-1 bg-muted rounded-lg px-4 py-1 border border-solid border-muted"
         flexDirection={BoxFlexDirection.Row}
diff --git a/app/components/UI/Rewards/components/Settings/LinkedOffDeviceAccountsSheet.test.tsx b/app/components/UI/Rewards/components/Settings/LinkedOffDeviceAccountsSheet.test.tsx
index c80cc4e5769..2d6bccc57fc 100644
--- a/app/components/UI/Rewards/components/Settings/LinkedOffDeviceAccountsSheet.test.tsx
+++ b/app/components/UI/Rewards/components/Settings/LinkedOffDeviceAccountsSheet.test.tsx
@@ -37,24 +37,6 @@ jest.mock(
   },
 );
 
-// Mock HeaderCompactStandard — renders title text directly
-jest.mock(
-  '../../../../../component-library/components-temp/HeaderCompactStandard',
-  () => {
-    const ReactActual = jest.requireActual('react');
-    const { View, Text } = jest.requireActual('react-native');
-    return {
-      __esModule: true,
-      default: ({ title }: { title?: string; onClose?: () => void }) =>
-        ReactActual.createElement(
-          View,
-          { testID: 'header-compact-standard' },
-          ReactActual.createElement(Text, null, title),
-        ),
-    };
-  },
-);
-
 // Mock Avatar
 jest.mock('../../../../../component-library/components/Avatars/Avatar', () => {
   const ReactActual = jest.requireActual('react');
@@ -79,6 +61,7 @@ jest.mock('../../../../../component-library/components/Avatars/Avatar', () => {
 
 // Mock design system components
 jest.mock('@metamask/design-system-react-native', () => {
+  const actual = jest.requireActual('@metamask/design-system-react-native');
   const ReactActual = jest.requireActual('react');
   const {
     View,
@@ -86,6 +69,7 @@ jest.mock('@metamask/design-system-react-native', () => {
     TouchableOpacity,
   } = jest.requireActual('react-native');
   return {
+    ...actual,
     Box: ({
       children,
       testID,
diff --git a/app/components/UI/Rewards/components/Settings/LinkedOffDeviceAccountsSheet.tsx b/app/components/UI/Rewards/components/Settings/LinkedOffDeviceAccountsSheet.tsx
index 2e8a29b63f4..7558ae19b2e 100644
--- a/app/components/UI/Rewards/components/Settings/LinkedOffDeviceAccountsSheet.tsx
+++ b/app/components/UI/Rewards/components/Settings/LinkedOffDeviceAccountsSheet.tsx
@@ -9,6 +9,7 @@ import {
   BoxFlexDirection,
   BoxAlignItems,
   ButtonIcon,
+  HeaderStandard,
   IconName,
   IconSize,
   FontWeight,
@@ -27,7 +28,6 @@ import {
 } from '../../../../../util/networks';
 import ClipboardManager from '../../../../../core/ClipboardManager';
 import type { OffDeviceAccount } from '../../hooks/useLinkedOffDeviceAccounts';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import { METAMASK_SUPPORT_URL } from '../../../../../constants/urls';
 
 const styles = StyleSheet.create({
@@ -147,7 +147,8 @@ const LinkedOffDeviceAccountsSheet: React.FC<
 
   return (
     <BottomSheet shouldNavigateBack={false} onClose={onClose}>
-      <HeaderCompactStandard
+      <HeaderStandard
+        testID="header-compact-standard"
         title={strings('rewards.settings.off_device_accounts_sheet_title')}
         onClose={onClose}
       />
diff --git a/app/components/UI/Rewards/components/Settings/RewardOptInAccountGroupModal.tsx b/app/components/UI/Rewards/components/Settings/RewardOptInAccountGroupModal.tsx
index 11fb5231277..5e0d323829a 100644
--- a/app/components/UI/Rewards/components/Settings/RewardOptInAccountGroupModal.tsx
+++ b/app/components/UI/Rewards/components/Settings/RewardOptInAccountGroupModal.tsx
@@ -10,11 +10,11 @@ import {
   Button,
   ButtonVariant,
   ButtonSize,
+  HeaderStandard,
 } from '@metamask/design-system-react-native';
 import BottomSheet, {
   BottomSheetRef,
 } from '../../../../../component-library/components/BottomSheets/BottomSheet';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import { AccountGroupId } from '@metamask/account-api';
 import { selectAccountGroupById } from '../../../../../selectors/multichainAccounts/accountTreeController';
 import { useSelector } from 'react-redux';
@@ -373,7 +373,7 @@ const RewardOptInAccountGroupModal: React.FC = () => {
       onClose={handleDismiss}
     >
       {Boolean(accountGroupContext?.metadata?.name) && (
-        <HeaderCompactStandard
+        <HeaderStandard
           title={accountGroupContext?.metadata.name}
           onClose={() => sheetRef.current?.onCloseBottomSheet()}
           closeButtonProps={{ testID: 'header-close-button' }}
diff --git a/app/components/UI/Rewards/components/Settings/RewardsEnvironmentToggle.tsx b/app/components/UI/Rewards/components/Settings/RewardsEnvironmentToggle.tsx
index 5b097ccc8da..47168f818ea 100644
--- a/app/components/UI/Rewards/components/Settings/RewardsEnvironmentToggle.tsx
+++ b/app/components/UI/Rewards/components/Settings/RewardsEnvironmentToggle.tsx
@@ -7,6 +7,7 @@ import {
   Button,
   ButtonSize,
   ButtonVariant,
+  HeaderStandard,
   Text,
   TextColor,
   TextVariant,
@@ -18,7 +19,6 @@ import AppConstants from '../../../../../core/AppConstants';
 import BottomSheet, {
   BottomSheetRef,
 } from '../../../../../component-library/components/BottomSheets/BottomSheet';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import ListItemSelect from '../../../../../component-library/components/List/ListItemSelect';
 import { VerticalAlignment } from '../../../../../component-library/components/List/ListItem';
 import { cancelBulkLink } from '../../../../../store/sagas/rewardsBulkLinkAccountGroups';
@@ -118,7 +118,7 @@ const RewardsEnvironmentToggle: React.FC = () => {
             ref={sheetRef}
             onClose={() => setIsSheetOpen(false)}
           >
-            <HeaderCompactStandard
+            <HeaderStandard
               title={strings('rewards.settings.environment_selector')}
               onClose={() => sheetRef.current?.onCloseBottomSheet()}
               closeButtonProps={{ testID: 'environment-sheet-close-button' }}
diff --git a/app/components/UI/Rewards/hooks/useCampaignOutcomeToast.test.ts b/app/components/UI/Rewards/hooks/useCampaignOutcomeToast.test.ts
new file mode 100644
index 00000000000..3c7982808f0
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useCampaignOutcomeToast.test.ts
@@ -0,0 +1,508 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { useContext } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useFocusEffect, useNavigation } from '@react-navigation/native';
+import { playNotification, NotificationMoment } from '../../../../util/haptics';
+import { useCampaignOutcomeToast } from './useCampaignOutcomeToast';
+import { dismissCampaignOutcomeToast } from '../../../../reducers/rewards';
+import {
+  selectCampaigns,
+  selectDismissedCampaignOutcomeToasts,
+} from '../../../../reducers/rewards/selectors';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import {
+  CampaignType,
+  type BaseCampaignParticipantOutcomeDto,
+} from '../../../../core/Engine/controllers/rewards-controller/types';
+const ToastVariants = { Icon: 'Icon', App: 'App', Plain: 'Plain' };
+const ButtonIconVariant = { Icon: 'Icon' };
+const IconName = { Close: 'Close', Confirmation: 'Confirmation', Star: 'Star' };
+
+jest.mock('../../../../component-library/components/Toast', () => ({
+  ToastContext: { Consumer: jest.fn(), Provider: jest.fn() },
+}));
+
+jest.mock('../../../../component-library/components/Toast/Toast.types', () => ({
+  ToastVariants: { Icon: 'Icon', App: 'App', Plain: 'Plain' },
+  ButtonIconVariant: { Icon: 'Icon' },
+}));
+
+jest.mock('../../../../component-library/components/Icons/Icon', () => ({
+  IconName: { Close: 'Close', Confirmation: 'Confirmation', Star: 'Star' },
+}));
+
+jest.mock('react', () => ({
+  ...jest.requireActual('react'),
+  useContext: jest.fn(),
+  useCallback: jest.fn((fn) => fn),
+  useMemo: jest.fn((fn) => fn()),
+}));
+
+jest.mock('react-redux', () => ({
+  useDispatch: jest.fn(),
+  useSelector: jest.fn(),
+}));
+
+jest.mock('@react-navigation/native', () => ({
+  useFocusEffect: jest.fn(),
+  useNavigation: jest.fn(),
+}));
+
+jest.mock('../../../../util/haptics', () => ({
+  playNotification: jest.fn(),
+  NotificationMoment: {
+    Success: 'Success',
+    Warning: 'Warning',
+    Error: 'Error',
+  },
+}));
+
+jest.mock('../../../../../locales/i18n', () => ({
+  strings: jest.fn((key: string, params?: Record<string, string>) => {
+    if (params?.campaignName) return `${key}:${params.campaignName}`;
+    return key;
+  }),
+}));
+
+jest.mock('../../../../util/theme', () => {
+  const actual = jest.requireActual('../../../../util/theme');
+  return {
+    ...actual,
+    useAppThemeFromContext: () => actual.mockTheme,
+  };
+});
+
+jest.mock('../../../../reducers/rewards', () => ({
+  dismissCampaignOutcomeToast: jest.fn(),
+}));
+
+jest.mock('../../../../reducers/rewards/selectors', () => ({
+  selectCampaigns: jest.fn(),
+  selectDismissedCampaignOutcomeToasts: jest.fn(),
+}));
+
+jest.mock('../../../../selectors/rewards', () => ({
+  selectRewardsSubscriptionId: jest.fn(),
+}));
+
+jest.mock('../components/Campaigns/CampaignTile.utils', () => ({
+  getCampaignStatus: jest.fn(() => 'complete'),
+}));
+
+const mockDispatch = jest.fn();
+const mockNavigate = jest.fn();
+const mockShowToast = jest.fn();
+const mockCloseToast = jest.fn();
+const mockToastRef = {
+  current: { showToast: mockShowToast, closeToast: mockCloseToast },
+};
+
+const mockUseDispatch = useDispatch as jest.MockedFunction<typeof useDispatch>;
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockUseFocusEffect = useFocusEffect as jest.MockedFunction<
+  typeof useFocusEffect
+>;
+const mockUseNavigation = useNavigation as jest.MockedFunction<
+  typeof useNavigation
+>;
+const mockDismissCampaignOutcomeToast =
+  dismissCampaignOutcomeToast as jest.MockedFunction<
+    typeof dismissCampaignOutcomeToast
+  >;
+
+const SUBSCRIPTION_ID = 'sub-123';
+const CAMPAIGN_ID = 'campaign-456';
+const CAMPAIGN_NAME = 'Test Campaign';
+
+const mockUseOutcome = jest.fn();
+
+const makeCompletedCampaign = (id = CAMPAIGN_ID, endDate = '2025-01-01') => ({
+  id,
+  name: CAMPAIGN_NAME,
+  type: CampaignType.ONDO_HOLDING,
+  endDate,
+  startDate: '2024-01-01',
+});
+
+const WINNER_NAV = {
+  route: 'WinnerRoute',
+  params: { campaignId: CAMPAIGN_ID },
+};
+const NON_WINNER_NAV = {
+  route: 'NonWinnerRoute',
+  params: { campaignId: CAMPAIGN_ID },
+};
+
+const mockConfig = {
+  campaignType: CampaignType.ONDO_HOLDING,
+  useOutcome: mockUseOutcome,
+  getWinnerNavigation: jest.fn(() => WINNER_NAV),
+  getNonWinnerNavigation: jest.fn(() => NON_WINNER_NAV),
+};
+
+function setupDefaults({
+  campaigns = [makeCompletedCampaign()],
+  dismissed = {},
+  subscriptionId = SUBSCRIPTION_ID,
+  outcome = null,
+}: {
+  campaigns?: ReturnType<typeof makeCompletedCampaign>[] | undefined;
+  dismissed?: Record<string, boolean>;
+  subscriptionId?: string | null;
+  outcome?: BaseCampaignParticipantOutcomeDto | null;
+} = {}) {
+  mockUseSelector.mockImplementation((selector) => {
+    if (selector === selectCampaigns) return campaigns ?? [];
+    if (selector === selectDismissedCampaignOutcomeToasts) return dismissed;
+    if (selector === selectRewardsSubscriptionId) return subscriptionId;
+    return undefined;
+  });
+  mockUseOutcome.mockReturnValue({
+    outcome,
+    isLoading: false,
+    hasError: false,
+  });
+}
+
+describe('useCampaignOutcomeToast', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseDispatch.mockReturnValue(mockDispatch);
+    mockUseNavigation.mockReturnValue({ navigate: mockNavigate } as never);
+    (useContext as jest.Mock).mockReturnValue({ toastRef: mockToastRef });
+    mockUseFocusEffect.mockImplementation((cb) => {
+      cb();
+    });
+    mockDismissCampaignOutcomeToast.mockReturnValue({
+      type: 'rewards/dismissCampaignOutcomeToast',
+    } as never);
+    mockConfig.getWinnerNavigation.mockReturnValue(WINNER_NAV);
+    mockConfig.getNonWinnerNavigation.mockReturnValue(NON_WINNER_NAV);
+  });
+
+  describe('does not show toast when', () => {
+    it('outcome is null', () => {
+      setupDefaults({ outcome: null });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(mockShowToast).not.toHaveBeenCalled();
+    });
+
+    it('no campaigns match the campaignType', () => {
+      setupDefaults({ campaigns: [] });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(mockShowToast).not.toHaveBeenCalled();
+    });
+
+    it('campaigns are missing from persisted state', () => {
+      setupDefaults({ campaigns: undefined });
+      expect(() =>
+        renderHook(() => useCampaignOutcomeToast(mockConfig)),
+      ).not.toThrow();
+      expect(mockShowToast).not.toHaveBeenCalled();
+    });
+
+    it('subscriptionId is missing', () => {
+      setupDefaults({
+        subscriptionId: null,
+        outcome: {
+          subscriptionId: '',
+          outcomeStatus: 'pending',
+          winnerVerificationCode: 'CODE',
+        },
+      });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(mockShowToast).not.toHaveBeenCalled();
+    });
+
+    it('winner toast was already dismissed', () => {
+      const key = `${CAMPAIGN_ID}:${SUBSCRIPTION_ID}:winner`;
+      setupDefaults({
+        outcome: {
+          subscriptionId: SUBSCRIPTION_ID,
+          outcomeStatus: 'pending',
+          winnerVerificationCode: 'CODE',
+        },
+        dismissed: { [key]: true },
+      });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(mockShowToast).not.toHaveBeenCalled();
+    });
+
+    it('non_winner toast was already dismissed', () => {
+      const key = `${CAMPAIGN_ID}:${SUBSCRIPTION_ID}:non_winner`;
+      setupDefaults({
+        outcome: {
+          subscriptionId: SUBSCRIPTION_ID,
+          outcomeStatus: 'finalized',
+          winnerVerificationCode: null,
+        },
+        dismissed: { [key]: true },
+      });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(mockShowToast).not.toHaveBeenCalled();
+    });
+
+    it('outcome is finalized with a verification code (neither variant)', () => {
+      setupDefaults({
+        outcome: {
+          subscriptionId: SUBSCRIPTION_ID,
+          outcomeStatus: 'finalized',
+          winnerVerificationCode: 'CODE',
+        },
+      });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(mockShowToast).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('winner toast', () => {
+    const winnerOutcome: BaseCampaignParticipantOutcomeDto = {
+      subscriptionId: SUBSCRIPTION_ID,
+      outcomeStatus: 'pending',
+      winnerVerificationCode: 'WINNER-XYZ',
+    };
+
+    it('shows Plain variant toast with trophy startAccessory', () => {
+      setupDefaults({ outcome: winnerOutcome });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(mockShowToast).toHaveBeenCalledWith(
+        expect.objectContaining({
+          variant: ToastVariants.Plain,
+          hasNoTimeout: true,
+          startAccessory: expect.anything(),
+        }),
+      );
+    });
+
+    it('uses consolidated winner locale keys', () => {
+      setupDefaults({ outcome: winnerOutcome });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(mockShowToast).toHaveBeenCalledWith(
+        expect.objectContaining({
+          labelOptions: [
+            {
+              label: 'rewards.campaign_outcome_toast.winner.title',
+              isBold: true,
+            },
+          ],
+          descriptionOptions: {
+            description: `rewards.campaign_outcome_toast.winner.description:${CAMPAIGN_NAME}`,
+          },
+          linkButtonOptions: expect.objectContaining({
+            label: 'rewards.campaign_outcome_toast.winner.cta',
+          }),
+        }),
+      );
+    });
+
+    it('shows close button with correct config', () => {
+      setupDefaults({ outcome: winnerOutcome });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(mockShowToast).toHaveBeenCalledWith(
+        expect.objectContaining({
+          closeButtonOptions: expect.objectContaining({
+            variant: ButtonIconVariant.Icon,
+            iconName: IconName.Close,
+          }),
+        }),
+      );
+    });
+
+    it('fires success haptic via playNotification', () => {
+      setupDefaults({ outcome: winnerOutcome });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(playNotification).toHaveBeenCalledWith(NotificationMoment.Success);
+    });
+  });
+
+  describe('non-winner toast', () => {
+    const nonWinnerOutcome: BaseCampaignParticipantOutcomeDto = {
+      subscriptionId: SUBSCRIPTION_ID,
+      outcomeStatus: 'finalized',
+      winnerVerificationCode: null,
+    };
+
+    it('shows Icon variant toast with Confirmation icon', () => {
+      setupDefaults({ outcome: nonWinnerOutcome });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(mockShowToast).toHaveBeenCalledWith(
+        expect.objectContaining({
+          variant: ToastVariants.Icon,
+          iconName: IconName.Confirmation,
+          backgroundColor: 'transparent',
+          hasNoTimeout: true,
+        }),
+      );
+    });
+
+    it('uses consolidated non_winner locale keys', () => {
+      setupDefaults({ outcome: nonWinnerOutcome });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(mockShowToast).toHaveBeenCalledWith(
+        expect.objectContaining({
+          labelOptions: [
+            {
+              label: 'rewards.campaign_outcome_toast.non_winner.title',
+              isBold: true,
+            },
+          ],
+          descriptionOptions: {
+            description: `rewards.campaign_outcome_toast.non_winner.description:${CAMPAIGN_NAME}`,
+          },
+          linkButtonOptions: expect.objectContaining({
+            label: 'rewards.campaign_outcome_toast.non_winner.cta',
+          }),
+        }),
+      );
+    });
+
+    it('fires warning haptic via playNotification', () => {
+      setupDefaults({ outcome: nonWinnerOutcome });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+      expect(playNotification).toHaveBeenCalledWith(NotificationMoment.Warning);
+    });
+  });
+
+  describe('handleDismiss', () => {
+    it('dispatches dismissCampaignOutcomeToast with variant winner and closes toast', () => {
+      setupDefaults({
+        outcome: {
+          subscriptionId: SUBSCRIPTION_ID,
+          outcomeStatus: 'pending',
+          winnerVerificationCode: 'CODE',
+        },
+      });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+
+      const closeButtonOptions =
+        mockShowToast.mock.calls[0][0].closeButtonOptions;
+      closeButtonOptions.onPress();
+
+      expect(mockDismissCampaignOutcomeToast).toHaveBeenCalledWith({
+        campaignId: CAMPAIGN_ID,
+        subscriptionId: SUBSCRIPTION_ID,
+        variant: 'winner',
+      });
+      expect(mockCloseToast).toHaveBeenCalled();
+    });
+
+    it('dispatches dismissCampaignOutcomeToast with variant non_winner', () => {
+      setupDefaults({
+        outcome: {
+          subscriptionId: SUBSCRIPTION_ID,
+          outcomeStatus: 'finalized',
+          winnerVerificationCode: null,
+        },
+      });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+
+      const closeButtonOptions =
+        mockShowToast.mock.calls[0][0].closeButtonOptions;
+      closeButtonOptions.onPress();
+
+      expect(mockDismissCampaignOutcomeToast).toHaveBeenCalledWith({
+        campaignId: CAMPAIGN_ID,
+        subscriptionId: SUBSCRIPTION_ID,
+        variant: 'non_winner',
+      });
+    });
+  });
+
+  describe('handleCta', () => {
+    it('navigates to winner route and dismisses for winner variant', () => {
+      setupDefaults({
+        outcome: {
+          subscriptionId: SUBSCRIPTION_ID,
+          outcomeStatus: 'pending',
+          winnerVerificationCode: 'CODE',
+        },
+      });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+
+      const { onPress } = mockShowToast.mock.calls[0][0].linkButtonOptions;
+      onPress();
+
+      expect(mockNavigate).toHaveBeenCalledWith(
+        WINNER_NAV.route as never,
+        WINNER_NAV.params as never,
+      );
+      expect(mockDismissCampaignOutcomeToast).toHaveBeenCalledWith(
+        expect.objectContaining({ variant: 'winner' }),
+      );
+    });
+
+    it('navigates to non-winner route and dismisses for non_winner variant', () => {
+      setupDefaults({
+        outcome: {
+          subscriptionId: SUBSCRIPTION_ID,
+          outcomeStatus: 'finalized',
+          winnerVerificationCode: null,
+        },
+      });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+
+      const { onPress } = mockShowToast.mock.calls[0][0].linkButtonOptions;
+      onPress();
+
+      expect(mockNavigate).toHaveBeenCalledWith(
+        NON_WINNER_NAV.route as never,
+        NON_WINNER_NAV.params as never,
+      );
+      expect(mockDismissCampaignOutcomeToast).toHaveBeenCalledWith(
+        expect.objectContaining({ variant: 'non_winner' }),
+      );
+    });
+  });
+
+  describe('cleanup on blur', () => {
+    it('calls closeToast in cleanup when screen blurs', () => {
+      let cleanupFn: (() => void) | undefined;
+      mockUseFocusEffect.mockImplementation((cb) => {
+        const cleanup = cb();
+        if (typeof cleanup === 'function') cleanupFn = cleanup;
+      });
+
+      setupDefaults({
+        outcome: {
+          subscriptionId: SUBSCRIPTION_ID,
+          outcomeStatus: 'pending',
+          winnerVerificationCode: 'CODE',
+        },
+      });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+
+      expect(cleanupFn).toBeDefined();
+      cleanupFn?.();
+      expect(mockCloseToast).toHaveBeenCalled();
+    });
+
+    it('does not return cleanup when variant is null', () => {
+      let cleanupFn: (() => void) | undefined;
+      mockUseFocusEffect.mockImplementation((cb) => {
+        const result = cb();
+        if (typeof result === 'function') cleanupFn = result;
+      });
+
+      setupDefaults({ outcome: null });
+      renderHook(() => useCampaignOutcomeToast(mockConfig));
+
+      expect(cleanupFn).toBeUndefined();
+    });
+  });
+
+  describe('edge cases', () => {
+    it('handles null toastRef gracefully', () => {
+      (useContext as jest.Mock).mockReturnValue({ toastRef: null });
+      setupDefaults({
+        outcome: {
+          subscriptionId: SUBSCRIPTION_ID,
+          outcomeStatus: 'pending',
+          winnerVerificationCode: 'CODE',
+        },
+      });
+      expect(() =>
+        renderHook(() => useCampaignOutcomeToast(mockConfig)),
+      ).not.toThrow();
+    });
+  });
+});
diff --git a/app/components/UI/Rewards/hooks/useCampaignOutcomeToast.ts b/app/components/UI/Rewards/hooks/useCampaignOutcomeToast.ts
new file mode 100644
index 00000000000..4ea89f6df6e
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useCampaignOutcomeToast.ts
@@ -0,0 +1,174 @@
+import { useCallback, useContext, useMemo } from 'react';
+import {
+  useFocusEffect,
+  useNavigation,
+  type NavigationProp,
+  type ParamListBase,
+} from '@react-navigation/native';
+import { useDispatch, useSelector } from 'react-redux';
+import { strings } from '../../../../../locales/i18n';
+import { ToastContext } from '../../../../component-library/components/Toast';
+import type {
+  BaseCampaignParticipantOutcomeDto,
+  CampaignType,
+  CampaignDto,
+} from '../../../../core/Engine/controllers/rewards-controller/types';
+import { getCampaignStatus } from '../components/Campaigns/CampaignTile.utils';
+import { dismissCampaignOutcomeToast } from '../../../../reducers/rewards';
+import {
+  selectCampaigns,
+  selectDismissedCampaignOutcomeToasts,
+} from '../../../../reducers/rewards/selectors';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import useRewardsToast from './useRewardsToast';
+
+export interface CampaignOutcomeToastConfig {
+  campaignType: CampaignType;
+  useOutcome: (id: string | undefined) => {
+    outcome: BaseCampaignParticipantOutcomeDto | null;
+  };
+  getWinnerNavigation: (campaign: CampaignDto) => {
+    route: string;
+    params: object;
+  };
+  getNonWinnerNavigation: (campaign: CampaignDto) => {
+    route: string;
+    params: object;
+  };
+}
+
+export function useCampaignOutcomeToast(
+  config: CampaignOutcomeToastConfig,
+): void {
+  const {
+    campaignType,
+    useOutcome,
+    getWinnerNavigation,
+    getNonWinnerNavigation,
+  } = config;
+
+  const dispatch = useDispatch();
+  const { toastRef } = useContext(ToastContext);
+  const { showToast, RewardsToastOptions } = useRewardsToast();
+  const navigation = useNavigation<NavigationProp<ParamListBase>>();
+
+  const subscriptionId = useSelector(selectRewardsSubscriptionId);
+  const campaigns = useSelector(selectCampaigns);
+  const dismissed = useSelector(selectDismissedCampaignOutcomeToasts);
+
+  const targetCampaign = useMemo(() => {
+    const completed = campaigns
+      .filter(
+        (c) => c.type === campaignType && getCampaignStatus(c) === 'complete',
+      )
+      .sort(
+        (a, b) => new Date(b.endDate).getTime() - new Date(a.endDate).getTime(),
+      );
+    return completed[0] ?? null;
+  }, [campaigns, campaignType]);
+
+  const { outcome } = useOutcome(targetCampaign?.id);
+
+  // Standardized variant derivation: winner = has code and not yet finalized
+  const variant = useMemo((): 'winner' | 'non_winner' | null => {
+    if (!outcome) return null;
+    if (
+      outcome.winnerVerificationCode &&
+      outcome.outcomeStatus !== 'finalized'
+    ) {
+      return 'winner';
+    }
+    if (
+      outcome.outcomeStatus === 'finalized' &&
+      !outcome.winnerVerificationCode
+    ) {
+      return 'non_winner';
+    }
+    return null;
+  }, [outcome]);
+
+  const isDismissed = useMemo(() => {
+    if (!variant || !targetCampaign || !subscriptionId) return true;
+    const key = `${targetCampaign.id}:${subscriptionId}:${variant}`;
+    return dismissed[key] === true;
+  }, [variant, targetCampaign, subscriptionId, dismissed]);
+
+  const handleDismiss = useCallback(() => {
+    if (!variant || !targetCampaign || !subscriptionId) return;
+    dispatch(
+      dismissCampaignOutcomeToast({
+        campaignId: targetCampaign.id,
+        subscriptionId,
+        variant,
+      }),
+    );
+    toastRef?.current?.closeToast();
+  }, [variant, targetCampaign, subscriptionId, dispatch, toastRef]);
+
+  const handleCta = useCallback(() => {
+    if (!targetCampaign || !variant) return;
+    handleDismiss();
+    const nav =
+      variant === 'winner'
+        ? getWinnerNavigation(targetCampaign)
+        : getNonWinnerNavigation(targetCampaign);
+    navigation.navigate(nav.route, nav.params);
+  }, [
+    variant,
+    targetCampaign,
+    handleDismiss,
+    navigation,
+    getWinnerNavigation,
+    getNonWinnerNavigation,
+  ]);
+
+  useFocusEffect(
+    useCallback(() => {
+      if (!variant || isDismissed || !targetCampaign) return;
+
+      const isWinner = variant === 'winner';
+      if (isWinner) {
+        showToast(
+          RewardsToastOptions.outcomeWinner({
+            title: strings('rewards.campaign_outcome_toast.winner.title'),
+            description: strings(
+              'rewards.campaign_outcome_toast.winner.description',
+              { campaignName: targetCampaign.name ?? '' },
+            ),
+            ctaLabel: strings('rewards.campaign_outcome_toast.winner.cta'),
+            onCtaPress: handleCta,
+            onClosePress: handleDismiss,
+          }),
+        );
+      } else {
+        showToast(
+          RewardsToastOptions.outcomeNonWinner({
+            title: strings('rewards.campaign_outcome_toast.non_winner.title'),
+            description: strings(
+              'rewards.campaign_outcome_toast.non_winner.description',
+              { campaignName: targetCampaign.name ?? '' },
+            ),
+            ctaLabel: strings('rewards.campaign_outcome_toast.non_winner.cta'),
+            onCtaPress: handleCta,
+            onClosePress: handleDismiss,
+          }),
+        );
+      }
+
+      return () => {
+        toastRef?.current?.closeToast();
+      };
+    }, [
+      variant,
+      isDismissed,
+      targetCampaign,
+      toastRef,
+      showToast,
+      RewardsToastOptions,
+      handleCta,
+      handleDismiss,
+    ]),
+  );
+}
+
+export default useCampaignOutcomeToast;
diff --git a/app/components/UI/Rewards/hooks/useCampaignParticipantOutcome.test.ts b/app/components/UI/Rewards/hooks/useCampaignParticipantOutcome.test.ts
new file mode 100644
index 00000000000..012cbe4549a
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useCampaignParticipantOutcome.test.ts
@@ -0,0 +1,173 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import { useSelector } from 'react-redux';
+import Engine from '../../../../core/Engine';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import { selectCampaignParticipantOptedIn } from '../../../../reducers/rewards/selectors';
+import { useCampaignParticipantOutcome } from './useCampaignParticipantOutcome';
+import type { BaseCampaignParticipantOutcomeDto } from '../../../../core/Engine/controllers/rewards-controller/types';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../../core/Engine', () => ({
+  controllerMessenger: { call: jest.fn() },
+}));
+
+jest.mock('../../../../selectors/rewards', () => ({
+  selectRewardsSubscriptionId: jest.fn(),
+}));
+
+jest.mock('../../../../reducers/rewards/selectors', () => ({
+  selectCampaignParticipantOptedIn: jest.fn(),
+}));
+
+const mockCall = Engine.controllerMessenger.call as jest.MockedFunction<
+  typeof Engine.controllerMessenger.call
+>;
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockSelectCampaignParticipantOptedIn =
+  selectCampaignParticipantOptedIn as jest.MockedFunction<
+    typeof selectCampaignParticipantOptedIn
+  >;
+
+const CAMPAIGN_ID = 'campaign-123';
+const SUBSCRIPTION_ID = 'sub-456';
+const MESSENGER_ACTION = 'RewardsController:getOndoCampaignParticipantOutcome';
+const CONFIG = { messengerAction: MESSENGER_ACTION };
+
+const MOCK_OUTCOME: BaseCampaignParticipantOutcomeDto = {
+  subscriptionId: SUBSCRIPTION_ID,
+  outcomeStatus: 'pending',
+  winnerVerificationCode: 'WINNER-XYZ',
+};
+
+function setupSelectors({
+  subscriptionId = SUBSCRIPTION_ID,
+  isOptedIn = true,
+}: {
+  subscriptionId?: string | null;
+  isOptedIn?: boolean;
+} = {}) {
+  const participantOptedInSelector = jest.fn().mockReturnValue(isOptedIn);
+  mockSelectCampaignParticipantOptedIn.mockReturnValue(
+    participantOptedInSelector,
+  );
+  mockUseSelector.mockImplementation((selector) => {
+    if (selector === selectRewardsSubscriptionId) return subscriptionId;
+    if (selector === participantOptedInSelector) return isOptedIn;
+    return undefined;
+  });
+}
+
+describe('useCampaignParticipantOutcome', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('fetches and returns outcome when subscriptionId, campaignId, and isOptedIn are truthy', async () => {
+    setupSelectors();
+    mockCall.mockResolvedValue(MOCK_OUTCOME);
+
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useCampaignParticipantOutcome(CAMPAIGN_ID, CONFIG),
+    );
+
+    await act(async () => {
+      await waitForNextUpdate();
+    });
+
+    expect(mockCall).toHaveBeenCalledWith(
+      MESSENGER_ACTION,
+      CAMPAIGN_ID,
+      SUBSCRIPTION_ID,
+    );
+    expect(result.current.outcome).toEqual(MOCK_OUTCOME);
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.hasError).toBe(false);
+  });
+
+  it('returns null outcome when campaignId is undefined', async () => {
+    setupSelectors();
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useCampaignParticipantOutcome(undefined, CONFIG),
+    );
+    await act(async () => {
+      await waitForNextUpdate().catch(() => undefined);
+    });
+    expect(result.current.outcome).toBeNull();
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.hasError).toBe(false);
+    expect(mockCall).not.toHaveBeenCalled();
+  });
+
+  it('returns null outcome when subscriptionId is missing', async () => {
+    setupSelectors({ subscriptionId: null });
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useCampaignParticipantOutcome(CAMPAIGN_ID, CONFIG),
+    );
+    await act(async () => {
+      await waitForNextUpdate().catch(() => undefined);
+    });
+    expect(result.current.outcome).toBeNull();
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.hasError).toBe(false);
+    expect(mockCall).not.toHaveBeenCalled();
+  });
+
+  it('returns null outcome when user is not opted in', async () => {
+    setupSelectors({ isOptedIn: false });
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useCampaignParticipantOutcome(CAMPAIGN_ID, CONFIG),
+    );
+    await act(async () => {
+      await waitForNextUpdate().catch(() => undefined);
+    });
+    expect(result.current.outcome).toBeNull();
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.hasError).toBe(false);
+    expect(mockCall).not.toHaveBeenCalled();
+  });
+
+  it('sets hasError and clears outcome when the fetch throws', async () => {
+    setupSelectors();
+    mockCall.mockRejectedValue(new Error('fetch failed'));
+
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useCampaignParticipantOutcome(CAMPAIGN_ID, CONFIG),
+    );
+
+    await act(async () => {
+      await waitForNextUpdate();
+    });
+
+    expect(result.current.outcome).toBeNull();
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.hasError).toBe(true);
+  });
+
+  it('resets state when campaignId changes to undefined', async () => {
+    setupSelectors();
+    mockCall.mockResolvedValue(MOCK_OUTCOME);
+
+    const initialProps: { id: string | undefined } = { id: CAMPAIGN_ID };
+    const { result, waitForNextUpdate, rerender } = renderHook(
+      ({ id }: { id: string | undefined }) =>
+        useCampaignParticipantOutcome(id, CONFIG),
+      { initialProps },
+    );
+
+    await act(async () => {
+      await waitForNextUpdate();
+    });
+    expect(result.current.outcome).toEqual(MOCK_OUTCOME);
+
+    rerender({ id: undefined });
+    await act(async () => {
+      await waitForNextUpdate().catch(() => undefined);
+    });
+    expect(result.current.outcome).toBeNull();
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.hasError).toBe(false);
+  });
+});
diff --git a/app/components/UI/Rewards/hooks/useCampaignParticipantOutcome.ts b/app/components/UI/Rewards/hooks/useCampaignParticipantOutcome.ts
new file mode 100644
index 00000000000..1f10639c665
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useCampaignParticipantOutcome.ts
@@ -0,0 +1,68 @@
+import { useCallback, useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import Engine from '../../../../core/Engine';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import { selectCampaignParticipantOptedIn } from '../../../../reducers/rewards/selectors';
+import type { BaseCampaignParticipantOutcomeDto } from '../../../../core/Engine/controllers/rewards-controller/types';
+
+export interface UseCampaignParticipantOutcomeResult<
+  T extends BaseCampaignParticipantOutcomeDto,
+> {
+  outcome: T | null;
+  isLoading: boolean;
+  hasError: boolean;
+}
+
+export interface CampaignOutcomeFetchConfig {
+  messengerAction: string;
+}
+
+export function useCampaignParticipantOutcome<
+  T extends BaseCampaignParticipantOutcomeDto,
+>(
+  campaignId: string | undefined,
+  config: CampaignOutcomeFetchConfig,
+): UseCampaignParticipantOutcomeResult<T> {
+  const subscriptionId = useSelector(selectRewardsSubscriptionId);
+  const isOptedIn = useSelector(
+    selectCampaignParticipantOptedIn(subscriptionId, campaignId),
+  );
+  const [outcome, setOutcome] = useState<T | null>(null);
+  const [isLoading, setIsLoading] = useState(false);
+  const [hasError, setHasError] = useState(false);
+
+  const fetchOutcome = useCallback(async (): Promise<void> => {
+    if (!subscriptionId || !campaignId || !isOptedIn) {
+      setOutcome(null);
+      setIsLoading(false);
+      setHasError(false);
+      return;
+    }
+
+    try {
+      setIsLoading(true);
+      setHasError(false);
+      const result = await Engine.controllerMessenger.call(
+        config.messengerAction as Parameters<
+          typeof Engine.controllerMessenger.call
+        >[0],
+        campaignId,
+        subscriptionId,
+      );
+      setOutcome(result as T);
+    } catch {
+      setOutcome(null);
+      setHasError(true);
+    } finally {
+      setIsLoading(false);
+    }
+  }, [campaignId, subscriptionId, isOptedIn, config.messengerAction]);
+
+  useEffect(() => {
+    fetchOutcome();
+  }, [fetchOutcome]);
+
+  return { outcome, isLoading, hasError };
+}
+
+export default useCampaignParticipantOutcome;
diff --git a/app/components/UI/Rewards/hooks/useCampaignReminderActions.test.ts b/app/components/UI/Rewards/hooks/useCampaignReminderActions.test.ts
new file mode 100644
index 00000000000..6003b493f85
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useCampaignReminderActions.test.ts
@@ -0,0 +1,378 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import { waitFor } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import {
+  buildCampaignReminderCompositeKey,
+  reminderStorageKeyForComposite,
+  useCampaignReminderActions,
+} from './useCampaignReminderActions';
+import {
+  CampaignType,
+  type CampaignDto,
+} from '../../../../core/Engine/controllers/rewards-controller/types';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import {
+  selectIsMetamaskNotificationsEnabled,
+  selectIsMetaMaskPushNotificationsEnabled,
+} from '../../../../selectors/notifications';
+import { isNotificationsFeatureEnabled } from '../../../../util/notifications/constants';
+
+const mockTrackEvent = jest.fn();
+const mockCreateEventBuilder = jest.fn();
+const mockShowToast = jest.fn();
+const mockEnableNotifications = jest.fn();
+const mockEnableNotificationsNudge = jest.fn(
+  (linkButtonOptions: { label: string; onPress: () => Promise<void> }) => ({
+    variant: 'Plain',
+    hasNoTimeout: true,
+    linkButtonOptions,
+    closeButtonOptions: {
+      onPress: jest.fn(),
+    },
+  }),
+);
+const mockGetItemSync = jest.fn((_key: string): string | null => null);
+const mockSetItem = jest.fn(
+  (_key: string, _value: string): Promise<void> => Promise.resolve(),
+);
+let mockEnableNotificationsLoading = false;
+
+const TEST_REWARDS_SUBSCRIPTION_ID = 'test-rewards-sub-id';
+const TEST_CAMPAIGN_ID = 'test-campaign-id';
+const TEST_CAMPAIGN_START_DATE = '2028-07-15T00:00:00.000Z';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../../store/storage-wrapper', () => ({
+  __esModule: true,
+  default: {
+    getItemSync: (key: string) => mockGetItemSync(key),
+    setItem: (key: string, value: string) => mockSetItem(key, value),
+  },
+}));
+
+jest.mock('../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: jest.fn(() => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  })),
+}));
+
+jest.mock('./useRewardsToast', () => ({
+  __esModule: true,
+  default: jest.fn(() => ({
+    showToast: mockShowToast,
+    RewardsToastOptions: {
+      success: jest.fn((title: string, subtitle?: string) => ({
+        variant: 'success',
+        title,
+        subtitle,
+      })),
+      error: jest.fn((title: string, subtitle?: string) => ({
+        variant: 'error',
+        title,
+        subtitle,
+      })),
+      enableNotificationsNudge: mockEnableNotificationsNudge,
+      loading: jest.fn((title: string, subtitle?: string) => ({
+        variant: 'loading',
+        title,
+        subtitle,
+      })),
+    },
+  })),
+}));
+
+jest.mock('../../../../util/notifications/hooks/useNotifications', () => ({
+  useEnableNotifications: jest.fn(() => ({
+    enableNotifications: mockEnableNotifications,
+    loading: mockEnableNotificationsLoading,
+  })),
+}));
+
+jest.mock('../../../../util/notifications/constants', () => ({
+  isNotificationsFeatureEnabled: jest.fn(() => true),
+}));
+
+jest.mock('../../../../../locales/i18n', () => ({
+  strings: (key: string) => {
+    const translations: Record<string, string> = {
+      'rewards.campaign.remind_me_success_toast': 'We will notify you.',
+      'rewards.campaign.remind_me_save_error': 'Save failed.',
+      'rewards.notifications_nudge.turn_on_button': 'Turn on',
+    };
+    return translations[key] || key;
+  },
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+
+const createCampaign = (overrides = {}): CampaignDto => ({
+  id: TEST_CAMPAIGN_ID,
+  type: CampaignType.PERPS_TRADING,
+  name: 'Test Campaign',
+  startDate: TEST_CAMPAIGN_START_DATE,
+  endDate: '2028-12-31T23:59:59.999Z',
+  termsAndConditions: null,
+  excludedRegions: [],
+  details: null,
+  featured: true,
+  showUpcomingDate: false,
+  ...overrides,
+});
+
+function mockSelectors({
+  subscriptionId = TEST_REWARDS_SUBSCRIPTION_ID,
+  notificationsEnabled = true,
+}: {
+  subscriptionId?: string | null;
+  notificationsEnabled?: boolean;
+} = {}) {
+  mockUseSelector.mockImplementation((selector) => {
+    if (selector === selectRewardsSubscriptionId) {
+      return subscriptionId;
+    }
+    if (
+      selector === selectIsMetamaskNotificationsEnabled ||
+      selector === selectIsMetaMaskPushNotificationsEnabled
+    ) {
+      return notificationsEnabled;
+    }
+    return undefined;
+  });
+}
+
+describe('useCampaignReminderActions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockEnableNotifications.mockResolvedValue(undefined);
+    mockEnableNotificationsLoading = false;
+    mockGetItemSync.mockReturnValue(null);
+    mockSetItem.mockResolvedValue(undefined);
+    mockSelectors();
+    (isNotificationsFeatureEnabled as jest.Mock).mockReturnValue(true);
+    mockCreateEventBuilder.mockImplementation(() => {
+      const builder = {
+        addProperties: jest.fn(),
+        build: jest.fn(() => ({ category: 'test-event' })),
+      };
+      builder.addProperties.mockReturnValue(builder);
+      return builder;
+    });
+  });
+
+  it('shows Remind Me CTA after storage hydration when reminder is enabled', async () => {
+    const { result } = renderHook(() =>
+      useCampaignReminderActions(createCampaign(), true),
+    );
+
+    await waitFor(() => {
+      expect(result.current.showRemindMeCta).toBe(true);
+    });
+  });
+
+  it('does not show Remind Me CTA when the reminder feature is disabled', async () => {
+    const { result } = renderHook(() =>
+      useCampaignReminderActions(createCampaign(), false),
+    );
+
+    await waitFor(() => {
+      expect(result.current.showRemindMeCta).toBe(false);
+    });
+  });
+
+  it('does not show Remind Me CTA when storage already has the reminder', async () => {
+    mockGetItemSync.mockReturnValueOnce('1');
+
+    const { result } = renderHook(() =>
+      useCampaignReminderActions(createCampaign(), true),
+    );
+
+    await waitFor(() => {
+      expect(result.current.showRemindMeCta).toBe(false);
+    });
+  });
+
+  it('does not show Remind Me CTA when subscription id is missing', async () => {
+    mockSelectors({ subscriptionId: null });
+
+    const { result } = renderHook(() =>
+      useCampaignReminderActions(createCampaign(), true),
+    );
+
+    await waitFor(() => {
+      expect(result.current.showRemindMeCta).toBe(false);
+    });
+  });
+
+  it('shows Remind Me CTA when notifications are disabled even if reminder is already stored', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    mockGetItemSync.mockReturnValue('1');
+
+    const { result } = renderHook(() =>
+      useCampaignReminderActions(createCampaign(), true),
+    );
+
+    await waitFor(() => {
+      expect(result.current.showRemindMeCta).toBe(true);
+    });
+  });
+
+  it('does not show Remind Me CTA when notifications are enabled and reminder is already stored', async () => {
+    mockSelectors({ notificationsEnabled: true });
+    mockGetItemSync.mockReturnValue('1');
+
+    const { result } = renderHook(() =>
+      useCampaignReminderActions(createCampaign(), true),
+    );
+
+    await waitFor(() => {
+      expect(result.current.showRemindMeCta).toBe(false);
+    });
+  });
+
+  it('does not show Remind Me CTA when the notifications feature flag is off', async () => {
+    (isNotificationsFeatureEnabled as jest.Mock).mockReturnValue(false);
+
+    const { result } = renderHook(() =>
+      useCampaignReminderActions(createCampaign(), true),
+    );
+
+    await waitFor(() => {
+      expect(result.current.showRemindMeCta).toBe(false);
+    });
+  });
+
+  it('persists, tracks, and shows success toast when notifications are already enabled', async () => {
+    const campaign = createCampaign();
+    const { result } = renderHook(() =>
+      useCampaignReminderActions(campaign, true),
+    );
+
+    await waitFor(() => {
+      expect(result.current.showRemindMeCta).toBe(true);
+    });
+
+    await act(async () => {
+      await result.current.handleRemindMePress();
+    });
+
+    expect(mockSetItem).toHaveBeenCalledWith(
+      reminderStorageKeyForComposite(
+        `${TEST_REWARDS_SUBSCRIPTION_ID}:${TEST_CAMPAIGN_ID}`,
+      ),
+      '1',
+    );
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.REWARDS_CAMPAIGN_REMINDER_SUBSCRIBED,
+    );
+    const builder = mockCreateEventBuilder.mock.results[0]?.value as {
+      addProperties: jest.Mock;
+    };
+    expect(builder.addProperties).toHaveBeenCalledWith({
+      campaign_id: TEST_CAMPAIGN_ID,
+      campaign_starts_at: TEST_CAMPAIGN_START_DATE,
+    });
+    expect(mockTrackEvent).toHaveBeenCalledWith({ category: 'test-event' });
+    expect(mockShowToast).toHaveBeenCalledWith(
+      expect.objectContaining({
+        variant: 'success',
+        title: 'We will notify you.',
+      }),
+    );
+    expect(result.current.showRemindMeCta).toBe(false);
+  });
+
+  it('shows error toast and does not track when reminder storage fails', async () => {
+    mockSetItem.mockRejectedValueOnce(new Error('disk full'));
+    const { result } = renderHook(() =>
+      useCampaignReminderActions(createCampaign(), true),
+    );
+
+    await waitFor(() => {
+      expect(result.current.showRemindMeCta).toBe(true);
+    });
+
+    await act(async () => {
+      await result.current.handleRemindMePress();
+    });
+
+    expect(mockTrackEvent).not.toHaveBeenCalled();
+    expect(mockShowToast).toHaveBeenCalledWith(
+      expect.objectContaining({
+        variant: 'error',
+        title: 'Save failed.',
+      }),
+    );
+    expect(result.current.showRemindMeCta).toBe(true);
+  });
+
+  it('prompts for notifications and defers subscription until notifications are enabled', async () => {
+    let notificationsEnabled = false;
+    mockSelectors({ notificationsEnabled });
+    const campaign = createCampaign();
+    const { result, rerender } = renderHook(() =>
+      useCampaignReminderActions(campaign, true),
+    );
+
+    await waitFor(() => {
+      expect(result.current.showRemindMeCta).toBe(true);
+    });
+
+    await act(async () => {
+      await result.current.handleRemindMePress();
+    });
+
+    expect(mockEnableNotificationsNudge).toHaveBeenCalledWith(
+      expect.objectContaining({
+        label: 'Turn on',
+        onPress: expect.any(Function),
+      }),
+    );
+    expect(mockSetItem).not.toHaveBeenCalled();
+    expect(mockTrackEvent).not.toHaveBeenCalled();
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+    expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
+
+    notificationsEnabled = true;
+    mockSelectors({ notificationsEnabled });
+    rerender();
+
+    await waitFor(() => {
+      expect(mockSetItem).toHaveBeenCalledWith(
+        reminderStorageKeyForComposite(
+          `${TEST_REWARDS_SUBSCRIPTION_ID}:${TEST_CAMPAIGN_ID}`,
+        ),
+        '1',
+      );
+    });
+    expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe('campaign reminder storage helpers', () => {
+  describe('buildCampaignReminderCompositeKey', () => {
+    it('joins subscription and campaign with colon', () => {
+      expect(buildCampaignReminderCompositeKey('sub-1', 'camp-2')).toBe(
+        'sub-1:camp-2',
+      );
+    });
+  });
+
+  describe('reminderStorageKeyForComposite', () => {
+    it('prefixes composite key for isolated MMKV rows', () => {
+      expect(reminderStorageKeyForComposite('sub-1:camp-2')).toBe(
+        'rewards_campaign_reminder_subscribed::sub-1:camp-2',
+      );
+    });
+  });
+});
diff --git a/app/components/UI/Rewards/hooks/useCampaignReminderActions.ts b/app/components/UI/Rewards/hooks/useCampaignReminderActions.ts
new file mode 100644
index 00000000000..884964159ac
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useCampaignReminderActions.ts
@@ -0,0 +1,135 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import type { CampaignDto } from '../../../../core/Engine/controllers/rewards-controller/types';
+import { strings } from '../../../../../locales/i18n';
+import useRewardsToast from './useRewardsToast';
+import { useRewardsNotificationsNudge } from './useRewardsNotificationsNudge';
+import StorageWrapper from '../../../../store/storage-wrapper';
+
+const REMINDER_SUBSCRIBED_VALUE = '1';
+
+export function buildCampaignReminderCompositeKey(
+  subscriptionId: string,
+  campaignId: string,
+): string {
+  return `${subscriptionId}:${campaignId}`;
+}
+
+/**
+ * One MMKV key per subscription:campaign reminder (no shared JSON list).
+ */
+export function reminderStorageKeyForComposite(compositeKey: string): string {
+  return `rewards_campaign_reminder_subscribed::${compositeKey}`;
+}
+
+/**
+ * Shared storage, analytics, and toasts for campaign start reminders
+ * (tile icon CTA and preview "Notify me" CTA).
+ */
+export function useCampaignReminderActions(
+  campaign: CampaignDto,
+  enabled: boolean,
+): {
+  showRemindMeCta: boolean;
+  handleRemindMePress: () => Promise<void>;
+} {
+  const subscriptionId = useSelector(selectRewardsSubscriptionId);
+  const isStoredRef = useRef(false);
+  const [hydrated, setHydrated] = useState(false);
+  const [renderKey, setRenderKey] = useState(0);
+  const { trackEvent, createEventBuilder } = useAnalytics();
+  const { showToast, RewardsToastOptions } = useRewardsToast();
+  const {
+    canPromptToEnableNotifications,
+    areNotificationsEnabled,
+    runAfterNotificationsEnabled,
+  } = useRewardsNotificationsNudge({ enabled });
+
+  const compositeKey = useMemo(() => {
+    if (!subscriptionId || !campaign.id) {
+      return null;
+    }
+    return buildCampaignReminderCompositeKey(subscriptionId, campaign.id);
+  }, [subscriptionId, campaign.id]);
+
+  useEffect(() => {
+    if (!enabled) {
+      setHydrated(true);
+      return;
+    }
+    if (!compositeKey) {
+      setHydrated(true);
+      return;
+    }
+    const storageKey = reminderStorageKeyForComposite(compositeKey);
+    const raw = StorageWrapper.getItemSync(storageKey);
+    isStoredRef.current = raw === REMINDER_SUBSCRIBED_VALUE;
+    setHydrated(true);
+    setRenderKey((k) => k + 1);
+  }, [enabled, compositeKey]);
+
+  const showRemindMeCta = Boolean(
+    renderKey >= 0 &&
+      enabled &&
+      canPromptToEnableNotifications &&
+      hydrated &&
+      compositeKey &&
+      (!areNotificationsEnabled || !isStoredRef.current),
+  );
+
+  const persistReminderSubscription = useCallback(async () => {
+    if (!compositeKey) {
+      throw new Error('Missing subscription or campaign for reminder storage');
+    }
+    if (isStoredRef.current) {
+      return;
+    }
+    const storageKey = reminderStorageKeyForComposite(compositeKey);
+    await StorageWrapper.setItem(storageKey, REMINDER_SUBSCRIBED_VALUE);
+    isStoredRef.current = true;
+    setRenderKey((k) => k + 1);
+  }, [compositeKey]);
+
+  const subscribeToReminder = useCallback(async () => {
+    try {
+      await persistReminderSubscription();
+    } catch {
+      showToast(
+        RewardsToastOptions.error(
+          strings('rewards.campaign.remind_me_save_error'),
+        ),
+      );
+      return;
+    }
+    trackEvent(
+      createEventBuilder(MetaMetricsEvents.REWARDS_CAMPAIGN_REMINDER_SUBSCRIBED)
+        .addProperties({
+          campaign_id: campaign.id,
+          campaign_starts_at: campaign.startDate,
+        })
+        .build(),
+    );
+    showToast(
+      RewardsToastOptions.success(
+        strings('rewards.campaign.remind_me_success_toast'),
+      ),
+    );
+  }, [
+    campaign.id,
+    campaign.startDate,
+    persistReminderSubscription,
+    trackEvent,
+    createEventBuilder,
+    showToast,
+    RewardsToastOptions,
+  ]);
+
+  const handleRemindMePress = useCallback(async () => {
+    await runAfterNotificationsEnabled(subscribeToReminder);
+  }, [runAfterNotificationsEnabled, subscribeToReminder]);
+
+  return { showRemindMeCta, handleRemindMePress };
+}
diff --git a/app/components/UI/Rewards/hooks/useGetOndoCampaignActivity.test.ts b/app/components/UI/Rewards/hooks/useGetOndoCampaignActivity.test.ts
index c0bed6ad4a6..f424932ae16 100644
--- a/app/components/UI/Rewards/hooks/useGetOndoCampaignActivity.test.ts
+++ b/app/components/UI/Rewards/hooks/useGetOndoCampaignActivity.test.ts
@@ -3,11 +3,11 @@ import { waitFor } from '@testing-library/react-native';
 import { useSelector, useDispatch } from 'react-redux';
 import { useGetOndoCampaignActivity } from './useGetOndoCampaignActivity';
 import Engine from '../../../../core/Engine';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
 import {
-  selectRewardsSubscriptionId,
   selectCampaignParticipantOptedIn,
-} from '../../../../selectors/rewards';
-import { selectOndoCampaignActivityById } from '../../../../reducers/rewards/selectors';
+  selectOndoCampaignActivityById,
+} from '../../../../reducers/rewards/selectors';
 import { setOndoCampaignActivity } from '../../../../reducers/rewards';
 import type { OndoGmActivityEntryDto } from '../../../../core/Engine/controllers/rewards-controller/types';
 
@@ -22,10 +22,10 @@ jest.mock('../../../../core/Engine', () => ({
 
 jest.mock('../../../../selectors/rewards', () => ({
   selectRewardsSubscriptionId: jest.fn(),
-  selectCampaignParticipantOptedIn: jest.fn(),
 }));
 
 jest.mock('../../../../reducers/rewards/selectors', () => ({
+  selectCampaignParticipantOptedIn: jest.fn(),
   selectOndoCampaignActivityById: jest.fn(),
 }));
 
diff --git a/app/components/UI/Rewards/hooks/useGetOndoCampaignActivity.ts b/app/components/UI/Rewards/hooks/useGetOndoCampaignActivity.ts
index 3c28894340a..92faacd5610 100644
--- a/app/components/UI/Rewards/hooks/useGetOndoCampaignActivity.ts
+++ b/app/components/UI/Rewards/hooks/useGetOndoCampaignActivity.ts
@@ -1,11 +1,11 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import Engine from '../../../../core/Engine';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
 import {
-  selectRewardsSubscriptionId,
   selectCampaignParticipantOptedIn,
-} from '../../../../selectors/rewards';
-import { selectOndoCampaignActivityById } from '../../../../reducers/rewards/selectors';
+  selectOndoCampaignActivityById,
+} from '../../../../reducers/rewards/selectors';
 import { setOndoCampaignActivity } from '../../../../reducers/rewards';
 import type { OndoGmActivityEntryDto } from '../../../../core/Engine/controllers/rewards-controller/types';
 
diff --git a/app/components/UI/Rewards/hooks/useGetOndoLeaderboardPosition.test.ts b/app/components/UI/Rewards/hooks/useGetOndoLeaderboardPosition.test.ts
index f3170271b60..2910af46256 100644
--- a/app/components/UI/Rewards/hooks/useGetOndoLeaderboardPosition.test.ts
+++ b/app/components/UI/Rewards/hooks/useGetOndoLeaderboardPosition.test.ts
@@ -2,11 +2,11 @@ import { renderHook, act } from '@testing-library/react-hooks';
 import { useSelector, useDispatch } from 'react-redux';
 import { useGetOndoLeaderboardPosition } from './useGetOndoLeaderboardPosition';
 import Engine from '../../../../core/Engine';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
 import {
-  selectRewardsSubscriptionId,
   selectCampaignParticipantOptedIn,
-} from '../../../../selectors/rewards';
-import { selectOndoCampaignLeaderboardPositionById } from '../../../../reducers/rewards/selectors';
+  selectOndoCampaignLeaderboardPositionById,
+} from '../../../../reducers/rewards/selectors';
 import { setOndoCampaignLeaderboardPosition } from '../../../../reducers/rewards';
 import { useInvalidateByRewardEvents } from './useInvalidateByRewardEvents';
 import type { CampaignLeaderboardPositionDto } from '../../../../core/Engine/controllers/rewards-controller/types';
@@ -26,10 +26,10 @@ jest.mock('./useInvalidateByRewardEvents', () => ({
 
 jest.mock('../../../../selectors/rewards', () => ({
   selectRewardsSubscriptionId: jest.fn(),
-  selectCampaignParticipantOptedIn: jest.fn(),
 }));
 
 jest.mock('../../../../reducers/rewards/selectors', () => ({
+  selectCampaignParticipantOptedIn: jest.fn(),
   selectOndoCampaignLeaderboardPositionById: jest.fn(),
 }));
 
@@ -83,16 +83,18 @@ interface SelectorState {
 function setupSelectors(state: SelectorState) {
   const isOptedIn = state.isOptedIn ?? true;
   const mockPositionSelector = jest.fn().mockReturnValue(state.position);
-  const mockOptedInSelector = jest.fn().mockReturnValue(isOptedIn);
+  const mockParticipantOptedInSelector = jest.fn().mockReturnValue(isOptedIn);
   mockSelectCampaignLeaderboardPositionById.mockReturnValue(
     mockPositionSelector,
   );
-  mockSelectCampaignParticipantOptedIn.mockReturnValue(mockOptedInSelector);
+  mockSelectCampaignParticipantOptedIn.mockReturnValue(
+    mockParticipantOptedInSelector,
+  );
 
   mockUseSelector.mockImplementation((selector) => {
     if (selector === selectRewardsSubscriptionId) return state.subscriptionId;
     if (selector === mockPositionSelector) return state.position;
-    if (selector === mockOptedInSelector) return isOptedIn;
+    if (selector === mockParticipantOptedInSelector) return isOptedIn;
     return undefined;
   });
 }
diff --git a/app/components/UI/Rewards/hooks/useGetOndoLeaderboardPosition.ts b/app/components/UI/Rewards/hooks/useGetOndoLeaderboardPosition.ts
index be4f0b96cc3..9b0bccab4f3 100644
--- a/app/components/UI/Rewards/hooks/useGetOndoLeaderboardPosition.ts
+++ b/app/components/UI/Rewards/hooks/useGetOndoLeaderboardPosition.ts
@@ -1,11 +1,11 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import Engine from '../../../../core/Engine';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
 import {
-  selectRewardsSubscriptionId,
   selectCampaignParticipantOptedIn,
-} from '../../../../selectors/rewards';
-import { selectOndoCampaignLeaderboardPositionById } from '../../../../reducers/rewards/selectors';
+  selectOndoCampaignLeaderboardPositionById,
+} from '../../../../reducers/rewards/selectors';
 import { setOndoCampaignLeaderboardPosition } from '../../../../reducers/rewards';
 import type { CampaignLeaderboardPositionDto } from '../../../../core/Engine/controllers/rewards-controller/types';
 import { useInvalidateByRewardEvents } from './useInvalidateByRewardEvents';
diff --git a/app/components/UI/Rewards/hooks/useGetOndoPortfolioPosition.test.ts b/app/components/UI/Rewards/hooks/useGetOndoPortfolioPosition.test.ts
index 80300f1f62c..332ad4b7415 100644
--- a/app/components/UI/Rewards/hooks/useGetOndoPortfolioPosition.test.ts
+++ b/app/components/UI/Rewards/hooks/useGetOndoPortfolioPosition.test.ts
@@ -3,11 +3,11 @@ import { waitFor } from '@testing-library/react-native';
 import { useSelector, useDispatch } from 'react-redux';
 import { useGetOndoPortfolioPosition } from './useGetOndoPortfolioPosition';
 import Engine from '../../../../core/Engine';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
 import {
-  selectRewardsSubscriptionId,
   selectCampaignParticipantOptedIn,
-} from '../../../../selectors/rewards';
-import { selectOndoCampaignPortfolioById } from '../../../../reducers/rewards/selectors';
+  selectOndoCampaignPortfolioById,
+} from '../../../../reducers/rewards/selectors';
 import { setOndoCampaignPortfolioPosition } from '../../../../reducers/rewards';
 import { useInvalidateByRewardEvents } from './useInvalidateByRewardEvents';
 import type { OndoGmPortfolioDto } from '../../../../core/Engine/controllers/rewards-controller/types';
@@ -27,10 +27,10 @@ jest.mock('./useInvalidateByRewardEvents', () => ({
 
 jest.mock('../../../../selectors/rewards', () => ({
   selectRewardsSubscriptionId: jest.fn(),
-  selectCampaignParticipantOptedIn: jest.fn(),
 }));
 
 jest.mock('../../../../reducers/rewards/selectors', () => ({
+  selectCampaignParticipantOptedIn: jest.fn(),
   selectOndoCampaignPortfolioById: jest.fn(),
 }));
 
diff --git a/app/components/UI/Rewards/hooks/useGetOndoPortfolioPosition.ts b/app/components/UI/Rewards/hooks/useGetOndoPortfolioPosition.ts
index 2270b597a59..e0f960916cc 100644
--- a/app/components/UI/Rewards/hooks/useGetOndoPortfolioPosition.ts
+++ b/app/components/UI/Rewards/hooks/useGetOndoPortfolioPosition.ts
@@ -1,11 +1,11 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import Engine from '../../../../core/Engine';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
 import {
-  selectRewardsSubscriptionId,
   selectCampaignParticipantOptedIn,
-} from '../../../../selectors/rewards';
-import { selectOndoCampaignPortfolioById } from '../../../../reducers/rewards/selectors';
+  selectOndoCampaignPortfolioById,
+} from '../../../../reducers/rewards/selectors';
 import { setOndoCampaignPortfolioPosition } from '../../../../reducers/rewards';
 import type { OndoGmPortfolioDto } from '../../../../core/Engine/controllers/rewards-controller/types';
 import { useInvalidateByRewardEvents } from './useInvalidateByRewardEvents';
diff --git a/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboard.test.ts b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboard.test.ts
new file mode 100644
index 00000000000..007822dca57
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboard.test.ts
@@ -0,0 +1,244 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import { useSelector, useDispatch } from 'react-redux';
+import { useGetPerpsTradingCampaignLeaderboard } from './useGetPerpsTradingCampaignLeaderboard';
+import Engine from '../../../../core/Engine';
+import {
+  selectPerpsTradingCampaignLeaderboard,
+  selectPerpsTradingCampaignLeaderboardLoading,
+  selectPerpsTradingCampaignLeaderboardError,
+} from '../../../../reducers/rewards/selectors';
+import {
+  setPerpsTradingCampaignLeaderboard,
+  setPerpsTradingCampaignLeaderboardLoading,
+  setPerpsTradingCampaignLeaderboardError,
+} from '../../../../reducers/rewards';
+import type { PerpsTradingCampaignLeaderboardDto } from '../../../../core/Engine/controllers/rewards-controller/types';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+  useDispatch: jest.fn(),
+}));
+
+jest.mock('../../../../core/Engine', () => ({
+  controllerMessenger: { call: jest.fn() },
+}));
+
+jest.mock('../../../../reducers/rewards/selectors', () => ({
+  selectPerpsTradingCampaignLeaderboard: jest.fn(),
+  selectPerpsTradingCampaignLeaderboardLoading: jest.fn(),
+  selectPerpsTradingCampaignLeaderboardError: jest.fn(),
+}));
+
+jest.mock('../../../../reducers/rewards', () => ({
+  setPerpsTradingCampaignLeaderboard: jest.fn((payload) => ({
+    type: 'rewards/setPerpsTradingCampaignLeaderboard',
+    payload,
+  })),
+  setPerpsTradingCampaignLeaderboardLoading: jest.fn((payload) => ({
+    type: 'rewards/setPerpsTradingCampaignLeaderboardLoading',
+    payload,
+  })),
+  setPerpsTradingCampaignLeaderboardError: jest.fn((payload) => ({
+    type: 'rewards/setPerpsTradingCampaignLeaderboardError',
+    payload,
+  })),
+}));
+
+const mockCall = Engine.controllerMessenger.call as jest.MockedFunction<
+  typeof Engine.controllerMessenger.call
+>;
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockUseDispatch = useDispatch as jest.MockedFunction<typeof useDispatch>;
+
+const CAMPAIGN_ID = 'campaign-123';
+const MOCK_LEADERBOARD: PerpsTradingCampaignLeaderboardDto = {
+  campaignId: CAMPAIGN_ID,
+  computedAt: '2024-03-20T12:00:00.000Z',
+  entries: [
+    { rank: 1, referralCode: 'ABC123', pnl: 1500, qualified: true },
+    { rank: 2, referralCode: 'DEF456', pnl: 800, qualified: true },
+  ],
+  totalParticipants: 50,
+};
+
+interface SelectorState {
+  leaderboard: PerpsTradingCampaignLeaderboardDto | null;
+  isLoading: boolean;
+  hasError: boolean;
+}
+
+function setupSelectors(state: SelectorState) {
+  mockUseSelector.mockImplementation((selector) => {
+    if (selector === selectPerpsTradingCampaignLeaderboard)
+      return state.leaderboard;
+    if (selector === selectPerpsTradingCampaignLeaderboardLoading)
+      return state.isLoading;
+    if (selector === selectPerpsTradingCampaignLeaderboardError)
+      return state.hasError;
+    return undefined;
+  });
+}
+
+describe('useGetPerpsTradingCampaignLeaderboard', () => {
+  const mockDispatch = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseDispatch.mockReturnValue(mockDispatch);
+    setupSelectors({ leaderboard: null, isLoading: false, hasError: false });
+  });
+
+  it('does not fetch when campaignId is undefined but resets loading and error', async () => {
+    renderHook(() => useGetPerpsTradingCampaignLeaderboard(undefined));
+
+    expect(mockCall).not.toHaveBeenCalled();
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignLeaderboardLoading(false),
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignLeaderboardError(false),
+    );
+  });
+
+  it('fetches leaderboard and dispatches actions on success', async () => {
+    mockCall.mockResolvedValueOnce(MOCK_LEADERBOARD as never);
+
+    renderHook(() => useGetPerpsTradingCampaignLeaderboard(CAMPAIGN_ID));
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignLeaderboardLoading(true),
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignLeaderboardError(false),
+    );
+    expect(mockCall).toHaveBeenCalledWith(
+      'RewardsController:getPerpsTradingCampaignLeaderboard',
+      CAMPAIGN_ID,
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignLeaderboard(MOCK_LEADERBOARD),
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignLeaderboardLoading(false),
+    );
+  });
+
+  it('dispatches error action on non-404 fetch failure', async () => {
+    mockCall.mockRejectedValueOnce(new Error('Network error') as never);
+
+    renderHook(() => useGetPerpsTradingCampaignLeaderboard(CAMPAIGN_ID));
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignLeaderboardError(true),
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignLeaderboardLoading(false),
+    );
+  });
+
+  it('returns isLeaderboardNotYetComputed true on 404 error', async () => {
+    mockCall.mockRejectedValueOnce(
+      new Error('leaderboard failed: 404') as never,
+    );
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboard(CAMPAIGN_ID),
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(result.current.isLeaderboardNotYetComputed).toBe(true);
+    expect(mockDispatch).not.toHaveBeenCalledWith(
+      setPerpsTradingCampaignLeaderboardError(true),
+    );
+  });
+
+  it('returns leaderboard data from selector', () => {
+    setupSelectors({
+      leaderboard: MOCK_LEADERBOARD,
+      isLoading: false,
+      hasError: false,
+    });
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboard(CAMPAIGN_ID),
+    );
+
+    expect(result.current.leaderboard).toEqual(MOCK_LEADERBOARD);
+  });
+
+  it('returns loading state from selector', () => {
+    setupSelectors({ leaderboard: null, isLoading: true, hasError: false });
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboard(CAMPAIGN_ID),
+    );
+
+    expect(result.current.isLoading).toBe(true);
+  });
+
+  it('returns error state from selector', () => {
+    setupSelectors({ leaderboard: null, isLoading: false, hasError: true });
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboard(CAMPAIGN_ID),
+    );
+
+    expect(result.current.hasError).toBe(true);
+  });
+
+  it('refetch function re-fetches the leaderboard', async () => {
+    mockCall.mockResolvedValue(MOCK_LEADERBOARD as never);
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboard(CAMPAIGN_ID),
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    mockDispatch.mockClear();
+
+    await act(async () => {
+      await result.current.refetch();
+    });
+
+    expect(mockCall).toHaveBeenCalledTimes(2);
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignLeaderboardLoading(true),
+    );
+  });
+
+  it('returns isLeaderboardNotYetComputed false initially', () => {
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboard(undefined),
+    );
+
+    expect(result.current.isLeaderboardNotYetComputed).toBe(false);
+  });
+
+  it('returns isLeaderboardNotYetComputed false on non-404 error', async () => {
+    mockCall.mockRejectedValueOnce(new Error('Server error') as never);
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboard(CAMPAIGN_ID),
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(result.current.isLeaderboardNotYetComputed).toBe(false);
+  });
+});
diff --git a/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboard.ts b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboard.ts
new file mode 100644
index 00000000000..6e7e7e8b953
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboard.ts
@@ -0,0 +1,76 @@
+import { useCallback, useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import Engine from '../../../../core/Engine';
+import {
+  selectPerpsTradingCampaignLeaderboard,
+  selectPerpsTradingCampaignLeaderboardLoading,
+  selectPerpsTradingCampaignLeaderboardError,
+} from '../../../../reducers/rewards/selectors';
+import {
+  setPerpsTradingCampaignLeaderboard,
+  setPerpsTradingCampaignLeaderboardLoading,
+  setPerpsTradingCampaignLeaderboardError,
+} from '../../../../reducers/rewards';
+import type { PerpsTradingCampaignLeaderboardDto } from '../../../../core/Engine/controllers/rewards-controller/types';
+
+export interface UseGetPerpsTradingCampaignLeaderboardResult {
+  leaderboard: PerpsTradingCampaignLeaderboardDto | null;
+  isLoading: boolean;
+  hasError: boolean;
+  isLeaderboardNotYetComputed: boolean;
+  refetch: () => Promise<void>;
+}
+
+export const useGetPerpsTradingCampaignLeaderboard = (
+  campaignId: string | undefined,
+): UseGetPerpsTradingCampaignLeaderboardResult => {
+  const dispatch = useDispatch();
+  const leaderboard = useSelector(selectPerpsTradingCampaignLeaderboard);
+  const isLoading = useSelector(selectPerpsTradingCampaignLeaderboardLoading);
+  const hasError = useSelector(selectPerpsTradingCampaignLeaderboardError);
+  const [isLeaderboardNotYetComputed, setIsLeaderboardNotYetComputed] =
+    useState(false);
+
+  const fetchLeaderboard = useCallback(async (): Promise<void> => {
+    if (!campaignId) {
+      dispatch(setPerpsTradingCampaignLeaderboardLoading(false));
+      dispatch(setPerpsTradingCampaignLeaderboardError(false));
+      setIsLeaderboardNotYetComputed(false);
+      return;
+    }
+
+    try {
+      dispatch(setPerpsTradingCampaignLeaderboardLoading(true));
+      dispatch(setPerpsTradingCampaignLeaderboardError(false));
+      setIsLeaderboardNotYetComputed(false);
+      const result = await Engine.controllerMessenger.call(
+        'RewardsController:getPerpsTradingCampaignLeaderboard',
+        campaignId,
+      );
+      dispatch(setPerpsTradingCampaignLeaderboard(result));
+    } catch (error) {
+      const is404 = error instanceof Error && error.message.includes('404');
+      if (is404) {
+        setIsLeaderboardNotYetComputed(true);
+      } else {
+        dispatch(setPerpsTradingCampaignLeaderboardError(true));
+      }
+    } finally {
+      dispatch(setPerpsTradingCampaignLeaderboardLoading(false));
+    }
+  }, [dispatch, campaignId]);
+
+  useEffect(() => {
+    fetchLeaderboard();
+  }, [fetchLeaderboard]);
+
+  return {
+    leaderboard,
+    isLoading,
+    hasError,
+    isLeaderboardNotYetComputed,
+    refetch: fetchLeaderboard,
+  };
+};
+
+export default useGetPerpsTradingCampaignLeaderboard;
diff --git a/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboardPosition.test.ts b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboardPosition.test.ts
new file mode 100644
index 00000000000..d85a3b027cf
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboardPosition.test.ts
@@ -0,0 +1,262 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import { useSelector, useDispatch } from 'react-redux';
+import { useGetPerpsTradingCampaignLeaderboardPosition } from './useGetPerpsTradingCampaignLeaderboardPosition';
+import Engine from '../../../../core/Engine';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import {
+  selectCampaignParticipantOptedIn,
+  selectPerpsTradingCampaignLeaderboardPositionById,
+} from '../../../../reducers/rewards/selectors';
+import { setPerpsTradingCampaignLeaderboardPosition } from '../../../../reducers/rewards';
+import { useInvalidateByRewardEvents } from './useInvalidateByRewardEvents';
+import type { PerpsTradingCampaignLeaderboardPositionDto } from '../../../../core/Engine/controllers/rewards-controller/types';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+  useDispatch: jest.fn(),
+}));
+
+jest.mock('../../../../core/Engine', () => ({
+  controllerMessenger: { call: jest.fn() },
+}));
+
+jest.mock('./useInvalidateByRewardEvents', () => ({
+  useInvalidateByRewardEvents: jest.fn(),
+}));
+
+jest.mock('../../../../selectors/rewards', () => ({
+  selectRewardsSubscriptionId: jest.fn(),
+}));
+
+jest.mock('../../../../reducers/rewards/selectors', () => ({
+  selectCampaignParticipantOptedIn: jest.fn(),
+  selectPerpsTradingCampaignLeaderboardPositionById: jest.fn(),
+}));
+
+jest.mock('../../../../reducers/rewards', () => ({
+  setPerpsTradingCampaignLeaderboardPosition: jest.fn((payload) => ({
+    type: 'rewards/setPerpsTradingCampaignLeaderboardPosition',
+    payload,
+  })),
+}));
+
+const mockCall = Engine.controllerMessenger.call as jest.MockedFunction<
+  typeof Engine.controllerMessenger.call
+>;
+const mockUseInvalidateByRewardEvents =
+  useInvalidateByRewardEvents as jest.MockedFunction<
+    typeof useInvalidateByRewardEvents
+  >;
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockUseDispatch = useDispatch as jest.MockedFunction<typeof useDispatch>;
+const mockSelectPositionById =
+  selectPerpsTradingCampaignLeaderboardPositionById as jest.MockedFunction<
+    typeof selectPerpsTradingCampaignLeaderboardPositionById
+  >;
+const mockSelectCampaignParticipantOptedIn =
+  selectCampaignParticipantOptedIn as jest.MockedFunction<
+    typeof selectCampaignParticipantOptedIn
+  >;
+
+const CAMPAIGN_ID = 'campaign-123';
+const SUBSCRIPTION_ID = 'sub-456';
+const MOCK_POSITION: PerpsTradingCampaignLeaderboardPositionDto = {
+  rank: 5,
+  pnl: 1500,
+  notionalVolume: 30000,
+  marginDeployed: 2000,
+  qualified: true,
+  neighbors: [],
+  computedAt: '2024-03-20T12:00:00.000Z',
+};
+
+interface SelectorState {
+  subscriptionId: string | null;
+  position: PerpsTradingCampaignLeaderboardPositionDto | null;
+  isOptedIn?: boolean;
+}
+
+function setupSelectors(state: SelectorState) {
+  const isOptedIn = state.isOptedIn ?? true;
+  const mockPositionSelector = jest.fn().mockReturnValue(state.position);
+  const mockParticipantOptedInSelector = jest.fn().mockReturnValue(isOptedIn);
+  mockSelectPositionById.mockReturnValue(mockPositionSelector);
+  mockSelectCampaignParticipantOptedIn.mockReturnValue(
+    mockParticipantOptedInSelector,
+  );
+
+  mockUseSelector.mockImplementation((selector) => {
+    if (selector === selectRewardsSubscriptionId) return state.subscriptionId;
+    if (selector === mockPositionSelector) return state.position;
+    if (selector === mockParticipantOptedInSelector) return isOptedIn;
+    return undefined;
+  });
+}
+
+describe('useGetPerpsTradingCampaignLeaderboardPosition', () => {
+  const mockDispatch = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseDispatch.mockReturnValue(mockDispatch);
+    setupSelectors({ subscriptionId: SUBSCRIPTION_ID, position: null });
+  });
+
+  it('does not fetch when subscriptionId is missing', async () => {
+    setupSelectors({ subscriptionId: null, position: null });
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboardPosition(CAMPAIGN_ID),
+    );
+
+    expect(mockCall).not.toHaveBeenCalled();
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.hasError).toBe(false);
+  });
+
+  it('does not fetch when not opted in', async () => {
+    setupSelectors({
+      subscriptionId: SUBSCRIPTION_ID,
+      position: null,
+      isOptedIn: false,
+    });
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboardPosition(CAMPAIGN_ID),
+    );
+
+    expect(mockCall).not.toHaveBeenCalled();
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.hasError).toBe(false);
+  });
+
+  it('does not fetch when campaignId is undefined', async () => {
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboardPosition(undefined),
+    );
+
+    expect(mockCall).not.toHaveBeenCalled();
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.hasError).toBe(false);
+  });
+
+  it('fetches position and dispatches actions on success', async () => {
+    mockCall.mockResolvedValueOnce(MOCK_POSITION as never);
+
+    renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboardPosition(CAMPAIGN_ID),
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(mockCall).toHaveBeenCalledWith(
+      'RewardsController:getPerpsTradingCampaignLeaderboardPosition',
+      CAMPAIGN_ID,
+      SUBSCRIPTION_ID,
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignLeaderboardPosition({
+        subscriptionId: SUBSCRIPTION_ID,
+        campaignId: CAMPAIGN_ID,
+        position: MOCK_POSITION,
+      }),
+    );
+  });
+
+  it('sets hasError on fetch failure', async () => {
+    mockCall.mockRejectedValueOnce(new Error('Network error') as never);
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboardPosition(CAMPAIGN_ID),
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(result.current.hasError).toBe(true);
+  });
+
+  it('returns position data from selector', () => {
+    setupSelectors({
+      subscriptionId: SUBSCRIPTION_ID,
+      position: MOCK_POSITION,
+    });
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboardPosition(CAMPAIGN_ID),
+    );
+
+    expect(result.current.position).toEqual(MOCK_POSITION);
+  });
+
+  it('returns null position when not loaded', () => {
+    setupSelectors({ subscriptionId: SUBSCRIPTION_ID, position: null });
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboardPosition(CAMPAIGN_ID),
+    );
+
+    expect(result.current.position).toBeNull();
+  });
+
+  it('refetch function re-fetches the position', async () => {
+    mockCall.mockResolvedValue(MOCK_POSITION as never);
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboardPosition(CAMPAIGN_ID),
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    mockDispatch.mockClear();
+
+    await act(async () => {
+      await result.current.refetch();
+    });
+
+    expect(mockCall).toHaveBeenCalledTimes(2);
+  });
+
+  it('calls selectPerpsTradingCampaignLeaderboardPositionById with subscriptionId and campaignId', () => {
+    renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboardPosition(CAMPAIGN_ID),
+    );
+
+    expect(mockSelectPositionById).toHaveBeenCalledWith(
+      SUBSCRIPTION_ID,
+      CAMPAIGN_ID,
+    );
+  });
+
+  it('subscribes to leaderboardPositionInvalidated to auto-refetch', () => {
+    renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboardPosition(CAMPAIGN_ID),
+    );
+
+    expect(mockUseInvalidateByRewardEvents).toHaveBeenCalledWith(
+      expect.arrayContaining([
+        'RewardsController:leaderboardPositionInvalidated',
+      ]),
+      expect.any(Function),
+    );
+  });
+
+  it('sets hasFetched after successful fetch', async () => {
+    mockCall.mockResolvedValueOnce(MOCK_POSITION as never);
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignLeaderboardPosition(CAMPAIGN_ID),
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(result.current.hasFetched).toBe(true);
+  });
+});
diff --git a/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboardPosition.ts b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboardPosition.ts
new file mode 100644
index 00000000000..aedd1ff533a
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignLeaderboardPosition.ts
@@ -0,0 +1,83 @@
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import Engine from '../../../../core/Engine';
+import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import {
+  selectCampaignParticipantOptedIn,
+  selectPerpsTradingCampaignLeaderboardPositionById,
+} from '../../../../reducers/rewards/selectors';
+import { setPerpsTradingCampaignLeaderboardPosition } from '../../../../reducers/rewards';
+import type { PerpsTradingCampaignLeaderboardPositionDto } from '../../../../core/Engine/controllers/rewards-controller/types';
+import { useInvalidateByRewardEvents } from './useInvalidateByRewardEvents';
+
+export interface UseGetPerpsTradingCampaignLeaderboardPositionResult {
+  position: PerpsTradingCampaignLeaderboardPositionDto | null;
+  isLoading: boolean;
+  hasError: boolean;
+  hasFetched: boolean;
+  refetch: () => Promise<void>;
+}
+
+export const useGetPerpsTradingCampaignLeaderboardPosition = (
+  campaignId: string | undefined,
+): UseGetPerpsTradingCampaignLeaderboardPositionResult => {
+  const dispatch = useDispatch();
+  const subscriptionId = useSelector(selectRewardsSubscriptionId);
+  const isOptedIn = useSelector(
+    selectCampaignParticipantOptedIn(subscriptionId, campaignId),
+  );
+  const position = useSelector(
+    selectPerpsTradingCampaignLeaderboardPositionById(
+      subscriptionId ?? undefined,
+      campaignId,
+    ),
+  );
+  const [isLoading, setIsLoading] = useState(false);
+  const [hasError, setHasError] = useState(false);
+  const [hasFetched, setHasFetched] = useState(false);
+
+  const fetchPosition = useCallback(async (): Promise<void> => {
+    if (!subscriptionId || !campaignId || !isOptedIn) {
+      setIsLoading(false);
+      setHasError(false);
+      setHasFetched(false);
+      return;
+    }
+
+    try {
+      setIsLoading(true);
+      setHasError(false);
+      const result = await Engine.controllerMessenger.call(
+        'RewardsController:getPerpsTradingCampaignLeaderboardPosition',
+        campaignId,
+        subscriptionId,
+      );
+      dispatch(
+        setPerpsTradingCampaignLeaderboardPosition({
+          subscriptionId,
+          campaignId,
+          position: result,
+        }),
+      );
+    } catch {
+      setHasError(true);
+    } finally {
+      setIsLoading(false);
+      setHasFetched(true);
+    }
+  }, [dispatch, subscriptionId, campaignId, isOptedIn]);
+
+  useEffect(() => {
+    fetchPosition();
+  }, [fetchPosition]);
+
+  const invalidationEvents = useMemo(
+    () => ['RewardsController:leaderboardPositionInvalidated'] as const,
+    [],
+  );
+  useInvalidateByRewardEvents(invalidationEvents, fetchPosition);
+
+  return { position, isLoading, hasError, hasFetched, refetch: fetchPosition };
+};
+
+export default useGetPerpsTradingCampaignLeaderboardPosition;
diff --git a/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignVolume.test.ts b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignVolume.test.ts
new file mode 100644
index 00000000000..dacbffded39
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignVolume.test.ts
@@ -0,0 +1,196 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import { useSelector, useDispatch } from 'react-redux';
+import { useGetPerpsTradingCampaignVolume } from './useGetPerpsTradingCampaignVolume';
+import Engine from '../../../../core/Engine';
+import {
+  selectPerpsTradingCampaignVolume,
+  selectPerpsTradingCampaignVolumeLoading,
+  selectPerpsTradingCampaignVolumeError,
+} from '../../../../reducers/rewards/selectors';
+import {
+  setPerpsTradingCampaignVolume,
+  setPerpsTradingCampaignVolumeLoading,
+  setPerpsTradingCampaignVolumeError,
+} from '../../../../reducers/rewards';
+import type { PerpsTradingCampaignVolumeDto } from '../../../../core/Engine/controllers/rewards-controller/types';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+  useDispatch: jest.fn(),
+}));
+
+jest.mock('../../../../core/Engine', () => ({
+  controllerMessenger: { call: jest.fn() },
+}));
+
+jest.mock('../../../../reducers/rewards/selectors', () => ({
+  selectPerpsTradingCampaignVolume: jest.fn(),
+  selectPerpsTradingCampaignVolumeLoading: jest.fn(),
+  selectPerpsTradingCampaignVolumeError: jest.fn(),
+}));
+
+jest.mock('../../../../reducers/rewards', () => ({
+  setPerpsTradingCampaignVolume: jest.fn((payload) => ({
+    type: 'rewards/setPerpsTradingCampaignVolume',
+    payload,
+  })),
+  setPerpsTradingCampaignVolumeLoading: jest.fn((payload) => ({
+    type: 'rewards/setPerpsTradingCampaignVolumeLoading',
+    payload,
+  })),
+  setPerpsTradingCampaignVolumeError: jest.fn((payload) => ({
+    type: 'rewards/setPerpsTradingCampaignVolumeError',
+    payload,
+  })),
+}));
+
+const mockCall = Engine.controllerMessenger.call as jest.MockedFunction<
+  typeof Engine.controllerMessenger.call
+>;
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockUseDispatch = useDispatch as jest.MockedFunction<typeof useDispatch>;
+
+const CAMPAIGN_ID = 'campaign-123';
+const MOCK_VOLUME: PerpsTradingCampaignVolumeDto = {
+  totalUsdVolume: '5000000',
+};
+
+interface SelectorState {
+  volume: PerpsTradingCampaignVolumeDto | null;
+  isLoading: boolean;
+  hasError: boolean;
+}
+
+function setupSelectors(state: SelectorState) {
+  mockUseSelector.mockImplementation((selector) => {
+    if (selector === selectPerpsTradingCampaignVolume) return state.volume;
+    if (selector === selectPerpsTradingCampaignVolumeLoading)
+      return state.isLoading;
+    if (selector === selectPerpsTradingCampaignVolumeError)
+      return state.hasError;
+    return undefined;
+  });
+}
+
+describe('useGetPerpsTradingCampaignVolume', () => {
+  const mockDispatch = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseDispatch.mockReturnValue(mockDispatch);
+    setupSelectors({ volume: null, isLoading: false, hasError: false });
+  });
+
+  it('does not fetch when campaignId is undefined but resets loading and error', async () => {
+    renderHook(() => useGetPerpsTradingCampaignVolume(undefined));
+
+    expect(mockCall).not.toHaveBeenCalled();
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignVolumeLoading(false),
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignVolumeError(false),
+    );
+  });
+
+  it('fetches volume and dispatches actions on success', async () => {
+    mockCall.mockResolvedValueOnce(MOCK_VOLUME as never);
+
+    renderHook(() => useGetPerpsTradingCampaignVolume(CAMPAIGN_ID));
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignVolumeLoading(true),
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignVolumeError(false),
+    );
+    expect(mockCall).toHaveBeenCalledWith(
+      'RewardsController:getPerpsTradingCampaignVolume',
+      CAMPAIGN_ID,
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignVolume(MOCK_VOLUME),
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignVolumeLoading(false),
+    );
+  });
+
+  it('dispatches error action on fetch failure', async () => {
+    mockCall.mockRejectedValueOnce(new Error('Network error') as never);
+
+    renderHook(() => useGetPerpsTradingCampaignVolume(CAMPAIGN_ID));
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignVolumeError(true),
+    );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignVolumeLoading(false),
+    );
+  });
+
+  it('returns volume data from selector', () => {
+    setupSelectors({
+      volume: MOCK_VOLUME,
+      isLoading: false,
+      hasError: false,
+    });
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignVolume(CAMPAIGN_ID),
+    );
+
+    expect(result.current.volume).toEqual(MOCK_VOLUME);
+  });
+
+  it('returns loading state from selector', () => {
+    setupSelectors({ volume: null, isLoading: true, hasError: false });
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignVolume(CAMPAIGN_ID),
+    );
+
+    expect(result.current.isLoading).toBe(true);
+  });
+
+  it('returns error state from selector', () => {
+    setupSelectors({ volume: null, isLoading: false, hasError: true });
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignVolume(CAMPAIGN_ID),
+    );
+
+    expect(result.current.hasError).toBe(true);
+  });
+
+  it('refetch function re-fetches the volume', async () => {
+    mockCall.mockResolvedValue(MOCK_VOLUME as never);
+
+    const { result } = renderHook(() =>
+      useGetPerpsTradingCampaignVolume(CAMPAIGN_ID),
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    mockDispatch.mockClear();
+
+    await act(async () => {
+      await result.current.refetch();
+    });
+
+    expect(mockCall).toHaveBeenCalledTimes(2);
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setPerpsTradingCampaignVolumeLoading(true),
+    );
+  });
+});
diff --git a/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignVolume.ts b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignVolume.ts
new file mode 100644
index 00000000000..b5a2974dbd0
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useGetPerpsTradingCampaignVolume.ts
@@ -0,0 +1,59 @@
+import { useCallback, useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import Engine from '../../../../core/Engine';
+import {
+  selectPerpsTradingCampaignVolume,
+  selectPerpsTradingCampaignVolumeLoading,
+  selectPerpsTradingCampaignVolumeError,
+} from '../../../../reducers/rewards/selectors';
+import {
+  setPerpsTradingCampaignVolume,
+  setPerpsTradingCampaignVolumeLoading,
+  setPerpsTradingCampaignVolumeError,
+} from '../../../../reducers/rewards';
+
+export interface UseGetPerpsTradingCampaignVolumeResult {
+  volume: ReturnType<typeof selectPerpsTradingCampaignVolume>;
+  isLoading: boolean;
+  hasError: boolean;
+  refetch: () => Promise<void>;
+}
+
+export const useGetPerpsTradingCampaignVolume = (
+  campaignId: string | undefined,
+): UseGetPerpsTradingCampaignVolumeResult => {
+  const dispatch = useDispatch();
+  const volume = useSelector(selectPerpsTradingCampaignVolume);
+  const isLoading = useSelector(selectPerpsTradingCampaignVolumeLoading);
+  const hasError = useSelector(selectPerpsTradingCampaignVolumeError);
+
+  const fetchVolume = useCallback(async (): Promise<void> => {
+    if (!campaignId) {
+      dispatch(setPerpsTradingCampaignVolumeLoading(false));
+      dispatch(setPerpsTradingCampaignVolumeError(false));
+      return;
+    }
+
+    try {
+      dispatch(setPerpsTradingCampaignVolumeLoading(true));
+      dispatch(setPerpsTradingCampaignVolumeError(false));
+      const result = await Engine.controllerMessenger.call(
+        'RewardsController:getPerpsTradingCampaignVolume',
+        campaignId,
+      );
+      dispatch(setPerpsTradingCampaignVolume(result));
+    } catch {
+      dispatch(setPerpsTradingCampaignVolumeError(true));
+    } finally {
+      dispatch(setPerpsTradingCampaignVolumeLoading(false));
+    }
+  }, [dispatch, campaignId]);
+
+  useEffect(() => {
+    fetchVolume();
+  }, [fetchVolume]);
+
+  return { volume, isLoading, hasError, refetch: fetchVolume };
+};
+
+export default useGetPerpsTradingCampaignVolume;
diff --git a/app/components/UI/Rewards/hooks/useLinkAccountAddress.test.ts b/app/components/UI/Rewards/hooks/useLinkAccountAddress.test.ts
index 5efbf8058e7..b614232da40 100644
--- a/app/components/UI/Rewards/hooks/useLinkAccountAddress.test.ts
+++ b/app/components/UI/Rewards/hooks/useLinkAccountAddress.test.ts
@@ -82,6 +82,21 @@ describe('useLinkAccountAddress', () => {
       iconName: 'confirmation',
       hapticsType: 'success',
     }),
+    enableNotificationsNudge: jest.fn().mockReturnValue({
+      variant: 'plain',
+      hapticsType: 'warning',
+    }),
+    loading: jest.fn().mockReturnValue({
+      variant: 'loading',
+    }),
+    outcomeWinner: jest.fn().mockReturnValue({
+      variant: 'plain',
+      hapticsType: 'success',
+    }),
+    outcomeNonWinner: jest.fn().mockReturnValue({
+      variant: 'icon',
+      hapticsType: 'warning',
+    }),
   };
 
   const mockAccount: InternalAccount = {
diff --git a/app/components/UI/Rewards/hooks/useLinkAccountGroup.test.ts b/app/components/UI/Rewards/hooks/useLinkAccountGroup.test.ts
index e59a982d667..7c5c8603ec7 100644
--- a/app/components/UI/Rewards/hooks/useLinkAccountGroup.test.ts
+++ b/app/components/UI/Rewards/hooks/useLinkAccountGroup.test.ts
@@ -103,6 +103,21 @@ describe('useLinkAccountGroup', () => {
       iconName: 'error',
       hapticsType: 'error',
     }),
+    enableNotificationsNudge: jest.fn().mockReturnValue({
+      variant: 'plain',
+      hapticsType: 'warning',
+    }),
+    loading: jest.fn().mockReturnValue({
+      variant: 'loading',
+    }),
+    outcomeWinner: jest.fn().mockReturnValue({
+      variant: 'plain',
+      hapticsType: 'success',
+    }),
+    outcomeNonWinner: jest.fn().mockReturnValue({
+      variant: 'icon',
+      hapticsType: 'warning',
+    }),
   };
 
   // Mock account data
diff --git a/app/components/UI/Rewards/hooks/useOndoCampaignParticipantOutcome.test.ts b/app/components/UI/Rewards/hooks/useOndoCampaignParticipantOutcome.test.ts
index 5dc86d8617a..6a4189dfcfb 100644
--- a/app/components/UI/Rewards/hooks/useOndoCampaignParticipantOutcome.test.ts
+++ b/app/components/UI/Rewards/hooks/useOndoCampaignParticipantOutcome.test.ts
@@ -1,149 +1,65 @@
-import { renderHook, act } from '@testing-library/react-hooks';
-import { useSelector } from 'react-redux';
-import Engine from '../../../../core/Engine';
-import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
-import { selectCampaignParticipantStatus } from '../../../../reducers/rewards/selectors';
+import { renderHook } from '@testing-library/react-hooks';
 import { useOndoCampaignParticipantOutcome } from './useOndoCampaignParticipantOutcome';
-import type { OndoGmCampaignParticipantOutcomeDto } from '../../../../core/Engine/controllers/rewards-controller/types';
+import { useCampaignParticipantOutcome } from './useCampaignParticipantOutcome';
 
-jest.mock('react-redux', () => ({
-  useSelector: jest.fn(),
+jest.mock('./useCampaignParticipantOutcome', () => ({
+  useCampaignParticipantOutcome: jest.fn(),
 }));
 
-jest.mock('../../../../core/Engine', () => ({
-  controllerMessenger: { call: jest.fn() },
-}));
-
-jest.mock('../../../../selectors/rewards', () => ({
-  selectRewardsSubscriptionId: jest.fn(),
-}));
-
-jest.mock('../../../../reducers/rewards/selectors', () => ({
-  selectCampaignParticipantStatus: jest.fn(),
-}));
-
-const mockCall = Engine.controllerMessenger.call as jest.MockedFunction<
-  typeof Engine.controllerMessenger.call
->;
-const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
-const mockSelectCampaignParticipantStatus =
-  selectCampaignParticipantStatus as jest.MockedFunction<
-    typeof selectCampaignParticipantStatus
+const mockUseCampaignParticipantOutcome =
+  useCampaignParticipantOutcome as jest.MockedFunction<
+    typeof useCampaignParticipantOutcome
   >;
 
 const CAMPAIGN_ID = 'campaign-123';
-const SUBSCRIPTION_ID = 'sub-456';
-
-const MOCK_OUTCOME: OndoGmCampaignParticipantOutcomeDto = {
-  subscriptionId: SUBSCRIPTION_ID,
-  outcomeStatus: 'pending',
-  winnerVerificationCode: 'WINNER-XYZ',
-};
-
-function setupSelectors({
-  subscriptionId = SUBSCRIPTION_ID,
-  isOptedIn = true,
-}: {
-  subscriptionId?: string | null;
-  isOptedIn?: boolean;
-} = {}) {
-  const participantStatusSelector = jest
-    .fn()
-    .mockReturnValue(isOptedIn ? { optedIn: true } : null);
-  mockSelectCampaignParticipantStatus.mockReturnValue(
-    participantStatusSelector,
-  );
-  mockUseSelector.mockImplementation((selector) => {
-    if (selector === selectRewardsSubscriptionId) return subscriptionId;
-    if (selector === participantStatusSelector)
-      return isOptedIn ? { optedIn: true } : null;
-    return undefined;
-  });
-}
 
 describe('useOndoCampaignParticipantOutcome', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-  });
-
-  it('returns null outcome and no loading when campaignId is undefined', async () => {
-    setupSelectors();
-    const { result, waitForNextUpdate } = renderHook(() =>
-      useOndoCampaignParticipantOutcome(undefined),
-    );
-    await act(async () => {
-      await waitForNextUpdate().catch(() => undefined);
+    mockUseCampaignParticipantOutcome.mockReturnValue({
+      outcome: null,
+      isLoading: false,
+      hasError: false,
     });
-    expect(result.current.outcome).toBeNull();
-    expect(result.current.isLoading).toBe(false);
-    expect(result.current.hasError).toBe(false);
-    expect(mockCall).not.toHaveBeenCalled();
   });
 
-  it('returns null outcome when subscriptionId is missing', async () => {
-    setupSelectors({ subscriptionId: null });
-    const { result, waitForNextUpdate } = renderHook(() =>
-      useOndoCampaignParticipantOutcome(CAMPAIGN_ID),
-    );
-    await act(async () => {
-      await waitForNextUpdate().catch(() => undefined);
-    });
-    expect(result.current.outcome).toBeNull();
-    expect(result.current.isLoading).toBe(false);
-    expect(result.current.hasError).toBe(false);
-    expect(mockCall).not.toHaveBeenCalled();
-  });
+  it('delegates to useCampaignParticipantOutcome with the Ondo messenger action', () => {
+    renderHook(() => useOndoCampaignParticipantOutcome(CAMPAIGN_ID));
 
-  it('returns null outcome when user is not opted in', async () => {
-    setupSelectors({ isOptedIn: false });
-    const { result, waitForNextUpdate } = renderHook(() =>
-      useOndoCampaignParticipantOutcome(CAMPAIGN_ID),
+    expect(mockUseCampaignParticipantOutcome).toHaveBeenCalledWith(
+      CAMPAIGN_ID,
+      {
+        messengerAction: 'RewardsController:getOndoCampaignParticipantOutcome',
+      },
     );
-    await act(async () => {
-      await waitForNextUpdate().catch(() => undefined);
-    });
-    expect(result.current.outcome).toBeNull();
-    expect(result.current.isLoading).toBe(false);
-    expect(result.current.hasError).toBe(false);
-    expect(mockCall).not.toHaveBeenCalled();
   });
 
-  it('fetches outcome and returns it when all conditions are met', async () => {
-    setupSelectors();
-    mockCall.mockResolvedValue(MOCK_OUTCOME);
-
-    const { result, waitForNextUpdate } = renderHook(() =>
-      useOndoCampaignParticipantOutcome(CAMPAIGN_ID),
-    );
+  it('passes undefined campaignId through to the generic hook', () => {
+    renderHook(() => useOndoCampaignParticipantOutcome(undefined));
 
-    await act(async () => {
-      await waitForNextUpdate();
+    expect(mockUseCampaignParticipantOutcome).toHaveBeenCalledWith(undefined, {
+      messengerAction: 'RewardsController:getOndoCampaignParticipantOutcome',
     });
-
-    expect(mockCall).toHaveBeenCalledWith(
-      'RewardsController:getOndoCampaignParticipantOutcome',
-      CAMPAIGN_ID,
-      SUBSCRIPTION_ID,
-    );
-    expect(result.current.outcome).toEqual(MOCK_OUTCOME);
-    expect(result.current.isLoading).toBe(false);
-    expect(result.current.hasError).toBe(false);
   });
 
-  it('sets hasError and clears outcome when the fetch throws', async () => {
-    setupSelectors();
-    mockCall.mockRejectedValue(new Error('fetch failed'));
+  it('returns the result from the generic hook', () => {
+    const mockOutcome = {
+      subscriptionId: 'sub-1',
+      outcomeStatus: 'pending' as const,
+      winnerVerificationCode: 'CODE',
+    };
+    mockUseCampaignParticipantOutcome.mockReturnValue({
+      outcome: mockOutcome,
+      isLoading: false,
+      hasError: false,
+    });
 
-    const { result, waitForNextUpdate } = renderHook(() =>
+    const { result } = renderHook(() =>
       useOndoCampaignParticipantOutcome(CAMPAIGN_ID),
     );
 
-    await act(async () => {
-      await waitForNextUpdate();
-    });
-
-    expect(result.current.outcome).toBeNull();
+    expect(result.current.outcome).toEqual(mockOutcome);
     expect(result.current.isLoading).toBe(false);
-    expect(result.current.hasError).toBe(true);
+    expect(result.current.hasError).toBe(false);
   });
 });
diff --git a/app/components/UI/Rewards/hooks/useOndoCampaignParticipantOutcome.ts b/app/components/UI/Rewards/hooks/useOndoCampaignParticipantOutcome.ts
index eaabab7f48b..017c62bfc41 100644
--- a/app/components/UI/Rewards/hooks/useOndoCampaignParticipantOutcome.ts
+++ b/app/components/UI/Rewards/hooks/useOndoCampaignParticipantOutcome.ts
@@ -1,58 +1,19 @@
-import { useCallback, useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import Engine from '../../../../core/Engine';
-import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
-import { selectCampaignParticipantStatus } from '../../../../reducers/rewards/selectors';
 import type { OndoGmCampaignParticipantOutcomeDto } from '../../../../core/Engine/controllers/rewards-controller/types';
+import {
+  useCampaignParticipantOutcome,
+  type UseCampaignParticipantOutcomeResult,
+} from './useCampaignParticipantOutcome';
 
-export interface UseOndoCampaignParticipantOutcomeResult {
-  outcome: OndoGmCampaignParticipantOutcomeDto | null;
-  isLoading: boolean;
-  hasError: boolean;
-}
+export type UseOndoCampaignParticipantOutcomeResult =
+  UseCampaignParticipantOutcomeResult<OndoGmCampaignParticipantOutcomeDto>;
 
 export function useOndoCampaignParticipantOutcome(
   campaignId: string | undefined,
 ): UseOndoCampaignParticipantOutcomeResult {
-  const subscriptionId = useSelector(selectRewardsSubscriptionId);
-  const isOptedIn =
-    useSelector(selectCampaignParticipantStatus(subscriptionId, campaignId))
-      ?.optedIn === true;
-  const [outcome, setOutcome] =
-    useState<OndoGmCampaignParticipantOutcomeDto | null>(null);
-  const [isLoading, setIsLoading] = useState(false);
-  const [hasError, setHasError] = useState(false);
-
-  const fetchOutcome = useCallback(async (): Promise<void> => {
-    if (!subscriptionId || !campaignId || !isOptedIn) {
-      setOutcome(null);
-      setIsLoading(false);
-      setHasError(false);
-      return;
-    }
-
-    try {
-      setIsLoading(true);
-      setHasError(false);
-      const result = await Engine.controllerMessenger.call(
-        'RewardsController:getOndoCampaignParticipantOutcome',
-        campaignId,
-        subscriptionId,
-      );
-      setOutcome(result);
-    } catch {
-      setOutcome(null);
-      setHasError(true);
-    } finally {
-      setIsLoading(false);
-    }
-  }, [campaignId, subscriptionId, isOptedIn]);
-
-  useEffect(() => {
-    fetchOutcome();
-  }, [fetchOutcome]);
-
-  return { outcome, isLoading, hasError };
+  return useCampaignParticipantOutcome<OndoGmCampaignParticipantOutcomeDto>(
+    campaignId,
+    { messengerAction: 'RewardsController:getOndoCampaignParticipantOutcome' },
+  );
 }
 
 export default useOndoCampaignParticipantOutcome;
diff --git a/app/components/UI/Rewards/hooks/useOndoLeaderboardPositionDisplay.test.ts b/app/components/UI/Rewards/hooks/useOndoLeaderboardPositionDisplay.test.ts
new file mode 100644
index 00000000000..78dc8e9dac3
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useOndoLeaderboardPositionDisplay.test.ts
@@ -0,0 +1,284 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { useOndoLeaderboardPositionDisplay } from './useOndoLeaderboardPositionDisplay';
+import { getCampaignStatus } from '../components/Campaigns/CampaignTile.utils';
+import { isCampaignIneligible } from '../utils/ondoCampaignConstants';
+import type {
+  CampaignDto,
+  CampaignLeaderboardPositionDto,
+} from '../../../../core/Engine/controllers/rewards-controller/types';
+
+jest.mock('../components/Campaigns/CampaignTile.utils', () => ({
+  getCampaignStatus: jest.fn(),
+}));
+
+jest.mock('../utils/ondoCampaignConstants', () => ({
+  isCampaignIneligible: jest.fn(),
+}));
+
+jest.mock('../components/Campaigns/OndoLeaderboard.utils', () => ({
+  formatTierDisplayName: (tier: string) => `${tier}_DISPLAY`,
+}));
+
+jest.mock('../utils/formatUtils', () => ({
+  formatPercentChange: (value: string) => `+${value}%`,
+  getPortfolioReturnColor: (pnl?: string) =>
+    pnl && parseFloat(pnl) < 0 ? 'text-error-default' : 'text-default',
+}));
+
+const mockGetCampaignStatus = getCampaignStatus as jest.MockedFunction<
+  typeof getCampaignStatus
+>;
+const mockIsCampaignIneligible = isCampaignIneligible as jest.MockedFunction<
+  typeof isCampaignIneligible
+>;
+
+const buildCampaign = (overrides: Partial<CampaignDto> = {}): CampaignDto => ({
+  id: 'campaign-1',
+  type: 'ONDO_HOLDING' as never,
+  name: 'Test Campaign',
+  startDate: '2024-01-01T00:00:00Z',
+  endDate: '2099-12-31T23:59:59Z',
+  termsAndConditions: null,
+  excludedRegions: [],
+  details: {
+    howItWorks: { title: '', description: '', steps: [] },
+    tiers: [{ name: 'STARTER', minNetDeposit: 500 }],
+  },
+  featured: false,
+  showUpcomingDate: false,
+  ...overrides,
+});
+
+const buildPosition = (
+  overrides: Partial<CampaignLeaderboardPositionDto> = {},
+): CampaignLeaderboardPositionDto => ({
+  rank: 5,
+  projectedTier: 'STARTER',
+  qualified: true,
+  qualifiedDays: 10,
+  totalInTier: 100,
+  rateOfReturn: 0.1,
+  currentUsdValue: 12500,
+  totalUsdDeposited: 10000,
+  netDeposit: 8500,
+  neighbors: [],
+  computedAt: '2024-01-01T00:00:00Z',
+  ...overrides,
+});
+
+describe('useOndoLeaderboardPositionDisplay', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockGetCampaignStatus.mockReturnValue('active');
+    mockIsCampaignIneligible.mockReturnValue(false);
+  });
+
+  describe('isCampaignComplete', () => {
+    it('returns true when getCampaignStatus returns complete', () => {
+      mockGetCampaignStatus.mockReturnValue('complete');
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: buildCampaign(),
+          position: null,
+        }),
+      );
+      expect(result.current.isCampaignComplete).toBe(true);
+    });
+
+    it('returns false when getCampaignStatus returns active', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: buildCampaign(),
+          position: null,
+        }),
+      );
+      expect(result.current.isCampaignComplete).toBe(false);
+    });
+
+    it('returns false when campaign is null', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({ campaign: null, position: null }),
+      );
+      expect(result.current.isCampaignComplete).toBe(false);
+    });
+  });
+
+  describe('isPending and isQualified', () => {
+    it('isPending is true when position.qualified is false', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: null,
+          position: buildPosition({ qualified: false }),
+        }),
+      );
+      expect(result.current.isPending).toBe(true);
+      expect(result.current.isQualified).toBe(false);
+    });
+
+    it('isQualified is true when position.qualified is true', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: null,
+          position: buildPosition({ qualified: true }),
+        }),
+      );
+      expect(result.current.isPending).toBe(false);
+      expect(result.current.isQualified).toBe(true);
+    });
+
+    it('both are false when position is null', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({ campaign: null, position: null }),
+      );
+      expect(result.current.isPending).toBe(false);
+      expect(result.current.isQualified).toBe(false);
+    });
+  });
+
+  describe('isIneligible', () => {
+    it('delegates to isCampaignIneligible', () => {
+      mockIsCampaignIneligible.mockReturnValue(true);
+      const campaign = buildCampaign();
+      const position = buildPosition({ qualified: false });
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({ campaign, position }),
+      );
+      expect(result.current.isIneligible).toBe(true);
+      expect(mockIsCampaignIneligible).toHaveBeenCalledWith(
+        campaign,
+        position.qualified,
+      );
+    });
+
+    it('returns false when isCampaignIneligible returns false', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: buildCampaign(),
+          position: buildPosition(),
+        }),
+      );
+      expect(result.current.isIneligible).toBe(false);
+    });
+  });
+
+  describe('rankValue', () => {
+    it('returns dash when position is null', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({ campaign: null, position: null }),
+      );
+      expect(result.current.rankValue).toBe('-');
+    });
+
+    it('returns dash when isIneligible is true', () => {
+      mockIsCampaignIneligible.mockReturnValue(true);
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: buildCampaign(),
+          position: buildPosition({ rank: 3 }),
+        }),
+      );
+      expect(result.current.rankValue).toBe('-');
+    });
+
+    it('returns zero-padded rank when eligible with position', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: buildCampaign(),
+          position: buildPosition({ rank: 7 }),
+        }),
+      );
+      expect(result.current.rankValue).toBe('07');
+    });
+
+    it('does not pad two-digit ranks', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: buildCampaign(),
+          position: buildPosition({ rank: 42 }),
+        }),
+      );
+      expect(result.current.rankValue).toBe('42');
+    });
+  });
+
+  describe('tierValue', () => {
+    it('returns dash when position is null', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({ campaign: null, position: null }),
+      );
+      expect(result.current.tierValue).toBe('-');
+    });
+
+    it('returns dash when isIneligible is true', () => {
+      mockIsCampaignIneligible.mockReturnValue(true);
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: buildCampaign(),
+          position: buildPosition({ projectedTier: 'MID' }),
+        }),
+      );
+      expect(result.current.tierValue).toBe('-');
+    });
+
+    it('returns formatted tier display name when eligible with position', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: buildCampaign(),
+          position: buildPosition({ projectedTier: 'MID' }),
+        }),
+      );
+      expect(result.current.tierValue).toBe('MID_DISPLAY');
+    });
+  });
+
+  describe('returnValue', () => {
+    it('returns undefined when portfolioPnlPercent is undefined', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({ campaign: null, position: null }),
+      );
+      expect(result.current.returnValue).toBeUndefined();
+    });
+
+    it('returns formatted value when portfolioPnlPercent is provided', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: null,
+          position: null,
+          portfolioPnlPercent: '0.05',
+        }),
+      );
+      expect(result.current.returnValue).toBe('+0.05%');
+    });
+  });
+
+  describe('returnColor', () => {
+    it('returns TextDefault when portfolioPnlPercent is undefined', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({ campaign: null, position: null }),
+      );
+      expect(result.current.returnColor).toBe('text-default');
+    });
+
+    it('returns ErrorDefault when portfolioPnlPercent is negative', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: null,
+          position: null,
+          portfolioPnlPercent: '-0.05',
+        }),
+      );
+      expect(result.current.returnColor).toBe('text-error-default');
+    });
+
+    it('returns TextDefault when portfolioPnlPercent is positive', () => {
+      const { result } = renderHook(() =>
+        useOndoLeaderboardPositionDisplay({
+          campaign: null,
+          position: null,
+          portfolioPnlPercent: '0.10',
+        }),
+      );
+      expect(result.current.returnColor).toBe('text-default');
+    });
+  });
+});
diff --git a/app/components/UI/Rewards/hooks/useOndoLeaderboardPositionDisplay.ts b/app/components/UI/Rewards/hooks/useOndoLeaderboardPositionDisplay.ts
new file mode 100644
index 00000000000..2f793d0be41
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useOndoLeaderboardPositionDisplay.ts
@@ -0,0 +1,65 @@
+import { useMemo } from 'react';
+import { TextColor } from '@metamask/design-system-react-native';
+import type {
+  CampaignDto,
+  CampaignLeaderboardPositionDto,
+} from '../../../../core/Engine/controllers/rewards-controller/types';
+import { formatTierDisplayName } from '../components/Campaigns/OndoLeaderboard.utils';
+import {
+  formatPercentChange,
+  getPortfolioReturnColor,
+} from '../utils/formatUtils';
+import { isCampaignIneligible } from '../utils/ondoCampaignConstants';
+import { getCampaignStatus } from '../components/Campaigns/CampaignTile.utils';
+
+interface UseOndoLeaderboardPositionDisplayParams {
+  campaign: CampaignDto | null;
+  position: CampaignLeaderboardPositionDto | null;
+  portfolioPnlPercent?: string;
+}
+
+interface UseOndoLeaderboardPositionDisplayResult {
+  isCampaignComplete: boolean;
+  isPending: boolean;
+  isQualified: boolean;
+  isIneligible: boolean;
+  rankValue: string;
+  tierValue: string;
+  returnValue: string | undefined;
+  returnColor: TextColor;
+}
+
+export const useOndoLeaderboardPositionDisplay = ({
+  campaign,
+  position,
+  portfolioPnlPercent,
+}: UseOndoLeaderboardPositionDisplayParams): UseOndoLeaderboardPositionDisplayResult => {
+  const isCampaignComplete =
+    campaign != null && getCampaignStatus(campaign) === 'complete';
+  const isPending = position != null && !position.qualified;
+  const isQualified = position != null && position.qualified;
+  const isIneligible = useMemo(
+    () => isCampaignIneligible(campaign, position?.qualified),
+    [campaign, position],
+  );
+  const rankValue =
+    isIneligible || !position ? '-' : String(position.rank).padStart(2, '0');
+  const tierValue =
+    isIneligible || !position
+      ? '-'
+      : formatTierDisplayName(position.projectedTier);
+  const returnValue = portfolioPnlPercent
+    ? formatPercentChange(portfolioPnlPercent)
+    : undefined;
+  const returnColor = getPortfolioReturnColor(portfolioPnlPercent);
+  return {
+    isCampaignComplete,
+    isPending,
+    isQualified,
+    isIneligible,
+    rankValue,
+    tierValue,
+    returnValue,
+    returnColor,
+  };
+};
diff --git a/app/components/UI/Rewards/hooks/useOndoOutcomeToast.test.ts b/app/components/UI/Rewards/hooks/useOndoOutcomeToast.test.ts
index 73d74fc6fa7..217d284cb64 100644
--- a/app/components/UI/Rewards/hooks/useOndoOutcomeToast.test.ts
+++ b/app/components/UI/Rewards/hooks/useOndoOutcomeToast.test.ts
@@ -1,563 +1,98 @@
 import { renderHook } from '@testing-library/react-hooks';
-import { useContext } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { useFocusEffect, useNavigation } from '@react-navigation/native';
-import {
-  playSuccessNotification,
-  playWarningNotification,
-} from '../../../../util/haptics';
 import { useOndoOutcomeToast } from './useOndoOutcomeToast';
-import { dismissCampaignOutcomeToast } from '../../../../reducers/rewards';
-import {
-  selectCampaigns,
-  selectDismissedCampaignOutcomeToasts,
-} from '../../../../reducers/rewards/selectors';
-import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import { useCampaignOutcomeToast } from './useCampaignOutcomeToast';
 import { useOndoCampaignParticipantOutcome } from './useOndoCampaignParticipantOutcome';
 import {
   CampaignType,
-  type OndoGmCampaignParticipantOutcomeDto,
+  type CampaignDto,
 } from '../../../../core/Engine/controllers/rewards-controller/types';
 import Routes from '../../../../constants/navigation/Routes';
-import {
-  ToastVariants,
-  ButtonIconVariant,
-} from '../../../../component-library/components/Toast/Toast.types';
-import { IconName } from '../../../../component-library/components/Icons/Icon';
-
-jest.mock('react', () => ({
-  ...jest.requireActual('react'),
-  useContext: jest.fn(),
-  useCallback: jest.fn((fn) => fn),
-  useMemo: jest.fn((fn) => fn()),
-}));
-
-jest.mock('react-redux', () => ({
-  useDispatch: jest.fn(),
-  useSelector: jest.fn(),
-}));
-
-jest.mock('@react-navigation/native', () => ({
-  useFocusEffect: jest.fn(),
-  useNavigation: jest.fn(),
-}));
-
-jest.mock('../../../../util/haptics', () => ({
-  playSuccessNotification: jest.fn(),
-  playWarningNotification: jest.fn(),
-}));
-
-jest.mock('../../../../../locales/i18n', () => ({
-  strings: jest.fn((key: string, params?: Record<string, string>) => {
-    if (params?.campaignName) return `${key}:${params.campaignName}`;
-    return key;
-  }),
-}));
-
-jest.mock('../../../../util/theme', () => {
-  const actual = jest.requireActual('../../../../util/theme');
-  return {
-    ...actual,
-    useAppThemeFromContext: () => actual.mockTheme,
-  };
-});
 
-jest.mock('../../../../reducers/rewards', () => ({
-  dismissCampaignOutcomeToast: jest.fn(),
-}));
-
-jest.mock('../../../../reducers/rewards/selectors', () => ({
-  selectCampaigns: jest.fn(),
-  selectDismissedCampaignOutcomeToasts: jest.fn(),
-}));
-
-jest.mock('../../../../selectors/rewards', () => ({
-  selectRewardsSubscriptionId: jest.fn(),
+jest.mock('./useCampaignOutcomeToast', () => ({
+  useCampaignOutcomeToast: jest.fn(),
 }));
 
 jest.mock('./useOndoCampaignParticipantOutcome', () => ({
   useOndoCampaignParticipantOutcome: jest.fn(),
 }));
 
-const mockDispatch = jest.fn();
-const mockNavigate = jest.fn();
-const mockShowToast = jest.fn();
-const mockCloseToast = jest.fn();
-const mockToastRef = {
-  current: { showToast: mockShowToast, closeToast: mockCloseToast },
-};
-
-const mockUseDispatch = useDispatch as jest.MockedFunction<typeof useDispatch>;
-const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
-const mockUseFocusEffect = useFocusEffect as jest.MockedFunction<
-  typeof useFocusEffect
->;
-const mockUseNavigation = useNavigation as jest.MockedFunction<
-  typeof useNavigation
->;
-const mockUseOndoCampaignParticipantOutcome =
-  useOndoCampaignParticipantOutcome as jest.MockedFunction<
-    typeof useOndoCampaignParticipantOutcome
+const mockUseCampaignOutcomeToast =
+  useCampaignOutcomeToast as jest.MockedFunction<
+    typeof useCampaignOutcomeToast
   >;
-const mockDismissCampaignOutcomeToast =
-  dismissCampaignOutcomeToast as jest.MockedFunction<
-    typeof dismissCampaignOutcomeToast
-  >;
-
-const SUBSCRIPTION_ID = 'sub-123';
-const CAMPAIGN_ID = 'campaign-456';
-const CAMPAIGN_NAME = 'Ondo Test Campaign';
 
-function makeParticipantOutcome(
-  options: Pick<OndoGmCampaignParticipantOutcomeDto, 'outcomeStatus'> & {
-    winnerVerificationCode?: string | null;
-    subscriptionId?: string;
-  },
-): OndoGmCampaignParticipantOutcomeDto {
-  return {
-    subscriptionId: options.subscriptionId ?? SUBSCRIPTION_ID,
-    outcomeStatus: options.outcomeStatus,
-    winnerVerificationCode: options.winnerVerificationCode,
-  };
-}
+const CAMPAIGN_ID = 'campaign-123';
+const CAMPAIGN_NAME = 'Ondo Campaign';
 
-const makeCompletedOndoCampaign = (
-  id = CAMPAIGN_ID,
-  endDate = '2025-01-01T00:00:00Z',
-) => ({
+const makeCampaign = (id = CAMPAIGN_ID): CampaignDto => ({
   id,
   name: CAMPAIGN_NAME,
   type: CampaignType.ONDO_HOLDING,
-  endDate,
-  startDate: '2024-01-01T00:00:00Z',
+  endDate: '2025-01-01',
+  startDate: '2024-01-01',
+  termsAndConditions: null,
+  excludedRegions: [],
+  details: null,
+  featured: false,
+  showUpcomingDate: false,
 });
 
-function setupDefaults({
-  campaigns = [],
-  dismissed = {},
-  subscriptionId = SUBSCRIPTION_ID,
-  outcome = null,
-}: {
-  campaigns?: ReturnType<typeof makeCompletedOndoCampaign>[] | undefined;
-  dismissed?: Record<string, boolean>;
-  subscriptionId?: string | null;
-  outcome?: OndoGmCampaignParticipantOutcomeDto | null;
-} = {}) {
-  mockUseSelector.mockImplementation((selector) => {
-    if (selector === selectCampaigns) return campaigns ?? [];
-    if (selector === selectDismissedCampaignOutcomeToasts) return dismissed;
-    if (selector === selectRewardsSubscriptionId) return subscriptionId;
-    return undefined;
-  });
-  mockUseOndoCampaignParticipantOutcome.mockReturnValue({
-    outcome,
-    isLoading: false,
-    hasError: false,
-  });
-}
-
 describe('useOndoOutcomeToast', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    mockUseDispatch.mockReturnValue(mockDispatch);
-    mockUseNavigation.mockReturnValue({ navigate: mockNavigate } as never);
-    (useContext as jest.Mock).mockReturnValue({ toastRef: mockToastRef });
-    mockUseFocusEffect.mockImplementation((cb) => {
-      cb();
-    });
-    mockDismissCampaignOutcomeToast.mockReturnValue({
-      type: 'rewards/dismissCampaignOutcomeToast',
-    } as never);
-  });
-
-  describe('targetCampaign selection', () => {
-    it('passes undefined to useOndoCampaignParticipantOutcome when no campaigns', () => {
-      setupDefaults({ campaigns: [] });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockUseOndoCampaignParticipantOutcome).toHaveBeenCalledWith(
-        undefined,
-      );
-    });
-
-    it('passes undefined to useOndoCampaignParticipantOutcome when campaigns are missing from persisted state', () => {
-      setupDefaults({ campaigns: undefined });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockUseOndoCampaignParticipantOutcome).toHaveBeenCalledWith(
-        undefined,
-      );
-      expect(mockShowToast).not.toHaveBeenCalled();
-    });
-
-    it('passes completed ONDO campaign id to useOndoCampaignParticipantOutcome', () => {
-      const campaign = makeCompletedOndoCampaign();
-      setupDefaults({ campaigns: [campaign] });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockUseOndoCampaignParticipantOutcome).toHaveBeenCalledWith(
-        CAMPAIGN_ID,
-      );
-    });
-
-    it('selects the most recently ended campaign when multiple exist', () => {
-      const older = makeCompletedOndoCampaign(
-        'campaign-old',
-        '2024-06-01T00:00:00Z',
-      );
-      const newer = makeCompletedOndoCampaign(
-        'campaign-new',
-        '2025-01-01T00:00:00Z',
-      );
-      setupDefaults({ campaigns: [older, newer] });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockUseOndoCampaignParticipantOutcome).toHaveBeenCalledWith(
-        'campaign-new',
-      );
-    });
-  });
-
-  describe('variant derivation', () => {
-    it('does not show toast when outcome is null', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: null,
-      });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockShowToast).not.toHaveBeenCalled();
-    });
-
-    it('derives winner_verify when outcome has verification code and is not finalized', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'pending',
-          winnerVerificationCode: 'WINNER-XYZ',
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockShowToast).toHaveBeenCalledWith(
-        expect.objectContaining({ iconName: IconName.Star }),
-      );
-    });
-
-    it('derives participant_no_winner when outcome is finalized with no verification code', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'finalized',
-          winnerVerificationCode: null,
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockShowToast).toHaveBeenCalledWith(
-        expect.objectContaining({ iconName: IconName.Info }),
-      );
-    });
-
-    it('does not show toast when outcome is finalized with a verification code', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'finalized',
-          winnerVerificationCode: 'WINNER-XYZ',
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockShowToast).not.toHaveBeenCalled();
-    });
-
-    it('does not show toast when outcome is pending with no verification code', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'pending',
-          winnerVerificationCode: null,
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockShowToast).not.toHaveBeenCalled();
-    });
   });
 
-  describe('dismissal check', () => {
-    it('does not show toast when winner_verify toast was previously dismissed', () => {
-      const key = `${CAMPAIGN_ID}:${SUBSCRIPTION_ID}:winner_verify`;
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'pending',
-          winnerVerificationCode: 'CODE',
-        }),
-        dismissed: { [key]: true },
-      });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockShowToast).not.toHaveBeenCalled();
-    });
-
-    it('does not show toast when participant_no_winner toast was previously dismissed', () => {
-      const key = `${CAMPAIGN_ID}:${SUBSCRIPTION_ID}:participant_no_winner`;
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'finalized',
-          winnerVerificationCode: null,
-        }),
-        dismissed: { [key]: true },
-      });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockShowToast).not.toHaveBeenCalled();
-    });
-
-    it('shows toast when a different variant was dismissed', () => {
-      const key = `${CAMPAIGN_ID}:${SUBSCRIPTION_ID}:participant_no_winner`;
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'pending',
-          winnerVerificationCode: 'CODE',
-        }),
-        dismissed: { [key]: true },
-      });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockShowToast).toHaveBeenCalled();
-    });
+  it('calls useCampaignOutcomeToast with ONDO_HOLDING campaign type', () => {
+    renderHook(() => useOndoOutcomeToast());
+    expect(mockUseCampaignOutcomeToast).toHaveBeenCalledWith(
+      expect.objectContaining({
+        campaignType: CampaignType.ONDO_HOLDING,
+      }),
+    );
   });
 
-  describe('toast configuration', () => {
-    it('shows winner_verify toast with correct config', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'pending',
-          winnerVerificationCode: 'CODE',
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-
-      expect(mockShowToast).toHaveBeenCalledWith(
-        expect.objectContaining({
-          variant: ToastVariants.Icon,
-          iconName: IconName.Star,
-          backgroundColor: 'transparent',
-          hasNoTimeout: true,
-          labelOptions: [
-            {
-              label: 'rewards.ondo_outcome_toast.winner_verify.title',
-              isBold: true,
-            },
-          ],
-          descriptionOptions: {
-            description: `rewards.ondo_outcome_toast.winner_verify.description:${CAMPAIGN_NAME}`,
-          },
-          linkButtonOptions: expect.objectContaining({
-            label: 'rewards.ondo_outcome_toast.winner_verify.cta',
-          }),
-          closeButtonOptions: expect.objectContaining({
-            variant: ButtonIconVariant.Icon,
-            iconName: IconName.Close,
-          }),
-        }),
-      );
-    });
-
-    it('shows participant_no_winner toast with correct config', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'finalized',
-          winnerVerificationCode: null,
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-
-      expect(mockShowToast).toHaveBeenCalledWith(
-        expect.objectContaining({
-          variant: ToastVariants.Icon,
-          iconName: IconName.Info,
-          backgroundColor: 'transparent',
-          hasNoTimeout: true,
-          labelOptions: [
-            {
-              label: 'rewards.ondo_outcome_toast.participant_no_winner.title',
-              isBold: true,
-            },
-          ],
-          descriptionOptions: {
-            description: `rewards.ondo_outcome_toast.participant_no_winner.description:${CAMPAIGN_NAME}`,
-          },
-          linkButtonOptions: expect.objectContaining({
-            label: 'rewards.ondo_outcome_toast.participant_no_winner.cta',
-          }),
-        }),
-      );
-    });
-
-    it('fires Success haptic for winner_verify', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'pending',
-          winnerVerificationCode: 'CODE',
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-      expect(playSuccessNotification).toHaveBeenCalled();
-    });
-
-    it('fires Warning haptic for participant_no_winner', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'finalized',
-          winnerVerificationCode: null,
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-      expect(playWarningNotification).toHaveBeenCalled();
-    });
+  it('passes useOndoCampaignParticipantOutcome as the useOutcome function', () => {
+    renderHook(() => useOndoOutcomeToast());
+    expect(mockUseCampaignOutcomeToast).toHaveBeenCalledWith(
+      expect.objectContaining({
+        useOutcome: useOndoCampaignParticipantOutcome,
+      }),
+    );
   });
 
-  describe('cleanup on blur', () => {
-    it('calls closeToast in the cleanup function when screen blurs', () => {
-      let cleanupFn: (() => void) | undefined;
-      mockUseFocusEffect.mockImplementation((cb) => {
-        const cleanup = cb();
-        if (typeof cleanup === 'function') cleanupFn = cleanup;
-      });
-
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'pending',
-          winnerVerificationCode: 'CODE',
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-
-      expect(cleanupFn).toBeDefined();
-      cleanupFn?.();
-      expect(mockCloseToast).toHaveBeenCalledTimes(1);
-    });
-
-    it('does not return a cleanup function when variant is null', () => {
-      let cleanupFn: (() => void) | undefined;
-      mockUseFocusEffect.mockImplementation((cb) => {
-        const result = cb();
-        if (typeof result === 'function') cleanupFn = result;
-      });
-
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: null,
-      });
-      renderHook(() => useOndoOutcomeToast());
-
-      expect(cleanupFn).toBeUndefined();
-      expect(mockCloseToast).not.toHaveBeenCalled();
+  it('getWinnerNavigation returns ONDO winning view route with campaignId and campaignName', () => {
+    renderHook(() => useOndoOutcomeToast());
+    const { getWinnerNavigation } =
+      mockUseCampaignOutcomeToast.mock.calls[0][0];
+    const nav = getWinnerNavigation(makeCampaign());
+    expect(nav).toEqual({
+      route: Routes.REWARDS_ONDO_CAMPAIGN_WINNING_VIEW,
+      params: { campaignId: CAMPAIGN_ID, campaignName: CAMPAIGN_NAME },
     });
   });
 
-  describe('handleDismiss', () => {
-    it('dispatches dismissCampaignOutcomeToast and closes toast when close button is pressed', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'pending',
-          winnerVerificationCode: 'CODE',
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-
-      const closeButtonOptions =
-        mockShowToast.mock.calls[0][0].closeButtonOptions;
-      closeButtonOptions.onPress();
-
-      expect(mockDispatch).toHaveBeenCalledWith(
-        mockDismissCampaignOutcomeToast.mock.results[0]?.value,
-      );
-      expect(mockDismissCampaignOutcomeToast).toHaveBeenCalledWith({
-        campaignId: CAMPAIGN_ID,
-        subscriptionId: SUBSCRIPTION_ID,
-        variant: 'winner_verify',
-      });
-      expect(mockCloseToast).toHaveBeenCalled();
+  it('getWinnerNavigation uses empty string for campaignName when name is null', () => {
+    renderHook(() => useOndoOutcomeToast());
+    const { getWinnerNavigation } =
+      mockUseCampaignOutcomeToast.mock.calls[0][0];
+    const nav = getWinnerNavigation({
+      ...makeCampaign(),
+      name: null as unknown as string,
     });
-  });
-
-  describe('handleCta', () => {
-    it('navigates to winning view and dismisses for winner_verify', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'pending',
-          winnerVerificationCode: 'CODE',
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-
-      const linkButtonOptions =
-        mockShowToast.mock.calls[0][0].linkButtonOptions;
-      linkButtonOptions.onPress();
-
-      expect(mockNavigate).toHaveBeenCalledWith(
-        Routes.REWARDS_ONDO_CAMPAIGN_WINNING_VIEW,
-        { campaignId: CAMPAIGN_ID },
-      );
-      expect(mockDismissCampaignOutcomeToast).toHaveBeenCalledWith({
-        campaignId: CAMPAIGN_ID,
-        subscriptionId: SUBSCRIPTION_ID,
-        variant: 'winner_verify',
-      });
-    });
-
-    it('navigates to campaign details view and dismisses for participant_no_winner', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'finalized',
-          winnerVerificationCode: null,
-        }),
-      });
-      renderHook(() => useOndoOutcomeToast());
-
-      const linkButtonOptions =
-        mockShowToast.mock.calls[0][0].linkButtonOptions;
-      linkButtonOptions.onPress();
-
-      expect(mockNavigate).toHaveBeenCalledWith(
-        Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW,
-        { campaignId: CAMPAIGN_ID },
-      );
-      expect(mockDismissCampaignOutcomeToast).toHaveBeenCalledWith({
-        campaignId: CAMPAIGN_ID,
-        subscriptionId: SUBSCRIPTION_ID,
-        variant: 'participant_no_winner',
-      });
+    expect(nav.params).toEqual({
+      campaignId: CAMPAIGN_ID,
+      campaignName: '',
     });
   });
 
-  describe('edge cases', () => {
-    it('does not show toast when subscriptionId is missing', () => {
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'pending',
-          winnerVerificationCode: 'CODE',
-        }),
-        subscriptionId: null,
-      });
-      renderHook(() => useOndoOutcomeToast());
-      expect(mockShowToast).not.toHaveBeenCalled();
-    });
-
-    it('handles null toastRef gracefully', () => {
-      (useContext as jest.Mock).mockReturnValue({ toastRef: null });
-      setupDefaults({
-        campaigns: [makeCompletedOndoCampaign()],
-        outcome: makeParticipantOutcome({
-          outcomeStatus: 'pending',
-          winnerVerificationCode: 'CODE',
-        }),
-      });
-      expect(() => renderHook(() => useOndoOutcomeToast())).not.toThrow();
+  it('getNonWinnerNavigation returns ONDO campaign details route', () => {
+    renderHook(() => useOndoOutcomeToast());
+    const { getNonWinnerNavigation } =
+      mockUseCampaignOutcomeToast.mock.calls[0][0];
+    const nav = getNonWinnerNavigation(makeCampaign());
+    expect(nav).toEqual({
+      route: Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW,
+      params: { campaignId: CAMPAIGN_ID },
     });
   });
 });
diff --git a/app/components/UI/Rewards/hooks/useOndoOutcomeToast.ts b/app/components/UI/Rewards/hooks/useOndoOutcomeToast.ts
index 87c295cf1f7..2a736f931c8 100644
--- a/app/components/UI/Rewards/hooks/useOndoOutcomeToast.ts
+++ b/app/components/UI/Rewards/hooks/useOndoOutcomeToast.ts
@@ -1,160 +1,21 @@
-import { useCallback, useContext, useMemo } from 'react';
-import { useFocusEffect, useNavigation } from '@react-navigation/native';
-import { useDispatch, useSelector } from 'react-redux';
-import {
-  playSuccessNotification,
-  playWarningNotification,
-} from '../../../../util/haptics';
-import Routes from '../../../../constants/navigation/Routes';
-import { strings } from '../../../../../locales/i18n';
-import { ToastContext } from '../../../../component-library/components/Toast';
-import {
-  ButtonIconVariant,
-  ToastVariants,
-} from '../../../../component-library/components/Toast/Toast.types';
-import { IconName } from '../../../../component-library/components/Icons/Icon';
-import { useAppThemeFromContext } from '../../../../util/theme';
 import { CampaignType } from '../../../../core/Engine/controllers/rewards-controller/types';
-import { getCampaignStatus } from '../components/Campaigns/CampaignTile.utils';
-import { dismissCampaignOutcomeToast } from '../../../../reducers/rewards';
-import {
-  selectCampaigns,
-  selectDismissedCampaignOutcomeToasts,
-} from '../../../../reducers/rewards/selectors';
-import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import Routes from '../../../../constants/navigation/Routes';
+import { useCampaignOutcomeToast } from './useCampaignOutcomeToast';
 import { useOndoCampaignParticipantOutcome } from './useOndoCampaignParticipantOutcome';
 
-export type OutcomeToastVariant = 'winner_verify' | 'participant_no_winner';
-
 export function useOndoOutcomeToast(): void {
-  const dispatch = useDispatch();
-  const { toastRef } = useContext(ToastContext);
-  const theme = useAppThemeFromContext();
-  const navigation = useNavigation();
-
-  const subscriptionId = useSelector(selectRewardsSubscriptionId);
-  const campaigns = useSelector(selectCampaigns);
-  const dismissed = useSelector(selectDismissedCampaignOutcomeToasts);
-
-  const targetCampaign = useMemo(() => {
-    const completed = campaigns
-      .filter(
-        (c) =>
-          c.type === CampaignType.ONDO_HOLDING &&
-          getCampaignStatus(c) === 'complete',
-      )
-      .sort(
-        (a, b) => new Date(b.endDate).getTime() - new Date(a.endDate).getTime(),
-      );
-    return completed[0] ?? null;
-  }, [campaigns]);
-
-  const { outcome } = useOndoCampaignParticipantOutcome(targetCampaign?.id);
-
-  const variant = useMemo((): OutcomeToastVariant | null => {
-    if (!outcome) return null;
-    if (
-      outcome.winnerVerificationCode &&
-      outcome.outcomeStatus !== 'finalized'
-    ) {
-      return 'winner_verify';
-    }
-    if (
-      outcome.outcomeStatus === 'finalized' &&
-      !outcome.winnerVerificationCode
-    ) {
-      return 'participant_no_winner';
-    }
-    return null;
-  }, [outcome]);
-
-  const isDismissed = useMemo(() => {
-    if (!variant || !targetCampaign || !subscriptionId) return true;
-    const key = `${targetCampaign.id}:${subscriptionId}:${variant}`;
-    return dismissed[key] === true;
-  }, [variant, targetCampaign, subscriptionId, dismissed]);
-
-  const handleDismiss = useCallback(() => {
-    if (!variant || !targetCampaign || !subscriptionId) return;
-    dispatch(
-      dismissCampaignOutcomeToast({
-        campaignId: targetCampaign.id,
-        subscriptionId,
-        variant,
-      }),
-    );
-    toastRef?.current?.closeToast();
-  }, [variant, targetCampaign, subscriptionId, dispatch, toastRef]);
-
-  const handleCta = useCallback(() => {
-    if (!targetCampaign || !variant) return;
-    handleDismiss();
-    if (variant === 'winner_verify') {
-      navigation.navigate(Routes.REWARDS_ONDO_CAMPAIGN_WINNING_VIEW, {
-        campaignId: targetCampaign.id,
-      });
-    } else {
-      navigation.navigate(Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW, {
-        campaignId: targetCampaign.id,
-      });
-    }
-  }, [variant, targetCampaign, handleDismiss, navigation]);
-
-  useFocusEffect(
-    useCallback(() => {
-      if (!variant || isDismissed || !targetCampaign) return;
-
-      const isWinner = variant === 'winner_verify';
-      toastRef?.current?.showToast({
-        variant: ToastVariants.Icon,
-        iconName: isWinner ? IconName.Star : IconName.Info,
-        iconColor: isWinner
-          ? theme.colors.warning.default
-          : theme.colors.success.default,
-        backgroundColor: 'transparent',
-        hasNoTimeout: true,
-        labelOptions: [
-          {
-            label: strings(`rewards.ondo_outcome_toast.${variant}.title`),
-            isBold: true,
-          },
-        ],
-        descriptionOptions: {
-          description: strings(
-            `rewards.ondo_outcome_toast.${variant}.description`,
-            { campaignName: targetCampaign.name },
-          ),
-        },
-        linkButtonOptions: {
-          label: strings(`rewards.ondo_outcome_toast.${variant}.cta`),
-          onPress: handleCta,
-        },
-        closeButtonOptions: {
-          variant: ButtonIconVariant.Icon,
-          iconName: IconName.Close,
-          onPress: handleDismiss,
-        },
-      });
-      if (isWinner) {
-        playSuccessNotification();
-      } else {
-        playWarningNotification();
-      }
-
-      return () => {
-        toastRef?.current?.closeToast();
-      };
-    }, [
-      variant,
-      isDismissed,
-      targetCampaign,
-      toastRef,
-      theme.colors.warning.default,
-      theme.colors.success.default,
-      handleCta,
-      handleDismiss,
-    ]),
-  );
+  useCampaignOutcomeToast({
+    campaignType: CampaignType.ONDO_HOLDING,
+    useOutcome: useOndoCampaignParticipantOutcome,
+    getWinnerNavigation: (campaign) => ({
+      route: Routes.REWARDS_ONDO_CAMPAIGN_WINNING_VIEW,
+      params: { campaignId: campaign.id, campaignName: campaign.name ?? '' },
+    }),
+    getNonWinnerNavigation: (campaign) => ({
+      route: Routes.REWARDS_ONDO_CAMPAIGN_DETAILS_VIEW,
+      params: { campaignId: campaign.id },
+    }),
+  });
 }
 
 export default useOndoOutcomeToast;
diff --git a/app/components/UI/Rewards/hooks/useOptInToCampaign.test.ts b/app/components/UI/Rewards/hooks/useOptInToCampaign.test.ts
index c94087723b0..e97add67a7e 100644
--- a/app/components/UI/Rewards/hooks/useOptInToCampaign.test.ts
+++ b/app/components/UI/Rewards/hooks/useOptInToCampaign.test.ts
@@ -1,10 +1,12 @@
 import { renderHook, act } from '@testing-library/react-hooks';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { useOptInToCampaign } from './useOptInToCampaign';
 import Engine from '../../../../core/Engine';
 import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import { setCampaignParticipantStatus } from '../../../../reducers/rewards';
 
 jest.mock('react-redux', () => ({
+  useDispatch: jest.fn(),
   useSelector: jest.fn(),
 }));
 
@@ -16,10 +18,22 @@ jest.mock('../../../../selectors/rewards', () => ({
   selectRewardsSubscriptionId: jest.fn(),
 }));
 
+jest.mock('../../../../reducers/rewards', () => ({
+  setCampaignParticipantStatus: jest.fn((payload) => ({
+    type: 'rewards/setCampaignParticipantStatus',
+    payload,
+  })),
+}));
+
 const mockCall = Engine.controllerMessenger.call as jest.MockedFunction<
   typeof Engine.controllerMessenger.call
 >;
 const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockUseDispatch = useDispatch as jest.MockedFunction<typeof useDispatch>;
+const mockSetCampaignParticipantStatus =
+  setCampaignParticipantStatus as unknown as jest.MockedFunction<
+    typeof setCampaignParticipantStatus
+  >;
 
 const SUB_ID = 'sub-123';
 const CAMPAIGN_ID = 'camp-456';
@@ -33,8 +47,11 @@ function setupSelectors(subscriptionId: string | null) {
 }
 
 describe('useOptInToCampaign', () => {
+  const mockDispatch = jest.fn();
+
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUseDispatch.mockReturnValue(mockDispatch);
   });
 
   it('returns null when subscriptionId is missing', async () => {
@@ -63,6 +80,18 @@ describe('useOptInToCampaign', () => {
       CAMPAIGN_ID,
       SUB_ID,
     );
+    expect(mockDispatch).toHaveBeenCalledWith(
+      setCampaignParticipantStatus({
+        subscriptionId: SUB_ID,
+        campaignId: CAMPAIGN_ID,
+        status: STATUS,
+      }),
+    );
+    expect(mockSetCampaignParticipantStatus).toHaveBeenCalledWith({
+      subscriptionId: SUB_ID,
+      campaignId: CAMPAIGN_ID,
+      status: STATUS,
+    });
     expect(returnValue).toEqual(STATUS);
     expect(result.current.isOptingIn).toBe(false);
     expect(result.current.optInError).toBeUndefined();
diff --git a/app/components/UI/Rewards/hooks/useOptInToCampaign.ts b/app/components/UI/Rewards/hooks/useOptInToCampaign.ts
index b3852646997..a0533e7889f 100644
--- a/app/components/UI/Rewards/hooks/useOptInToCampaign.ts
+++ b/app/components/UI/Rewards/hooks/useOptInToCampaign.ts
@@ -1,7 +1,8 @@
 import { useCallback, useState } from 'react';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import Engine from '../../../../core/Engine';
 import { selectRewardsSubscriptionId } from '../../../../selectors/rewards';
+import { setCampaignParticipantStatus } from '../../../../reducers/rewards';
 import type { CampaignParticipantStatusDto } from '../../../../core/Engine/controllers/rewards-controller/types';
 
 export interface UseOptInToCampaignResult {
@@ -22,6 +23,7 @@ export interface UseOptInToCampaignResult {
  */
 export const useOptInToCampaign = (): UseOptInToCampaignResult => {
   const subscriptionId = useSelector(selectRewardsSubscriptionId);
+  const dispatch = useDispatch();
   const [isOptingIn, setIsOptingIn] = useState(false);
   const [optInError, setOptInError] = useState<string | undefined>(undefined);
 
@@ -36,11 +38,19 @@ export const useOptInToCampaign = (): UseOptInToCampaignResult => {
       try {
         setIsOptingIn(true);
         setOptInError(undefined);
-        return await Engine.controllerMessenger.call(
+        const result = await Engine.controllerMessenger.call(
           'RewardsController:optInToCampaign',
           campaignId,
           subscriptionId,
         );
+        dispatch(
+          setCampaignParticipantStatus({
+            subscriptionId,
+            campaignId,
+            status: result,
+          }),
+        );
+        return result;
       } catch (error) {
         const message =
           error instanceof Error ? error.message : 'Opt-in failed';
@@ -50,7 +60,7 @@ export const useOptInToCampaign = (): UseOptInToCampaignResult => {
         setIsOptingIn(false);
       }
     },
-    [subscriptionId],
+    [dispatch, subscriptionId],
   );
 
   const clearOptInError = useCallback(() => setOptInError(undefined), []);
diff --git a/app/components/UI/Rewards/hooks/usePerpsTradingCampaignEndedOutcomeToast.test.ts b/app/components/UI/Rewards/hooks/usePerpsTradingCampaignEndedOutcomeToast.test.ts
new file mode 100644
index 00000000000..44c7d775a5c
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/usePerpsTradingCampaignEndedOutcomeToast.test.ts
@@ -0,0 +1,98 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { usePerpsTradingCampaignEndedOutcomeToast } from './usePerpsTradingCampaignEndedOutcomeToast';
+import { useCampaignOutcomeToast } from './useCampaignOutcomeToast';
+import { usePerpsTradingCampaignParticipantOutcome } from './usePerpsTradingCampaignParticipantOutcome';
+import {
+  CampaignType,
+  type CampaignDto,
+} from '../../../../core/Engine/controllers/rewards-controller/types';
+import Routes from '../../../../constants/navigation/Routes';
+
+jest.mock('./useCampaignOutcomeToast', () => ({
+  useCampaignOutcomeToast: jest.fn(),
+}));
+
+jest.mock('./usePerpsTradingCampaignParticipantOutcome', () => ({
+  usePerpsTradingCampaignParticipantOutcome: jest.fn(),
+}));
+
+const mockUseCampaignOutcomeToast =
+  useCampaignOutcomeToast as jest.MockedFunction<
+    typeof useCampaignOutcomeToast
+  >;
+
+const CAMPAIGN_ID = 'campaign-xyz';
+const CAMPAIGN_NAME = 'Perps Campaign';
+
+const makeCampaign = (id = CAMPAIGN_ID, name = CAMPAIGN_NAME): CampaignDto => ({
+  id,
+  name,
+  type: CampaignType.PERPS_TRADING,
+  endDate: '2025-01-01',
+  startDate: '2024-01-01',
+  termsAndConditions: null,
+  excludedRegions: [],
+  details: null,
+  featured: false,
+  showUpcomingDate: false,
+});
+
+describe('usePerpsTradingCampaignEndedOutcomeToast', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('calls useCampaignOutcomeToast with PERPS_TRADING campaign type', () => {
+    renderHook(() => usePerpsTradingCampaignEndedOutcomeToast());
+    expect(mockUseCampaignOutcomeToast).toHaveBeenCalledWith(
+      expect.objectContaining({
+        campaignType: CampaignType.PERPS_TRADING,
+      }),
+    );
+  });
+
+  it('passes usePerpsTradingCampaignParticipantOutcome as the useOutcome function', () => {
+    renderHook(() => usePerpsTradingCampaignEndedOutcomeToast());
+    expect(mockUseCampaignOutcomeToast).toHaveBeenCalledWith(
+      expect.objectContaining({
+        useOutcome: usePerpsTradingCampaignParticipantOutcome,
+      }),
+    );
+  });
+
+  it('getWinnerNavigation returns Perps winning view route with campaignId and campaignName', () => {
+    renderHook(() => usePerpsTradingCampaignEndedOutcomeToast());
+    const { getWinnerNavigation } =
+      mockUseCampaignOutcomeToast.mock.calls[0][0];
+    const nav = getWinnerNavigation(makeCampaign());
+    expect(nav).toEqual({
+      route: Routes.REWARDS_PERPS_TRADING_CAMPAIGN_WINNING_VIEW,
+      params: { campaignId: CAMPAIGN_ID, campaignName: CAMPAIGN_NAME },
+    });
+  });
+
+  it('getWinnerNavigation uses empty string for campaignName when name is null', () => {
+    renderHook(() => usePerpsTradingCampaignEndedOutcomeToast());
+    const { getWinnerNavigation } =
+      mockUseCampaignOutcomeToast.mock.calls[0][0];
+    const nav = getWinnerNavigation({
+      ...makeCampaign(),
+      name: null as unknown as string,
+    });
+    expect(nav.params).toEqual({
+      campaignId: CAMPAIGN_ID,
+      campaignName: '',
+    });
+  });
+
+  it('getNonWinnerNavigation returns Perps details view route', () => {
+    renderHook(() => usePerpsTradingCampaignEndedOutcomeToast());
+    const { getNonWinnerNavigation } =
+      mockUseCampaignOutcomeToast.mock.calls[0][0];
+    const nav = getNonWinnerNavigation(makeCampaign());
+    expect(nav).toEqual({
+      route: Routes.REWARDS_PERPS_TRADING_CAMPAIGN_DETAILS_VIEW,
+      params: { campaignId: CAMPAIGN_ID },
+    });
+  });
+});
diff --git a/app/components/UI/Rewards/hooks/usePerpsTradingCampaignEndedOutcomeToast.ts b/app/components/UI/Rewards/hooks/usePerpsTradingCampaignEndedOutcomeToast.ts
new file mode 100644
index 00000000000..ae99229b1ba
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/usePerpsTradingCampaignEndedOutcomeToast.ts
@@ -0,0 +1,21 @@
+import { CampaignType } from '../../../../core/Engine/controllers/rewards-controller/types';
+import Routes from '../../../../constants/navigation/Routes';
+import { useCampaignOutcomeToast } from './useCampaignOutcomeToast';
+import { usePerpsTradingCampaignParticipantOutcome } from './usePerpsTradingCampaignParticipantOutcome';
+
+export function usePerpsTradingCampaignEndedOutcomeToast(): void {
+  useCampaignOutcomeToast({
+    campaignType: CampaignType.PERPS_TRADING,
+    useOutcome: usePerpsTradingCampaignParticipantOutcome,
+    getWinnerNavigation: (campaign) => ({
+      route: Routes.REWARDS_PERPS_TRADING_CAMPAIGN_WINNING_VIEW,
+      params: { campaignId: campaign.id, campaignName: campaign.name ?? '' },
+    }),
+    getNonWinnerNavigation: (campaign) => ({
+      route: Routes.REWARDS_PERPS_TRADING_CAMPAIGN_DETAILS_VIEW,
+      params: { campaignId: campaign.id },
+    }),
+  });
+}
+
+export default usePerpsTradingCampaignEndedOutcomeToast;
diff --git a/app/components/UI/Rewards/hooks/usePerpsTradingCampaignParticipantOutcome.test.ts b/app/components/UI/Rewards/hooks/usePerpsTradingCampaignParticipantOutcome.test.ts
new file mode 100644
index 00000000000..35795726f9f
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/usePerpsTradingCampaignParticipantOutcome.test.ts
@@ -0,0 +1,68 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { usePerpsTradingCampaignParticipantOutcome } from './usePerpsTradingCampaignParticipantOutcome';
+import { useCampaignParticipantOutcome } from './useCampaignParticipantOutcome';
+
+jest.mock('./useCampaignParticipantOutcome', () => ({
+  useCampaignParticipantOutcome: jest.fn(),
+}));
+
+const mockUseCampaignParticipantOutcome =
+  useCampaignParticipantOutcome as jest.MockedFunction<
+    typeof useCampaignParticipantOutcome
+  >;
+
+const CAMPAIGN_ID = 'campaign-xyz';
+
+describe('usePerpsTradingCampaignParticipantOutcome', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseCampaignParticipantOutcome.mockReturnValue({
+      outcome: null,
+      isLoading: false,
+      hasError: false,
+    });
+  });
+
+  it('delegates to useCampaignParticipantOutcome with the Perps messenger action', () => {
+    renderHook(() => usePerpsTradingCampaignParticipantOutcome(CAMPAIGN_ID));
+
+    expect(mockUseCampaignParticipantOutcome).toHaveBeenCalledWith(
+      CAMPAIGN_ID,
+      {
+        messengerAction:
+          'RewardsController:getPerpsTradingCampaignParticipantOutcome',
+      },
+    );
+  });
+
+  it('passes undefined campaignId through to the generic hook', () => {
+    renderHook(() => usePerpsTradingCampaignParticipantOutcome(undefined));
+
+    expect(mockUseCampaignParticipantOutcome).toHaveBeenCalledWith(undefined, {
+      messengerAction:
+        'RewardsController:getPerpsTradingCampaignParticipantOutcome',
+    });
+  });
+
+  it('returns the result from the generic hook', () => {
+    const mockOutcome = {
+      subscriptionId: 'sub-1',
+      outcomeStatus: 'pending' as const,
+      winnerVerificationCode: 'CODE',
+      rank: 3,
+    };
+    mockUseCampaignParticipantOutcome.mockReturnValue({
+      outcome: mockOutcome,
+      isLoading: false,
+      hasError: false,
+    });
+
+    const { result } = renderHook(() =>
+      usePerpsTradingCampaignParticipantOutcome(CAMPAIGN_ID),
+    );
+
+    expect(result.current.outcome).toEqual(mockOutcome);
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.hasError).toBe(false);
+  });
+});
diff --git a/app/components/UI/Rewards/hooks/usePerpsTradingCampaignParticipantOutcome.ts b/app/components/UI/Rewards/hooks/usePerpsTradingCampaignParticipantOutcome.ts
new file mode 100644
index 00000000000..255885f2823
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/usePerpsTradingCampaignParticipantOutcome.ts
@@ -0,0 +1,22 @@
+import type { PerpsTradingCampaignParticipantOutcomeDto } from '../../../../core/Engine/controllers/rewards-controller/types';
+import {
+  useCampaignParticipantOutcome,
+  type UseCampaignParticipantOutcomeResult,
+} from './useCampaignParticipantOutcome';
+
+export type UsePerpsTradingCampaignParticipantOutcomeResult =
+  UseCampaignParticipantOutcomeResult<PerpsTradingCampaignParticipantOutcomeDto>;
+
+export function usePerpsTradingCampaignParticipantOutcome(
+  campaignId: string | undefined,
+): UsePerpsTradingCampaignParticipantOutcomeResult {
+  return useCampaignParticipantOutcome<PerpsTradingCampaignParticipantOutcomeDto>(
+    campaignId,
+    {
+      messengerAction:
+        'RewardsController:getPerpsTradingCampaignParticipantOutcome',
+    },
+  );
+}
+
+export default usePerpsTradingCampaignParticipantOutcome;
diff --git a/app/components/UI/Rewards/hooks/useRewardsNotificationsNudge.test.tsx b/app/components/UI/Rewards/hooks/useRewardsNotificationsNudge.test.tsx
new file mode 100644
index 00000000000..d406b8ff7a6
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useRewardsNotificationsNudge.test.tsx
@@ -0,0 +1,656 @@
+import React from 'react';
+import { AppState } from 'react-native';
+import { renderHook, act } from '@testing-library/react-hooks';
+import { waitFor } from '@testing-library/react-native';
+
+jest.mock('react-native', () => ({
+  ...jest.requireActual('react-native'),
+  AppState: { addEventListener: jest.fn() },
+}));
+const mockAppStateAddEventListener = AppState.addEventListener as jest.Mock;
+import { useSelector } from 'react-redux';
+import { ToastContext } from '../../../../component-library/components/Toast';
+import { useRewardsNotificationsNudge } from './useRewardsNotificationsNudge';
+import {
+  selectIsMetamaskNotificationsEnabled,
+  selectIsMetaMaskPushNotificationsEnabled,
+} from '../../../../selectors/notifications';
+import { isNotificationsFeatureEnabled } from '../../../../util/notifications/constants';
+
+const mockShowToast = jest.fn();
+const mockEnableNotifications = jest.fn();
+const mockOriginalCloseButtonPress = jest.fn();
+const mockEnableNotificationsNudge = jest.fn(
+  (linkButtonOptions: { label: string; onPress: () => Promise<void> }) => ({
+    variant: 'Plain',
+    hasNoTimeout: true,
+    linkButtonOptions,
+    closeButtonOptions: {
+      onPress: mockOriginalCloseButtonPress,
+    },
+  }),
+);
+const mockLoadingToast = jest.fn((title: string, subtitle?: string) => ({
+  variant: 'loading',
+  title,
+  subtitle,
+}));
+const mockErrorToast = jest.fn((title: string) => ({
+  variant: 'error',
+  title,
+}));
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('./useRewardsToast', () => ({
+  __esModule: true,
+  default: jest.fn(() => ({
+    showToast: mockShowToast,
+    RewardsToastOptions: {
+      enableNotificationsNudge: mockEnableNotificationsNudge,
+      loading: mockLoadingToast,
+      error: mockErrorToast,
+    },
+  })),
+}));
+
+jest.mock('../../../../util/notifications/hooks/useNotifications', () => ({
+  useEnableNotifications: jest.fn(() => ({
+    enableNotifications: mockEnableNotifications,
+  })),
+}));
+
+jest.mock('../../../../util/notifications/constants', () => ({
+  isNotificationsFeatureEnabled: jest.fn(() => true),
+}));
+
+jest.mock(
+  '../../../../util/notifications/services/NotificationService',
+  () => ({
+    __esModule: true,
+    default: { openSystemSettings: jest.fn() },
+    getPushPermission: jest.fn().mockResolvedValue('authorized'),
+  }),
+);
+const mockNotificationService = jest.requireMock(
+  '../../../../util/notifications/services/NotificationService',
+);
+const mockOpenSystemSettings = mockNotificationService.default
+  .openSystemSettings as jest.Mock;
+const mockGetPushPermission =
+  mockNotificationService.getPushPermission as jest.Mock;
+
+jest.mock('../../../../../locales/i18n', () => ({
+  strings: (key: string) => {
+    const translations: Record<string, string> = {
+      'rewards.notifications_nudge.turn_on_button': 'Turn on',
+      'rewards.notifications_nudge.loading': 'Enabling notifications...',
+      'rewards.notifications_nudge.loading_description':
+        'This may take a moment.',
+      'rewards.notifications_nudge.enable_error':
+        'Failed to enable notifications',
+    };
+    return translations[key] || key;
+  },
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockCloseToast = jest.fn();
+
+function mockSelectors({
+  notificationsEnabled,
+}: {
+  notificationsEnabled: boolean;
+}) {
+  mockUseSelector.mockImplementation((selector) => {
+    if (
+      selector === selectIsMetamaskNotificationsEnabled ||
+      selector === selectIsMetaMaskPushNotificationsEnabled
+    ) {
+      return notificationsEnabled;
+    }
+    return undefined;
+  });
+}
+
+function renderNudgeHook(options?: {
+  enabled?: boolean;
+  onNotificationsEnabled?: () => void;
+}) {
+  const toastRef = {
+    current: {
+      showToast: jest.fn(),
+      closeToast: mockCloseToast,
+    },
+  };
+  const wrapper = ({ children }: { children: React.ReactNode }) =>
+    React.createElement(
+      ToastContext.Provider,
+      { value: { toastRef } },
+      children,
+    );
+
+  return renderHook(() => useRewardsNotificationsNudge(options), { wrapper });
+}
+
+describe('useRewardsNotificationsNudge', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockEnableNotifications.mockResolvedValue(undefined);
+    mockGetPushPermission.mockResolvedValue('authorized');
+    mockSelectors({ notificationsEnabled: true });
+    (isNotificationsFeatureEnabled as jest.Mock).mockReturnValue(true);
+    mockAppStateAddEventListener.mockReturnValue({ remove: jest.fn() });
+  });
+
+  it('returns enabled state when notifications and push are enabled', () => {
+    const { result } = renderNudgeHook();
+
+    expect(result.current.areNotificationsEnabled).toBe(true);
+    expect(result.current.canPromptToEnableNotifications).toBe(true);
+    expect(result.current.shouldPromptToEnableNotifications).toBe(false);
+  });
+
+  it('returns prompt state when notifications are disabled and feature flag is on', () => {
+    mockSelectors({ notificationsEnabled: false });
+
+    const { result } = renderNudgeHook();
+
+    expect(result.current.areNotificationsEnabled).toBe(false);
+    expect(result.current.canPromptToEnableNotifications).toBe(true);
+    expect(result.current.shouldPromptToEnableNotifications).toBe(true);
+  });
+
+  it('shows the notifications nudge and enables notifications from its CTA', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    const { result } = renderNudgeHook();
+
+    let didShow = false;
+    act(() => {
+      didShow = result.current.showEnableNotificationsNudge();
+    });
+
+    expect(didShow).toBe(true);
+    expect(mockEnableNotificationsNudge).toHaveBeenCalledWith({
+      label: 'Turn on',
+      onPress: expect.any(Function),
+    });
+    expect(mockShowToast).toHaveBeenCalledWith(
+      expect.objectContaining({
+        variant: 'Plain',
+        closeButtonOptions: expect.objectContaining({
+          onPress: expect.any(Function),
+        }),
+      }),
+    );
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
+    expect(mockCloseToast).toHaveBeenCalledTimes(1);
+    expect(mockShowToast).toHaveBeenCalledTimes(2);
+    expect(mockShowToast).toHaveBeenLastCalledWith(
+      expect.objectContaining({ variant: 'loading' }),
+    );
+  });
+
+  it('shows loading toast when Turn On CTA is pressed', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    const { result } = renderNudgeHook();
+
+    act(() => {
+      result.current.showEnableNotificationsNudge();
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    expect(mockShowToast).toHaveBeenCalledTimes(2);
+    expect(mockShowToast).toHaveBeenLastCalledWith(
+      expect.objectContaining({ variant: 'loading' }),
+    );
+  });
+
+  it('shows error toast if enableNotifications fails', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    mockEnableNotifications.mockRejectedValue(new Error('failed'));
+    const { result } = renderNudgeHook();
+
+    act(() => {
+      result.current.showEnableNotificationsNudge();
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    expect(mockCloseToast).toHaveBeenCalledTimes(1);
+    expect(mockShowToast).toHaveBeenLastCalledWith(
+      expect.objectContaining({ variant: 'error' }),
+    );
+  });
+
+  it('calls onNotificationsEnabled callback after successful enable', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    const onNotificationsEnabled = jest.fn();
+    const { result } = renderNudgeHook({ onNotificationsEnabled });
+
+    act(() => {
+      result.current.showEnableNotificationsNudge();
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
+    expect(onNotificationsEnabled).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not call onNotificationsEnabled callback when enableNotifications fails', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    mockEnableNotifications.mockRejectedValue(new Error('failed'));
+    const onNotificationsEnabled = jest.fn();
+    const { result } = renderNudgeHook({ onNotificationsEnabled });
+
+    act(() => {
+      result.current.showEnableNotificationsNudge();
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    expect(onNotificationsEnabled).not.toHaveBeenCalled();
+  });
+
+  it('does not call onNotificationsEnabled when push permission is denied', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    mockGetPushPermission.mockResolvedValue('denied');
+    const onNotificationsEnabled = jest.fn();
+    const { result } = renderNudgeHook({ onNotificationsEnabled });
+
+    act(() => {
+      result.current.showEnableNotificationsNudge();
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    expect(onNotificationsEnabled).not.toHaveBeenCalled();
+  });
+
+  it('runs deferred action immediately when notifications are already enabled', async () => {
+    const action = jest.fn();
+    const { result } = renderNudgeHook();
+
+    let didRun = false;
+    await act(async () => {
+      didRun = await result.current.runAfterNotificationsEnabled(action);
+    });
+
+    expect(didRun).toBe(true);
+    expect(action).toHaveBeenCalledTimes(1);
+    expect(mockShowToast).not.toHaveBeenCalled();
+  });
+
+  it('defers action until notifications become enabled', async () => {
+    let notificationsEnabled = false;
+    mockSelectors({ notificationsEnabled });
+    const action = jest.fn();
+    const { result, rerender } = renderNudgeHook();
+
+    let didRun = true;
+    await act(async () => {
+      didRun = await result.current.runAfterNotificationsEnabled(action);
+    });
+
+    expect(didRun).toBe(false);
+    expect(action).not.toHaveBeenCalled();
+    expect(mockShowToast).toHaveBeenCalledTimes(1);
+
+    notificationsEnabled = true;
+    mockSelectors({ notificationsEnabled });
+    rerender();
+
+    await waitFor(() => {
+      expect(action).toHaveBeenCalledTimes(1);
+    });
+    expect(mockCloseToast).toHaveBeenCalledTimes(1);
+  });
+
+  it('shows loading toast before deferred action runs via effect', async () => {
+    let notificationsEnabled = false;
+    mockSelectors({ notificationsEnabled });
+    const action = jest.fn();
+    const { result, rerender } = renderNudgeHook();
+
+    await act(async () => {
+      await result.current.runAfterNotificationsEnabled(action);
+    });
+
+    notificationsEnabled = true;
+    mockSelectors({ notificationsEnabled });
+    rerender();
+
+    await waitFor(() => {
+      expect(action).toHaveBeenCalledTimes(1);
+    });
+
+    // nudge (1st call) + loading in effect (2nd call)
+    expect(mockShowToast).toHaveBeenCalledTimes(2);
+    expect(mockShowToast).toHaveBeenLastCalledWith(
+      expect.objectContaining({ variant: 'loading' }),
+    );
+  });
+
+  it('does not run or prompt when notifications are disabled and feature flag is off', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    (isNotificationsFeatureEnabled as jest.Mock).mockReturnValue(false);
+    const action = jest.fn();
+    const { result } = renderNudgeHook();
+
+    let didRun = true;
+    await act(async () => {
+      didRun = await result.current.runAfterNotificationsEnabled(action);
+    });
+
+    expect(didRun).toBe(false);
+    expect(action).not.toHaveBeenCalled();
+    expect(mockShowToast).not.toHaveBeenCalled();
+  });
+
+  it('returns false from showEnableNotificationsNudge when the nudge is unavailable', () => {
+    mockSelectors({ notificationsEnabled: false });
+    (isNotificationsFeatureEnabled as jest.Mock).mockReturnValue(false);
+    const { result } = renderNudgeHook();
+
+    let didShow = true;
+    act(() => {
+      didShow = result.current.showEnableNotificationsNudge();
+    });
+
+    expect(didShow).toBe(false);
+    expect(mockShowToast).not.toHaveBeenCalled();
+  });
+
+  it('clears pending deferred action when the nudge is dismissed', async () => {
+    let notificationsEnabled = false;
+    mockSelectors({ notificationsEnabled });
+    const action = jest.fn();
+    const { result, rerender } = renderNudgeHook();
+
+    await act(async () => {
+      await result.current.runAfterNotificationsEnabled(action);
+    });
+
+    const toastConfig = mockShowToast.mock.calls[0][0] as {
+      closeButtonOptions: { onPress: () => void };
+    };
+    act(() => {
+      toastConfig.closeButtonOptions.onPress();
+    });
+
+    notificationsEnabled = true;
+    mockSelectors({ notificationsEnabled });
+    rerender();
+
+    expect(mockOriginalCloseButtonPress).toHaveBeenCalledTimes(1);
+    expect(action).not.toHaveBeenCalled();
+  });
+
+  it('closes toast and opens Settings when push permission is denied before Turn On', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    mockGetPushPermission.mockResolvedValue('denied');
+    const { result } = renderNudgeHook();
+
+    act(() => {
+      result.current.showEnableNotificationsNudge();
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    expect(mockGetPushPermission).toHaveBeenCalledTimes(1);
+    expect(mockEnableNotifications).not.toHaveBeenCalled();
+    expect(mockCloseToast).toHaveBeenCalledTimes(1);
+    expect(mockOpenSystemSettings).toHaveBeenCalledTimes(1);
+    expect(mockAppStateAddEventListener).toHaveBeenCalledWith(
+      'change',
+      expect.any(Function),
+    );
+  });
+
+  it('calls enableNotifications after user returns from OS settings with permission granted', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    mockGetPushPermission
+      .mockResolvedValueOnce('denied')
+      .mockResolvedValueOnce('authorized');
+
+    let capturedHandler: ((state: string) => Promise<void>) | null = null;
+    const mockRemove = jest.fn();
+    mockAppStateAddEventListener.mockImplementation(
+      (_event: string, handler: (state: string) => Promise<void>) => {
+        capturedHandler = handler;
+        return { remove: mockRemove };
+      },
+    );
+
+    const { result } = renderNudgeHook();
+
+    act(() => {
+      result.current.showEnableNotificationsNudge();
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    expect(mockOpenSystemSettings).toHaveBeenCalledTimes(1);
+    expect(capturedHandler).not.toBeNull();
+    expect(mockEnableNotifications).not.toHaveBeenCalled();
+
+    await act(async () => {
+      await capturedHandler?.('active');
+    });
+
+    expect(mockRemove).toHaveBeenCalledTimes(1);
+    expect(mockGetPushPermission).toHaveBeenCalledTimes(2);
+    expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
+    expect(mockShowToast).toHaveBeenLastCalledWith(
+      expect.objectContaining({ variant: 'loading' }),
+    );
+  });
+
+  it('does not call enableNotifications if permission is still denied after returning from OS settings', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    mockGetPushPermission.mockResolvedValue('denied');
+
+    let capturedHandler: ((state: string) => Promise<void>) | null = null;
+    mockAppStateAddEventListener.mockImplementation(
+      (_event: string, handler: (state: string) => Promise<void>) => {
+        capturedHandler = handler;
+        return { remove: jest.fn() };
+      },
+    );
+
+    const { result } = renderNudgeHook();
+
+    act(() => {
+      result.current.showEnableNotificationsNudge();
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    await act(async () => {
+      await capturedHandler?.('active');
+    });
+
+    expect(mockEnableNotifications).not.toHaveBeenCalled();
+  });
+
+  it('calls onNotificationsEnabled callback after returning from OS settings with permission granted', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    mockGetPushPermission
+      .mockResolvedValueOnce('denied')
+      .mockResolvedValueOnce('authorized');
+
+    let capturedHandler: ((state: string) => Promise<void>) | null = null;
+    mockAppStateAddEventListener.mockImplementation(
+      (_event: string, handler: (state: string) => Promise<void>) => {
+        capturedHandler = handler;
+        return { remove: jest.fn() };
+      },
+    );
+
+    const onNotificationsEnabled = jest.fn();
+    const { result } = renderNudgeHook({ onNotificationsEnabled });
+
+    act(() => {
+      result.current.showEnableNotificationsNudge();
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    await act(async () => {
+      await capturedHandler?.('active');
+    });
+
+    expect(mockEnableNotifications).toHaveBeenCalledTimes(1);
+    expect(onNotificationsEnabled).toHaveBeenCalledTimes(1);
+  });
+
+  it('ignores non-active AppState transitions after opening OS settings', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    mockGetPushPermission.mockResolvedValue('denied');
+
+    let capturedHandler: ((state: string) => Promise<void>) | null = null;
+    mockAppStateAddEventListener.mockImplementation(
+      (_event: string, handler: (state: string) => Promise<void>) => {
+        capturedHandler = handler;
+        return { remove: jest.fn() };
+      },
+    );
+
+    const { result } = renderNudgeHook();
+
+    act(() => {
+      result.current.showEnableNotificationsNudge();
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    await act(async () => {
+      await capturedHandler?.('background');
+    });
+
+    expect(mockGetPushPermission).toHaveBeenCalledTimes(1);
+    expect(mockEnableNotifications).not.toHaveBeenCalled();
+  });
+
+  it('does not open Settings when push permission is authorized before Turn On', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    mockGetPushPermission.mockResolvedValue('authorized');
+    const { result } = renderNudgeHook();
+
+    act(() => {
+      result.current.showEnableNotificationsNudge();
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    expect(mockCloseToast).toHaveBeenCalledTimes(1);
+    expect(mockOpenSystemSettings).not.toHaveBeenCalled();
+  });
+
+  it('closes toast even when called from runAfterNotificationsEnabled flow', async () => {
+    mockSelectors({ notificationsEnabled: false });
+    const action = jest.fn();
+    const { result } = renderNudgeHook();
+
+    await act(async () => {
+      await result.current.runAfterNotificationsEnabled(action);
+    });
+
+    const linkButtonOptions = mockEnableNotificationsNudge.mock.calls[0][0] as {
+      onPress: () => Promise<void>;
+    };
+    await act(async () => {
+      await linkButtonOptions.onPress();
+    });
+
+    expect(mockCloseToast).toHaveBeenCalledTimes(1);
+  });
+
+  it('closeEnableNotificationsNudge clears pending action and closes the toast', async () => {
+    let notificationsEnabled = false;
+    mockSelectors({ notificationsEnabled });
+    const action = jest.fn();
+    const { result, rerender } = renderNudgeHook();
+
+    await act(async () => {
+      await result.current.runAfterNotificationsEnabled(action);
+    });
+
+    act(() => {
+      result.current.closeEnableNotificationsNudge();
+    });
+
+    notificationsEnabled = true;
+    mockSelectors({ notificationsEnabled });
+    rerender();
+
+    expect(mockCloseToast).toHaveBeenCalledTimes(1);
+    expect(action).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/Rewards/hooks/useRewardsNotificationsNudge.ts b/app/components/UI/Rewards/hooks/useRewardsNotificationsNudge.ts
new file mode 100644
index 00000000000..979066f98f0
--- /dev/null
+++ b/app/components/UI/Rewards/hooks/useRewardsNotificationsNudge.ts
@@ -0,0 +1,259 @@
+import { useCallback, useContext, useEffect, useRef } from 'react';
+import { AppState } from 'react-native';
+import { useSelector } from 'react-redux';
+import { ToastContext } from '../../../../component-library/components/Toast';
+import { strings } from '../../../../../locales/i18n';
+import {
+  selectIsMetamaskNotificationsEnabled,
+  selectIsMetaMaskPushNotificationsEnabled,
+} from '../../../../selectors/notifications';
+import { isNotificationsFeatureEnabled } from '../../../../util/notifications/constants';
+import { useEnableNotifications } from '../../../../util/notifications/hooks/useNotifications';
+import NotificationService, {
+  getPushPermission,
+} from '../../../../util/notifications/services/NotificationService';
+import useRewardsToast from './useRewardsToast';
+
+type NotificationsEnabledAction = () => Promise<void> | void;
+
+interface UseRewardsNotificationsNudgeOptions {
+  enabled?: boolean;
+  onNotificationsEnabled?: () => void;
+}
+
+export interface UseRewardsNotificationsNudgeReturn {
+  areNotificationsEnabled: boolean;
+  canPromptToEnableNotifications: boolean;
+  shouldPromptToEnableNotifications: boolean;
+  showEnableNotificationsNudge: () => boolean;
+  closeEnableNotificationsNudge: () => void;
+  runAfterNotificationsEnabled: (
+    action: NotificationsEnabledAction,
+  ) => Promise<boolean>;
+}
+
+/**
+ * Shared Rewards notification nudge flow.
+ *
+ * Screens can either show the nudge directly, or defer an action until
+ * MetaMask notifications and push notifications are both enabled.
+ */
+export function useRewardsNotificationsNudge(
+  options: UseRewardsNotificationsNudgeOptions = {},
+): UseRewardsNotificationsNudgeReturn {
+  const { enabled = true, onNotificationsEnabled } = options;
+  const onNotificationsEnabledRef = useRef(onNotificationsEnabled);
+  onNotificationsEnabledRef.current = onNotificationsEnabled;
+  const isMetamaskNotificationsEnabled = useSelector(
+    selectIsMetamaskNotificationsEnabled,
+  );
+  const isMetaMaskPushNotificationsEnabled = useSelector(
+    selectIsMetaMaskPushNotificationsEnabled,
+  );
+  const { toastRef } = useContext(ToastContext);
+  const { showToast, RewardsToastOptions } = useRewardsToast();
+  const { enableNotifications } = useEnableNotifications({
+    nudgeEnablePush: true,
+  });
+  const notificationsEnableInFlightRef = useRef(false);
+  const pendingActionRef = useRef<NotificationsEnabledAction | null>(null);
+  const appStateSubscriptionRef = useRef<ReturnType<
+    typeof AppState.addEventListener
+  > | null>(null);
+
+  const canPromptToEnableNotifications = isNotificationsFeatureEnabled();
+  const areNotificationsEnabled =
+    isMetamaskNotificationsEnabled && isMetaMaskPushNotificationsEnabled;
+  const shouldPromptToEnableNotifications =
+    enabled && canPromptToEnableNotifications && !areNotificationsEnabled;
+
+  // Kept in sync on every render so closeEnableNotificationsNudge can read the
+  // latest value without being recreated whenever areNotificationsEnabled changes.
+  const areNotificationsEnabledRef = useRef(areNotificationsEnabled);
+  areNotificationsEnabledRef.current = areNotificationsEnabled;
+
+  const closeEnableNotificationsNudge = useCallback(() => {
+    pendingActionRef.current = null;
+    // If notifications are now enabled the nudge is already gone (replaced by
+    // loading → success toast). Calling closeToast here would kill the success
+    // toast that was just shown, so we skip it.
+    if (!areNotificationsEnabledRef.current) {
+      toastRef?.current?.closeToast();
+    }
+  }, [toastRef]);
+
+  const handleTurnOnNotifications = useCallback(async () => {
+    if (!enabled || notificationsEnableInFlightRef.current) {
+      return;
+    }
+    notificationsEnableInFlightRef.current = true;
+    showToast(
+      RewardsToastOptions.loading(
+        strings('rewards.notifications_nudge.loading'),
+        strings('rewards.notifications_nudge.loading_description'),
+      ),
+    );
+    try {
+      const permission = await getPushPermission();
+      if (permission === 'denied') {
+        toastRef?.current?.closeToast();
+        NotificationService.openSystemSettings();
+        appStateSubscriptionRef.current = AppState.addEventListener(
+          'change',
+          async (nextState) => {
+            if (nextState !== 'active') return;
+            appStateSubscriptionRef.current?.remove();
+            appStateSubscriptionRef.current = null;
+            const retryPermission = await getPushPermission();
+            if (retryPermission === 'denied') return;
+            notificationsEnableInFlightRef.current = true;
+            showToast(
+              RewardsToastOptions.loading(
+                strings('rewards.notifications_nudge.loading'),
+                strings('rewards.notifications_nudge.loading_description'),
+              ),
+            );
+            try {
+              await enableNotifications();
+              toastRef?.current?.closeToast();
+              onNotificationsEnabledRef.current?.();
+            } catch {
+              toastRef?.current?.closeToast();
+              showToast(
+                RewardsToastOptions.error(
+                  strings('rewards.notifications_nudge.enable_error'),
+                ),
+              );
+            } finally {
+              notificationsEnableInFlightRef.current = false;
+            }
+          },
+        );
+        return;
+      }
+      await enableNotifications();
+      toastRef?.current?.closeToast();
+      onNotificationsEnabledRef.current?.();
+    } catch {
+      toastRef?.current?.closeToast();
+      showToast(
+        RewardsToastOptions.error(
+          strings('rewards.notifications_nudge.enable_error'),
+        ),
+      );
+    } finally {
+      notificationsEnableInFlightRef.current = false;
+    }
+  }, [enableNotifications, enabled, toastRef, showToast, RewardsToastOptions]);
+
+  const showEnableNotificationsNudge = useCallback(() => {
+    if (!shouldPromptToEnableNotifications) {
+      return false;
+    }
+
+    const nudgeConfig = RewardsToastOptions.enableNotificationsNudge({
+      label: strings('rewards.notifications_nudge.turn_on_button'),
+      onPress: handleTurnOnNotifications,
+    });
+
+    showToast(
+      nudgeConfig.closeButtonOptions
+        ? {
+            ...nudgeConfig,
+            closeButtonOptions: {
+              ...nudgeConfig.closeButtonOptions,
+              onPress: () => {
+                pendingActionRef.current = null;
+                nudgeConfig.closeButtonOptions?.onPress?.();
+              },
+            },
+          }
+        : nudgeConfig,
+    );
+    return true;
+  }, [
+    RewardsToastOptions,
+    handleTurnOnNotifications,
+    shouldPromptToEnableNotifications,
+    showToast,
+  ]);
+
+  const runAfterNotificationsEnabled = useCallback(
+    async (action: NotificationsEnabledAction) => {
+      if (!enabled) {
+        return false;
+      }
+      if (areNotificationsEnabled) {
+        await action();
+        return true;
+      }
+      if (!canPromptToEnableNotifications) {
+        return false;
+      }
+
+      pendingActionRef.current = action;
+      showEnableNotificationsNudge();
+      return false;
+    },
+    [
+      areNotificationsEnabled,
+      canPromptToEnableNotifications,
+      enabled,
+      showEnableNotificationsNudge,
+    ],
+  );
+
+  useEffect(() => {
+    if (!pendingActionRef.current || !areNotificationsEnabled || !enabled) {
+      return;
+    }
+
+    const pendingAction = pendingActionRef.current;
+    pendingActionRef.current = null;
+    toastRef?.current?.closeToast();
+    showToast(
+      RewardsToastOptions.loading(
+        strings('rewards.notifications_nudge.loading'),
+        strings('rewards.notifications_nudge.loading_description'),
+      ),
+    );
+    Promise.resolve(pendingAction()).catch(() => {
+      toastRef?.current?.closeToast();
+      showToast(
+        RewardsToastOptions.error(
+          strings('rewards.notifications_nudge.enable_error'),
+        ),
+      );
+    });
+  }, [
+    areNotificationsEnabled,
+    enabled,
+    toastRef,
+    showToast,
+    RewardsToastOptions,
+  ]);
+
+  useEffect(() => {
+    if (!enabled) {
+      appStateSubscriptionRef.current?.remove();
+      appStateSubscriptionRef.current = null;
+      pendingActionRef.current = null;
+    }
+  }, [enabled]);
+
+  useEffect(
+    () => () => {
+      appStateSubscriptionRef.current?.remove();
+    },
+    [],
+  );
+
+  return {
+    areNotificationsEnabled,
+    canPromptToEnableNotifications,
+    shouldPromptToEnableNotifications,
+    showEnableNotificationsNudge,
+    closeEnableNotificationsNudge,
+    runAfterNotificationsEnabled,
+  };
+}
diff --git a/app/components/UI/Rewards/hooks/useRewardsToast.test.tsx b/app/components/UI/Rewards/hooks/useRewardsToast.test.tsx
index f7db2fb7b6a..aa29b8cbfb2 100644
--- a/app/components/UI/Rewards/hooks/useRewardsToast.test.tsx
+++ b/app/components/UI/Rewards/hooks/useRewardsToast.test.tsx
@@ -1,5 +1,6 @@
 import { renderHook, act } from '@testing-library/react-hooks';
-import { useContext } from 'react';
+import { render } from '@testing-library/react-native';
+import { useContext, type ReactElement } from 'react';
 import { playNotification, NotificationMoment } from '../../../../util/haptics';
 import { mockTheme } from '../../../../util/theme';
 import useRewardsToast, { RewardsToastOptions } from './useRewardsToast';
@@ -20,6 +21,10 @@ jest.mock('../../../../util/haptics');
 jest.mock('../../../../../locales/i18n', () => ({
   strings: jest.fn((key: string) => {
     if (key === 'rewards.toast_dismiss') return 'Dismiss';
+    if (key === 'rewards.notifications_nudge.title') return "Don't miss out";
+    if (key === 'rewards.notifications_nudge.description') {
+      return 'Enable notifications to stay informed on campaigns';
+    }
     return key;
   }),
 }));
@@ -32,6 +37,29 @@ jest.mock('../../../../util/theme', () => {
   };
 });
 
+jest.mock('../../../../images/rewards/notification.svg', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: () =>
+      ReactActual.createElement(View, { testID: 'rewards-notification-svg' }),
+  };
+});
+
+jest.mock('@metamask/design-system-react-native', () => {
+  const ReactActual = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    Box: ({ children }: { children?: React.ReactNode }) =>
+      ReactActual.createElement(
+        View,
+        { testID: 'rewards-nudge-start-accessory-box' },
+        children,
+      ),
+  };
+});
+
 describe('useRewardsToast', () => {
   let mockShowToast: jest.Mock;
   let mockCloseToast: jest.Mock;
@@ -79,6 +107,31 @@ describe('useRewardsToast', () => {
       });
       expect(playNotification).toHaveBeenCalledWith(NotificationMoment.Success);
     });
+
+    it('strips hapticsType from payload passed to toastRef for enableNotificationsNudge', async () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const nudgeConfig =
+        result.current.RewardsToastOptions.enableNotificationsNudge({
+          label: 'Turn on',
+          onPress: jest.fn(),
+        });
+
+      await act(async () => {
+        result.current.showToast(nudgeConfig);
+        await new Promise((resolve) => setTimeout(resolve, 0));
+      });
+
+      expect(mockShowToast).toHaveBeenCalledWith(
+        expect.not.objectContaining({ hapticsType: expect.anything() }),
+      );
+      expect(mockShowToast).toHaveBeenCalledWith(
+        expect.objectContaining({
+          variant: ToastVariants.Plain,
+          hasNoTimeout: true,
+        }),
+      );
+      expect(playNotification).toHaveBeenCalledWith(NotificationMoment.Warning);
+    });
   });
 
   describe('RewardsToastOptions configurations', () => {
@@ -213,6 +266,122 @@ describe('useRewardsToast', () => {
       });
     });
 
+    it('returns loading configuration with title only', () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const config = result.current.RewardsToastOptions.loading('Loading...');
+
+      expect(config).toMatchObject({
+        variant: ToastVariants.Plain,
+        hasNoTimeout: true,
+        hapticsType: NotificationMoment.Warning,
+      });
+      expect(config.labelOptions).toEqual([
+        { label: 'Loading...', isBold: true },
+      ]);
+      expect(config.descriptionOptions).toBeUndefined();
+      expect(config.closeButtonOptions).toMatchObject({
+        variant: ButtonIconVariant.Icon,
+        iconName: IconName.Close,
+      });
+    });
+
+    it('returns loading configuration with title and subtitle', () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const config = result.current.RewardsToastOptions.loading(
+        'Loading...',
+        'Please wait',
+      );
+
+      expect(config.labelOptions).toEqual([
+        { label: 'Loading...', isBold: true },
+      ]);
+      expect(config.descriptionOptions).toEqual({ description: 'Please wait' });
+    });
+
+    it('calls closeToast when loading close button is pressed', () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const config = result.current.RewardsToastOptions.loading('Loading...');
+
+      config.closeButtonOptions?.onPress?.();
+
+      expect(mockCloseToast).toHaveBeenCalledTimes(1);
+    });
+
+    it('renders startAccessory for loading config', () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const config = result.current.RewardsToastOptions.loading('Loading...');
+
+      expect(config.startAccessory).toBeDefined();
+    });
+
+    it('returns enableNotificationsNudge configuration with Plain variant', () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const onPress = jest.fn();
+      const config =
+        result.current.RewardsToastOptions.enableNotificationsNudge({
+          label: 'Turn on',
+          onPress,
+        });
+
+      expect(config).toMatchObject({
+        variant: ToastVariants.Plain,
+        hasNoTimeout: true,
+        hapticsType: NotificationMoment.Warning,
+        linkButtonOptions: { label: 'Turn on', onPress },
+      });
+      expect(config.labelOptions).toEqual([
+        { label: "Don't miss out", isBold: true },
+      ]);
+      expect(config.descriptionOptions).toEqual({
+        description: 'Enable notifications to stay informed on campaigns',
+      });
+      expect(config.closeButtonOptions).toMatchObject({
+        variant: ButtonIconVariant.Icon,
+        iconName: IconName.Close,
+      });
+    });
+
+    it('passes linkButtonOptions through to enableNotificationsNudge config', () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const onPress = jest.fn();
+      const config =
+        result.current.RewardsToastOptions.enableNotificationsNudge({
+          label: 'Open settings',
+          onPress,
+        });
+
+      expect(config.linkButtonOptions).toEqual({
+        label: 'Open settings',
+        onPress,
+      });
+    });
+
+    it('renders startAccessory containing notification icon placeholder', () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const config =
+        result.current.RewardsToastOptions.enableNotificationsNudge({
+          label: 'Turn on',
+          onPress: jest.fn(),
+        });
+
+      expect(config.startAccessory).toBeDefined();
+      const { getByTestId } = render(config.startAccessory as ReactElement);
+      expect(getByTestId('rewards-notification-svg')).toBeDefined();
+    });
+
+    it('calls closeToast when enableNotificationsNudge close button is pressed', () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const config =
+        result.current.RewardsToastOptions.enableNotificationsNudge({
+          label: 'Turn on',
+          onPress: jest.fn(),
+        });
+
+      config.closeButtonOptions?.onPress?.();
+
+      expect(mockCloseToast).toHaveBeenCalledTimes(1);
+    });
+
     it('calls closeToast when close button is pressed', () => {
       const { result } = renderHook(() => useRewardsToast());
       const config = result.current.RewardsToastOptions.success('Test Title');
@@ -221,6 +390,68 @@ describe('useRewardsToast', () => {
 
       expect(mockCloseToast).toHaveBeenCalledTimes(1);
     });
+
+    it('returns outcomeWinner configuration with CTA and close handlers', () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const onCta = jest.fn();
+      const onClose = jest.fn();
+      const config = result.current.RewardsToastOptions.outcomeWinner({
+        title: 'Winner title',
+        description: 'Winner body',
+        ctaLabel: 'Next',
+        onCtaPress: onCta,
+        onClosePress: onClose,
+      });
+
+      expect(config).toMatchObject({
+        variant: ToastVariants.Plain,
+        hasNoTimeout: true,
+        hapticsType: NotificationMoment.Success,
+        descriptionOptions: { description: 'Winner body' },
+        linkButtonOptions: { label: 'Next' },
+      });
+      expect(config.labelOptions).toEqual([
+        { label: 'Winner title', isBold: true },
+      ]);
+      expect(config.startAccessory).toBeDefined();
+      const { getByTestId } = render(config.startAccessory as ReactElement);
+      expect(getByTestId('rewards-nudge-start-accessory-box')).toBeDefined();
+      config.linkButtonOptions?.onPress?.();
+      config.closeButtonOptions?.onPress?.();
+      expect(onCta).toHaveBeenCalledTimes(1);
+      expect(onClose).toHaveBeenCalledTimes(1);
+    });
+
+    it('returns outcomeNonWinner configuration with CTA and close handlers', () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const onCta = jest.fn();
+      const onClose = jest.fn();
+      const config = result.current.RewardsToastOptions.outcomeNonWinner({
+        title: 'Thanks title',
+        description: 'Thanks body',
+        ctaLabel: 'Done',
+        onCtaPress: onCta,
+        onClosePress: onClose,
+      });
+
+      expect(config).toMatchObject({
+        variant: ToastVariants.Icon,
+        iconName: IconName.Confirmation,
+        iconColor: mockTheme.colors.success.default,
+        backgroundColor: 'transparent',
+        hasNoTimeout: true,
+        hapticsType: NotificationMoment.Warning,
+        descriptionOptions: { description: 'Thanks body' },
+        linkButtonOptions: { label: 'Done' },
+      });
+      expect(config.labelOptions).toEqual([
+        { label: 'Thanks title', isBold: true },
+      ]);
+      config.linkButtonOptions?.onPress?.();
+      config.closeButtonOptions?.onPress?.();
+      expect(onCta).toHaveBeenCalledTimes(1);
+      expect(onClose).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe('edge cases and error handling', () => {
@@ -346,6 +577,17 @@ describe('useRewardsToast', () => {
 
       expect(config.hasNoTimeout).toBe(false);
     });
+
+    it('uses persistent toast timeout for enableNotificationsNudge', () => {
+      const { result } = renderHook(() => useRewardsToast());
+      const config =
+        result.current.RewardsToastOptions.enableNotificationsNudge({
+          label: 'Turn on',
+          onPress: jest.fn(),
+        });
+
+      expect(config.hasNoTimeout).toBe(true);
+    });
   });
 
   describe('label and description formatting', () => {
diff --git a/app/components/UI/Rewards/hooks/useRewardsToast.tsx b/app/components/UI/Rewards/hooks/useRewardsToast.tsx
index 1c18401ecf3..48fa2bfe57c 100644
--- a/app/components/UI/Rewards/hooks/useRewardsToast.tsx
+++ b/app/components/UI/Rewards/hooks/useRewardsToast.tsx
@@ -1,9 +1,12 @@
-import { useCallback, useContext, useMemo } from 'react';
+import React, { useCallback, useContext, useMemo } from 'react';
+import { ActivityIndicator } from 'react-native';
+import { Box } from '@metamask/design-system-react-native';
 import { ToastContext } from '../../../../component-library/components/Toast';
 import {
   ButtonIconVariant,
   ToastDescriptionOptions,
   ToastLabelOptions,
+  ToastLinkButtonOptions,
   ToastOptions,
   ToastVariants,
 } from '../../../../component-library/components/Toast/Toast.types';
@@ -14,15 +17,32 @@ import {
   NotificationMoment,
   type HapticNotificationMoment,
 } from '../../../../util/haptics';
+import { strings } from '../../../../../locales/i18n';
+import RewardsNotificationIcon from '../../../../images/rewards/notification.svg';
+import RewardsTrophyIcon from '../../../../images/rewards/trophy.svg';
 
 export type RewardsToastOptions = ToastOptions & {
   hapticsType: HapticNotificationMoment;
 };
 
+export interface OutcomeCtaToastParams {
+  title: string;
+  description: string;
+  ctaLabel: string;
+  onCtaPress: () => void;
+  onClosePress: () => void;
+}
+
 export interface RewardsToastConfig {
   success: (title: string, subtitle?: string) => RewardsToastOptions;
   error: (title: string, subtitle?: string) => RewardsToastOptions;
+  loading: (title: string, subtitle?: string) => RewardsToastOptions;
   entriesClosed: (title: string, subtitle?: string) => RewardsToastOptions;
+  enableNotificationsNudge: (
+    linkButtonOptions: ToastLinkButtonOptions,
+  ) => RewardsToastOptions;
+  outcomeWinner: (params: OutcomeCtaToastParams) => RewardsToastOptions;
+  outcomeNonWinner: (params: OutcomeCtaToastParams) => RewardsToastOptions;
 }
 
 const getRewardsToastLabels = (title: string): ToastLabelOptions => {
@@ -104,6 +124,26 @@ const useRewardsToast = (): {
           },
         },
       }),
+      loading: (title: string, subtitle?: string) => ({
+        ...(REWARDS_TOASTS_DEFAULT_OPTIONS as RewardsToastOptions),
+        variant: ToastVariants.Plain,
+        hasNoTimeout: true,
+        hapticsType: NotificationMoment.Warning,
+        startAccessory: (
+          <Box twClassName="p-1 mr-2">
+            <ActivityIndicator size="small" color={theme.colors.icon.default} />
+          </Box>
+        ),
+        labelOptions: getRewardsToastLabels(title),
+        descriptionOptions: getRewardsToastDescriptionLabels(subtitle),
+        closeButtonOptions: {
+          variant: ButtonIconVariant.Icon,
+          iconName: IconName.Close,
+          onPress: () => {
+            toastRef?.current?.closeToast();
+          },
+        },
+      }),
       entriesClosed: (title: string, subtitle?: string) => ({
         ...(REWARDS_TOASTS_DEFAULT_OPTIONS as RewardsToastOptions),
         variant: ToastVariants.Icon,
@@ -122,11 +162,102 @@ const useRewardsToast = (): {
           },
         },
       }),
+      enableNotificationsNudge: (
+        linkButtonOptions: ToastLinkButtonOptions,
+      ) => ({
+        ...(REWARDS_TOASTS_DEFAULT_OPTIONS as RewardsToastOptions),
+        variant: ToastVariants.Plain,
+        hasNoTimeout: true,
+        hapticsType: NotificationMoment.Warning,
+        startAccessory: (
+          <Box twClassName="p-1 mr-2">
+            <RewardsNotificationIcon
+              name="notification"
+              width={24}
+              height={24}
+              color={theme.colors.warning.default}
+            />
+          </Box>
+        ),
+        labelOptions: getRewardsToastLabels(
+          strings('rewards.notifications_nudge.title'),
+        ),
+        descriptionOptions: getRewardsToastDescriptionLabels(
+          strings('rewards.notifications_nudge.description'),
+        ),
+        linkButtonOptions,
+        closeButtonOptions: {
+          variant: ButtonIconVariant.Icon,
+          iconName: IconName.Close,
+          onPress: () => {
+            toastRef?.current?.closeToast();
+          },
+        },
+      }),
+      outcomeWinner: ({
+        title,
+        description,
+        ctaLabel,
+        onCtaPress,
+        onClosePress,
+      }: OutcomeCtaToastParams) => ({
+        ...(REWARDS_TOASTS_DEFAULT_OPTIONS as RewardsToastOptions),
+        variant: ToastVariants.Plain,
+        hasNoTimeout: true,
+        hapticsType: NotificationMoment.Success,
+        startAccessory: (
+          <Box twClassName="p-1 mr-2">
+            <RewardsTrophyIcon
+              name="trophy"
+              width={24}
+              height={24}
+              color={theme.colors.success.default}
+            />
+          </Box>
+        ),
+        labelOptions: getRewardsToastLabels(title),
+        descriptionOptions: { description },
+        linkButtonOptions: {
+          label: ctaLabel,
+          onPress: onCtaPress,
+        },
+        closeButtonOptions: {
+          variant: ButtonIconVariant.Icon,
+          iconName: IconName.Close,
+          onPress: onClosePress,
+        },
+      }),
+      outcomeNonWinner: ({
+        title,
+        description,
+        ctaLabel,
+        onCtaPress,
+        onClosePress,
+      }: OutcomeCtaToastParams) => ({
+        variant: ToastVariants.Icon,
+        iconName: IconName.Confirmation,
+        iconColor: theme.colors.success.default,
+        backgroundColor: 'transparent',
+        hasNoTimeout: true,
+        hapticsType: NotificationMoment.Warning,
+        labelOptions: getRewardsToastLabels(title),
+        descriptionOptions: { description },
+        linkButtonOptions: {
+          label: ctaLabel,
+          onPress: onCtaPress,
+        },
+        closeButtonOptions: {
+          variant: ButtonIconVariant.Icon,
+          iconName: IconName.Close,
+          onPress: onClosePress,
+        },
+      }),
     }),
     [
       theme.colors.success.default,
       theme.colors.error.default,
       theme.colors.icon.default,
+      theme.colors.warning.default,
       toastRef,
     ],
   );
diff --git a/app/components/UI/Rewards/utils.ts b/app/components/UI/Rewards/utils.ts
index cf902295145..fff1df35443 100644
--- a/app/components/UI/Rewards/utils.ts
+++ b/app/components/UI/Rewards/utils.ts
@@ -106,6 +106,7 @@ export enum RewardsMetricsButtons {
   VISIT_APP_STORE = 'visit_app_store',
   BUY_MUSD = 'buy_musd',
   SWAP_TO_MUSD = 'swap_to_musd',
+  COPY_WINNER_VERIFICATION_CODE = 'copy_winner_verification_code',
 }
 
 export const deriveAccountMetricProps = (account?: InternalAccount) => {
diff --git a/app/components/UI/Rewards/utils/formatUtils.test.ts b/app/components/UI/Rewards/utils/formatUtils.test.ts
index 5eb35ddc9e4..c78001af9c0 100644
--- a/app/components/UI/Rewards/utils/formatUtils.test.ts
+++ b/app/components/UI/Rewards/utils/formatUtils.test.ts
@@ -17,7 +17,6 @@ import {
   validateEmail,
   formatPercentChange,
   isPercentChangeNonNegative,
-  formatComputedAt,
   getChainHex,
   getAssetReference,
   parseCaip19,
@@ -43,24 +42,33 @@ jest.mock('../../../../util/date', () => ({
 
 // Mock i18n strings
 jest.mock('../../../../../locales/i18n', () => ({
-  strings: jest.fn((key: string) => {
-    const t: Record<string, string> = {
-      'rewards.events.to': 'to',
-      'rewards.events.type.swap': 'Swap',
-      'rewards.events.type.referral_action': 'Referral action',
-      'rewards.events.type.sign_up_bonus': 'Sign up bonus',
-      'rewards.events.type.loyalty_bonus': 'Loyalty bonus',
-      'rewards.events.type.one_time_bonus': 'One-time bonus',
-      'rewards.events.type.open_position': 'Opened position',
-      'rewards.events.type.close_position': 'Closed position',
-      'rewards.events.type.take_profit': 'Take profit',
-      'rewards.events.type.stop_loss': 'Stop loss',
-      'rewards.events.type.uncategorized_event': 'Uncategorized event',
-      'perps.market.long': 'Long',
-      'perps.market.short': 'Short',
-    };
-    return t[key] || key;
-  }),
+  strings: jest.fn(
+    (key: string, params: Record<string, string> | undefined) => {
+      const t: Record<string, string> = {
+        'rewards.events.to': 'to',
+        'rewards.events.type.swap': 'Swap',
+        'rewards.events.type.referral_action': 'Referral action',
+        'rewards.events.type.sign_up_bonus': 'Sign up bonus',
+        'rewards.events.type.loyalty_bonus': 'Loyalty bonus',
+        'rewards.events.type.one_time_bonus': 'One-time bonus',
+        'rewards.events.type.open_position': 'Opened position',
+        'rewards.events.type.close_position': 'Closed position',
+        'rewards.events.type.take_profit': 'Take profit',
+        'rewards.events.type.stop_loss': 'Stop loss',
+        'rewards.events.type.uncategorized_event': 'Uncategorized event',
+        'perps.market.long': 'Long',
+        'perps.market.short': 'Short',
+        'rewards.perps_trading_campaign.last_updated': 'Last updated: {{time}}',
+      };
+      let template = t[key] ?? key;
+      if (params) {
+        for (const [paramKey, value] of Object.entries(params)) {
+          template = template.split(`{{${paramKey}}}`).join(value);
+        }
+      }
+      return template;
+    },
+  ),
   default: {
     locale: 'en-US',
   },
@@ -1368,6 +1376,60 @@ describe('formatUtils', () => {
     });
   });
 
+  describe('formatOrdinalRank', () => {
+    it('formats 1 as 1st', () => {
+      expect(formatOrdinalRank(1)).toBe('1st');
+    });
+
+    it('formats 2 as 2nd', () => {
+      expect(formatOrdinalRank(2)).toBe('2nd');
+    });
+
+    it('formats 3 as 3rd', () => {
+      expect(formatOrdinalRank(3)).toBe('3rd');
+    });
+
+    it('formats 4 as 4th', () => {
+      expect(formatOrdinalRank(4)).toBe('4th');
+    });
+
+    it('formats 11 as 11th', () => {
+      expect(formatOrdinalRank(11)).toBe('11th');
+    });
+
+    it('formats 12 as 12th', () => {
+      expect(formatOrdinalRank(12)).toBe('12th');
+    });
+
+    it('formats 13 as 13th', () => {
+      expect(formatOrdinalRank(13)).toBe('13th');
+    });
+
+    it('formats 21 as 21st', () => {
+      expect(formatOrdinalRank(21)).toBe('21st');
+    });
+
+    it('formats 22 as 22nd', () => {
+      expect(formatOrdinalRank(22)).toBe('22nd');
+    });
+
+    it('formats 23 as 23rd', () => {
+      expect(formatOrdinalRank(23)).toBe('23rd');
+    });
+
+    it('formats 111 as 111th', () => {
+      expect(formatOrdinalRank(111)).toBe('111th');
+    });
+
+    it('uses absolute value for negative ranks', () => {
+      expect(formatOrdinalRank(-5)).toBe('5th');
+    });
+
+    it('floors non-integer ranks', () => {
+      expect(formatOrdinalRank(3.7)).toBe('3rd');
+    });
+  });
+
   describe('isPercentChangeNonNegative', () => {
     it('returns true for positive number', () => {
       expect(isPercentChangeNonNegative(0.15)).toBe(true);
@@ -1390,25 +1452,6 @@ describe('formatUtils', () => {
     });
   });
 
-  describe('formatComputedAt', () => {
-    it('returns empty string for null', () => {
-      expect(formatComputedAt(null)).toBe('');
-    });
-
-    it('returns empty string for empty string', () => {
-      expect(formatComputedAt('')).toBe('');
-    });
-
-    it('returns HH:MM:SS for a valid ISO timestamp', () => {
-      const result = formatComputedAt('2026-03-28T14:30:45.000Z');
-      expect(result).toMatch(/^\d{2}:\d{2}:\d{2}$/);
-    });
-
-    it('returns empty string for unparseable value', () => {
-      expect(formatComputedAt('not-a-date')).toBe('');
-    });
-  });
-
   describe('getChainHex', () => {
     it('extracts hex chain ID from EIP-155 CAIP-19', () => {
       expect(getChainHex('eip155:1/erc20:0xabc')).toBe('0x1');
@@ -1556,8 +1599,20 @@ describe('formatUtils', () => {
       expect(formatSignedUsd('0')).toBe('$0.00');
     });
 
-    it('returns raw string for non-numeric input', () => {
-      expect(formatSignedUsd('abc')).toBe('abc');
+    it('prepends + for positive number input', () => {
+      expect(formatSignedUsd(5000)).toBe('+$5,000.00');
+    });
+
+    it('formats negative number input', () => {
+      expect(formatSignedUsd(-1250.5)).toBe('$-1,250.50');
+    });
+
+    it('returns em dash for non-numeric string', () => {
+      expect(formatSignedUsd('abc')).toBe('—');
+    });
+
+    it('returns em dash for empty string', () => {
+      expect(formatSignedUsd('')).toBe('—');
     });
   });
 
diff --git a/app/components/UI/Rewards/utils/formatUtils.ts b/app/components/UI/Rewards/utils/formatUtils.ts
index a477d85d242..d6de04f929a 100644
--- a/app/components/UI/Rewards/utils/formatUtils.ts
+++ b/app/components/UI/Rewards/utils/formatUtils.ts
@@ -8,7 +8,7 @@ import {
   parseCaipChainId,
 } from '@metamask/utils';
 import { BigNumber } from 'bignumber.js';
-import I18n from '../../../../../locales/i18n';
+import I18n, { strings } from '../../../../../locales/i18n';
 import { getTimeDifferenceFromNow } from '../../../../util/date';
 import formatFiat from '../../../../util/formatFiat';
 import { getIntlNumberFormatter } from '../../../../util/intl';
@@ -367,10 +367,10 @@ export const formatCompactUsd = (value: number): string => {
  * @example formatSignedUsd('-1250.50')     // '-$1,250.50'
  * @example formatSignedUsd(null)           // '—'
  */
-export const formatSignedUsd = (value: string | null): string => {
+export const formatSignedUsd = (value: string | number | null): string => {
   if (value === null) return '—';
-  const num = parseFloat(value);
-  if (Number.isNaN(num)) return value;
+  const num = typeof value === 'number' ? value : parseFloat(value);
+  if (Number.isNaN(num)) return '—';
   const sign = num > 0 ? '+' : '';
   return `${sign}${formatUsd(value)}`;
 };
@@ -425,22 +425,6 @@ export function formatOrdinalRank(rank: number): string {
   return `${n}${suffix}`;
 }
 
-// ── Timestamp formatting ────────────────────────────────────────────────
-
-/**
- * Formats an ISO 8601 timestamp to `HH:MM:SS`.
- * Returns '' for null or unparseable values.
- */
-export const formatComputedAt = (isoString: string | null): string => {
-  if (!isoString) return '';
-  const date = new Date(isoString);
-  if (isNaN(date.getTime())) return '';
-  const h = date.getHours().toString().padStart(2, '0');
-  const m = date.getMinutes().toString().padStart(2, '0');
-  const s = date.getSeconds().toString().padStart(2, '0');
-  return `${h}:${m}:${s}`;
-};
-
 // ── CAIP-19 / address helpers ───────────────────────────────────────────
 
 /**
diff --git a/app/components/UI/Rewards/utils/perpsCampaignConstants.ts b/app/components/UI/Rewards/utils/perpsCampaignConstants.ts
new file mode 100644
index 00000000000..ee988ff0387
--- /dev/null
+++ b/app/components/UI/Rewards/utils/perpsCampaignConstants.ts
@@ -0,0 +1,9 @@
+/**
+ * Notional volume (USD) required to qualify for the perps trading competition leaderboard.
+ * Aligns with backend / UI rules for `qualified` on leaderboard position.
+ */
+export const PERPS_QUALIFICATION_NOTIONAL_USD = 25_000;
+
+/** HyperTracker attribution URL for the perps trading campaign leaderboard. */
+export const HYPERTRACKER_ATTRIBUTION_URL =
+  'https://hypertracker.io?utm_source=metamask&utm_medium=leaderboard&utm_campaign=partner-attribution';
diff --git a/app/components/UI/Rewards/utils/prizePoolUtils.test.ts b/app/components/UI/Rewards/utils/prizePoolUtils.test.ts
new file mode 100644
index 00000000000..6457bf916ec
--- /dev/null
+++ b/app/components/UI/Rewards/utils/prizePoolUtils.test.ts
@@ -0,0 +1,79 @@
+import { computePrizePoolProgress } from './prizePoolUtils';
+
+describe('computePrizePoolProgress', () => {
+  const ondoLike = [
+    { deposit: 0, prize: 25_000 },
+    { deposit: 1_500_000, prize: 50_000 },
+    { deposit: 3_500_000, prize: 75_000 },
+    { deposit: 6_000_000, prize: 100_000 },
+  ] as const;
+
+  it('returns first-tier defaults when amount is below first threshold above zero', () => {
+    const result = computePrizePoolProgress(
+      ondoLike,
+      1_000_000,
+      (m) => m.deposit,
+    );
+    expect(result.currentPrize).toBe(25_000);
+    expect(result.nextPrize).toBe(50_000);
+    expect(result.nextThreshold).toBe(1_500_000);
+    expect(result.isMaxTier).toBe(false);
+    expect(result.progress).toBeCloseTo(1_000_000 / 1_500_000);
+  });
+
+  it('returns max tier when amount meets final milestone', () => {
+    const result = computePrizePoolProgress(
+      ondoLike,
+      6_000_000,
+      (m) => m.deposit,
+    );
+    expect(result.progress).toBe(1);
+    expect(result.currentPrize).toBe(100_000);
+    expect(result.nextPrize).toBeNull();
+    expect(result.nextThreshold).toBe(6_000_000);
+    expect(result.isMaxTier).toBe(true);
+  });
+
+  it('interpolates progress within a tier (perps-style notionalVolume)', () => {
+    const perpsLike = [
+      { notionalVolume: 0, prize: 10_000 },
+      { notionalVolume: 5_000_000, prize: 15_000 },
+      { notionalVolume: 10_000_000, prize: 20_000 },
+    ] as const;
+
+    const mid = 7_500_000;
+    const result = computePrizePoolProgress(
+      perpsLike,
+      mid,
+      (m) => m.notionalVolume,
+    );
+    expect(result.currentPrize).toBe(15_000);
+    expect(result.nextPrize).toBe(20_000);
+    expect(result.nextThreshold).toBe(10_000_000);
+    expect(result.progress).toBe(0.5);
+  });
+
+  it('returns zero progress at the start of the first tier', () => {
+    const result = computePrizePoolProgress(ondoLike, 0, (m) => m.deposit);
+    expect(result.progress).toBe(0);
+    expect(result.currentPrize).toBe(25_000);
+    expect(result.nextThreshold).toBe(1_500_000);
+  });
+
+  it('returns expected currentPrize at each Ondo-style tier boundary', () => {
+    const cp = (amount: number) =>
+      computePrizePoolProgress(ondoLike, amount, (m) => m.deposit).currentPrize;
+
+    expect(cp(0)).toBe(25_000);
+    expect(cp(500_000)).toBe(25_000);
+    expect(cp(1_499_999)).toBe(25_000);
+    expect(cp(1_500_000)).toBe(50_000);
+    expect(cp(2_000_000)).toBe(50_000);
+    expect(cp(3_499_999)).toBe(50_000);
+    expect(cp(3_500_000)).toBe(75_000);
+    expect(cp(4_500_000)).toBe(75_000);
+    expect(cp(5_999_999)).toBe(75_000);
+    expect(cp(6_000_000)).toBe(100_000);
+    expect(cp(10_000_000)).toBe(100_000);
+  });
+});
diff --git a/app/components/UI/Rewards/utils/prizePoolUtils.ts b/app/components/UI/Rewards/utils/prizePoolUtils.ts
new file mode 100644
index 00000000000..5f31c32c109
--- /dev/null
+++ b/app/components/UI/Rewards/utils/prizePoolUtils.ts
@@ -0,0 +1,49 @@
+export interface PrizePoolProgressResult {
+  progress: number;
+  currentPrize: number;
+  nextPrize: number | null;
+  nextThreshold: number;
+  isMaxTier: boolean;
+}
+
+/**
+ * Computes progress toward the next prize tier from sorted milestones (ascending threshold).
+ */
+export function computePrizePoolProgress<T extends { prize: number }>(
+  milestones: readonly T[],
+  totalAmount: number,
+  getThreshold: (m: T) => number,
+): PrizePoolProgressResult {
+  let currentIndex = 0;
+  for (let i = milestones.length - 1; i >= 0; i--) {
+    if (totalAmount >= getThreshold(milestones[i])) {
+      currentIndex = i;
+      break;
+    }
+  }
+
+  const current = milestones[currentIndex];
+  const next = milestones[currentIndex + 1];
+
+  if (!next) {
+    return {
+      progress: 1,
+      currentPrize: current.prize,
+      nextPrize: null,
+      nextThreshold: getThreshold(current),
+      isMaxTier: true,
+    };
+  }
+
+  const rangeAmount = getThreshold(next) - getThreshold(current);
+  const progressInRange = totalAmount - getThreshold(current);
+  const progress = Math.min(progressInRange / rangeAmount, 1);
+
+  return {
+    progress,
+    currentPrize: current.prize,
+    nextPrize: next.prize,
+    nextThreshold: getThreshold(next),
+    isMaxTier: false,
+  };
+}
diff --git a/app/components/UI/SecurityOptionToggle/SecurityOptionToggle.tsx b/app/components/UI/SecurityOptionToggle/SecurityOptionToggle.tsx
index be8f03f8509..85471e4f3b8 100644
--- a/app/components/UI/SecurityOptionToggle/SecurityOptionToggle.tsx
+++ b/app/components/UI/SecurityOptionToggle/SecurityOptionToggle.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback } from 'react';
-import { Platform, Switch, View } from 'react-native';
+import { Switch, View } from 'react-native';
 import { createStyles } from './styles';
-import generateTestId from '../../../../wdio/utils/generateTestId';
 import Text, {
   TextColor,
   TextVariant,
@@ -57,7 +56,7 @@ const SecurityOptionToggle = ({
             style={styles.switch}
             ios_backgroundColor={colors.border.muted}
             disabled={disabled}
-            {...generateTestId(Platform, testId)}
+            testID={testId}
           />
         </View>
       </View>
diff --git a/app/components/UI/SecurityTrust/components/SecurityTrustEntryCard/SecurityTrustEntryCard.tsx b/app/components/UI/SecurityTrust/components/SecurityTrustEntryCard/SecurityTrustEntryCard.tsx
index f3aa0ed469c..d029711cd68 100644
--- a/app/components/UI/SecurityTrust/components/SecurityTrustEntryCard/SecurityTrustEntryCard.tsx
+++ b/app/components/UI/SecurityTrust/components/SecurityTrustEntryCard/SecurityTrustEntryCard.tsx
@@ -124,9 +124,9 @@ const SecurityTrustEntryCard: React.FC<SecurityTrustEntryCardProps> = ({
         )}
       </Box>
       <Text
-        variant={TextVariant.HeadingMd}
+        variant={TextVariant.BodyMd}
         color={config.textColor}
-        fontWeight={'600' as FontWeight}
+        fontWeight={FontWeight.Medium}
       >
         {config.label}
       </Text>
diff --git a/app/components/UI/SettingsDrawer/index.js b/app/components/UI/SettingsDrawer/index.js
index ba16c8ad17c..57d57bf854c 100644
--- a/app/components/UI/SettingsDrawer/index.js
+++ b/app/components/UI/SettingsDrawer/index.js
@@ -1,9 +1,8 @@
 import React from 'react';
-import { View, StyleSheet, TouchableOpacity, Platform } from 'react-native';
+import { View, StyleSheet, TouchableOpacity } from 'react-native';
 import PropTypes from 'prop-types';
 import { fontStyles } from '../../../styles/common';
 import { useTheme } from '../../../util/theme';
-import generateTestId from '../../../../wdio/utils/generateTestId';
 import Icon, {
   IconColor,
   IconName,
@@ -54,10 +53,6 @@ const propTypes = {
    * Additional descriptive text about this option
    */
   description: PropTypes.string,
-  /**
-   * Disable bottom border
-   */
-  noBorder: PropTypes.bool,
   /**
    * Handler called when this drawer is pressed
    */
@@ -96,7 +91,7 @@ const SettingsDrawer = ({
   const { colors } = useTheme();
   const styles = createStyles(colors, titleColor);
   return (
-    <TouchableOpacity onPress={onPress} {...generateTestId(Platform, testID)}>
+    <TouchableOpacity onPress={onPress} testID={testID}>
       <ListItem style={styles.root} gap={16}>
         <Box flexDirection={BoxFlexDirection.Column} twClassName="flex-1">
           <Text variant={TextVariant.BodyLGMedium} color={titleColor}>
diff --git a/app/components/UI/SettingsNotification/__snapshots__/index.test.tsx.snap b/app/components/UI/SettingsNotification/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 05d92c4e81d..00000000000
--- a/app/components/UI/SettingsNotification/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,90 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SettingsNotification should render correctly as notification 1`] = `
-<View
-  style={
-    [
-      {
-        "alignSelf": "center",
-        "flex": 1,
-        "flexDirection": "row",
-        "justifyContent": "flex-end",
-        "marginRight": 24,
-      },
-      null,
-    ]
-  }
->
-  <Text
-    allowFontScaling={false}
-    selectable={false}
-    style={
-      [
-        {
-          "color": "#ca3542",
-          "fontSize": 16,
-        },
-        {
-          "marginRight": 4,
-        },
-        {
-          "fontFamily": "FontAwesome",
-          "fontStyle": "normal",
-          "fontWeight": "normal",
-        },
-        {},
-      ]
-    }
-  >
-    
-  </Text>
-  this is a notification
-</View>
-`;
-
-exports[`SettingsNotification should render correctly as warning 1`] = `
-<View
-  style={
-    [
-      {
-        "alignItems": "center",
-        "borderRadius": 10,
-        "display": "flex",
-        "flexDirection": "row",
-        "justifyContent": "center",
-        "marginTop": 10,
-        "padding": 12,
-        "width": "100%",
-      },
-      {
-        "backgroundColor": "#ca35421a",
-      },
-    ]
-  }
->
-  <Text
-    allowFontScaling={false}
-    selectable={false}
-    style={
-      [
-        {
-          "color": "#ca3542",
-          "fontSize": 16,
-        },
-        {
-          "marginRight": 4,
-        },
-        {
-          "fontFamily": "FontAwesome",
-          "fontStyle": "normal",
-          "fontWeight": "normal",
-        },
-        {},
-      ]
-    }
-  >
-    
-  </Text>
-  this is a warning
-</View>
-`;
diff --git a/app/components/UI/SettingsNotification/index.test.tsx b/app/components/UI/SettingsNotification/index.test.tsx
index 62a4d5849be..acce7596736 100644
--- a/app/components/UI/SettingsNotification/index.test.tsx
+++ b/app/components/UI/SettingsNotification/index.test.tsx
@@ -1,23 +1,30 @@
 import React from 'react';
+import { Text } from 'react-native';
 import { render } from '@testing-library/react-native';
 import SettingsNotification from './';
 
 describe('SettingsNotification', () => {
-  it('should render correctly as warning', () => {
-    const { toJSON } = render(
+  it('renders children in warning variant', () => {
+    const { getByTestId } = render(
       <SettingsNotification isWarning>
-        {'this is a warning'}
+        <Text testID="settings-notification-label">this is a warning</Text>
       </SettingsNotification>,
     );
-    expect(toJSON()).toMatchSnapshot();
+
+    expect(getByTestId('settings-notification-label').props.children).toBe(
+      'this is a warning',
+    );
   });
 
-  it('should render correctly as notification', () => {
-    const { toJSON } = render(
+  it('renders children in notification variant', () => {
+    const { getByTestId } = render(
       <SettingsNotification isWarning isNotification>
-        {'this is a notification'}
+        <Text testID="settings-notification-label">this is a notification</Text>
       </SettingsNotification>,
     );
-    expect(toJSON()).toMatchSnapshot();
+
+    expect(getByTestId('settings-notification-label').props.children).toBe(
+      'this is a notification',
+    );
   });
 });
diff --git a/app/components/UI/Sites/components/SiteRowItem/SiteRowItem.test.tsx b/app/components/UI/Sites/components/SiteRowItem/SiteRowItem.test.tsx
index 29f45f2d573..9c83e7ad90f 100644
--- a/app/components/UI/Sites/components/SiteRowItem/SiteRowItem.test.tsx
+++ b/app/components/UI/Sites/components/SiteRowItem/SiteRowItem.test.tsx
@@ -1,6 +1,11 @@
 import React from 'react';
 import { render, fireEvent } from '@testing-library/react-native';
-import SiteRowItem, { type SiteData } from './SiteRowItem';
+import SiteRowItem, {
+  bookmarkUrlForRemoval,
+  type SiteData,
+} from './SiteRowItem';
+
+jest.mock('../../../WebsiteIcon', () => jest.fn(() => null));
 
 describe('SiteRowItem', () => {
   const mockOnPress = jest.fn();
@@ -54,7 +59,7 @@ describe('SiteRowItem', () => {
       expect(image.props.source.uri).toBe('https://example.com/logo.png');
     });
 
-    it('renders fallback global icon when logoUrl is not provided', () => {
+    it('renders WebsiteIcon fallback when logoUrl is not provided', () => {
       const site = createSite({ logoUrl: undefined });
 
       const { getByTestId, queryByTestId } = render(
@@ -149,5 +154,59 @@ describe('SiteRowItem', () => {
       const image = getByTestId('site-logo-image');
       expect(image).toBeOnTheScreen();
     });
+
+    it('falls back to WebsiteIcon when remote logo image errors', () => {
+      const site = createSite({ logoUrl: 'https://example.com/broken.png' });
+
+      const { getByTestId, queryByTestId } = render(
+        <SiteRowItem site={site} onPress={mockOnPress} />,
+      );
+
+      const image = getByTestId('site-logo-image');
+      fireEvent(image, 'error');
+
+      expect(queryByTestId('site-logo-image')).toBeNull();
+      expect(getByTestId('site-logo-fallback')).toBeOnTheScreen();
+    });
+
+    it('shows remote logo again after logoUrl changes', () => {
+      const siteA = createSite({
+        id: 'row-1',
+        logoUrl: 'https://example.com/broken.png',
+      });
+      const { getByTestId, rerender, queryByTestId } = render(
+        <SiteRowItem site={siteA} onPress={mockOnPress} />,
+      );
+
+      fireEvent(getByTestId('site-logo-image'), 'error');
+      expect(queryByTestId('site-logo-image')).toBeNull();
+
+      const siteB = createSite({
+        id: 'row-1',
+        logoUrl: 'https://example.com/fixed.png',
+      });
+      rerender(<SiteRowItem site={siteB} onPress={mockOnPress} />);
+
+      const image = getByTestId('site-logo-image');
+      expect(image).toBeOnTheScreen();
+      expect(image.props.source.uri).toBe('https://example.com/fixed.png');
+    });
+  });
+
+  describe('bookmarkUrlForRemoval', () => {
+    it('uses storedBookmarkUrl when set', () => {
+      expect(
+        bookmarkUrlForRemoval(
+          createSite({
+            url: 'https://uniswap.org',
+            storedBookmarkUrl: 'uniswap.org',
+          }),
+        ),
+      ).toBe('uniswap.org');
+    });
+
+    it('falls back to url when storedBookmarkUrl is unset', () => {
+      expect(bookmarkUrlForRemoval(createSite())).toBe('https://metamask.io');
+    });
   });
 });
diff --git a/app/components/UI/Sites/components/SiteRowItem/SiteRowItem.tsx b/app/components/UI/Sites/components/SiteRowItem/SiteRowItem.tsx
index d059b368bac..250bd99fdd0 100644
--- a/app/components/UI/Sites/components/SiteRowItem/SiteRowItem.tsx
+++ b/app/components/UI/Sites/components/SiteRowItem/SiteRowItem.tsx
@@ -1,5 +1,11 @@
-import React, { useState, useEffect } from 'react';
-import { TouchableOpacity, Image } from 'react-native';
+import React, { useEffect, useState } from 'react';
+import {
+  TouchableOpacity,
+  StyleSheet,
+  Image,
+  View,
+  type ImageSourcePropType,
+} from 'react-native';
 import {
   Box,
   Text,
@@ -7,15 +13,26 @@ import {
   Icon,
   IconName,
   IconSize,
+  IconColor,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import WebsiteIcon from '../../../WebsiteIcon';
 
 export interface SiteData {
   id: string;
   name: string;
   url: string;
   displayUrl: string;
+  /**
+   * Exact bookmark URL as persisted in Redux. When set (e.g. favorites from
+   * `useBrowserFavoritesSites`), use {@link bookmarkUrlForRemoval} for
+   * `removeBookmark` so removal matches even if `url` was normalized with a protocol.
+   */
+  storedBookmarkUrl?: string;
+  /** Remote URL string — passed to WebsiteIcon for favicon lookup. */
   logoUrl?: string;
+  /** Local bundled image (require result) — rendered directly with <Image>, takes priority over logoUrl. */
+  logoSource?: ImageSourcePropType;
   featured?: boolean;
   /**
    * When true, applies additional padding around the logo image.
@@ -24,20 +41,32 @@ export interface SiteData {
   logoNeedsPadding?: boolean;
 }
 
+/** `url` value to pass to `removeBookmark` for this site row. */
+export function bookmarkUrlForRemoval(site: SiteData): string {
+  return site.storedBookmarkUrl ?? site.url;
+}
+
 interface SiteRowItemProps {
   site: SiteData;
   onPress: () => void;
+  onRemoveFavorite?: () => void;
 }
 
-const SiteRowItem = ({ site, onPress }: SiteRowItemProps) => {
+const { icon: websiteIconStyle, iconWithPadding } = StyleSheet.create({
+  icon: { width: 40, height: 40, borderRadius: 20 },
+  iconWithPadding: { width: 40, height: 40, borderRadius: 20, padding: 6 },
+});
+
+const SiteRowItem = ({ site, onPress, onRemoveFavorite }: SiteRowItemProps) => {
   const tw = useTailwind();
-  const [imageError, setImageError] = useState(false);
+  const [remoteLogoLoadError, setRemoteLogoLoadError] = useState(false);
 
-  // Reset error state when site changes (for list recycling)
   useEffect(() => {
-    setImageError(false);
+    setRemoteLogoLoadError(false);
   }, [site.id, site.logoUrl]);
 
+  const showRemoteLogoImage = Boolean(site.logoUrl) && !remoteLogoLoadError;
+
   return (
     <TouchableOpacity
       testID={`site-row-item-${site.name}`}
@@ -46,39 +75,60 @@ const SiteRowItem = ({ site, onPress }: SiteRowItemProps) => {
     >
       {/* Logo */}
       <Box twClassName="flex-row items-center flex-1">
-        {site.logoUrl && !imageError ? (
-          <Box
-            twClassName={`w-10 h-10 rounded-full bg-white border border-muted mr-4 overflow-hidden items-center justify-center ${site.logoNeedsPadding ? 'p-1' : 'p-0.1'}`}
-          >
+        <Box twClassName="w-10 h-10 rounded-full border border-muted mr-4 overflow-hidden items-center justify-center">
+          {site.logoSource ? (
+            <Image
+              testID="site-logo-image"
+              source={site.logoSource}
+              style={websiteIconStyle}
+            />
+          ) : showRemoteLogoImage ? (
             <Image
               testID="site-logo-image"
               source={{ uri: site.logoUrl }}
-              style={tw.style('w-full h-full')}
+              style={site.logoNeedsPadding ? iconWithPadding : websiteIconStyle}
               resizeMode="contain"
-              onError={() => setImageError(true)}
+              onError={() => setRemoteLogoLoadError(true)}
             />
-          </Box>
-        ) : (
-          <Box
-            testID="site-logo-fallback"
-            twClassName="w-10 h-10 mr-4 items-center justify-center"
-          >
-            <Icon name={IconName.Global} size={IconSize.Lg} />
-          </Box>
-        )}
+          ) : (
+            <View testID="site-logo-fallback">
+              <WebsiteIcon
+                url={site.url}
+                title={site.name}
+                style={websiteIconStyle}
+              />
+            </View>
+          )}
+        </Box>
         {/* Site Info */}
         <Box twClassName="flex-1">
-          <Text variant={TextVariant.BodyMd} style={tw.style('font-medium')}>
+          <Text
+            variant={TextVariant.BodyMd}
+            style={tw.style('font-medium')}
+            numberOfLines={1}
+          >
             {site.name}
           </Text>
-          <Text variant={TextVariant.BodySm} twClassName="text-alternative">
+          <Text
+            variant={TextVariant.BodySm}
+            twClassName="text-alternative"
+            numberOfLines={1}
+          >
             {site.displayUrl}
           </Text>
         </Box>
       </Box>
-      {/* Arrow Icon */}
-      <Box twClassName="ml-3">
-        <Icon name={IconName.Arrow2UpRight} size={IconSize.Md} />
+      {/* Action Icons */}
+      <Box twClassName="ml-3 flex-row items-center gap-3">
+        {onRemoveFavorite && (
+          <TouchableOpacity onPress={onRemoveFavorite} hitSlop={8}>
+            <Icon
+              name={IconName.StarFilled}
+              size={IconSize.Md}
+              color={IconColor.IconDefault}
+            />
+          </TouchableOpacity>
+        )}
       </Box>
     </TouchableOpacity>
   );
diff --git a/app/components/UI/Sites/components/SiteRowItemWrapper/SiteRowItemWrapper.test.tsx b/app/components/UI/Sites/components/SiteRowItemWrapper/SiteRowItemWrapper.test.tsx
deleted file mode 100644
index a9313343194..00000000000
--- a/app/components/UI/Sites/components/SiteRowItemWrapper/SiteRowItemWrapper.test.tsx
+++ /dev/null
@@ -1,264 +0,0 @@
-import React from 'react';
-import { render, fireEvent } from '@testing-library/react-native';
-import SiteRowItemWrapper from './SiteRowItemWrapper';
-import type { NavigationProp, ParamListBase } from '@react-navigation/native';
-import type { SiteData } from '../SiteRowItem/SiteRowItem';
-import Routes from '../../../../../constants/navigation/Routes';
-
-// Mock the dependencies
-jest.mock('../../../../Nav/Main/MainNavigator', () => ({
-  updateLastTrendingScreen: jest.fn(),
-}));
-
-jest.mock('../SiteRowItem/SiteRowItem', () => {
-  const { TouchableOpacity, Text } = jest.requireActual('react-native');
-
-  return {
-    __esModule: true,
-    default: jest.fn(({ onPress, site }) => (
-      <TouchableOpacity testID={`site-row-item-${site.name}`} onPress={onPress}>
-        <Text testID="site-id">{site.id}</Text>
-        <Text testID="site-name">{site.name}</Text>
-        <Text testID="site-url">{site.url}</Text>
-        <Text testID="site-display-url">{site.displayUrl}</Text>
-        {site.logoUrl && <Text testID="site-logo-url">{site.logoUrl}</Text>}
-        {site.featured && <Text testID="site-featured">Featured</Text>}
-      </TouchableOpacity>
-    )),
-  };
-});
-
-describe('SiteRowItemWrapper', () => {
-  let mockNavigation: jest.Mocked<NavigationProp<ParamListBase>>;
-  let mockSiteData: SiteData;
-  let dateNowSpy: jest.SpyInstance;
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    mockNavigation = {
-      navigate: jest.fn(),
-      dispatch: jest.fn(),
-      reset: jest.fn(),
-      goBack: jest.fn(),
-      isFocused: jest.fn(),
-      canGoBack: jest.fn(),
-      getState: jest.fn(),
-      getParent: jest.fn(),
-      setParams: jest.fn(),
-      setOptions: jest.fn(),
-      addListener: jest.fn(),
-      removeListener: jest.fn(),
-      getId: jest.fn(),
-    } as jest.Mocked<NavigationProp<ParamListBase>>;
-
-    mockSiteData = {
-      id: '1',
-      name: 'Example Site',
-      url: 'https://example.com',
-      displayUrl: 'example.com',
-      logoUrl: 'https://example.com/logo.png',
-      featured: false,
-    };
-
-    dateNowSpy = jest.spyOn(Date, 'now').mockReturnValue(1234567890);
-  });
-
-  afterEach(() => {
-    dateNowSpy.mockRestore();
-  });
-
-  describe('Rendering', () => {
-    it('should render SiteRowItem with correct props', () => {
-      const { getByTestId } = render(
-        <SiteRowItemWrapper site={mockSiteData} navigation={mockNavigation} />,
-      );
-
-      expect(getByTestId('site-row-item-Example Site')).toBeTruthy();
-      expect(getByTestId('site-id').props.children).toBe('1');
-      expect(getByTestId('site-name').props.children).toBe('Example Site');
-      expect(getByTestId('site-url').props.children).toBe(
-        'https://example.com',
-      );
-      expect(getByTestId('site-display-url').props.children).toBe(
-        'example.com',
-      );
-    });
-
-    it('should render site with logoUrl', () => {
-      const { getByTestId } = render(
-        <SiteRowItemWrapper site={mockSiteData} navigation={mockNavigation} />,
-      );
-
-      expect(getByTestId('site-logo-url').props.children).toBe(
-        'https://example.com/logo.png',
-      );
-    });
-
-    it('should render site without logoUrl', () => {
-      const siteWithoutLogo: SiteData = {
-        id: '2',
-        name: 'Site Without Logo',
-        url: 'https://no-logo.com',
-        displayUrl: 'no-logo.com',
-      };
-
-      const { queryByTestId } = render(
-        <SiteRowItemWrapper
-          site={siteWithoutLogo}
-          navigation={mockNavigation}
-        />,
-      );
-
-      expect(queryByTestId('site-logo-url')).toBeNull();
-    });
-
-    it('should render featured site', () => {
-      const featuredSite: SiteData = {
-        id: '3',
-        name: 'Featured Site',
-        url: 'https://featured.com',
-        displayUrl: 'featured.com',
-        featured: true,
-      };
-
-      const { getByTestId } = render(
-        <SiteRowItemWrapper site={featuredSite} navigation={mockNavigation} />,
-      );
-
-      expect(getByTestId('site-featured').props.children).toBe('Featured');
-    });
-
-    it('should not render featured tag for non-featured site', () => {
-      const { queryByTestId } = render(
-        <SiteRowItemWrapper site={mockSiteData} navigation={mockNavigation} />,
-      );
-
-      expect(queryByTestId('site-featured')).toBeNull();
-    });
-
-    it('should render with different site data', () => {
-      const differentSiteData: SiteData = {
-        id: '4',
-        name: 'Another Site',
-        url: 'https://another-site.com',
-        displayUrl: 'another-site.com',
-        logoUrl: 'https://another-site.com/logo.png',
-        featured: true,
-      };
-
-      const { getByTestId } = render(
-        <SiteRowItemWrapper
-          site={differentSiteData}
-          navigation={mockNavigation}
-        />,
-      );
-
-      expect(getByTestId('site-id').props.children).toBe('4');
-      expect(getByTestId('site-name').props.children).toBe('Another Site');
-      expect(getByTestId('site-url').props.children).toBe(
-        'https://another-site.com',
-      );
-      expect(getByTestId('site-display-url').props.children).toBe(
-        'another-site.com',
-      );
-      expect(getByTestId('site-featured')).toBeTruthy();
-    });
-  });
-
-  const assertBrowserNavigation = (siteUrl?: string) => {
-    expect(mockNavigation.navigate).toHaveBeenCalledWith(
-      Routes.BROWSER.HOME,
-      expect.objectContaining({
-        screen: Routes.BROWSER.VIEW,
-        params: expect.objectContaining({
-          ...(siteUrl ? { newTabUrl: siteUrl } : {}),
-          fromTrending: true,
-        }),
-      }),
-    );
-  };
-
-  describe('Navigation and Press Handling', () => {
-    it('should call updateLastTrendingScreen when pressed', () => {
-      const { getByTestId } = render(
-        <SiteRowItemWrapper site={mockSiteData} navigation={mockNavigation} />,
-      );
-
-      fireEvent.press(getByTestId('site-row-item-Example Site'));
-    });
-
-    it('should navigate to TrendingBrowser with correct params when pressed', () => {
-      const { getByTestId } = render(
-        <SiteRowItemWrapper site={mockSiteData} navigation={mockNavigation} />,
-      );
-
-      fireEvent.press(getByTestId('site-row-item-Example Site'));
-
-      assertBrowserNavigation('https://example.com');
-      expect(mockNavigation.navigate).toHaveBeenCalledTimes(1);
-    });
-
-    it('should navigate with correct URL for different sites', () => {
-      const customSite: SiteData = {
-        id: '5',
-        name: 'Custom Site',
-        url: 'https://custom-url.com/page',
-        displayUrl: 'custom-url.com',
-      };
-
-      const { getByTestId } = render(
-        <SiteRowItemWrapper site={customSite} navigation={mockNavigation} />,
-      );
-
-      fireEvent.press(getByTestId('site-row-item-Custom Site'));
-
-      assertBrowserNavigation('https://custom-url.com/page');
-    });
-
-    it('should handle multiple presses correctly', () => {
-      const { getByTestId } = render(
-        <SiteRowItemWrapper site={mockSiteData} navigation={mockNavigation} />,
-      );
-
-      const siteRowItem = getByTestId('site-row-item-Example Site');
-
-      fireEvent.press(siteRowItem);
-      fireEvent.press(siteRowItem);
-      fireEvent.press(siteRowItem);
-      expect(mockNavigation.navigate).toHaveBeenCalledTimes(3);
-    });
-
-    it('should always pass fromTrending as true', () => {
-      const { getByTestId } = render(
-        <SiteRowItemWrapper site={mockSiteData} navigation={mockNavigation} />,
-      );
-
-      fireEvent.press(getByTestId('site-row-item-Example Site'));
-
-      assertBrowserNavigation();
-    });
-  });
-
-  describe('Props variations', () => {
-    it('should work with minimal site data', () => {
-      const minimalSiteData: SiteData = {
-        id: '6',
-        name: 'Minimal',
-        url: 'https://minimal.com',
-        displayUrl: 'minimal.com',
-      };
-
-      const { getByTestId } = render(
-        <SiteRowItemWrapper
-          site={minimalSiteData}
-          navigation={mockNavigation}
-        />,
-      );
-
-      fireEvent.press(getByTestId('site-row-item-Minimal'));
-
-      assertBrowserNavigation('https://minimal.com');
-    });
-  });
-});
diff --git a/app/components/UI/Sites/components/SiteRowItemWrapper/SiteRowItemWrapper.tsx b/app/components/UI/Sites/components/SiteRowItemWrapper/SiteRowItemWrapper.tsx
deleted file mode 100644
index eabf90da6d0..00000000000
--- a/app/components/UI/Sites/components/SiteRowItemWrapper/SiteRowItemWrapper.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import SiteRowItem, { type SiteData } from '../SiteRowItem/SiteRowItem';
-import Routes from '../../../../../constants/navigation/Routes';
-import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
-
-interface SiteRowItemWrapperProps {
-  site: SiteData;
-  navigation: AppNavigationProp;
-}
-
-const SiteRowItemWrapper: React.FC<SiteRowItemWrapperProps> = ({
-  site,
-  navigation,
-}) => {
-  const handlePress = () => {
-    navigation.navigate(Routes.BROWSER.HOME, {
-      screen: Routes.BROWSER.VIEW,
-      params: {
-        newTabUrl: site.url,
-        timestamp: Date.now(),
-        fromTrending: true,
-      },
-    });
-  };
-
-  return <SiteRowItem site={site} onPress={handlePress} />;
-};
-
-export default SiteRowItemWrapper;
diff --git a/app/components/UI/Sites/components/SitesList/SitesList.test.tsx b/app/components/UI/Sites/components/SitesList/SitesList.test.tsx
index d6607f79cbd..1a82cdbb907 100644
--- a/app/components/UI/Sites/components/SitesList/SitesList.test.tsx
+++ b/app/components/UI/Sites/components/SitesList/SitesList.test.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
-import { render } from '@testing-library/react-native';
+import { render, fireEvent } from '@testing-library/react-native';
 import SitesList from './SitesList';
 import { useNavigation } from '@react-navigation/native';
 import type { SiteData } from '../SiteRowItem/SiteRowItem';
+import Routes from '../../../../../constants/navigation/Routes';
 
 // Mock FlashList to render items in tests
 jest.mock('@shopify/flash-list', () => {
@@ -45,22 +46,23 @@ jest.mock('@react-navigation/native', () => ({
   useNavigation: jest.fn(),
 }));
 
-jest.mock('../SiteRowItemWrapper/SiteRowItemWrapper', () => {
-  const { View, Text } = jest.requireActual('react-native');
+jest.mock('../SiteRowItem/SiteRowItem', () => {
+  const { View, Text, TouchableOpacity } = jest.requireActual('react-native');
   return {
     __esModule: true,
     default: ({
       site,
-      navigation,
+      onPress,
     }: {
       site: SiteData;
-      navigation: unknown;
+      onPress?: () => void;
+      onRemoveFavorite?: () => void;
     }) => (
-      <View testID={`site-wrapper-${site.id}`}>
+      <TouchableOpacity testID={`site-wrapper-${site.id}`} onPress={onPress}>
         <Text testID={`site-id-${site.id}`}>{site.id}</Text>
         <Text testID={`site-name-${site.id}`}>{site.name}</Text>
-        <Text testID={`has-navigation-${site.id}`}>{String(!!navigation)}</Text>
-      </View>
+        <Text testID={`has-onpress-${site.id}`}>{String(!!onPress)}</Text>
+      </TouchableOpacity>
     ),
   };
 });
@@ -129,12 +131,33 @@ describe('SitesList', () => {
   });
 
   describe('props passthrough', () => {
-    it('passes navigation to SiteRowItemWrapper', () => {
+    it('passes onPress handler to SiteRowItem', () => {
       const sites = [createSite('1')];
 
       const { getByTestId } = render(<SitesList sites={sites} />);
 
-      expect(getByTestId('has-navigation-1').props.children).toBe('true');
+      expect(getByTestId('has-onpress-1').props.children).toBe('true');
+    });
+  });
+
+  describe('navigation', () => {
+    it('navigates to browser with site URL when row is pressed', () => {
+      const sites = [createSite('1', { url: 'https://example.com' })];
+
+      const { getByTestId } = render(<SitesList sites={sites} />);
+
+      fireEvent.press(getByTestId('site-wrapper-1'));
+
+      expect(mockNavigation.navigate).toHaveBeenCalledWith(
+        Routes.BROWSER.HOME,
+        expect.objectContaining({
+          screen: Routes.BROWSER.VIEW,
+          params: expect.objectContaining({
+            newTabUrl: 'https://example.com',
+            fromTrending: true,
+          }),
+        }),
+      );
     });
   });
 
@@ -185,13 +208,13 @@ describe('SitesList', () => {
       expect(getByTestId('site-wrapper-49')).toBeOnTheScreen();
     });
 
-    it('renders when navigation is not provided', () => {
+    it('still wires onPress when navigation hook returns undefined', () => {
       (useNavigation as jest.Mock).mockReturnValue(undefined);
       const sites = [createSite('1')];
 
       const { getByTestId } = render(<SitesList sites={sites} />);
 
-      expect(getByTestId('has-navigation-1').props.children).toBe('false');
+      expect(getByTestId('has-onpress-1').props.children).toBe('true');
     });
   });
 });
diff --git a/app/components/UI/Sites/components/SitesList/SitesList.tsx b/app/components/UI/Sites/components/SitesList/SitesList.tsx
index e10a1eb1473..6398b435507 100644
--- a/app/components/UI/Sites/components/SitesList/SitesList.tsx
+++ b/app/components/UI/Sites/components/SitesList/SitesList.tsx
@@ -1,24 +1,49 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { FlashList } from '@shopify/flash-list';
 import { useNavigation } from '@react-navigation/native';
-import SiteRowItemWrapper from '../SiteRowItemWrapper/SiteRowItemWrapper';
-import type { SiteData } from '../SiteRowItem/SiteRowItem';
+import SiteRowItem, { SiteData } from '../SiteRowItem/SiteRowItem';
+import Routes from '../../../../../constants/navigation/Routes';
+import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
 
 export interface SitesListProps {
   sites: SiteData[];
   refreshControl?: React.ReactElement;
   ListFooterComponent?: React.ReactElement | null;
+  onRemoveFavorite?: (site: SiteData) => void;
 }
 
 const SitesList: React.FC<SitesListProps> = ({
   sites,
   refreshControl,
   ListFooterComponent,
+  onRemoveFavorite,
 }) => {
-  const navigation = useNavigation();
+  const navigation = useNavigation<AppNavigationProp>();
 
-  const renderSiteItem = ({ item }: { item: SiteData }) => (
-    <SiteRowItemWrapper site={item} navigation={navigation} />
+  const renderSiteItem = useCallback(
+    ({ item }: { item: SiteData }) => {
+      const handlePress = () => {
+        navigation.navigate(Routes.BROWSER.HOME, {
+          screen: Routes.BROWSER.VIEW,
+          params: {
+            newTabUrl: item.url,
+            timestamp: Date.now(),
+            fromTrending: true,
+          },
+        });
+      };
+
+      return (
+        <SiteRowItem
+          site={item}
+          onPress={handlePress}
+          onRemoveFavorite={
+            onRemoveFavorite ? () => onRemoveFavorite(item) : undefined
+          }
+        />
+      );
+    },
+    [navigation, onRemoveFavorite],
   );
 
   return (
diff --git a/app/components/UI/Sites/hooks/useBrowserFavoritesSites/useBrowserFavoritesSites.test.ts b/app/components/UI/Sites/hooks/useBrowserFavoritesSites/useBrowserFavoritesSites.test.ts
new file mode 100644
index 00000000000..c259c6015c3
--- /dev/null
+++ b/app/components/UI/Sites/hooks/useBrowserFavoritesSites/useBrowserFavoritesSites.test.ts
@@ -0,0 +1,76 @@
+import { renderHook } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import { useBrowserFavoritesSites } from './useBrowserFavoritesSites';
+
+jest.mock('react-redux', () => ({ useSelector: jest.fn() }));
+jest.mock('../../../../../selectors/browser', () => ({
+  selectBrowserBookmarksWithType: jest.fn(),
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+
+const setBookmarks = (bookmarks: { url: string; name: string }[]) => {
+  mockUseSelector.mockReturnValue(bookmarks);
+};
+
+describe('useBrowserFavoritesSites', () => {
+  beforeEach(() => mockUseSelector.mockReset());
+
+  it('maps bookmarks to SiteData with prefixed URL and full display URL', () => {
+    setBookmarks([{ url: 'uniswap.org', name: 'Uniswap' }]);
+    const { result } = renderHook(() => useBrowserFavoritesSites());
+
+    expect(result.current.data).toHaveLength(1);
+    expect(result.current.data[0]).toEqual(
+      expect.objectContaining({
+        name: 'Uniswap',
+        url: 'https://uniswap.org',
+        displayUrl: 'uniswap.org',
+        storedBookmarkUrl: 'uniswap.org',
+      }),
+    );
+  });
+
+  it('shows full path in displayUrl for favorites', () => {
+    setBookmarks([
+      { url: 'https://app.uniswap.org/swap?chain=1', name: 'Uniswap' },
+    ]);
+    const { result } = renderHook(() => useBrowserFavoritesSites());
+    expect(result.current.data[0].displayUrl).toBe(
+      'app.uniswap.org/swap?chain=1',
+    );
+  });
+
+  it('falls back to the display URL when the bookmark has no name', () => {
+    setBookmarks([{ url: 'https://example.com/path', name: '' }]);
+    const { result } = renderHook(() => useBrowserFavoritesSites());
+    expect(result.current.data[0].name).toBe('example.com');
+  });
+
+  it('skips entries with no URL', () => {
+    setBookmarks([
+      { url: '', name: 'Empty' },
+      { url: 'https://ok.example.com', name: 'OK' },
+    ]);
+    const { result } = renderHook(() => useBrowserFavoritesSites());
+    expect(result.current.data.map((s) => s.name)).toEqual(['OK']);
+  });
+
+  it('filters by search query against name + URL fields', () => {
+    setBookmarks([
+      { url: 'https://uniswap.org', name: 'Uniswap' },
+      { url: 'https://opensea.io', name: 'OpenSea' },
+    ]);
+    const { result } = renderHook(() => useBrowserFavoritesSites('open'));
+    expect(result.current.data.map((s) => s.name)).toEqual(['OpenSea']);
+  });
+
+  it('returns the full list when the search query is whitespace', () => {
+    setBookmarks([
+      { url: 'https://a.com', name: 'A' },
+      { url: 'https://b.com', name: 'B' },
+    ]);
+    const { result } = renderHook(() => useBrowserFavoritesSites('   '));
+    expect(result.current.data).toHaveLength(2);
+  });
+});
diff --git a/app/components/UI/Sites/hooks/useBrowserFavoritesSites/useBrowserFavoritesSites.ts b/app/components/UI/Sites/hooks/useBrowserFavoritesSites/useBrowserFavoritesSites.ts
new file mode 100644
index 00000000000..ad0cb9813b3
--- /dev/null
+++ b/app/components/UI/Sites/hooks/useBrowserFavoritesSites/useBrowserFavoritesSites.ts
@@ -0,0 +1,57 @@
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import { prefixUrlWithProtocol } from '../../../../../util/browser';
+import { selectBrowserBookmarksWithType } from '../../../../../selectors/browser';
+import type { SiteData } from '../../components/SiteRowItem/SiteRowItem';
+import {
+  extractDisplayUrl,
+  extractFullDisplayUrl,
+  matchesSiteQuery,
+} from '../useSiteData/useSitesData';
+
+interface BookmarkEntry {
+  url: string;
+  name: string;
+}
+
+const toSiteData = (entry: BookmarkEntry, index: number): SiteData => {
+  const url = prefixUrlWithProtocol(entry.url.trim());
+  return {
+    id: `browser-favorite-${url}-${index}`,
+    name: entry.name?.trim() || extractDisplayUrl(url),
+    url,
+    displayUrl: extractFullDisplayUrl(url),
+    storedBookmarkUrl: entry.url,
+  };
+};
+
+/**
+ * Bookmarked (favorited) browser sites, mapped to {@link SiteData} for Explore/Dapps UI.
+ * Accepts an optional searchQuery for client-side filtering.
+ * Data is Redux-driven and requires no remote fetch.
+ */
+export const useBrowserFavoritesSites = (
+  searchQuery?: string,
+): {
+  data: SiteData[];
+  isLoading: boolean;
+  refetch: () => Promise<void>;
+} => {
+  const bookmarks = useSelector(
+    selectBrowserBookmarksWithType,
+  ) as BookmarkEntry[];
+
+  const data = useMemo(() => {
+    const all = bookmarks.filter((b) => b?.url).map((b, i) => toSiteData(b, i));
+    const query = searchQuery?.trim() ?? '';
+    return query ? all.filter((s) => matchesSiteQuery(s, query)) : all;
+  }, [bookmarks, searchQuery]);
+
+  return {
+    data,
+    isLoading: false,
+    refetch: async () => {
+      // Bookmarks are Redux-driven; no remote refetch.
+    },
+  };
+};
diff --git a/app/components/UI/Sites/hooks/useBrowserRecentsSites/useBrowserRecentsSites.test.ts b/app/components/UI/Sites/hooks/useBrowserRecentsSites/useBrowserRecentsSites.test.ts
new file mode 100644
index 00000000000..13e5acd86a2
--- /dev/null
+++ b/app/components/UI/Sites/hooks/useBrowserRecentsSites/useBrowserRecentsSites.test.ts
@@ -0,0 +1,100 @@
+import { renderHook } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import { useBrowserRecentsSites } from './useBrowserRecentsSites';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+// Short-circuit the transitive import chain
+// (browser selectors → UrlAutocomplete → entire TrendingView graph).
+jest.mock('../../../../../selectors/browser', () => ({
+  selectBrowserHistoryWithType: jest.fn(),
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+
+const setHistory = (history: { url: string; name: string }[]) => {
+  mockUseSelector.mockReturnValue(history);
+};
+
+describe('useBrowserRecentsSites', () => {
+  beforeEach(() => {
+    mockUseSelector.mockReset();
+  });
+
+  it('returns an empty list when there is no history', () => {
+    setHistory([]);
+    const { result } = renderHook(() => useBrowserRecentsSites());
+    expect(result.current.data).toEqual([]);
+    expect(result.current.isLoading).toBe(false);
+  });
+
+  it('deduplicates entries that normalize to the same URL', () => {
+    // Same origin+path; different trailing slash and hash should collapse.
+    setHistory([
+      { url: 'https://uniswap.org/swap', name: 'Uniswap Swap' },
+      { url: 'https://uniswap.org/swap/', name: 'Uniswap Swap dup1' },
+      { url: 'https://uniswap.org/swap#fragment', name: 'Uniswap Swap dup2' },
+    ]);
+    const { result } = renderHook(() => useBrowserRecentsSites());
+    expect(result.current.data).toHaveLength(1);
+    expect(result.current.data[0].name).toBe('Uniswap Swap');
+  });
+
+  it('caps results at 5 entries (latest first)', () => {
+    setHistory(
+      Array.from({ length: 10 }, (_, i) => ({
+        url: `https://site${i}.example.com`,
+        name: `Site ${i}`,
+      })),
+    );
+    const { result } = renderHook(() => useBrowserRecentsSites());
+    expect(result.current.data).toHaveLength(5);
+    // Selector returns history reversed (latest first); dedup keeps first occurrence.
+    expect(result.current.data.map((s) => s.name)).toEqual([
+      'Site 0',
+      'Site 1',
+      'Site 2',
+      'Site 3',
+      'Site 4',
+    ]);
+  });
+
+  it('falls back gracefully when an entry has a malformed URL', () => {
+    // The new URL() in normalizeUrlKey throws — the catch returns the raw string.
+    setHistory([
+      { url: 'not a real url', name: 'Bad' },
+      { url: 'https://good.example.com', name: 'Good' },
+    ]);
+    const { result } = renderHook(() => useBrowserRecentsSites());
+    // Both pass; neither throws.
+    expect(result.current.data.map((s) => s.name)).toEqual(['Bad', 'Good']);
+  });
+
+  it('skips entries that have no URL', () => {
+    setHistory([
+      { url: '', name: 'Empty' },
+      { url: 'https://ok.example.com', name: 'OK' },
+    ]);
+    const { result } = renderHook(() => useBrowserRecentsSites());
+    expect(result.current.data.map((s) => s.name)).toEqual(['OK']);
+  });
+
+  it('uses extracted display URL when entry name is empty', () => {
+    setHistory([{ url: 'https://example.com/path', name: '' }]);
+    const { result } = renderHook(() => useBrowserRecentsSites());
+    expect(result.current.data[0].name).toBe('example.com');
+    expect(result.current.data[0].displayUrl).toBe('example.com/path');
+  });
+
+  it('shows full path in displayUrl for recents', () => {
+    setHistory([
+      { url: 'https://app.uniswap.org/swap?chain=1', name: 'Uniswap' },
+    ]);
+    const { result } = renderHook(() => useBrowserRecentsSites());
+    expect(result.current.data[0].displayUrl).toBe(
+      'app.uniswap.org/swap?chain=1',
+    );
+  });
+});
diff --git a/app/components/UI/Sites/hooks/useBrowserRecentsSites/useBrowserRecentsSites.ts b/app/components/UI/Sites/hooks/useBrowserRecentsSites/useBrowserRecentsSites.ts
new file mode 100644
index 00000000000..f92f4585cc3
--- /dev/null
+++ b/app/components/UI/Sites/hooks/useBrowserRecentsSites/useBrowserRecentsSites.ts
@@ -0,0 +1,74 @@
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import { prefixUrlWithProtocol } from '../../../../../util/browser';
+import { selectBrowserHistoryWithType } from '../../../../../selectors/browser';
+import type { SiteData } from '../../components/SiteRowItem/SiteRowItem';
+import {
+  extractDisplayUrl,
+  extractFullDisplayUrl,
+} from '../useSiteData/useSitesData';
+
+const MAX_RECENT_SITES = 5;
+
+interface HistoryEntry {
+  url: string;
+  name: string;
+}
+
+const normalizeUrlKey = (raw: string): string => {
+  try {
+    const u = new URL(prefixUrlWithProtocol(raw.trim()));
+    u.hash = '';
+    const path = u.pathname.replace(/\/$/, '') || '/';
+    return `${u.origin}${path}`;
+  } catch {
+    return raw;
+  }
+};
+
+const toSiteData = (entry: HistoryEntry, index: number): SiteData => {
+  const url = prefixUrlWithProtocol(entry.url.trim());
+  return {
+    id: `browser-recent-${normalizeUrlKey(url)}-${index}`,
+    name: entry.name?.trim() || extractDisplayUrl(url),
+    url,
+    displayUrl: extractFullDisplayUrl(url),
+  };
+};
+
+/**
+ * Most recent unique browser history entries, mapped to {@link SiteData} for Explore/Dapps UI.
+ * History is de-duplicated by normalized URL; latest visit wins.
+ */
+export const useBrowserRecentsSites = (): {
+  data: SiteData[];
+  isLoading: boolean;
+  refetch: () => Promise<void>;
+} => {
+  // selectBrowserHistoryWithType returns history already reversed (most recent first)
+  const history = useSelector(selectBrowserHistoryWithType) as HistoryEntry[];
+
+  const data = useMemo(() => {
+    const seen = new Set<string>();
+    const out: SiteData[] = [];
+
+    for (const entry of history) {
+      if (out.length >= MAX_RECENT_SITES) break;
+      if (!entry?.url) continue;
+      const key = normalizeUrlKey(entry.url);
+      if (seen.has(key)) continue;
+      seen.add(key);
+      out.push(toSiteData(entry, out.length));
+    }
+
+    return out;
+  }, [history]);
+
+  return {
+    data,
+    isLoading: false,
+    refetch: async () => {
+      // History is driven by Redux; no remote refetch.
+    },
+  };
+};
diff --git a/app/components/UI/Sites/hooks/useSiteData/useSitesData.test.ts b/app/components/UI/Sites/hooks/useSiteData/useSitesData.test.ts
index 4be690d798b..c9d2fe53052 100644
--- a/app/components/UI/Sites/hooks/useSiteData/useSitesData.test.ts
+++ b/app/components/UI/Sites/hooks/useSiteData/useSitesData.test.ts
@@ -1,5 +1,11 @@
 import { renderHook, waitFor } from '@testing-library/react-native';
-import { useSitesData, clearSitesCache } from './useSitesData';
+import {
+  useSitesData,
+  clearSitesCache,
+  matchesSiteQuery,
+  extractFullDisplayUrl,
+} from './useSitesData';
+import type { SiteData } from '../../components/SiteRowItem/SiteRowItem';
 import Logger from '../../../../../util/Logger';
 
 // Mock dependencies
@@ -330,3 +336,50 @@ describe('useSitesData', () => {
     });
   });
 });
+
+describe('extractFullDisplayUrl', () => {
+  it('strips the protocol and keeps path + query', () => {
+    expect(extractFullDisplayUrl('https://app.uniswap.org/swap?chain=1')).toBe(
+      'app.uniswap.org/swap?chain=1',
+    );
+  });
+
+  it('strips www prefix', () => {
+    expect(extractFullDisplayUrl('https://www.example.com/path')).toBe(
+      'example.com/path',
+    );
+  });
+
+  it('returns just the hostname when there is no path', () => {
+    expect(extractFullDisplayUrl('https://uniswap.org')).toBe('uniswap.org');
+  });
+
+  it('returns the raw string for invalid URLs', () => {
+    expect(extractFullDisplayUrl('not a url')).toBe('not a url');
+  });
+});
+
+describe('matchesSiteQuery', () => {
+  const site: SiteData = {
+    id: '1',
+    name: 'Uniswap',
+    url: 'https://uniswap.org/swap',
+    displayUrl: 'uniswap.org',
+  };
+
+  it('matches case-insensitively against the name', () => {
+    expect(matchesSiteQuery(site, 'UNI')).toBe(true);
+  });
+
+  it('matches against the displayUrl', () => {
+    expect(matchesSiteQuery(site, 'uniswap.org')).toBe(true);
+  });
+
+  it('matches a path fragment present only in the full url', () => {
+    expect(matchesSiteQuery(site, '/swap')).toBe(true);
+  });
+
+  it('returns false when no field contains the query', () => {
+    expect(matchesSiteQuery(site, 'opensea')).toBe(false);
+  });
+});
diff --git a/app/components/UI/Sites/hooks/useSiteData/useSitesData.ts b/app/components/UI/Sites/hooks/useSiteData/useSitesData.ts
index 7fd4bae8c26..0287cf61ecf 100644
--- a/app/components/UI/Sites/hooks/useSiteData/useSitesData.ts
+++ b/app/components/UI/Sites/hooks/useSiteData/useSitesData.ts
@@ -1,5 +1,6 @@
 import { useEffect, useState, useCallback, useMemo } from 'react';
 import Logger from '../../../../../util/Logger';
+import { prefixUrlWithProtocol } from '../../../../../util/browser';
 import type { SiteData } from '../../components/SiteRowItem/SiteRowItem';
 
 interface ApiDappResponse {
@@ -60,9 +61,10 @@ const PORTFOLIO_SITE: SiteData = {
 };
 
 /**
- * Helper function to extract display URL from full URL
+ * Returns just the hostname (no www., no path) — used for curated site cards
+ * where a clean domain label is preferred.
  */
-const extractDisplayUrl = (url: string): string => {
+export const extractDisplayUrl = (url: string): string => {
   try {
     const urlObj = new URL(url);
     return urlObj.hostname.replace('www.', '');
@@ -71,14 +73,35 @@ const extractDisplayUrl = (url: string): string => {
   }
 };
 
+/**
+ * Returns the full URL without the protocol (e.g. `uniswap.org/swap?chain=1`).
+ * Used for user-generated entries (recents, favorites) where the full path
+ * provides meaningful context.
+ */
+export const extractFullDisplayUrl = (url: string): string => {
+  try {
+    const urlObj = new URL(url);
+    const withoutProtocol = url.slice(urlObj.protocol.length + 2); // strip "scheme://"
+    return withoutProtocol.replace(/^www\./, '');
+  } catch {
+    return url;
+  }
+};
+
+export const matchesSiteQuery = (site: SiteData, query: string): boolean => {
+  const q = query.toLowerCase();
+  return (
+    site.name.toLowerCase().includes(q) ||
+    site.displayUrl.toLowerCase().includes(q) ||
+    site.url.toLowerCase().includes(q)
+  );
+};
+
 const isPortfolioSiteUrl = (url: string): boolean => {
   try {
-    const trimmedUrl = url.trim();
-    const normalizedUrl =
-      trimmedUrl.startsWith('http://') || trimmedUrl.startsWith('https://')
-        ? trimmedUrl
-        : `https://${trimmedUrl}`;
-    return new URL(normalizedUrl).hostname === PORTFOLIO_HOSTNAME;
+    return (
+      new URL(prefixUrlWithProtocol(url.trim())).hostname === PORTFOLIO_HOSTNAME
+    );
   } catch {
     return false;
   }
@@ -174,17 +197,10 @@ export const useSitesData = (searchQuery?: string): UseSitesDataResult => {
 
   // Filter sites locally based on search query
   const sites = useMemo(() => {
-    if (!searchQuery?.trim()) {
-      return allSites;
-    }
-
-    const query = searchQuery.toLowerCase().trim();
-    return allSites.filter(
-      (site) =>
-        site.name.toLowerCase().includes(query) ||
-        site.displayUrl.toLowerCase().includes(query) ||
-        site.url.toLowerCase().includes(query),
-    );
+    const query = searchQuery?.trim() ?? '';
+    return query
+      ? allSites.filter((site) => matchesSiteQuery(site, query))
+      : allSites;
   }, [allSites, searchQuery]);
 
   return { sites, isLoading, error, refetch };
diff --git a/app/components/UI/SkipAccountSecurityModal/index.js b/app/components/UI/SkipAccountSecurityModal/index.js
index a46800d47a5..77391bebb7b 100644
--- a/app/components/UI/SkipAccountSecurityModal/index.js
+++ b/app/components/UI/SkipAccountSecurityModal/index.js
@@ -11,7 +11,6 @@ import Text, {
 } from '../../../component-library/components/Texts/Text';
 import PropTypes from 'prop-types';
 import { useTheme } from '../../../util/theme';
-import generateTestId from '../../../../wdio/utils/generateTestId';
 import { SkipAccountSecurityModalSelectorsIDs } from './SkipAccountSecurityModal.testIds';
 import BottomSheet from '../../../component-library/components/BottomSheets/BottomSheet';
 import Checkbox from '../../../component-library/components/Checkbox';
@@ -102,7 +101,7 @@ const SkipAccountSecurityModal = ({ route }) => {
           name={IconName.Danger}
           size={IconSize.Lg}
           style={styles.imageWarning}
-          {...generateTestId(Platform, 'skip-backup-warning')}
+          testID="skip-backup-warning"
         />
 
         <Text variant={TextVariant.HeadingMD} color={TextColor.Default}>
diff --git a/app/components/UI/StyledButton/__snapshots__/index.test.tsx.snap b/app/components/UI/StyledButton/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index ff106165532..00000000000
--- a/app/components/UI/StyledButton/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,1035 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`StyledButton should render correctly on Android the button with type cancel 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    [
-      {
-        "borderRadius": 12,
-        "justifyContent": "center",
-        "padding": 15,
-      },
-      {
-        "backgroundColor": "#ffffff",
-        "borderColor": "#66676a",
-        "borderWidth": 1,
-      },
-      null,
-      undefined,
-    ]
-  }
-/>
-`;
-
-exports[`StyledButton should render correctly on Android the button with type confirm 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    [
-      {
-        "borderRadius": 12,
-        "justifyContent": "center",
-        "padding": 15,
-      },
-      {
-        "backgroundColor": "#4459ff",
-        "minHeight": 50,
-      },
-      null,
-      undefined,
-    ]
-  }
-/>
-`;
-
-exports[`StyledButton should render correctly on Android the button with type danger 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    [
-      {
-        "borderRadius": 12,
-        "justifyContent": "center",
-        "padding": 15,
-      },
-      {
-        "backgroundColor": "#ca3542",
-        "borderColor": "#ca3542",
-        "borderWidth": 1,
-      },
-      null,
-      undefined,
-    ]
-  }
-/>
-`;
-
-exports[`StyledButton should render correctly on Android the button with type info 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    [
-      {
-        "borderRadius": 12,
-        "justifyContent": "center",
-        "padding": 15,
-      },
-      {
-        "backgroundColor": "#ffffff",
-        "borderColor": "#4459ff",
-        "borderWidth": 1,
-      },
-      null,
-      undefined,
-    ]
-  }
-/>
-`;
-
-exports[`StyledButton should render correctly on Android the button with type inverse-transparent 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    [
-      {
-        "borderRadius": 12,
-        "justifyContent": "center",
-        "padding": 15,
-      },
-      {
-        "backgroundColor": "transparent",
-        "borderColor": "transparent",
-        "borderWidth": 0,
-      },
-      null,
-      undefined,
-    ]
-  }
-/>
-`;
-
-exports[`StyledButton should render correctly on Android the button with type normal 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    [
-      {
-        "borderRadius": 12,
-        "justifyContent": "center",
-        "padding": 15,
-      },
-      {
-        "backgroundColor": "transparent",
-        "borderColor": "#4459ff",
-        "borderWidth": 1,
-      },
-      null,
-      undefined,
-    ]
-  }
-/>
-`;
-
-exports[`StyledButton should render correctly on Android the button with type onOverlay 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    [
-      {
-        "borderRadius": 12,
-        "justifyContent": "center",
-        "padding": 15,
-      },
-      {
-        "borderColor": "#ffffff",
-        "borderWidth": 1,
-      },
-      null,
-      undefined,
-    ]
-  }
-/>
-`;
-
-exports[`StyledButton should render correctly on Android the button with type orange 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    [
-      {
-        "borderRadius": 12,
-        "justifyContent": "center",
-        "padding": 15,
-      },
-      {
-        "borderColor": "#9a6300",
-        "borderWidth": 1,
-      },
-      null,
-      undefined,
-    ]
-  }
-/>
-`;
-
-exports[`StyledButton should render correctly on Android the button with type secondary 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    [
-      {
-        "borderRadius": 12,
-        "justifyContent": "center",
-        "padding": 15,
-      },
-      {
-        "backgroundColor": "#ffffff",
-        "borderColor": "#949596",
-        "borderWidth": 1,
-      },
-      null,
-      undefined,
-    ]
-  }
-/>
-`;
-
-exports[`StyledButton should render correctly on Android the button with type transparent 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    [
-      {
-        "borderRadius": 12,
-        "justifyContent": "center",
-        "padding": 15,
-      },
-      {
-        "backgroundColor": "transparent",
-        "borderColor": "transparent",
-        "borderWidth": 0,
-      },
-      null,
-      undefined,
-    ]
-  }
-/>
-`;
-
-exports[`StyledButton should render correctly on iOS the button with type cancel 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "opacity": 1,
-    }
-  }
->
-  <View
-    style={
-      [
-        {
-          "borderRadius": 12,
-          "justifyContent": "center",
-          "padding": 15,
-        },
-        {
-          "backgroundColor": "#ffffff",
-          "borderColor": "#66676a",
-          "borderWidth": 1,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
-
-exports[`StyledButton should render correctly on iOS the button with type confirm 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "opacity": 1,
-    }
-  }
->
-  <View
-    style={
-      [
-        {
-          "borderRadius": 12,
-          "justifyContent": "center",
-          "padding": 15,
-        },
-        {
-          "backgroundColor": "#4459ff",
-          "minHeight": 50,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
-
-exports[`StyledButton should render correctly on iOS the button with type danger 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "opacity": 1,
-    }
-  }
->
-  <View
-    style={
-      [
-        {
-          "borderRadius": 12,
-          "justifyContent": "center",
-          "padding": 15,
-        },
-        {
-          "backgroundColor": "#ca3542",
-          "borderColor": "#ca3542",
-          "borderWidth": 1,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
-
-exports[`StyledButton should render correctly on iOS the button with type info 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "opacity": 1,
-    }
-  }
->
-  <View
-    style={
-      [
-        {
-          "borderRadius": 12,
-          "justifyContent": "center",
-          "padding": 15,
-        },
-        {
-          "backgroundColor": "#ffffff",
-          "borderColor": "#4459ff",
-          "borderWidth": 1,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
-
-exports[`StyledButton should render correctly on iOS the button with type inverse-transparent 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "opacity": 1,
-    }
-  }
->
-  <View
-    style={
-      [
-        {
-          "borderRadius": 12,
-          "justifyContent": "center",
-          "padding": 15,
-        },
-        {
-          "backgroundColor": "transparent",
-          "borderColor": "transparent",
-          "borderWidth": 0,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
-
-exports[`StyledButton should render correctly on iOS the button with type normal 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "opacity": 1,
-    }
-  }
->
-  <View
-    style={
-      [
-        {
-          "borderRadius": 12,
-          "justifyContent": "center",
-          "padding": 15,
-        },
-        {
-          "backgroundColor": "transparent",
-          "borderColor": "#4459ff",
-          "borderWidth": 1,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
-
-exports[`StyledButton should render correctly on iOS the button with type onOverlay 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "opacity": 1,
-    }
-  }
->
-  <View
-    style={
-      [
-        {
-          "borderRadius": 12,
-          "justifyContent": "center",
-          "padding": 15,
-        },
-        {
-          "borderColor": "#ffffff",
-          "borderWidth": 1,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
-
-exports[`StyledButton should render correctly on iOS the button with type orange 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "opacity": 1,
-    }
-  }
->
-  <View
-    style={
-      [
-        {
-          "borderRadius": 12,
-          "justifyContent": "center",
-          "padding": 15,
-        },
-        {
-          "borderColor": "#9a6300",
-          "borderWidth": 1,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
-
-exports[`StyledButton should render correctly on iOS the button with type secondary 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "opacity": 1,
-    }
-  }
->
-  <View
-    style={
-      [
-        {
-          "borderRadius": 12,
-          "justifyContent": "center",
-          "padding": 15,
-        },
-        {
-          "backgroundColor": "#ffffff",
-          "borderColor": "#949596",
-          "borderWidth": 1,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
-
-exports[`StyledButton should render correctly on iOS the button with type transparent 1`] = `
-<View
-  accessibilityRole="button"
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={false}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "opacity": 1,
-    }
-  }
->
-  <View
-    style={
-      [
-        {
-          "borderRadius": 12,
-          "justifyContent": "center",
-          "padding": 15,
-        },
-        {
-          "backgroundColor": "transparent",
-          "borderColor": "transparent",
-          "borderWidth": 0,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
diff --git a/app/components/UI/StyledButton/index.test.tsx b/app/components/UI/StyledButton/index.test.tsx
index 68fb06c73aa..f604f389e25 100644
--- a/app/components/UI/StyledButton/index.test.tsx
+++ b/app/components/UI/StyledButton/index.test.tsx
@@ -20,23 +20,23 @@ describe('StyledButton', () => {
 
   buttonTypes.forEach((type) => {
     it(`should render correctly on iOS the button with type ${type}`, () => {
-      const { toJSON } = render(
+      const { getByRole } = render(
         <ThemeContext.Provider value={mockTheme}>
           <StyledButtonIOS type={type} />
         </ThemeContext.Provider>,
       );
-      expect(toJSON()).toMatchSnapshot();
+      expect(getByRole('button')).toBeOnTheScreen();
     });
   });
 
   buttonTypes.forEach((type) => {
     it(`should render correctly on Android the button with type ${type}`, () => {
-      const { toJSON } = render(
+      const { getByRole } = render(
         <ThemeContext.Provider value={mockTheme}>
           <StyledButtonAndroid type={type} />
         </ThemeContext.Provider>,
       );
-      expect(toJSON()).toMatchSnapshot();
+      expect(getByRole('button')).toBeOnTheScreen();
     });
   });
 });
diff --git a/app/components/UI/Tabs/TabCountIcon/__snapshots__/index.test.tsx.snap b/app/components/UI/Tabs/TabCountIcon/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 9d95d9bb11d..00000000000
--- a/app/components/UI/Tabs/TabCountIcon/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,34 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TabCountIcon should render correctly 1`] = `
-<View
-  style={
-    [
-      {
-        "alignItems": "center",
-        "borderColor": "#66676a",
-        "borderRadius": 6,
-        "borderWidth": 2,
-        "justifyContent": "center",
-      },
-      undefined,
-    ]
-  }
->
-  <Text
-    style={
-      {
-        "alignSelf": "center",
-        "color": "#66676a",
-        "flex": 0,
-        "fontFamily": "Geist-Regular",
-        "fontSize": 15,
-        "textAlign": "center",
-      }
-    }
-    testID="show-tabs-number"
-  >
-    1
-  </Text>
-</View>
-`;
diff --git a/app/components/UI/Tabs/TabCountIcon/index.test.tsx b/app/components/UI/Tabs/TabCountIcon/index.test.tsx
index 89ff6fe900c..7c8c02f8a03 100644
--- a/app/components/UI/Tabs/TabCountIcon/index.test.tsx
+++ b/app/components/UI/Tabs/TabCountIcon/index.test.tsx
@@ -4,6 +4,7 @@ import configureMockStore from 'redux-mock-store';
 import { render } from '@testing-library/react-native';
 import { Provider } from 'react-redux';
 import { ThemeContext, mockTheme } from '../../../../util/theme';
+import { BrowserViewSelectorsIDs } from '../../../Views/BrowserTab/BrowserView.testIds';
 
 const mockStore = configureMockStore();
 const initialState = {
@@ -14,15 +15,16 @@ const initialState = {
 const store = mockStore(initialState);
 
 describe('TabCountIcon', () => {
-  it('should render correctly', () => {
-    // eslint-disable-next-line react/jsx-no-bind
-    const { toJSON } = render(
+  it('shows the tab count from Redux state', () => {
+    const { getByTestId } = render(
       <Provider store={store}>
         <ThemeContext.Provider value={mockTheme}>
           <TabCountIcon />
         </ThemeContext.Provider>
       </Provider>,
     );
-    expect(toJSON()).toMatchSnapshot();
+    const countLabel = getByTestId(BrowserViewSelectorsIDs.TABS_NUMBER);
+    expect(countLabel).toBeOnTheScreen();
+    expect(countLabel.props.children).toBe(1);
   });
 });
diff --git a/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx b/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx
index 2851f3f6246..71d10b709cb 100644
--- a/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx
+++ b/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx
@@ -44,8 +44,15 @@ import Balance from '../../AssetOverview/Balance';
 import TokenDetails from '../../AssetOverview/TokenDetails';
 import { TokenDetailsActions } from './TokenDetailsActions';
 import AssetOverviewClaimBonus from '../../Earn/components/AssetOverviewClaimBonus';
+import MoneyConvertStablecoins from '../../Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins';
+import { MONEY_EVENTS_CONSTANTS } from '../../Money/constants/moneyEvents';
 import { isTokenEligibleForMerklRewards } from '../../Earn/components/MerklRewards/hooks/useMerklRewards';
-import { selectMerklCampaignClaimingEnabledFlag } from '../../Earn/selectors/featureFlags';
+import { isMusdToken } from '../../Earn/constants/musd';
+import {
+  selectIsMusdConversionFlowEnabledFlag,
+  selectMerklCampaignClaimingEnabledFlag,
+} from '../../Earn/selectors/featureFlags';
+import { useMusdConversionEligibility } from '../../Earn/hooks/useMusdConversionEligibility';
 import PerpsDiscoveryBanner from '../../Perps/components/PerpsDiscoveryBanner';
 import { isTokenTrustworthyForPerps } from '../../Perps/constants/perpsConfig';
 import { selectTokenOverviewAdvancedChartEnabled } from '../../../../selectors/featureFlagController/tokenOverviewAdvancedChart';
@@ -341,6 +348,15 @@ const AssetOverviewContent: React.FC<AssetOverviewContentProps> = ({
     [isMerklClaimingEnabled, token.chainId, token.address],
   );
 
+  const isMusdConversionFlowEnabled = useSelector(
+    selectIsMusdConversionFlowEnabledFlag,
+  );
+  const { isEligible: isMusdGeoEligible } = useMusdConversionEligibility();
+  const showMusdConvertSection =
+    isMusdToken(token.address) &&
+    isMusdConversionFlowEnabled &&
+    isMusdGeoEligible;
+
   const securityConfig = useMemo(
     () => getResultTypeConfig(securityData?.resultType),
     [securityData?.resultType],
@@ -748,6 +764,11 @@ const AssetOverviewContent: React.FC<AssetOverviewContentProps> = ({
           {isTokenEligibleForMerklClaim && (
             <AssetOverviewClaimBonus asset={token} />
           )}
+          {showMusdConvertSection && (
+            <MoneyConvertStablecoins
+              location={MONEY_EVENTS_CONSTANTS.EVENT_LOCATIONS.ASSET_DETAIL}
+            />
+          )}
           {
             ///: BEGIN:ONLY_INCLUDE_IF(tron)
             tronNativeToken && (
diff --git a/app/components/UI/TokenDetails/components/AssetOverviewContent.view.test.tsx b/app/components/UI/TokenDetails/components/AssetOverviewContent.view.test.tsx
new file mode 100644
index 00000000000..0c3bc858d9e
--- /dev/null
+++ b/app/components/UI/TokenDetails/components/AssetOverviewContent.view.test.tsx
@@ -0,0 +1,231 @@
+import '../../../../../tests/component-view/mocks';
+import React from 'react';
+import { Text } from 'react-native';
+import { createStackNavigator } from '@react-navigation/stack';
+import { merge } from 'lodash';
+import { fireEvent, screen, waitFor } from '@testing-library/react-native';
+
+import renderWithProvider, {
+  type ProviderValues,
+} from '../../../../util/test/renderWithProvider';
+
+import AssetOverviewContent, {
+  type AssetOverviewContentProps,
+} from './AssetOverviewContent';
+import { TokenI } from '../../Tokens/types';
+import { TimePeriod } from '../../../hooks/useTokenHistoricalPrices';
+import { TokenOverviewSelectorsIDs } from '../../AssetOverview/TokenOverview.testIds';
+import { MarketInsightsSelectorsIDs } from '../../MarketInsights/MarketInsights.testIds';
+import { remoteFeatureFlagMarketInsightsEnabled } from '../../../../../tests/api-mocking/mock-responses/feature-flags-mocks';
+import {
+  MOCK_PERPS_MARKET_INSIGHTS_REPORT,
+  setupMarketInsightsEngineMock,
+} from '../../../../../tests/component-view/fixtures/perpsMarketInsights';
+import { initialStateAssetDetails } from '../../../../../tests/component-view/presets/assetDetails';
+import {
+  fiatOrdersRampRoutingSupported,
+  initialStateMarketInsightsView,
+} from '../../../../../tests/component-view/presets/marketInsightsView';
+import { describeForPlatforms } from '../../../../../tests/component-view/platform';
+import Routes from '../../../../constants/navigation/Routes';
+import MarketInsightsView from '../../MarketInsights/Views/MarketInsightsView/MarketInsightsView';
+import { AccessRestrictedProvider } from '../../Compliance';
+
+const ETH_NATIVE = '0x0000000000000000000000000000000000000000';
+
+const ethMainnetToken: TokenI = {
+  address: ETH_NATIVE,
+  chainId: '0x1',
+  symbol: 'ETH',
+  name: 'Ethereum',
+  decimals: 18,
+  balance: '1',
+  balanceFiat: '$2000',
+  logo: '',
+  image: '',
+  isETH: true,
+  isNative: true,
+  hasBalanceError: false,
+  aggregators: [],
+};
+
+const baseOverviewProps: AssetOverviewContentProps = {
+  token: ethMainnetToken,
+  balance: '1',
+  mainBalance: '$2,000.00',
+  secondaryBalance: '1 ETH',
+  currentPrice: 2000,
+  priceDiff: 0,
+  comparePrice: 2000,
+  prices: [],
+  isLoading: false,
+  timePeriod: '1d' as TimePeriod,
+  setTimePeriod: () => undefined,
+  chartNavigationButtons: ['1d', '1w', '1m', '3m', '1y', '3y'],
+  isPerpsEnabled: false,
+  currentCurrency: 'USD',
+  onBuy: () => undefined,
+  onSend: async () => undefined,
+  onReceive: () => undefined,
+};
+
+function AssetOverviewContentHarness() {
+  return <AssetOverviewContent {...baseOverviewProps} />;
+}
+
+function renderAssetOverviewMarketInsightsStack(
+  extraRoutes: {
+    name: string;
+    Component?: React.ComponentType<unknown>;
+  }[],
+  providerValues: ProviderValues,
+) {
+  const Stack = createStackNavigator();
+
+  const DefaultRouteProbe =
+    (routeName: string): React.FC =>
+    () => <Text testID={`route-${routeName}`}>{routeName}</Text>;
+
+  return renderWithProvider(
+    <AccessRestrictedProvider>
+      <Stack.Navigator>
+        <Stack.Screen
+          name="AssetOverviewMI"
+          component={AssetOverviewContentHarness}
+        />
+        {extraRoutes.map(({ name, Component: Extra }) => (
+          <Stack.Screen
+            key={name}
+            name={name}
+            component={Extra ?? DefaultRouteProbe(name)}
+          />
+        ))}
+      </Stack.Navigator>
+    </AccessRestrictedProvider>,
+    providerValues,
+  );
+}
+
+/**
+ * Bridge + ramps + multichain balances (MarketInsightsView preset) merged with Asset
+ * Details preset so `AssetOverviewContent` selectors (Earn, staking, etc.) resolve.
+ */
+function buildTokenDetailsMarketInsightsState(
+  marketInsightsFlagEnabled: boolean,
+) {
+  return merge(
+    {},
+    initialStateAssetDetails({ deterministicFiat: true }).build(),
+    initialStateMarketInsightsView()
+      .withOverrides(fiatOrdersRampRoutingSupported)
+      .build(),
+    {
+      engine: {
+        backgroundState: {
+          TokenListController: {
+            tokensChainsCache: {},
+          },
+          RemoteFeatureFlagController: {
+            remoteFeatureFlags: remoteFeatureFlagMarketInsightsEnabled(
+              marketInsightsFlagEnabled,
+            ),
+          },
+          EarnController: {
+            pooled_staking: { isEligible: false },
+            lending: { positions: [], markets: [] },
+          },
+        },
+      },
+    },
+  );
+}
+
+describeForPlatforms(
+  'AssetOverviewContent (Market Insights entry card)',
+  () => {
+    it('does not show entry card or skeleton after fetch when API returns no report', async () => {
+      setupMarketInsightsEngineMock(null);
+
+      renderAssetOverviewMarketInsightsStack(
+        [
+          {
+            name: Routes.MARKET_INSIGHTS.VIEW,
+            Component:
+              MarketInsightsView as unknown as React.ComponentType<unknown>,
+          },
+        ],
+        { state: buildTokenDetailsMarketInsightsState(true) },
+      );
+
+      await waitFor(
+        () => {
+          expect(
+            screen.queryByTestId(
+              MarketInsightsSelectorsIDs.ENTRY_CARD_SKELETON,
+            ),
+          ).toBeNull();
+        },
+        { timeout: 15000 },
+      );
+      expect(
+        screen.queryByTestId(MarketInsightsSelectorsIDs.ENTRY_CARD),
+      ).toBeNull();
+    });
+
+    it('does not show entry card when market insights feature flag is off', async () => {
+      setupMarketInsightsEngineMock(MOCK_PERPS_MARKET_INSIGHTS_REPORT);
+
+      renderAssetOverviewMarketInsightsStack(
+        [
+          {
+            name: Routes.MARKET_INSIGHTS.VIEW,
+            Component:
+              MarketInsightsView as unknown as React.ComponentType<unknown>,
+          },
+        ],
+        { state: buildTokenDetailsMarketInsightsState(false) },
+      );
+
+      expect(
+        await screen.findByTestId(TokenOverviewSelectorsIDs.CONTAINER),
+      ).toBeOnTheScreen();
+
+      await waitFor(() => {
+        expect(
+          screen.queryByTestId(MarketInsightsSelectorsIDs.ENTRY_CARD_SKELETON),
+        ).toBeNull();
+      });
+      expect(
+        screen.queryByTestId(MarketInsightsSelectorsIDs.ENTRY_CARD),
+      ).toBeNull();
+    });
+
+    it('shows entry card when report exists and opens Market Insights on press', async () => {
+      setupMarketInsightsEngineMock(MOCK_PERPS_MARKET_INSIGHTS_REPORT);
+
+      renderAssetOverviewMarketInsightsStack(
+        [
+          {
+            name: Routes.MARKET_INSIGHTS.VIEW,
+            Component:
+              MarketInsightsView as unknown as React.ComponentType<unknown>,
+          },
+          { name: Routes.BRIDGE.ROOT },
+          { name: Routes.RAMP.TOKEN_SELECTION },
+        ],
+        { state: buildTokenDetailsMarketInsightsState(true) },
+      );
+
+      const entryCard = await screen.findByTestId(
+        MarketInsightsSelectorsIDs.ENTRY_CARD,
+        {},
+        { timeout: 15000 },
+      );
+      fireEvent.press(entryCard);
+
+      expect(
+        await screen.findByTestId(MarketInsightsSelectorsIDs.VIEW_CONTAINER),
+      ).toBeOnTheScreen();
+    });
+  },
+);
diff --git a/app/components/UI/TokenDetails/constants/constants.ts b/app/components/UI/TokenDetails/constants/constants.ts
index bd773a049a1..d2f2de6a6fc 100644
--- a/app/components/UI/TokenDetails/constants/constants.ts
+++ b/app/components/UI/TokenDetails/constants/constants.ts
@@ -14,6 +14,14 @@ export enum TokenDetailsSource {
   HomeSection = 'home_section',
   /** Trending tokens section (e.g. Explore tab) */
   Trending = 'trending',
+  /** Explore Now tab — crypto movers pills */
+  ExploreNowMovers = 'explore_now_movers',
+  /** Explore Now tab — stocks list */
+  ExploreNowStocks = 'explore_now_stocks',
+  /** Explore Crypto tab — trending tokens list */
+  ExploreCryptoTrending = 'explore_crypto_trending',
+  /** Explore RWAs tab — stocks list */
+  ExploreRwasStocks = 'explore_rwas_stocks',
   /** Trending tokens section on the Swaps / Bridge view */
   TrendingSwaps = 'trending-swaps',
   /** Dedicated homepage trending-tokens section (A/B treatment layout) */
diff --git a/app/components/UI/TokenDetails/hooks/useTokenTransactions.test.ts b/app/components/UI/TokenDetails/hooks/useTokenTransactions.test.ts
new file mode 100644
index 00000000000..91e087d8c7c
--- /dev/null
+++ b/app/components/UI/TokenDetails/hooks/useTokenTransactions.test.ts
@@ -0,0 +1,331 @@
+import { renderHook, waitFor } from '@testing-library/react-native';
+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 { selectTokens } from '../../../../selectors/tokensController';
+import { selectSelectedInternalAccount } from '../../../../selectors/accountsController';
+import { selectSelectedInternalAccountByScope } from '../../../../selectors/multichainAccounts/accounts';
+import {
+  selectConversionRate,
+  selectCurrentCurrency,
+} from '../../../../selectors/currencyRateController';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('@metamask/bridge-controller', () => ({
+  formatChainIdToCaip: jest.fn((chainId: string) => `eip155:${chainId}`),
+}));
+
+jest.mock('../../../../selectors/tokensController', () => ({
+  selectTokens: jest.fn(),
+}));
+
+jest.mock('../../../../selectors/transactionController', () => ({
+  selectTransactions: jest.fn(),
+  selectSwapsTransactions: jest.fn(),
+}));
+
+jest.mock('../../../../selectors/accountsController', () => ({
+  selectSelectedInternalAccount: jest.fn(),
+  selectSelectedInternalAccountAddress: jest.fn(),
+}));
+
+jest.mock('../../../../selectors/multichainAccounts/accounts', () => ({
+  selectSelectedInternalAccountByScope: jest.fn(),
+}));
+
+jest.mock('../../../../selectors/currencyRateController', () => ({
+  selectConversionRate: jest.fn(),
+  selectCurrentCurrency: jest.fn(),
+}));
+
+jest.mock('../../../../util/activity', () => ({
+  sortTransactions: jest.fn((txs: unknown[]) => txs),
+}));
+
+jest.mock('../../../../util/transactions', () => ({
+  addAccountTimeFlagFilter: jest.fn(() => false),
+}));
+
+jest.mock('../../../../util/transaction-controller', () => ({
+  updateIncomingTransactions: jest.fn(),
+}));
+
+jest.mock('../../../../core/Multichain/utils', () => ({
+  isNonEvmChainId: jest.fn(() => false),
+}));
+
+jest.mock('../../Earn/utils/musd', () => ({
+  isMusdClaimForCurrentView: jest.fn(() => false),
+}));
+
+jest.mock('../../../../selectors/multichain', () => ({
+  selectNonEvmTransactionsForSelectedAccountGroup: jest.fn(),
+}));
+
+jest.mock('../../../../selectors/accountTrackerController', () => ({
+  selectAccounts: jest.fn(),
+  selectAccountsByChainId: jest.fn(),
+}));
+
+jest.mock('../../../UI/TransactionElement/utils', () => ({
+  TOKEN_CATEGORY_HASH: {
+    tokenMethodApprove: true,
+    tokenMethodSetApprovalForAll: true,
+    tokenMethodTransfer: true,
+    tokenMethodTransferFrom: true,
+    tokenMethodIncreaseAllowance: true,
+  },
+}));
+
+jest.mock('../../../../store', () => ({
+  store: {
+    getState: () => ({
+      inpageProvider: { networkId: '1' },
+    }),
+  },
+}));
+
+const MOCK_ADDRESS = '0x1234567890abcdef1234567890abcdef12345678';
+const MOCK_RECIPIENT = '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd';
+const MONAD_CHAIN_ID = '0x279f';
+const ETH_CHAIN_ID = '0x1';
+const MOCK_TOKEN_ADDRESS = '0x6b175474e89094c44da98b954eedeac495271d0f';
+
+const mockUseSelector = jest.mocked(useSelector);
+
+const createMockTransaction = (overrides: Record<string, unknown> = {}) => ({
+  id: 'tx-1',
+  chainId: ETH_CHAIN_ID,
+  status: TX_CONFIRMED,
+  time: Date.now(),
+  txParams: {
+    from: MOCK_ADDRESS,
+    to: MOCK_RECIPIENT,
+  },
+  isTransfer: false,
+  ...overrides,
+});
+
+const createAsset = (overrides: Partial<TokenI> = {}): TokenI => ({
+  address: '',
+  decimals: 18,
+  image: '',
+  name: 'Ether',
+  symbol: 'ETH',
+  balance: '1000000000000000000',
+  logo: undefined,
+  isETH: true,
+  chainId: ETH_CHAIN_ID,
+  isNative: true,
+  ...overrides,
+});
+
+const setupMocks = (transactions: unknown[] = []) => {
+  mockUseSelector.mockImplementation((selector) => {
+    if (selector === selectTransactions) return transactions;
+    if (selector === selectSwapsTransactions) return {};
+    if (selector === selectTokens) return [];
+    if (selector === selectSelectedInternalAccount) {
+      return { address: MOCK_ADDRESS, metadata: { importTime: 0 } };
+    }
+    if (selector === selectSelectedInternalAccountByScope) {
+      return () => ({ address: MOCK_ADDRESS });
+    }
+    if (selector === selectConversionRate) return 1;
+    if (selector === selectCurrentCurrency) return 'usd';
+    // Inline selector for selectedAddressForAsset
+    return MOCK_ADDRESS;
+  });
+};
+
+describe('useTokenTransactions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('filter selection for native tokens', () => {
+    it('includes native send transaction for ETH (isETH=true)', async () => {
+      const tx = createMockTransaction({ chainId: ETH_CHAIN_ID });
+      setupMocks([tx]);
+
+      const asset = createAsset({
+        symbol: 'ETH',
+        isETH: true,
+        isNative: true,
+        address: '',
+        chainId: ETH_CHAIN_ID,
+      });
+
+      const { result } = renderHook(() => useTokenTransactions(asset));
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.confirmedTxs.length).toBe(1);
+    });
+
+    it('includes native send transaction for non-ETH native token (MON on Monad)', async () => {
+      const tx = createMockTransaction({
+        chainId: MONAD_CHAIN_ID,
+        txParams: { from: MOCK_ADDRESS, to: MOCK_RECIPIENT },
+      });
+      setupMocks([tx]);
+
+      const asset = createAsset({
+        symbol: 'MON',
+        isETH: false,
+        isNative: true,
+        address: '0x0000000000000000000000000000000000000000',
+        chainId: MONAD_CHAIN_ID,
+      });
+
+      const { result } = renderHook(() => useTokenTransactions(asset));
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      // Core regression test: MON native sends must appear
+      expect(result.current.confirmedTxs.length).toBe(1);
+    });
+
+    it('excludes token-category transactions from native token view', async () => {
+      const tx = createMockTransaction({
+        chainId: MONAD_CHAIN_ID,
+        type: 'tokenMethodTransfer',
+        txParams: { from: MOCK_ADDRESS, to: MOCK_TOKEN_ADDRESS },
+      });
+      setupMocks([tx]);
+
+      const asset = createAsset({
+        symbol: 'MON',
+        isETH: false,
+        isNative: true,
+        address: '0x0000000000000000000000000000000000000000',
+        chainId: MONAD_CHAIN_ID,
+      });
+
+      const { result } = renderHook(() => useTokenTransactions(asset));
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.confirmedTxs.length).toBe(0);
+      expect(result.current.transactions.length).toBe(0);
+    });
+
+    it('includes ERC20 token transaction in token-specific view', async () => {
+      const tx = createMockTransaction({
+        chainId: ETH_CHAIN_ID,
+        txParams: { from: MOCK_ADDRESS, to: MOCK_TOKEN_ADDRESS },
+      });
+      setupMocks([tx]);
+
+      const asset = createAsset({
+        symbol: 'DAI',
+        isETH: false,
+        isNative: false,
+        address: MOCK_TOKEN_ADDRESS,
+        chainId: ETH_CHAIN_ID,
+      });
+
+      const { result } = renderHook(() => useTokenTransactions(asset));
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.confirmedTxs.length).toBe(1);
+    });
+
+    it('excludes unrelated transactions from ERC20 token view', async () => {
+      const tx = createMockTransaction({
+        chainId: ETH_CHAIN_ID,
+        txParams: { from: MOCK_ADDRESS, to: MOCK_RECIPIENT },
+      });
+      setupMocks([tx]);
+
+      const asset = createAsset({
+        symbol: 'DAI',
+        isETH: false,
+        isNative: false,
+        address: MOCK_TOKEN_ADDRESS,
+        chainId: ETH_CHAIN_ID,
+      });
+
+      const { result } = renderHook(() => useTokenTransactions(asset));
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.confirmedTxs.length).toBe(0);
+    });
+
+    it('includes gas-sponsored native send for non-ETH chain', async () => {
+      const tx = createMockTransaction({
+        chainId: MONAD_CHAIN_ID,
+        txParams: {
+          from: MOCK_ADDRESS,
+          to: MOCK_RECIPIENT,
+          gasPrice: '0x0',
+          maxFeePerGas: '0x0',
+        },
+      });
+      setupMocks([tx]);
+
+      const asset = createAsset({
+        symbol: 'MON',
+        isETH: false,
+        isNative: true,
+        address: '0x0000000000000000000000000000000000000000',
+        chainId: MONAD_CHAIN_ID,
+      });
+
+      const { result } = renderHook(() => useTokenTransactions(asset));
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      // Gas-sponsored (zero gas fee) native sends must still appear
+      expect(result.current.confirmedTxs.length).toBe(1);
+    });
+  });
+
+  describe('cross-chain filtering', () => {
+    it('excludes transactions from a different chain', async () => {
+      const tx = createMockTransaction({
+        chainId: ETH_CHAIN_ID,
+        txParams: { from: MOCK_ADDRESS, to: MOCK_RECIPIENT },
+      });
+      setupMocks([tx]);
+
+      const asset = createAsset({
+        symbol: 'MON',
+        isETH: false,
+        isNative: true,
+        address: '0x0000000000000000000000000000000000000000',
+        chainId: MONAD_CHAIN_ID,
+      });
+
+      const { result } = renderHook(() => useTokenTransactions(asset));
+
+      await waitFor(() => {
+        expect(result.current.transactionsUpdated).toBe(true);
+      });
+
+      expect(result.current.confirmedTxs.length).toBe(0);
+    });
+  });
+});
diff --git a/app/components/UI/TokenDetails/hooks/useTokenTransactions.ts b/app/components/UI/TokenDetails/hooks/useTokenTransactions.ts
index df04c39c438..90794897a8d 100644
--- a/app/components/UI/TokenDetails/hooks/useTokenTransactions.ts
+++ b/app/components/UI/TokenDetails/hooks/useTokenTransactions.ts
@@ -374,12 +374,13 @@ export const useTokenTransactions = (
   );
 
   // Determine which filter to use
+  const isNativeToken = asset.isNative || asset.isETH;
   const filter = useMemo(() => {
-    if (navSymbol.toUpperCase() !== 'ETH' && navAddress !== '') {
-      return noEthFilter;
+    if (isNativeToken) {
+      return ethFilter;
     }
-    return ethFilter;
-  }, [navSymbol, navAddress, ethFilter, noEthFilter]);
+    return noEthFilter;
+  }, [isNativeToken, ethFilter, noEthFilter]);
 
   // Check if pending tx statuses changed
   const didTxStatusesChange = useCallback(
diff --git a/app/components/UI/TokenImage/__snapshots__/index.test.tsx.snap b/app/components/UI/TokenImage/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 15964de2db8..00000000000
--- a/app/components/UI/TokenImage/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,19 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TokenImage should render correctly 1`] = `
-<View
-  style={
-    [
-      {
-        "height": 50,
-        "width": 50,
-      },
-      undefined,
-      {
-        "borderRadius": 25,
-        "overflow": "hidden",
-      },
-    ]
-  }
-/>
-`;
diff --git a/app/components/UI/TokenImage/index.test.tsx b/app/components/UI/TokenImage/index.test.tsx
deleted file mode 100644
index 3108a01f37d..00000000000
--- a/app/components/UI/TokenImage/index.test.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import { render } from '@testing-library/react-native';
-import TokenImage from './';
-import configureMockStore from 'redux-mock-store';
-import { Provider } from 'react-redux';
-import { backgroundState } from '../../../util/test/initial-root-state';
-
-const mockStore = configureMockStore();
-const initialState = {
-  engine: {
-    backgroundState,
-  },
-  settings: {
-    primaryCurrency: 'usd',
-  },
-};
-const store = mockStore(initialState);
-
-describe('TokenImage', () => {
-  it('should render correctly', () => {
-    const { toJSON } = render(
-      <Provider store={store}>
-        <TokenImage
-          asset={{
-            address: '0x123',
-            symbol: 'ABC',
-            decimals: 18,
-            image: 'invalid-uri',
-          }}
-        />
-      </Provider>,
-    );
-    expect(toJSON()).toMatchSnapshot();
-  });
-});
diff --git a/app/components/UI/Tokens/TokenList/TokenList.tsx b/app/components/UI/Tokens/TokenList/TokenList.tsx
index 584dc59f229..3ce8a4ac964 100644
--- a/app/components/UI/Tokens/TokenList/TokenList.tsx
+++ b/app/components/UI/Tokens/TokenList/TokenList.tsx
@@ -40,6 +40,7 @@ interface TokenListProps {
   setShowScamWarningModal: (chainId: string | null) => void;
   maxItems?: number;
   isFullView?: boolean;
+  listHeaderComponent?: React.ReactElement;
   listFooterComponent?: React.ReactElement;
   /**
    * Optional external RefreshControl. When provided, overrides the internal
@@ -47,8 +48,18 @@ interface TokenListProps {
    * refresh orchestrator (e.g. Money Hub).
    */
   refreshControl?: React.ReactElement;
+  /**
+   * When true, mUSD rows render only the native balance on the secondary row
+   * (no token price / 24h change). Used by the Money Hub.
+   */
+  hideSecondaryPriceRow?: boolean;
 }
 
+const wrapEdgeNode = (
+  node: React.ReactElement | undefined,
+  isFullView: boolean,
+) => (isFullView && node ? <Box twClassName="-mx-4">{node}</Box> : node);
+
 const TokenListComponent = ({
   tokenKeys,
   refreshing,
@@ -58,8 +69,10 @@ const TokenListComponent = ({
   setShowScamWarningModal,
   maxItems,
   isFullView = false,
+  listHeaderComponent,
   listFooterComponent,
   refreshControl,
+  hideSecondaryPriceRow = false,
 }: TokenListProps) => {
   const { colors } = useTheme();
   const tw = useTailwind();
@@ -155,6 +168,7 @@ const TokenListComponent = ({
         showPercentageChange={showPercentageChange}
         isFullView={isFullView}
         shouldShowTokenListItemCta={shouldShowTokenListItemCta}
+        hideSecondaryPriceRow={hideSecondaryPriceRow}
       />
     ),
     [
@@ -164,6 +178,7 @@ const TokenListComponent = ({
       showPercentageChange,
       isFullView,
       shouldShowTokenListItemCta,
+      hideSecondaryPriceRow,
     ],
   );
 
@@ -172,6 +187,7 @@ const TokenListComponent = ({
       twClassName={'bg-default'}
       testID={WalletViewSelectorsIDs.TOKENS_CONTAINER_LIST}
     >
+      {listHeaderComponent}
       {displayTokenKeys.map((item, index) => (
         <TokenListItem
           key={`${getTokenKey(item)}-${index}`}
@@ -182,6 +198,7 @@ const TokenListComponent = ({
           showPercentageChange={showPercentageChange}
           isFullView={isFullView}
           shouldShowTokenListItemCta={shouldShowTokenListItemCta}
+          hideSecondaryPriceRow={hideSecondaryPriceRow}
         />
       ))}
       {shouldShowViewAllButton && (
@@ -218,13 +235,8 @@ const TokenListComponent = ({
         }
         extraData={{ isTokenNetworkFilterEqualCurrentNetwork }}
         contentContainerStyle={!isFullView ? undefined : tw`px-4`}
-        ListFooterComponent={
-          isFullView && listFooterComponent ? (
-            <Box twClassName="-mx-4">{listFooterComponent}</Box>
-          ) : (
-            listFooterComponent
-          )
-        }
+        ListHeaderComponent={wrapEdgeNode(listHeaderComponent, isFullView)}
+        ListFooterComponent={wrapEdgeNode(listFooterComponent, isFullView)}
       />
     </Box>
   );
diff --git a/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.test.tsx b/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.test.tsx
index 2d119d4a36f..5b5f1a5e7e2 100644
--- a/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.test.tsx
+++ b/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.test.tsx
@@ -30,7 +30,6 @@ import { useMusdConversionTokens } from '../../../Earn/hooks/useMusdConversionTo
 import { useMusdConversionEligibility } from '../../../Earn/hooks/useMusdConversionEligibility';
 import {
   selectIsMusdConversionFlowEnabledFlag,
-  selectMusdQuickConvertEnabledFlag,
   selectStablecoinLendingEnabledFlag,
 } from '../../../Earn/selectors/featureFlags';
 import {
@@ -38,7 +37,6 @@ import {
   MUSD_TOKEN_ADDRESS,
 } from '../../../Earn/constants/musd';
 import { EARN_EXPERIENCES } from '../../../Earn/constants/experiences';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../../../Earn/types/musd.types';
 
 jest.mock('../../../Stake/components/StakeButton', () => ({
   __esModule: true,
@@ -201,7 +199,6 @@ jest.mock('../../../Earn/selectors/featureFlags', () => ({
   selectPooledStakingEnabledFlag: jest.fn(() => true),
   selectStablecoinLendingEnabledFlag: jest.fn(() => false),
   selectIsMusdConversionFlowEnabledFlag: jest.fn(() => false),
-  selectMusdQuickConvertEnabledFlag: jest.fn(() => false),
   selectMusdConversionPaymentTokensAllowlist: jest.fn(() => ({})),
 }));
 
@@ -215,11 +212,6 @@ const mockSelectStablecoinLendingEnabledFlag =
     typeof selectStablecoinLendingEnabledFlag
   >;
 
-const mockSelectMusdQuickConvertEnabledFlag =
-  selectMusdQuickConvertEnabledFlag as jest.MockedFunction<
-    typeof selectMusdQuickConvertEnabledFlag
-  >;
-
 jest.mock('../../util/deriveBalanceFromAssetMarketDetails', () => ({
   deriveBalanceFromAssetMarketDetails: jest.fn(() => ({
     balanceFiat: '$100.00',
@@ -341,7 +333,6 @@ describe('TokenListItem - Component Rendering Tests for Coverage', () => {
     asset?: TokenI;
     pricePercentChange1d?: number;
     isMusdConversionEnabled?: boolean;
-    isQuickConvertEnabled?: boolean;
     isTokenWithCta?: boolean;
     isGeoEligible?: boolean;
     isStockToken?: boolean;
@@ -359,7 +350,6 @@ describe('TokenListItem - Component Rendering Tests for Coverage', () => {
     asset,
     pricePercentChange1d = 5.67,
     isMusdConversionEnabled = false,
-    isQuickConvertEnabled = false,
     isTokenWithCta = false,
     isGeoEligible = true,
     isStockToken = false,
@@ -396,9 +386,6 @@ describe('TokenListItem - Component Rendering Tests for Coverage', () => {
     mockSelectIsMusdConversionFlowEnabledFlag.mockReturnValue(
       isMusdConversionEnabled,
     );
-    mockSelectMusdQuickConvertEnabledFlag.mockReturnValue(
-      isQuickConvertEnabled,
-    );
     mockUseMusdConversionTokens.mockReturnValue({
       isConversionToken: jest.fn().mockReturnValue(false),
       hasConvertibleTokensByChainId: jest.fn().mockReturnValue(false),
@@ -428,10 +415,6 @@ describe('TokenListItem - Component Rendering Tests for Coverage', () => {
           return isStablecoinLendingEnabled;
         }
 
-        if (selector === selectMusdQuickConvertEnabledFlag) {
-          return isQuickConvertEnabled;
-        }
-
         if (selector === selectTokenMarketData) {
           return tokenMarketData ?? {};
         }
@@ -812,7 +795,6 @@ describe('TokenListItem - Component Rendering Tests for Coverage', () => {
             chainId: toHex('0x1'),
           },
           navigationStack: Routes.EARN.ROOT,
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
         });
       });
     }, 10000);
@@ -962,80 +944,6 @@ describe('TokenListItem - Component Rendering Tests for Coverage', () => {
       expect(mockTrackEvent).toHaveBeenCalledTimes(1);
       expect(mockTrackEvent).toHaveBeenCalledWith({ name: 'mock-built-event' });
     }, 10000);
-
-    it('tracks mUSD conversion CTA clicked event with quick convert redirect when education screen has been seen and quick convert is enabled', async () => {
-      // Arrange
-      mockHasSeenConversionEducationScreen = true;
-      prepareMocks({
-        asset: usdcAsset,
-        isMusdConversionEnabled: true,
-        isQuickConvertEnabled: true,
-        isTokenWithCta: true,
-      });
-
-      const convertAssetKey: FlashListAssetKey = {
-        address: usdcAsset.address,
-        chainId: usdcAsset.chainId,
-        isStaked: false,
-      };
-
-      const { getByTestId, getByText } = renderWithProvider(
-        <TokenListItem
-          assetKey={convertAssetKey}
-          showRemoveMenu={jest.fn()}
-          setShowScamWarningModal={jest.fn()}
-          privacyMode={false}
-          shouldShowTokenListItemCta={mockshouldShowTokenListItemCta}
-        />,
-      );
-
-      await waitFor(
-        () => {
-          expect(getByText('Get 3% mUSD bonus')).toBeOnTheScreen();
-        },
-        { timeout: 3000 },
-      );
-
-      mockTrackEvent.mockClear();
-      mockCreateEventBuilder.mockClear();
-      mockAddProperties.mockClear();
-      mockBuild.mockClear();
-
-      // Act
-      await act(async () => {
-        fireEvent.press(getByTestId(SECONDARY_BALANCE_BUTTON_TEST_ID));
-      });
-
-      // Assert
-      await waitFor(
-        () => {
-          expect(mockCreateEventBuilder).toHaveBeenCalledTimes(1);
-        },
-        { timeout: 3000 },
-      );
-      const { MetaMetricsEvents } = jest.requireActual(
-        '../../../../hooks/useMetrics',
-      );
-      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
-        MetaMetricsEvents.MUSD_CONVERSION_CTA_CLICKED,
-      );
-
-      expect(mockAddProperties).toHaveBeenCalledTimes(1);
-      expect(mockAddProperties).toHaveBeenCalledWith({
-        location: 'token_list_item',
-        redirects_to: 'quick_convert_home_screen',
-        cta_type: 'musd_conversion_secondary_cta',
-        cta_text: strings('earn.musd_conversion.get_a_percentage_musd_bonus', {
-          percentage: MUSD_CONVERSION_APY,
-        }),
-        network_chain_id: usdcAsset.chainId,
-        network_name: 'Ethereum Mainnet',
-        asset_symbol: usdcAsset.symbol,
-      });
-
-      expect(mockTrackEvent).toHaveBeenCalledTimes(1);
-      expect(mockTrackEvent).toHaveBeenCalledWith({ name: 'mock-built-event' });
-    }, 10000);
   });
 
   describe('Stock Badge', () => {
@@ -1230,6 +1138,56 @@ describe('TokenListItem - Component Rendering Tests for Coverage', () => {
     });
   });
 
+  describe('hideSecondaryPriceRow (Money Hub compact mUSD layout)', () => {
+    const musdAsset = {
+      ...defaultAsset,
+      address: MUSD_TOKEN_ADDRESS,
+      symbol: 'mUSD',
+      name: 'MetaMask USD',
+      isNative: false,
+      balance: '1280.34',
+      balanceFiat: '$1,280.34',
+    };
+    const musdKey: FlashListAssetKey = {
+      address: MUSD_TOKEN_ADDRESS,
+      chainId: '0x1',
+      isStaked: false,
+    };
+    const renderCompact = (key: FlashListAssetKey) =>
+      renderWithProvider(
+        <TokenListItem
+          assetKey={key}
+          showRemoveMenu={jest.fn()}
+          setShowScamWarningModal={jest.fn()}
+          privacyMode={false}
+          shouldShowTokenListItemCta={mockshouldShowTokenListItemCta}
+          hideSecondaryPriceRow
+        />,
+      );
+
+    it('renders compact mUSD layout and navigates on press', () => {
+      prepareMocks({ asset: musdAsset });
+      const { getByText } = renderCompact(musdKey);
+      expect(getByText('MetaMask USD')).toBeOnTheScreen();
+      expect(getByText('1280.34 mUSD')).toBeOnTheScreen();
+      fireEvent.press(getByText('MetaMask USD'));
+      expect(mockNavigate).toHaveBeenCalledWith(
+        'Asset',
+        expect.objectContaining({ symbol: 'mUSD' }),
+      );
+    });
+
+    it('does not affect non-mUSD rows', () => {
+      prepareMocks({ asset: defaultAsset });
+      const { getByText } = renderCompact({
+        address: '0x456',
+        chainId: '0x1',
+        isStaked: false,
+      });
+      expect(getByText('Test Token')).toBeOnTheScreen();
+    });
+  });
+
   describe('mUSD Bonus Row', () => {
     const claimableAsset = {
       ...defaultAsset,
@@ -1243,14 +1201,14 @@ describe('TokenListItem - Component Rendering Tests for Coverage', () => {
       isStaked: false,
     };
 
-    it('shows green "3% bonus" on mUSD rows when conversion is enabled', () => {
+    it('does not render the "3% bonus" label on mUSD rows (MUSD-729)', () => {
       prepareMocks({
         asset: claimableAsset,
         pricePercentChange1d: 5.0,
         isMusdConversionEnabled: true,
       });
 
-      const { getByText, queryByText } = renderWithProvider(
+      const { queryByText, getByText } = renderWithProvider(
         <TokenListItem
           assetKey={assetKey}
           showRemoveMenu={jest.fn()}
@@ -1261,15 +1219,15 @@ describe('TokenListItem - Component Rendering Tests for Coverage', () => {
       );
 
       expect(
-        getByText(
+        queryByText(
           strings('earn.musd_conversion.percentage_bonus', {
             percentage: MUSD_CONVERSION_APY,
           }),
         ),
-      ).toBeOnTheScreen();
-      expect(queryByText('+5.00%')).toBeNull();
-      // Price rail must stay hidden on mUSD bonus rows per Figma.
-      expect(queryByText(/\u2022/)).toBeNull();
+      ).toBeNull();
+      // Without the bonus label or a Convert CTA, the row falls back to the
+      // standard percentage-change rail.
+      expect(getByText('+5.00%')).toBeOnTheScreen();
     });
 
     it('shows normal percentage when mUSD but conversion flow is disabled', () => {
diff --git a/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.tsx b/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.tsx
index 8c5ab617e8a..1f1dd585081 100644
--- a/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.tsx
+++ b/app/components/UI/Tokens/TokenList/TokenListItem/TokenListItem.tsx
@@ -2,7 +2,7 @@ import { useQuery, useQueryClient } from '@tanstack/react-query';
 import { CaipAssetType, Hex } from '@metamask/utils';
 import { useNavigation } from '@react-navigation/native';
 import React, { useCallback, useMemo } from 'react';
-import { Platform, StyleSheet, TouchableOpacity, View } from 'react-native';
+import { StyleSheet, TouchableOpacity, View } from 'react-native';
 import { useSelector } from 'react-redux';
 import Badge, {
   BadgeVariant,
@@ -21,12 +21,7 @@ import { TokenI } from '../../types';
 import { ScamWarningIcon } from './ScamWarningIcon/ScamWarningIcon';
 import useIsOriginalNativeTokenSymbol from '../../../../hooks/useIsOriginalNativeTokenSymbol/useIsOriginalNativeTokenSymbol';
 import { FlashListAssetKey } from '../TokenList';
-import {
-  selectIsMusdConversionFlowEnabledFlag,
-  selectMusdQuickConvertEnabledFlag,
-  selectStablecoinLendingEnabledFlag,
-} from '../../../Earn/selectors/featureFlags';
-import { useMusdConversionEligibility } from '../../../Earn/hooks/useMusdConversionEligibility';
+import { selectStablecoinLendingEnabledFlag } from '../../../Earn/selectors/featureFlags';
 import { useTokenPricePercentageChange } from '../../hooks/useTokenPricePercentageChange';
 import { selectAsset } from '../../../../../selectors/assets/assets-list';
 import Tag from '../../../../../component-library/components/Tags/Tag';
@@ -77,8 +72,7 @@ import {
 } from '@metamask/assets-controllers';
 import { formatPriceWithSubscriptNotation } from '../../../Predict/utils/format';
 import { safeToChecksumAddress } from '../../../../../util/address';
-import generateTestId from '../../../../../../wdio/utils/generateTestId';
-import { getAssetTestId } from '../../../../../../wdio/screen-objects/testIDs/Screens/WalletView.testIds';
+import { getAssetTestId } from '../../../../../../tests/selectors/Wallet/WalletView.selectors';
 import SkeletonText from '../../../Ramp/Aggregator/components/SkeletonText';
 import {
   TOKEN_BALANCE_LOADING,
@@ -92,6 +86,7 @@ import {
 } from '../../../AssetElement/index.constants';
 import {
   Box,
+  BoxAlignItems,
   BoxFlexDirection,
   BoxJustifyContent,
   FontWeight,
@@ -99,7 +94,6 @@ import {
   TextColor,
   TextVariant,
 } from '@metamask/design-system-react-native';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../../../Earn/types/musd.types';
 import TokenListSecurityBadge from '../../components/TokenListSecurityBadge/TokenListSecurityBadge';
 import { tokenListSecurityBadgeKeys } from '../../queries/tokenSecurityBadgeKeys';
 import { getCaipAssetIdForToken } from '../../util/getCaipAssetIdForToken';
@@ -156,6 +150,11 @@ interface TokenListItemProps {
   showPercentageChange?: boolean;
   isFullView?: boolean;
   shouldShowTokenListItemCta: (asset?: TokenI) => boolean;
+  /**
+   * When true, mUSD rows render only the native balance on the secondary row
+   * (no token price / 24h change). Used by the Money Hub.
+   */
+  hideSecondaryPriceRow?: boolean;
 }
 
 export const TokenListItem = React.memo(
@@ -167,6 +166,7 @@ export const TokenListItem = React.memo(
     showPercentageChange = true,
     isFullView = false,
     shouldShowTokenListItemCta,
+    hideSecondaryPriceRow = false,
   }: TokenListItemProps) => {
     const { trackEvent, createEventBuilder } = useAnalytics();
     const navigation = useNavigation();
@@ -250,15 +250,6 @@ export const TokenListItem = React.memo(
       selectStablecoinLendingEnabledFlag,
     );
 
-    const isQuickConvertEnabled = useSelector(
-      selectMusdQuickConvertEnabledFlag,
-    );
-
-    const isMusdConversionFlowEnabled = useSelector(
-      selectIsMusdConversionFlowEnabledFlag,
-    );
-    const { isEligible: isMusdGeoEligible } = useMusdConversionEligibility();
-
     const { getEarnToken } = useEarnTokens();
 
     const earnToken = getEarnToken(asset as TokenI);
@@ -272,8 +263,6 @@ export const TokenListItem = React.memo(
     );
 
     const isMusdAsset = !!asset && isMusdToken(asset.address);
-    const showMusdBonusRow =
-      isMusdAsset && isMusdConversionFlowEnabled && isMusdGeoEligible;
 
     const pricePercentChange1d = useTokenPricePercentageChange(asset);
 
@@ -347,9 +336,7 @@ export const TokenListItem = React.memo(
             return EVENT_LOCATIONS.CONVERSION_EDUCATION_SCREEN;
           }
 
-          return isQuickConvertEnabled
-            ? EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN
-            : EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN;
+          return EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN;
         };
 
         trackEvent(
@@ -387,7 +374,6 @@ export const TokenListItem = React.memo(
             chainId: assetChainId,
           },
           navigationStack: Routes.EARN.ROOT,
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT,
         });
       } catch (error) {
         Logger.error(
@@ -403,7 +389,6 @@ export const TokenListItem = React.memo(
       createEventBuilder,
       hasSeenConversionEducationScreen,
       initiateCustomConversion,
-      isQuickConvertEnabled,
       networkName,
       trackEvent,
     ]);
@@ -451,16 +436,6 @@ export const TokenListItem = React.memo(
     });
 
     const secondaryBalanceDisplay = useMemo(() => {
-      if (showMusdBonusRow) {
-        return {
-          text: strings('earn.musd_conversion.percentage_bonus', {
-            percentage: MUSD_CONVERSION_APY,
-          }),
-          color: CLTextColor.Success,
-          onPress: undefined,
-        };
-      }
-
       if (shouldShowConvertToMusdCta) {
         return {
           text: strings('earn.musd_conversion.get_a_percentage_musd_bonus', {
@@ -503,7 +478,6 @@ export const TokenListItem = React.memo(
 
       return { text, color, onPress: undefined };
     }, [
-      showMusdBonusRow,
       shouldShowConvertToMusdCta,
       isStablecoinLendingEnabled,
       earnToken?.experience?.type,
@@ -562,6 +536,68 @@ export const TokenListItem = React.memo(
       fiatBalanceDisplay = fiatBalance;
     }
 
+    // Money Hub compact mUSD layout: name vertically centered, fiat over
+    // native on the right, no price/24h-change row.
+    if (hideSecondaryPriceRow && isMusdAsset) {
+      return (
+        <TouchableOpacity
+          onPress={() => onItemPress?.(asset)}
+          style={styles.itemWrapper}
+          testID={getAssetTestId(asset.symbol)}
+        >
+          <BadgeWrapper
+            style={styles.badge}
+            badgePosition={BadgePosition.BottomRight}
+            badgeElement={
+              networkBadgeSource && (
+                <Badge
+                  variant={BadgeVariant.Network}
+                  imageSource={networkBadgeSource}
+                />
+              )
+            }
+          >
+            <AssetLogo asset={asset} />
+          </BadgeWrapper>
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Between}
+            twClassName="flex-1 ml-5 gap-2.5"
+          >
+            <Text
+              variant={TextVariant.BodyMd}
+              fontWeight={FontWeight.Medium}
+              numberOfLines={1}
+              style={styles.assetNameText}
+            >
+              {asset.name || asset.symbol}
+            </Text>
+            <Box twClassName="items-end">
+              <SensitiveText
+                variant={CLTextVariant.BodyMDMedium}
+                isHidden={privacyMode}
+                length={SensitiveTextLength.Medium}
+                testID={BALANCE_TEST_ID}
+              >
+                {fiatBalanceDisplay}
+              </SensitiveText>
+              <SensitiveText
+                variant={CLTextVariant.BodySMMedium}
+                style={styles.secondaryBalance}
+                length={SensitiveTextLength.Short}
+                isHidden={privacyMode}
+                numberOfLines={1}
+                ellipsizeMode="tail"
+              >
+                {tokenBalance}
+              </SensitiveText>
+            </Box>
+          </Box>
+        </TouchableOpacity>
+      );
+    }
+
     return (
       <TouchableOpacity
         onPress={() => {
@@ -573,7 +609,7 @@ export const TokenListItem = React.memo(
           onLongPress?.(asset);
         }}
         style={styles.itemWrapper}
-        {...generateTestId(Platform, getAssetTestId(asset.symbol))}
+        testID={getAssetTestId(asset.symbol)}
       >
         {/* Column: 1 - Token logo */}
         <BadgeWrapper
@@ -666,93 +702,64 @@ export const TokenListItem = React.memo(
             justifyContent={BoxJustifyContent.Between}
             twClassName="gap-2.5"
           >
-            {showMusdBonusRow ? (
-              <>
-                <Box twClassName="shrink min-w-0">
-                  <SensitiveText
-                    variant={CLTextVariant.BodySMMedium}
-                    color={CLTextColor.Alternative}
-                    length={SensitiveTextLength.Short}
-                    isHidden={privacyMode}
-                    numberOfLines={1}
-                    ellipsizeMode="tail"
-                  >
-                    {tokenBalance}
-                  </SensitiveText>
-                </Box>
-
-                <SensitiveText
-                  variant={CLTextVariant.BodySMMedium}
-                  color={secondaryBalanceDisplay.color}
-                  isHidden={false}
-                  length={SensitiveTextLength.Short}
-                  testID={SECONDARY_BALANCE_TEST_ID}
+            {/* Token price and percentage change */}
+            <View style={styles.percentageChange}>
+              <Text
+                variant={TextVariant.BodySm}
+                fontWeight={FontWeight.Medium}
+                color={TextColor.TextAlternative}
+                twClassName="uppercase"
+              >
+                {tokenPriceInFiat && !hideFiatForScamWarning
+                  ? formatPriceWithSubscriptNotation(
+                      tokenPriceInFiat,
+                      currentCurrency,
+                    )
+                  : '-'}
+                {' \u2022 '}
+              </Text>
+
+              {hideFiatForScamWarning ? (
+                <Text
+                  variant={TextVariant.BodySm}
+                  fontWeight={FontWeight.Medium}
+                  color={TextColor.TextAlternative}
+                  twClassName="uppercase"
+                >
+                  {'-'}
+                </Text>
+              ) : (
+                <TouchableOpacity
+                  disabled={!secondaryBalanceDisplay.onPress}
+                  onPress={secondaryBalanceDisplay.onPress}
+                  testID={SECONDARY_BALANCE_BUTTON_TEST_ID}
                 >
-                  {secondaryBalanceDisplay.text}
-                </SensitiveText>
-              </>
-            ) : (
-              <>
-                {/* Token price and percentage change */}
-                <View style={styles.percentageChange}>
-                  <Text
-                    variant={TextVariant.BodySm}
-                    fontWeight={FontWeight.Medium}
-                    color={TextColor.TextAlternative}
-                    twClassName="uppercase"
-                  >
-                    {tokenPriceInFiat && !hideFiatForScamWarning
-                      ? formatPriceWithSubscriptNotation(
-                          tokenPriceInFiat,
-                          currentCurrency,
-                        )
-                      : '-'}
-                    {' \u2022 '}
-                  </Text>
-
-                  {hideFiatForScamWarning ? (
-                    <Text
-                      variant={TextVariant.BodySm}
-                      fontWeight={FontWeight.Medium}
-                      color={TextColor.TextAlternative}
-                      twClassName="uppercase"
-                    >
-                      {'-'}
-                    </Text>
-                  ) : (
-                    <TouchableOpacity
-                      disabled={!secondaryBalanceDisplay.onPress}
-                      onPress={secondaryBalanceDisplay.onPress}
-                      testID={SECONDARY_BALANCE_BUTTON_TEST_ID}
-                    >
-                      <SensitiveText
-                        variant={CLTextVariant.BodySMMedium}
-                        color={secondaryBalanceDisplay.color}
-                        isHidden={false}
-                        length={SensitiveTextLength.Short}
-                        testID={SECONDARY_BALANCE_TEST_ID}
-                      >
-                        {secondaryBalanceDisplay.text || '-'}
-                      </SensitiveText>
-                    </TouchableOpacity>
-                  )}
-                </View>
-
-                {/* Token balance */}
-                <Box twClassName="shrink">
                   <SensitiveText
                     variant={CLTextVariant.BodySMMedium}
-                    style={styles.secondaryBalance}
+                    color={secondaryBalanceDisplay.color}
+                    isHidden={false}
                     length={SensitiveTextLength.Short}
-                    isHidden={privacyMode}
-                    numberOfLines={1}
-                    ellipsizeMode="tail"
+                    testID={SECONDARY_BALANCE_TEST_ID}
                   >
-                    {tokenBalance}
+                    {secondaryBalanceDisplay.text || '-'}
                   </SensitiveText>
-                </Box>
-              </>
-            )}
+                </TouchableOpacity>
+              )}
+            </View>
+
+            {/* Token balance */}
+            <Box twClassName="shrink">
+              <SensitiveText
+                variant={CLTextVariant.BodySMMedium}
+                style={styles.secondaryBalance}
+                length={SensitiveTextLength.Short}
+                isHidden={privacyMode}
+                numberOfLines={1}
+                ellipsizeMode="tail"
+              >
+                {tokenBalance}
+              </SensitiveText>
+            </Box>
           </Box>
         </Box>
       </TouchableOpacity>
diff --git a/app/components/UI/Tokens/index.tsx b/app/components/UI/Tokens/index.tsx
index 9446ad1f1d1..ed10fae377e 100644
--- a/app/components/UI/Tokens/index.tsx
+++ b/app/components/UI/Tokens/index.tsx
@@ -56,6 +56,7 @@ interface TokensProps {
    * (e.g. network filter set to a chain without mUSD).
    */
   hasMusdBalanceOnAnyChain?: boolean;
+  listHeaderComponent?: React.ReactElement;
   listFooterComponent?: React.ReactElement;
   /**
    * Optional external RefreshControl. When provided, overrides the internal
@@ -69,6 +70,11 @@ interface TokensProps {
    * already handles its own loading state (e.g. CashTokensFullView).
    */
   hideLoadingSkeleton?: boolean;
+  /**
+   * When true, mUSD rows render only the native balance on the secondary row
+   * (no token price / 24h change). Used by the Money Hub.
+   */
+  hideSecondaryPriceRow?: boolean;
 }
 
 const Tokens = forwardRef<TabRefreshHandle, TokensProps>(
@@ -77,9 +83,11 @@ const Tokens = forwardRef<TabRefreshHandle, TokensProps>(
       isFullView = false,
       showOnlyMusd = false,
       hasMusdBalanceOnAnyChain: hasMusdBalanceOnAnyChainProp,
+      listHeaderComponent,
       listFooterComponent,
       refreshControl,
       hideLoadingSkeleton = false,
+      hideSecondaryPriceRow = false,
     },
     ref,
   ) => {
@@ -269,8 +277,10 @@ const Tokens = forwardRef<TabRefreshHandle, TokensProps>(
               setShowScamWarningModal={handleScamWarningModal}
               maxItems={maxItems}
               isFullView={isFullView}
+              listHeaderComponent={listHeaderComponent}
               listFooterComponent={listFooterComponent}
               refreshControl={refreshControl}
+              hideSecondaryPriceRow={hideSecondaryPriceRow}
             />
           </>
         );
@@ -278,9 +288,9 @@ const Tokens = forwardRef<TabRefreshHandle, TokensProps>(
 
       const cashEmptyDescription =
         showOnlyMusd && hasMusdBalanceOnAnyChainProp
-          ? strings('homepage.sections.cash_empty_description_network_filter')
+          ? strings('homepage.sections.money_empty_description_network_filter')
           : showOnlyMusd
-            ? strings('homepage.sections.cash_empty_description')
+            ? strings('homepage.sections.money_empty_description')
             : undefined;
 
       const emptyState = (
@@ -293,13 +303,14 @@ const Tokens = forwardRef<TabRefreshHandle, TokensProps>(
         </Box>
       );
 
-      if (listFooterComponent || refreshControl) {
+      if (listHeaderComponent || listFooterComponent || refreshControl) {
         return (
           <ScrollView
             style={tw`flex-1`}
             showsVerticalScrollIndicator={false}
             refreshControl={refreshControl}
           >
+            {listHeaderComponent}
             {emptyState}
             {listFooterComponent}
           </ScrollView>
@@ -322,8 +333,10 @@ const Tokens = forwardRef<TabRefreshHandle, TokensProps>(
       handleScamWarningModal,
       maxItems,
       isGeoEligible,
+      listHeaderComponent,
       listFooterComponent,
       refreshControl,
+      hideSecondaryPriceRow,
     ]);
 
     return (
diff --git a/app/components/UI/TransactionElement/TransactionDetails/index.js b/app/components/UI/TransactionElement/TransactionDetails/index.js
index 9460de845b1..fdd740f4bac 100644
--- a/app/components/UI/TransactionElement/TransactionDetails/index.js
+++ b/app/components/UI/TransactionElement/TransactionDetails/index.js
@@ -58,6 +58,7 @@ import { AvatarAccountType } from '../../../../component-library/components/Avat
 import { WalletViewSelectorsIDs } from '../../../Views/Wallet/WalletView.testIds';
 import { TransactionType } from '@metamask/transaction-controller';
 import TagBase from '../../../../component-library/base-components/TagBase';
+import { isHardwareAccount } from '../../../../util/address';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -333,6 +334,10 @@ class TransactionDetails extends PureComponent {
     );
     const { updatedTransactionDetails } = this.state;
     const styles = this.getStyles();
+    const fromAddress = txParams?.from;
+    const isHardwareWallet = Boolean(
+      fromAddress && isHardwareAccount(fromAddress),
+    );
     const isBridgeTransaction =
       transactionObject?.type === TransactionType.bridge;
     const renderTxActions =
@@ -474,7 +479,9 @@ class TransactionDetails extends PureComponent {
             gasEstimationReady
             transactionType={updatedTransactionDetails.transactionType}
             chainId={chainId}
-            isGasFeeSponsored={transactionObject.isGasFeeSponsored}
+            isGasFeeSponsored={
+              transactionObject.isGasFeeSponsored && !isHardwareWallet
+            }
           />
         </View>
         {updatedTransactionDetails.hash &&
diff --git a/app/components/UI/TransactionElement/TransactionDetails/index.test.tsx b/app/components/UI/TransactionElement/TransactionDetails/index.test.tsx
index 7bac09b5ca8..4e677958653 100644
--- a/app/components/UI/TransactionElement/TransactionDetails/index.test.tsx
+++ b/app/components/UI/TransactionElement/TransactionDetails/index.test.tsx
@@ -8,6 +8,7 @@ import renderWithProvider from '../../../../util/test/renderWithProvider';
 import { createStackNavigator } from '@react-navigation/stack';
 import { mockNetworkState } from '../../../../util/test/network';
 import type { NetworkState } from '@metamask/network-controller';
+import { isHardwareAccount } from '../../../../util/address';
 
 const Stack = createStackNavigator();
 const mockEthQuery = {
@@ -71,6 +72,11 @@ jest.mock('../../../../util/networks/global-network', () => ({
   getGlobalEthQuery: jest.fn(() => mockEthQuery),
 }));
 
+jest.mock('../../../../util/address', () => ({
+  ...jest.requireActual('../../../../util/address'),
+  isHardwareAccount: jest.fn(),
+}));
+
 jest.mock('@metamask/controller-utils', () => ({
   ...jest.requireActual('@metamask/controller-utils'),
   query: jest.fn(),
@@ -511,4 +517,19 @@ describe('TransactionDetails', () => {
 
     expect(screen.queryByText('Paid by MetaMask')).not.toBeOnTheScreen();
   });
+
+  it('does not show "Paid by MetaMask" for hardware wallet even when isGasFeeSponsored is true', () => {
+    jest.mocked(isHardwareAccount).mockReturnValue(true);
+
+    renderComponent({
+      state: initialState,
+      transactionObj: {
+        isGasFeeSponsored: true,
+        txParams: { from: '0xHardwareAddress' },
+      },
+    });
+
+    expect(screen.queryByTestId('paid-by-metamask')).not.toBeOnTheScreen();
+    expect(screen.queryByText('Paid by MetaMask')).not.toBeOnTheScreen();
+  });
 });
diff --git a/app/components/UI/TransactionElement/index.js b/app/components/UI/TransactionElement/index.js
index e0a35415e5b..55bbda471ab 100644
--- a/app/components/UI/TransactionElement/index.js
+++ b/app/components/UI/TransactionElement/index.js
@@ -26,7 +26,10 @@ import {
 } from '@metamask/transaction-controller';
 import { ThemeContext, mockTheme } from '../../../util/theme';
 import { selectTickerByChainId } from '../../../selectors/networkController';
-import { selectSelectedInternalAccount } from '../../../selectors/accountsController';
+import {
+  selectSelectedInternalAccount,
+  selectSelectedInternalAccountAddress,
+} from '../../../selectors/accountsController';
 import { selectSelectedAccountGroupInternalAccounts } from '../../../selectors/multichainAccounts/accountTreeController';
 import { selectPrimaryCurrency } from '../../../selectors/settings';
 import {
@@ -46,6 +49,7 @@ import BadgeWrapper from '../../../component-library/components/Badges/BadgeWrap
 import Badge, {
   BadgeVariant,
 } from '../../../component-library/components/Badges/Badge';
+import { AvatarSize } from '../../../component-library/components/Avatars/Avatar';
 import { NetworkBadgeSource } from '../AssetOverview/Balance/Balance';
 import {
   getFontFamily,
@@ -56,7 +60,7 @@ import {
   selectCurrencyRates,
 } from '../../../selectors/currencyRateController';
 import { selectContractExchangeRatesByChainId } from '../../../selectors/tokenRatesController';
-import { selectTokensByChainIdAndAddress } from '../../../selectors/tokensController';
+import { selectTokensByChainIdAndWalletAddress } from '../../../selectors/tokensController';
 import Routes from '../../../constants/navigation/Routes';
 import {
   hasGasFeeTokenSelected,
@@ -98,6 +102,10 @@ const createStyles = (colors, typography) =>
       width: 32,
       height: 32,
     },
+    iconBadgePosition: {
+      bottom: -4,
+      right: -4,
+    },
     importText: {
       color: colors.text.alternative,
       fontSize: 14,
@@ -224,6 +232,10 @@ class TransactionElement extends PureComponent {
      * Chain Id
      */
     txChainId: PropTypes.string,
+    /**
+     * Selected wallet address for decoding and token map (optional override from parent)
+     */
+    selectedAddress: PropTypes.string,
     /**
      * Ticker
      */
@@ -264,13 +276,13 @@ class TransactionElement extends PureComponent {
   mounted = false;
 
   componentDidMount = async () => {
+    this.mounted = true;
     const [transactionElement, transactionDetails] = await decodeTransaction({
       ...this.props,
       swapsTransactions: this.props.swapsTransactions,
       assetSymbol: this.props.assetSymbol,
       ticker: this.props.ticker,
     });
-    this.mounted = true;
 
     this.mounted && this.setState({ transactionElement, transactionDetails });
   };
@@ -278,7 +290,8 @@ class TransactionElement extends PureComponent {
   componentDidUpdate(prevProps) {
     if (
       prevProps.txChainId !== this.props.txChainId ||
-      prevProps.swapsTransactions !== this.props.swapsTransactions
+      prevProps.swapsTransactions !== this.props.swapsTransactions ||
+      prevProps.selectedAddress !== this.props.selectedAddress
     ) {
       this.componentDidMount();
     }
@@ -461,10 +474,13 @@ class TransactionElement extends PureComponent {
 
     return (
       <BadgeWrapper
+        badgePosition={styles.iconBadgePosition}
         badgeElement={
           <Badge
             variant={BadgeVariant.Network}
             imageSource={NetworkBadgeSource(chainId)}
+            isScaled={false}
+            size={AvatarSize.Xs}
           />
         }
       >
@@ -707,6 +723,35 @@ class TransactionElement extends PureComponent {
     );
   };
 
+  renderPendingElement = () => {
+    const { i, tx } = this.props;
+    const { colors, typography } = this.context || mockTheme;
+    const styles = createStyles(colors, typography);
+
+    return (
+      <ListItem>
+        <ListItem.Date style={styles.listItemDate}>
+          {this.renderTxTime()}
+        </ListItem.Date>
+        <ListItem.Content style={styles.listItemContent}>
+          <ListItem.Icon>
+            <View style={styles.icon} />
+          </ListItem.Icon>
+          <ListItem.Body>
+            <ListItem.Title numberOfLines={1} style={styles.listItemTitle}>
+              ...
+            </ListItem.Title>
+            <StatusText
+              testID={`transaction-status-${i}`}
+              status={tx.status}
+              style={styles.listItemStatus}
+            />
+          </ListItem.Body>
+        </ListItem.Content>
+      </ListItem>
+    );
+  };
+
   render() {
     const { tx, selectedInternalAccount } = this.props;
     const { transactionElement, transactionDetails } = this.state;
@@ -714,7 +759,7 @@ class TransactionElement extends PureComponent {
     const { colors, typography } = this.context || mockTheme;
     const styles = createStyles(colors, typography);
 
-    if (!transactionElement || !transactionDetails) return null;
+    const isReady = Boolean(transactionElement && transactionDetails);
 
     const accountImportTime = selectedInternalAccount?.metadata.importTime;
     const { time } = tx;
@@ -726,11 +771,13 @@ class TransactionElement extends PureComponent {
           style={
             this.props.showBottomBorder ? styles.rowWithBorder : styles.row
           }
-          onPress={this.onPressItem}
+          onPress={isReady ? this.onPressItem : undefined}
           underlayColor={colors.background.alternative}
           activeOpacity={1}
         >
-          {this.renderTxElement(transactionElement)}
+          {isReady
+            ? this.renderTxElement(transactionElement)
+            : this.renderPendingElement()}
         </TouchableHighlight>
         {accountImportTime <= time && this.renderImportTime()}
       </>
@@ -738,21 +785,29 @@ class TransactionElement extends PureComponent {
   }
 }
 
-const mapStateToProps = (state, ownProps) => ({
-  selectedInternalAccount: selectSelectedInternalAccount(state),
-  selectSelectedAccountGroupInternalAccounts:
-    selectSelectedAccountGroupInternalAccounts(state),
-  primaryCurrency: selectPrimaryCurrency(state),
-  swapsTransactions: selectSwapsTransactions(state),
-  ticker: selectTickerByChainId(state, ownProps.txChainId),
-  conversionRate: selectConversionRateByChainId(state, ownProps.txChainId),
-  currencyRates: selectCurrencyRates(state),
-  contractExchangeRates: selectContractExchangeRatesByChainId(
-    state,
-    ownProps.txChainId,
-  ),
-  tokens: selectTokensByChainIdAndAddress(state, ownProps.txChainId),
-});
+const mapStateToProps = (state, ownProps) => {
+  const walletAddressForTokens =
+    ownProps.selectedAddress ?? selectSelectedInternalAccountAddress(state);
+  return {
+    selectedInternalAccount: selectSelectedInternalAccount(state),
+    selectSelectedAccountGroupInternalAccounts:
+      selectSelectedAccountGroupInternalAccounts(state),
+    primaryCurrency: selectPrimaryCurrency(state),
+    swapsTransactions: selectSwapsTransactions(state),
+    ticker: selectTickerByChainId(state, ownProps.txChainId),
+    conversionRate: selectConversionRateByChainId(state, ownProps.txChainId),
+    currencyRates: selectCurrencyRates(state),
+    contractExchangeRates: selectContractExchangeRatesByChainId(
+      state,
+      ownProps.txChainId,
+    ),
+    tokens: selectTokensByChainIdAndWalletAddress(
+      state,
+      ownProps.txChainId,
+      walletAddressForTokens,
+    ),
+  };
+};
 
 TransactionElement.contextType = ThemeContext;
 
diff --git a/app/components/UI/Trending/components/FilterBar/FilterBar.tsx b/app/components/UI/Trending/components/FilterBar/FilterBar.tsx
index 470c1ae25a1..9f2a24d9640 100644
--- a/app/components/UI/Trending/components/FilterBar/FilterBar.tsx
+++ b/app/components/UI/Trending/components/FilterBar/FilterBar.tsx
@@ -17,6 +17,8 @@ export interface FilterButtonProps {
   ellipsizeMode?: 'tail' | 'head' | 'middle' | 'clip';
   /** Optional Tailwind class overrides for layout in custom contexts */
   twClassName?: string;
+  /** Optional icon name to show before the label (e.g., for sort direction indicators) */
+  iconName?: IconName;
 }
 
 export const FilterButton: React.FC<FilterButtonProps> = ({
@@ -27,6 +29,7 @@ export const FilterButton: React.FC<FilterButtonProps> = ({
   numberOfLines,
   ellipsizeMode,
   twClassName,
+  iconName,
 }) => {
   const tw = useTailwind();
 
@@ -43,10 +46,13 @@ export const FilterButton: React.FC<FilterButtonProps> = ({
       disabled={disabled}
     >
       <View style={tw`flex-row items-center justify-center gap-1`}>
+        {iconName && (
+          <Icon name={iconName} color={IconColor.Default} size={IconSize.Sm} />
+        )}
         <Text
           style={tw`min-w-0 shrink text-[14px] font-medium text-default`}
-          numberOfLines={numberOfLines}
-          ellipsizeMode={ellipsizeMode}
+          numberOfLines={numberOfLines ?? 1}
+          ellipsizeMode={ellipsizeMode ?? 'tail'}
         >
           {label}
         </Text>
@@ -64,6 +70,8 @@ export interface FilterBarProps {
   priceChangeButtonText: string;
   onPriceChangePress: () => void;
   isPriceChangeDisabled?: boolean;
+  /** Optional icon name for the price change button */
+  priceChangeIconName?: IconName;
 
   networkName: string;
   onNetworkPress: () => void;
@@ -81,6 +89,7 @@ const FilterBar: React.FC<FilterBarProps> = ({
   priceChangeButtonText,
   onPriceChangePress,
   isPriceChangeDisabled = false,
+  priceChangeIconName,
   networkName,
   onNetworkPress,
   extraFilters,
@@ -95,6 +104,7 @@ const FilterBar: React.FC<FilterBarProps> = ({
           label={priceChangeButtonText}
           onPress={onPriceChangePress}
           disabled={isPriceChangeDisabled}
+          iconName={priceChangeIconName}
         />
         <View style={tw`ml-2 min-w-0 shrink flex-row items-center gap-2`}>
           <FilterButton
diff --git a/app/components/UI/Trending/components/TokenListPageLayout/TokenListPageLayout.tsx b/app/components/UI/Trending/components/TokenListPageLayout/TokenListPageLayout.tsx
index 6dfcdab0905..e1b0984931f 100644
--- a/app/components/UI/Trending/components/TokenListPageLayout/TokenListPageLayout.tsx
+++ b/app/components/UI/Trending/components/TokenListPageLayout/TokenListPageLayout.tsx
@@ -88,6 +88,7 @@ const TokenListPageLayout: React.FC<TokenListPageLayoutProps> = ({
           priceChangeButtonText={filters.priceChangeButtonText}
           onPriceChangePress={filters.handlePriceChangePress}
           isPriceChangeDisabled={searchResults.length === 0}
+          priceChangeIconName={filters.priceChangeSortDirectionIcon}
           networkName={filters.selectedNetworkName}
           onNetworkPress={filters.handleAllNetworksPress}
           extraFilters={extraFilters}
diff --git a/app/components/UI/Trending/components/TrendingListHeader/TrendingListHeader.tsx b/app/components/UI/Trending/components/TrendingListHeader/TrendingListHeader.tsx
index 3e139988ffc..e8571a73196 100644
--- a/app/components/UI/Trending/components/TrendingListHeader/TrendingListHeader.tsx
+++ b/app/components/UI/Trending/components/TrendingListHeader/TrendingListHeader.tsx
@@ -3,10 +3,10 @@ import { useNavigation } from '@react-navigation/native';
 import {
   HeaderSearch,
   HeaderSearchVariant,
+  HeaderStandard,
   IconName as DSIconName,
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../../../locales/i18n';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import type { TrendingListHeaderProps } from './TrendingListHeader.types';
 
 /**
@@ -98,7 +98,7 @@ const TrendingListHeader: React.FC<TrendingListHeaderProps> = ({
   }
 
   return (
-    <HeaderCompactStandard
+    <HeaderStandard
       title={title || strings('trending.trending_tokens')}
       onBack={handleBack}
       backButtonProps={{
diff --git a/app/components/UI/Trending/components/TrendingTokenRowItem/TrendingTokenRowItem.tsx b/app/components/UI/Trending/components/TrendingTokenRowItem/TrendingTokenRowItem.tsx
index 61bc7b3be7d..efc92ff877a 100644
--- a/app/components/UI/Trending/components/TrendingTokenRowItem/TrendingTokenRowItem.tsx
+++ b/app/components/UI/Trending/components/TrendingTokenRowItem/TrendingTokenRowItem.tsx
@@ -1,7 +1,5 @@
 import React, { useCallback, useMemo } from 'react';
-import { ImageSourcePropType, TouchableOpacity, View } from 'react-native';
-import { StackActions, useNavigation } from '@react-navigation/native';
-import { useSelector } from 'react-redux';
+import { TouchableOpacity, View } from 'react-native';
 import Text, {
   TextColor,
   TextVariant,
@@ -16,97 +14,25 @@ import Badge, {
 import BadgeWrapper, {
   BadgePosition,
 } from '../../../../../component-library/components/Badges/BadgeWrapper';
-import {
-  CaipChainId,
-  Hex,
-  isCaipChainId,
-  parseCaipChainId,
-} from '@metamask/utils';
+import { isCaipChainId } from '@metamask/utils';
 import { getResultTypeConfig } from '../../../SecurityTrust/utils/securityUtils';
-import SecurityTrustInlineBadge from '../../../SecurityTrust/components/SecurityTrustInlineBadge/SecurityTrustInlineBadge';
-
-/**
- * Converts CAIP chain ID to hex chain ID
- */
-const caipChainIdToHex = (caipChainId: CaipChainId): Hex => {
-  const { namespace, reference } = parseCaipChainId(caipChainId);
-  return namespace === 'eip155'
-    ? (`0x${Number(reference).toString(16)}` as Hex)
-    : (caipChainId as Hex);
-};
+import {
+  caipChainIdToHex,
+  getCaipChainIdFromAssetId,
+  getNetworkBadgeSource,
+  formatMarketStats,
+  getPriceChangeFieldKey,
+} from './utils';
 import { NATIVE_SWAPS_TOKEN_ADDRESS } from '../../../../../constants/bridge';
 import type { TransactionActiveAbTestEntry } from '../../../../../util/transactions/transaction-active-ab-test-attribution-registry';
-import {
-  getDefaultNetworkByChainId,
-  getTestNetImageByChainId,
-  isTestNet,
-} from '../../../../../util/networks';
-import {
-  CustomNetworkImgMapping,
-  PopularList,
-  UnpopularNetworkList,
-  getNonEvmNetworkImageSourceByChainId,
-} from '../../../../../util/networks/customNetworks';
 import { AvatarSize } from '../../../../../component-library/components/Avatars/Avatar';
-import { formatMarketStats, getPriceChangeFieldKey } from './utils';
 import { formatPriceWithSubscriptNotation } from '../../../Predict/utils/format';
-import { TimeOption, PriceChangeOption } from '../TrendingTokensBottomSheet';
-import { selectNetworkConfigurationsByCaipChainId } from '../../../../../selectors/networkController';
+import { TimeOption } from '../TrendingTokensBottomSheet';
 import { getTrendingTokenImageUrl } from '../../utils/getTrendingTokenImageUrl';
-import { useAddPopularNetwork } from '../../../../hooks/useAddPopularNetwork';
-import TrendingFeedSessionManager from '../../services/TrendingFeedSessionManager';
 import type { TrendingFilterContext } from '../TrendingTokensList/TrendingTokensList';
 import { TokenDetailsSource } from '../../../TokenDetails/constants/constants';
-
-/**
- * Extracts CAIP chain ID from asset ID
- */
-const getCaipChainIdFromAssetId = (assetId: string): CaipChainId =>
-  assetId.split('/')[0] as CaipChainId;
-
-/**
- * Gets network badge image source for a given CAIP chain ID
- */
-const getNetworkBadgeSource = (
-  caipChainId: CaipChainId,
-): ImageSourcePropType | undefined => {
-  const hexChainId = caipChainIdToHex(caipChainId);
-
-  if (isTestNet(hexChainId)) {
-    return getTestNetImageByChainId(hexChainId);
-  }
-
-  const defaultNetwork = getDefaultNetworkByChainId(hexChainId) as
-    | { imageSource: ImageSourcePropType }
-    | undefined;
-
-  if (defaultNetwork) {
-    return defaultNetwork.imageSource;
-  }
-
-  const unpopularNetwork = UnpopularNetworkList.find(
-    (networkConfig) => networkConfig.chainId === hexChainId,
-  );
-
-  const customNetworkImg = CustomNetworkImgMapping[hexChainId];
-
-  const popularNetwork = PopularList.find(
-    (networkConfig) => networkConfig.chainId === hexChainId,
-  );
-
-  const network = unpopularNetwork || popularNetwork;
-  if (network) {
-    return network.rpcPrefs.imageSource;
-  }
-  if (isCaipChainId(caipChainId)) {
-    return getNonEvmNetworkImageSourceByChainId(caipChainId);
-  }
-  if (customNetworkImg) {
-    return customNetworkImg as ImageSourcePropType;
-  }
-
-  return undefined;
-};
+import { useTrendingTokenPress } from '../../hooks/useTrendingTokenPress/useTrendingTokenPress';
+import SecurityTrustInlineBadge from '../../../SecurityTrust/components/SecurityTrustInlineBadge/SecurityTrustInlineBadge';
 
 /**
  * Gets the text color for price percentage change
@@ -146,12 +72,22 @@ interface TrendingTokenRowItemProps {
    * asset details screen (including network-add logic and analytics tracking).
    */
   onPress?: (token: TrendingAsset) => void;
+  /**
+   * Called synchronously before the card's press handler fires.
+   * Useful for injecting analytics without overriding navigation.
+   */
+  onCardPress?: () => void;
+  /**
+   * When the same token row appears in multiple Explore sections, set this to keep
+   * `testID` (and E2E selectors) unique per instance.
+   */
+  testIdInstanceKey?: string;
 }
 
 /**
  * Converts a TrendingAsset to Asset navigation params
  */
-const getAssetNavigationParams = (
+export const getAssetNavigationParams = (
   token: TrendingAsset,
   source: TokenDetailsSource,
   transactionActiveAbTests?: TransactionActiveAbTestEntry[],
@@ -195,31 +131,16 @@ const TrendingTokenRowItem = ({
   tokenDetailsSource = TokenDetailsSource.Trending,
   transactionActiveAbTests,
   onPress,
+  onCardPress,
+  testIdInstanceKey,
 }: TrendingTokenRowItemProps) => {
   const { styles } = useStyles(styleSheet, {});
-  const navigation = useNavigation();
-  const networkConfigurations = useSelector(
-    selectNetworkConfigurationsByCaipChainId,
-  );
-  const { addPopularNetwork } = useAddPopularNetwork();
-  const sessionManager = TrendingFeedSessionManager.getInstance();
 
-  // Memoize derived values
   const caipChainId = useMemo(
     () => getCaipChainIdFromAssetId(token.assetId),
     [token.assetId],
   );
 
-  const assetParams = useMemo(
-    () =>
-      getAssetNavigationParams(
-        token,
-        tokenDetailsSource,
-        transactionActiveAbTests,
-      ),
-    [token, tokenDetailsSource, transactionActiveAbTests],
-  );
-
   const networkBadgeImageSource = useMemo(
     () => getNetworkBadgeSource(caipChainId),
     [caipChainId],
@@ -230,89 +151,43 @@ const TrendingTokenRowItem = ({
     [token.securityData?.resultType],
   );
 
-  // Parse price change percentage from API (comes as string like "-3.44" or "+0.456")
-  // Use the correct field based on selected time option
   const priceChangeFieldKey = getPriceChangeFieldKey(selectedTimeOption);
   const pricePercentChangeString = token.priceChangePct?.[priceChangeFieldKey];
   const pricePercentChange = pricePercentChangeString
     ? parseFloat(pricePercentChangeString)
     : undefined;
 
-  // Determine the color for percentage change
-  // Handle 0 as neutral (not positive or negative)
   const hasPercentageChange =
     pricePercentChange !== undefined && !isNaN(pricePercentChange);
   const isPositiveChange = hasPercentageChange && pricePercentChange > 0;
 
+  const { onPress: defaultOnPress } = useTrendingTokenPress({
+    token,
+    index: position,
+    filterContext,
+    tokenDetailsSource,
+    transactionActiveAbTests,
+    selectedTimeOption,
+  });
+
   const handlePress = useCallback(async () => {
+    onCardPress?.();
     if (onPress) {
       onPress(token);
       return;
     }
+    await defaultOnPress();
+  }, [onPress, onCardPress, token, defaultOnPress]);
 
-    if (!assetParams) return;
-
-    // Track token click event BEFORE navigation to ensure capture
-    if (position !== undefined && filterContext) {
-      sessionManager.trackTokenClick({
-        token_symbol: token.symbol,
-        token_address: assetParams.address,
-        token_name: token.name,
-        chain_id: assetParams.chainId,
-        position,
-        price_usd: parseFloat(token.price) || 0,
-        price_change_pct: pricePercentChange ?? 0,
-        time_filter: filterContext.timeFilter,
-        sort_option: filterContext.sortOption || PriceChangeOption.PriceChange,
-        network_filter: filterContext.networkFilter,
-        is_search_result: filterContext.isSearchResult,
-      });
-    }
-
-    const isNetworkAdded = Boolean(networkConfigurations[caipChainId]);
-
-    if (!isNetworkAdded) {
-      const popularNetwork = PopularList.find(
-        (network) => network.chainId === assetParams.chainId,
-      );
-
-      if (popularNetwork) {
-        // Add the network directly without showing confirmation modal
-        // addPopularNetwork handles both enabling the network in the filter
-        // and switching to it (shouldSwitchNetwork defaults to true)
-        try {
-          await addPopularNetwork(popularNetwork);
-        } catch (error) {
-          // If network addition fails, don't navigate
-          console.error('Failed to add network:', error);
-          return;
-        }
-      }
-    }
-
-    // Use push so we always open a new Asset screen for the tapped token.
-    // This prevents issues such as dismissing screens like Bridge instead
-    // of navigating forward to the new token.
-    navigation.dispatch(StackActions.push('Asset', assetParams));
-  }, [
-    onPress,
-    assetParams,
-    caipChainId,
-    navigation,
-    networkConfigurations,
-    addPopularNetwork,
-    position,
-    filterContext,
-    pricePercentChange,
-    token,
-    sessionManager,
-  ]);
+  const rowTestId = testIdInstanceKey
+    ? `trending-token-row-item-${testIdInstanceKey}-${token.assetId}`
+    : `trending-token-row-item-${token.assetId}`;
 
   return (
     <TouchableOpacity
       style={styles.container}
       onPress={handlePress}
-      testID={`trending-token-row-item-${token.assetId}`}
+      testID={rowTestId}
     >
       <View>
         <BadgeWrapper
diff --git a/app/components/UI/Trending/components/TrendingTokenRowItem/utils.test.ts b/app/components/UI/Trending/components/TrendingTokenRowItem/utils.test.ts
index 64670bd7f85..329d864b8f9 100644
--- a/app/components/UI/Trending/components/TrendingTokenRowItem/utils.test.ts
+++ b/app/components/UI/Trending/components/TrendingTokenRowItem/utils.test.ts
@@ -1,4 +1,13 @@
-import { formatCompactUSD, formatMarketStats } from './utils';
+import type { CaipChainId } from '@metamask/utils';
+import {
+  caipChainIdToHex,
+  formatCompactUSD,
+  formatMarketStats,
+  getCaipChainIdFromAssetId,
+  getNetworkBadgeSource,
+  getPriceChangeFieldKey,
+} from './utils';
+import { TimeOption } from '../TrendingTokensBottomSheet/TrendingTokenTimeBottomSheet';
 
 describe('formatCompactUSD', () => {
   describe('Billions formatting', () => {
@@ -364,3 +373,69 @@ describe('formatMarketStats', () => {
     });
   });
 });
+
+describe('getCaipChainIdFromAssetId', () => {
+  it('extracts the chain prefix from a CAIP-19 asset id', () => {
+    expect(getCaipChainIdFromAssetId('eip155:1/erc20:0xabc')).toBe('eip155:1');
+  });
+
+  it('returns the input untouched when there is no slash separator', () => {
+    expect(getCaipChainIdFromAssetId('eip155:1')).toBe('eip155:1');
+  });
+});
+
+describe('caipChainIdToHex', () => {
+  it('converts an eip155 reference to a hex chain id', () => {
+    expect(caipChainIdToHex('eip155:1' as CaipChainId)).toBe('0x1');
+    expect(caipChainIdToHex('eip155:137' as CaipChainId)).toBe('0x89');
+  });
+
+  it('passes non-eip155 CAIP ids through unchanged', () => {
+    expect(
+      caipChainIdToHex(
+        'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' as CaipChainId,
+      ),
+    ).toBe('solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp');
+  });
+});
+
+describe('getNetworkBadgeSource', () => {
+  it('returns an image source for a known popular EVM network (mainnet)', () => {
+    const src = getNetworkBadgeSource('eip155:1' as CaipChainId);
+    expect(src).toBeDefined();
+  });
+
+  it('returns undefined for an unknown EVM chain', () => {
+    const src = getNetworkBadgeSource('eip155:99999999' as CaipChainId);
+    expect(src).toBeUndefined();
+  });
+
+  it('returns CustomNetworkImgMapping image for EVM chain not in default/popular lists', () => {
+    // Flare mainnet (14) — in CustomNetworkImgMapping as 0xe, not covered by earlier lookups.
+    const src = getNetworkBadgeSource('eip155:14' as CaipChainId);
+    expect(src).toBeDefined();
+  });
+
+  it('does not throw for a non-EVM CAIP chain id', () => {
+    // Whether the badge resolves to a real image depends on customNetworks data;
+    // we just assert the lookup pipeline handles the non-eip155 branch cleanly.
+    expect(() =>
+      getNetworkBadgeSource('solana:mainnet' as CaipChainId),
+    ).not.toThrow();
+  });
+});
+
+describe('getPriceChangeFieldKey', () => {
+  it('maps each TimeOption to its priceChangePct field key', () => {
+    expect(getPriceChangeFieldKey(TimeOption.TwentyFourHours)).toBe('h24');
+    expect(getPriceChangeFieldKey(TimeOption.SixHours)).toBe('h6');
+    expect(getPriceChangeFieldKey(TimeOption.OneHour)).toBe('h1');
+    expect(getPriceChangeFieldKey(TimeOption.FiveMinutes)).toBe('m5');
+  });
+
+  it('defaults to h24 for an unknown TimeOption', () => {
+    expect(getPriceChangeFieldKey('unknown' as unknown as TimeOption)).toBe(
+      'h24',
+    );
+  });
+});
diff --git a/app/components/UI/Trending/components/TrendingTokenRowItem/utils.ts b/app/components/UI/Trending/components/TrendingTokenRowItem/utils.ts
index c2305f19580..79cb5870f24 100644
--- a/app/components/UI/Trending/components/TrendingTokenRowItem/utils.ts
+++ b/app/components/UI/Trending/components/TrendingTokenRowItem/utils.ts
@@ -1,5 +1,55 @@
+import { ImageSourcePropType } from 'react-native';
+import {
+  CaipChainId,
+  isCaipChainId,
+  KnownCaipNamespace,
+  parseCaipChainId,
+} from '@metamask/utils';
+import {
+  getDefaultNetworkByChainId,
+  getTestNetImageByChainId,
+  isTestNet,
+} from '../../../../../util/networks';
+import {
+  CustomNetworkImgMapping,
+  PopularList,
+  UnpopularNetworkList,
+  getNonEvmNetworkImageSourceByChainId,
+} from '../../../../../util/networks/customNetworks';
+import { caipChainIdToHex } from '../../../Rewards/utils/formatUtils';
 import { TimeOption } from '../TrendingTokensBottomSheet/TrendingTokenTimeBottomSheet';
 
+export const getCaipChainIdFromAssetId = (assetId: string): CaipChainId =>
+  assetId.split('/')[0] as CaipChainId;
+
+export { caipChainIdToHex };
+
+export const getNetworkBadgeSource = (
+  caipChainId: CaipChainId,
+): ImageSourcePropType | undefined => {
+  const hexChainId = caipChainIdToHex(caipChainId);
+  if (isTestNet(hexChainId)) return getTestNetImageByChainId(hexChainId);
+  const defaultNetwork = getDefaultNetworkByChainId(hexChainId) as
+    | { imageSource: ImageSourcePropType }
+    | undefined;
+  if (defaultNetwork) return defaultNetwork.imageSource;
+  const unpopularNetwork = UnpopularNetworkList.find(
+    (n) => n.chainId === hexChainId,
+  );
+  const popularNetwork = PopularList.find((n) => n.chainId === hexChainId);
+  const network = unpopularNetwork || popularNetwork;
+  if (network) return network.rpcPrefs.imageSource;
+  if (
+    isCaipChainId(caipChainId) &&
+    parseCaipChainId(caipChainId).namespace !== KnownCaipNamespace.Eip155
+  ) {
+    return getNonEvmNetworkImageSourceByChainId(caipChainId);
+  }
+  const customNetworkImg = CustomNetworkImgMapping[hexChainId];
+  if (customNetworkImg) return customNetworkImg as ImageSourcePropType;
+  return undefined;
+};
+
 /**
  * Formats a number as compact USD currency string
  * @param value - The number to format
diff --git a/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenNetworkBottomSheet.tsx b/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenNetworkBottomSheet.tsx
index 48e18a54b9d..61acf04b382 100644
--- a/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenNetworkBottomSheet.tsx
+++ b/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenNetworkBottomSheet.tsx
@@ -1,9 +1,9 @@
 import React, { useRef, useState, useCallback, useEffect } from 'react';
+import { HeaderStandard } from '@metamask/design-system-react-native';
 import { StyleSheet, ScrollView } from 'react-native';
 import BottomSheet, {
   BottomSheetRef,
 } from '../../../../../component-library/components/BottomSheets/BottomSheet';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import Icon, {
   IconName,
   IconSize,
@@ -115,7 +115,7 @@ const TrendingTokenNetworkBottomSheet: React.FC<
       onClose={handleSheetClose}
       testID="trending-token-network-bottom-sheet"
     >
-      <HeaderCompactStandard
+      <HeaderStandard
         title={strings('trending.networks')}
         onClose={handleClose}
         closeButtonProps={{ testID: 'close-button' }}
diff --git a/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenPriceChangeBottomSheet.tsx b/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenPriceChangeBottomSheet.tsx
index f0e2b3d7192..2aea06e9fae 100644
--- a/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenPriceChangeBottomSheet.tsx
+++ b/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenPriceChangeBottomSheet.tsx
@@ -1,4 +1,5 @@
 import React, { useRef, useState, useCallback, useEffect } from 'react';
+import { HeaderStandard } from '@metamask/design-system-react-native';
 import { View, StyleSheet, TouchableOpacity, Platform } from 'react-native';
 import { useTheme } from '../../../../../util/theme';
 import BottomSheet, {
@@ -14,7 +15,6 @@ import Icon, {
   IconColor,
 } from '../../../../../component-library/components/Icons/Icon';
 import { strings } from '../../../../../../locales/i18n';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import Button, {
   ButtonVariants,
   ButtonWidthTypes,
@@ -149,7 +149,7 @@ const TrendingTokenPriceChangeBottomSheet: React.FC<
       onClose={handleSheetClose}
       testID="trending-token-price-change-bottom-sheet"
     >
-      <HeaderCompactStandard
+      <HeaderStandard
         title={strings('trending.sort_by')}
         onClose={handleClose}
         closeButtonProps={{ testID: 'close-button' }}
diff --git a/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenTimeBottomSheet.tsx b/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenTimeBottomSheet.tsx
index 3c8fd0c43df..027363e9efb 100644
--- a/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenTimeBottomSheet.tsx
+++ b/app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenTimeBottomSheet.tsx
@@ -1,4 +1,5 @@
 import React, { useRef, useState, useCallback, useEffect } from 'react';
+import { HeaderStandard } from '@metamask/design-system-react-native';
 import { View, StyleSheet, TouchableOpacity } from 'react-native';
 import { useTheme } from '../../../../../util/theme';
 import BottomSheet, {
@@ -7,7 +8,6 @@ import BottomSheet, {
 import Text, {
   TextVariant,
 } from '../../../../../component-library/components/Texts/Text';
-import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import Icon, {
   IconName,
   IconSize,
@@ -139,7 +139,7 @@ const TrendingTokenTimeBottomSheet: React.FC<
       onClose={handleSheetClose}
       testID="trending-token-time-bottom-sheet"
     >
-      <HeaderCompactStandard
+      <HeaderStandard
         title={strings('trending.time')}
         onClose={handleClose}
         closeButtonProps={{ testID: 'close-button' }}
diff --git a/app/components/UI/Trending/hooks/useTokenListFilters/useTokenListFilters.test.ts b/app/components/UI/Trending/hooks/useTokenListFilters/useTokenListFilters.test.ts
index 7b2294c5ca3..c691a9cd10d 100644
--- a/app/components/UI/Trending/hooks/useTokenListFilters/useTokenListFilters.test.ts
+++ b/app/components/UI/Trending/hooks/useTokenListFilters/useTokenListFilters.test.ts
@@ -7,6 +7,7 @@ import {
   TimeOption,
 } from '../../components/TrendingTokensBottomSheet';
 import type { CaipChainId } from '@metamask/utils';
+import { IconName } from '../../../../../component-library/components/Icons/Icon';
 
 const mockGoBack = jest.fn();
 jest.mock('@react-navigation/native', () => ({
@@ -284,6 +285,50 @@ describe('useTokenListFilters', () => {
     });
   });
 
+  describe('priceChangeSortDirectionIcon', () => {
+    it('returns Arrow2Down for descending sort direction', () => {
+      const { result } = renderFilters();
+
+      expect(result.current.priceChangeSortDirectionIcon).toBe(
+        IconName.Arrow2Down,
+      );
+    });
+
+    it('returns Arrow2Up for ascending sort direction', () => {
+      const { result } = renderFilters();
+
+      act(() =>
+        result.current.handlePriceChangeSelect(
+          PriceChangeOption.Volume,
+          SortDirection.Ascending,
+        ),
+      );
+
+      expect(result.current.priceChangeSortDirectionIcon).toBe(
+        IconName.Arrow2Up,
+      );
+    });
+
+    it('updates when sort direction changes', () => {
+      const { result } = renderFilters();
+
+      expect(result.current.priceChangeSortDirectionIcon).toBe(
+        IconName.Arrow2Down,
+      );
+
+      act(() =>
+        result.current.handlePriceChangeSelect(
+          PriceChangeOption.PriceChange,
+          SortDirection.Ascending,
+        ),
+      );
+
+      expect(result.current.priceChangeSortDirectionIcon).toBe(
+        IconName.Arrow2Up,
+      );
+    });
+  });
+
   describe('filterContext', () => {
     it('reflects current filter state', () => {
       const { result } = renderFilters();
diff --git a/app/components/UI/Trending/hooks/useTokenListFilters/useTokenListFilters.ts b/app/components/UI/Trending/hooks/useTokenListFilters/useTokenListFilters.ts
index 8dce1bcf7f9..f9867d1bc4d 100644
--- a/app/components/UI/Trending/hooks/useTokenListFilters/useTokenListFilters.ts
+++ b/app/components/UI/Trending/hooks/useTokenListFilters/useTokenListFilters.ts
@@ -11,6 +11,7 @@ import {
 import type { TrendingFilterContext } from '../../components/TrendingTokensList/TrendingTokensList';
 import TrendingFeedSessionManager from '../../services/TrendingFeedSessionManager';
 import { useNetworkName } from '../useNetworkName/useNetworkName';
+import { IconName } from '../../../../../component-library/components/Icons/Icon';
 
 interface UseTokenListFiltersOptions {
   /**
@@ -49,6 +50,7 @@ export interface TokenListFilters {
   ) => void;
   handlePriceChangePress: () => void;
   priceChangeButtonText: string;
+  priceChangeSortDirectionIcon: IconName;
 
   // Time
   selectedTimeOption: TimeOption;
@@ -189,6 +191,14 @@ export const useTokenListFilters = (
     }
   }, [selectedPriceChangeOption]);
 
+  const priceChangeSortDirectionIcon = useMemo(
+    () =>
+      priceChangeSortDirection === SortDirection.Ascending
+        ? IconName.Arrow2Up
+        : IconName.Arrow2Down,
+    [priceChangeSortDirection],
+  );
+
   const filterContext: TrendingFilterContext = useMemo(
     () => ({
       timeFilter: selectedTimeOption,
@@ -226,6 +236,7 @@ export const useTokenListFilters = (
     handlePriceChangeSelect,
     handlePriceChangePress,
     priceChangeButtonText,
+    priceChangeSortDirectionIcon,
     selectedTimeOption,
     setSelectedTimeOption,
     refreshing,
diff --git a/app/components/UI/Trending/hooks/useTrendingTokenPress/useTrendingTokenPress.test.ts b/app/components/UI/Trending/hooks/useTrendingTokenPress/useTrendingTokenPress.test.ts
new file mode 100644
index 00000000000..de39077c2ca
--- /dev/null
+++ b/app/components/UI/Trending/hooks/useTrendingTokenPress/useTrendingTokenPress.test.ts
@@ -0,0 +1,176 @@
+import { renderHook, act } from '@testing-library/react-native';
+import { StackActions, useNavigation } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import { useTrendingTokenPress } from './useTrendingTokenPress';
+import { useAddPopularNetwork } from '../../../../hooks/useAddPopularNetwork';
+import TrendingFeedSessionManager from '../../services/TrendingFeedSessionManager';
+import { PopularList } from '../../../../../util/networks/customNetworks';
+import {
+  TimeOption,
+  PriceChangeOption,
+} from '../../components/TrendingTokensBottomSheet';
+import type { TrendingFilterContext } from '../../components/TrendingTokensList/TrendingTokensList';
+
+jest.mock('@react-navigation/native', () => ({
+  StackActions: { push: jest.fn((route, params) => ({ route, params })) },
+  useNavigation: jest.fn(),
+}));
+jest.mock('react-redux', () => ({ useSelector: jest.fn() }));
+jest.mock('../../../../hooks/useAddPopularNetwork');
+// Short-circuit selector module — useSelector is mocked, so we don't need real selectors.
+jest.mock('../../../../../selectors/networkController', () => ({
+  selectNetworkConfigurationsByCaipChainId: jest.fn(),
+}));
+jest.mock('../../services/TrendingFeedSessionManager', () => ({
+  __esModule: true,
+  default: { getInstance: jest.fn() },
+}));
+
+const mockNavigationDispatch = jest.fn();
+const mockAddPopularNetwork = jest.fn();
+const mockTrackTokenClick = jest.fn();
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockUseNavigation = useNavigation as jest.MockedFunction<
+  typeof useNavigation
+>;
+const mockUseAddPopularNetwork = useAddPopularNetwork as jest.MockedFunction<
+  typeof useAddPopularNetwork
+>;
+const mockGetInstance =
+  TrendingFeedSessionManager.getInstance as jest.MockedFunction<
+    typeof TrendingFeedSessionManager.getInstance
+  >;
+
+// EVM token assetId — caipChainIdToHex maps `eip155:43114` → `0xa86a`.
+const avalancheNetwork = PopularList.find((n) => n.nickname === 'Avalanche');
+if (!avalancheNetwork) throw new Error('Avalanche missing from PopularList');
+const AVAX_CHAIN_ID = avalancheNetwork.chainId;
+const ETH_TOKEN: TrendingAsset = {
+  assetId: 'eip155:1/erc20:0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+  symbol: 'USDC',
+  name: 'USD Coin',
+  decimals: 6,
+  price: '1',
+  priceChangePct: { h24: '2.5' },
+} as unknown as TrendingAsset;
+
+const AVAX_TOKEN: TrendingAsset = {
+  assetId: `eip155:43114/erc20:0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7`,
+  symbol: 'WAVAX',
+  name: 'Wrapped AVAX',
+  decimals: 18,
+  price: '20',
+} as unknown as TrendingAsset;
+
+describe('useTrendingTokenPress', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseNavigation.mockReturnValue({
+      dispatch: mockNavigationDispatch,
+    } as never);
+    mockUseAddPopularNetwork.mockReturnValue({
+      addPopularNetwork: mockAddPopularNetwork,
+    } as never);
+    mockGetInstance.mockReturnValue({
+      trackTokenClick: mockTrackTokenClick,
+    } as never);
+  });
+
+  it('navigates without adding a network when the chain is already configured', async () => {
+    // Network is already added — no call to addPopularNetwork.
+    mockUseSelector.mockReturnValue({ 'eip155:1': { name: 'Mainnet' } });
+
+    const { result } = renderHook(() =>
+      useTrendingTokenPress({ token: ETH_TOKEN }),
+    );
+    await act(async () => {
+      await result.current.onPress();
+    });
+
+    expect(mockAddPopularNetwork).not.toHaveBeenCalled();
+    expect(mockNavigationDispatch).toHaveBeenCalledTimes(1);
+    expect(StackActions.push).toHaveBeenCalledWith(
+      'Asset',
+      expect.objectContaining({ symbol: 'USDC', chainId: '0x1' }),
+    );
+  });
+
+  it('adds the network from PopularList before navigating when the chain is not configured', async () => {
+    mockUseSelector.mockReturnValue({}); // no networks configured
+    mockAddPopularNetwork.mockResolvedValueOnce(undefined);
+
+    const { result } = renderHook(() =>
+      useTrendingTokenPress({ token: AVAX_TOKEN }),
+    );
+    await act(async () => {
+      await result.current.onPress();
+    });
+
+    expect(mockAddPopularNetwork).toHaveBeenCalledWith(
+      expect.objectContaining({ chainId: AVAX_CHAIN_ID }),
+    );
+    expect(mockNavigationDispatch).toHaveBeenCalledTimes(1);
+  });
+
+  it('aborts navigation when addPopularNetwork throws', async () => {
+    mockUseSelector.mockReturnValue({});
+    mockAddPopularNetwork.mockRejectedValueOnce(new Error('boom'));
+    const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {
+      /* silence */
+    });
+
+    const { result } = renderHook(() =>
+      useTrendingTokenPress({ token: AVAX_TOKEN }),
+    );
+    await act(async () => {
+      await result.current.onPress();
+    });
+
+    expect(mockAddPopularNetwork).toHaveBeenCalled();
+    expect(mockNavigationDispatch).not.toHaveBeenCalled();
+    errorSpy.mockRestore();
+  });
+
+  it('tracks an analytics event when index and filterContext are provided', async () => {
+    mockUseSelector.mockReturnValue({ 'eip155:1': {} });
+    const filterContext: TrendingFilterContext = {
+      timeFilter: TimeOption.TwentyFourHours,
+      sortOption: PriceChangeOption.PriceChange,
+      networkFilter: 'all',
+      isSearchResult: false,
+    };
+
+    const { result } = renderHook(() =>
+      useTrendingTokenPress({
+        token: ETH_TOKEN,
+        index: 4,
+        filterContext,
+      }),
+    );
+    await act(async () => {
+      await result.current.onPress();
+    });
+
+    expect(mockTrackTokenClick).toHaveBeenCalledTimes(1);
+    expect(mockTrackTokenClick).toHaveBeenCalledWith(
+      expect.objectContaining({
+        token_symbol: 'USDC',
+        position: 4,
+        price_change_pct: 2.5,
+        is_search_result: false,
+      }),
+    );
+  });
+
+  it('skips analytics when index or filterContext is missing', async () => {
+    mockUseSelector.mockReturnValue({ 'eip155:1': {} });
+    const { result } = renderHook(() =>
+      useTrendingTokenPress({ token: ETH_TOKEN }),
+    );
+    await act(async () => {
+      await result.current.onPress();
+    });
+    expect(mockTrackTokenClick).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/components/UI/Trending/hooks/useTrendingTokenPress/useTrendingTokenPress.ts b/app/components/UI/Trending/hooks/useTrendingTokenPress/useTrendingTokenPress.ts
new file mode 100644
index 00000000000..c4640787f1f
--- /dev/null
+++ b/app/components/UI/Trending/hooks/useTrendingTokenPress/useTrendingTokenPress.ts
@@ -0,0 +1,104 @@
+import { useCallback } from 'react';
+import { StackActions, useNavigation } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import { isCaipChainId, type CaipChainId } from '@metamask/utils';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import type { TransactionActiveAbTestEntry } from '../../../../../util/transactions/transaction-active-ab-test-attribution-registry';
+import { getAssetNavigationParams } from '../../components/TrendingTokenRowItem/TrendingTokenRowItem';
+import { getPriceChangeFieldKey } from '../../components/TrendingTokenRowItem/utils';
+import TrendingFeedSessionManager from '../../services/TrendingFeedSessionManager';
+import { useAddPopularNetwork } from '../../../../hooks/useAddPopularNetwork';
+import { PopularList } from '../../../../../util/networks/customNetworks';
+import { TokenDetailsSource } from '../../../TokenDetails/constants/constants';
+import { selectNetworkConfigurationsByCaipChainId } from '../../../../../selectors/networkController';
+import {
+  TimeOption,
+  PriceChangeOption,
+} from '../../components/TrendingTokensBottomSheet';
+import type { TrendingFilterContext } from '../../components/TrendingTokensList/TrendingTokensList';
+import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
+
+export const useTrendingTokenPress = ({
+  token,
+  index,
+  filterContext,
+  tokenDetailsSource = TokenDetailsSource.Trending,
+  transactionActiveAbTests,
+  selectedTimeOption = TimeOption.TwentyFourHours,
+}: {
+  token: TrendingAsset;
+  index?: number;
+  filterContext?: TrendingFilterContext;
+  tokenDetailsSource?: TokenDetailsSource;
+  transactionActiveAbTests?: TransactionActiveAbTestEntry[];
+  selectedTimeOption?: TimeOption;
+}): { onPress: () => Promise<void> } => {
+  const navigation = useNavigation<AppNavigationProp>();
+  const networkConfigurations = useSelector(
+    selectNetworkConfigurationsByCaipChainId,
+  );
+  const { addPopularNetwork } = useAddPopularNetwork();
+
+  const onPress = useCallback(async () => {
+    const assetParams = getAssetNavigationParams(
+      token,
+      tokenDetailsSource,
+      transactionActiveAbTests,
+    );
+    if (!assetParams) return;
+
+    const caipChainId = token.assetId.split('/')[0];
+
+    if (index !== undefined && filterContext) {
+      const key = getPriceChangeFieldKey(selectedTimeOption);
+      const rawPct = token.priceChangePct?.[key];
+      const pricePercentChange = rawPct ? parseFloat(String(rawPct)) : 0;
+
+      TrendingFeedSessionManager.getInstance().trackTokenClick({
+        token_symbol: token.symbol,
+        token_address: assetParams.address,
+        token_name: token.name,
+        chain_id: assetParams.chainId,
+        position: index,
+        price_usd: parseFloat(token.price) || 0,
+        price_change_pct: pricePercentChange,
+        time_filter: filterContext.timeFilter,
+        sort_option: filterContext.sortOption ?? PriceChangeOption.PriceChange,
+        network_filter: filterContext.networkFilter,
+        is_search_result: filterContext.isSearchResult,
+      });
+    }
+
+    const isNetworkAdded = isCaipChainId(caipChainId)
+      ? Boolean(networkConfigurations[caipChainId as CaipChainId])
+      : true;
+
+    if (!isNetworkAdded) {
+      const popularNetwork = PopularList.find(
+        (n) => n.chainId === assetParams.chainId,
+      );
+      if (popularNetwork) {
+        try {
+          await addPopularNetwork(popularNetwork);
+        } catch (error) {
+          console.error('Failed to add network:', error);
+          return;
+        }
+      }
+    }
+
+    navigation.dispatch(StackActions.push('Asset', assetParams));
+  }, [
+    token,
+    index,
+    filterContext,
+    tokenDetailsSource,
+    transactionActiveAbTests,
+    selectedTimeOption,
+    navigation,
+    networkConfigurations,
+    addPopularNetwork,
+  ]);
+
+  return { onPress };
+};
diff --git a/app/components/UI/UrlAutocomplete/Result.tsx b/app/components/UI/UrlAutocomplete/Result.tsx
index 9c7483266d4..c78453bcf70 100644
--- a/app/components/UI/UrlAutocomplete/Result.tsx
+++ b/app/components/UI/UrlAutocomplete/Result.tsx
@@ -4,7 +4,7 @@ import { useTheme } from '../../../util/theme';
 import { getHost } from '../../../util/browser';
 import WebsiteIcon from '../WebsiteIcon';
 import ButtonIcon from '../../../component-library/components/Buttons/ButtonIcon';
-import { deleteFavoriteTestId } from '../../../../wdio/screen-objects/testIDs/BrowserScreen/UrlAutocomplete.testIds';
+import { deleteFavoriteTestId } from './UrlAutocomplete.testIds';
 import {
   Box,
   Icon,
diff --git a/app/components/UI/UrlAutocomplete/UrlAutocomplete.constants.ts b/app/components/UI/UrlAutocomplete/UrlAutocomplete.constants.ts
index 21f1681445d..915df4b8af9 100644
--- a/app/components/UI/UrlAutocomplete/UrlAutocomplete.constants.ts
+++ b/app/components/UI/UrlAutocomplete/UrlAutocomplete.constants.ts
@@ -1,5 +1,5 @@
 import { UrlAutocompleteCategory } from './types';
-import type { SectionId } from '../../Views/TrendingView/sections.config';
+import { SearchFeedId } from '../../Views/TrendingView/search/useExploreSearch';
 
 export const MAX_RECENTS = 5;
 
@@ -43,7 +43,7 @@ export const ORDERED_CATEGORIES = [
  * Section order for browser search (Sites first, then other omni-search sections)
  * This order is passed to useExploreSearch to display Sites before tokens/perps/predictions
  */
-export const BROWSER_SEARCH_SECTIONS_ORDER: SectionId[] = [
+export const BROWSER_SEARCH_SECTIONS_ORDER: SearchFeedId[] = [
   'sites',
   'tokens',
   'perps',
diff --git a/wdio/screen-objects/testIDs/BrowserScreen/UrlAutocomplete.testIds.ts b/app/components/UI/UrlAutocomplete/UrlAutocomplete.testIds.ts
similarity index 81%
rename from wdio/screen-objects/testIDs/BrowserScreen/UrlAutocomplete.testIds.ts
rename to app/components/UI/UrlAutocomplete/UrlAutocomplete.testIds.ts
index fbceab555d1..3cb21f0a3d8 100644
--- a/wdio/screen-objects/testIDs/BrowserScreen/UrlAutocomplete.testIds.ts
+++ b/app/components/UI/UrlAutocomplete/UrlAutocomplete.testIds.ts
@@ -1 +1 @@
-export const deleteFavoriteTestId = (url: string) => `delete-favorite-${url}`;
\ No newline at end of file
+export const deleteFavoriteTestId = (url: string) => `delete-favorite-${url}`;
diff --git a/app/components/UI/UrlAutocomplete/index.test.tsx b/app/components/UI/UrlAutocomplete/index.test.tsx
index 28d7a494fb5..3b43cee2db0 100644
--- a/app/components/UI/UrlAutocomplete/index.test.tsx
+++ b/app/components/UI/UrlAutocomplete/index.test.tsx
@@ -91,17 +91,35 @@ const mockPredictionsData = {
 };
 
 const mockUseExploreSearchReturn = {
-  data: {
-    sites: [{ name: 'Uniswap', url: 'https://uniswap.org' }],
-    tokens: [mockTokenData],
-    perps: [mockPerpsData],
-    predictions: [mockPredictionsData],
-  },
-  isLoading: { sites: false, tokens: false, perps: false, predictions: false },
-  sectionsOrder: ['sites', 'tokens', 'perps', 'predictions'],
+  sections: [
+    {
+      feedId: 'tokens' as const,
+      title: '',
+      items: [mockTokenData],
+      isLoading: false,
+    },
+    {
+      feedId: 'perps' as const,
+      title: '',
+      items: [mockPerpsData],
+      isLoading: false,
+    },
+    {
+      feedId: 'predictions' as const,
+      title: '',
+      items: [mockPredictionsData],
+      isLoading: false,
+    },
+    {
+      feedId: 'sites' as const,
+      title: '',
+      items: [{ name: 'Uniswap', url: 'https://uniswap.org' }],
+      isLoading: false,
+    },
+  ],
 };
 
-jest.mock('../../Views/TrendingView/hooks/useExploreSearch', () => ({
+jest.mock('../../Views/TrendingView/search/useExploreSearch', () => ({
   useExploreSearch: jest.fn(() => mockUseExploreSearchReturn),
 }));
 jest.mock('../Perps/providers/PerpsConnectionProvider', () => ({
@@ -125,7 +143,7 @@ jest.mock('../Bridge/hooks/useSwapBridgeNavigation', () => ({
 
 import React from 'react';
 import UrlAutocomplete, { UrlAutocompleteRef } from './';
-import { deleteFavoriteTestId } from '../../../../wdio/screen-objects/testIDs/BrowserScreen/UrlAutocomplete.testIds';
+import { deleteFavoriteTestId } from './UrlAutocomplete.testIds';
 import { act, fireEvent, screen, waitFor } from '@testing-library/react-native';
 import renderWithProvider, {
   DeepPartial,
diff --git a/app/components/UI/UrlAutocomplete/index.tsx b/app/components/UI/UrlAutocomplete/index.tsx
index a2607f29845..0ba6d28edb8 100644
--- a/app/components/UI/UrlAutocomplete/index.tsx
+++ b/app/components/UI/UrlAutocomplete/index.tsx
@@ -48,8 +48,10 @@ import {
   useSwapBridgeNavigation,
 } from '../Bridge/hooks/useSwapBridgeNavigation';
 import { BridgeToken } from '../Bridge/types';
-import { useExploreSearch } from '../../Views/TrendingView/hooks/useExploreSearch';
-import { type SectionId } from '../../Views/TrendingView/sections.config';
+import {
+  useExploreSearch,
+  type SearchFeedId,
+} from '../../Views/TrendingView/search/useExploreSearch';
 import type { TrendingAsset } from '@metamask/assets-controllers';
 import { type PerpsMarketData } from '@metamask/perps-controller';
 import type { PredictMarket } from '../Predict/types';
@@ -81,19 +83,22 @@ const getTrendingTokenImageUrl = (assetId: string): string =>
   `https://token.api.cx.metamask.io/assets/${assetId}/logo.png`;
 
 interface ResultsWithCategory {
-  category: UrlAutocompleteCategory | SectionId;
+  category: UrlAutocompleteCategory | SearchFeedId;
   data: AutocompleteSearchResult[];
   isLoading?: boolean;
 }
 
 /**
- * Helper to map SectionId to UrlAutocompleteCategory for display
+ * Helper to map search feed id to UrlAutocompleteCategory for display
  */
-const sectionIdToCategory = (sectionId: SectionId): UrlAutocompleteCategory => {
+const sectionIdToCategory = (
+  sectionId: SearchFeedId,
+): UrlAutocompleteCategory => {
   switch (sectionId) {
     case 'sites':
       return UrlAutocompleteCategory.Sites;
     case 'tokens':
+    case 'stocks':
       return UrlAutocompleteCategory.Tokens;
     case 'perps':
       return UrlAutocompleteCategory.Perps;
@@ -199,14 +204,42 @@ const SearchContent: React.FC<SearchContentProps> = ({
     selectBasicFunctionalityEnabled,
   );
 
-  // Use omni-search hook with browser-specific section order (Sites first)
+  // Bridge Explore `useExploreSearch` ({ sections }) to the record shape this UI expects
+  const exploreResult = useExploreSearch(searchQuery);
   const {
     data: omniSearchData,
     isLoading: omniSearchLoading,
     sectionsOrder,
-  } = useExploreSearch(searchQuery, {
-    sectionsOrder: BROWSER_SEARCH_SECTIONS_ORDER,
-  });
+  } = useMemo(() => {
+    const order = BROWSER_SEARCH_SECTIONS_ORDER;
+    const byFeedId = new Map(exploreResult.sections.map((s) => [s.feedId, s]));
+
+    const data: Partial<Record<SearchFeedId, unknown[]>> = {};
+    const isLoading: Partial<Record<SearchFeedId, boolean>> = {};
+
+    for (const sectionId of order) {
+      if (sectionId === 'tokens') {
+        const tokensSec = byFeedId.get('tokens');
+        const stocksSec = byFeedId.get('stocks');
+        data.tokens = [
+          ...((tokensSec?.items as TrendingAsset[]) ?? []),
+          ...((stocksSec?.items as TrendingAsset[]) ?? []),
+        ];
+        isLoading.tokens =
+          Boolean(tokensSec?.isLoading) || Boolean(stocksSec?.isLoading);
+        continue;
+      }
+      const sec = byFeedId.get(sectionId);
+      data[sectionId] = sec?.items ?? [];
+      isLoading[sectionId] = sec?.isLoading ?? false;
+    }
+
+    return {
+      data: data as Record<SearchFeedId, unknown[]>,
+      isLoading: isLoading as Record<SearchFeedId, boolean>,
+      sectionsOrder: order,
+    };
+  }, [exploreResult]);
 
   // Create Fuse instance for filtering Recents and Favorites
   const fuseInstance = useMemo(() => {
diff --git a/app/components/UI/WebviewError/WebviewError.testIds.ts b/app/components/UI/WebviewError/WebviewError.testIds.ts
new file mode 100644
index 00000000000..dfb8b777463
--- /dev/null
+++ b/app/components/UI/WebviewError/WebviewError.testIds.ts
@@ -0,0 +1,5 @@
+export const WebviewErrorSelectorsIDs = {
+  TITLE: 'error-page-title',
+  MESSAGE: 'error-page-message',
+  RETURN_BUTTON: 'error-page-return-button',
+};
diff --git a/app/components/UI/WebviewError/index.js b/app/components/UI/WebviewError/index.js
index a2d6d0004b3..bdae4ab0fd2 100644
--- a/app/components/UI/WebviewError/index.js
+++ b/app/components/UI/WebviewError/index.js
@@ -1,16 +1,11 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { Image, StyleSheet, View, Text, Platform } from 'react-native';
+import { Image, StyleSheet, View, Text } from 'react-native';
 import StyledButton from '../StyledButton';
 import { strings } from '../../../../locales/i18n';
 import { fontStyles } from '../../../styles/common';
 import { ThemeContext, mockTheme } from '../../../util/theme';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import {
-  ERROR_PAGE_MESSAGE,
-  ERROR_PAGE_RETURN_BUTTON,
-  ERROR_PAGE_TITLE,
-} from '../../../../wdio/screen-objects/testIDs/BrowserScreen/ExternalWebsites.testIds';
+import { WebviewErrorSelectorsIDs } from './WebviewError.testIds';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -102,13 +97,13 @@ export default class WebviewError extends PureComponent {
         <View style={styles.textWrapper}>
           <Text
             style={styles.errorTitle}
-            {...generateTestId(Platform, ERROR_PAGE_TITLE)}
+            testID={WebviewErrorSelectorsIDs.TITLE}
           >
             {strings('webview_error.title')}
           </Text>
           <Text
             style={styles.errorMessage}
-            {...generateTestId(Platform, ERROR_PAGE_MESSAGE)}
+            testID={WebviewErrorSelectorsIDs.MESSAGE}
           >
             {strings('webview_error.message')}
           </Text>
@@ -118,7 +113,7 @@ export default class WebviewError extends PureComponent {
         </View>
         <View
           style={styles.buttonWrapper}
-          {...generateTestId(Platform, ERROR_PAGE_RETURN_BUTTON)}
+          testID={WebviewErrorSelectorsIDs.RETURN_BUTTON}
         >
           <StyledButton type={'confirm'} onPress={this.returnHome}>
             {strings('webview_error.return_home')}
diff --git a/app/components/UI/shared/ListHeaderWithSearch/ListHeaderWithSearch.tsx b/app/components/UI/shared/ListHeaderWithSearch/ListHeaderWithSearch.tsx
index bb39df2bc79..4d5ff2d4068 100644
--- a/app/components/UI/shared/ListHeaderWithSearch/ListHeaderWithSearch.tsx
+++ b/app/components/UI/shared/ListHeaderWithSearch/ListHeaderWithSearch.tsx
@@ -14,6 +14,7 @@ import {
   BoxFlexDirection,
   BoxAlignItems,
   IconName as DSIconName,
+  HeaderStandard,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import Icon, {
@@ -25,7 +26,6 @@ import Text, {
   TextVariant,
   TextColor,
 } from '../../../../component-library/components/Texts/Text';
-import HeaderCompactStandard from '../../../../component-library/components-temp/HeaderCompactStandard';
 import { useTheme } from '../../../../util/theme';
 import type { ListHeaderWithSearchProps } from './ListHeaderWithSearch.types';
 import styleSheet from './ListHeaderWithSearch.styles';
@@ -140,7 +140,7 @@ const ListHeaderWithSearch: React.FC<ListHeaderWithSearchProps> = ({
   }
 
   return (
-    <HeaderCompactStandard
+    <HeaderStandard
       title={title || defaultTitle}
       onBack={handleBack}
       backButtonProps={{
diff --git a/app/components/Views/AccountSelector/AccountSelector.styles.ts b/app/components/Views/AccountSelector/AccountSelector.styles.ts
deleted file mode 100644
index f2566f57c3e..00000000000
--- a/app/components/Views/AccountSelector/AccountSelector.styles.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { StyleSheet } from 'react-native';
-import { Theme } from '../../../util/theme/models';
-import { colors as importedColors } from '../../../styles/common';
-
-const styleSheet = (params: { theme: Theme }) => {
-  const { theme } = params;
-  const { colors } = theme;
-
-  return StyleSheet.create({
-    accountSelectorFooterContent: {
-      paddingHorizontal: 16,
-      paddingTop: 24,
-      // Extra space above safe-area inset so the footer actions are not flush with the screen edge
-      paddingBottom: 20,
-    },
-    backdrop: {
-      ...StyleSheet.absoluteFillObject,
-      backgroundColor: colors.overlay.default,
-    },
-    keyboardAvoidingView: {
-      flex: 1,
-      backgroundColor: importedColors.transparent,
-    },
-    container: {
-      flex: 1,
-      backgroundColor: colors.background.default,
-    },
-    addWalletModalContainer: {
-      flex: 1,
-      backgroundColor: colors.background.default,
-    },
-    accountSelectorFooter: {
-      flexDirection: 'row',
-    },
-    footerButton: {
-      flex: 1,
-    },
-    footerButtonSubsequent: {
-      flex: 1,
-      marginLeft: 16,
-    },
-  });
-};
-
-export default styleSheet;
diff --git a/app/components/Views/AccountSelector/AccountSelector.tsx b/app/components/Views/AccountSelector/AccountSelector.tsx
index de18e3297b0..f4c18b90492 100644
--- a/app/components/Views/AccountSelector/AccountSelector.tsx
+++ b/app/components/Views/AccountSelector/AccountSelector.tsx
@@ -8,24 +8,29 @@ import React, {
   useState,
 } from 'react';
 import {
-  KeyboardAvoidingView,
-  Platform,
   ActivityIndicator,
+  KeyboardAvoidingView,
   Modal,
-  useWindowDimensions,
-  View,
+  Platform,
 } from 'react-native';
 import { StackActions, useNavigation } from '@react-navigation/native';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import Animated, {
-  useSharedValue,
-  useAnimatedStyle,
-  withTiming,
-  withSpring,
-  runOnJS,
-  useDerivedValue,
-  interpolate,
-} from 'react-native-reanimated';
+import {
+  useSafeAreaFrame,
+  useSafeAreaInsets,
+} from 'react-native-safe-area-context';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  Button,
+  ButtonSize,
+  ButtonVariant,
+  FontWeight,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
 
 // External dependencies.
 import MultichainAccountSelectorList from '../../../component-library/components-temp/MultichainAccounts/MultichainAccountSelectorList';
@@ -36,13 +41,6 @@ import { store } from '../../../store';
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import { strings } from '../../../../locales/i18n';
 import { useAccounts } from '../../hooks/useAccounts';
-import Button, {
-  ButtonSize,
-  ButtonVariants,
-  ButtonWidthTypes,
-} from '../../../component-library/components/Buttons/Button';
-import { TextVariant } from '../../../component-library/components/Texts/Text';
-import Text from '../../../component-library/components/Texts/Text/Text';
 import AddAccountActions from '../AddAccountActions';
 import { AccountListBottomSheetSelectorsIDs } from './AccountListBottomSheet.testIds';
 import { CommonSelectorsIDs } from '../../../util/Common.testIds';
@@ -50,12 +48,10 @@ import { selectSelectedAccountGroup } from '../../../selectors/multichainAccount
 import { AccountGroupObject } from '@metamask/account-tree-controller';
 
 // Internal dependencies.
-import { useStyles } from '../../../component-library/hooks';
 import {
   AccountSelectorProps,
   AccountSelectorScreens,
 } from './AccountSelector.types';
-import styleSheet from './AccountSelector.styles';
 import { useDispatch, useSelector } from 'react-redux';
 import { setReloadAccounts } from '../../../actions/accounts';
 import { RootState } from '../../../reducers';
@@ -67,24 +63,16 @@ import {
   trace,
 } from '../../../util/trace';
 import { getTraceTags } from '../../../util/sentry/tags';
-import { ButtonProps } from '../../../component-library/components/Buttons/Button/Button.types';
 import { useSyncSRPs } from '../../hooks/useSyncSRPs';
 import { useAccountsOperationsLoadingStates } from '../../../util/accounts/useAccountsOperationsLoadingStates';
-import { Box } from '../../UI/Box/Box';
-import {
-  AlignItems,
-  FlexDirection,
-  JustifyContent,
-} from '../../UI/Box/box.types';
-import { AnimationDuration } from '../../../component-library/constants/animation.constants';
 import Routes from '../../../constants/navigation/Routes';
 
 const AccountSelector = ({ route }: AccountSelectorProps) => {
-  const { styles } = useStyles(styleSheet, {});
+  const tw = useTailwind();
   const dispatch = useDispatch();
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
-  const { width: screenWidth } = useWindowDimensions();
+  const { y: frameY } = useSafeAreaFrame();
   const { trackEvent, createEventBuilder } = useAnalytics();
   const routeParams = useMemo(() => route?.params, [route?.params]);
 
@@ -148,18 +136,14 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
     }
   }, [navigation, shouldRedirectToAddWallet]);
 
-  // Tracing for the account list rendering:
   const isAccountSelector = useMemo(
     () => screen === AccountSelectorScreens.AccountSelector,
     [screen],
   );
 
-  const translateX = useSharedValue(screenWidth);
-
-  // Backdrop opacity animation - fades in as screen slides in from right
-  const backdropOpacity = useDerivedValue(() =>
-    interpolate(translateX.value, [screenWidth, 0], [0, 0.5]),
-  );
+  const handleClose = useCallback(() => {
+    navigation.goBack();
+  }, [navigation]);
 
   useEffect(() => {
     if (reloadAccounts) {
@@ -167,45 +151,38 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
     }
   }, [dispatch, reloadAccounts]);
 
+  // Tracing for the account list: start at layout flush, end after paint (useEffect).
   useLayoutEffect(() => {
-    if (!isAccountSelector) return;
-
-    const onAnimationComplete = () => {
+    if (!isAccountSelector) {
+      return undefined;
+    }
+    trace({
+      name: TraceName.ShowAccountList,
+      op: TraceOperation.AccountUi,
+      tags: getTraceTags(store.getState()),
+    });
+    return () => {
       endTrace({
         name: TraceName.ShowAccountList,
       });
     };
-
-    translateX.value = withSpring(
-      0,
-      {
-        damping: 20,
-        stiffness: 500,
-        mass: 0.3,
-      },
-      () => runOnJS(onAnimationComplete)(),
-    );
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isAccountSelector]);
 
-  const closeModal = useCallback(() => {
-    const onCloseComplete = () => {
-      navigation.goBack();
-    };
-
-    translateX.value = withTiming(
-      screenWidth,
-      { duration: AnimationDuration.Fast },
-      () => runOnJS(onCloseComplete)(),
-    );
-  }, [translateX, navigation, screenWidth]);
+  useEffect(() => {
+    if (!isAccountSelector) {
+      return;
+    }
+    endTrace({
+      name: TraceName.ShowAccountList,
+    });
+  }, [isAccountSelector]);
 
   const _onSelectMultichainAccount = useCallback(
     (accountGroup: AccountGroupObject) => {
       Engine.context.AccountTreeController.setSelectedAccountGroup(
         accountGroup.id,
       );
-      closeModal();
+      handleClose();
 
       trackEvent(
         createEventBuilder(MetaMetricsEvents.SWITCHED_ACCOUNT)
@@ -216,7 +193,7 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
           .build(),
       );
     },
-    [accounts?.length, trackEvent, createEventBuilder, closeModal],
+    [accounts?.length, trackEvent, createEventBuilder, handleClose],
   );
 
   const handleAddAccount = useCallback(() => {
@@ -227,43 +204,6 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
     setScreen(AccountSelectorScreens.AccountSelector);
   }, []);
 
-  // Tracing for the account list rendering:
-  useEffect(() => {
-    if (isAccountSelector) {
-      trace({
-        name: TraceName.ShowAccountList,
-        op: TraceOperation.AccountUi,
-        tags: getTraceTags(store.getState()),
-      });
-      // Trace ends in animation callback
-    }
-  }, [isAccountSelector]);
-
-  const addAccountButtonProps: ButtonProps[] = useMemo(
-    () => [
-      {
-        variant: ButtonVariants.Secondary,
-        isDisabled: isAccountSyncingInProgress,
-        label: (
-          <Box
-            alignItems={AlignItems.center}
-            justifyContent={JustifyContent.center}
-            flexDirection={FlexDirection.Row}
-            gap={8}
-          >
-            {isAccountSyncingInProgress && <ActivityIndicator size="small" />}
-            <Text variant={TextVariant.BodyMDMedium}>{buttonLabel}</Text>
-          </Box>
-        ),
-        size: ButtonSize.Lg,
-        width: ButtonWidthTypes.Full,
-        onPress: handleAddAccount,
-        testID: AccountListBottomSheetSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID,
-      },
-    ],
-    [handleAddAccount, buttonLabel, isAccountSyncingInProgress],
-  );
-
   const renderAccountSelector = useCallback(
     () => (
       <Fragment>
@@ -277,24 +217,38 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
           />
         ) : null}
         {!disableAddAccountButton && (
-          <View
-            style={[
-              styles.accountSelectorFooter,
-              styles.accountSelectorFooterContent,
-            ]}
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            twClassName="px-4 pt-6 pb-5"
           >
-            {addAccountButtonProps.map((buttonProp, index) => (
-              <Button
-                key={index}
-                style={
-                  index > 0
-                    ? styles.footerButtonSubsequent
-                    : styles.footerButton
-                }
-                {...buttonProp}
-              />
-            ))}
-          </View>
+            <Button
+              variant={ButtonVariant.Secondary}
+              size={ButtonSize.Lg}
+              onPress={handleAddAccount}
+              isDisabled={isAccountSyncingInProgress}
+              testID={
+                AccountListBottomSheetSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID
+              }
+              twClassName="flex-1"
+            >
+              <Box
+                flexDirection={BoxFlexDirection.Row}
+                alignItems={BoxAlignItems.Center}
+                justifyContent={BoxJustifyContent.Center}
+                gap={2}
+              >
+                {isAccountSyncingInProgress ? (
+                  <ActivityIndicator size="small" />
+                ) : null}
+                <Text
+                  variant={TextVariant.BodyMd}
+                  fontWeight={FontWeight.Medium}
+                >
+                  {buttonLabel}
+                </Text>
+              </Box>
+            </Button>
+          </Box>
         )}
       </Fragment>
     ),
@@ -302,11 +256,9 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
       selectedAccountGroup,
       _onSelectMultichainAccount,
       disableAddAccountButton,
-      addAccountButtonProps,
-      styles.accountSelectorFooterContent,
-      styles.accountSelectorFooter,
-      styles.footerButton,
-      styles.footerButtonSubsequent,
+      handleAddAccount,
+      buttonLabel,
+      isAccountSyncingInProgress,
     ],
   );
 
@@ -320,14 +272,6 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
     [handleBackToSelector],
   );
 
-  const animatedStyle = useAnimatedStyle(() => ({
-    transform: [{ translateX: translateX.value }],
-  }));
-
-  const backdropStyle = useAnimatedStyle(() => ({
-    opacity: backdropOpacity.value,
-  }));
-
   const showAddWalletModal =
     screen === AccountSelectorScreens.AddAccountActions ||
     screen === AccountSelectorScreens.MultichainAddWalletActions;
@@ -338,31 +282,28 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
 
   return (
     <>
-      <Animated.View style={[styles.backdrop, backdropStyle]} />
       <KeyboardAvoidingView
-        style={styles.keyboardAvoidingView}
         behavior={Platform.OS === 'ios' ? 'padding' : undefined}
         enabled={keyboardAvoidingViewEnabled}
+        keyboardVerticalOffset={Platform.OS === 'ios' ? -insets.bottom : frameY}
+        style={tw.style('flex-1')}
       >
-        <Animated.View
-          style={[
-            styles.container,
-            {
-              paddingTop: insets.top,
-              paddingBottom: insets.bottom,
-            },
-            animatedStyle,
-          ]}
+        <Box
+          twClassName="flex-1 bg-default"
+          style={{
+            paddingTop: insets.top,
+            paddingBottom: insets.bottom,
+          }}
         >
           <HeaderCompactStandard
             title={strings('accounts.accounts_title')}
-            onBack={closeModal}
+            onBack={handleClose}
             backButtonProps={{
               testID: CommonSelectorsIDs.BACK_ARROW_BUTTON,
             }}
           />
           {renderAccountSelector()}
-        </Animated.View>
+        </Box>
       </KeyboardAvoidingView>
 
       <Modal
@@ -371,14 +312,12 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
         onRequestClose={handleBackToSelector}
       >
         {showAddWalletModal ? (
-          <View
-            style={[
-              styles.addWalletModalContainer,
-              {
-                paddingTop: insets.top,
-                paddingBottom: insets.bottom,
-              },
-            ]}
+          <Box
+            twClassName="flex-1 bg-default"
+            style={{
+              paddingTop: insets.top,
+              paddingBottom: insets.bottom,
+            }}
           >
             <HeaderCompactStandard
               title={
@@ -394,7 +333,7 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
             {screen === AccountSelectorScreens.AddAccountActions
               ? renderAddAccountActions()
               : renderMultichainAddWalletActions()}
-          </View>
+          </Box>
         ) : null}
       </Modal>
     </>
diff --git a/app/components/Views/AccountsMenu/AccountsMenu.test.tsx b/app/components/Views/AccountsMenu/AccountsMenu.test.tsx
index e5f9c3e108f..5e2f63e78af 100644
--- a/app/components/Views/AccountsMenu/AccountsMenu.test.tsx
+++ b/app/components/Views/AccountsMenu/AccountsMenu.test.tsx
@@ -96,11 +96,6 @@ jest.mock('../../../../locales/i18n', () => ({
   strings: jest.fn((key: string) => key),
 }));
 
-jest.mock('../../../util/networks', () => ({
-  ...jest.requireActual('../../../util/networks'),
-  isPermissionsSettingsV1Enabled: true,
-}));
-
 jest.mock('../../UI/Ramp/hooks/useRampsUnifiedV1Enabled', () => ({
   __esModule: true,
   default: jest.fn(() => false),
diff --git a/app/components/Views/AccountsMenu/AccountsMenu.tsx b/app/components/Views/AccountsMenu/AccountsMenu.tsx
index 260a13428ef..cf734b373e7 100644
--- a/app/components/Views/AccountsMenu/AccountsMenu.tsx
+++ b/app/components/Views/AccountsMenu/AccountsMenu.tsx
@@ -25,7 +25,6 @@ import Routes from '../../../constants/navigation/Routes';
 import { strings } from '../../../../locales/i18n';
 import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import { AccountsMenuSelectorsIDs } from './AccountsMenu.testIds';
-import { isPermissionsSettingsV1Enabled } from '../../../util/networks';
 import useRampsUnifiedV1Enabled from '../../UI/Ramp/hooks/useRampsUnifiedV1Enabled';
 import useRampsUnifiedV2Enabled from '../../UI/Ramp/hooks/useRampsUnifiedV2Enabled';
 import AppConstants from '../../../core/AppConstants';
@@ -441,17 +440,15 @@ const AccountsMenu = () => {
         />
 
         {/* Permissions Row */}
-        {isPermissionsSettingsV1Enabled && (
-          <ActionListItem
-            startAccessory={
-              <Icon name={IconName.SecurityTick} size={IconSize.Lg} />
-            }
-            label={strings('accounts_menu.permissions')}
-            endAccessory={arrowRightIcon}
-            onPress={onPressPermissions}
-            testID={AccountsMenuSelectorsIDs.PERMISSIONS}
-          />
-        )}
+        <ActionListItem
+          startAccessory={
+            <Icon name={IconName.SecurityTick} size={IconSize.Lg} />
+          }
+          label={strings('accounts_menu.permissions')}
+          endAccessory={arrowRightIcon}
+          onPress={onPressPermissions}
+          testID={AccountsMenuSelectorsIDs.PERMISSIONS}
+        />
 
         {/* Networks Row */}
         <ActionListItem
diff --git a/app/components/Views/ActivityView/index.js b/app/components/Views/ActivityView/index.js
index 02d27e59d6e..67458ec491a 100644
--- a/app/components/Views/ActivityView/index.js
+++ b/app/components/Views/ActivityView/index.js
@@ -1,6 +1,6 @@
 import { useFocusEffect, useNavigation } from '@react-navigation/native';
-import React, { useCallback, useMemo, useState } from 'react';
-import { StyleSheet, View } from 'react-native';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { BackHandler, StyleSheet, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useSelector } from 'react-redux';
 import { WalletViewSelectorsIDs } from '../Wallet/WalletView.testIds';
@@ -19,14 +19,17 @@ import TextComponent, {
   TextVariant,
 } from '../../../component-library/components/Texts/Text';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { KnownCaipNamespace } from '@metamask/utils';
 import { selectIsEvmNetworkSelected } from '../../../selectors/multichainNetworkController';
 import { selectChainId } from '../../../selectors/networkController';
 import { selectNetworkName } from '../../../selectors/networkInfos';
+import Routes from '../../../constants/navigation/Routes';
 import { useParams } from '../../../util/navigation/navUtils';
 import { getNetworkImageSource } from '../../../util/networks';
 import { useTheme } from '../../../util/theme';
 import { TabsList } from '../../../component-library/components-temp/Tabs';
 import { createNetworkManagerNavDetails } from '../../UI/NetworkManager';
+import { selectMoneyHomeScreenEnabledFlag } from '../../UI/Money/selectors/featureFlags';
 import { selectPerpsEnabledFlag } from '../../UI/Perps';
 import { selectPredictEnabledFlag } from '../../UI/Predict/selectors/featureFlags';
 import PredictTransactionsView from '../../UI/Predict/views/PredictTransactionsView/PredictTransactionsView';
@@ -37,6 +40,7 @@ import RampOrdersList from '../../UI/Ramp/Aggregator/Views/OrdersList';
 import { useCurrentNetworkInfo } from '../../hooks/useCurrentNetworkInfo';
 import {
   NetworkType,
+  useNetworksByCustomNamespace,
   useNetworksByNamespace,
 } from '../../hooks/useNetworksByNamespace/useNetworksByNamespace';
 import { useStyles } from '../../hooks/useStyles';
@@ -96,13 +100,24 @@ const ActivityView = () => {
     networkType: NetworkType.Popular,
   });
 
+  const { areAllNetworksSelected: areAllEvmPopularNetworksEnabled } =
+    useNetworksByCustomNamespace({
+      networkType: NetworkType.Popular,
+      namespace: KnownCaipNamespace.Eip155,
+    });
+
   const currentNetworkName = getNetworkInfo(0)?.networkName;
 
+  const isMoneyHomeScreenEnabled = useSelector(
+    selectMoneyHomeScreenEnabledFlag,
+  );
+
   const params = useParams();
   const perpsEnabledFlag = useSelector(selectPerpsEnabledFlag);
   const isPerpsEnabled = useMemo(
-    () => perpsEnabledFlag && isEvmSelected,
-    [perpsEnabledFlag, isEvmSelected],
+    () =>
+      perpsEnabledFlag && (isEvmSelected || areAllEvmPopularNetworksEnabled),
+    [perpsEnabledFlag, isEvmSelected, areAllEvmPopularNetworksEnabled],
   );
   const predictEnabledFlag = useSelector(selectPredictEnabledFlag);
   const isPredictEnabled = useMemo(
@@ -114,13 +129,34 @@ const ActivityView = () => {
     navigation.navigate(...createNetworkManagerNavDetails({}));
   };
 
+  // Prevent back button returning to confirmation screen in case that users are redirected after a successful transaction.
+  const handleNavigateHome = useCallback(() => {
+    navigation.navigate(Routes.HOME_TABS);
+  }, [navigation]);
+
   const handleBackPress = useCallback(() => {
-    if (navigation.canGoBack()) {
+    if (isMoneyHomeScreenEnabled) {
+      handleNavigateHome();
+    } else if (navigation.canGoBack()) {
       navigation.goBack();
     }
-  }, [navigation]);
+  }, [isMoneyHomeScreenEnabled, navigation, handleNavigateHome]);
+
+  useEffect(() => {
+    if (!isMoneyHomeScreenEnabled) return;
+
+    const subscription = BackHandler.addEventListener(
+      'hardwareBackPress',
+      () => {
+        handleNavigateHome();
+        return true;
+      },
+    );
+
+    return () => subscription.remove();
+  }, [navigation, isMoneyHomeScreenEnabled, handleNavigateHome]);
 
-  const showBackButton = params.showBackButton || false;
+  const showBackButton = params.showBackButton || isMoneyHomeScreenEnabled;
 
   // Calculate dynamic tab indices based on which tabs are enabled
   // Tab order: Transactions (0), Orders (1), Perps (conditional), Predict (conditional)
diff --git a/app/components/Views/ActivityView/index.test.tsx b/app/components/Views/ActivityView/index.test.tsx
index f80014687c1..31e0ff0d4fe 100644
--- a/app/components/Views/ActivityView/index.test.tsx
+++ b/app/components/Views/ActivityView/index.test.tsx
@@ -1,14 +1,21 @@
 import React from 'react';
 import ActivityView from '.';
+import { BackHandler } from 'react-native';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import renderWithProvider from '../../../util/test/renderWithProvider';
 import { createStackNavigator } from '@react-navigation/stack';
-import { fireEvent } from '@testing-library/react-native';
+import { cleanup, fireEvent } from '@testing-library/react-native';
 // eslint-disable-next-line import-x/no-namespace
 import * as networkManagerUtils from '../../UI/NetworkManager';
 import { useCurrentNetworkInfo } from '../../hooks/useCurrentNetworkInfo';
 import { ActivitiesViewSelectorsIDs } from './ActivitiesView.testIds';
 import { WalletViewSelectorsIDs } from '../Wallet/WalletView.testIds';
+import Routes from '../../../constants/navigation/Routes';
+
+let mockMoneyHomeScreenEnabled = false;
+jest.mock('../../UI/Money/selectors/featureFlags', () => ({
+  selectMoneyHomeScreenEnabledFlag: jest.fn(() => mockMoneyHomeScreenEnabled),
+}));
 
 // Mock the Perps feature flag selector - will be controlled per test
 let mockPerpsEnabled = false;
@@ -131,13 +138,20 @@ jest.mock('../../../core/Engine', () => ({
   },
 }));
 
+let mockAreAllEvmPopularNetworksEnabled = false;
+
 jest.mock('../../hooks/useNetworksByNamespace/useNetworksByNamespace', () => ({
   useNetworksByNamespace: () => ({
     networks: [],
+    areAllNetworksSelected: false,
     selectNetwork: jest.fn(),
     selectCustomNetwork: jest.fn(),
     selectPopularNetwork: jest.fn(),
   }),
+  useNetworksByCustomNamespace: () => ({
+    networks: [],
+    areAllNetworksSelected: mockAreAllEvmPopularNetworksEnabled,
+  }),
   NetworkType: {
     Popular: 'popular',
     Custom: 'custom',
@@ -229,6 +243,8 @@ describe('ActivityView', () => {
   const mockUseCurrentNetworkInfo =
     useCurrentNetworkInfo as jest.MockedFunction<typeof useCurrentNetworkInfo>;
 
+  let backHandlerSpy: jest.SpyInstance;
+
   const defaultNetworkInfo = {
     enabledNetworks: [
       { chainId: '0x1', enabled: true },
@@ -259,14 +275,26 @@ describe('ActivityView', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    backHandlerSpy = jest
+      .spyOn(BackHandler, 'addEventListener')
+      .mockReturnValue({ remove: jest.fn() } as unknown as ReturnType<
+        typeof BackHandler.addEventListener
+      >);
     mockUseCurrentNetworkInfo.mockReturnValue(defaultNetworkInfo);
     mockIsEvmSelected = true;
+    mockMoneyHomeScreenEnabled = false;
     mockPerpsEnabled = false;
     mockPredictEnabled = false;
+    mockAreAllEvmPopularNetworksEnabled = false;
     clearRenderedTabs();
     mockRoute.params = {};
   });
 
+  afterEach(() => {
+    cleanup();
+    backHandlerSpy.mockRestore();
+  });
+
   describe('Network Manager Integration', () => {
     beforeEach(() => {
       jest.clearAllMocks();
@@ -395,6 +423,80 @@ describe('ActivityView', () => {
 
       expect(mockNavigation.goBack).not.toHaveBeenCalled();
     });
+
+    it('displays back button when Money home screen flag is enabled without showBackButton param', () => {
+      mockMoneyHomeScreenEnabled = true;
+      mockRoute.params = {};
+
+      const { getByTestId } = renderComponent(mockInitialState);
+
+      expect(getByTestId('activity-view-back-button')).toBeOnTheScreen();
+    });
+
+    it('calls navigation.navigate with HOME_TABS on back button press when Money flag is enabled', () => {
+      mockMoneyHomeScreenEnabled = true;
+      mockRoute.params = {};
+      const { getByTestId } = renderComponent(mockInitialState);
+
+      fireEvent.press(getByTestId('activity-view-back-button'));
+
+      expect(mockNavigation.navigate).toHaveBeenCalledWith(Routes.HOME_TABS);
+      expect(mockNavigation.goBack).not.toHaveBeenCalled();
+    });
+
+    it('calls navigation.navigate with HOME_TABS and not goBack when both flag and showBackButton param are true', () => {
+      mockMoneyHomeScreenEnabled = true;
+      mockRoute.params = { showBackButton: true };
+      const { getByTestId } = renderComponent(mockInitialState);
+
+      fireEvent.press(getByTestId('activity-view-back-button'));
+
+      expect(mockNavigation.navigate).toHaveBeenCalledWith(Routes.HOME_TABS);
+      expect(mockNavigation.goBack).not.toHaveBeenCalled();
+    });
+
+    it('registers hardwareBackPress handler when Money flag is enabled', () => {
+      mockMoneyHomeScreenEnabled = true;
+      mockRoute.params = {};
+
+      renderComponent(mockInitialState);
+
+      expect(BackHandler.addEventListener).toHaveBeenCalledWith(
+        'hardwareBackPress',
+        expect.any(Function),
+      );
+    });
+
+    it('navigates to HOME_TABS when hardwareBackPress fires with Money flag enabled', () => {
+      mockMoneyHomeScreenEnabled = true;
+      mockRoute.params = {};
+      renderComponent(mockInitialState);
+      const [[, handler]] = (BackHandler.addEventListener as jest.Mock).mock
+        .calls;
+
+      const result = handler();
+
+      expect(mockNavigation.navigate).toHaveBeenCalledWith(Routes.HOME_TABS);
+      expect(result).toBe(true);
+    });
+
+    it('does not navigate to HOME_TABS on hardwareBackPress when Money flag is disabled', () => {
+      mockMoneyHomeScreenEnabled = false;
+      mockRoute.params = {};
+
+      renderComponent(mockInitialState);
+
+      const hardwareBackPressCalls = (
+        BackHandler.addEventListener as jest.Mock
+      ).mock.calls.filter(([event]: [string]) => event === 'hardwareBackPress');
+      hardwareBackPressCalls.forEach(([, handler]: [string, () => boolean]) =>
+        handler(),
+      );
+
+      expect(mockNavigation.navigate).not.toHaveBeenCalledWith(
+        Routes.HOME_TABS,
+      );
+    });
   });
 
   describe('header and SafeAreaView', () => {
@@ -455,6 +557,18 @@ describe('ActivityView', () => {
         queryByTestId(ActivitiesViewSelectorsIDs.HEADER_COMPACT_STANDARD),
       ).toBeNull();
     });
+
+    it('renders HeaderCompactStandard when Money home screen flag is enabled', () => {
+      mockMoneyHomeScreenEnabled = true;
+      mockRoute.params = {};
+
+      const { getByTestId, queryByTestId } = renderComponent(mockInitialState);
+
+      expect(
+        getByTestId(ActivitiesViewSelectorsIDs.HEADER_COMPACT_STANDARD),
+      ).toBeOnTheScreen();
+      expect(queryByTestId(ActivitiesViewSelectorsIDs.HEADER_ROOT)).toBeNull();
+    });
   });
 
   describe('Perps tab', () => {
@@ -474,6 +588,18 @@ describe('ActivityView', () => {
       expect(getRenderedTabs()).toContain('perps');
     });
 
+    it('includes Perps tab when all popular EVM networks are enabled while on non-EVM', () => {
+      mockPerpsEnabled = true;
+      mockIsEvmSelected = false;
+      mockAreAllEvmPopularNetworksEnabled = true;
+
+      const { getByTestId, queryByTestId } = renderComponent(mockInitialState);
+
+      expect(getByTestId('tab-perps')).toBeOnTheScreen();
+      expect(queryByTestId('perps-transactions-view')).toBeNull();
+      expect(getRenderedTabs()).toContain('perps');
+    });
+
     it('excludes Perps tab when feature flag is disabled', () => {
       mockPerpsEnabled = false;
       mockIsEvmSelected = true;
@@ -486,6 +612,7 @@ describe('ActivityView', () => {
     it('excludes Perps tab on non-EVM network even with feature flag enabled', () => {
       mockPerpsEnabled = true;
       mockIsEvmSelected = false;
+      mockAreAllEvmPopularNetworksEnabled = false;
 
       renderComponent(mockInitialState);
 
diff --git a/app/components/Views/BrowserTab/components/Options/Options.testIds.ts b/app/components/Views/BrowserTab/components/Options/Options.testIds.ts
new file mode 100644
index 00000000000..dac9ec7070a
--- /dev/null
+++ b/app/components/Views/BrowserTab/components/Options/Options.testIds.ts
@@ -0,0 +1,10 @@
+export const BrowserOptionsSelectorsIDs = {
+  MENU: 'browser-options-menu',
+  ADD_FAVORITES: 'browser-options-menu-add-favorites',
+  OPEN_FAVORITES: 'browser-options-menu-open-favorites',
+  NEW_TAB: 'browser-options-menu-new-tab',
+  RELOAD: 'browser-options-menu-reload',
+  SHARE: 'browser-options-menu-share',
+  OPEN_IN_BROWSER: 'browser-options-menu-open-in-browser',
+  SWITCH_NETWORK: 'browser-options-switch-browser',
+};
diff --git a/app/components/Views/BrowserTab/components/Options/index.tsx b/app/components/Views/BrowserTab/components/Options/index.tsx
index 607a2cc9185..664216f2ee2 100644
--- a/app/components/Views/BrowserTab/components/Options/index.tsx
+++ b/app/components/Views/BrowserTab/components/Options/index.tsx
@@ -1,27 +1,18 @@
 import React, { MutableRefObject, useCallback } from 'react';
 import {
   Linking,
-  Platform,
   Text,
   TouchableWithoutFeedback,
   View,
   ImageSourcePropType,
 } from 'react-native';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
-import generateTestId from '../../../../../../wdio/utils/generateTestId';
 import Device from '../../../../../util/device';
 import { useStyles } from '../../../../hooks/useStyles';
 import styleSheet from './styles';
 import Button from '../../../../UI/Button';
 import { strings } from '../../../../../../locales/i18n';
-import {
-  ADD_FAVORITES_OPTION,
-  MENU_ID,
-  NEW_TAB_OPTION,
-  OPEN_IN_BROWSER_OPTION,
-  RELOAD_OPTION,
-  SHARE_OPTION,
-} from '../../../../../../wdio/screen-objects/testIDs/BrowserScreen/OptionMenu.testIds';
+import { BrowserOptionsSelectorsIDs } from './Options.testIds';
 import Icon from 'react-native-vector-icons/FontAwesome';
 import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
@@ -194,7 +185,7 @@ const Options = ({
           <Text
             style={styles.optionText}
             numberOfLines={2}
-            {...generateTestId(Platform, SHARE_OPTION)}
+            testID={BrowserOptionsSelectorsIDs.SHARE}
           >
             {strings('browser.share')}
           </Text>
@@ -216,7 +207,7 @@ const Options = ({
           <Text
             style={styles.optionText}
             numberOfLines={2}
-            {...generateTestId(Platform, RELOAD_OPTION)}
+            testID={BrowserOptionsSelectorsIDs.RELOAD}
           >
             {strings('browser.reload')}
           </Text>
@@ -235,7 +226,7 @@ const Options = ({
               ? styles.optionsWrapperAndroid
               : styles.optionsWrapperIos,
           ]}
-          {...generateTestId(Platform, MENU_ID)}
+          testID={BrowserOptionsSelectorsIDs.MENU}
         >
           <Button onPress={onNewTabPress} style={styles.option}>
             <View style={styles.optionIconWrapper}>
@@ -248,7 +239,7 @@ const Options = ({
             <Text
               style={styles.optionText}
               numberOfLines={1}
-              {...generateTestId(Platform, NEW_TAB_OPTION)}
+              testID={BrowserOptionsSelectorsIDs.NEW_TAB}
             >
               {strings('browser.new_tab')}
             </Text>
@@ -262,7 +253,7 @@ const Options = ({
               <Text
                 style={styles.optionText}
                 numberOfLines={2}
-                {...generateTestId(Platform, ADD_FAVORITES_OPTION)}
+                testID={BrowserOptionsSelectorsIDs.ADD_FAVORITES}
               >
                 {strings('browser.add_to_favorites')}
               </Text>
@@ -276,7 +267,7 @@ const Options = ({
             <Text
               style={styles.optionText}
               numberOfLines={2}
-              {...generateTestId(Platform, OPEN_IN_BROWSER_OPTION)}
+              testID={BrowserOptionsSelectorsIDs.OPEN_IN_BROWSER}
             >
               {strings('browser.open_in_browser')}
             </Text>
diff --git a/app/components/Views/CashTokensFullView/CashTokensFullView.test.tsx b/app/components/Views/CashTokensFullView/CashTokensFullView.test.tsx
index 5fe115ddc61..9c10990dc66 100644
--- a/app/components/Views/CashTokensFullView/CashTokensFullView.test.tsx
+++ b/app/components/Views/CashTokensFullView/CashTokensFullView.test.tsx
@@ -4,13 +4,17 @@ import { InteractionManager } from 'react-native';
 import renderWithProvider from '../../../util/test/renderWithProvider';
 import CashTokensFullView from './CashTokensFullView';
 import { useMerklBonusClaim } from '../../UI/Earn/components/MerklRewards/hooks/useMerklBonusClaim';
+import { selectMoneyHubEnabledFlag } from '../../UI/Money/selectors/featureFlags';
+import { CashTokensFullViewTestIds } from './CashTokensFullView.testIds';
 
 const mockGoBack = jest.fn();
+const mockNavigate = jest.fn();
 
 jest.mock('@react-navigation/native', () => ({
   ...jest.requireActual('@react-navigation/native'),
   useNavigation: () => ({
     goBack: mockGoBack,
+    navigate: mockNavigate,
   }),
 }));
 
@@ -38,8 +42,12 @@ jest.mock('../../UI/Earn/hooks/useMusdConversion', () => ({
     hasSeenConversionEducationScreen: true,
   }),
 }));
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const mockUseMusdConversionTokens = jest.fn<{ tokens: any[] }, []>(() => ({
+  tokens: [],
+}));
 jest.mock('../../UI/Earn/hooks/useMusdConversionTokens', () => ({
-  useMusdConversionTokens: () => ({ tokens: [] }),
+  useMusdConversionTokens: () => mockUseMusdConversionTokens(),
   tokenFiatValue: () => 0,
 }));
 jest.mock('../../UI/Bridge/hooks/useSwapBridgeNavigation', () => ({
@@ -49,11 +57,13 @@ jest.mock('../../UI/Bridge/hooks/useSwapBridgeNavigation', () => ({
 jest.mock(
   '../../UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins',
   () => {
-    const { View } = jest.requireActual('react-native');
+    const { View, Text } = jest.requireActual('react-native');
     return {
       __esModule: true,
-      default: (props: Record<string, unknown>) => (
-        <View testID="money-convert-stablecoins-container" {...props} />
+      default: ({ location }: { location: string }) => (
+        <View testID="money-convert-stablecoins-container">
+          <Text testID="money-convert-stablecoins-location">{location}</Text>
+        </View>
       ),
     };
   },
@@ -95,12 +105,20 @@ jest.mock('../../../core/Engine', () => ({
 jest.mock('../../Views/confirmations/hooks/useNetworkName', () => ({
   useNetworkName: () => 'Ethereum Mainnet',
 }));
-jest.mock('../../UI/Earn/selectors/featureFlags', () => ({
-  selectMusdQuickConvertEnabledFlag: jest.fn(() => false),
-}));
 jest.mock('../../UI/Money/selectors/featureFlags', () => ({
   selectMoneyHubEnabledFlag: jest.fn(() => false),
 }));
+jest.mock('../../UI/Money/components/MoneyMusdEmptyBalanceRow', () => {
+  const { Pressable, Text } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ({ onPress }: { onPress?: () => void }) => (
+      <Pressable testID="money-musd-empty-balance-row" onPress={onPress}>
+        <Text>MetaMask USD empty</Text>
+      </Pressable>
+    ),
+  };
+});
 jest.mock('./useCashTokensRefresh', () => ({
   useCashTokensRefresh: () => ({ refreshing: false, onRefresh: jest.fn() }),
 }));
@@ -110,9 +128,11 @@ jest.mock('../../UI/Tokens', () => {
   const MockTokens = ({
     isFullView,
     showOnlyMusd,
+    listHeaderComponent,
   }: {
     isFullView?: boolean;
     showOnlyMusd?: boolean;
+    listHeaderComponent?: React.ReactElement;
   }) =>
     createElement(
       View,
@@ -122,6 +142,7 @@ jest.mock('../../UI/Tokens', () => {
         { testID: 'tokens-props' },
         `isFullView=${isFullView} showOnlyMusd=${showOnlyMusd}`,
       ),
+      listHeaderComponent,
     );
   return { __esModule: true, default: MockTokens };
 });
@@ -218,4 +239,95 @@ describe('CashTokensFullView', () => {
     fireEvent.press(screen.getByTestId('cash-tokens-full-view-back-button'));
     expect(mockGoBack).toHaveBeenCalled();
   });
+
+  describe('Money Hub enabled', () => {
+    beforeEach(() => {
+      (selectMoneyHubEnabledFlag as unknown as jest.Mock).mockReturnValue(true);
+      mockUseMusdBalance.mockReturnValue({
+        hasMusdBalanceOnAnyChain: false,
+        tokenBalanceByChain: {},
+      });
+    });
+
+    it('renders the empty Money Hub layout (heading, mUSD row, bonus + convert)', () => {
+      renderWithProvider(<CashTokensFullView />);
+      expect(
+        screen.getByTestId(CashTokensFullViewTestIds.HEADING),
+      ).toBeOnTheScreen();
+      expect(
+        screen.getByTestId('money-musd-empty-balance-row'),
+      ).toBeOnTheScreen();
+      expect(
+        screen.queryByTestId('cash-get-musd-empty-state'),
+      ).not.toBeOnTheScreen();
+      expect(
+        screen.getByTestId('asset-overview-claim-bonus'),
+      ).toBeOnTheScreen();
+      expect(
+        screen.getByTestId('money-convert-stablecoins-container'),
+      ).toBeOnTheScreen();
+    });
+
+    it('renders Your balance heading when user has mUSD', async () => {
+      mockUseMusdBalance.mockReturnValue({
+        hasMusdBalanceOnAnyChain: true,
+        tokenBalanceByChain: { '0x1': '1000' },
+      });
+      renderWithProvider(<CashTokensFullView />);
+      await waitFor(() => {
+        expect(
+          screen.getByTestId(CashTokensFullViewTestIds.HEADING),
+        ).toBeOnTheScreen();
+      });
+    });
+
+    it('press handlers wire to navigation and pass money_hub location to convert section', () => {
+      renderWithProvider(<CashTokensFullView />);
+      fireEvent.press(screen.getByTestId('money-musd-empty-balance-row'));
+      expect(mockNavigate).toHaveBeenCalledWith(
+        'Asset',
+        expect.objectContaining({ symbol: 'mUSD' }),
+      );
+      expect(
+        screen.getByTestId('money-convert-stablecoins-location'),
+      ).toHaveTextContent('money_hub');
+    });
+
+    it('renders Swap/Buy footer with no stablecoins; switches to Convert when stablecoins exist', () => {
+      const { rerender } = renderWithProvider(<CashTokensFullView />);
+      expect(
+        screen.getByTestId(CashTokensFullViewTestIds.SWAP_BUTTON),
+      ).toBeOnTheScreen();
+      expect(
+        screen.getByTestId(CashTokensFullViewTestIds.BUY_BUTTON),
+      ).toBeOnTheScreen();
+      expect(() => {
+        fireEvent.press(
+          screen.getByTestId(CashTokensFullViewTestIds.SWAP_BUTTON),
+        );
+        fireEvent.press(
+          screen.getByTestId(CashTokensFullViewTestIds.BUY_BUTTON),
+        );
+      }).not.toThrow();
+
+      mockUseMusdConversionTokens.mockReturnValue({
+        tokens: [
+          {
+            address: '0xabc',
+            chainId: '0x1',
+            symbol: 'USDC',
+            fiat: { balance: 100 },
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          } as any,
+        ],
+      });
+      rerender(<CashTokensFullView />);
+      expect(
+        screen.queryByTestId(CashTokensFullViewTestIds.SWAP_BUTTON),
+      ).not.toBeOnTheScreen();
+      expect(() =>
+        fireEvent.press(screen.getByText('Convert to mUSD')),
+      ).not.toThrow();
+    });
+  });
 });
diff --git a/app/components/Views/CashTokensFullView/CashTokensFullView.testIds.ts b/app/components/Views/CashTokensFullView/CashTokensFullView.testIds.ts
index 428b1488354..ee10b5a7e7c 100644
--- a/app/components/Views/CashTokensFullView/CashTokensFullView.testIds.ts
+++ b/app/components/Views/CashTokensFullView/CashTokensFullView.testIds.ts
@@ -2,4 +2,5 @@ export const CashTokensFullViewTestIds = {
   BACK_BUTTON: 'cash-tokens-full-view-back-button',
   SWAP_BUTTON: 'cash-tokens-full-view-swap-button',
   BUY_BUTTON: 'cash-tokens-full-view-buy-button',
+  HEADING: 'cash-tokens-full-view-heading',
 };
diff --git a/app/components/Views/CashTokensFullView/CashTokensFullView.tsx b/app/components/Views/CashTokensFullView/CashTokensFullView.tsx
index 4c24ae3f285..f78eab3b6af 100644
--- a/app/components/Views/CashTokensFullView/CashTokensFullView.tsx
+++ b/app/components/Views/CashTokensFullView/CashTokensFullView.tsx
@@ -24,7 +24,10 @@ import {
   HeaderBase,
   ButtonIcon,
   ButtonIconSize,
+  FontWeight,
   IconName,
+  Text,
+  TextVariant,
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../locales/i18n';
 import Tokens from '../../UI/Tokens';
@@ -38,22 +41,20 @@ import {
   MUSD_CONVERSION_DEFAULT_CHAIN_ID,
   MUSD_TOKEN_ASSET_ID_BY_CHAIN,
 } from '../../UI/Earn/constants/musd';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../../UI/Earn/types/musd.types';
 import { useRampNavigation } from '../../UI/Ramp/hooks/useRampNavigation';
 import {
   useSwapBridgeNavigation,
   SwapBridgeNavigationLocation,
 } from '../../UI/Bridge/hooks/useSwapBridgeNavigation';
 import MoneyConvertStablecoins from '../../UI/Money/components/MoneyConvertStablecoins/MoneyConvertStablecoins';
+import MoneyMusdEmptyBalanceRow from '../../UI/Money/components/MoneyMusdEmptyBalanceRow';
 import AssetOverviewClaimBonus from '../../UI/Earn/components/AssetOverviewClaimBonus/AssetOverviewClaimBonus';
 import { MUSD_MAINNET_ASSET_FOR_DETAILS } from '../Homepage/Sections/Cash/CashGetMusdEmptyState.constants';
 import CashGetMusdEmptyState from '../Homepage/Sections/Cash/CashGetMusdEmptyState';
 import SectionRow from '../Homepage/components/SectionRow/SectionRow';
 import CashTokensFullViewSkeleton from './CashTokensFullViewSkeleton';
 import { useCashTokensRefresh } from './useCashTokensRefresh';
-import { AssetType } from '../confirmations/types/token';
 import Logger from '../../../util/Logger';
-import AppConstants from '../../../core/AppConstants';
 import { selectMoneyHubEnabledFlag } from '../../UI/Money/selectors/featureFlags';
 import { useSelector } from 'react-redux';
 import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
@@ -74,6 +75,12 @@ const CashTokensFullView = () => {
 
   const numChainsWithMusdBalance = Object.keys(tokenBalanceByChain).length;
 
+  const handleEmptyMusdRowPress = useCallback(() => {
+    navigation.navigate('Asset', {
+      ...MUSD_MAINNET_ASSET_FOR_DETAILS,
+    });
+  }, [navigation]);
+
   const { tokens: conversionTokens } = useMusdConversionTokens();
 
   const isMoneyHubEnabled = useSelector(selectMoneyHubEnabledFlag);
@@ -134,8 +141,7 @@ const CashTokensFullView = () => {
   }, []);
   const { refreshing, onRefresh } = useCashTokensRefresh(merklRefetchRef);
 
-  const { initiateMaxConversion, initiateCustomConversion } =
-    useMusdConversion();
+  const { initiateCustomConversion } = useMusdConversion();
   const { goToBuy } = useRampNavigation();
   const { goToSwaps } = useSwapBridgeNavigation({
     location: SwapBridgeNavigationLocation.MainView,
@@ -146,76 +152,6 @@ const CashTokensFullView = () => {
     navigation.goBack();
   }, [navigation]);
 
-  const handleConvertMaxPress = useCallback(
-    async (token: AssetType) => {
-      try {
-        trackEvent(
-          createEventBuilder(
-            MetaMetricsEvents.MONEY_HUB_TOKEN_ROW_CONVERT_CLICKED,
-          )
-            .addProperties({
-              location: MONEY_EVENT_LOCATIONS.MONEY_HUB,
-              button_type: 'text_button',
-              button_action: 'max',
-              button_text: strings('earn.musd_conversion.max'),
-              redirects_to:
-                MUSD_EVENT_LOCATIONS.QUICK_CONVERT_MAX_BOTTOM_SHEET_CONFIRMATION_SCREEN,
-              asset_symbol: token.symbol,
-              network_chain_id: token.chainId,
-              network_name: token.chainId
-                ? getNetworkName(token.chainId as Hex)
-                : 'unknown',
-            })
-            .build(),
-        );
-        await initiateMaxConversion(token);
-      } catch (error) {
-        Logger.error(error as Error, {
-          message: '[CashTokensFullView] Failed to initiate max conversion',
-        });
-      }
-    },
-    [createEventBuilder, initiateMaxConversion, trackEvent],
-  );
-
-  const handleConvertEditPress = useCallback(
-    async (token: AssetType) => {
-      try {
-        trackEvent(
-          createEventBuilder(
-            MetaMetricsEvents.MONEY_HUB_TOKEN_ROW_CONVERT_CLICKED,
-          )
-            .addProperties({
-              location: MONEY_EVENT_LOCATIONS.MONEY_HUB,
-              button_type: 'icon_button',
-              icon: IconName.Edit,
-              button_action: 'custom',
-              redirects_to: MUSD_EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN,
-              asset_symbol: token.symbol,
-              network_chain_id: token.chainId,
-              network_name: token.chainId
-                ? getNetworkName(token.chainId as Hex)
-                : 'unknown',
-            })
-            .build(),
-        );
-
-        await initiateCustomConversion({
-          preferredPaymentToken: {
-            address: token.address as Hex,
-            chainId: token.chainId as Hex,
-          },
-          navigationOverride: MUSD_CONVERSION_NAVIGATION_OVERRIDE.CUSTOM,
-        });
-      } catch (error) {
-        Logger.error(error as Error, {
-          message: '[CashTokensFullView] Failed to initiate custom conversion',
-        });
-      }
-    },
-    [createEventBuilder, initiateCustomConversion, trackEvent],
-  );
-
   const handleConvertPress = useCallback(async () => {
     const topToken = conversionTokens[0];
     if (!topToken) return;
@@ -280,18 +216,20 @@ const CashTokensFullView = () => {
     });
   }, [createEventBuilder, goToBuy, trackEvent]);
 
-  const handleLearnMorePress = useCallback(() => {
-    trackEvent(
-      createEventBuilder(MetaMetricsEvents.MONEY_HUB_LEARN_MORE_PRESSED)
-        .addProperties({
-          location: MONEY_EVENT_LOCATIONS.MONEY_HUB,
-          url: AppConstants.URLS.MUSD_LEARN_MORE,
-        })
-        .build(),
-    );
-
-    Linking.openURL(AppConstants.URLS.MUSD_LEARN_MORE);
-  }, [createEventBuilder, trackEvent]);
+  const balanceHeading = useMemo(
+    () => (
+      <Box twClassName="px-4 pt-2 pb-3">
+        <Text
+          variant={TextVariant.HeadingLg}
+          fontWeight={FontWeight.Bold}
+          testID={CashTokensFullViewTestIds.HEADING}
+        >
+          {strings('money.your_balance')}
+        </Text>
+      </Box>
+    ),
+    [],
+  );
 
   const bonusAndConvertSections = useMemo(
     () => (
@@ -301,21 +239,10 @@ const CashTokensFullView = () => {
           onRefetchReady={handleRefetchReady}
           location={MONEY_EVENT_LOCATIONS.MONEY_HUB}
         />
-        <MoneyConvertStablecoins
-          tokens={conversionTokens}
-          onMaxPress={handleConvertMaxPress}
-          onEditPress={handleConvertEditPress}
-          onLearnMorePress={handleLearnMorePress}
-        />
+        <MoneyConvertStablecoins location={MONEY_EVENT_LOCATIONS.MONEY_HUB} />
       </>
     ),
-    [
-      conversionTokens,
-      handleConvertMaxPress,
-      handleConvertEditPress,
-      handleLearnMorePress,
-      handleRefetchReady,
-    ],
+    [handleRefetchReady],
   );
 
   return (
@@ -332,7 +259,7 @@ const CashTokensFullView = () => {
         style={tw`p-4`}
         twClassName="h-auto"
       >
-        {strings('homepage.sections.cash')}
+        {strings('money.title')}
       </HeaderBase>
       {hasMusdBalanceOnAnyChain ? (
         isTokenListReady ? (
@@ -341,6 +268,11 @@ const CashTokensFullView = () => {
             showOnlyMusd
             hideLoadingSkeleton
             hasMusdBalanceOnAnyChain={hasMusdBalanceOnAnyChain}
+            // MUSD-729: hide the "3% bonus" / price-rail secondary row on
+            // mUSD entries inside Money Hub so the row reads as a balance
+            // entry under the new "Your balance" heading.
+            hideSecondaryPriceRow={isMoneyHubEnabled}
+            listHeaderComponent={isMoneyHubEnabled ? balanceHeading : undefined}
             listFooterComponent={
               isMoneyHubEnabled ? bonusAndConvertSections : undefined
             }
@@ -353,6 +285,7 @@ const CashTokensFullView = () => {
             numChainsWithMusdBalance={numChainsWithMusdBalance}
             isMoneyHubEnabled={isMoneyHubEnabled}
             conversionTokenCount={conversionTokens.length}
+            listHeaderComponent={isMoneyHubEnabled ? balanceHeading : undefined}
           />
         )
       ) : (
@@ -363,12 +296,20 @@ const CashTokensFullView = () => {
             <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
           }
         >
-          <SectionRow>
-            <CashGetMusdEmptyState
-              isFullView
-              hideClaimButton={isMoneyHubEnabled}
-            />
-          </SectionRow>
+          {isMoneyHubEnabled && balanceHeading}
+          {isMoneyHubEnabled ? (
+            // MUSD-729 empty state: mirror the "Your balance" funded layout
+            // (mUSD avatar + network badge + $0.00 / 0 mUSD). The standard
+            // <Tokens /> list does not render a row for tokens with zero
+            // balance, and there is no shared design-system component that
+            // matches this presentation, so we fall back to a small bespoke
+            // row to keep the empty/funded structures visually consistent.
+            <MoneyMusdEmptyBalanceRow onPress={handleEmptyMusdRowPress} />
+          ) : (
+            <SectionRow>
+              <CashGetMusdEmptyState isFullView />
+            </SectionRow>
+          )}
           {isMoneyHubEnabled ? bonusAndConvertSections : undefined}
         </ScrollView>
       )}
diff --git a/app/components/Views/CashTokensFullView/CashTokensFullViewSkeleton.tsx b/app/components/Views/CashTokensFullView/CashTokensFullViewSkeleton.tsx
index 926ab6ca796..297d69cca4d 100644
--- a/app/components/Views/CashTokensFullView/CashTokensFullViewSkeleton.tsx
+++ b/app/components/Views/CashTokensFullView/CashTokensFullViewSkeleton.tsx
@@ -21,6 +21,7 @@ interface CashTokensFullViewSkeletonProps {
   numChainsWithMusdBalance: number;
   isMoneyHubEnabled: boolean;
   conversionTokenCount: number;
+  listHeaderComponent?: React.ReactElement;
 }
 
 /**
@@ -115,10 +116,10 @@ const BonusSectionSkeleton = () => (
 );
 
 /**
- * Mirrors a single ConvertTokenRow: 32px token icon, name + balance text,
+ * Mirrors a single MusdConversionAssetRow: 32px token icon, name + balance text,
  * and action button placeholders on the right.
  */
-const ConvertTokenRowSkeleton = () => (
+const MusdConversionAssetRowSkeleton = () => (
   <Box
     flexDirection={BoxFlexDirection.Row}
     alignItems={BoxAlignItems.Center}
@@ -172,7 +173,7 @@ const ConvertSectionSkeleton = ({ tokenCount }: { tokenCount: number }) => (
     {tokenCount > 0 && (
       <Box twClassName="mt-3">
         {Array.from({ length: Math.min(tokenCount, 3) }, (_, index) => (
-          <ConvertTokenRowSkeleton key={`convert-row-${index}`} />
+          <MusdConversionAssetRowSkeleton key={`convert-row-${index}`} />
         ))}
       </Box>
     )}
@@ -193,6 +194,7 @@ const CashTokensFullViewSkeleton = ({
   numChainsWithMusdBalance,
   isMoneyHubEnabled,
   conversionTokenCount,
+  listHeaderComponent,
 }: CashTokensFullViewSkeletonProps) => {
   const tw = useTailwind();
 
@@ -202,6 +204,7 @@ const CashTokensFullViewSkeleton = ({
       showsVerticalScrollIndicator={false}
       testID={CashTokensFullViewSkeletonTestIds.CONTAINER}
     >
+      {listHeaderComponent}
       {numChainsWithMusdBalance > 0 ? (
         <>
           {Array.from({ length: numChainsWithMusdBalance }, (_, index) => (
diff --git a/app/components/Views/ChoosePassword/index.tsx b/app/components/Views/ChoosePassword/index.tsx
index 14f270b3fc0..9edc0e42561 100644
--- a/app/components/Views/ChoosePassword/index.tsx
+++ b/app/components/Views/ChoosePassword/index.tsx
@@ -5,7 +5,7 @@ import React, {
   useCallback,
   useContext,
 } from 'react';
-import { TouchableOpacity, Platform, Keyboard } from 'react-native';
+import { TouchableOpacity, Platform, Keyboard, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import { captureException } from '@sentry/react-native';
@@ -137,9 +137,7 @@ const ChoosePassword = () => {
 
   const mounted = useRef(true);
   const passwordSetupAttemptTraceCtx = useRef<TraceContext | null>(null);
-  const confirmPasswordInputRef = useRef<React.ElementRef<
-    typeof TextField
-  > | null>(null);
+  const confirmPasswordInputRef = useRef<TextInput | null>(null);
   // Flag to know if password in keyring was set or not
   const keyringControllerPasswordSet = useRef(false);
 
@@ -730,20 +728,10 @@ const ChoosePassword = () => {
                   </Label>
                   <TextField
                     autoFocus
-                    secureTextEntry={showPasswordIndex.includes(0)}
                     value={password}
                     onChangeText={onPasswordChange}
                     onFocus={() => setIsPasswordFieldFocused(true)}
                     onBlur={() => setIsPasswordFieldFocused(false)}
-                    testID={ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID}
-                    accessibilityLabel={
-                      ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID
-                    }
-                    onSubmitEditing={jumpToConfirmPassword}
-                    autoComplete="password-new"
-                    returnKeyType="next"
-                    autoCapitalize="none"
-                    keyboardAppearance={themeAppearance}
                     isError={isPasswordTooShort}
                     endAccessory={
                       <TouchableOpacity onPress={() => toggleShowPassword(0)}>
@@ -758,6 +746,17 @@ const ChoosePassword = () => {
                         />
                       </TouchableOpacity>
                     }
+                    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}
@@ -786,21 +785,9 @@ const ChoosePassword = () => {
                     {strings('choose_password.confirm_password')}
                   </Label>
                   <TextField
-                    ref={confirmPasswordInputRef}
+                    inputRef={confirmPasswordInputRef}
                     value={confirmPassword}
                     onChangeText={setConfirmPasswordValue}
-                    secureTextEntry={showPasswordIndex.includes(1)}
-                    testID={
-                      ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID
-                    }
-                    accessibilityLabel={
-                      ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID
-                    }
-                    autoComplete="password-new"
-                    onSubmitEditing={Keyboard.dismiss}
-                    returnKeyType={'done'}
-                    autoCapitalize="none"
-                    keyboardAppearance={themeAppearance}
                     endAccessory={
                       <TouchableOpacity
                         disabled={password === ''}
@@ -819,6 +806,18 @@ const ChoosePassword = () => {
                     }
                     isDisabled={password === ''}
                     isError={checkError()}
+                    inputProps={{
+                      secureTextEntry: showPasswordIndex.includes(1),
+                      testID:
+                        ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID,
+                      accessibilityLabel:
+                        ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID,
+                      autoComplete: 'password-new',
+                      onSubmitEditing: Keyboard.dismiss,
+                      returnKeyType: 'done',
+                      autoCapitalize: 'none',
+                      keyboardAppearance: themeAppearance,
+                    }}
                   />
                   {checkError() && (
                     <Text
diff --git a/app/components/Views/ConnectQRHardware/ConnectQRHardware.testIds.ts b/app/components/Views/ConnectQRHardware/ConnectQRHardware.testIds.ts
new file mode 100644
index 00000000000..49f442a2374
--- /dev/null
+++ b/app/components/Views/ConnectQRHardware/ConnectQRHardware.testIds.ts
@@ -0,0 +1,3 @@
+export const ConnectQRHardwareSelectorsIDs = {
+  CONTINUE_BUTTON: 'qr-continue-button',
+};
diff --git a/app/components/Views/ConnectQRHardware/Instruction/index.test.tsx b/app/components/Views/ConnectQRHardware/Instruction/index.test.tsx
index b17b802e875..3675e6ef9e5 100644
--- a/app/components/Views/ConnectQRHardware/Instruction/index.test.tsx
+++ b/app/components/Views/ConnectQRHardware/Instruction/index.test.tsx
@@ -15,7 +15,7 @@ import {
   NGRAVE_BUY,
   NGRAVE_LEARN_MORE,
 } from '../../../../constants/urls';
-import { QR_CONTINUE_BUTTON } from '../../../../../wdio/screen-objects/testIDs/Components/ConnectQRHardware.testIds';
+import { ConnectQRHardwareSelectorsIDs } from '../ConnectQRHardware.testIds';
 import { AppThemeKey } from '../../../../util/theme/models';
 
 jest.mock('../../../../../locales/i18n', () => ({
@@ -175,7 +175,9 @@ describe('ConnectQRInstruction', () => {
       { state: initialState },
     );
 
-    const continueButton = getByTestId(QR_CONTINUE_BUTTON);
+    const continueButton = getByTestId(
+      ConnectQRHardwareSelectorsIDs.CONTINUE_BUTTON,
+    );
     fireEvent.press(continueButton);
 
     expect(mockOnConnect).toHaveBeenCalledTimes(1);
diff --git a/app/components/Views/ConnectQRHardware/Instruction/index.tsx b/app/components/Views/ConnectQRHardware/Instruction/index.tsx
index 1f8be95d507..40890df184d 100644
--- a/app/components/Views/ConnectQRHardware/Instruction/index.tsx
+++ b/app/components/Views/ConnectQRHardware/Instruction/index.tsx
@@ -2,7 +2,7 @@
 /* eslint @typescript-eslint/no-require-imports: "off" */
 
 import React from 'react';
-import { View, Text, ScrollView, Platform } from 'react-native';
+import { View, Text, ScrollView } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { strings } from '../../../../../locales/i18n';
 import {
@@ -15,8 +15,7 @@ import {
 import { useTheme } from '../../../../util/theme';
 import { createStyles } from './styles';
 import StyledButton from '../../../UI/StyledButton';
-import generateTestId from '../../../../../wdio/utils/generateTestId';
-import { QR_CONTINUE_BUTTON } from '../../../../../wdio/screen-objects/testIDs/Components/ConnectQRHardware.testIds';
+import { ConnectQRHardwareSelectorsIDs } from '../ConnectQRHardware.testIds';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
 import {
@@ -186,7 +185,7 @@ const ConnectQRInstruction = (props: IConnectQRInstructionProps) => {
           type={'confirm'}
           onPress={onConnect}
           style={styles.button}
-          {...generateTestId(Platform, QR_CONTINUE_BUTTON)}
+          testID={ConnectQRHardwareSelectorsIDs.CONTINUE_BUTTON}
         >
           {strings('connect_qr_hardware.button_continue')}
         </StyledButton>
diff --git a/app/components/Views/ConnectQRHardware/index.test.tsx b/app/components/Views/ConnectQRHardware/index.test.tsx
index 1c3e718aca4..ebcfe27d925 100644
--- a/app/components/Views/ConnectQRHardware/index.test.tsx
+++ b/app/components/Views/ConnectQRHardware/index.test.tsx
@@ -3,14 +3,11 @@ import renderWithProvider from '../../../util/test/renderWithProvider';
 import Engine from '../../../core/Engine';
 import ConnectQRHardware from './index';
 import { fireEvent, act, waitFor } from '@testing-library/react-native';
-import { QR_CONTINUE_BUTTON } from '../../../../wdio/screen-objects/testIDs/Components/ConnectQRHardware.testIds';
+import { ConnectQRHardwareSelectorsIDs } from './ConnectQRHardware.testIds';
 import { backgroundState } from '../../../util/test/initial-root-state';
-import {
-  ACCOUNT_SELECTOR_FORGET_BUTTON,
-  ACCOUNT_SELECTOR_NEXT_BUTTON,
-  ACCOUNT_SELECTOR_PREVIOUS_BUTTON,
-} from '../../../../wdio/screen-objects/testIDs/Components/AccountSelector.testIds';
-import { QrKeyringBridge } from '@metamask/eth-qr-keyring';
+import { AccountSelectorSelectorsIDs } from '../../UI/HardwareWallet/AccountSelector/AccountSelector.testIds';
+import { QrKeyring, QrKeyringBridge } from '@metamask/eth-qr-keyring';
+import type { Hex } from '@metamask/utils';
 import { removeAccountsFromPermissions } from '../../../core/Permissions';
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import { HardwareDeviceTypes } from '../../../constants/keyringTypes';
@@ -42,7 +39,14 @@ const mockedNavigate = {
   goBack: jest.fn(),
 };
 
-const mockPage0Accounts = [
+interface MockAccount {
+  address: Hex;
+  index: number;
+  shortenedAddress: string;
+  balance: string;
+}
+
+const mockPage0Accounts: MockAccount[] = [
   {
     address: '0x4678901234567890123456789012345678901210',
     shortenedAddress: '0x46789...01210',
@@ -75,7 +79,7 @@ const mockPage0Accounts = [
   },
 ];
 
-const mockPage1Accounts = [
+const mockPage1Accounts: MockAccount[] = [
   {
     address: '0x12345678901234567890123456789012345678902',
     shortenedAddress: '0x12345...78902',
@@ -108,28 +112,12 @@ const mockPage1Accounts = [
   },
 ];
 
-const mockQrKeyring = {
-  getFirstPage: jest.fn(),
-  getNextPage: jest.fn(),
-  getPreviousPage: jest.fn(),
-  forgetDevice: jest.fn(),
-  getName: jest.fn().mockResolvedValue('KeystoneDevice'),
-  getAccounts: jest
-    .fn()
-    .mockReturnValue([
-      '0x4678901234567890123456789012345678901210',
-      '0x49A10E12ceaacC302548d3c1C72836C9298d180e',
-    ]),
-  setAccountToUnlock: jest.fn(),
-  addAccounts: jest
-    .fn()
-    .mockResolvedValue(['0x4678901234567890123456789012345678901210']),
-};
-
 const mockQrKeyringBridge: QrKeyringBridge = {
   requestScan: jest.fn(),
 };
 
+const mockQrKeyring = new QrKeyring({ bridge: mockQrKeyringBridge });
+
 jest.mock('@react-navigation/native', () => {
   const actualNav = jest.requireActual('@react-navigation/native');
   return {
@@ -182,31 +170,55 @@ const mockInitialState = {
 
 describe('ConnectQRHardware', () => {
   const mockKeyringController = MockEngine.context.KeyringController;
-  mockQrKeyring.getFirstPage.mockResolvedValue(mockPage0Accounts);
-  mockQrKeyring.getNextPage.mockResolvedValue(mockPage1Accounts);
-  mockQrKeyring.getPreviousPage.mockResolvedValue(mockPage0Accounts);
-
   const mockAccountTrackerController =
     MockEngine.context.AccountTrackerController;
-  mockAccountTrackerController.syncBalanceWithAddresses.mockImplementation(
-    (addresses) =>
-      Promise.resolve(
-        addresses.reduce(
-          (acc: { [key: string]: { balance: string } }, address) => {
-            acc[address] = {
-              balance: '0x0',
-            };
-            return acc;
-          },
-          {},
-        ),
-      ),
-  );
 
   beforeEach(() => {
     jest.clearAllMocks();
     mockTrackEvent.mockClear();
     mockCreateEventBuilder.mockClear();
+
+    // Re-establish QrKeyring spies each test. `testSetup.js` runs
+    // `jest.restoreAllMocks()` in afterEach, which restores spied methods to
+    // their real implementations, so spies must be recreated here.
+    jest
+      .spyOn(mockQrKeyring, 'getFirstPage')
+      .mockResolvedValue(mockPage0Accounts);
+    jest
+      .spyOn(mockQrKeyring, 'getNextPage')
+      .mockResolvedValue(mockPage1Accounts);
+    jest
+      .spyOn(mockQrKeyring, 'getPreviousPage')
+      .mockResolvedValue(mockPage0Accounts);
+    jest.spyOn(mockQrKeyring, 'forgetDevice').mockImplementation();
+    jest
+      .spyOn(mockQrKeyring, 'getName')
+      .mockResolvedValue('KeystoneDevice' as never);
+    jest
+      .spyOn(mockQrKeyring, 'getAccounts')
+      .mockReturnValue([
+        '0x4678901234567890123456789012345678901210',
+        '0x49A10E12ceaacC302548d3c1C72836C9298d180e',
+      ] as never);
+    jest.spyOn(mockQrKeyring, 'setAccountToUnlock').mockImplementation();
+    jest
+      .spyOn(mockQrKeyring, 'addAccounts')
+      .mockResolvedValue(['0x4678901234567890123456789012345678901210']);
+
+    mockAccountTrackerController.syncBalanceWithAddresses.mockImplementation(
+      (addresses) =>
+        Promise.resolve(
+          addresses.reduce(
+            (acc: { [key: string]: { balance: string } }, address) => {
+              acc[address] = {
+                balance: '0x0',
+              };
+              return acc;
+            },
+            {},
+          ),
+        ),
+    );
   });
 
   it('renders first page correctly when user clicks `continue` button', async () => {
@@ -217,7 +229,7 @@ describe('ConnectQRHardware', () => {
       { state: mockInitialState },
     );
 
-    const button = getByTestId(QR_CONTINUE_BUTTON);
+    const button = getByTestId(ConnectQRHardwareSelectorsIDs.CONTINUE_BUTTON);
 
     expect(button).toBeDefined();
 
@@ -240,14 +252,14 @@ describe('ConnectQRHardware', () => {
       { state: mockInitialState },
     );
 
-    const button = getByTestId(QR_CONTINUE_BUTTON);
+    const button = getByTestId(ConnectQRHardwareSelectorsIDs.CONTINUE_BUTTON);
     expect(button).toBeDefined();
 
     await act(async () => {
       fireEvent.press(button);
     });
 
-    const nextButton = getByTestId(ACCOUNT_SELECTOR_NEXT_BUTTON);
+    const nextButton = getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON);
     expect(nextButton).toBeDefined();
     await act(async () => {
       fireEvent.press(nextButton);
@@ -268,20 +280,20 @@ describe('ConnectQRHardware', () => {
       { state: mockInitialState },
     );
 
-    const button = getByTestId(QR_CONTINUE_BUTTON);
+    const button = getByTestId(ConnectQRHardwareSelectorsIDs.CONTINUE_BUTTON);
     expect(button).toBeDefined();
 
     await act(async () => {
       fireEvent.press(button);
     });
 
-    const nextButton = getByTestId(ACCOUNT_SELECTOR_NEXT_BUTTON);
+    const nextButton = getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON);
     expect(nextButton).toBeDefined();
     await act(async () => {
       fireEvent.press(nextButton);
     });
 
-    const prevButton = getByTestId(ACCOUNT_SELECTOR_PREVIOUS_BUTTON);
+    const prevButton = getByTestId(AccountSelectorSelectorsIDs.PREVIOUS_BUTTON);
     expect(prevButton).toBeDefined();
     await act(async () => {
       fireEvent.press(prevButton);
@@ -303,14 +315,14 @@ describe('ConnectQRHardware', () => {
       { state: mockInitialState },
     );
 
-    const button = getByTestId(QR_CONTINUE_BUTTON);
+    const button = getByTestId(ConnectQRHardwareSelectorsIDs.CONTINUE_BUTTON);
     expect(button).toBeDefined();
 
     await act(async () => {
       fireEvent.press(button);
     });
 
-    const forgetButton = getByTestId(ACCOUNT_SELECTOR_FORGET_BUTTON);
+    const forgetButton = getByTestId(AccountSelectorSelectorsIDs.FORGET_BUTTON);
     expect(forgetButton).toBeDefined();
     await act(async () => {
       fireEvent.press(forgetButton);
@@ -332,7 +344,7 @@ describe('ConnectQRHardware', () => {
       { state: mockInitialState },
     );
 
-    const button = getByTestId(QR_CONTINUE_BUTTON);
+    const button = getByTestId(ConnectQRHardwareSelectorsIDs.CONTINUE_BUTTON);
 
     await act(async () => {
       fireEvent.press(button);
@@ -352,7 +364,7 @@ describe('ConnectQRHardware', () => {
       { state: mockInitialState },
     );
 
-    const button = getByTestId(QR_CONTINUE_BUTTON);
+    const button = getByTestId(ConnectQRHardwareSelectorsIDs.CONTINUE_BUTTON);
 
     await act(async () => {
       fireEvent.press(button);
@@ -388,13 +400,13 @@ describe('ConnectQRHardware', () => {
       { state: mockInitialState },
     );
 
-    const button = getByTestId(QR_CONTINUE_BUTTON);
+    const button = getByTestId(ConnectQRHardwareSelectorsIDs.CONTINUE_BUTTON);
 
     await act(async () => {
       fireEvent.press(button);
     });
 
-    const forgetButton = getByTestId(ACCOUNT_SELECTOR_FORGET_BUTTON);
+    const forgetButton = getByTestId(AccountSelectorSelectorsIDs.FORGET_BUTTON);
 
     await act(async () => {
       fireEvent.press(forgetButton);
@@ -421,7 +433,7 @@ describe('ConnectQRHardware', () => {
       { state: mockInitialState },
     );
 
-    const button = getByTestId(QR_CONTINUE_BUTTON);
+    const button = getByTestId(ConnectQRHardwareSelectorsIDs.CONTINUE_BUTTON);
 
     await act(async () => {
       fireEvent.press(button);
diff --git a/app/components/Views/Homepage/Homepage.test.tsx b/app/components/Views/Homepage/Homepage.test.tsx
index 7a52a54dd55..86777285a4b 100644
--- a/app/components/Views/Homepage/Homepage.test.tsx
+++ b/app/components/Views/Homepage/Homepage.test.tsx
@@ -234,7 +234,6 @@ jest.mock('../../UI/Earn/selectors/featureFlags', () => ({
   selectMusdConversionCTATokens: jest.fn(() => ({})),
   selectIsMusdConversionTokenListItemCtaEnabledFlag: jest.fn(() => false),
   selectIsMusdConversionAssetOverviewEnabledFlag: jest.fn(() => false),
-  selectMusdQuickConvertEnabledFlag: jest.fn(() => false),
   selectMerklCampaignClaimingEnabledFlag: jest.fn(() => false),
 }));
 
@@ -610,4 +609,32 @@ describe('Homepage', () => {
       });
     });
   });
+
+  describe('perpsProvidersHoisted + Perps feature flag', () => {
+    it('does not render PerpsSection when perpsProvidersHoisted=true and Perps flag is disabled', () => {
+      jest
+        .requireMock('../../UI/Perps')
+        .selectPerpsEnabledFlag.mockReturnValue(false);
+
+      renderWithProvider(<Homepage perpsProvidersHoisted />, {
+        state: stateWithPreferences,
+      });
+
+      const calls = getUseHomeViewedEventCalls();
+      expect(calls.some((c) => c[0]?.sectionName === 'perps')).toBe(false);
+    });
+
+    it('renders PerpsSection when perpsProvidersHoisted=true and Perps flag is enabled', () => {
+      jest
+        .requireMock('../../UI/Perps')
+        .selectPerpsEnabledFlag.mockReturnValue(true);
+
+      renderWithProvider(<Homepage perpsProvidersHoisted />, {
+        state: stateWithPreferences,
+      });
+
+      const calls = getUseHomeViewedEventCalls();
+      expect(calls.some((c) => c[0]?.sectionName === 'perps')).toBe(true);
+    });
+  });
 });
diff --git a/app/components/Views/Homepage/Homepage.tsx b/app/components/Views/Homepage/Homepage.tsx
index 64f622d5c0d..51330d8e3cd 100644
--- a/app/components/Views/Homepage/Homepage.tsx
+++ b/app/components/Views/Homepage/Homepage.tsx
@@ -40,75 +40,124 @@ import { PerpsConnectionProvider } from '../../UI/Perps/providers/PerpsConnectio
 import { PerpsStreamProvider } from '../../UI/Perps/providers/PerpsStreamManager';
 import { HomepageTrendingAbTestContext } from './context/HomepageTrendingAbTestContext';
 
+interface HomepageProps {
+  /**
+   * When true, skips rendering PerpsConnectionProvider + PerpsStreamProvider
+   * because a parent (e.g. HomepageDiscoveryTabs) already provides them.
+   */
+  perpsProvidersHoisted?: boolean;
+}
+
 /**
  * Homepage component - Main view for the redesigned wallet homepage.
  *
  * This component orchestrates all homepage sections and coordinates
  * their refresh functionality via refs.
  */
-const Homepage = forwardRef<SectionRefreshHandle>((_, ref) => {
-  const cashSectionRef = useRef<SectionRefreshHandle>(null);
-  const tokensSectionRef = useRef<SectionRefreshHandle>(null);
-  const whatsHappeningSectionRef = 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 trendingTokensRef = useRef<SectionRefreshHandle>(null);
-  const trendingPerpsRef = useRef<SectionRefreshHandle>(null);
-  const trendingPredictionsRef = useRef<SectionRefreshHandle>(null);
+const Homepage = forwardRef<SectionRefreshHandle, HomepageProps>(
+  ({ perpsProvidersHoisted = false }, ref) => {
+    const cashSectionRef = useRef<SectionRefreshHandle>(null);
+    const tokensSectionRef = useRef<SectionRefreshHandle>(null);
+    const whatsHappeningSectionRef = 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 trendingTokensRef = useRef<SectionRefreshHandle>(null);
+    const trendingPerpsRef = useRef<SectionRefreshHandle>(null);
+    const trendingPredictionsRef = useRef<SectionRefreshHandle>(null);
 
-  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
-  const isPredictEnabled = useSelector(selectPredictEnabledFlag);
-  const isDeFiEnabled = useSelector(selectDeFiPositionsSectionEnabled);
-  const isWhatsHappeningEnabled = useSelector(selectWhatsHappeningEnabled);
-  const isTopTradersEnabled = useSelector(selectSocialLeaderboardEnabled);
-  const isMusdConversionEnabled = useSelector(
-    selectIsMusdConversionFlowEnabledFlag,
-  );
-  const { isEligible: isGeoEligible } = useMusdConversionEligibility();
-  const isCashSectionEnabled = isMusdConversionEnabled && isGeoEligible;
+    const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
+    const isPredictEnabled = useSelector(selectPredictEnabledFlag);
+    const isDeFiEnabled = useSelector(selectDeFiPositionsSectionEnabled);
+    const isWhatsHappeningEnabled = useSelector(selectWhatsHappeningEnabled);
+    const isTopTradersEnabled = useSelector(selectSocialLeaderboardEnabled);
+    const isMusdConversionEnabled = useSelector(
+      selectIsMusdConversionFlowEnabledFlag,
+    );
+    const { isEligible: isGeoEligible } = useMusdConversionEligibility();
+    const isCashSectionEnabled = isMusdConversionEnabled && isGeoEligible;
 
-  const {
-    variant: abVariant,
-    isActive: isAbActive,
-    variantName: abVariantName,
-  } = useABTest(
-    HOMEPAGE_TRENDING_SECTIONS_AB_KEY,
-    HOMEPAGE_TRENDING_SECTIONS_VARIANTS,
-  );
-  const separateTrending = abVariant.separateTrending;
+    const {
+      variant: abVariant,
+      isActive: isAbActive,
+      variantName: abVariantName,
+    } = useABTest(
+      HOMEPAGE_TRENDING_SECTIONS_AB_KEY,
+      HOMEPAGE_TRENDING_SECTIONS_VARIANTS,
+    );
+    const separateTrending = abVariant.separateTrending;
 
-  const trendingAbTestContextValue = useMemo(
-    () => ({ isActive: isAbActive, variantName: abVariantName }),
-    [isAbActive, abVariantName],
-  );
+    const trendingAbTestContextValue = useMemo(
+      () => ({ isActive: isAbActive, variantName: abVariantName }),
+      [isAbActive, abVariantName],
+    );
 
-  const ownedNfts = useOwnedNfts();
-  const hasNfts = ownedNfts.length > 0;
+    const ownedNfts = useOwnedNfts();
+    const hasNfts = ownedNfts.length > 0;
 
-  const { enableAllPopularNetworks } = useNetworkEnablement();
+    const { enableAllPopularNetworks } = useNetworkEnablement();
 
-  // 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(() => {
-      enableAllPopularNetworks();
-    }, [enableAllPopularNetworks]),
-  );
+    // 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(() => {
+        enableAllPopularNetworks();
+      }, [enableAllPopularNetworks]),
+    );
 
-  /**
-   * Compute the ordered list of enabled sections. Cash is first when enabled;
-   * Tokens and NFTs are always present; Perps, Predictions, and DeFi are feature-flagged.
-   * When separateTrending is active, trending sections are appended.
-   */
-  const enabledSections = useMemo(() => {
-    if (separateTrending) {
-      // Treatment: position sections + trending sections + conditional NFT placement
-      const sections: { name: HomeSectionName; enabled: boolean }[] = [
+    /**
+     * Compute the ordered list of enabled sections. Cash is first when enabled;
+     * Tokens and NFTs are always present; Perps, Predictions, and DeFi are feature-flagged.
+     * When separateTrending is active, trending sections are appended.
+     */
+    const enabledSections = useMemo(() => {
+      if (separateTrending) {
+        // Treatment: position sections + trending sections + conditional NFT placement
+        const sections: { name: HomeSectionName; enabled: boolean }[] = [
+          { name: HomeSectionNames.CASH, enabled: isCashSectionEnabled },
+          { name: HomeSectionNames.TOKENS, enabled: true },
+          { name: HomeSectionNames.PERPS, enabled: isPerpsEnabled },
+          { name: HomeSectionNames.PREDICT, enabled: isPredictEnabled },
+          {
+            name: HomeSectionNames.TOP_TRADERS,
+            enabled: isTopTradersEnabled,
+          },
+          { name: HomeSectionNames.DEFI, enabled: isDeFiEnabled },
+        ];
+
+        // NFTs above trending when user has NFTs
+        if (hasNfts) {
+          sections.push({ name: HomeSectionNames.NFTS, enabled: true });
+        }
+
+        // Always-on trending sections
+        sections.push(
+          {
+            name: HomeSectionNames.WHATS_HAPPENING,
+            enabled: isWhatsHappeningEnabled,
+          },
+          { name: HomeSectionNames.TRENDING_TOKENS, enabled: true },
+          { name: HomeSectionNames.TRENDING_PERPS, enabled: isPerpsEnabled },
+          {
+            name: HomeSectionNames.TRENDING_PREDICT,
+            enabled: isPredictEnabled,
+          },
+        );
+
+        // NFTs below trending when user has no NFTs
+        if (!hasNfts) {
+          sections.push({ name: HomeSectionNames.NFTS, enabled: true });
+        }
+
+        return sections.filter((s) => s.enabled);
+      }
+
+      // Control: original layout
+      return [
         { name: HomeSectionNames.CASH, enabled: isCashSectionEnabled },
         { name: HomeSectionNames.TOKENS, enabled: true },
         { name: HomeSectionNames.PERPS, enabled: isPerpsEnabled },
@@ -117,174 +166,187 @@ const Homepage = forwardRef<SectionRefreshHandle>((_, ref) => {
           name: HomeSectionNames.TOP_TRADERS,
           enabled: isTopTradersEnabled,
         },
-        { name: HomeSectionNames.DEFI, enabled: isDeFiEnabled },
-      ];
-
-      // NFTs above trending when user has NFTs
-      if (hasNfts) {
-        sections.push({ name: HomeSectionNames.NFTS, enabled: true });
-      }
-
-      // Always-on trending sections
-      sections.push(
         {
           name: HomeSectionNames.WHATS_HAPPENING,
           enabled: isWhatsHappeningEnabled,
         },
-        { name: HomeSectionNames.TRENDING_TOKENS, enabled: true },
-        { name: HomeSectionNames.TRENDING_PERPS, enabled: isPerpsEnabled },
-        {
-          name: HomeSectionNames.TRENDING_PREDICT,
-          enabled: isPredictEnabled,
-        },
-      );
-
-      // NFTs below trending when user has no NFTs
-      if (!hasNfts) {
-        sections.push({ name: HomeSectionNames.NFTS, enabled: true });
-      }
+        { name: HomeSectionNames.DEFI, enabled: isDeFiEnabled },
+        { name: HomeSectionNames.NFTS, enabled: true },
+      ].filter((s) => s.enabled);
+    }, [
+      separateTrending,
+      isCashSectionEnabled,
+      isWhatsHappeningEnabled,
+      isPerpsEnabled,
+      isPredictEnabled,
+      isDeFiEnabled,
+      hasNfts,
+      isTopTradersEnabled,
+    ]);
 
-      return sections.filter((s) => s.enabled);
-    }
+    const totalSectionsLoaded = enabledSections.length;
 
-    // Control: original layout
-    return [
-      { name: HomeSectionNames.CASH, enabled: isCashSectionEnabled },
-      { name: HomeSectionNames.TOKENS, enabled: true },
-      { name: HomeSectionNames.PERPS, enabled: isPerpsEnabled },
-      { name: HomeSectionNames.PREDICT, enabled: isPredictEnabled },
-      {
-        name: HomeSectionNames.TOP_TRADERS,
-        enabled: isTopTradersEnabled,
-      },
-      {
-        name: HomeSectionNames.WHATS_HAPPENING,
-        enabled: isWhatsHappeningEnabled,
-      },
-      { name: HomeSectionNames.DEFI, enabled: isDeFiEnabled },
-      { name: HomeSectionNames.NFTS, enabled: true },
-    ].filter((s) => s.enabled);
-  }, [
-    separateTrending,
-    isCashSectionEnabled,
-    isWhatsHappeningEnabled,
-    isPerpsEnabled,
-    isPredictEnabled,
-    isDeFiEnabled,
-    hasNfts,
-    isTopTradersEnabled,
-  ]);
+    useHomeSessionSummary({ totalSectionsLoaded });
 
-  const totalSectionsLoaded = enabledSections.length;
+    const getSectionIndex = useCallback(
+      (name: HomeSectionName) =>
+        enabledSections.findIndex((s) => s.name === name),
+      [enabledSections],
+    );
 
-  useHomeSessionSummary({ totalSectionsLoaded });
+    const refresh = useCallback(async () => {
+      await Promise.allSettled([
+        cashSectionRef.current?.refresh(),
+        tokensSectionRef.current?.refresh(),
+        whatsHappeningSectionRef.current?.refresh(),
+        perpsSectionRef.current?.refresh(),
+        predictionsSectionRef.current?.refresh(),
+        topTradersSectionRef.current?.refresh(),
+        defiSectionRef.current?.refresh(),
+        nftsSectionRef.current?.refresh(),
+        trendingTokensRef.current?.refresh(),
+        trendingPerpsRef.current?.refresh(),
+        trendingPredictionsRef.current?.refresh(),
+      ]);
+    }, []);
 
-  const getSectionIndex = useCallback(
-    (name: HomeSectionName) =>
-      enabledSections.findIndex((s) => s.name === name),
-    [enabledSections],
-  );
+    useImperativeHandle(ref, () => ({ refresh }), [refresh]);
 
-  const refresh = useCallback(async () => {
-    await Promise.allSettled([
-      cashSectionRef.current?.refresh(),
-      tokensSectionRef.current?.refresh(),
-      whatsHappeningSectionRef.current?.refresh(),
-      perpsSectionRef.current?.refresh(),
-      predictionsSectionRef.current?.refresh(),
-      topTradersSectionRef.current?.refresh(),
-      defiSectionRef.current?.refresh(),
-      nftsSectionRef.current?.refresh(),
-      trendingTokensRef.current?.refresh(),
-      trendingPerpsRef.current?.refresh(),
-      trendingPredictionsRef.current?.refresh(),
-    ]);
-  }, []);
+    const sectionMode = separateTrending ? 'positions-only' : 'default';
 
-  useImperativeHandle(ref, () => ({ refresh }), [refresh]);
+    if (separateTrending) {
+      const renderTreatmentNonPerpsSections = (
+        trendingPerpsSection: React.ReactNode,
+      ) => (
+        <>
+          <PredictionsSection
+            ref={predictionsSectionRef}
+            sectionIndex={getSectionIndex(HomeSectionNames.PREDICT)}
+            totalSectionsLoaded={totalSectionsLoaded}
+            mode={sectionMode}
+          />
+          {isTopTradersEnabled && (
+            <TopTradersSection
+              ref={topTradersSectionRef}
+              sectionIndex={getSectionIndex(HomeSectionNames.TOP_TRADERS)}
+              totalSectionsLoaded={totalSectionsLoaded}
+            />
+          )}
+          {isDeFiEnabled && (
+            <DeFiSection
+              ref={defiSectionRef}
+              sectionIndex={getSectionIndex(HomeSectionNames.DEFI)}
+              totalSectionsLoaded={totalSectionsLoaded}
+            />
+          )}
 
-  const sectionMode = separateTrending ? 'positions-only' : 'default';
+          {/* NFTs above trending when user has NFTs */}
+          {hasNfts && (
+            <NFTsSection
+              ref={nftsSectionRef}
+              sectionIndex={getSectionIndex(HomeSectionNames.NFTS)}
+              totalSectionsLoaded={totalSectionsLoaded}
+            />
+          )}
 
-  if (separateTrending) {
-    const renderTreatmentNonPerpsSections = (
-      trendingPerpsSection: React.ReactNode,
-    ) => (
-      <>
-        <PredictionsSection
-          ref={predictionsSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.PREDICT)}
-          totalSectionsLoaded={totalSectionsLoaded}
-          mode={sectionMode}
-        />
-        {isTopTradersEnabled && (
-          <TopTradersSection
-            ref={topTradersSectionRef}
-            sectionIndex={getSectionIndex(HomeSectionNames.TOP_TRADERS)}
+          {/* Always-on trending sections */}
+          <WhatsHappeningSection
+            ref={whatsHappeningSectionRef}
+            sectionIndex={getSectionIndex(HomeSectionNames.WHATS_HAPPENING)}
             totalSectionsLoaded={totalSectionsLoaded}
           />
-        )}
-        {isDeFiEnabled && (
-          <DeFiSection
-            ref={defiSectionRef}
-            sectionIndex={getSectionIndex(HomeSectionNames.DEFI)}
+          <TokensSection
+            ref={trendingTokensRef}
+            sectionIndex={getSectionIndex(HomeSectionNames.TRENDING_TOKENS)}
             totalSectionsLoaded={totalSectionsLoaded}
+            mode="trending-only"
+            sectionName={HomeSectionNames.TRENDING_TOKENS}
+            titleOverride={strings('homepage.sections.trending_tokens')}
           />
-        )}
-
-        {/* NFTs above trending when user has NFTs */}
-        {hasNfts && (
-          <NFTsSection
-            ref={nftsSectionRef}
-            sectionIndex={getSectionIndex(HomeSectionNames.NFTS)}
+          {trendingPerpsSection}
+          <PredictionsSection
+            ref={trendingPredictionsRef}
+            sectionIndex={getSectionIndex(HomeSectionNames.TRENDING_PREDICT)}
             totalSectionsLoaded={totalSectionsLoaded}
+            mode="trending-only"
+            sectionName={HomeSectionNames.TRENDING_PREDICT}
+            titleOverride={strings('homepage.sections.trending_predictions')}
           />
-        )}
 
-        {/* Always-on trending sections */}
-        <WhatsHappeningSection
-          ref={whatsHappeningSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.WHATS_HAPPENING)}
-          totalSectionsLoaded={totalSectionsLoaded}
-        />
-        <TokensSection
-          ref={trendingTokensRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.TRENDING_TOKENS)}
-          totalSectionsLoaded={totalSectionsLoaded}
-          mode="trending-only"
-          sectionName={HomeSectionNames.TRENDING_TOKENS}
-          titleOverride={strings('homepage.sections.trending_tokens')}
-        />
-        {trendingPerpsSection}
-        <PredictionsSection
-          ref={trendingPredictionsRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.TRENDING_PREDICT)}
+          {/* NFTs below trending when user has no NFTs */}
+          {!hasNfts && (
+            <NFTsSection
+              ref={nftsSectionRef}
+              sectionIndex={getSectionIndex(HomeSectionNames.NFTS)}
+              totalSectionsLoaded={totalSectionsLoaded}
+            />
+          )}
+        </>
+      );
+
+      const trendingPerpsSection = (
+        <PerpsSectionBase
+          ref={trendingPerpsRef}
+          sectionIndex={getSectionIndex(HomeSectionNames.TRENDING_PERPS)}
           totalSectionsLoaded={totalSectionsLoaded}
           mode="trending-only"
-          sectionName={HomeSectionNames.TRENDING_PREDICT}
-          titleOverride={strings('homepage.sections.trending_predictions')}
+          sectionName={HomeSectionNames.TRENDING_PERPS}
+          titleOverride={strings('homepage.sections.trending_perpetuals')}
         />
+      );
 
-        {/* NFTs below trending when user has no NFTs */}
-        {!hasNfts && (
-          <NFTsSection
-            ref={nftsSectionRef}
-            sectionIndex={getSectionIndex(HomeSectionNames.NFTS)}
-            totalSectionsLoaded={totalSectionsLoaded}
-          />
-        )}
-      </>
-    );
+      return (
+        <HomepageTrendingAbTestContext.Provider
+          value={trendingAbTestContextValue}
+        >
+          <Box
+            gap={8}
+            marginBottom={8}
+            paddingTop={6}
+            testID={WalletViewSelectorsIDs.HOMEPAGE_CONTAINER}
+          >
+            {/* Cash — always first */}
+            <CashSection
+              ref={cashSectionRef}
+              sectionIndex={getSectionIndex(HomeSectionNames.CASH)}
+              totalSectionsLoaded={totalSectionsLoaded}
+            />
 
-    const trendingPerpsSection = (
-      <PerpsSectionBase
-        ref={trendingPerpsRef}
-        sectionIndex={getSectionIndex(HomeSectionNames.TRENDING_PERPS)}
-        totalSectionsLoaded={totalSectionsLoaded}
-        mode="trending-only"
-        sectionName={HomeSectionNames.TRENDING_PERPS}
-        titleOverride={strings('homepage.sections.trending_perpetuals')}
-      />
-    );
+            {/* Position sections — hidden when empty */}
+            <TokensSection
+              ref={tokensSectionRef}
+              sectionIndex={getSectionIndex(HomeSectionNames.TOKENS)}
+              totalSectionsLoaded={totalSectionsLoaded}
+              mode={sectionMode}
+            />
+            {isPerpsEnabled &&
+              (() => {
+                const perpsContent = (
+                  <>
+                    <PerpsSectionBase
+                      ref={perpsSectionRef}
+                      sectionIndex={getSectionIndex(HomeSectionNames.PERPS)}
+                      totalSectionsLoaded={totalSectionsLoaded}
+                      mode={sectionMode}
+                    />
+                    <Box gap={8}>
+                      {renderTreatmentNonPerpsSections(trendingPerpsSection)}
+                    </Box>
+                  </>
+                );
+                return perpsProvidersHoisted ? (
+                  perpsContent
+                ) : (
+                  <PerpsConnectionProvider suppressErrorView>
+                    <PerpsStreamProvider>{perpsContent}</PerpsStreamProvider>
+                  </PerpsConnectionProvider>
+                );
+              })()}
+            {!isPerpsEnabled && renderTreatmentNonPerpsSections(null)}
+          </Box>
+        </HomepageTrendingAbTestContext.Provider>
+      );
+    }
 
     return (
       <HomepageTrendingAbTestContext.Provider
@@ -296,97 +358,65 @@ const Homepage = forwardRef<SectionRefreshHandle>((_, ref) => {
           paddingTop={6}
           testID={WalletViewSelectorsIDs.HOMEPAGE_CONTAINER}
         >
-          {/* Cash — always first */}
           <CashSection
             ref={cashSectionRef}
             sectionIndex={getSectionIndex(HomeSectionNames.CASH)}
             totalSectionsLoaded={totalSectionsLoaded}
           />
-
-          {/* Position sections — hidden when empty */}
           <TokensSection
             ref={tokensSectionRef}
             sectionIndex={getSectionIndex(HomeSectionNames.TOKENS)}
             totalSectionsLoaded={totalSectionsLoaded}
             mode={sectionMode}
           />
-          {isPerpsEnabled && (
-            <PerpsConnectionProvider suppressErrorView>
-              <PerpsStreamProvider>
-                <PerpsSectionBase
-                  ref={perpsSectionRef}
-                  sectionIndex={getSectionIndex(HomeSectionNames.PERPS)}
-                  totalSectionsLoaded={totalSectionsLoaded}
-                  mode={sectionMode}
-                />
-                <Box gap={8}>
-                  {renderTreatmentNonPerpsSections(trendingPerpsSection)}
-                </Box>
-              </PerpsStreamProvider>
-            </PerpsConnectionProvider>
+          {isPerpsEnabled &&
+            (perpsProvidersHoisted ? (
+              <PerpsSectionBase
+                ref={perpsSectionRef}
+                sectionIndex={getSectionIndex(HomeSectionNames.PERPS)}
+                totalSectionsLoaded={totalSectionsLoaded}
+                mode={sectionMode}
+              />
+            ) : (
+              <PerpsSectionWithProvider
+                ref={perpsSectionRef}
+                sectionIndex={getSectionIndex(HomeSectionNames.PERPS)}
+                totalSectionsLoaded={totalSectionsLoaded}
+                mode={sectionMode}
+              />
+            ))}
+          <PredictionsSection
+            ref={predictionsSectionRef}
+            sectionIndex={getSectionIndex(HomeSectionNames.PREDICT)}
+            totalSectionsLoaded={totalSectionsLoaded}
+            mode={sectionMode}
+          />
+          {isTopTradersEnabled && (
+            <TopTradersSection
+              ref={topTradersSectionRef}
+              sectionIndex={getSectionIndex(HomeSectionNames.TOP_TRADERS)}
+              totalSectionsLoaded={totalSectionsLoaded}
+            />
           )}
-          {!isPerpsEnabled && renderTreatmentNonPerpsSections(null)}
+          <WhatsHappeningSection
+            ref={whatsHappeningSectionRef}
+            sectionIndex={getSectionIndex(HomeSectionNames.WHATS_HAPPENING)}
+            totalSectionsLoaded={totalSectionsLoaded}
+          />
+          <DeFiSection
+            ref={defiSectionRef}
+            sectionIndex={getSectionIndex(HomeSectionNames.DEFI)}
+            totalSectionsLoaded={totalSectionsLoaded}
+          />
+          <NFTsSection
+            ref={nftsSectionRef}
+            sectionIndex={getSectionIndex(HomeSectionNames.NFTS)}
+            totalSectionsLoaded={totalSectionsLoaded}
+          />
         </Box>
       </HomepageTrendingAbTestContext.Provider>
     );
-  }
-
-  return (
-    <HomepageTrendingAbTestContext.Provider value={trendingAbTestContextValue}>
-      <Box
-        gap={8}
-        marginBottom={8}
-        paddingTop={6}
-        testID={WalletViewSelectorsIDs.HOMEPAGE_CONTAINER}
-      >
-        <CashSection
-          ref={cashSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.CASH)}
-          totalSectionsLoaded={totalSectionsLoaded}
-        />
-        <TokensSection
-          ref={tokensSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.TOKENS)}
-          totalSectionsLoaded={totalSectionsLoaded}
-          mode={sectionMode}
-        />
-        <PerpsSectionWithProvider
-          ref={perpsSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.PERPS)}
-          totalSectionsLoaded={totalSectionsLoaded}
-          mode={sectionMode}
-        />
-        <PredictionsSection
-          ref={predictionsSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.PREDICT)}
-          totalSectionsLoaded={totalSectionsLoaded}
-          mode={sectionMode}
-        />
-        {isTopTradersEnabled && (
-          <TopTradersSection
-            ref={topTradersSectionRef}
-            sectionIndex={getSectionIndex(HomeSectionNames.TOP_TRADERS)}
-            totalSectionsLoaded={totalSectionsLoaded}
-          />
-        )}
-        <WhatsHappeningSection
-          ref={whatsHappeningSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.WHATS_HAPPENING)}
-          totalSectionsLoaded={totalSectionsLoaded}
-        />
-        <DeFiSection
-          ref={defiSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.DEFI)}
-          totalSectionsLoaded={totalSectionsLoaded}
-        />
-        <NFTsSection
-          ref={nftsSectionRef}
-          sectionIndex={getSectionIndex(HomeSectionNames.NFTS)}
-          totalSectionsLoaded={totalSectionsLoaded}
-        />
-      </Box>
-    </HomepageTrendingAbTestContext.Provider>
-  );
-});
+  },
+);
 
 export default Homepage;
diff --git a/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.test.tsx b/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.test.tsx
index 6ee701c507a..451c00c864c 100644
--- a/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.test.tsx
+++ b/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.test.tsx
@@ -38,10 +38,6 @@ jest.mock('../../../../Views/confirmations/hooks/useNetworkName', () => ({
   useNetworkName: () => 'Ethereum Mainnet',
 }));
 
-jest.mock('../../../../UI/Earn/selectors/featureFlags', () => ({
-  selectMusdQuickConvertEnabledFlag: jest.fn(() => false),
-}));
-
 const mockInitiateCustomConversion = jest.fn();
 jest.mock('../../../../UI/Earn/hooks/useMusdConversion', () => ({
   useMusdConversion: () => ({
diff --git a/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.tsx b/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.tsx
index ffd587379a3..f2672e386e0 100644
--- a/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.tsx
+++ b/app/components/Views/Homepage/Sections/Cash/CashGetMusdEmptyState.tsx
@@ -31,13 +31,11 @@ import { useRampNavigation } from '../../../../UI/Ramp/hooks/useRampNavigation';
 import { RampIntent } from '../../../../UI/Ramp/types';
 import { useMusdConversion } from '../../../../UI/Earn/hooks/useMusdConversion';
 import { useMusdConversionFlowData } from '../../../../UI/Earn/hooks/useMusdConversionFlowData';
-import { MUSD_CONVERSION_NAVIGATION_OVERRIDE } from '../../../../UI/Earn/types/musd.types';
 import { MUSD_EVENTS_CONSTANTS } from '../../../../UI/Earn/constants/events';
 import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
 import { useMerklBonusClaim } from '../../../../UI/Earn/components/MerklRewards/hooks/useMerklBonusClaim';
 import { useNetworkName } from '../../../../Views/confirmations/hooks/useNetworkName';
-import { selectMusdQuickConvertEnabledFlag } from '../../../../UI/Earn/selectors/featureFlags';
 import I18n, { strings } from '../../../../../../locales/i18n';
 import Logger from '../../../../../util/Logger';
 import { RootState } from '../../../../../reducers';
@@ -116,7 +114,6 @@ const CashGetMusdEmptyState = ({
   } = useMusdConversionFlowData();
   const { initiateCustomConversion, hasSeenConversionEducationScreen } =
     useMusdConversion();
-  const isQuickConvertEnabled = useSelector(selectMusdQuickConvertEnabledFlag);
   const { trackEvent, createEventBuilder } = useAnalytics();
   const networkName = useNetworkName(MUSD_CONVERSION_DEFAULT_CHAIN_ID);
 
@@ -208,9 +205,8 @@ const CashGetMusdEmptyState = ({
         if (!hasSeenConversionEducationScreen) {
           return EVENT_LOCATIONS.CONVERSION_EDUCATION_SCREEN;
         }
-        return isQuickConvertEnabled
-          ? EVENT_LOCATIONS.QUICK_CONVERT_HOME_SCREEN
-          : EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN;
+
+        return EVENT_LOCATIONS.CUSTOM_AMOUNT_SCREEN;
       }
       return EVENT_LOCATIONS.BUY_SCREEN;
     };
@@ -243,9 +239,6 @@ const CashGetMusdEmptyState = ({
       try {
         await initiateCustomConversion({
           preferredPaymentToken: paymentToken,
-          navigationOverride: isQuickConvertEnabled
-            ? MUSD_CONVERSION_NAVIGATION_OVERRIDE.QUICK_CONVERT
-            : undefined,
         });
         return;
       } catch (error) {
@@ -270,7 +263,6 @@ const CashGetMusdEmptyState = ({
     hasConvertibleTokens,
     hasSeenConversionEducationScreen,
     isFullView,
-    isQuickConvertEnabled,
     getPaymentTokenForSelectedNetwork,
     goToBuy,
     initiateCustomConversion,
diff --git a/app/components/Views/Homepage/Sections/Cash/CashSection.test.tsx b/app/components/Views/Homepage/Sections/Cash/CashSection.test.tsx
index 28c98509d81..4ce1725523e 100644
--- a/app/components/Views/Homepage/Sections/Cash/CashSection.test.tsx
+++ b/app/components/Views/Homepage/Sections/Cash/CashSection.test.tsx
@@ -145,20 +145,16 @@ describe('CashSection', () => {
     );
   });
 
-  it('navigates to Money home screen when Money home screen flag is enabled', () => {
+  it('returns null when Money home screen flag is enabled', () => {
     jest
       .requireMock('../../../../UI/Money/selectors/featureFlags')
       .selectMoneyHomeScreenEnabledFlag.mockReturnValue(true);
 
-    renderWithProvider(
+    const { queryByText } = renderWithProvider(
       <CashSection sectionIndex={0} totalSectionsLoaded={1} />,
     );
 
-    fireEvent.press(screen.getByText('Money'));
-
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.MONEY.ROOT, {
-      screen: Routes.MONEY.HOME,
-    });
+    expect(queryByText('Money')).toBeNull();
   });
 
   it('shows Get mUSD empty state when user has no mUSD balance', () => {
diff --git a/app/components/Views/Homepage/Sections/Cash/CashSection.tsx b/app/components/Views/Homepage/Sections/Cash/CashSection.tsx
index 49bd123fc65..becd6eeec25 100644
--- a/app/components/Views/Homepage/Sections/Cash/CashSection.tsx
+++ b/app/components/Views/Homepage/Sections/Cash/CashSection.tsx
@@ -18,6 +18,7 @@ import { useSectionPerformance } from '../../hooks/useSectionPerformance';
 import { selectIsMusdConversionFlowEnabledFlag } from '../../../../UI/Earn/selectors/featureFlags';
 import { useMusdConversionEligibility } from '../../../../UI/Earn/hooks/useMusdConversionEligibility';
 import { useMusdBalance } from '../../../../UI/Earn/hooks/useMusdBalance';
+import { selectMoneyHomeScreenEnabledFlag } from '../../../../UI/Money/selectors/featureFlags';
 import MusdAggregatedRow from './MusdAggregatedRow';
 import { useCashNavigation } from './useCashNavigation';
 
@@ -42,11 +43,13 @@ const CashSection = forwardRef<SectionRefreshHandle, CashSectionProps>(
     const isMusdConversionEnabled = useSelector(
       selectIsMusdConversionFlowEnabledFlag,
     );
+    const isMoneyHomeEnabled = useSelector(selectMoneyHomeScreenEnabledFlag);
     const { isEligible: isGeoEligible } = useMusdConversionEligibility();
     const { hasMusdBalanceOnAnyChain } = useMusdBalance();
     const { navigateToCash } = useCashNavigation();
 
-    const isCashSectionEnabled = isMusdConversionEnabled && isGeoEligible;
+    const isCashSectionEnabled =
+      isMusdConversionEnabled && isGeoEligible && !isMoneyHomeEnabled;
 
     const { onLayout } = useHomeViewedEvent({
       sectionRef: sectionViewRef,
@@ -73,13 +76,17 @@ const CashSection = forwardRef<SectionRefreshHandle, CashSectionProps>(
     useImperativeHandle(ref, () => ({ refresh }), [refresh]);
 
     if (!isCashSectionEnabled) {
+      let reason = 'flag_off';
+      if (isMusdConversionEnabled) {
+        reason = !isGeoEligible ? 'geo_ineligible' : 'money_home_on';
+      }
       Logger.log(
-        `[CashSection] not rendered flag=${isMusdConversionEnabled} geo=${isGeoEligible} reason=${!isMusdConversionEnabled ? 'flag_off' : 'geo_ineligible'}`,
+        `[CashSection] not rendered flag=${isMusdConversionEnabled} geo=${isGeoEligible} moneyHome=${isMoneyHomeEnabled} reason=${reason}`,
       );
       return null;
     }
 
-    const title = strings('homepage.sections.cash');
+    const title = strings('homepage.sections.money');
 
     return (
       <View ref={sectionViewRef} onLayout={onLayout}>
diff --git a/app/components/Views/Homepage/Sections/Perpetuals/PerpsSection.tsx b/app/components/Views/Homepage/Sections/Perpetuals/PerpsSection.tsx
index c884219e22e..5cb10e0782b 100644
--- a/app/components/Views/Homepage/Sections/Perpetuals/PerpsSection.tsx
+++ b/app/components/Views/Homepage/Sections/Perpetuals/PerpsSection.tsx
@@ -442,18 +442,16 @@ const PerpsSectionMain = forwardRef<SectionRefreshHandle, PerpsSectionProps>(
     return (
       <View ref={sectionViewRef} onLayout={onLayout}>
         <Box gap={3}>
-          <Box gap={1}>
-            <SectionHeader title={title} onPress={handleViewAllPerps} />
-            {showHomepageUnrealizedPnl && (
-              <HomepageSectionUnrealizedPnlRow
-                isLoading={perpsAccountLoading}
-                valueText={homepageUnrealizedPnl?.valueText}
-                tone={homepageUnrealizedPnl?.tone ?? 'neutral'}
-                label={strings('perps.unrealized_pnl')}
-                testID="homepage-perps-unrealized-pnl"
-              />
-            )}
-          </Box>
+          <SectionHeader title={title} onPress={handleViewAllPerps} />
+          {showHomepageUnrealizedPnl && (
+            <HomepageSectionUnrealizedPnlRow
+              isLoading={perpsAccountLoading}
+              valueText={homepageUnrealizedPnl?.valueText}
+              tone={homepageUnrealizedPnl?.tone ?? 'neutral'}
+              label={strings('perps.unrealized_pnl')}
+              testID="homepage-perps-unrealized-pnl"
+            />
+          )}
           {showSkeleton || pendingTrending ? (
             <SectionRow>
               <PerpsPositionSkeleton />
diff --git a/app/components/Views/Homepage/Sections/Predictions/PredictionsSection.test.tsx b/app/components/Views/Homepage/Sections/Predictions/PredictionsSection.test.tsx
index 51afe896083..f6b07c1a6b3 100644
--- a/app/components/Views/Homepage/Sections/Predictions/PredictionsSection.test.tsx
+++ b/app/components/Views/Homepage/Sections/Predictions/PredictionsSection.test.tsx
@@ -314,6 +314,41 @@ describe('PredictionsSection', () => {
       });
     });
 
+    it('renders the current active position values from the hook data', async () => {
+      mockUsePredictPositionsForHomepage.mockImplementation(
+        ({
+          claimable = false,
+        }: { maxPositions?: number; claimable?: boolean } = {}) => ({
+          positions: claimable
+            ? []
+            : [
+                {
+                  ...mockActivePositions[0],
+                  currentValue: 99,
+                  percentPnl: 890,
+                },
+                mockActivePositions[1],
+              ],
+          isLoading: false,
+          error: null,
+          totalClaimableValue: 0,
+          refetch: jest.fn(),
+        }),
+      );
+
+      renderWithProvider(
+        <PredictionsSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByText('Test Position 1')).toBeOnTheScreen();
+      });
+
+      expect(screen.getByText('$99')).toBeOnTheScreen();
+      expect(screen.getByText('890%')).toBeOnTheScreen();
+      expect(screen.queryByText('$12')).not.toBeOnTheScreen();
+    });
+
     it('shows position skeletons when loading positions', () => {
       mockUsePredictPositionsForHomepage.mockImplementation(
         ({
@@ -656,6 +691,51 @@ describe('PredictionsSection', () => {
       expect(screen.queryByText('Test Position 1')).not.toBeOnTheScreen();
       expect(screen.queryByText('Test Position 2')).not.toBeOnTheScreen();
     });
+
+    it('does not duplicate the section header when trending carousel is shown above positions', async () => {
+      setupClaimableOnly();
+      mockUsePredictMarketsForHomepage.mockReturnValue({
+        markets: mockMarkets,
+        isLoading: false,
+        error: null,
+        refetch: jest.fn(),
+      });
+
+      renderWithProvider(
+        <PredictionsSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByText('Claim $200.00')).toBeOnTheScreen();
+      });
+
+      // Title should appear exactly once — from the trending carousel header.
+      // The positions header is gated by showHeader=false in this branch.
+      expect(screen.getAllByText('Predictions')).toHaveLength(1);
+    });
+
+    it('does not show unrealized PnL row when trending carousel is above positions', async () => {
+      setupClaimableOnly();
+      mockUsePredictMarketsForHomepage.mockReturnValue({
+        markets: mockMarkets,
+        isLoading: false,
+        error: null,
+        refetch: jest.fn(),
+      });
+
+      renderWithProvider(
+        <PredictionsSection sectionIndex={0} totalSectionsLoaded={1} />,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByText('Claim $200.00')).toBeOnTheScreen();
+      });
+
+      // showHeader=false when trending carousel is above positions,
+      // so the unrealized PnL row must not render even if the hook returns data
+      expect(screen.queryByText(/P&L/i)).not.toBeOnTheScreen();
+      expect(screen.queryByText(/PnL/i)).not.toBeOnTheScreen();
+    });
   });
 
   describe('positions-only mode with claimable-only', () => {
diff --git a/app/components/Views/Homepage/Sections/Predictions/PredictionsSection.tsx b/app/components/Views/Homepage/Sections/Predictions/PredictionsSection.tsx
index 44327a9ee00..4e3513374d4 100644
--- a/app/components/Views/Homepage/Sections/Predictions/PredictionsSection.tsx
+++ b/app/components/Views/Homepage/Sections/Predictions/PredictionsSection.tsx
@@ -70,13 +70,11 @@ interface HomepagePredictTrendingMarketsProps {
   isLoadingMarkets: boolean;
   markets: PredictMarket[];
   transactionActiveAbTests?: TransactionActiveAbTestEntry[];
-  /** When false the section header is omitted (e.g. carousel shown below positions). */
-  showHeader?: boolean;
 }
 
 /**
  * Shared header + horizontal markets carousel for homepage predictions
- * (default "trending when empty" and dedicated trending-only section).
+ * (default “trending when empty” and dedicated trending-only section).
  */
 const HomepagePredictTrendingMarkets = ({
   title,
@@ -85,20 +83,15 @@ const HomepagePredictTrendingMarkets = ({
   isLoadingMarkets,
   markets,
   transactionActiveAbTests,
-  showHeader = true,
 }: HomepagePredictTrendingMarketsProps) => {
   const tw = useTailwind();
   return (
     <Box gap={3}>
-      {showHeader && (
-        <SectionHeader
-          title={title}
-          onPress={onViewAll}
-          testID={WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE(
-            headerTestIdKey,
-          )}
-        />
-      )}
+      <SectionHeader
+        title={title}
+        onPress={onViewAll}
+        testID={WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE(headerTestIdKey)}
+      />
       <ScrollView
         horizontal
         showsHorizontalScrollIndicator={false}
@@ -187,6 +180,7 @@ interface HomepagePredictPositionsProps {
   predictHomepageUnrealizedPnl: PredictHomepageUnrealizedPnlRowState;
   onClaim: () => Promise<void>;
   onPositionPress: (position: PredictPosition) => void;
+  /** When false the section header is omitted (e.g. carousel shown above positions). */
   showHeader?: boolean;
 }
 
@@ -205,50 +199,44 @@ const HomepagePredictPositions = ({
 }: HomepagePredictPositionsProps) => (
   <Box gap={3}>
     {showHeader && (
-      <Box gap={1}>
-        <SectionHeader
-          title={title}
-          onPress={onViewAll}
-          testID={WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('predictions')}
+      <SectionHeader
+        title={title}
+        onPress={onViewAll}
+        testID={WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('predictions')}
+      />
+    )}
+    {showHeader && predictHomepageUnrealizedPnl.show && (
+      <HomepageSectionUnrealizedPnlRow
+        isLoading={predictHomepageUnrealizedPnl.isLoading}
+        valueText={predictHomepageUnrealizedPnl.valueText}
+        tone={predictHomepageUnrealizedPnl.tone}
+        label={strings('predict.unrealized_pnl_label')}
+        testID="homepage-predict-unrealized-pnl"
+      />
+    )}
+    {isLoadingPositions ? (
+      <>
+        <PredictPositionRowSkeleton />
+        <PredictPositionRowSkeleton />
+      </>
+    ) : (
+      positions.map((position) => (
+        <PredictPositionRow
+          key={`${position.outcomeId}:${position.outcomeIndex}`}
+          position={position}
+          onPress={onPositionPress}
+          privacyMode={Boolean(privacyMode)}
+        />
+      ))
+    )}
+    {!isLoadingPositions && !isLoadingClaimable && totalClaimableValue > 0 && (
+      <Box paddingHorizontal={4} paddingTop={1} paddingBottom={3}>
+        <PredictClaimButton
+          amount={privacyMode ? undefined : totalClaimableValue}
+          onPress={onClaim}
         />
-        {predictHomepageUnrealizedPnl.show && (
-          <HomepageSectionUnrealizedPnlRow
-            isLoading={predictHomepageUnrealizedPnl.isLoading}
-            valueText={predictHomepageUnrealizedPnl.valueText}
-            tone={predictHomepageUnrealizedPnl.tone}
-            label={strings('predict.unrealized_pnl_label')}
-            testID="homepage-predict-unrealized-pnl"
-          />
-        )}
       </Box>
     )}
-    <Box>
-      {isLoadingPositions ? (
-        <>
-          <PredictPositionRowSkeleton />
-          <PredictPositionRowSkeleton />
-        </>
-      ) : (
-        positions.map((position) => (
-          <PredictPositionRow
-            key={`${position.outcomeId}:${position.outcomeIndex}`}
-            position={position}
-            onPress={onPositionPress}
-            privacyMode={Boolean(privacyMode)}
-          />
-        ))
-      )}
-      {!isLoadingPositions &&
-        !isLoadingClaimable &&
-        totalClaimableValue > 0 && (
-          <Box paddingHorizontal={4} paddingTop={1} paddingBottom={3}>
-            <PredictClaimButton
-              amount={privacyMode ? undefined : totalClaimableValue}
-              onPress={onClaim}
-            />
-          </Box>
-        )}
-    </Box>
   </Box>
 );
 
@@ -366,7 +354,6 @@ const usePredictPositionsSectionData = (homepageQueriesEnabled: boolean) => {
   }, [claim]);
 
   const hasPositions = positions.length > 0;
-  const hasClaimablePositions = !isLoadingClaimable && totalClaimableValue > 0;
   const {
     data: predictUnrealizedPnL,
     isLoading: isPredictUnrealizedPnLLoading,
@@ -400,7 +387,6 @@ const usePredictPositionsSectionData = (homepageQueriesEnabled: boolean) => {
     isLoadingClaimable,
     handleClaim,
     hasPositions,
-    hasClaimablePositions,
     predictHomepageUnrealizedPnl,
   };
 };
@@ -441,7 +427,6 @@ const PredictionsSectionDefault = forwardRef<
       isLoadingClaimable,
       handleClaim,
       hasPositions,
-      hasClaimablePositions,
       predictHomepageUnrealizedPnl,
     } = usePredictPositionsSectionData(isPredictEnabled);
     const {
@@ -453,6 +438,8 @@ const PredictionsSectionDefault = forwardRef<
       enabled: isPredictEnabled,
     });
 
+    const hasClaimablePositions =
+      !isLoadingClaimable && totalClaimableValue > 0;
     const hasAnyPositions = hasPositions || hasClaimablePositions;
     const isLoading =
       isLoadingPositions || isLoadingMarkets || isLoadingClaimable;
@@ -526,7 +513,6 @@ const PredictionsSectionDefault = forwardRef<
           )}
           <HomepagePredictPositions
             title={title}
-            showHeader={!showTrendingAbove}
             onViewAll={handleViewAllFromPositions}
             privacyMode={privacyMode}
             isLoadingPositions={isLoadingPositions}
@@ -536,6 +522,7 @@ const PredictionsSectionDefault = forwardRef<
             predictHomepageUnrealizedPnl={predictHomepageUnrealizedPnl}
             onClaim={handleClaim}
             onPositionPress={handlePositionPress}
+            showHeader={!showTrendingAbove}
           />
         </View>
       );
@@ -593,10 +580,11 @@ const PredictionsSectionPositionsOnly = forwardRef<
       isLoadingClaimable,
       handleClaim,
       hasPositions,
-      hasClaimablePositions,
       predictHomepageUnrealizedPnl,
     } = usePredictPositionsSectionData(isPredictEnabled);
 
+    const hasClaimablePositions =
+      !isLoadingClaimable && totalClaimableValue > 0;
     const hasAnyPositions = hasPositions || hasClaimablePositions;
     const isLoading = isLoadingPositions || isLoadingClaimable;
     const willRender = isPredictEnabled && !isLoading && hasAnyPositions;
diff --git a/app/components/Views/Homepage/Sections/Predictions/components/PredictMarketCard.tsx b/app/components/Views/Homepage/Sections/Predictions/components/PredictMarketCard.tsx
index fcb2e5b8e92..f14c7a60822 100644
--- a/app/components/Views/Homepage/Sections/Predictions/components/PredictMarketCard.tsx
+++ b/app/components/Views/Homepage/Sections/Predictions/components/PredictMarketCard.tsx
@@ -6,7 +6,6 @@ import {
   Text,
   BoxFlexDirection,
   BoxAlignItems,
-  BoxJustifyContent,
   TextVariant,
   TextColor,
   FontWeight,
@@ -63,15 +62,14 @@ const OutcomeRow: React.FC<{
       </Box>
 
       {/* Outcome title - flex to fill space */}
-      <Box twClassName="flex-1">
-        <Text
-          variant={TextVariant.BodyMd}
-          color={TextColor.TextDefault}
-          numberOfLines={1}
-        >
-          {outcome.groupItemTitle || outcome.title}
-        </Text>
-      </Box>
+      <Text
+        variant={TextVariant.BodyMd}
+        color={TextColor.TextDefault}
+        numberOfLines={1}
+        twClassName="flex-1"
+      >
+        {outcome.groupItemTitle || outcome.title}
+      </Text>
 
       {/* Percentage */}
       <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
@@ -89,6 +87,7 @@ const PredictMarketCard: React.FC<PredictMarketCardProps> = ({
   market,
   transactionActiveAbTests,
 }) => {
+  const tw = useTailwind();
   const navigation =
     useNavigation<NavigationProp<PredictNavigationParamList>>();
 
@@ -129,29 +128,27 @@ const PredictMarketCard: React.FC<PredictMarketCardProps> = ({
   }, [market.outcomes]);
 
   return (
-    <TouchableOpacity onPress={handlePress}>
-      <Box
-        twClassName="w-[240px] rounded-2xl bg-background-muted flex-1"
-        padding={4}
-        gap={6}
-        justifyContent={BoxJustifyContent.Between}
+    <TouchableOpacity
+      onPress={handlePress}
+      style={tw.style(
+        'w-[240px] rounded-2xl bg-background-muted flex-1 p-4 gap-6 justify-between',
+      )}
+    >
+      {/* Header: Title */}
+      <Text
+        variant={TextVariant.BodyMd}
+        fontWeight={FontWeight.Medium}
+        color={TextColor.TextDefault}
+        numberOfLines={2}
       >
-        {/* Header: Title */}
-        <Text
-          variant={TextVariant.BodyMd}
-          fontWeight={FontWeight.Medium}
-          color={TextColor.TextDefault}
-          numberOfLines={2}
-        >
-          {market.title}
-        </Text>
+        {market.title}
+      </Text>
 
-        {/* Outcomes */}
-        <Box gap={2}>
-          {displayOutcomes.map((outcome) => (
-            <OutcomeRow key={outcome.id} outcome={outcome} />
-          ))}
-        </Box>
+      {/* Outcomes */}
+      <Box gap={2}>
+        {displayOutcomes.map((outcome) => (
+          <OutcomeRow key={outcome.id} outcome={outcome} />
+        ))}
       </Box>
     </TouchableOpacity>
   );
diff --git a/app/components/Views/Homepage/Sections/Predictions/components/PredictPositionRow.tsx b/app/components/Views/Homepage/Sections/Predictions/components/PredictPositionRow.tsx
index d48ae6e1754..86df547b532 100644
--- a/app/components/Views/Homepage/Sections/Predictions/components/PredictPositionRow.tsx
+++ b/app/components/Views/Homepage/Sections/Predictions/components/PredictPositionRow.tsx
@@ -6,8 +6,6 @@ import {
   Text,
   TextColor,
   TextVariant,
-  BoxFlexDirection,
-  BoxAlignItems,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { useTheme } from '../../../../../../util/theme';
@@ -57,65 +55,58 @@ export const PredictPositionRow = ({
       onPress={handlePress}
       accessibilityRole="button"
       accessibilityLabel={`${title} - ${outcome}`}
+      style={tw.style('flex-row items-start px-4 py-3 gap-4')}
     >
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Start}
-        paddingHorizontal={4}
-        paddingVertical={3}
-        gap={4}
-      >
-        {position.icon ? (
-          <Image
-            source={{ uri: position.icon }}
-            style={tw.style('w-10 h-10 rounded-lg mt-1')}
-          />
-        ) : (
-          <Box twClassName="w-10 h-10 rounded-lg mt-1 bg-background-alternative" />
-        )}
-        <Box style={tw.style('flex-1')} gap={0}>
-          <Text variant={TextVariant.BodyMd} color={TextColor.TextDefault}>
-            {title}
-          </Text>
-          <SensitiveText
-            variant={ComponentTextVariant.BodySMMedium}
-            color={ComponentTextColor.Alternative}
-            isHidden={privacyMode}
-            length={SensitiveTextLength.Long}
-            numberOfLines={1}
-          >
-            {strings('predict.position_info', {
-              initialValue: formatPrice(initialValue, {
-                maximumDecimals: 2,
-              }),
-              outcome,
-              shares: formatPrice(size, {
-                maximumDecimals: 2,
-              }),
-            })}
-          </SensitiveText>
-        </Box>
-        <Box twClassName="items-end" gap={0}>
-          <SensitiveText
-            variant={ComponentTextVariant.BodyMDMedium}
-            isHidden={privacyMode}
-            length={SensitiveTextLength.Short}
-          >
-            {formatPrice(currentValue, { maximumDecimals: 2 })}
-          </SensitiveText>
-          <SensitiveText
-            variant={ComponentTextVariant.BodySMMedium}
-            color={
-              percentPnl >= 0
-                ? ComponentTextColor.Success
-                : ComponentTextColor.Error
-            }
-            isHidden={privacyMode}
-            length={SensitiveTextLength.Short}
-          >
-            {formatPercentage(percentPnl)}
-          </SensitiveText>
-        </Box>
+      {position.icon ? (
+        <Image
+          source={{ uri: position.icon }}
+          style={tw.style('w-10 h-10 rounded-lg mt-1')}
+        />
+      ) : (
+        <Box twClassName="w-10 h-10 rounded-lg mt-1 bg-background-alternative" />
+      )}
+      <Box style={tw.style('flex-1')} gap={0}>
+        <Text variant={TextVariant.BodyMd} color={TextColor.TextDefault}>
+          {title}
+        </Text>
+        <SensitiveText
+          variant={ComponentTextVariant.BodySMMedium}
+          color={ComponentTextColor.Alternative}
+          isHidden={privacyMode}
+          length={SensitiveTextLength.Long}
+          numberOfLines={1}
+        >
+          {strings('predict.position_info', {
+            initialValue: formatPrice(initialValue, {
+              maximumDecimals: 2,
+            }),
+            outcome,
+            shares: formatPrice(size, {
+              maximumDecimals: 2,
+            }),
+          })}
+        </SensitiveText>
+      </Box>
+      <Box twClassName="items-end" gap={0}>
+        <SensitiveText
+          variant={ComponentTextVariant.BodyMDMedium}
+          isHidden={privacyMode}
+          length={SensitiveTextLength.Short}
+        >
+          {formatPrice(currentValue, { maximumDecimals: 2 })}
+        </SensitiveText>
+        <SensitiveText
+          variant={ComponentTextVariant.BodySMMedium}
+          color={
+            percentPnl >= 0
+              ? ComponentTextColor.Success
+              : ComponentTextColor.Error
+          }
+          isHidden={privacyMode}
+          length={SensitiveTextLength.Short}
+        >
+          {formatPercentage(percentPnl)}
+        </SensitiveText>
       </Box>
     </TouchableOpacity>
   );
diff --git a/app/components/Views/Homepage/Sections/Predictions/hooks/usePredictPositionsForHomepage.test.ts b/app/components/Views/Homepage/Sections/Predictions/hooks/usePredictPositionsForHomepage.test.ts
index b70836a0ed3..87a7e68db8f 100644
--- a/app/components/Views/Homepage/Sections/Predictions/hooks/usePredictPositionsForHomepage.test.ts
+++ b/app/components/Views/Homepage/Sections/Predictions/hooks/usePredictPositionsForHomepage.test.ts
@@ -3,6 +3,7 @@ import { usePredictPositionsForHomepage } from './usePredictPositionsForHomepage
 import type { PredictPosition } from '../../../../../UI/Predict/types';
 
 const mockRefetch = jest.fn().mockResolvedValue(undefined);
+const mockUsePredictPositions = jest.fn();
 let mockUsePredictPositionsReturn: {
   data: PredictPosition[] | undefined;
   isLoading: boolean;
@@ -16,7 +17,12 @@ let mockUsePredictPositionsReturn: {
 };
 
 jest.mock('../../../../../UI/Predict/hooks/usePredictPositions', () => ({
-  usePredictPositions: () => mockUsePredictPositionsReturn,
+  usePredictPositions: (
+    ...args: Parameters<typeof mockUsePredictPositions>
+  ) => {
+    mockUsePredictPositions(...args);
+    return mockUsePredictPositionsReturn;
+  },
 }));
 
 const createMockPosition = (id: string, currentValue = 12): PredictPosition =>
@@ -36,6 +42,7 @@ const createMockPosition = (id: string, currentValue = 12): PredictPosition =>
 describe('usePredictPositionsForHomepage', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUsePredictPositions.mockClear();
     mockUsePredictPositionsReturn = {
       data: [
         createMockPosition('1'),
@@ -157,6 +164,28 @@ describe('usePredictPositionsForHomepage', () => {
       expect(result.current.totalClaimableValue).toBe(0);
     });
 
+    it('enables live updates for active positions', () => {
+      renderHook(() => usePredictPositionsForHomepage({ claimable: false }));
+
+      expect(mockUsePredictPositions).toHaveBeenCalledWith(
+        expect.objectContaining({
+          claimable: false,
+          livePriceUpdates: true,
+        }),
+      );
+    });
+
+    it('disables live updates for claimable positions', () => {
+      renderHook(() => usePredictPositionsForHomepage({ claimable: true }));
+
+      expect(mockUsePredictPositions).toHaveBeenCalledWith(
+        expect.objectContaining({
+          claimable: true,
+          livePriceUpdates: false,
+        }),
+      );
+    });
+
     it('treats undefined currentValue as 0 in totalClaimableValue sum', () => {
       mockUsePredictPositionsReturn.data = [
         {
diff --git a/app/components/Views/Homepage/Sections/Predictions/hooks/usePredictPositionsForHomepage.ts b/app/components/Views/Homepage/Sections/Predictions/hooks/usePredictPositionsForHomepage.ts
index 8b47633ad2b..2967e5343d0 100644
--- a/app/components/Views/Homepage/Sections/Predictions/hooks/usePredictPositionsForHomepage.ts
+++ b/app/components/Views/Homepage/Sections/Predictions/hooks/usePredictPositionsForHomepage.ts
@@ -32,6 +32,7 @@ export const usePredictPositionsForHomepage = (
   const { data, isLoading, error, refetch } = usePredictPositions({
     claimable,
     enabled,
+    livePriceUpdates: !claimable,
   });
 
   const allPositions = useMemo(() => data ?? [], [data]);
diff --git a/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.test.tsx b/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.test.tsx
index ff4289db332..17168682b60 100644
--- a/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.test.tsx
+++ b/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.test.tsx
@@ -23,7 +23,8 @@ const mockTraders = [
 const mockUseTopTraders = jest.fn((_options?: unknown) => ({
   traders: mockTraders,
   isLoading: false,
-  error: null,
+  isFetching: false,
+  error: null as string | null,
   refresh: mockRefetch,
   toggleFollow: jest.fn(),
 }));
@@ -75,6 +76,7 @@ describe('TopTradersSection', () => {
     mockUseTopTraders.mockReturnValue({
       traders: mockTraders,
       isLoading: false,
+      isFetching: false,
       error: null,
       refresh: mockRefetch,
       toggleFollow: jest.fn(),
@@ -85,6 +87,7 @@ describe('TopTradersSection', () => {
     mockUseTopTraders.mockReturnValue({
       traders: [],
       isLoading: false,
+      isFetching: false,
       error: null,
       refresh: mockRefetch,
       toggleFollow: jest.fn(),
@@ -97,6 +100,7 @@ describe('TopTradersSection', () => {
     mockUseTopTraders.mockReturnValue({
       traders: [],
       isLoading: true,
+      isFetching: true,
       error: null,
       refresh: mockRefetch,
       toggleFollow: jest.fn(),
@@ -139,6 +143,86 @@ describe('TopTradersSection', () => {
     );
   });
 
+  it('renders the error state instead of the carousel when the fetch fails', () => {
+    mockUseTopTraders.mockReturnValue({
+      traders: [],
+      isLoading: false,
+      isFetching: false,
+      error: 'Network error',
+      refresh: mockRefetch,
+      toggleFollow: jest.fn(),
+    });
+    renderWithProvider(<TopTradersSection {...defaultProps} />);
+
+    expect(screen.queryByTestId('homepage-top-traders-carousel')).toBeNull();
+    expect(
+      screen.getByTestId('homepage-top-traders-section-root'),
+    ).toBeOnTheScreen();
+  });
+
+  it('calls refresh when the retry button in the error state is pressed', async () => {
+    mockUseTopTraders.mockReturnValue({
+      traders: [],
+      isLoading: false,
+      isFetching: false,
+      error: 'Network error',
+      refresh: mockRefetch,
+      toggleFollow: jest.fn(),
+    });
+    renderWithProvider(<TopTradersSection {...defaultProps} />);
+
+    fireEvent.press(screen.getByText('Retry'));
+
+    expect(mockRefetch).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders skeletons instead of error state while a retry is in flight', () => {
+    mockUseTopTraders.mockReturnValue({
+      traders: [],
+      isLoading: false,
+      isFetching: true,
+      error: 'Network error',
+      refresh: mockRefetch,
+      toggleFollow: jest.fn(),
+    });
+    renderWithProvider(<TopTradersSection {...defaultProps} />);
+
+    expect(
+      screen.getByTestId('homepage-top-traders-carousel'),
+    ).toBeOnTheScreen();
+    expect(screen.queryByText('Retry')).toBeNull();
+  });
+
+  it('keeps cached traders visible when a background refetch fails', () => {
+    mockUseTopTraders.mockReturnValue({
+      traders: mockTraders,
+      isLoading: false,
+      isFetching: false,
+      error: 'Network error',
+      refresh: mockRefetch,
+      toggleFollow: jest.fn(),
+    });
+    renderWithProvider(<TopTradersSection {...defaultProps} />);
+
+    expect(screen.getByTestId('top-trader-card-trader-1')).toBeOnTheScreen();
+    expect(screen.queryByText('Retry')).toBeNull();
+  });
+
+  it('keeps cached traders and ViewMoreCard visible during a background refetch', () => {
+    mockUseTopTraders.mockReturnValue({
+      traders: mockTraders,
+      isLoading: false,
+      isFetching: true,
+      error: null,
+      refresh: mockRefetch,
+      toggleFollow: jest.fn(),
+    });
+    renderWithProvider(<TopTradersSection {...defaultProps} />);
+
+    expect(screen.getByTestId('top-trader-card-trader-1')).toBeOnTheScreen();
+    expect(screen.getByTestId('top-traders-view-more-card')).toBeOnTheScreen();
+  });
+
   it('exposes refresh via ref and resolves when called', async () => {
     const ref = createRef<SectionRefreshHandle>();
     renderWithProvider(<TopTradersSection ref={ref} {...defaultProps} />);
diff --git a/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.tsx b/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.tsx
index d648184236e..e1005c6c2ac 100644
--- a/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.tsx
+++ b/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.tsx
@@ -16,6 +16,7 @@ import SectionHeader from '../../../../../component-library/components-temp/Sect
 import Routes from '../../../../../constants/navigation/Routes';
 import type { RootStackParamList } from '../../../../../core/NavigationService/types';
 import { selectSocialLeaderboardEnabled } from '../../../../../selectors/featureFlagController/socialLeaderboard';
+import ErrorState from '../../components/ErrorState';
 import ViewMoreCard from '../../components/ViewMoreCard';
 import useHomeViewedEvent, {
   HomeSectionNames,
@@ -25,6 +26,7 @@ import { SectionRefreshHandle } from '../../types';
 import { TopTraderCard, TopTraderCardSkeleton } from './components';
 import { TOP_TRADER_CARD_WIDTH } from './components/TopTraderCard';
 import { useTopTraders } from './hooks';
+import { WalletViewSelectorsIDs } from '../../../Wallet/WalletView.testIds';
 
 const HOME_TRADER_LIMIT = 10;
 const SKELETON_KEYS = Array.from(
@@ -54,10 +56,11 @@ const TopTradersSection = forwardRef<
   const isEnabled = useSelector(selectSocialLeaderboardEnabled);
   const title = strings('homepage.sections.top_traders');
 
-  const { traders, isLoading, refresh, toggleFollow } = useTopTraders({
-    limit: HOME_TRADER_LIMIT,
-    enabled: isEnabled,
-  });
+  const { traders, isLoading, isFetching, error, refresh, toggleFollow } =
+    useTopTraders({
+      limit: HOME_TRADER_LIMIT,
+      enabled: isEnabled,
+    });
 
   useImperativeHandle(
     ref,
@@ -67,8 +70,14 @@ const TopTradersSection = forwardRef<
     [refresh],
   );
 
+  const isInFlight = isLoading || isFetching;
+  const hasTraders = traders.length > 0;
+  const hasError = Boolean(error);
+  const showError = hasError && !isFetching && !hasTraders;
+  const willRender = isEnabled && (isInFlight || hasError || hasTraders);
+
   const { onLayout } = useHomeViewedEvent({
-    sectionRef: sectionViewRef,
+    sectionRef: willRender ? sectionViewRef : null,
     isLoading,
     sectionName: HomeSectionNames.TOP_TRADERS,
     sectionIndex,
@@ -79,12 +88,23 @@ const TopTradersSection = forwardRef<
 
   useSectionPerformance({
     sectionId: HomeSectionNames.TOP_TRADERS,
-    contentReady: !isLoading && traders.length > 0,
-    isEmpty: !isLoading && traders.length === 0,
+    contentReady: !isLoading && hasTraders,
+    // Exclude error renders from the empty bucket so Sentry doesn't conflate
+    // visible error states (which render the retry UI) with truly empty
+    // sections. Without this, a fetch error with no cached traders would be
+    // reported as `content_state: 'empty'`.
+    isEmpty: !isLoading && !hasError && !hasTraders,
     isLoading,
-    enabled: isEnabled,
+    // Disable telemetry once we render the error UI so the in-flight TTC and
+    // data-fetch spans get closed via the hook's cleanup instead of remaining
+    // open until the user navigates away.
+    enabled: isEnabled && !showError,
   });
 
+  const showSkeletons = isInFlight && !hasTraders;
+  const showViewMore = hasTraders;
+  const isEmpty = !isInFlight && !hasError && !hasTraders;
+
   const handleViewAll = useCallback(() => {
     navigation.navigate(Routes.SOCIAL_LEADERBOARD.VIEW);
   }, [navigation]);
@@ -100,10 +120,30 @@ const TopTradersSection = forwardRef<
     [navigation],
   );
 
-  if (!isEnabled || (!isLoading && traders.length === 0)) {
+  if (!isEnabled || isEmpty) {
     return null;
   }
 
+  if (showError) {
+    return (
+      <View
+        ref={sectionViewRef}
+        onLayout={onLayout}
+        testID="homepage-top-traders-section-root"
+      >
+        <Box gap={3}>
+          <SectionHeader title={title} onPress={handleViewAll} />
+          <ErrorState
+            title={strings('homepage.error.unable_to_load', {
+              section: title.toLowerCase(),
+            })}
+            onRetry={refresh}
+          />
+        </Box>
+      </View>
+    );
+  }
+
   return (
     <View
       ref={sectionViewRef}
@@ -111,7 +151,11 @@ const TopTradersSection = forwardRef<
       testID="homepage-top-traders-section-root"
     >
       <Box gap={3}>
-        <SectionHeader title={title} onPress={handleViewAll} />
+        <SectionHeader
+          title={title}
+          onPress={handleViewAll}
+          testID={WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('top-traders')}
+        />
 
         <ScrollView
           horizontal
@@ -119,7 +163,7 @@ const TopTradersSection = forwardRef<
           contentContainerStyle={tw.style('px-4 gap-3 pb-2')}
           testID="homepage-top-traders-carousel"
         >
-          {isLoading
+          {showSkeletons
             ? SKELETON_KEYS.map((key) => <TopTraderCardSkeleton key={key} />)
             : traders.map((trader) => (
                 <TopTraderCard
@@ -129,7 +173,7 @@ const TopTradersSection = forwardRef<
                   onTraderPress={handleTraderPress}
                 />
               ))}
-          {!isLoading && traders.length > 0 && (
+          {showViewMore && (
             <ViewMoreCard
               onPress={handleViewAll}
               twClassName={`w-[${TOP_TRADER_CARD_WIDTH}px] h-auto`}
diff --git a/app/components/Views/Homepage/Sections/TopTraders/hooks/useTopTraders.test.ts b/app/components/Views/Homepage/Sections/TopTraders/hooks/useTopTraders.test.ts
index 6e20e96d753..62ef166f621 100644
--- a/app/components/Views/Homepage/Sections/TopTraders/hooks/useTopTraders.test.ts
+++ b/app/components/Views/Homepage/Sections/TopTraders/hooks/useTopTraders.test.ts
@@ -1,12 +1,18 @@
 import { renderHook, act } from '@testing-library/react-native';
 import { useSelector } from 'react-redux';
 import { useQuery } from '@metamask/react-data-query';
+import { addBreadcrumb } from '@sentry/react-native';
 import Engine from '../../../../../../core/Engine';
 import Logger from '../../../../../../util/Logger';
+import { selectIsUnlocked } from '../../../../../../selectors/keyringController';
 import { useTopTraders } from './useTopTraders';
 
 jest.mock('react-redux', () => ({
-  useSelector: jest.fn().mockReturnValue([]),
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../../../../selectors/keyringController', () => ({
+  selectIsUnlocked: jest.fn(),
 }));
 
 jest.mock('../../../../../../selectors/socialController', () => ({
@@ -59,6 +65,12 @@ const mockLeaderboardResponse = { traders: mockTraders };
 
 jest.mock('@metamask/react-data-query');
 
+jest.mock('@sentry/react-native', () => ({
+  addBreadcrumb: jest.fn(),
+}));
+
+const mockAddBreadcrumb = addBreadcrumb as jest.Mock;
+
 const mockRefetch = jest.fn();
 const mockUseQuery = useQuery as jest.MockedFunction<typeof useQuery>;
 const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
@@ -69,6 +81,7 @@ const makeQueryResult = (
   ({
     data: undefined,
     isLoading: false,
+    isFetching: false,
     error: null,
     refetch: mockRefetch,
     ...overrides,
@@ -78,7 +91,11 @@ describe('useTopTraders', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockUseQuery.mockReturnValue(makeQueryResult());
-    mockUseSelector.mockReturnValue([]);
+    mockAddBreadcrumb.mockClear();
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectIsUnlocked) return true;
+      return []; // default for other selectors (e.g. selectFollowingProfileIds)
+    });
   });
 
   describe('data mapping', () => {
@@ -155,13 +172,17 @@ describe('useTopTraders', () => {
       expect(result.current.error).toBe('Network error');
     });
 
-    it('logs the full error object via Logger.error', () => {
+    it('logs the full error object via Logger.error with enriched extras', () => {
       const err = new Error('Network error');
       mockUseQuery.mockReturnValue(makeQueryResult({ error: err }));
       renderHook(() => useTopTraders());
       expect(Logger.error).toHaveBeenCalledWith(
         err,
-        'useTopTraders: leaderboard fetch failed',
+        expect.objectContaining({
+          message: 'useTopTraders: leaderboard fetch failed',
+          endpoint: 'leaderboard',
+          errorCategory: expect.any(String),
+        }),
       );
     });
 
@@ -181,7 +202,10 @@ describe('useTopTraders', () => {
 
   describe('isFollowing seeding from controller state', () => {
     it('seeds isFollowing true for traders present in followingProfileIds', () => {
-      mockUseSelector.mockReturnValue([mockTraders[0].profileId]);
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectIsUnlocked) return true;
+        return [mockTraders[0].profileId];
+      });
       mockUseQuery.mockReturnValue(
         makeQueryResult({ data: mockLeaderboardResponse as never }),
       );
@@ -216,7 +240,10 @@ describe('useTopTraders', () => {
     });
 
     it('calls unfollowTrader when trader is already followed', async () => {
-      mockUseSelector.mockReturnValue([mockTraders[0].profileId]);
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectIsUnlocked) return true;
+        return [mockTraders[0].profileId];
+      });
       const { result } = renderHook(() => useTopTraders());
 
       await act(async () => {
@@ -316,11 +343,49 @@ describe('useTopTraders', () => {
 
       expect(Logger.error).toHaveBeenCalledWith(
         err,
-        'useTopTraders: refresh failed',
+        expect.objectContaining({
+          message: 'useTopTraders: refresh failed',
+          endpoint: 'leaderboard',
+          errorCategory: expect.any(String),
+        }),
       );
     });
   });
 
+  describe('breadcrumbs', () => {
+    it('emits a failure breadcrumb when an error is set', () => {
+      const err = new Error('fetch failed');
+      mockUseQuery.mockReturnValue(makeQueryResult({ error: err }));
+      renderHook(() => useTopTraders());
+      expect(mockAddBreadcrumb).toHaveBeenCalledWith(
+        expect.objectContaining({
+          category: 'social_service',
+          level: 'error',
+          message: expect.stringContaining(
+            'social_service.leaderboard.failure',
+          ),
+        }),
+      );
+    });
+
+    it('includes httpStatus in the failure breadcrumb for HttpError', () => {
+      const err = Object.assign(new Error('Unauthorized'), { httpStatus: 401 });
+      mockUseQuery.mockReturnValue(makeQueryResult({ error: err }));
+      renderHook(() => useTopTraders());
+      expect(mockAddBreadcrumb.mock.calls[0][0].message).toContain(
+        'status=401',
+      );
+    });
+
+    it('does not emit a breadcrumb when there is no error', () => {
+      mockUseQuery.mockReturnValue(
+        makeQueryResult({ data: mockLeaderboardResponse as never }),
+      );
+      renderHook(() => useTopTraders());
+      expect(mockAddBreadcrumb).not.toHaveBeenCalled();
+    });
+  });
+
   describe('options', () => {
     it('includes limit in the query key when provided', () => {
       renderHook(() => useTopTraders({ limit: 5 }));
@@ -342,7 +407,7 @@ describe('useTopTraders', () => {
       );
     });
 
-    it('defaults enabled to true when the option is not provided', () => {
+    it('defaults enabled to true when the option is not provided and wallet is unlocked', () => {
       renderHook(() => useTopTraders());
 
       expect(mockUseQuery).toHaveBeenCalledWith(
@@ -350,6 +415,18 @@ describe('useTopTraders', () => {
       );
     });
 
+    it('is disabled when wallet is locked even if enabled option is true', () => {
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectIsUnlocked) return false;
+        return [];
+      });
+      renderHook(() => useTopTraders({ enabled: true }));
+
+      expect(mockUseQuery).toHaveBeenCalledWith(
+        expect.objectContaining({ enabled: false }),
+      );
+    });
+
     it('forwards enabled: false to useQuery to prevent the API call', () => {
       renderHook(() => useTopTraders({ enabled: false }));
 
@@ -358,7 +435,7 @@ describe('useTopTraders', () => {
       );
     });
 
-    it('forwards enabled: true to useQuery when explicitly set', () => {
+    it('forwards enabled: true to useQuery when explicitly set and wallet is unlocked', () => {
       renderHook(() => useTopTraders({ enabled: true }));
 
       expect(mockUseQuery).toHaveBeenCalledWith(
diff --git a/app/components/Views/Homepage/Sections/TopTraders/hooks/useTopTraders.ts b/app/components/Views/Homepage/Sections/TopTraders/hooks/useTopTraders.ts
index ef75a98c924..51effe0f10a 100644
--- a/app/components/Views/Homepage/Sections/TopTraders/hooks/useTopTraders.ts
+++ b/app/components/Views/Homepage/Sections/TopTraders/hooks/useTopTraders.ts
@@ -1,4 +1,5 @@
 import { useMemo, useCallback, useEffect } from 'react';
+import { useSelector } from 'react-redux';
 import { useQuery } from '@metamask/react-data-query';
 import type {
   LeaderboardResponse,
@@ -6,11 +7,19 @@ import type {
 } from '@metamask/social-controllers';
 import Logger from '../../../../../../util/Logger';
 import { useFollowToggleMany } from '../../../../../hooks/useFollowToggle';
+import { selectIsUnlocked } from '../../../../../../selectors/keyringController';
 import type { TopTrader } from '../types';
+import {
+  addSocialBreadcrumb,
+  buildSocialErrorExtras,
+  categoriseSocialError,
+  extractHttpStatus,
+} from '../../../../../../util/social/socialServiceTelemetry';
 
 export interface UseTopTradersResult {
   traders: TopTrader[];
   isLoading: boolean;
+  isFetching: boolean;
   error: string | null;
   refresh: () => Promise<void>;
   toggleFollow: (addressOrId: string) => void;
@@ -24,6 +33,8 @@ interface UseTopTradersOptions {
 export const useTopTraders = (
   options?: UseTopTradersOptions,
 ): UseTopTradersResult => {
+  const isUnlocked = useSelector(selectIsUnlocked);
+
   const fetchOptions: FetchLeaderboardOptions | null = options?.limit
     ? { limit: options.limit }
     : null;
@@ -33,10 +44,11 @@ export const useTopTraders = (
     fetchOptions,
   ];
 
-  const { data, isLoading, error, refetch } = useQuery<LeaderboardResponse>({
-    queryKey,
-    enabled: options?.enabled ?? true,
-  });
+  const { data, isLoading, isFetching, error, refetch } =
+    useQuery<LeaderboardResponse>({
+      queryKey,
+      enabled: (options?.enabled ?? true) && isUnlocked,
+    });
 
   const { isFollowing, toggleFollow } = useFollowToggleMany();
 
@@ -62,20 +74,43 @@ export const useTopTraders = (
     try {
       await refetch();
     } catch (err) {
-      Logger.error(err as Error, 'useTopTraders: refresh failed');
+      Logger.error(
+        err as Error,
+        buildSocialErrorExtras({
+          legacyMessage: 'useTopTraders: refresh failed',
+          endpoint: 'leaderboard',
+          error: err,
+          queryParams: { limit: options?.limit ?? 0 },
+        }),
+      );
       throw err;
     }
-  }, [refetch]);
+  }, [refetch, options?.limit]);
 
   useEffect(() => {
     if (error) {
-      Logger.error(error as Error, 'useTopTraders: leaderboard fetch failed');
+      Logger.error(
+        error as Error,
+        buildSocialErrorExtras({
+          legacyMessage: 'useTopTraders: leaderboard fetch failed',
+          endpoint: 'leaderboard',
+          error,
+          queryParams: { limit: options?.limit ?? 0 },
+        }),
+      );
+      addSocialBreadcrumb({
+        endpoint: 'leaderboard',
+        errorCategory: categoriseSocialError(error),
+        httpStatus: extractHttpStatus(error),
+        queryParams: { limit: options?.limit ?? 0 },
+      });
     }
-  }, [error]);
+  }, [error, options?.limit]);
 
   return {
     traders,
     isLoading,
+    isFetching,
     error:
       error instanceof Error ? error.message : error ? String(error) : null,
     refresh,
diff --git a/app/components/Views/Homepage/Sections/WhatsHappening/WhatsHappeningSection.test.tsx b/app/components/Views/Homepage/Sections/WhatsHappening/WhatsHappeningSection.test.tsx
index ebaaa55c4a1..06c51c82086 100644
--- a/app/components/Views/Homepage/Sections/WhatsHappening/WhatsHappeningSection.test.tsx
+++ b/app/components/Views/Homepage/Sections/WhatsHappening/WhatsHappeningSection.test.tsx
@@ -3,8 +3,16 @@ import { screen, fireEvent } from '@testing-library/react-native';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import WhatsHappeningSection from './WhatsHappeningSection';
 import Routes from '../../../../../constants/navigation/Routes';
+import { MetaMetricsEvents } from '../../../../../core/Analytics/MetaMetrics.events';
 
 const mockNavigate = jest.fn();
+const mockTrackEvent = jest.fn();
+const mockCreateEventBuilder = jest.fn((eventName: string) => ({
+  addProperties: jest.fn((properties: Record<string, unknown>) => ({
+    build: jest.fn(() => ({ category: eventName, properties })),
+  })),
+  build: jest.fn(() => ({ category: eventName })),
+}));
 
 jest.mock('@react-navigation/native', () => {
   const actual = jest.requireActual('@react-navigation/native');
@@ -30,6 +38,13 @@ jest.mock('./hooks', () => ({
   })),
 }));
 
+jest.mock('../../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  }),
+}));
+
 const mockUseWhatsHappening = jest.requireMock('./hooks').useWhatsHappening;
 const mockSelectWhatsHappeningEnabled = jest.requireMock(
   '../../../../../selectors/featureFlagController/whatsHappening',
@@ -138,10 +153,9 @@ describe('WhatsHappeningSection', () => {
     });
     renderWithProvider(<WhatsHappeningSection {...defaultProps} />);
     fireEvent.press(screen.getByText(mockItem.title));
-    expect(mockNavigate).toHaveBeenCalledWith(
-      Routes.WHATS_HAPPENING_DETAIL,
-      expect.objectContaining({ items: [mockItem], initialIndex: 0 }),
-    );
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.WHATS_HAPPENING_DETAIL, {
+      initialIndex: 0,
+    });
   });
 
   it('navigates to detail view at index 0 when ViewMore card is pressed', () => {
@@ -153,10 +167,9 @@ describe('WhatsHappeningSection', () => {
     });
     renderWithProvider(<WhatsHappeningSection {...defaultProps} />);
     fireEvent.press(screen.getByText(/view more/i));
-    expect(mockNavigate).toHaveBeenCalledWith(
-      Routes.WHATS_HAPPENING_DETAIL,
-      expect.objectContaining({ items: [mockItem], initialIndex: 0 }),
-    );
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.WHATS_HAPPENING_DETAIL, {
+      initialIndex: 0,
+    });
   });
 
   it('navigates with correct index when second card is pressed', () => {
@@ -173,11 +186,53 @@ describe('WhatsHappeningSection', () => {
     });
     renderWithProvider(<WhatsHappeningSection {...defaultProps} />);
     fireEvent.press(screen.getByText(secondItem.title));
-    expect(mockNavigate).toHaveBeenCalledWith(
-      Routes.WHATS_HAPPENING_DETAIL,
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.WHATS_HAPPENING_DETAIL, {
+      initialIndex: 1,
+    });
+  });
+
+  it('tracks Whats Happening Opened with entry_point=card when a card is pressed', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem],
+      isLoading: false,
+      error: null,
+      refresh: jest.fn(),
+    });
+    renderWithProvider(<WhatsHappeningSection {...defaultProps} />);
+    fireEvent.press(screen.getByText(mockItem.title));
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.WHATS_HAPPENING_OPENED,
+    );
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        category: MetaMetricsEvents.WHATS_HAPPENING_OPENED,
+        properties: expect.objectContaining({
+          entry_point: 'card',
+          event_id: mockItem.id,
+          card_index: 0,
+          category: 'macro',
+          impact: 'positive',
+          asset_symbols: [],
+        }),
+      }),
+    );
+  });
+
+  it('tracks Whats Happening Opened with entry_point=view_all when View More is pressed', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem],
+      isLoading: false,
+      error: null,
+      refresh: jest.fn(),
+    });
+    renderWithProvider(<WhatsHappeningSection {...defaultProps} />);
+    fireEvent.press(screen.getByText(/view more/i));
+    expect(mockTrackEvent).toHaveBeenCalledWith(
       expect.objectContaining({
-        items: [mockItem, secondItem],
-        initialIndex: 1,
+        category: MetaMetricsEvents.WHATS_HAPPENING_OPENED,
+        properties: expect.objectContaining({
+          entry_point: 'view_all',
+        }),
       }),
     );
   });
diff --git a/app/components/Views/Homepage/Sections/WhatsHappening/WhatsHappeningSection.tsx b/app/components/Views/Homepage/Sections/WhatsHappening/WhatsHappeningSection.tsx
index cd2bc79285c..1a2507d663e 100644
--- a/app/components/Views/Homepage/Sections/WhatsHappening/WhatsHappeningSection.tsx
+++ b/app/components/Views/Homepage/Sections/WhatsHappening/WhatsHappeningSection.tsx
@@ -4,11 +4,11 @@ import React, {
   useImperativeHandle,
   useRef,
 } from 'react';
-import { ScrollView, View } from 'react-native';
+import { ScrollView, StyleSheet, View } from 'react-native';
 import { useSelector } from 'react-redux';
 import { useNavigation } from '@react-navigation/native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import { Box, TextVariant } from '@metamask/design-system-react-native';
+import { TextVariant } from '@metamask/design-system-react-native';
 import SectionHeader from '../../../../../component-library/components-temp/SectionHeader';
 import ErrorState from '../../components/ErrorState';
 import ViewMoreCard from '../../components/ViewMoreCard';
@@ -16,14 +16,17 @@ import { SectionRefreshHandle } from '../../types';
 import { selectWhatsHappeningEnabled } from '../../../../../selectors/featureFlagController/whatsHappening';
 import { strings } from '../../../../../../locales/i18n';
 import Routes from '../../../../../constants/navigation/Routes';
+import { MAX_ITEMS_DISPLAYED, WhatsHappeningEntryPoint } from './constants';
 import { useWhatsHappening } from './hooks';
 import { WhatsHappeningCard, WhatsHappeningCardSkeleton } from './components';
 import useHomeViewedEvent, {
   HomeSectionNames,
 } from '../../hooks/useHomeViewedEvent';
 import { useSectionPerformance } from '../../hooks/useSectionPerformance';
-
-const MAX_ITEMS_DISPLAYED = 5;
+import { WalletViewSelectorsIDs } from '../../../Wallet/WalletView.testIds';
+import { MetaMetricsEvents } from '../../../../../core/Analytics';
+import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
+import { getWhatsHappeningEventProps } from './eventProperties';
 
 const CARD_WIDTH = 280;
 const GAP = 12;
@@ -38,6 +41,10 @@ const SKELETON_KEYS = Array.from(
   (__, i) => `skeleton-${i}`,
 );
 
+const styles = StyleSheet.create({
+  sectionGap: { gap: 12 },
+});
+
 interface WhatsHappeningSectionProps {
   sectionIndex: number;
   totalSectionsLoaded: number;
@@ -52,6 +59,7 @@ const WhatsHappeningSection = forwardRef<
   const navigation = useNavigation();
   const isEnabled = useSelector(selectWhatsHappeningEnabled);
   const title = strings('homepage.sections.whats_happening');
+  const { trackEvent, createEventBuilder } = useAnalytics();
 
   const { items, isLoading, error, refresh } =
     useWhatsHappening(MAX_ITEMS_DISPLAYED);
@@ -86,25 +94,38 @@ const WhatsHappeningSection = forwardRef<
 
   const navigateToDetail = useCallback(
     (initialIndex: number) => {
-      // TODO: When WhatsHappeningDetailView is implemented, pass only { initialIndex } — the
-      // detail screen should call useWhatsHappening(); AiDigestController caches the response.
       navigation.navigate(Routes.WHATS_HAPPENING_DETAIL, {
-        items,
         initialIndex,
       });
     },
-    [navigation, items],
+    [navigation],
   );
 
   const handleViewAll = useCallback(() => {
+    trackEvent(
+      createEventBuilder(MetaMetricsEvents.WHATS_HAPPENING_OPENED)
+        .addProperties({ entry_point: WhatsHappeningEntryPoint.ViewAll })
+        .build(),
+    );
     navigateToDetail(0);
-  }, [navigateToDetail]);
+  }, [navigateToDetail, trackEvent, createEventBuilder]);
 
   const handleCardPress = useCallback(
     (index: number) => {
+      const item = items[index];
+      if (item) {
+        trackEvent(
+          createEventBuilder(MetaMetricsEvents.WHATS_HAPPENING_OPENED)
+            .addProperties({
+              ...getWhatsHappeningEventProps(item, index),
+              entry_point: WhatsHappeningEntryPoint.Card,
+            })
+            .build(),
+        );
+      }
       navigateToDetail(index);
     },
-    [navigateToDetail],
+    [items, navigateToDetail, trackEvent, createEventBuilder],
   );
 
   if (!isEnabled) {
@@ -113,16 +134,20 @@ const WhatsHappeningSection = forwardRef<
 
   if (hasError) {
     return (
-      <View ref={sectionViewRef} onLayout={onLayout}>
-        <Box gap={3}>
-          <SectionHeader title={title} onPress={handleViewAll} />
-          <ErrorState
-            title={strings('homepage.error.unable_to_load', {
-              section: title.toLowerCase(),
-            })}
-            onRetry={refresh}
-          />
-        </Box>
+      <View ref={sectionViewRef} onLayout={onLayout} style={styles.sectionGap}>
+        <SectionHeader
+          title={title}
+          onPress={handleViewAll}
+          testID={WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE(
+            'whats-happening',
+          )}
+        />
+        <ErrorState
+          title={strings('homepage.error.unable_to_load', {
+            section: title.toLowerCase(),
+          })}
+          onRetry={refresh}
+        />
       </View>
     );
   }
@@ -132,37 +157,42 @@ const WhatsHappeningSection = forwardRef<
   }
 
   return (
-    <View ref={sectionViewRef} onLayout={onLayout}>
-      <Box gap={3}>
-        <SectionHeader title={title} onPress={handleViewAll} />
-        <ScrollView
-          horizontal
-          showsHorizontalScrollIndicator={false}
-          contentContainerStyle={tw.style('px-4 gap-3')}
-          snapToOffsets={SNAP_OFFSETS}
-          decelerationRate="fast"
-          testID="homepage-whats-happening-carousel"
-        >
-          {isLoading ? (
-            SKELETON_KEYS.map((key) => <WhatsHappeningCardSkeleton key={key} />)
-          ) : (
-            <>
-              {items.map((item, index) => (
-                <WhatsHappeningCard
-                  key={item.id}
-                  item={item}
-                  onPress={() => handleCardPress(index)}
-                />
-              ))}
-              <ViewMoreCard
-                onPress={handleViewAll}
-                twClassName="w-[180px] h-[248px]"
-                textVariant={TextVariant.BodyLg}
+    <View ref={sectionViewRef} onLayout={onLayout} style={styles.sectionGap}>
+      <SectionHeader
+        title={title}
+        onPress={handleViewAll}
+        testID={WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE(
+          'whats-happening',
+        )}
+      />
+      <ScrollView
+        horizontal
+        showsHorizontalScrollIndicator={false}
+        contentContainerStyle={tw.style('px-4 gap-3')}
+        snapToOffsets={SNAP_OFFSETS}
+        decelerationRate="fast"
+        testID="homepage-whats-happening-carousel"
+      >
+        {isLoading ? (
+          SKELETON_KEYS.map((key) => <WhatsHappeningCardSkeleton key={key} />)
+        ) : (
+          <>
+            {items.map((item, index) => (
+              <WhatsHappeningCard
+                key={item.id}
+                item={item}
+                cardIndex={index}
+                onPress={() => handleCardPress(index)}
               />
-            </>
-          )}
-        </ScrollView>
-      </Box>
+            ))}
+            <ViewMoreCard
+              onPress={handleViewAll}
+              twClassName="w-[180px] h-[254px]"
+              textVariant={TextVariant.BodyLg}
+            />
+          </>
+        )}
+      </ScrollView>
     </View>
   );
 });
diff --git a/app/components/Views/Homepage/Sections/WhatsHappening/components/WhatsHappeningCard.test.tsx b/app/components/Views/Homepage/Sections/WhatsHappening/components/WhatsHappeningCard.test.tsx
index 5f650f5c8d3..ab46f9cd626 100644
--- a/app/components/Views/Homepage/Sections/WhatsHappening/components/WhatsHappeningCard.test.tsx
+++ b/app/components/Views/Homepage/Sections/WhatsHappening/components/WhatsHappeningCard.test.tsx
@@ -3,6 +3,30 @@ import { screen, fireEvent } from '@testing-library/react-native';
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import WhatsHappeningCard from './WhatsHappeningCard';
 import type { WhatsHappeningItem } from '../types';
+import { MetaMetricsEvents } from '../../../../../../core/Analytics/MetaMetrics.events';
+
+const mockTrackEvent = jest.fn();
+const mockCreateEventBuilder = jest.fn((eventName: string) => ({
+  addProperties: jest.fn((properties: Record<string, unknown>) => ({
+    build: jest.fn(() => ({ category: eventName, properties })),
+  })),
+  build: jest.fn(() => ({ category: eventName })),
+}));
+
+let capturedOnVisible: (() => void) | null = null;
+jest.mock('../../../../../UI/MarketInsights/hooks/useViewportTracking', () => ({
+  useViewportTracking: (onVisible: () => void) => {
+    capturedOnVisible = onVisible;
+    return { ref: { current: null }, onLayout: jest.fn() };
+  },
+}));
+
+jest.mock('../../../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  }),
+}));
 
 const mockRelatedAsset = {
   sourceAssetId: 'btc-mainnet',
@@ -23,31 +47,68 @@ const baseItem: WhatsHappeningItem = {
 };
 
 describe('WhatsHappeningCard', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    capturedOnVisible = null;
+  });
+
   it('renders title and description', () => {
-    renderWithProvider(<WhatsHappeningCard item={baseItem} />);
+    renderWithProvider(<WhatsHappeningCard item={baseItem} cardIndex={0} />);
     expect(screen.getByText(baseItem.title)).toBeOnTheScreen();
     expect(screen.getByText(baseItem.description)).toBeOnTheScreen();
   });
 
   it('renders category badge when category is provided', () => {
-    renderWithProvider(<WhatsHappeningCard item={baseItem} />);
+    renderWithProvider(<WhatsHappeningCard item={baseItem} cardIndex={0} />);
     expect(screen.getByText('Macro')).toBeOnTheScreen();
   });
 
   it('does not render category badge when category is absent', () => {
     const item = { ...baseItem, category: undefined };
-    renderWithProvider(<WhatsHappeningCard item={item} />);
+    renderWithProvider(<WhatsHappeningCard item={item} cardIndex={0} />);
     expect(screen.queryByText('Macro')).toBeNull();
   });
 
+  it('renders Bullish impact badge for positive impact', () => {
+    const item = { ...baseItem, impact: 'positive' as const };
+    renderWithProvider(<WhatsHappeningCard item={item} cardIndex={0} />);
+    expect(screen.getByText('Bullish')).toBeOnTheScreen();
+  });
+
+  it('renders Bearish impact badge for negative impact', () => {
+    const item = { ...baseItem, impact: 'negative' as const };
+    renderWithProvider(<WhatsHappeningCard item={item} cardIndex={0} />);
+    expect(screen.getByText('Bearish')).toBeOnTheScreen();
+  });
+
+  it('renders Neutral impact badge for neutral impact', () => {
+    const item = { ...baseItem, impact: 'neutral' as const };
+    renderWithProvider(<WhatsHappeningCard item={item} cardIndex={0} />);
+    expect(screen.getByText('Neutral')).toBeOnTheScreen();
+  });
+
+  it('does not render impact badge when impact is absent', () => {
+    const item = { ...baseItem, impact: undefined };
+    renderWithProvider(<WhatsHappeningCard item={item} cardIndex={0} />);
+    expect(screen.queryByText('Bullish')).toBeNull();
+    expect(screen.queryByText('Bearish')).toBeNull();
+    expect(screen.queryByText('Neutral')).toBeNull();
+  });
+
+  it('renders impact badge alongside category badge', () => {
+    renderWithProvider(<WhatsHappeningCard item={baseItem} cardIndex={0} />);
+    expect(screen.getByText('Bullish')).toBeOnTheScreen();
+    expect(screen.getByText('Macro')).toBeOnTheScreen();
+  });
+
   it('renders related asset symbol pills', () => {
-    renderWithProvider(<WhatsHappeningCard item={baseItem} />);
+    renderWithProvider(<WhatsHappeningCard item={baseItem} cardIndex={0} />);
     expect(screen.getByText('BTC')).toBeOnTheScreen();
   });
 
   it('does not render asset pills when relatedAssets is empty', () => {
     const item = { ...baseItem, relatedAssets: [] };
-    renderWithProvider(<WhatsHappeningCard item={item} />);
+    renderWithProvider(<WhatsHappeningCard item={item} cardIndex={0} />);
     expect(screen.queryByText('BTC')).toBeNull();
   });
 
@@ -59,26 +120,26 @@ describe('WhatsHappeningCard', () => {
       caip19: ['eip155:1/slip44:60'],
     };
     const item = { ...baseItem, relatedAssets: [mockRelatedAsset, ethAsset] };
-    renderWithProvider(<WhatsHappeningCard item={item} />);
+    renderWithProvider(<WhatsHappeningCard item={item} cardIndex={0} />);
     expect(screen.getByText('BTC')).toBeOnTheScreen();
     expect(screen.getByText('ETH')).toBeOnTheScreen();
   });
 
   it('renders formatted date when date is valid', () => {
-    renderWithProvider(<WhatsHappeningCard item={baseItem} />);
+    renderWithProvider(<WhatsHappeningCard item={baseItem} cardIndex={0} />);
     expect(screen.getByText('Mar 15, 2026')).toBeOnTheScreen();
   });
 
   it('does not render date when date string is invalid', () => {
     const item = { ...baseItem, date: 'not-a-date' };
-    renderWithProvider(<WhatsHappeningCard item={item} />);
+    renderWithProvider(<WhatsHappeningCard item={item} cardIndex={0} />);
     expect(screen.queryByText('not-a-date')).toBeNull();
   });
 
   it('calls onPress with the item when tapped', () => {
     const onPress = jest.fn();
     renderWithProvider(
-      <WhatsHappeningCard item={baseItem} onPress={onPress} />,
+      <WhatsHappeningCard item={baseItem} cardIndex={0} onPress={onPress} />,
     );
     fireEvent.press(screen.getByText(baseItem.title));
     expect(onPress).toHaveBeenCalledTimes(1);
@@ -86,9 +147,30 @@ describe('WhatsHappeningCard', () => {
   });
 
   it('does not throw when onPress is not provided', () => {
-    renderWithProvider(<WhatsHappeningCard item={baseItem} />);
+    renderWithProvider(<WhatsHappeningCard item={baseItem} cardIndex={0} />);
     expect(() =>
       fireEvent.press(screen.getByText(baseItem.title)),
     ).not.toThrow();
   });
+
+  it('tracks Whats Happening Card Scrolled to View when card becomes visible', () => {
+    renderWithProvider(<WhatsHappeningCard item={baseItem} cardIndex={2} />);
+    expect(capturedOnVisible).not.toBeNull();
+    capturedOnVisible?.();
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.WHATS_HAPPENING_CARD_SCROLLED_TO_VIEW,
+    );
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        category: MetaMetricsEvents.WHATS_HAPPENING_CARD_SCROLLED_TO_VIEW,
+        properties: expect.objectContaining({
+          event_id: 'trend-0',
+          card_index: 2,
+          category: 'macro',
+          impact: 'positive',
+          asset_symbols: ['BTC'],
+        }),
+      }),
+    );
+  });
 });
diff --git a/app/components/Views/Homepage/Sections/WhatsHappening/components/WhatsHappeningCard.tsx b/app/components/Views/Homepage/Sections/WhatsHappening/components/WhatsHappeningCard.tsx
index b272c676496..e1c7065fa69 100644
--- a/app/components/Views/Homepage/Sections/WhatsHappening/components/WhatsHappeningCard.tsx
+++ b/app/components/Views/Homepage/Sections/WhatsHappening/components/WhatsHappeningCard.tsx
@@ -1,8 +1,8 @@
-import React, { useMemo } from 'react';
-import { TouchableOpacity } from 'react-native';
+import React, { useCallback, useMemo } from 'react';
+import { TouchableOpacity, View } from 'react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import {
   Box,
-  BoxJustifyContent,
   Text,
   TextVariant,
   TextColor,
@@ -13,43 +13,89 @@ import {
 import { strings } from '../../../../../../../locales/i18n';
 import type { WhatsHappeningItem } from '../types';
 import { formatShortDate } from '../util/formatDate';
+import {
+  getImpactLabel,
+  getImpactBackgroundClass,
+  getImpactTextColor,
+} from '../util/impact';
+import { MetaMetricsEvents } from '../../../../../../core/Analytics';
+import { useAnalytics } from '../../../../../hooks/useAnalytics/useAnalytics';
+import { useViewportTracking } from '../../../../../UI/MarketInsights/hooks/useViewportTracking';
+import { getWhatsHappeningEventProps } from '../eventProperties';
 
 interface WhatsHappeningCardProps {
   item: WhatsHappeningItem;
+  cardIndex: number;
   onPress?: (item: WhatsHappeningItem) => void;
 }
 
 const WhatsHappeningCard: React.FC<WhatsHappeningCardProps> = ({
   item,
+  cardIndex,
   onPress,
 }) => {
+  const tw = useTailwind();
   const formattedDate = useMemo(() => formatShortDate(item.date), [item.date]);
+  const { trackEvent, createEventBuilder } = useAnalytics();
 
   const handlePress = () => onPress?.(item);
 
+  const handleVisible = useCallback(() => {
+    trackEvent(
+      createEventBuilder(
+        MetaMetricsEvents.WHATS_HAPPENING_CARD_SCROLLED_TO_VIEW,
+      )
+        .addProperties(getWhatsHappeningEventProps(item, cardIndex))
+        .build(),
+    );
+  }, [trackEvent, createEventBuilder, item, cardIndex]);
+
+  const { ref: cardRef, onLayout: onVisibilityLayout } =
+    useViewportTracking(handleVisible);
+
   return (
-    <TouchableOpacity onPress={handlePress} activeOpacity={0.7}>
-      <Box
-        twClassName="w-[280px] h-[248px] rounded-2xl bg-background-muted overflow-hidden"
-        padding={4}
-        justifyContent={BoxJustifyContent.Between}
-        gap={3}
+    <View ref={cardRef} collapsable={false} onLayout={onVisibilityLayout}>
+      <TouchableOpacity
+        onPress={handlePress}
+        activeOpacity={0.7}
+        style={tw.style(
+          'w-[280px] h-[254px] rounded-2xl bg-background-muted overflow-hidden p-4 justify-between gap-3',
+        )}
       >
         <Box gap={3}>
-          {/* Category badge */}
-          {item.category && (
-            <Box twClassName="self-start">
-              <Box twClassName="rounded-full bg-background-default px-2 py-0.5">
-                <Text
-                  variant={TextVariant.BodyXs}
-                  color={TextColor.TextAlternative}
-                  fontWeight={FontWeight.Medium}
+          {/* Impact + Category badges */}
+          {(item.impact || item.category) && (
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              twClassName="flex-wrap gap-2"
+            >
+              {item.impact && (
+                <Box
+                  twClassName={`self-start rounded-full ${getImpactBackgroundClass(item.impact)} px-2 py-0.5`}
                 >
-                  {strings(
-                    `homepage.sections.whats_happening_categories.${item.category}`,
-                  )}
-                </Text>
-              </Box>
+                  <Text
+                    variant={TextVariant.BodyXs}
+                    color={getImpactTextColor(item.impact)}
+                    fontWeight={FontWeight.Medium}
+                  >
+                    {getImpactLabel(item.impact)}
+                  </Text>
+                </Box>
+              )}
+              {item.category && (
+                <Box twClassName="self-start rounded-full bg-background-default px-2 py-0.5">
+                  <Text
+                    variant={TextVariant.BodyXs}
+                    color={TextColor.TextAlternative}
+                    fontWeight={FontWeight.Medium}
+                  >
+                    {strings(
+                      `homepage.sections.whats_happening_categories.${item.category}`,
+                    )}
+                  </Text>
+                </Box>
+              )}
             </Box>
           )}
 
@@ -58,7 +104,7 @@ const WhatsHappeningCard: React.FC<WhatsHappeningCardProps> = ({
             variant={TextVariant.BodyMd}
             fontWeight={FontWeight.Medium}
             color={TextColor.TextDefault}
-            numberOfLines={3}
+            numberOfLines={2}
           >
             {item.title}
           </Text>
@@ -107,8 +153,8 @@ const WhatsHappeningCard: React.FC<WhatsHappeningCardProps> = ({
             </Text>
           )}
         </Box>
-      </Box>
-    </TouchableOpacity>
+      </TouchableOpacity>
+    </View>
   );
 };
 
diff --git a/app/components/Views/Homepage/Sections/WhatsHappening/constants.ts b/app/components/Views/Homepage/Sections/WhatsHappening/constants.ts
new file mode 100644
index 00000000000..05d74115589
--- /dev/null
+++ b/app/components/Views/Homepage/Sections/WhatsHappening/constants.ts
@@ -0,0 +1,12 @@
+export const MAX_ITEMS_DISPLAYED = 5;
+
+export const WhatsHappeningEntryPoint = {
+  Card: 'card',
+  ViewAll: 'view_all',
+} as const;
+
+export const WhatsHappeningInteractionType = {
+  SourceClick: 'source_click',
+  BuyPressed: 'buy_pressed',
+  TradePressed: 'trade_pressed',
+} as const;
diff --git a/app/components/Views/Homepage/Sections/WhatsHappening/eventProperties.ts b/app/components/Views/Homepage/Sections/WhatsHappening/eventProperties.ts
new file mode 100644
index 00000000000..ae75f319382
--- /dev/null
+++ b/app/components/Views/Homepage/Sections/WhatsHappening/eventProperties.ts
@@ -0,0 +1,31 @@
+import type { WhatsHappeningItem } from './types';
+
+/**
+ * Shared properties bag for Whats Happening analytics events.
+ * Used by CARD_SCROLLED_TO_VIEW, OPENED, VIEWED, INTERACTION, and CLOSED.
+ *
+ * Optional fields (`category`, `impact`) are stripped when undefined so
+ * the resulting payload only includes keys that have a real value.
+ *
+ * The shape is widened with `Record<string, unknown>` so the result can be
+ * passed directly to `AnalyticsEventBuilder.addProperties`, which expects
+ * an index-signature-compatible bag.
+ */
+export type WhatsHappeningEventProps = {
+  event_id: string;
+  card_index: number;
+  category?: WhatsHappeningItem['category'];
+  impact?: WhatsHappeningItem['impact'];
+  asset_symbols: string[];
+} & Record<string, unknown>;
+
+export const getWhatsHappeningEventProps = (
+  item: WhatsHappeningItem,
+  cardIndex: number,
+): WhatsHappeningEventProps => ({
+  event_id: item.id,
+  card_index: cardIndex,
+  ...(item.category ? { category: item.category } : {}),
+  ...(item.impact ? { impact: item.impact } : {}),
+  asset_symbols: item.relatedAssets.map((asset) => asset.symbol),
+});
diff --git a/app/components/Views/Homepage/Sections/WhatsHappening/util/impact.ts b/app/components/Views/Homepage/Sections/WhatsHappening/util/impact.ts
new file mode 100644
index 00000000000..1b3de5ac10f
--- /dev/null
+++ b/app/components/Views/Homepage/Sections/WhatsHappening/util/impact.ts
@@ -0,0 +1,44 @@
+import { TextColor } from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../../locales/i18n';
+import type { WhatsHappeningItem } from '../types';
+
+export const getImpactLabel = (
+  impact: WhatsHappeningItem['impact'],
+): string => {
+  switch (impact) {
+    case 'positive':
+      return strings('homepage.sections.whats_happening_impact.bullish');
+    case 'negative':
+      return strings('homepage.sections.whats_happening_impact.bearish');
+    default:
+      return strings('homepage.sections.whats_happening_impact.neutral');
+  }
+};
+
+/** Returns just the background colour class for the impact badge. */
+export const getImpactBackgroundClass = (
+  impact: WhatsHappeningItem['impact'],
+): string => {
+  switch (impact) {
+    case 'positive':
+      return 'bg-success-muted';
+    case 'negative':
+      return 'bg-error-muted';
+    default:
+      return 'bg-muted';
+  }
+};
+
+/** Returns the text colour token for the impact badge. */
+export const getImpactTextColor = (
+  impact: WhatsHappeningItem['impact'],
+): TextColor => {
+  switch (impact) {
+    case 'positive':
+      return TextColor.SuccessDefault;
+    case 'negative':
+      return TextColor.ErrorDefault;
+    default:
+      return TextColor.TextAlternative;
+  }
+};
diff --git a/app/components/Views/Homepage/components/HomepageDiscoveryTabs/HomepageDiscoveryTabs.styles.ts b/app/components/Views/Homepage/components/HomepageDiscoveryTabs/HomepageDiscoveryTabs.styles.ts
new file mode 100644
index 00000000000..a220b300da1
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageDiscoveryTabs/HomepageDiscoveryTabs.styles.ts
@@ -0,0 +1,25 @@
+import { StyleSheet } from 'react-native';
+import type { Theme } from '../../../../../util/theme/models';
+
+const styleSheet = (_params: { theme: Theme }) =>
+  StyleSheet.create({
+    flex: {
+      flex: 1,
+    },
+    gradient: {
+      position: 'absolute',
+      left: 0,
+      right: 0,
+      zIndex: 1,
+      pointerEvents: 'none',
+    },
+    gradientFill: {
+      flex: 1,
+    },
+    portfolioScrollContent: {
+      paddingTop: 14,
+      gap: 16,
+    },
+  });
+
+export default styleSheet;
diff --git a/app/components/Views/Homepage/components/HomepageDiscoveryTabs/HomepageDiscoveryTabs.test.tsx b/app/components/Views/Homepage/components/HomepageDiscoveryTabs/HomepageDiscoveryTabs.test.tsx
new file mode 100644
index 00000000000..8df0c54f38a
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageDiscoveryTabs/HomepageDiscoveryTabs.test.tsx
@@ -0,0 +1,380 @@
+import React from 'react';
+import { InteractionManager, Text } from 'react-native';
+import { act, fireEvent, render, screen } from '@testing-library/react-native';
+import type { SectionRefreshHandle } from '../../types';
+import HomepageDiscoveryTabs from './HomepageDiscoveryTabs';
+import { HomeTabNames } from '../../hooks/useTabViewedEvent';
+
+const mockTrackTabViewed = jest.fn();
+jest.mock('../../hooks/useTabViewedEvent', () => ({
+  __esModule: true,
+  HomeTabNames: {
+    PORTFOLIO: 'portfolio',
+    PERPETUALS: 'perpetuals',
+    PREDICTIONS: 'predictions',
+  },
+  default: () => ({ trackTabViewed: mockTrackTabViewed }),
+}));
+
+jest.mock('react-native-reanimated', () => {
+  const Reanimated = jest.requireActual('react-native-reanimated/mock');
+  Reanimated.default.ScrollView = jest.requireActual('react-native').ScrollView;
+  return Reanimated;
+});
+
+jest
+  .spyOn(InteractionManager, 'runAfterInteractions')
+  .mockImplementation((task) => {
+    if (task == null) {
+      return { cancel: jest.fn(), then: jest.fn(), done: jest.fn() };
+    }
+    if (typeof task === 'function') {
+      task();
+    } else {
+      // eslint-disable-next-line no-void
+      void task.gen();
+    }
+    return { cancel: jest.fn(), then: jest.fn(), done: jest.fn() };
+  });
+
+jest.mock('../../Homepage', () => {
+  const ReactLib = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: ReactLib.forwardRef(
+      (
+        _props: Record<string, never>,
+        ref: React.ForwardedRef<SectionRefreshHandle>,
+      ) => {
+        ReactLib.useImperativeHandle(ref, () => ({
+          refresh: jest.fn(async () => undefined),
+        }));
+        return ReactLib.createElement(View, { testID: 'homepage' });
+      },
+    ),
+  };
+});
+
+jest.mock('../../../../UI/Perps/Views/PerpsHomeView/PerpsHomeView', () => {
+  const { View } = jest.requireActual('react-native');
+  const ReactLib = jest.requireActual('react');
+  return function MockPerpsHomeView({
+    tabEnterCallbackRef,
+  }: {
+    tabEnterCallbackRef?: React.MutableRefObject<(() => void) | null>;
+  }) {
+    if (tabEnterCallbackRef) tabEnterCallbackRef.current = jest.fn();
+    return ReactLib.createElement(View, { testID: 'perps-home-view' });
+  };
+});
+
+const mockPredictFeedProps: { current: Record<string, unknown> | null } = {
+  current: null,
+};
+jest.mock('../../../../UI/Predict/views/PredictFeed', () => {
+  const { View } = jest.requireActual('react-native');
+  const ReactLib = jest.requireActual('react');
+  return function MockPredictFeed(props: Record<string, unknown>) {
+    mockPredictFeedProps.current = props;
+    return ReactLib.createElement(View, { testID: 'predict-feed' });
+  };
+});
+
+jest.mock('../../../../UI/Perps/providers/PerpsConnectionProvider', () => ({
+  PerpsConnectionProvider: ({ children }: { children: React.ReactNode }) =>
+    children,
+}));
+
+const mockPauseAllChannels = jest.fn();
+const mockResumeAllChannels = jest.fn();
+
+jest.mock('../../../../UI/Perps/providers/PerpsStreamManager', () => ({
+  PerpsStreamProvider: ({ children }: { children: React.ReactNode }) =>
+    children,
+  getStreamManagerInstance: () => ({
+    pauseAllChannels: mockPauseAllChannels,
+    resumeAllChannels: mockResumeAllChannels,
+  }),
+}));
+
+jest.mock('../../../../UI/Predict/contexts', () => ({
+  PredictPreviewSheetProvider: ({ children }: { children: React.ReactNode }) =>
+    children,
+}));
+
+jest.mock('../../../../UI/Predict/hooks/useDiscoveryScrollManager', () => ({
+  useDiscoveryScrollManager: jest.fn(() => ({
+    scrollHandler: jest.fn(),
+    onTabEnter: jest.fn(),
+    headerHidden: false,
+  })),
+}));
+
+jest.mock('../../../../../util/theme', () => ({
+  useTheme: () => ({ themeAppearance: 'dark', colors: {} }),
+}));
+
+jest.mock('@metamask/design-system-twrnc-preset', () => ({
+  useTailwind: () => ({ style: () => ({}) }),
+}));
+
+jest.mock('react-native-linear-gradient', () => 'LinearGradient');
+
+const pressTab = async (label: string) => {
+  await act(async () => {
+    fireEvent.press(screen.getAllByText(label)[0]);
+  });
+};
+
+const renderComponent = (props = {}) =>
+  render(<HomepageDiscoveryTabs {...props} />);
+
+describe('HomepageDiscoveryTabs', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('initial render', () => {
+    it('renders the Portfolio tab bar label', () => {
+      renderComponent();
+      expect(screen.getByText('Portfolio')).toBeOnTheScreen();
+    });
+
+    it('renders the Perpetuals tab bar label', () => {
+      renderComponent();
+      expect(screen.getByText('Perpetuals')).toBeOnTheScreen();
+    });
+
+    it('renders the Predictions tab bar label', () => {
+      renderComponent();
+      expect(screen.getByText('Predictions')).toBeOnTheScreen();
+    });
+
+    it('shows Portfolio content on initial mount', () => {
+      renderComponent();
+      expect(screen.getByTestId('homepage')).toBeOnTheScreen();
+    });
+  });
+
+  describe('tab switching', () => {
+    it('shows Perpetuals content after pressing the Perpetuals tab', async () => {
+      renderComponent();
+      await pressTab('Perpetuals');
+      expect(screen.getByTestId('perps-home-view')).toBeOnTheScreen();
+    });
+
+    it('shows Predictions content after pressing the Predictions tab', async () => {
+      renderComponent();
+      await pressTab('Predictions');
+      expect(screen.getByTestId('predict-feed')).toBeOnTheScreen();
+    });
+
+    it('returns to Portfolio content after switching back', async () => {
+      renderComponent();
+      await pressTab('Perpetuals');
+      await pressTab('Portfolio');
+      expect(screen.getByTestId('homepage')).toBeOnTheScreen();
+    });
+  });
+
+  describe('portfolioHeader prop', () => {
+    it('renders portfolioHeader inside the Portfolio tab', () => {
+      renderComponent({
+        portfolioHeader: <Text testID="portfolio-header">Header</Text>,
+      });
+      expect(screen.getByTestId('portfolio-header')).toBeOnTheScreen();
+    });
+
+    it('keeps portfolioHeader mounted but hidden when switching to Perpetuals', async () => {
+      renderComponent({
+        portfolioHeader: <Text testID="portfolio-header">Header</Text>,
+      });
+      await pressTab('Perpetuals');
+      // Portfolio tab is keepMounted — header stays in tree but is not accessible
+      // (pointerEvents="none" + display:none via twClassName="hidden")
+      expect(screen.queryByTestId('perps-home-view')).toBeOnTheScreen();
+    });
+  });
+
+  describe('ref / imperative handle', () => {
+    it('exposes a refresh method via ref', () => {
+      const ref = React.createRef<{ refresh: () => Promise<void> }>();
+      render(<HomepageDiscoveryTabs ref={ref} />);
+      expect(typeof ref.current?.refresh).toBe('function');
+    });
+
+    it('calling refresh does not throw', async () => {
+      const ref = React.createRef<{ refresh: () => Promise<void> }>();
+      render(<HomepageDiscoveryTabs ref={ref} />);
+      await act(async () => {
+        await ref.current?.refresh();
+      });
+    });
+  });
+
+  describe('walletHeaderOffset prop', () => {
+    it('renders without throwing when walletHeaderOffset is provided', () => {
+      expect(() => renderComponent({ walletHeaderOffset: 100 })).not.toThrow();
+    });
+
+    it('renders without throwing when walletHeaderOffset is 0', () => {
+      expect(() => renderComponent({ walletHeaderOffset: 0 })).not.toThrow();
+    });
+  });
+
+  describe('PredictFeed wallet header forwarding', () => {
+    beforeEach(() => {
+      mockPredictFeedProps.current = null;
+    });
+
+    it('forwards walletHeaderTranslateY and walletHeaderHeight to PredictFeed', async () => {
+      const walletHeaderTranslateY = { value: 0 } as unknown;
+      renderComponent({
+        walletHeaderTranslateY,
+        walletHeaderHeight: 120,
+      });
+      await pressTab('Predictions');
+
+      expect(mockPredictFeedProps.current).not.toBeNull();
+      expect(mockPredictFeedProps.current?.walletHeaderTranslateY).toBe(
+        walletHeaderTranslateY,
+      );
+      expect(mockPredictFeedProps.current?.walletHeaderHeight).toBe(120);
+    });
+
+    it('passes onHeaderHiddenChange to PredictFeed so discovery icons collapse', async () => {
+      renderComponent();
+      await pressTab('Predictions');
+
+      expect(typeof mockPredictFeedProps.current?.onHeaderHiddenChange).toBe(
+        'function',
+      );
+    });
+
+    it('passes hideHeader=true to PredictFeed', async () => {
+      renderComponent();
+      await pressTab('Predictions');
+
+      expect(mockPredictFeedProps.current?.hideHeader).toBe(true);
+    });
+  });
+
+  describe('tab_viewed analytics', () => {
+    it('fires trackTabViewed with portfolio on initial mount', () => {
+      renderComponent();
+      expect(mockTrackTabViewed).toHaveBeenCalledWith(HomeTabNames.PORTFOLIO);
+    });
+
+    it('fires trackTabViewed with perpetuals when switching to Perpetuals tab', async () => {
+      renderComponent();
+      mockTrackTabViewed.mockClear();
+      await pressTab('Perpetuals');
+      expect(mockTrackTabViewed).toHaveBeenCalledWith(HomeTabNames.PERPETUALS);
+    });
+
+    it('fires trackTabViewed with predictions when switching to Predictions tab', async () => {
+      renderComponent();
+      mockTrackTabViewed.mockClear();
+      await pressTab('Predictions');
+      expect(mockTrackTabViewed).toHaveBeenCalledWith(HomeTabNames.PREDICTIONS);
+    });
+
+    it('fires trackTabViewed with portfolio when switching back to Portfolio', async () => {
+      renderComponent();
+      await pressTab('Perpetuals');
+      mockTrackTabViewed.mockClear();
+      await pressTab('Portfolio');
+      expect(mockTrackTabViewed).toHaveBeenCalledWith(HomeTabNames.PORTFOLIO);
+    });
+
+    it('does not fire trackTabViewed again when pressing the active tab', async () => {
+      renderComponent();
+      mockTrackTabViewed.mockClear();
+      await pressTab('Portfolio');
+      expect(mockTrackTabViewed).not.toHaveBeenCalled();
+    });
+
+    it('fires once per distinct tab switch across multiple switches', async () => {
+      renderComponent();
+      mockTrackTabViewed.mockClear();
+      await pressTab('Perpetuals');
+      await pressTab('Predictions');
+      await pressTab('Portfolio');
+      expect(mockTrackTabViewed).toHaveBeenCalledTimes(3);
+    });
+  });
+
+  describe('Perps WS pause/resume on tab switch', () => {
+    it('pauses all channels when switching from Portfolio to Predictions', async () => {
+      renderComponent();
+      await pressTab('Predictions');
+      expect(mockPauseAllChannels).toHaveBeenCalledTimes(1);
+      expect(mockResumeAllChannels).not.toHaveBeenCalled();
+    });
+
+    it('pauses all channels when switching from Perpetuals to Predictions', async () => {
+      renderComponent();
+      await pressTab('Perpetuals');
+      mockPauseAllChannels.mockClear();
+      await pressTab('Predictions');
+      expect(mockPauseAllChannels).toHaveBeenCalledTimes(1);
+    });
+
+    it('resumes all channels when switching from Predictions back to Portfolio', async () => {
+      renderComponent();
+      await pressTab('Predictions');
+      mockPauseAllChannels.mockClear();
+      mockResumeAllChannels.mockClear();
+      await pressTab('Portfolio');
+      expect(mockResumeAllChannels).toHaveBeenCalledTimes(1);
+      expect(mockPauseAllChannels).not.toHaveBeenCalled();
+    });
+
+    it('resumes all channels when switching from Predictions to Perpetuals', async () => {
+      renderComponent();
+      await pressTab('Predictions');
+      mockResumeAllChannels.mockClear();
+      await pressTab('Perpetuals');
+      expect(mockResumeAllChannels).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not pause when switching between two Perps-consuming tabs', async () => {
+      renderComponent();
+      await pressTab('Perpetuals');
+      expect(mockPauseAllChannels).not.toHaveBeenCalled();
+      await pressTab('Portfolio');
+      expect(mockPauseAllChannels).not.toHaveBeenCalled();
+    });
+
+    it('does not call resumeAllChannels on unmount when tab layer never paused', async () => {
+      const { unmount } = renderComponent();
+      // Stay on Portfolio — never switched to Predictions
+      act(() => {
+        unmount();
+      });
+      expect(mockResumeAllChannels).not.toHaveBeenCalled();
+    });
+
+    it('calls resumeAllChannels on unmount when tab layer holds a pause', async () => {
+      const { unmount } = renderComponent();
+      await pressTab('Predictions');
+      mockResumeAllChannels.mockClear();
+      act(() => {
+        unmount();
+      });
+      expect(mockResumeAllChannels).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not call resumeAllChannels on unmount after returning from Predictions', async () => {
+      const { unmount } = renderComponent();
+      await pressTab('Predictions');
+      await pressTab('Portfolio');
+      mockResumeAllChannels.mockClear();
+      act(() => {
+        unmount();
+      });
+      expect(mockResumeAllChannels).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/app/components/Views/Homepage/components/HomepageDiscoveryTabs/HomepageDiscoveryTabs.tsx b/app/components/Views/Homepage/components/HomepageDiscoveryTabs/HomepageDiscoveryTabs.tsx
new file mode 100644
index 00000000000..b0fcae924e3
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageDiscoveryTabs/HomepageDiscoveryTabs.tsx
@@ -0,0 +1,443 @@
+import React, {
+  forwardRef,
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useRef,
+} from 'react';
+import {
+  Animated,
+  RefreshControlProps,
+  StyleProp,
+  StyleSheet,
+  View,
+  ViewStyle,
+} from 'react-native';
+import Reanimated, {
+  SharedValue,
+  withTiming,
+  Easing,
+  useSharedValue,
+} from 'react-native-reanimated';
+import LinearGradient from 'react-native-linear-gradient';
+import TabsIconList from '../../../../../component-library/components-temp/Tabs/TabsIconList/TabsIconList';
+import { TabsIconListRef } from '../../../../../component-library/components-temp/Tabs/TabsIconList/TabsIconList.types';
+import Homepage from '../../Homepage';
+import PerpsHomeView from '../../../../UI/Perps/Views/PerpsHomeView/PerpsHomeView';
+import PredictFeed from '../../../../UI/Predict/views/PredictFeed';
+import { PerpsConnectionProvider } from '../../../../UI/Perps/providers/PerpsConnectionProvider';
+import {
+  PerpsStreamProvider,
+  getStreamManagerInstance,
+} from '../../../../UI/Perps/providers/PerpsStreamManager';
+import { PredictPreviewSheetProvider } from '../../../../UI/Predict/contexts';
+import { SectionRefreshHandle } from '../../types';
+import { IconName } from '../../../../../component-library/components/Icons/Icon/Icon.types';
+import { useStyles } from '../../../../../component-library/hooks';
+import styleSheet from './HomepageDiscoveryTabs.styles';
+import { useDiscoveryScrollManager } from '../../../../UI/Predict/hooks/useDiscoveryScrollManager';
+import { useTheme } from '../../../../../util/theme';
+import { AppThemeKey } from '../../../../../util/theme/models';
+import { TabIconAnimationContext } from '../../../../../component-library/components-temp/Tabs/TabsIconTab/TabsIconAnimationContext';
+import useTabViewedEvent, { HomeTabNames } from '../../hooks/useTabViewedEvent';
+
+// Tab indices — kept as a const so future tabs can be added without renumbering.
+const TAB_INDEX = {
+  PORTFOLIO: 0,
+  PERPETUALS: 1,
+  PREDICTIONS: 2,
+} as const;
+
+// Tabs that consume live Perps WebSocket data. Add new tab indices here when
+// a future tab needs Perps WS channels to stay active.
+const PERPS_WS_TABS = new Set<number>([
+  TAB_INDEX.PORTFOLIO,
+  TAB_INDEX.PERPETUALS,
+]);
+
+const TAB_NAMES = {
+  [TAB_INDEX.PORTFOLIO]: HomeTabNames.PORTFOLIO,
+  [TAB_INDEX.PERPETUALS]: HomeTabNames.PERPETUALS,
+  [TAB_INDEX.PREDICTIONS]: HomeTabNames.PREDICTIONS,
+} as const;
+
+// Static per-tab gradient color stops. Keyed by TAB_INDEX so adding a new tab
+// only requires adding an entry here.
+// Design spec: linear-gradient(180deg, <color> 0%, rgba(<color>, 0) 100%)
+const TAB_GRADIENT_COLORS: Record<number, [string, string, string]> = {
+  [TAB_INDEX.PORTFOLIO]: [
+    'rgba(75, 80, 92, 0.9)',
+    'rgba(75, 80, 92, 0.2)',
+    'transparent',
+  ],
+  [TAB_INDEX.PERPETUALS]: [
+    'rgba(25, 0, 102, 0.9)',
+    'rgba(25, 0, 102, 0.2)',
+    'transparent',
+  ],
+  [TAB_INDEX.PREDICTIONS]: [
+    'rgba(61, 6, 95, 0.9)',
+    'rgba(61, 6, 95, 0.2)',
+    'transparent',
+  ],
+};
+
+/**
+ * Thin wrapper that exposes a `tabLabel` prop consumed by TabsList to build
+ * the tab bar. The children are rendered as the tab's content.
+ */
+interface DiscoveryTabViewProps {
+  tabLabel: string;
+  tabIcon?: IconName;
+  keepMounted?: boolean;
+  style?: StyleProp<ViewStyle>;
+  children?: React.ReactNode;
+}
+
+const discoveryTabViewStyles = StyleSheet.create({ root: { flex: 1 } });
+
+const DiscoveryTabView: React.FC<DiscoveryTabViewProps> = ({
+  children,
+  style,
+}) => <View style={[discoveryTabViewStyles.root, style]}>{children}</View>;
+
+export interface HomepageDiscoveryTabsProps {
+  /**
+   * Content rendered above the Homepage sections inside the Portfolio tab scroll.
+   * Receives AccountGroupBalance, AssetDetailsActions, and Carousel from Wallet.
+   */
+  portfolioHeader?: React.ReactNode;
+  /**
+   * Forwarded to the Portfolio tab ScrollView — used by HomepageScrollContext
+   * pub/sub to notify scroll subscribers without triggering re-renders.
+   */
+  onPortfolioScroll?: () => void;
+  /**
+   * RefreshControl element for pull-to-refresh on the Portfolio tab.
+   */
+  refreshControl?: React.ReactElement<RefreshControlProps>;
+  /**
+   * Combined height of the wallet header + safe area top inset, used to
+   * position the gradient overlay so it bleeds up into the header area.
+   */
+  walletHeaderOffset?: number;
+  /**
+   * Reanimated SharedValue controlling vertical translation of the wallet header.
+   * Updated from the scroll worklet so the header hides/shows on the native thread.
+   */
+  walletHeaderTranslateY?: SharedValue<number>;
+  /**
+   * Height of the wallet header — used to know how far to translate it off screen.
+   */
+  walletHeaderHeight?: number;
+}
+
+/**
+ * HomepageDiscoveryTabs
+ *
+ * Hub Page Navigational Discovery Tabs (coreMCU589AbtestHubPageDiscoveryTabs).
+ *
+ * Uses the design-system TabsList which renders the TabsBar at the top and
+ * lazy-mounts tab content via InteractionManager — screens only initialise
+ * when the user first visits that tab.
+ *
+ * Tabs:
+ * - Portfolio: scrollable homepage sections with balance header
+ * - Perpetuals: PerpsHomeView wrapped in connection + stream providers
+ * - Predictions: PredictFeed wrapped in preview sheet provider
+ */
+const HomepageDiscoveryTabs = forwardRef<
+  SectionRefreshHandle,
+  HomepageDiscoveryTabsProps
+>(
+  (
+    {
+      portfolioHeader,
+      onPortfolioScroll,
+      refreshControl,
+      walletHeaderOffset = 0,
+      walletHeaderTranslateY,
+      walletHeaderHeight = 0,
+    },
+    ref,
+  ) => {
+    const tabsRef = useRef<TabsIconListRef>(null);
+    const homepageRef = useRef<SectionRefreshHandle>(null);
+    const perpsTabEnterRef = useRef<(() => void) | null>(null);
+    const { styles } = useStyles(styleSheet, {});
+    const { themeAppearance } = useTheme();
+    const isDarkMode = themeAppearance === AppThemeKey.dark;
+    // One Animated.Value per tab — pre-rendered at mount so no re-render is needed
+    // during a tab switch. Portfolio starts fully visible; others start at 0.
+    const tabGradientOpacities = useRef(
+      Object.keys(TAB_GRADIENT_COLORS).map(
+        (_, i) => new Animated.Value(i === TAB_INDEX.PORTFOLIO ? 1 : 0),
+      ),
+    ).current;
+    const activeTabIndexRef = useRef<number>(TAB_INDEX.PORTFOLIO);
+    // Tracks whether the tab layer currently holds a pause so the unmount
+    // cleanup only calls resume when it actually owns one, preventing an
+    // unmatched decrement against a controller-owned pause count.
+    const tabLayerHoldsPauseRef = useRef(false);
+
+    // 0 = icons expanded (header visible), 1 = icons collapsed (header hidden).
+    // Reanimated SharedValue drives icon height/marginBottom/opacity via useAnimatedStyle
+    // on the UI thread — no per-frame JS work, no JS-thread layout reflow.
+    const iconCollapseProgress = useSharedValue(0);
+    // RN Animated.Value mirror for the gradient overlay's Animated.multiply (which composes
+    // with tabGradientOpacities). Updated alongside the SharedValue at every toggle.
+    const iconCollapseAnim = useRef(new Animated.Value(0)).current;
+    const iconCollapseAnimRef = useRef(iconCollapseAnim);
+
+    // Triggered directly from the scroll worklet via onHeaderHiddenChange —
+    // fires in the same frame as the hide/show decision, not based on position.
+    // eslint-disable-next-line react-compiler/react-compiler -- mutating a Reanimated SharedValue is the documented pattern; it does not affect React render
+    const animateIcons = useCallback(
+      (hidden: boolean) => {
+        const toValue = hidden ? 1 : 0;
+        const duration = hidden ? 300 : 250;
+
+        // UI-thread layout animation via Reanimated.
+        iconCollapseProgress.value = withTiming(toValue, {
+          duration,
+          easing: Easing.out(Easing.cubic),
+        });
+
+        // Mirror onto the Animated.Value for the gradient overlay's Animated.multiply.
+        Animated.timing(iconCollapseAnimRef.current, {
+          toValue,
+          duration,
+          useNativeDriver: true,
+        }).start();
+      },
+      [iconCollapseProgress],
+    );
+
+    const { scrollHandler, onTabEnter: portfolioOnTabEnter } =
+      useDiscoveryScrollManager({
+        walletHeaderHeight,
+        walletHeaderTranslateY,
+        onPortfolioScroll,
+        onHeaderHiddenChange: animateIcons,
+      });
+
+    useImperativeHandle(ref, () => ({
+      refresh: async () => {
+        await homepageRef.current?.refresh();
+      },
+    }));
+
+    // Only resume on unmount if the tab layer holds a pause, to avoid issuing
+    // an unmatched resume that could decrement a controller-owned pause count.
+    useEffect(
+      () => () => {
+        if (tabLayerHoldsPauseRef.current) {
+          getStreamManagerInstance().resumeAllChannels();
+        }
+      },
+      [],
+    );
+    const { trackTabViewed } = useTabViewedEvent();
+
+    useEffect(() => {
+      trackTabViewed(TAB_NAMES[TAB_INDEX.PORTFOLIO]);
+    }, [trackTabViewed]);
+
+    const handleChangeTab = useCallback(
+      ({ i }: { i: number }) => {
+        const prevIndex = activeTabIndexRef.current;
+        activeTabIndexRef.current = i;
+
+        // Restore each tab's own header state on entry.
+        // Predictions has no scroll manager so we always show the header.
+        if (i === TAB_INDEX.PORTFOLIO) {
+          portfolioOnTabEnter();
+        } else if (i === TAB_INDEX.PERPETUALS) {
+          if (perpsTabEnterRef.current) {
+            perpsTabEnterRef.current();
+          } else {
+            // First visit — Perps not mounted yet so ref is null. It will mount
+            // at the top of scroll, so show the header/icons immediately.
+            // eslint-disable-next-line react-compiler/react-compiler
+            walletHeaderTranslateY &&
+              (walletHeaderTranslateY.value = withTiming(0, {
+                duration: 250,
+                easing: Easing.out(Easing.cubic),
+              }));
+            iconCollapseProgress.value = withTiming(0, {
+              duration: 250,
+              easing: Easing.out(Easing.cubic),
+            });
+            Animated.timing(iconCollapseAnimRef.current, {
+              toValue: 0,
+              duration: 250,
+              useNativeDriver: true,
+            }).start();
+          }
+        } else {
+          // Predictions has no scroll manager — always show header + icons on entry.
+          walletHeaderTranslateY &&
+            (walletHeaderTranslateY.value = withTiming(0, {
+              duration: 250,
+              easing: Easing.out(Easing.cubic),
+            }));
+          iconCollapseProgress.value = withTiming(0, {
+            duration: 250,
+            easing: Easing.out(Easing.cubic),
+          });
+          Animated.timing(iconCollapseAnimRef.current, {
+            toValue: 0,
+            duration: 250,
+            useNativeDriver: true,
+          }).start();
+        }
+
+        if (prevIndex !== i) {
+          trackTabViewed(TAB_NAMES[i as keyof typeof TAB_NAMES]);
+
+          // Pause Perps streams only when leaving a Perps-consuming tab for one
+          // that has no Perps consumers (e.g. Predictions). Resume when returning.
+          const wasActive = PERPS_WS_TABS.has(prevIndex);
+          const isActive = PERPS_WS_TABS.has(i);
+
+          if (wasActive && !isActive) {
+            getStreamManagerInstance().pauseAllChannels();
+            tabLayerHoldsPauseRef.current = true;
+          } else if (!wasActive && isActive) {
+            getStreamManagerInstance().resumeAllChannels();
+            tabLayerHoldsPauseRef.current = false;
+          }
+
+          // Snap outgoing to 1 and incoming to 0 before animating, in case a
+          // previous transition was interrupted mid-flight.
+          tabGradientOpacities[prevIndex].setValue(1);
+          tabGradientOpacities[i].setValue(0);
+
+          Animated.parallel([
+            Animated.timing(tabGradientOpacities[prevIndex], {
+              toValue: 0,
+              duration: 350,
+              useNativeDriver: true,
+            }),
+            Animated.timing(tabGradientOpacities[i], {
+              toValue: 1,
+              duration: 350,
+              useNativeDriver: true,
+            }),
+          ]).start();
+        }
+      },
+      [
+        tabGradientOpacities,
+        portfolioOnTabEnter,
+        walletHeaderTranslateY,
+        trackTabViewed,
+        iconCollapseProgress,
+      ],
+    );
+
+    return (
+      <PerpsConnectionProvider suppressErrorView>
+        <PerpsStreamProvider>
+          <TabIconAnimationContext.Provider value={{ iconCollapseProgress }}>
+            <View style={styles.flex}>
+              <TabsIconList
+                ref={tabsRef}
+                initialActiveIndex={TAB_INDEX.PORTFOLIO}
+                onChangeTab={handleChangeTab}
+                tabsListContentTwClassName="px-0"
+                tabsBarProps={{
+                  fillWidth: true,
+                }}
+              >
+                <DiscoveryTabView
+                  tabLabel="Portfolio"
+                  tabIcon={IconName.PieChart}
+                >
+                  <Reanimated.ScrollView
+                    showsVerticalScrollIndicator={false}
+                    onScroll={scrollHandler}
+                    scrollEventThrottle={16}
+                    refreshControl={refreshControl}
+                    contentContainerStyle={styles.portfolioScrollContent}
+                  >
+                    {portfolioHeader}
+                    <Homepage ref={homepageRef} perpsProvidersHoisted />
+                  </Reanimated.ScrollView>
+                </DiscoveryTabView>
+
+                <DiscoveryTabView
+                  tabLabel="Perpetuals"
+                  tabIcon={IconName.Candlestick}
+                >
+                  <PerpsHomeView
+                    hideHeader
+                    walletHeaderTranslateY={walletHeaderTranslateY}
+                    walletHeaderHeight={walletHeaderHeight}
+                    tabEnterCallbackRef={perpsTabEnterRef}
+                    onHeaderHiddenChange={animateIcons}
+                    topInset={22}
+                  />
+                </DiscoveryTabView>
+
+                <DiscoveryTabView
+                  tabLabel="Predictions"
+                  tabIcon={IconName.Predictions}
+                  keepMounted={false}
+                >
+                  <PredictPreviewSheetProvider>
+                    <PredictFeed
+                      hideHeader
+                      walletHeaderTranslateY={walletHeaderTranslateY}
+                      walletHeaderHeight={walletHeaderHeight}
+                      onHeaderHiddenChange={animateIcons}
+                    />
+                  </PredictPreviewSheetProvider>
+                </DiscoveryTabView>
+              </TabsIconList>
+
+              {/* Gradient overlay — dark mode only. One layer per tab, each always mounted
+              with fixed colors. Crossfade is pure opacity animation on the native thread —
+              no state update or unmount/remount during the transition.
+              Outer wrapper fades the entire gradient out when the header/icons collapse. */}
+              {walletHeaderOffset > 0 &&
+                isDarkMode &&
+                Object.entries(TAB_GRADIENT_COLORS).map(
+                  ([idx, gradientColors]) => (
+                    <Animated.View
+                      key={idx}
+                      style={[
+                        styles.gradient,
+                        {
+                          top: -walletHeaderOffset,
+                          height: walletHeaderOffset + 175,
+                          opacity: Animated.multiply(
+                            tabGradientOpacities[Number(idx)],
+                            iconCollapseAnim.interpolate({
+                              inputRange: [0, 1],
+                              outputRange: [1, 0],
+                            }),
+                          ),
+                        },
+                      ]}
+                      pointerEvents="none"
+                    >
+                      <LinearGradient
+                        colors={gradientColors}
+                        locations={[0, 0.6, 1.0]}
+                        style={styles.gradientFill}
+                      />
+                    </Animated.View>
+                  ),
+                )}
+            </View>
+          </TabIconAnimationContext.Provider>
+        </PerpsStreamProvider>
+      </PerpsConnectionProvider>
+    );
+  },
+);
+
+HomepageDiscoveryTabs.displayName = 'HomepageDiscoveryTabs';
+
+export default HomepageDiscoveryTabs;
diff --git a/app/components/Views/Homepage/components/HomepageDiscoveryTabs/index.ts b/app/components/Views/Homepage/components/HomepageDiscoveryTabs/index.ts
new file mode 100644
index 00000000000..822f80a9a58
--- /dev/null
+++ b/app/components/Views/Homepage/components/HomepageDiscoveryTabs/index.ts
@@ -0,0 +1 @@
+export { default } from './HomepageDiscoveryTabs';
diff --git a/app/components/Views/Homepage/hooks/useTabViewedEvent.test.ts b/app/components/Views/Homepage/hooks/useTabViewedEvent.test.ts
new file mode 100644
index 00000000000..24c5d0074d8
--- /dev/null
+++ b/app/components/Views/Homepage/hooks/useTabViewedEvent.test.ts
@@ -0,0 +1,238 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import useTabViewedEvent, { HomeTabNames } from './useTabViewedEvent';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
+
+// --- Analytics mock ---
+const mockTrackEvent = jest.fn();
+const mockBuild = jest.fn(() => ({ builtEvent: true }));
+const mockAddProperties = jest.fn(() => ({ build: mockBuild }));
+const mockCreateEventBuilder = jest.fn(() => ({
+  addProperties: mockAddProperties,
+}));
+
+jest.mock('../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  }),
+}));
+
+// --- Scroll context mock ---
+let mockContextValue = {
+  subscribeToScroll: jest.fn(() => jest.fn()),
+  viewportHeight: 800,
+  containerScreenY: 0,
+  entryPoint: 'app_opened',
+  visitId: 1,
+  notifySectionViewed: jest.fn(),
+  getViewedSectionCount: jest.fn(() => 0),
+  getVisitMaxDepth: jest.fn(() => -1),
+  appSessionId: 'test-session-id',
+};
+
+jest.mock('../context/HomepageScrollContext', () => ({
+  useHomepageScrollContext: () => mockContextValue,
+}));
+
+describe('useTabViewedEvent', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockContextValue = {
+      subscribeToScroll: jest.fn(() => jest.fn()),
+      viewportHeight: 800,
+      containerScreenY: 0,
+      entryPoint: 'app_opened',
+      visitId: 1,
+      notifySectionViewed: jest.fn(),
+      getViewedSectionCount: jest.fn(() => 0),
+      getVisitMaxDepth: jest.fn(() => -1),
+      appSessionId: 'test-session-id',
+    };
+  });
+
+  describe('event shape', () => {
+    it('uses the HOME_VIEWED MetaMetrics event', () => {
+      const { result } = renderHook(() => useTabViewedEvent());
+
+      act(() => {
+        result.current.trackTabViewed(HomeTabNames.PORTFOLIO);
+      });
+
+      expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+        MetaMetricsEvents.HOME_VIEWED,
+      );
+    });
+
+    it('fires with interaction_type: tab_viewed', () => {
+      const { result } = renderHook(() => useTabViewedEvent());
+
+      act(() => {
+        result.current.trackTabViewed(HomeTabNames.PORTFOLIO);
+      });
+
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({ interaction_type: 'tab_viewed' }),
+      );
+    });
+
+    it('fires with location: home', () => {
+      const { result } = renderHook(() => useTabViewedEvent());
+
+      act(() => {
+        result.current.trackTabViewed(HomeTabNames.PORTFOLIO);
+      });
+
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({ location: 'home' }),
+      );
+    });
+
+    it('includes the tab name in the event', () => {
+      const { result } = renderHook(() => useTabViewedEvent());
+
+      act(() => {
+        result.current.trackTabViewed(HomeTabNames.PERPETUALS);
+      });
+
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({ name: HomeTabNames.PERPETUALS }),
+      );
+    });
+
+    it('includes entry_point from context', () => {
+      mockContextValue = { ...mockContextValue, entryPoint: 'home_tab' };
+      const { result } = renderHook(() => useTabViewedEvent());
+
+      act(() => {
+        result.current.trackTabViewed(HomeTabNames.PORTFOLIO);
+      });
+
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({ entry_point: 'home_tab' }),
+      );
+    });
+
+    it('includes app_session_id from context', () => {
+      mockContextValue = { ...mockContextValue, appSessionId: 'abc-123' };
+      const { result } = renderHook(() => useTabViewedEvent());
+
+      act(() => {
+        result.current.trackTabViewed(HomeTabNames.PORTFOLIO);
+      });
+
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({ app_session_id: 'abc-123' }),
+      );
+    });
+
+    it('includes visit_number equal to visitId', () => {
+      mockContextValue = { ...mockContextValue, visitId: 5 };
+      const { result } = renderHook(() => useTabViewedEvent());
+
+      act(() => {
+        result.current.trackTabViewed(HomeTabNames.PORTFOLIO);
+      });
+
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({ visit_number: 5 }),
+      );
+    });
+
+    it('passes the built event to trackEvent', () => {
+      const builtEvent = { builtEvent: true };
+      mockBuild.mockReturnValue(builtEvent);
+      const { result } = renderHook(() => useTabViewedEvent());
+
+      act(() => {
+        result.current.trackTabViewed(HomeTabNames.PORTFOLIO);
+      });
+
+      expect(mockTrackEvent).toHaveBeenCalledWith(builtEvent);
+    });
+
+    it('fires with all required properties', () => {
+      mockContextValue = {
+        ...mockContextValue,
+        entryPoint: 'navigated_back',
+        appSessionId: 'full-props-session',
+        visitId: 3,
+      };
+      const { result } = renderHook(() => useTabViewedEvent());
+
+      act(() => {
+        result.current.trackTabViewed(HomeTabNames.PREDICTIONS);
+      });
+
+      expect(mockAddProperties).toHaveBeenCalledWith({
+        interaction_type: 'tab_viewed',
+        location: 'home',
+        name: HomeTabNames.PREDICTIONS,
+        entry_point: 'navigated_back',
+        app_session_id: 'full-props-session',
+        visit_number: 3,
+      });
+    });
+  });
+
+  describe('tab names', () => {
+    it.each([
+      [HomeTabNames.PORTFOLIO],
+      [HomeTabNames.PERPETUALS],
+      [HomeTabNames.PREDICTIONS],
+    ])('fires with name: %s', (tabName) => {
+      const { result } = renderHook(() => useTabViewedEvent());
+
+      act(() => {
+        result.current.trackTabViewed(tabName);
+      });
+
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({ name: tabName }),
+      );
+    });
+  });
+
+  describe('ref-based context reads', () => {
+    it('uses the latest context values at call time, not render time', () => {
+      const { result, rerender } = renderHook(() => useTabViewedEvent());
+
+      // Update context after initial render
+      mockContextValue = {
+        ...mockContextValue,
+        entryPoint: 'navigated_back',
+        appSessionId: 'updated-session',
+        visitId: 7,
+      };
+
+      act(() => {
+        rerender();
+      });
+
+      act(() => {
+        result.current.trackTabViewed(HomeTabNames.PORTFOLIO);
+      });
+
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({
+          entry_point: 'navigated_back',
+          app_session_id: 'updated-session',
+          visit_number: 7,
+        }),
+      );
+    });
+  });
+
+  describe('multiple calls', () => {
+    it('fires a separate event for each trackTabViewed call', () => {
+      const { result } = renderHook(() => useTabViewedEvent());
+
+      act(() => {
+        result.current.trackTabViewed(HomeTabNames.PORTFOLIO);
+        result.current.trackTabViewed(HomeTabNames.PERPETUALS);
+        result.current.trackTabViewed(HomeTabNames.PREDICTIONS);
+      });
+
+      expect(mockTrackEvent).toHaveBeenCalledTimes(3);
+    });
+  });
+});
diff --git a/app/components/Views/Homepage/hooks/useTabViewedEvent.ts b/app/components/Views/Homepage/hooks/useTabViewedEvent.ts
new file mode 100644
index 00000000000..ed56619d5b8
--- /dev/null
+++ b/app/components/Views/Homepage/hooks/useTabViewedEvent.ts
@@ -0,0 +1,55 @@
+import { useCallback, useEffect, useRef } from 'react';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
+import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
+import { useHomepageScrollContext } from '../context/HomepageScrollContext';
+
+export const HomeTabNames = {
+  PORTFOLIO: 'portfolio',
+  PERPETUALS: 'perpetuals',
+  PREDICTIONS: 'predictions',
+} as const;
+
+export type HomeTabName = (typeof HomeTabNames)[keyof typeof HomeTabNames];
+
+/**
+ * Fires a `Home Viewed` Segment event with `interaction_type: 'tab_viewed'`
+ * whenever the active discovery tab changes or the component mounts.
+ *
+ * - `visit_number` increments with each homepage visit via `visitId` from HomepageScrollContext.
+ * - `active_ab_tests` is injected automatically by the analytics registry (HUB_PAGE_DISCOVERY_TABS_AB_TEST_ANALYTICS_MAPPING in abTestConfig.ts).
+ */
+const useTabViewedEvent = () => {
+  const { entryPoint, visitId, appSessionId } = useHomepageScrollContext();
+  const { trackEvent, createEventBuilder } = useAnalytics();
+
+  const entryPointRef = useRef(entryPoint);
+  entryPointRef.current = entryPoint;
+
+  const appSessionIdRef = useRef(appSessionId);
+  appSessionIdRef.current = appSessionId;
+
+  const visitIdRef = useRef(visitId);
+  visitIdRef.current = visitId;
+
+  const trackTabViewed = useCallback(
+    (name: HomeTabName) => {
+      trackEvent(
+        createEventBuilder(MetaMetricsEvents.HOME_VIEWED)
+          .addProperties({
+            interaction_type: 'tab_viewed',
+            location: 'home',
+            name,
+            entry_point: entryPointRef.current,
+            app_session_id: appSessionIdRef.current,
+            visit_number: visitIdRef.current,
+          })
+          .build(),
+      );
+    },
+    [trackEvent, createEventBuilder],
+  );
+
+  return { trackTabViewed };
+};
+
+export default useTabViewedEvent;
diff --git a/app/components/Views/LedgerSelectAccount/index.test.tsx b/app/components/Views/LedgerSelectAccount/index.test.tsx
index 662ad9397ba..52275c84893 100644
--- a/app/components/Views/LedgerSelectAccount/index.test.tsx
+++ b/app/components/Views/LedgerSelectAccount/index.test.tsx
@@ -20,11 +20,7 @@ import {
   LEDGER_LIVE_PATH,
 } from '../../../core/Ledger/constants';
 import { MetaMetricsEvents } from '../../../core/Analytics';
-import {
-  ACCOUNT_SELECTOR_FORGET_BUTTON,
-  ACCOUNT_SELECTOR_NEXT_BUTTON,
-  ACCOUNT_SELECTOR_PREVIOUS_BUTTON,
-} from '../../../../wdio/screen-objects/testIDs/Components/AccountSelector.testIds';
+import { AccountSelectorSelectorsIDs } from '../../UI/HardwareWallet/AccountSelector/AccountSelector.testIds';
 import { SELECT_DROP_DOWN } from '../../UI/SelectOptionSheet/constants';
 import { useHardwareWallet } from '../../../core/HardwareWallet';
 import { HardwareWalletType, ConnectionStatus } from '@metamask/hw-wallet-sdk';
@@ -353,9 +349,15 @@ describe('LedgerSelectAccount', () => {
 
       expect(queryByText('Select an account')).toBeOnTheScreen();
       expect(queryByText('Select HD Path')).toBeOnTheScreen();
-      expect(getByTestId(ACCOUNT_SELECTOR_NEXT_BUTTON)).toBeOnTheScreen();
-      expect(getByTestId(ACCOUNT_SELECTOR_PREVIOUS_BUTTON)).toBeOnTheScreen();
-      expect(getByTestId(ACCOUNT_SELECTOR_FORGET_BUTTON)).toBeOnTheScreen();
+      expect(
+        getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON),
+      ).toBeOnTheScreen();
+      expect(
+        getByTestId(AccountSelectorSelectorsIDs.PREVIOUS_BUTTON),
+      ).toBeOnTheScreen();
+      expect(
+        getByTestId(AccountSelectorSelectorsIDs.FORGET_BUTTON),
+      ).toBeOnTheScreen();
     });
 
     it('displays HD path selector dropdown', async () => {
@@ -373,7 +375,7 @@ describe('LedgerSelectAccount', () => {
       mockGetLedgerAccountsByOperation.mockResolvedValue(mockAccounts);
 
       await act(async () => {
-        fireEvent.press(getByTestId(ACCOUNT_SELECTOR_NEXT_BUTTON));
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON));
       });
 
       await waitFor(() => {
@@ -390,7 +392,9 @@ describe('LedgerSelectAccount', () => {
       mockGetLedgerAccountsByOperation.mockResolvedValue(mockAccounts);
 
       await act(async () => {
-        fireEvent.press(getByTestId(ACCOUNT_SELECTOR_PREVIOUS_BUTTON));
+        fireEvent.press(
+          getByTestId(AccountSelectorSelectorsIDs.PREVIOUS_BUTTON),
+        );
       });
 
       await waitFor(() => {
@@ -409,7 +413,7 @@ describe('LedgerSelectAccount', () => {
       );
 
       await act(async () => {
-        fireEvent.press(getByTestId(ACCOUNT_SELECTOR_NEXT_BUTTON));
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON));
       });
 
       await waitFor(() => {
@@ -427,7 +431,7 @@ describe('LedgerSelectAccount', () => {
       mockGetLedgerAccountsByOperation.mockReturnValue(slowPromise);
 
       await act(async () => {
-        fireEvent.press(getByTestId(ACCOUNT_SELECTOR_NEXT_BUTTON));
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON));
       });
 
       expect(queryByText('Please wait')).toBeOnTheScreen();
@@ -565,7 +569,7 @@ describe('LedgerSelectAccount', () => {
       const { getByTestId, queryByText } = await renderAndWaitForAccounts();
 
       await act(async () => {
-        fireEvent.press(getByTestId(ACCOUNT_SELECTOR_FORGET_BUTTON));
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.FORGET_BUTTON));
       });
 
       await waitFor(() => {
@@ -730,7 +734,7 @@ describe('LedgerSelectAccount', () => {
       mockGetLedgerAccountsByOperation.mockResolvedValue(mockAccounts);
 
       await act(async () => {
-        fireEvent.press(getByTestId(ACCOUNT_SELECTOR_NEXT_BUTTON));
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON));
       });
 
       expect(mockGetLedgerAccountsByOperation).toHaveBeenCalledWith(
@@ -741,7 +745,9 @@ describe('LedgerSelectAccount', () => {
       mockGetLedgerAccountsByOperation.mockResolvedValue(mockAccounts);
 
       await act(async () => {
-        fireEvent.press(getByTestId(ACCOUNT_SELECTOR_PREVIOUS_BUTTON));
+        fireEvent.press(
+          getByTestId(AccountSelectorSelectorsIDs.PREVIOUS_BUTTON),
+        );
       });
 
       expect(mockGetLedgerAccountsByOperation).toHaveBeenCalledWith(
@@ -755,7 +761,7 @@ describe('LedgerSelectAccount', () => {
       const { getByTestId, queryByText } = await renderAndWaitForAccounts();
 
       await act(async () => {
-        fireEvent.press(getByTestId(ACCOUNT_SELECTOR_FORGET_BUTTON));
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.FORGET_BUTTON));
       });
 
       await waitFor(() => {
@@ -769,7 +775,7 @@ describe('LedgerSelectAccount', () => {
       const { getByTestId, queryByText } = await renderAndWaitForAccounts();
 
       await act(async () => {
-        fireEvent.press(getByTestId(ACCOUNT_SELECTOR_FORGET_BUTTON));
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.FORGET_BUTTON));
       });
 
       expect(queryByText('Please wait')).toBeOnTheScreen();
@@ -786,7 +792,7 @@ describe('LedgerSelectAccount', () => {
       );
 
       await act(async () => {
-        fireEvent.press(getByTestId(ACCOUNT_SELECTOR_NEXT_BUTTON));
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON));
       });
 
       await waitFor(() => {
@@ -803,12 +809,138 @@ describe('LedgerSelectAccount', () => {
       );
 
       await act(async () => {
-        fireEvent.press(getByTestId(ACCOUNT_SELECTOR_PREVIOUS_BUTTON));
+        fireEvent.press(
+          getByTestId(AccountSelectorSelectorsIDs.PREVIOUS_BUTTON),
+        );
       });
 
       await waitFor(() => {
         expect(queryByText('Network error')).toBeOnTheScreen();
       });
     });
+
+    it('calls ensureDeviceReady before nextPage pagination', async () => {
+      const { getByTestId } = await renderAndWaitForAccounts();
+
+      mockEnsureDeviceReady.mockClear();
+      mockGetLedgerAccountsByOperation.mockClear();
+      mockGetLedgerAccountsByOperation.mockResolvedValue(mockAccounts);
+
+      await act(async () => {
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON));
+      });
+
+      await waitFor(() => {
+        expect(mockEnsureDeviceReady).toHaveBeenCalledWith('test-device-id');
+      });
+    });
+
+    it('calls ensureDeviceReady before prevPage pagination', async () => {
+      const { getByTestId } = await renderAndWaitForAccounts();
+
+      mockEnsureDeviceReady.mockClear();
+      mockGetLedgerAccountsByOperation.mockClear();
+      mockGetLedgerAccountsByOperation.mockResolvedValue(mockAccounts);
+
+      await act(async () => {
+        fireEvent.press(
+          getByTestId(AccountSelectorSelectorsIDs.PREVIOUS_BUTTON),
+        );
+      });
+
+      await waitFor(() => {
+        expect(mockEnsureDeviceReady).toHaveBeenCalledWith('test-device-id');
+      });
+    });
+
+    it('skips pagination when ensureDeviceReady returns false on nextPage', async () => {
+      const { getByTestId } = await renderAndWaitForAccounts();
+
+      mockEnsureDeviceReady.mockResolvedValue(false);
+      mockGetLedgerAccountsByOperation.mockClear();
+
+      await act(async () => {
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON));
+      });
+
+      await waitFor(() => {
+        expect(mockEnsureDeviceReady).toHaveBeenCalled();
+      });
+
+      expect(mockGetLedgerAccountsByOperation).not.toHaveBeenCalled();
+    });
+
+    it('skips pagination when ensureDeviceReady returns false on prevPage', async () => {
+      const { getByTestId } = await renderAndWaitForAccounts();
+
+      mockEnsureDeviceReady.mockResolvedValue(false);
+      mockGetLedgerAccountsByOperation.mockClear();
+
+      await act(async () => {
+        fireEvent.press(
+          getByTestId(AccountSelectorSelectorsIDs.PREVIOUS_BUTTON),
+        );
+      });
+
+      await waitFor(() => {
+        expect(mockEnsureDeviceReady).toHaveBeenCalled();
+      });
+
+      expect(mockGetLedgerAccountsByOperation).not.toHaveBeenCalled();
+    });
+
+    it('shows inline error when ensureDeviceReady throws during nextPage without blocking modal', async () => {
+      mockEnsureDeviceReady
+        .mockResolvedValueOnce(true)
+        .mockRejectedValueOnce(new Error('Device readiness check failed'));
+
+      const { getByTestId, queryByText } = await renderAndWaitForAccounts();
+
+      await act(async () => {
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON));
+      });
+
+      await waitFor(() => {
+        expect(queryByText('Device readiness check failed')).toBeOnTheScreen();
+      });
+      expect(queryByText('Please wait')).not.toBeOnTheScreen();
+    });
+
+    it('shows inline error when ensureDeviceReady throws during prevPage without blocking modal', async () => {
+      mockEnsureDeviceReady
+        .mockResolvedValueOnce(true)
+        .mockRejectedValueOnce(new Error('Bluetooth adapter unavailable'));
+
+      const { getByTestId, queryByText } = await renderAndWaitForAccounts();
+
+      await act(async () => {
+        fireEvent.press(
+          getByTestId(AccountSelectorSelectorsIDs.PREVIOUS_BUTTON),
+        );
+      });
+
+      await waitFor(() => {
+        expect(queryByText('Bluetooth adapter unavailable')).toBeOnTheScreen();
+      });
+      expect(queryByText('Please wait')).not.toBeOnTheScreen();
+    });
+
+    it('does not show blocking modal when ensureDeviceReady returns false on nextPage', async () => {
+      mockEnsureDeviceReady
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
+
+      const { getByTestId, queryByText } = await renderAndWaitForAccounts();
+
+      await act(async () => {
+        fireEvent.press(getByTestId(AccountSelectorSelectorsIDs.NEXT_BUTTON));
+      });
+
+      await waitFor(() => {
+        expect(mockEnsureDeviceReady).toHaveBeenCalled();
+      });
+
+      expect(queryByText('Please wait')).not.toBeOnTheScreen();
+    });
   });
 });
diff --git a/app/components/Views/LedgerSelectAccount/index.tsx b/app/components/Views/LedgerSelectAccount/index.tsx
index 10ce014f578..5c32be1798f 100644
--- a/app/components/Views/LedgerSelectAccount/index.tsx
+++ b/app/components/Views/LedgerSelectAccount/index.tsx
@@ -222,8 +222,13 @@ const LedgerSelectAccount = () => {
   }, [selectedOption]);
 
   const nextPage = useCallback(async () => {
-    showLoadingModal();
+    let modalShown = false;
     try {
+      const isReady = await ensureDeviceReady(deviceId);
+      if (!isReady) return;
+
+      showLoadingModal();
+      modalShown = true;
       const _accounts = await getLedgerAccountsByOperation(
         PAGINATION_OPERATIONS.GET_NEXT_PAGE,
       );
@@ -231,13 +236,20 @@ const LedgerSelectAccount = () => {
     } catch (e) {
       setErrorMsg((e as Error).message);
     } finally {
-      setBlockingModalVisible(false);
+      if (modalShown) {
+        setBlockingModalVisible(false);
+      }
     }
-  }, []);
+  }, [ensureDeviceReady, deviceId]);
 
   const prevPage = useCallback(async () => {
-    showLoadingModal();
+    let modalShown = false;
     try {
+      const isReady = await ensureDeviceReady(deviceId);
+      if (!isReady) return;
+
+      showLoadingModal();
+      modalShown = true;
       const _accounts = await getLedgerAccountsByOperation(
         PAGINATION_OPERATIONS.GET_PREVIOUS_PAGE,
       );
@@ -245,9 +257,11 @@ const LedgerSelectAccount = () => {
     } catch (e) {
       setErrorMsg((e as Error).message);
     } finally {
-      setBlockingModalVisible(false);
+      if (modalShown) {
+        setBlockingModalVisible(false);
+      }
     }
-  }, []);
+  }, [ensureDeviceReady, deviceId]);
 
   const updateNewLegacyAccountsLabel = useCallback(async () => {
     if (LEDGER_LEGACY_PATH === (await getHDPath())) {
diff --git a/app/components/Views/Login/index.tsx b/app/components/Views/Login/index.tsx
index 07c49838810..0b5e4829d36 100644
--- a/app/components/Views/Login/index.tsx
+++ b/app/components/Views/Login/index.tsx
@@ -11,6 +11,7 @@ import {
   TouchableOpacity,
   Platform,
   Image,
+  TextInput,
 } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import METAMASK_NAME from '../../../images/branding/metamask-name.png';
@@ -100,7 +101,7 @@ interface LoginProps {
  * View where returning users can authenticate
  */
 const Login: React.FC<LoginProps> = ({ saveOnboardingEvent }) => {
-  const fieldRef = useRef<React.ElementRef<typeof TextField> | null>(null);
+  const fieldRef = useRef<TextInput | null>(null);
 
   const [password, setPassword] = useState('');
   const [loading, setLoading] = useState(false);
@@ -421,15 +422,9 @@ const Login: React.FC<LoginProps> = ({ saveOnboardingEvent }) => {
             >
               <TextField
                 placeholder={strings('login.password_placeholder')}
-                testID={LoginViewSelectors.PASSWORD_INPUT}
-                accessibilityLabel={LoginViewSelectors.PASSWORD_INPUT}
-                returnKeyType={'done'}
-                autoCapitalize="none"
-                secureTextEntry
-                ref={fieldRef}
+                inputRef={fieldRef}
                 onChangeText={handlePasswordChange}
                 value={password}
-                onSubmitEditing={unlockWithPassword}
                 endAccessory={
                   capabilities ? (
                     <DeviceAuthenticationButton
@@ -440,9 +435,17 @@ const Login: React.FC<LoginProps> = ({ saveOnboardingEvent }) => {
                     />
                   ) : null
                 }
-                keyboardAppearance={themeAppearance}
                 isError={!!error}
                 isDisabled={loading}
+                inputProps={{
+                  testID: LoginViewSelectors.PASSWORD_INPUT,
+                  accessibilityLabel: LoginViewSelectors.PASSWORD_INPUT,
+                  returnKeyType: 'done',
+                  autoCapitalize: 'none',
+                  secureTextEntry: true,
+                  onSubmitEditing: unlockWithPassword,
+                  keyboardAppearance: themeAppearance,
+                }}
               />
             </Box>
 
diff --git a/app/components/Views/ManualBackupStep1/index.tsx b/app/components/Views/ManualBackupStep1/index.tsx
index d8dff85b1a9..7f7b1de0d43 100644
--- a/app/components/Views/ManualBackupStep1/index.tsx
+++ b/app/components/Views/ManualBackupStep1/index.tsx
@@ -322,15 +322,16 @@ const ManualBackupStep1 = () => {
                 placeholder={strings('manual_backup_step_1.password')}
                 value={password}
                 onChangeText={onPasswordChange}
-                secureTextEntry
-                onSubmitEditing={tryUnlock}
-                testID={ManualBackUpStepsSelectorsIDs.CONFIRM_PASSWORD_INPUT}
-                accessibilityLabel={
-                  ManualBackUpStepsSelectorsIDs.CONFIRM_PASSWORD_INPUT
-                }
-                keyboardAppearance={themeAppearance}
-                autoCapitalize="none"
                 autoFocus
+                inputProps={{
+                  secureTextEntry: true,
+                  onSubmitEditing: tryUnlock,
+                  testID: ManualBackUpStepsSelectorsIDs.CONFIRM_PASSWORD_INPUT,
+                  accessibilityLabel:
+                    ManualBackUpStepsSelectorsIDs.CONFIRM_PASSWORD_INPUT,
+                  keyboardAppearance: themeAppearance,
+                  autoCapitalize: 'none',
+                }}
               />
               {warningIncorrectPassword && (
                 <Text
diff --git a/app/components/Views/MultichainAccounts/sheets/EditAccountName.testIds.ts b/app/components/Views/MultichainAccounts/sheets/EditAccountName.testIds.ts
index d1cd888882b..f8a8123a08a 100644
--- a/app/components/Views/MultichainAccounts/sheets/EditAccountName.testIds.ts
+++ b/app/components/Views/MultichainAccounts/sheets/EditAccountName.testIds.ts
@@ -2,4 +2,5 @@ export const EditAccountNameIds = {
   EDIT_ACCOUNT_NAME_CONTAINER: 'edit-account-name-container',
   ACCOUNT_NAME_INPUT: 'edit-account-name-input',
   SAVE_BUTTON: 'edit-account-name-save-button',
+  BACK_BUTTON: 'edit-multichain-account-name-back-button',
 };
diff --git a/app/components/Views/MultichainAccounts/sheets/EditMultichainAccountName/EditMultichainAccountName.styles.ts b/app/components/Views/MultichainAccounts/sheets/EditMultichainAccountName/EditMultichainAccountName.styles.ts
deleted file mode 100644
index c8f575dccd1..00000000000
--- a/app/components/Views/MultichainAccounts/sheets/EditMultichainAccountName/EditMultichainAccountName.styles.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Theme } from '../../../../../util/theme/models';
-import { Platform, StatusBar, StyleSheet } from 'react-native';
-
-const styleSheet = (params: { theme: Theme }) => {
-  const { theme } = params;
-  const { colors } = theme;
-
-  return StyleSheet.create({
-    safeArea: {
-      paddingTop: Platform.OS === 'android' ? StatusBar.currentHeight : 0,
-      flex: 1,
-      backgroundColor: colors.background.default,
-    },
-    keyboardAvoidingView: {
-      flex: 1,
-      justifyContent: 'space-between',
-    },
-    contentContainer: {
-      marginTop: 16,
-      paddingLeft: 24,
-      paddingRight: 24,
-      gap: 16,
-    },
-    input: {
-      borderRadius: 8,
-      borderWidth: 2,
-      width: '100%',
-      borderColor: colors.border.default,
-      padding: 10,
-      height: 40,
-      color: colors.text.default,
-    },
-    saveButtonContainer: {
-      paddingHorizontal: 24,
-      marginTop: 16,
-      paddingVertical: 10,
-      width: '100%',
-    },
-    header: {
-      display: 'flex',
-      flexDirection: 'row',
-      alignItems: 'center',
-      justifyContent: 'center',
-      margin: 16,
-    },
-  });
-};
-
-export default styleSheet;
diff --git a/app/components/Views/MultichainAccounts/sheets/EditMultichainAccountName/EditMultichainAccountName.test.tsx b/app/components/Views/MultichainAccounts/sheets/EditMultichainAccountName/EditMultichainAccountName.test.tsx
index 1363eb99450..3b0e0bdc3d7 100644
--- a/app/components/Views/MultichainAccounts/sheets/EditMultichainAccountName/EditMultichainAccountName.test.tsx
+++ b/app/components/Views/MultichainAccounts/sheets/EditMultichainAccountName/EditMultichainAccountName.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { fireEvent } from '@testing-library/react-native';
+import { Platform, StatusBar } from 'react-native';
 import { EditMultichainAccountName } from './EditMultichainAccountName';
 import { strings } from '../../../../../../locales/i18n';
 import { EditAccountNameIds } from '../EditAccountName.testIds';
@@ -37,12 +38,29 @@ jest.mock('../../../../../core/Engine', () => ({
 }));
 
 describe('EditMultichainAccountName', () => {
+  const originalPlatformOs = Platform.OS;
+  const originalStatusBarCurrentHeight = StatusBar.currentHeight;
   const render = () => renderWithProvider(<EditMultichainAccountName />);
 
   beforeEach(() => {
     jest.clearAllMocks();
     mockSetAccountGroupName.mockReset();
     mockUseRoute.mockReturnValue(mockRoute);
+    Platform.OS = 'ios';
+    Object.defineProperty(StatusBar, 'currentHeight', {
+      configurable: true,
+      writable: true,
+      value: originalStatusBarCurrentHeight,
+    });
+  });
+
+  afterAll(() => {
+    Platform.OS = originalPlatformOs;
+    Object.defineProperty(StatusBar, 'currentHeight', {
+      configurable: true,
+      writable: true,
+      value: originalStatusBarCurrentHeight,
+    });
   });
 
   describe('rendering', () => {
@@ -85,9 +103,9 @@ describe('EditMultichainAccountName', () => {
     });
 
     it('navigates back when back button is pressed', () => {
-      const { getByRole } = render();
+      const { getByTestId } = render();
 
-      const backButton = getByRole('button');
+      const backButton = getByTestId(EditAccountNameIds.BACK_BUTTON);
       fireEvent.press(backButton);
 
       expect(mockGoBack).toHaveBeenCalledTimes(1);
@@ -235,5 +253,28 @@ describe('EditMultichainAccountName', () => {
       const nameInput = getByTestId(EditAccountNameIds.ACCOUNT_NAME_INPUT);
       expect(nameInput.props.value).toBe('');
     });
+
+    it('renders fallback header when route omits account group', () => {
+      mockUseRoute.mockReturnValue({
+        params: {},
+      } as typeof mockRoute);
+
+      const { getByText } = render();
+      expect(getByText('Account Group')).toBeOnTheScreen();
+    });
+  });
+
+  describe('platform-specific layout', () => {
+    it('renders on Android with status bar inset and keyboard avoiding height behavior', () => {
+      Platform.OS = 'android';
+      Object.defineProperty(StatusBar, 'currentHeight', {
+        configurable: true,
+        writable: true,
+        value: 24,
+      });
+
+      const { getByTestId } = render();
+      expect(getByTestId(EditAccountNameIds.BACK_BUTTON)).toBeOnTheScreen();
+    });
   });
 });
diff --git a/app/components/Views/MultichainAccounts/sheets/EditMultichainAccountName/EditMultichainAccountName.tsx b/app/components/Views/MultichainAccounts/sheets/EditMultichainAccountName/EditMultichainAccountName.tsx
index 92c4ed85f12..a178d619dd1 100644
--- a/app/components/Views/MultichainAccounts/sheets/EditMultichainAccountName/EditMultichainAccountName.tsx
+++ b/app/components/Views/MultichainAccounts/sheets/EditMultichainAccountName/EditMultichainAccountName.tsx
@@ -1,5 +1,11 @@
 import React, { useCallback, useState } from 'react';
 import { useSelector } from 'react-redux';
+import {
+  KeyboardAvoidingView,
+  Platform,
+  StatusBar,
+  TextInput,
+} from 'react-native';
 import { strings } from '../../../../../../locales/i18n';
 import Engine from '../../../../../core/Engine';
 import {
@@ -8,31 +14,28 @@ import {
   useNavigation,
   useRoute,
 } from '@react-navigation/native';
-import Text, {
-  TextColor,
-  TextVariant,
-} from '../../../../../component-library/components/Texts/Text';
-import { Box } from '../../../../UI/Box/Box';
 import {
+  Box,
+  BoxFlexDirection,
   Button,
+  ButtonIcon,
+  ButtonIconSize,
+  ButtonSize,
   ButtonVariant,
-  ButtonBaseSize,
+  HeaderBase,
+  IconName,
+  Text,
+  TextColor,
+  TextVariant,
+  FontWeight,
 } from '@metamask/design-system-react-native';
-import styleSheet from './EditMultichainAccountName.styles';
-import { useStyles } from '../../../../hooks/useStyles';
-import { useTheme } from '../../../../../util/theme';
-import { TextInput, KeyboardAvoidingView, Platform } from 'react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { EditAccountNameIds } from '../EditAccountName.testIds';
 import { AccountGroupObject } from '@metamask/account-tree-controller';
 import { RootState } from '../../../../../reducers';
 import { selectAccountGroupById } from '../../../../../selectors/multichainAccounts/accountTreeController';
-import HeaderBase from '../../../../../component-library/components/HeaderBase/HeaderBase';
-import ButtonLink from '../../../../../component-library/components/Buttons/Button/variants/ButtonLink';
-import Icon, {
-  IconName,
-  IconSize,
-} from '../../../../../component-library/components/Icons/Icon';
+import { useTheme } from '../../../../../util/theme';
 
 interface RootNavigationParamList extends ParamListBase {
   EditMultichainAccountName: {
@@ -46,7 +49,7 @@ type EditMultichainAccountNameRouteProp = RouteProp<
 >;
 
 export const EditMultichainAccountName = () => {
-  const { styles } = useStyles(styleSheet, {});
+  const tw = useTailwind();
   const { colors, themeAppearance } = useTheme();
   const route = useRoute<EditMultichainAccountNameRouteProp>();
   const { accountGroup: initialAccountGroup } = route.params;
@@ -65,6 +68,18 @@ export const EditMultichainAccountName = () => {
   const [accountName, setAccountName] = useState(initialName);
   const [error, setError] = useState<string | null>(null);
 
+  const safeAreaStyle = tw.style(
+    'flex-1 bg-default',
+    Platform.OS === 'android' && StatusBar.currentHeight
+      ? { paddingTop: StatusBar.currentHeight }
+      : undefined,
+  );
+
+  const inputStyle = tw.style(
+    'h-10 w-full rounded-lg border-2 border-default p-2.5',
+    { color: colors.text.default },
+  );
+
   const handleAccountNameChange = useCallback(() => {
     // Validate that account name is not empty
     if (!accountName || accountName.trim() === '') {
@@ -93,13 +108,14 @@ export const EditMultichainAccountName = () => {
   }, [accountName, accountGroup, navigation]);
 
   return (
-    <SafeAreaView style={styles.safeArea}>
+    <SafeAreaView style={safeAreaStyle}>
       <HeaderBase
-        style={styles.header}
+        twClassName="m-4 flex-row items-center justify-center"
         startAccessory={
-          <ButtonLink
-            labelTextVariant={TextVariant.BodyMDMedium}
-            label={<Icon name={IconName.ArrowLeft} size={IconSize.Md} />}
+          <ButtonIcon
+            testID={EditAccountNameIds.BACK_BUTTON}
+            iconName={IconName.ArrowLeft}
+            size={ButtonIconSize.Md}
             onPress={() => navigation.goBack()}
           />
         }
@@ -107,19 +123,20 @@ export const EditMultichainAccountName = () => {
         {accountGroup?.metadata?.name || 'Account Group'}
       </HeaderBase>
       <KeyboardAvoidingView
-        style={styles.keyboardAvoidingView}
+        style={tw.style('flex-1 justify-between')}
         behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
       >
         <Box
-          style={styles.contentContainer}
+          flexDirection={BoxFlexDirection.Column}
+          twClassName="mt-4 gap-4 px-6"
           testID={EditAccountNameIds.EDIT_ACCOUNT_NAME_CONTAINER}
         >
-          <Text variant={TextVariant.BodyMDMedium}>
+          <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
             {strings('multichain_accounts.edit_account_name.account_name')}
           </Text>
           <TextInput
             testID={EditAccountNameIds.ACCOUNT_NAME_INPUT}
-            style={styles.input}
+            style={inputStyle}
             value={accountName}
             onChangeText={(newName: string) => {
               setAccountName(newName);
@@ -136,13 +153,13 @@ export const EditMultichainAccountName = () => {
             autoFocus
             editable
           />
-          {error && <Text color={TextColor.Error}>{error}</Text>}
+          {error ? <Text color={TextColor.ErrorDefault}>{error}</Text> : null}
         </Box>
-        <Box style={styles.saveButtonContainer}>
+        <Box twClassName="mt-4 w-full px-6 py-2.5">
           <Button
             isFullWidth
             variant={ButtonVariant.Primary}
-            size={ButtonBaseSize.Lg}
+            size={ButtonSize.Lg}
             onPress={handleAccountNameChange}
             testID={EditAccountNameIds.SAVE_BUTTON}
           >
diff --git a/app/components/Views/MultichainAccounts/sheets/RevealSRP/RevealSRP.styles.ts b/app/components/Views/MultichainAccounts/sheets/RevealSRP/RevealSRP.styles.ts
deleted file mode 100644
index 967751b0efa..00000000000
--- a/app/components/Views/MultichainAccounts/sheets/RevealSRP/RevealSRP.styles.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Third party dependencies.
-import { Insets, Platform, StatusBar, StyleSheet } from 'react-native';
-
-const styleSheet = (params: { vars: { insets: Insets } }) => {
-  const { vars } = params;
-  const { insets } = vars;
-
-  return StyleSheet.create({
-    container: {
-      flex: 1,
-      paddingLeft: 16,
-      paddingRight: 16,
-      paddingTop: Platform.OS === 'android' ? StatusBar.currentHeight : 0,
-      paddingBottom: Platform.OS === 'android' ? 10 : insets.bottom,
-    },
-    headerContainer: {
-      display: 'flex',
-      flexDirection: 'row',
-      alignItems: 'center',
-      paddingLeft: 16,
-      paddingRight: 16,
-    },
-    contentContainer: {
-      display: 'flex',
-      flexDirection: 'column',
-      alignItems: 'center',
-      justifyContent: 'center',
-      marginBottom: 'auto',
-      paddingLeft: 16,
-      paddingRight: 16,
-      gap: 16,
-    },
-    securityQuizLockImage: {
-      marginTop: 46,
-      marginBottom: 46,
-      marginLeft: 60,
-      marginRight: 60,
-    },
-    buttonContainer: {
-      marginTop: 'auto',
-      marginBottom: Platform.OS === 'android' ? 12 : 0,
-      paddingLeft: 16,
-      paddingRight: 16,
-      gap: 16,
-    },
-    button: {
-      width: '100%',
-    },
-  });
-};
-
-export default styleSheet;
diff --git a/app/components/Views/MultichainAccounts/sheets/RevealSRP/RevealSRP.test.tsx b/app/components/Views/MultichainAccounts/sheets/RevealSRP/RevealSRP.test.tsx
index 82d6ec20271..edc9b4b1639 100644
--- a/app/components/Views/MultichainAccounts/sheets/RevealSRP/RevealSRP.test.tsx
+++ b/app/components/Views/MultichainAccounts/sheets/RevealSRP/RevealSRP.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { fireEvent } from '@testing-library/react-native';
+import { Platform, StatusBar } from 'react-native';
 import { RevealSRP } from './RevealSRP';
 import { createMockInternalAccount } from '../../../../../util/test/accountsControllerTestUtils';
 import { EthAccountType } from '@metamask/keyring-api';
@@ -21,6 +22,10 @@ jest.mock('react-native', () => {
       removeEventListener: jest.fn(),
       getInitialURL: jest.fn(() => Promise.resolve()),
     },
+    Platform: {
+      ...RN.Platform,
+      OS: 'ios',
+    },
   };
 });
 
@@ -55,10 +60,28 @@ jest.mock('../../../../hooks/useKeyringId', () => ({
 const render = () => renderWithProvider(<RevealSRP />);
 
 describe('RevealSRP', () => {
+  const originalPlatformOs = Platform.OS;
+  const originalStatusBarCurrentHeight = StatusBar.currentHeight;
+
   beforeEach(() => {
     jest.clearAllMocks();
     // Re-establish the default return value after clearing mocks
     mockUseKeyringId.mockReturnValue('test-keyring-id');
+    Platform.OS = 'ios';
+    Object.defineProperty(StatusBar, 'currentHeight', {
+      configurable: true,
+      writable: true,
+      value: originalStatusBarCurrentHeight,
+    });
+  });
+
+  afterAll(() => {
+    Platform.OS = originalPlatformOs;
+    Object.defineProperty(StatusBar, 'currentHeight', {
+      configurable: true,
+      writable: true,
+      value: originalStatusBarCurrentHeight,
+    });
   });
 
   it('navigates back when back button is pressed', () => {
@@ -99,4 +122,28 @@ describe('RevealSRP', () => {
       },
     });
   });
+
+  it('renders on Android when status bar height is available', () => {
+    Platform.OS = 'android';
+    Object.defineProperty(StatusBar, 'currentHeight', {
+      configurable: true,
+      writable: true,
+      value: 24,
+    });
+
+    const { getByTestId } = render();
+    expect(getByTestId(AccountDetailsIds.BACK_BUTTON)).toBeOnTheScreen();
+  });
+
+  it('renders on Android when status bar height is unavailable', () => {
+    Platform.OS = 'android';
+    Object.defineProperty(StatusBar, 'currentHeight', {
+      configurable: true,
+      writable: true,
+      value: undefined,
+    });
+
+    const { getByTestId } = render();
+    expect(getByTestId(AccountDetailsIds.BACK_BUTTON)).toBeOnTheScreen();
+  });
 });
diff --git a/app/components/Views/MultichainAccounts/sheets/RevealSRP/RevealSRP.tsx b/app/components/Views/MultichainAccounts/sheets/RevealSRP/RevealSRP.tsx
index a086d5a5fc7..1c4cf4c7726 100644
--- a/app/components/Views/MultichainAccounts/sheets/RevealSRP/RevealSRP.tsx
+++ b/app/components/Views/MultichainAccounts/sheets/RevealSRP/RevealSRP.tsx
@@ -1,6 +1,5 @@
-import React, { useCallback } from 'react';
-import { View } from 'react-native';
-import { Box } from '../../../../UI/Box/Box';
+import React, { useCallback, useMemo } from 'react';
+import { Platform, StatusBar } from 'react-native';
 import { InternalAccount } from '@metamask/keyring-internal-api';
 import {
   SafeAreaView,
@@ -8,33 +7,33 @@ import {
 } from 'react-native-safe-area-context';
 import { strings } from '../../../../../../locales/i18n';
 import { AccountDetailsIds } from '../../AccountDetails.testIds';
-import { AlignItems, FlexDirection } from '../../../../UI/Box/box.types';
-import ButtonPrimary from '../../../../../component-library/components/Buttons/Button/variants/ButtonPrimary';
-import ButtonSecondary from '../../../../../component-library/components/Buttons/Button/variants/ButtonSecondary';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  Button,
+  ButtonIcon,
+  ButtonIconSize,
+  ButtonSize,
+  ButtonVariant,
+  HeaderBase,
+  IconName,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import {
   ParamListBase,
   RouteProp,
   useNavigation,
   useRoute,
 } from '@react-navigation/native';
-import HeaderBase from '../../../../../component-library/components/HeaderBase';
-import ButtonLink from '../../../../../component-library/components/Buttons/Button/variants/ButtonLink';
-import Text, {
-  TextColor,
-  TextVariant,
-} from '../../../../../component-library/components/Texts/Text';
-import Icon, {
-  IconName,
-  IconSize,
-} from '../../../../../component-library/components/Icons/Icon';
 import Routes from '../../../../../constants/navigation/Routes';
-import { useStyles } from '../../../../../component-library/hooks/useStyles';
-import styleSheet from './RevealSRP.styles';
-import { useKeyringId } from '../../../../hooks/useKeyringId';
 import SecurityQuizLockImage from '../../../../../images/security-quiz-intro-lock.svg';
-import { ButtonSize } from '../../../../../component-library/components/Buttons/Button';
 import { SRP_GUIDE_URL } from '../../../../../constants/urls';
 import { ExportCredentialsIds } from '../../AccountDetails/ExportCredentials.testIds';
+import { useKeyringId } from '../../../../hooks/useKeyringId';
 
 interface RootNavigationParamList extends ParamListBase {
   RevealSRP: {
@@ -48,11 +47,25 @@ export const RevealSRP = () => {
   const route = useRoute<RevealSRPProp>();
   const { account } = route.params;
   const insets = useSafeAreaInsets();
-  const { styles } = useStyles(styleSheet, { insets });
+  const tw = useTailwind();
   const { navigate, goBack } = useNavigation();
 
   const keyringId = useKeyringId(account);
 
+  const containerStyle = useMemo(
+    () =>
+      tw.style(
+        'flex-1 px-4',
+        Platform.OS === 'android' && StatusBar.currentHeight
+          ? { paddingTop: StatusBar.currentHeight }
+          : undefined,
+        {
+          paddingBottom: Platform.OS === 'android' ? 10 : insets.bottom,
+        },
+      ),
+    [insets.bottom, tw],
+  );
+
   const handleLearnMoreClick = useCallback(() => {
     navigate(Routes.WEBVIEW.MAIN, {
       screen: Routes.WEBVIEW.SIMPLE,
@@ -74,52 +87,67 @@ export const RevealSRP = () => {
   }, [keyringId, navigate]);
 
   return (
-    <SafeAreaView edges={{ bottom: 'additive' }} style={styles.container}>
+    <SafeAreaView edges={{ bottom: 'additive' }} style={containerStyle}>
       <HeaderBase
-        style={styles.headerContainer}
+        twClassName="flex-row items-center px-4"
         startAccessory={
-          <ButtonLink
+          <ButtonIcon
             testID={AccountDetailsIds.BACK_BUTTON}
-            labelTextVariant={TextVariant.HeadingMD}
-            label={<Icon name={IconName.ArrowLeft} size={IconSize.Md} />}
+            iconName={IconName.ArrowLeft}
+            size={ButtonIconSize.Md}
             onPress={handleBackClick}
           />
         }
       >
         {strings('multichain_accounts.reveal_srp.header')}
       </HeaderBase>
-      <View
-        style={styles.contentContainer}
+      <Box
+        flexDirection={BoxFlexDirection.Column}
+        alignItems={BoxAlignItems.Center}
+        twClassName="mb-auto grow justify-center gap-4 px-4"
         testID={ExportCredentialsIds.CONTAINER}
       >
-        <SecurityQuizLockImage
-          name="security-quiz-lock"
-          style={styles.securityQuizLockImage}
-          height={200}
-          width={190}
-        />
-        <Text variant={TextVariant.BodyMD} color={TextColor.Alternative}>
+        <Box twClassName="mx-[60px] my-[46px]">
+          <SecurityQuizLockImage
+            name="security-quiz-lock"
+            height={200}
+            width={190}
+          />
+        </Box>
+        <Text
+          variant={TextVariant.BodyMd}
+          color={TextColor.TextAlternative}
+          twClassName="text-center"
+        >
           {strings('multichain_accounts.reveal_srp.description')}
         </Text>
-      </View>
+      </Box>
       <Box
-        style={styles.buttonContainer}
-        flexDirection={FlexDirection.Column}
-        alignItems={AlignItems.center}
+        flexDirection={BoxFlexDirection.Column}
+        alignItems={BoxAlignItems.Stretch}
+        style={tw.style(
+          'mt-auto w-full gap-4 px-4',
+          Platform.OS === 'android' && 'pb-3',
+        )}
       >
-        <ButtonPrimary
-          style={styles.button}
+        <Button
+          variant={ButtonVariant.Primary}
           size={ButtonSize.Lg}
-          label={strings('multichain_accounts.reveal_srp.get_started')}
+          isFullWidth
           onPress={handleGetStartedClick}
           testID={ExportCredentialsIds.NEXT_BUTTON}
-        />
-        <ButtonSecondary
-          style={styles.button}
-          label={strings('multichain_accounts.reveal_srp.learn_more')}
+        >
+          {strings('multichain_accounts.reveal_srp.get_started')}
+        </Button>
+        <Button
+          variant={ButtonVariant.Secondary}
+          size={ButtonSize.Lg}
+          isFullWidth
           onPress={handleLearnMoreClick}
           testID={ExportCredentialsIds.LEARN_MORE_BUTTON}
-        />
+        >
+          {strings('multichain_accounts.reveal_srp.learn_more')}
+        </Button>
       </Box>
     </SafeAreaView>
   );
diff --git a/app/components/Views/NftDetails/NftDetails.test.ts b/app/components/Views/NftDetails/NftDetails.test.ts
index c62a4cacea8..752958b9330 100644
--- a/app/components/Views/NftDetails/NftDetails.test.ts
+++ b/app/components/Views/NftDetails/NftDetails.test.ts
@@ -205,6 +205,7 @@ describe('NftDetails', () => {
     );
 
     expect(getByText(TEST_COLLECTIBLE.name)).toBeOnTheScreen();
+    expect(getByText(TEST_COLLECTIBLE.collection.name)).toBeOnTheScreen();
   });
 
   it('tracks NFT Details Opened event with mobile-nft-list source', () => {
diff --git a/app/components/Views/NftDetails/NftDetails.tsx b/app/components/Views/NftDetails/NftDetails.tsx
index e89661cd859..129c204e7ab 100644
--- a/app/components/Views/NftDetails/NftDetails.tsx
+++ b/app/components/Views/NftDetails/NftDetails.tsx
@@ -528,6 +528,12 @@ const NftDetails = () => {
             </Text>
           ) : null}
 
+          <NftDetailsInformationRow
+            title={strings('collectible.collection')}
+            value={collectible.collection?.name}
+            titleStyle={styles.informationRowTitleStyle}
+            valueStyle={styles.informationRowValueStyle}
+          />
           <NftDetailsInformationRow
             title={strings('nft_details.unique_token_holders')}
             value={collectible.collection?.ownerCount}
diff --git a/app/components/Views/Notifications/NotificationsView.view.test.tsx b/app/components/Views/Notifications/NotificationsView.view.test.tsx
new file mode 100644
index 00000000000..be9c1faae83
--- /dev/null
+++ b/app/components/Views/Notifications/NotificationsView.view.test.tsx
@@ -0,0 +1,169 @@
+import '../../../../tests/component-view/mocks';
+import React from 'react';
+import { FlatList, Text, View } from 'react-native';
+import { useNavigation, useRoute } from '@react-navigation/native';
+import { fireEvent, waitFor } from '@testing-library/react-native';
+
+import { renderScreenWithRoutes } from '../../../../tests/component-view/render';
+import { describeForPlatforms } from '../../../../tests/component-view/platform';
+import {
+  buildNotificationsState,
+  MOCK_NOTIFICATIONS,
+} from '../../../../tests/component-view/presets/notifications';
+import {
+  MOCK_FEATURE_ANNOUNCEMENT_NOTIFICATIONS,
+  MOCK_ON_CHAIN_NOTIFICATIONS,
+} from '../../../components/UI/Notification/__mocks__/mock_notifications';
+import Routes from '../../../constants/navigation/Routes';
+import { NotificationMenuViewSelectorsIDs } from './NotificationMenuView.testIds';
+import { NotificationsViewSelectorsIDs } from './NotificationsView.testIds';
+import NotificationsView from './';
+
+/**
+ * Component-view coverage for smoke `enable-notifications-after-onboarding`.
+ *
+ * Smoke spec: tests/smoke/notifications/enable-notifications-after-onboarding.spec.ts
+ *
+ * Notifications are seeded into Redux via `buildNotificationsState` (controllers
+ * + remote feature flag), mirroring what the smoke E2E gets via
+ * `mockNotificationServices` mockttp responses — no nock needed at the view
+ * layer. `IS_TEST=true` (set at config-load time in `jest.config.view.js`)
+ * flips `isNotificationsFeatureEnabled` on without mocking the config module.
+ */
+
+const NOTIFICATIONS_DETAILS_PROBE_TEST_ID = 'notifications-details-probe';
+const NOTIFICATIONS_DETAILS_PROBE_ID_TEST_ID = 'notifications-details-probe-id';
+const NOTIFICATIONS_DETAILS_BACK_TEST_ID =
+  'notifications-details-probe-back-button';
+
+/**
+ * Lightweight `NotificationsDetails` stand-in. Avoids needing the real
+ * `NotificationComponentState` machinery (block-explorer footers, asset rows…)
+ * unrelated to this flow. Mirrors the back-navigation contract that
+ * `NotificationDetailsView.tapOnBackButton()` exercises in the smoke spec.
+ */
+function NotificationsDetailsProbe() {
+  const route = useRoute();
+  const navigation = useNavigation();
+  const params = route.params as { notification?: { id?: string } } | undefined;
+  return (
+    <View testID={NOTIFICATIONS_DETAILS_PROBE_TEST_ID}>
+      <Text>Notification Details</Text>
+      <Text testID={NOTIFICATIONS_DETAILS_PROBE_ID_TEST_ID}>
+        {params?.notification?.id ?? ''}
+      </Text>
+      <Text
+        testID={NOTIFICATIONS_DETAILS_BACK_TEST_ID}
+        onPress={() => navigation.goBack()}
+      >
+        Back
+      </Text>
+    </View>
+  );
+}
+
+function renderNotificationsScreen(
+  notifications: typeof MOCK_NOTIFICATIONS = MOCK_NOTIFICATIONS,
+) {
+  return renderScreenWithRoutes(
+    NotificationsView as unknown as React.ComponentType,
+    { name: 'NotificationsView' },
+    [
+      {
+        name: Routes.NOTIFICATIONS.DETAILS,
+        Component: NotificationsDetailsProbe,
+      },
+    ],
+    { state: buildNotificationsState({ notifications }) },
+  );
+}
+
+describeForPlatforms('Notifications view (list + details flow)', () => {
+  /**
+   * The smoke spec inspects the rendered list of notifications. In jest,
+   * `FlatList` never receives layout metrics so it only renders the first row
+   * — instead of fighting virtualization we assert on the FlatList `data`
+   * prop, which is the same source the device-rendered list reads from.
+   */
+  it('exposes the full seeded notifications list to the FlatList data source', () => {
+    const result = renderNotificationsScreen();
+    const flatList = result.UNSAFE_getByType(FlatList);
+
+    expect(
+      result.getByTestId(NotificationsViewSelectorsIDs.NOTIFICATIONS_CONTAINER),
+    ).toBeOnTheScreen();
+
+    const data = (flatList.props as { data?: typeof MOCK_NOTIFICATIONS }).data;
+    expect(data).toHaveLength(MOCK_NOTIFICATIONS.length);
+
+    const seededIds = new Set(MOCK_NOTIFICATIONS.map((n) => n.id));
+    data?.forEach((n) => {
+      expect(seededIds.has(n.id)).toBe(true);
+    });
+  });
+
+  /**
+   * Seed only the feature announcement so it's the first (and only) row in
+   * the FlatList's initial render window — proves the same tap → details →
+   * back path the smoke spec asserts on, without depending on virtualization.
+   */
+  it('opens details for a feature announcement and returns on back', async () => {
+    const featureAnnouncement = MOCK_FEATURE_ANNOUNCEMENT_NOTIFICATIONS[0];
+    const result = renderNotificationsScreen([featureAnnouncement]);
+
+    fireEvent.press(
+      await result.findByTestId(
+        NotificationMenuViewSelectorsIDs.ITEM(featureAnnouncement.id),
+      ),
+    );
+
+    await waitFor(() => {
+      expect(
+        result.getByTestId(NOTIFICATIONS_DETAILS_PROBE_TEST_ID),
+      ).toBeOnTheScreen();
+    });
+    expect(
+      result.getByTestId(NOTIFICATIONS_DETAILS_PROBE_ID_TEST_ID),
+    ).toHaveTextContent(featureAnnouncement.id);
+
+    fireEvent.press(result.getByTestId(NOTIFICATIONS_DETAILS_BACK_TEST_ID));
+
+    await waitFor(() => {
+      expect(
+        result.getByTestId(
+          NotificationsViewSelectorsIDs.NOTIFICATIONS_CONTAINER,
+        ),
+      ).toBeOnTheScreen();
+    });
+  });
+
+  it('opens details for a wallet notification and returns on back', async () => {
+    const walletNotification = MOCK_ON_CHAIN_NOTIFICATIONS[0];
+    const result = renderNotificationsScreen([walletNotification]);
+
+    fireEvent.press(
+      await result.findByTestId(
+        NotificationMenuViewSelectorsIDs.ITEM(walletNotification.id),
+      ),
+    );
+
+    await waitFor(() => {
+      expect(
+        result.getByTestId(NOTIFICATIONS_DETAILS_PROBE_TEST_ID),
+      ).toBeOnTheScreen();
+    });
+    expect(
+      result.getByTestId(NOTIFICATIONS_DETAILS_PROBE_ID_TEST_ID),
+    ).toHaveTextContent(walletNotification.id);
+
+    fireEvent.press(result.getByTestId(NOTIFICATIONS_DETAILS_BACK_TEST_ID));
+
+    await waitFor(() => {
+      expect(
+        result.getByTestId(
+          NotificationsViewSelectorsIDs.NOTIFICATIONS_CONTAINER,
+        ),
+      ).toBeOnTheScreen();
+    });
+  });
+});
diff --git a/app/components/Views/OAuthRehydration/index.tsx b/app/components/Views/OAuthRehydration/index.tsx
index fffa40fd48b..83fea56811b 100644
--- a/app/components/Views/OAuthRehydration/index.tsx
+++ b/app/components/Views/OAuthRehydration/index.tsx
@@ -747,16 +747,19 @@ const OAuthRehydration: React.FC<OAuthRehydrationProps> = ({
   const renderPasswordField = () => (
     <TextField
       placeholder={strings('login.password_placeholder')}
-      testID={LoginViewSelectors.PASSWORD_INPUT}
-      returnKeyType={'done'}
-      autoCapitalize="none"
-      secureTextEntry
       onChangeText={handlePasswordChange}
       value={password}
-      onSubmitEditing={handleLogin}
-      keyboardAppearance={themeAppearance}
       isDisabled={disabledInput}
       isError={!!error}
+      inputProps={{
+        testID: LoginViewSelectors.PASSWORD_INPUT,
+        accessibilityLabel: LoginViewSelectors.PASSWORD_INPUT,
+        returnKeyType: 'done',
+        autoCapitalize: 'none',
+        secureTextEntry: true,
+        onSubmitEditing: handleLogin,
+        keyboardAppearance: themeAppearance,
+      }}
     />
   );
 
diff --git a/app/components/Views/ResetPassword/index.tsx b/app/components/Views/ResetPassword/index.tsx
index c5ce58e47b3..0465441d70c 100644
--- a/app/components/Views/ResetPassword/index.tsx
+++ b/app/components/Views/ResetPassword/index.tsx
@@ -6,6 +6,7 @@ import {
   Alert,
   InteractionManager,
   TouchableOpacity,
+  TextInput,
 } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
@@ -142,9 +143,7 @@ const ResetPassword = ({ navigation, route }: ResetPasswordProps) => {
     string | undefined
   >(undefined);
 
-  const confirmPasswordInput = useRef<React.ElementRef<
-    typeof TextField
-  > | null>(null);
+  const confirmPasswordInput = useRef<TextInput | null>(null);
   const mounted = useRef(true);
 
   useEffect(() => {
@@ -573,12 +572,14 @@ const ResetPassword = ({ navigation, route }: ResetPasswordProps) => {
             <TextField
               placeholder={strings('password_reset.password_title')}
               onChangeText={onPasswordChange}
-              secureTextEntry
               value={password}
-              onSubmitEditing={reauthenticateWithPassword}
-              testID={ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID}
-              keyboardAppearance={themeAppearance}
-              autoComplete="password"
+              inputProps={{
+                secureTextEntry: true,
+                onSubmitEditing: reauthenticateWithPassword,
+                testID: ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID,
+                keyboardAppearance: themeAppearance,
+                autoComplete: 'password',
+              }}
             />
             {renderWarningText(warningIncorrectPassword)}
           </Box>
@@ -648,16 +649,9 @@ const ResetPassword = ({ navigation, route }: ResetPasswordProps) => {
                     onChangeText={onPasswordChange}
                     onFocus={() => setIsPasswordFieldFocused(true)}
                     onBlur={() => setIsPasswordFieldFocused(false)}
-                    secureTextEntry={showPasswordIndex.includes(0)}
                     placeholder={strings(
                       'reset_password.new_password_placeholder',
                     )}
-                    testID={ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID}
-                    onSubmitEditing={jumpToConfirmPassword}
-                    returnKeyType="next"
-                    autoComplete="password-new"
-                    autoCapitalize="none"
-                    keyboardAppearance={themeAppearance}
                     isError={isPasswordTooShort()}
                     endAccessory={
                       <TouchableOpacity onPress={() => toggleShowPassword(0)}>
@@ -675,6 +669,15 @@ const ResetPassword = ({ navigation, route }: ResetPasswordProps) => {
                         />
                       </TouchableOpacity>
                     }
+                    inputProps={{
+                      secureTextEntry: showPasswordIndex.includes(0),
+                      testID: ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID,
+                      onSubmitEditing: jumpToConfirmPassword,
+                      returnKeyType: 'next',
+                      autoComplete: 'password-new',
+                      autoCapitalize: 'none',
+                      keyboardAppearance: themeAppearance,
+                    }}
                   />
                   {renderPasswordHelperText()}
                 </Box>
@@ -689,20 +692,12 @@ const ResetPassword = ({ navigation, route }: ResetPasswordProps) => {
                     {strings('reset_password.confirm_password')}
                   </Label>
                   <TextField
-                    ref={confirmPasswordInput}
+                    inputRef={confirmPasswordInput}
                     value={confirmPassword}
                     onChangeText={setConfirmPassword}
-                    secureTextEntry={showPasswordIndex.includes(1)}
                     placeholder={strings(
                       'reset_password.confirm_password_placeholder',
                     )}
-                    testID={
-                      ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID
-                    }
-                    returnKeyType={'done'}
-                    autoComplete="password-new"
-                    autoCapitalize="none"
-                    keyboardAppearance={themeAppearance}
                     endAccessory={
                       <TouchableOpacity onPress={() => toggleShowPassword(1)}>
                         <Icon
@@ -719,6 +714,15 @@ const ResetPassword = ({ navigation, route }: ResetPasswordProps) => {
                         />
                       </TouchableOpacity>
                     }
+                    inputProps={{
+                      secureTextEntry: showPasswordIndex.includes(1),
+                      testID:
+                        ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID,
+                      returnKeyType: 'done',
+                      autoComplete: 'password-new',
+                      autoCapitalize: 'none',
+                      keyboardAppearance: themeAppearance,
+                    }}
                   />
                   {renderErrorText()}
                 </Box>
diff --git a/app/components/Views/RevealPrivateCredential/components/PasswordEntry.tsx b/app/components/Views/RevealPrivateCredential/components/PasswordEntry.tsx
index 6fff497c663..0bc541c3dfb 100644
--- a/app/components/Views/RevealPrivateCredential/components/PasswordEntry.tsx
+++ b/app/components/Views/RevealPrivateCredential/components/PasswordEntry.tsx
@@ -12,7 +12,6 @@ import { strings } from '../../../../../locales/i18n';
 import { RevealSeedViewSelectorsIDs } from '../RevealSeedView.testIds';
 import { useTheme } from '../../../../util/theme';
 import { PasswordEntryProps } from '../types';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
 
 const PasswordEntry = ({
   password,
@@ -22,8 +21,7 @@ const PasswordEntry = ({
   showPassword,
   onToggleShowPassword,
 }: PasswordEntryProps) => {
-  const tw = useTailwind();
-  const { colors, themeAppearance } = useTheme();
+  const { themeAppearance } = useTheme();
 
   return (
     <>
@@ -38,22 +36,23 @@ const PasswordEntry = ({
       <TextField
         value={password}
         placeholder={'Password'}
-        placeholderTextColor={colors.text.muted}
         onChangeText={onPasswordChange}
-        secureTextEntry={!showPassword}
-        autoCapitalize="none"
-        onSubmitEditing={onSubmit}
-        keyboardAppearance={themeAppearance}
-        testID={RevealSeedViewSelectorsIDs.PASSWORD_INPUT_BOX_ID}
-        accessibilityLabel={RevealSeedViewSelectorsIDs.PASSWORD_INPUT_BOX_ID}
-        returnKeyType="done"
-        autoComplete="password"
         endAccessory={
           <ButtonIcon
             iconName={showPassword ? IconName.Eye : IconName.EyeSlash}
             onPress={onToggleShowPassword}
           />
         }
+        inputProps={{
+          secureTextEntry: !showPassword,
+          autoCapitalize: 'none',
+          onSubmitEditing: onSubmit,
+          keyboardAppearance: themeAppearance,
+          testID: RevealSeedViewSelectorsIDs.PASSWORD_INPUT_BOX_ID,
+          accessibilityLabel: RevealSeedViewSelectorsIDs.PASSWORD_INPUT_BOX_ID,
+          returnKeyType: 'done',
+          autoComplete: 'password',
+        }}
       />
       <Text
         twClassName="mt-2"
diff --git a/app/components/Views/Root/__snapshots__/index.test.tsx.snap b/app/components/Views/Root/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 512752dfdfa..00000000000
--- a/app/components/Views/Root/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Root should render null while isTest is true and store is loading 1`] = `null`;
diff --git a/app/components/Views/Root/index.test.tsx b/app/components/Views/Root/index.test.tsx
index f40db80297b..36af0f1cdc2 100644
--- a/app/components/Views/Root/index.test.tsx
+++ b/app/components/Views/Root/index.test.tsx
@@ -47,6 +47,9 @@ jest.mock('../../../util/test/utils', () => ({
 }));
 
 describe('Root', () => {
+  /** Must match `testID` on the `View` returned by `jest.mock('../../Nav/App')`. */
+  const mockedAppTestId = 'mock-app';
+
   it('should initialize SecureKeychain', async () => {
     render(<Root foxCode="" />);
 
@@ -66,9 +69,9 @@ describe('Root', () => {
     Object.defineProperty(testUtils, 'isTest', { value: true, writable: true });
   });
 
-  it('should render null while isTest is true and store is loading', () => {
+  it('does not mount Nav/App until the store gate clears when isTest is true', () => {
     Object.defineProperty(testUtils, 'isTest', { value: true, writable: true });
-    const { toJSON } = render(<Root foxCode="" />);
-    expect(toJSON()).toMatchSnapshot();
+    const { queryByTestId } = render(<Root foxCode="" />);
+    expect(queryByTestId(mockedAppTestId)).toBeNull();
   });
 });
diff --git a/app/components/Views/Settings/BatchAccountBalanceSettings/index.tsx b/app/components/Views/Settings/BatchAccountBalanceSettings/index.tsx
index b7ccb73b816..cc4045b542b 100644
--- a/app/components/Views/Settings/BatchAccountBalanceSettings/index.tsx
+++ b/app/components/Views/Settings/BatchAccountBalanceSettings/index.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { View, Switch, Platform } from 'react-native';
+import { View, Switch } from 'react-native';
 import { useSelector } from 'react-redux';
 import Engine from '../../../../core/Engine';
 import { selectIsMultiAccountBalancesEnabled } from '../../../../selectors/preferencesController';
@@ -10,7 +10,6 @@ import Text, {
   TextVariant,
   TextColor,
 } from '../../../../component-library/components/Texts/Text';
-import generateTestId from '../../../../../wdio/utils/generateTestId';
 import styleSheet from './index.styles';
 import {
   BATCH_BALANCE_REQUESTS_SECTION,
@@ -61,10 +60,7 @@ const BatchAccountBalanceSettings = () => {
             thumbColor={theme.brandColors.white}
             style={styles.switch}
             ios_backgroundColor={colors.border.muted}
-            {...generateTestId(
-              Platform,
-              SECURITY_PRIVACY_MULTI_ACCOUNT_BALANCES_TOGGLE_ID,
-            )}
+            testID={SECURITY_PRIVACY_MULTI_ACCOUNT_BALANCES_TOGGLE_ID}
           />
         </View>
       </View>
diff --git a/app/components/Views/Settings/NotificationsSettings/NotificationsSettings.view.test.tsx b/app/components/Views/Settings/NotificationsSettings/NotificationsSettings.view.test.tsx
new file mode 100644
index 00000000000..df67c1d30e5
--- /dev/null
+++ b/app/components/Views/Settings/NotificationsSettings/NotificationsSettings.view.test.tsx
@@ -0,0 +1,200 @@
+import '../../../../../tests/component-view/mocks';
+import React from 'react';
+import { fireEvent, waitFor } from '@testing-library/react-native';
+
+import { renderComponentViewScreen } from '../../../../../tests/component-view/render';
+import { describeForPlatforms } from '../../../../../tests/component-view/platform';
+import {
+  buildNotificationsState,
+  NOTIFICATIONS_ACCOUNT_ADDRESS,
+} from '../../../../../tests/component-view/presets/notifications';
+import NotificationsSettings from './';
+import {
+  NotificationSettingsViewSelectorsIDs,
+  NotificationSettingsViewSelectorsText,
+} from './NotificationSettingsView.testIds';
+import Engine from '../../../../core/Engine';
+
+/**
+ * Component-view coverage for smoke `notification-settings-flow`.
+ *
+ * Smoke spec: tests/smoke/notifications/notification-settings-flow.spec.ts
+ *
+ * No hooks, selectors or services are mocked here — the per-account toggle
+ * resolves from real `AccountTreeController` + `AccountsController` state
+ * seeded by `buildNotificationsState`. The feature flag check resolves true
+ * via `IS_TEST=true` (set at config-load time in `jest.config.view.js`).
+ */
+
+function renderSettings(
+  stateOverrides?: Parameters<typeof buildNotificationsState>[0],
+) {
+  return renderComponentViewScreen(
+    NotificationsSettings as unknown as React.ComponentType,
+    { name: 'NotificationsSettings' },
+    { state: buildNotificationsState(stateOverrides) },
+    { isFullScreenModal: false },
+  );
+}
+
+describeForPlatforms('Notifications settings (toggles + visibility)', () => {
+  it('renders all sub-toggles when notifications are enabled', async () => {
+    const { getByTestId, findByText } = renderSettings();
+
+    expect(
+      getByTestId(NotificationSettingsViewSelectorsIDs.NOTIFICATIONS_TOGGLE),
+    ).toBeOnTheScreen();
+
+    expect(
+      await waitFor(() =>
+        getByTestId(
+          NotificationSettingsViewSelectorsIDs.PUSH_NOTIFICATIONS_TOGGLE,
+        ),
+      ),
+    ).toBeOnTheScreen();
+
+    expect(
+      getByTestId(
+        NotificationSettingsViewSelectorsIDs.FEATURE_ANNOUNCEMENTS_TOGGLE,
+      ),
+    ).toBeOnTheScreen();
+
+    expect(
+      await findByText(
+        NotificationSettingsViewSelectorsText.ACCOUNT_ACTIVITY_SECTION,
+      ),
+    ).toBeOnTheScreen();
+
+    expect(
+      getByTestId(
+        NotificationSettingsViewSelectorsIDs.ACCOUNT_NOTIFICATION_TOGGLE(
+          NOTIFICATIONS_ACCOUNT_ADDRESS,
+        ),
+      ),
+    ).toBeOnTheScreen();
+  });
+
+  it('hides push, feature announcements and account section when main toggle is off', async () => {
+    const { getByTestId, queryByTestId, queryByText } = renderSettings({
+      notificationsEnabled: false,
+    });
+
+    expect(
+      getByTestId(NotificationSettingsViewSelectorsIDs.NOTIFICATIONS_TOGGLE),
+    ).toBeOnTheScreen();
+
+    await waitFor(() => {
+      expect(
+        queryByTestId(
+          NotificationSettingsViewSelectorsIDs.PUSH_NOTIFICATIONS_TOGGLE,
+        ),
+      ).toBeNull();
+    });
+    expect(
+      queryByTestId(
+        NotificationSettingsViewSelectorsIDs.FEATURE_ANNOUNCEMENTS_TOGGLE,
+      ),
+    ).toBeNull();
+    expect(
+      queryByText(
+        NotificationSettingsViewSelectorsText.ACCOUNT_ACTIVITY_SECTION,
+      ),
+    ).toBeNull();
+  });
+
+  it('invokes the disable controller path when the main toggle is pressed (on -> off)', async () => {
+    const disableSpy = jest
+      .spyOn(
+        Engine.context.NotificationServicesController as unknown as {
+          disableNotificationServices: () => Promise<void>;
+        },
+        'disableNotificationServices',
+      )
+      .mockResolvedValue(undefined);
+
+    try {
+      const { getByTestId } = renderSettings();
+
+      fireEvent(
+        getByTestId(NotificationSettingsViewSelectorsIDs.NOTIFICATIONS_TOGGLE),
+        'onChange',
+        { nativeEvent: { value: false } },
+      );
+
+      await waitFor(() => {
+        expect(disableSpy).toHaveBeenCalled();
+      });
+    } finally {
+      disableSpy.mockRestore();
+    }
+  });
+
+  it('invokes setFeatureAnnouncementsEnabled(false) when the feature announcements toggle is pressed', async () => {
+    const toggleSpy = jest
+      .spyOn(
+        Engine.context.NotificationServicesController as unknown as {
+          setFeatureAnnouncementsEnabled: (val: boolean) => Promise<void>;
+        },
+        'setFeatureAnnouncementsEnabled',
+      )
+      .mockResolvedValue(undefined);
+
+    try {
+      const { getByTestId } = renderSettings();
+
+      fireEvent(
+        getByTestId(
+          NotificationSettingsViewSelectorsIDs.FEATURE_ANNOUNCEMENTS_TOGGLE,
+        ),
+        'onChange',
+        { nativeEvent: { value: false } },
+      );
+
+      await waitFor(() => {
+        expect(toggleSpy).toHaveBeenCalledWith(false);
+      });
+    } finally {
+      toggleSpy.mockRestore();
+    }
+  });
+
+  /**
+   * The per-account toggle's initial state comes from
+   * `Engine.NotificationServicesController.checkAccountsPresence`, which our
+   * Engine stub resolves to `{}` by default → toggle starts OFF. Pressing it
+   * therefore calls `enableAccounts` (off → on); the inverse direction is
+   * symmetrical. We assert the wiring through the press, not the direction.
+   */
+  it('invokes enableAccounts with the account address when the per-account toggle is pressed', async () => {
+    const enableAccountsSpy = jest
+      .spyOn(
+        Engine.context.NotificationServicesController as unknown as {
+          enableAccounts: (addresses: string[]) => Promise<void>;
+        },
+        'enableAccounts',
+      )
+      .mockResolvedValue(undefined);
+
+    try {
+      const { getByTestId } = renderSettings();
+
+      fireEvent(
+        getByTestId(
+          NotificationSettingsViewSelectorsIDs.ACCOUNT_NOTIFICATION_TOGGLE(
+            NOTIFICATIONS_ACCOUNT_ADDRESS,
+          ),
+        ),
+        'onChange',
+        { nativeEvent: { value: true } },
+      );
+
+      await waitFor(() => {
+        expect(enableAccountsSpy).toHaveBeenCalledWith([
+          NOTIFICATIONS_ACCOUNT_ADDRESS,
+        ]);
+      });
+    } finally {
+      enableAccountsSpy.mockRestore();
+    }
+  });
+});
diff --git a/app/components/Views/Settings/SecuritySettings/SecurityPrivacyView.testIds.ts b/app/components/Views/Settings/SecuritySettings/SecurityPrivacyView.testIds.ts
index d28261b5ef5..50fd8b639a2 100644
--- a/app/components/Views/Settings/SecuritySettings/SecurityPrivacyView.testIds.ts
+++ b/app/components/Views/Settings/SecuritySettings/SecurityPrivacyView.testIds.ts
@@ -13,6 +13,7 @@ export const SecurityPrivacyViewSelectorsIDs = {
   DEVICE_SECURITY_TOGGLE: 'device-security-toggle',
   CLEAR_PRIVACY_DATA_BUTTON: 'clear-privacy-data-button',
   PROTECT_YOUR_WALLET: 'protect-your-wallet',
+  DELETE_WALLET_BUTTON: 'security-settings-delete-wallet-buttons',
 };
 
 export const SecurityPrivacyViewSelectorsText = {
diff --git a/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx b/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
index 1399163f9d4..6057ff80af1 100644
--- a/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
+++ b/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
@@ -28,7 +28,7 @@ import {
 } from './Sections';
 import { selectProviderType } from '../../../../selectors/networkController';
 import { selectUseTransactionSimulations } from '../../../../selectors/preferencesController';
-import { SECURITY_PRIVACY_VIEW_ID } from '../../../../../wdio/screen-objects/testIDs/Screens/SecurityPrivacy.testIds';
+import { SecurityPrivacyViewSelectorsIDs } from './SecurityPrivacyView.testIds';
 import createStyles from './SecuritySettings.styles';
 import { HeadingProps, SecuritySettingsParams } from './SecuritySettings.types';
 import { useFocusEffect, useNavigation } from '@react-navigation/native';
@@ -360,7 +360,7 @@ const Settings: React.FC = () => {
       />
       <ScrollView
         style={styles.content}
-        testID={SECURITY_PRIVACY_VIEW_ID}
+        testID={SecurityPrivacyViewSelectorsIDs.SECURITY_SETTINGS_SCROLL}
         ref={scrollViewRef}
       >
         <View style={styles.inner}>
diff --git a/app/components/Views/Settings/index.test.tsx b/app/components/Views/Settings/index.test.tsx
index db808cae634..28b54cdedf9 100644
--- a/app/components/Views/Settings/index.test.tsx
+++ b/app/components/Views/Settings/index.test.tsx
@@ -52,11 +52,6 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('../../../util/networks', () => ({
-  ...jest.requireActual('../../../util/networks'),
-  isPermissionsSettingsV1Enabled: true,
-}));
-
 jest.mock('../../../util/notifications/constants/config', () => ({
   isNotificationsFeatureEnabled: jest.fn(() => true),
 }));
diff --git a/app/components/Views/SimpleWebview/index.test.tsx b/app/components/Views/SimpleWebview/index.test.tsx
index d8ceedb3856..e2b9f9ef566 100644
--- a/app/components/Views/SimpleWebview/index.test.tsx
+++ b/app/components/Views/SimpleWebview/index.test.tsx
@@ -4,30 +4,20 @@ import SimpleWebview from './';
 import { useNavigation } from '@react-navigation/native';
 import Share from 'react-native-share';
 import Logger from '../../../util/Logger';
-import getHeaderCompactStandardNavbarOptions from '../../../component-library/components-temp/HeaderCompactStandard/getHeaderCompactStandardNavbarOptions';
-import Device from '../../../util/device';
+import HeaderCompactStandard from '../../../component-library/components-temp/HeaderCompactStandard';
 
 jest.mock(
-  '../../../component-library/components-temp/HeaderCompactStandard/getHeaderCompactStandardNavbarOptions',
+  '../../../component-library/components-temp/HeaderCompactStandard',
   () => ({
     __esModule: true,
-    default: jest.fn(() => ({
-      header: () => null,
-    })),
+    default: jest.fn(() => null),
   }),
 );
 
-jest.mock('../../../util/device', () => ({
-  __esModule: true,
-  default: {
-    isAndroid: jest.fn(() => false),
-  },
-}));
-
-const mockSetOptions = jest.fn();
+const mockGoBack = jest.fn();
 const mockNavigation = {
-  goBack: jest.fn(),
-  setOptions: mockSetOptions,
+  goBack: mockGoBack,
+  setOptions: jest.fn(),
 };
 
 jest.mock('@react-navigation/native', () => ({
@@ -48,64 +38,38 @@ describe('SimpleWebview', () => {
     (Share.open as jest.Mock).mockImplementation(() => Promise.resolve());
   });
 
-  it('renders correctly', () => {
+  it('renders the HeaderCompactStandard with safe area top inset', () => {
     render(<SimpleWebview />);
 
-    expect(getHeaderCompactStandardNavbarOptions).toHaveBeenCalled();
-  });
-
-  it('sets header options from HeaderCompactStandard and Device.isAndroid() for includesTopInset', () => {
-    render(<SimpleWebview />);
-
-    expect(getHeaderCompactStandardNavbarOptions).toHaveBeenCalledWith(
+    expect(HeaderCompactStandard).toHaveBeenCalledWith(
       expect.objectContaining({
         title: '',
-        includesTopInset: false,
-        twClassName: 'bg-default rounded-t-2xl',
+        includesTopInset: true,
         onBack: expect.any(Function),
         endButtonIconProps: expect.arrayContaining([
           expect.objectContaining({ onPress: expect.any(Function) }),
         ]),
       }),
-    );
-    expect(mockSetOptions).toHaveBeenCalledWith(
-      expect.objectContaining({
-        header: expect.any(Function),
-      }),
-    );
-    expect(mockSetOptions.mock.calls[0][0]).not.toHaveProperty('headerStyle');
-  });
-
-  it('passes includesTopInset true when Device.isAndroid() is true', () => {
-    jest.mocked(Device.isAndroid).mockReturnValueOnce(true);
-    render(<SimpleWebview />);
-
-    expect(getHeaderCompactStandardNavbarOptions).toHaveBeenCalledWith(
-      expect.objectContaining({
-        includesTopInset: true,
-      }),
+      expect.anything(),
     );
   });
 
   it('calls navigation.goBack when header onBack is invoked', () => {
     render(<SimpleWebview />);
 
-    const { onBack } = (getHeaderCompactStandardNavbarOptions as jest.Mock).mock
+    const headerProps = (HeaderCompactStandard as unknown as jest.Mock).mock
       .calls[0][0] as { onBack: () => void };
-    onBack();
+    headerProps.onBack();
 
-    expect(mockNavigation.goBack).toHaveBeenCalled();
+    expect(mockGoBack).toHaveBeenCalled();
   });
 
   it('calls Share.open when share button onPress is invoked', () => {
     render(<SimpleWebview />);
 
-    const { endButtonIconProps } = (
-      getHeaderCompactStandardNavbarOptions as jest.Mock
-    ).mock.calls[0][0] as {
-      endButtonIconProps: { onPress: () => void }[];
-    };
-    endButtonIconProps[0].onPress();
+    const headerProps = (HeaderCompactStandard as unknown as jest.Mock).mock
+      .calls[0][0] as { endButtonIconProps: { onPress: () => void }[] };
+    headerProps.endButtonIconProps[0].onPress();
 
     expect(Share.open).toHaveBeenCalledWith({ url: 'https://etherscan.io' });
   });
@@ -116,12 +80,9 @@ describe('SimpleWebview', () => {
 
     render(<SimpleWebview />);
 
-    const { endButtonIconProps } = (
-      getHeaderCompactStandardNavbarOptions as jest.Mock
-    ).mock.calls[0][0] as {
-      endButtonIconProps: { onPress: () => void }[];
-    };
-    endButtonIconProps[0].onPress();
+    const headerProps = (HeaderCompactStandard as unknown as jest.Mock).mock
+      .calls[0][0] as { endButtonIconProps: { onPress: () => void }[] };
+    headerProps.endButtonIconProps[0].onPress();
 
     await waitFor(() => {
       expect(log).toHaveBeenCalledWith(
diff --git a/app/components/Views/SimpleWebview/index.tsx b/app/components/Views/SimpleWebview/index.tsx
index fb0eb616c6f..42fb2807540 100644
--- a/app/components/Views/SimpleWebview/index.tsx
+++ b/app/components/Views/SimpleWebview/index.tsx
@@ -1,22 +1,25 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
-import React, { useCallback, useEffect } from 'react';
+import React, { useCallback } from 'react';
+import { View } from 'react-native';
 import { WebView } from '@metamask/react-native-webview';
-import getHeaderCompactStandardNavbarOptions from '../../../component-library/components-temp/HeaderCompactStandard/getHeaderCompactStandardNavbarOptions';
+import HeaderCompactStandard from '../../../component-library/components-temp/HeaderCompactStandard';
 import { IconName } from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import Share from 'react-native-share'; // eslint-disable-line  import-x/default
 import Logger from '../../../util/Logger';
 import { baseStyles } from '../../../styles/common';
-import Device from '../../../util/device';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
 
 // TODO: This will be replaced with the actual route params type once navigation is refactored
 type RouteParams = {
   SimpleWebView: {
     url: string;
+    title?: string;
   };
 };
 
 const SimpleWebView = () => {
+  const tw = useTailwind();
   const navigation = useNavigation();
   const route = useRoute<RouteProp<RouteParams, 'SimpleWebView'>>();
   const url = route.params.url;
@@ -32,19 +35,17 @@ const SimpleWebView = () => {
     }
   }, [url]);
 
-  useEffect(() => {
-    navigation.setOptions({
-      ...getHeaderCompactStandardNavbarOptions({
-        title,
-        onBack: () => navigation.goBack(),
-        includesTopInset: Device.isAndroid(),
-        twClassName: 'bg-default rounded-t-2xl',
-        endButtonIconProps: [{ iconName: IconName.Share, onPress: share }],
-      }),
-    });
-  }, [navigation, share, title]);
-
-  return <WebView containerStyle={baseStyles.flexGrow} source={{ uri: url }} />;
+  return (
+    <View style={tw.style('flex-1 bg-default')}>
+      <HeaderCompactStandard
+        title={title}
+        onBack={() => navigation.goBack()}
+        includesTopInset
+        endButtonIconProps={[{ iconName: IconName.Share, onPress: share }]}
+      />
+      <WebView containerStyle={baseStyles.flexGrow} source={{ uri: url }} />
+    </View>
+  );
 };
 
 export default SimpleWebView;
diff --git a/app/components/Views/SitesFullView/SitesFullView.test.tsx b/app/components/Views/SitesFullView/SitesFullView.test.tsx
index b389e694a35..1abf768b60a 100644
--- a/app/components/Views/SitesFullView/SitesFullView.test.tsx
+++ b/app/components/Views/SitesFullView/SitesFullView.test.tsx
@@ -1,21 +1,33 @@
 import React from 'react';
-import { render, fireEvent, act, waitFor } from '@testing-library/react-native';
+import { fireEvent, act, waitFor } from '@testing-library/react-native';
+import renderWithProvider from '../../../util/test/renderWithProvider';
 import SitesFullView from './SitesFullView';
 import { useSitesData } from '../../UI/Sites/hooks/useSiteData/useSitesData';
 import type { SiteData } from '../../UI/Sites/components/SiteRowItem/SiteRowItem';
 
 // Mock dependencies
 jest.mock('../../UI/Sites/hooks/useSiteData/useSitesData');
+jest.mock(
+  '../../UI/Sites/hooks/useBrowserFavoritesSites/useBrowserFavoritesSites',
+  () => ({
+    useBrowserFavoritesSites: jest.fn(() => ({ sites: [], isLoading: false })),
+  }),
+);
 
 const mockGoBack = jest.fn();
 const mockNavigate = jest.fn();
 
-jest.mock('@react-navigation/native', () => ({
-  useNavigation: () => ({
-    navigate: mockNavigate,
-    goBack: mockGoBack,
-  }),
-}));
+jest.mock('@react-navigation/native', () => {
+  const actualNav = jest.requireActual('@react-navigation/native');
+  return {
+    ...actualNav,
+    useNavigation: () => ({
+      navigate: mockNavigate,
+      goBack: mockGoBack,
+    }),
+    useRoute: () => ({ params: {} }),
+  };
+});
 
 jest.mock('../../../util/theme', () => {
   const { mockTheme } = jest.requireActual('../../../util/theme');
@@ -185,7 +197,7 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      const { getByTestId } = render(<SitesFullView />);
+      const { getByTestId } = renderWithProvider(<SitesFullView />);
 
       expect(getByTestId('sites-full-view-header')).toBeOnTheScreen();
       expect(
@@ -204,7 +216,7 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      const { getByTestId } = render(<SitesFullView />);
+      const { getByTestId } = renderWithProvider(<SitesFullView />);
 
       expect(getByTestId('sites-list')).toBeOnTheScreen();
       expect(getByTestId('site-item-1')).toBeOnTheScreen();
@@ -219,7 +231,7 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      const { getAllByTestId } = render(<SitesFullView />);
+      const { getAllByTestId } = renderWithProvider(<SitesFullView />);
 
       const skeletons = getAllByTestId('site-skeleton');
       expect(skeletons.length).toBe(15);
@@ -232,7 +244,7 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      const { getByTestId } = render(<SitesFullView />);
+      const { getByTestId } = renderWithProvider(<SitesFullView />);
 
       expect(getByTestId('refresh-control')).toBeOnTheScreen();
     });
@@ -246,7 +258,7 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      const { getByTestId } = render(<SitesFullView />);
+      const { getByTestId } = renderWithProvider(<SitesFullView />);
       const backButton = getByTestId('sites-full-view-header-back-button');
 
       fireEvent.press(backButton);
@@ -259,7 +271,9 @@ describe('SitesFullView', () => {
     it('filters sites by name, URL, and display URL', () => {
       setupMockWithSearchFilter();
 
-      const { getByTestId, queryByTestId } = render(<SitesFullView />);
+      const { getByTestId, queryByTestId } = renderWithProvider(
+        <SitesFullView />,
+      );
 
       // Activate search
       fireEvent.press(getByTestId('sites-full-view-header-search-toggle'));
@@ -284,7 +298,7 @@ describe('SitesFullView', () => {
     it('shows all sites when search query is empty', () => {
       setupMockWithSearchFilter();
 
-      const { getByTestId } = render(<SitesFullView />);
+      const { getByTestId } = renderWithProvider(<SitesFullView />);
 
       // Activate search
       fireEvent.press(getByTestId('sites-full-view-header-search-toggle'));
@@ -306,7 +320,7 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      const { getByTestId } = render(<SitesFullView />);
+      const { getByTestId } = renderWithProvider(<SitesFullView />);
 
       // Activate search
       fireEvent.press(getByTestId('sites-full-view-header-search-toggle'));
@@ -333,7 +347,9 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      const { getByTestId, queryByTestId } = render(<SitesFullView />);
+      const { getByTestId, queryByTestId } = renderWithProvider(
+        <SitesFullView />,
+      );
 
       // Initially no footer
       expect(queryByTestId('sites-search-footer')).toBeNull();
@@ -356,7 +372,9 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      const { getByTestId, queryByTestId } = render(<SitesFullView />);
+      const { getByTestId, queryByTestId } = renderWithProvider(
+        <SitesFullView />,
+      );
 
       // Footer should not appear when search is inactive
       expect(queryByTestId('sites-search-footer')).toBeNull();
@@ -377,7 +395,7 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      render(<SitesFullView />);
+      renderWithProvider(<SitesFullView />);
 
       expect(mockUseSitesData).toHaveBeenCalledWith('');
     });
@@ -389,7 +407,7 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      render(<SitesFullView />);
+      renderWithProvider(<SitesFullView />);
 
       const SitesListMock = jest.requireMock(
         '../../UI/Sites/components/SitesList/SitesList',
@@ -429,7 +447,7 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      const { getByTestId } = render(<SitesFullView />);
+      const { getByTestId } = renderWithProvider(<SitesFullView />);
 
       expect(getByTestId('site-item-1')).toBeOnTheScreen();
     });
@@ -441,7 +459,9 @@ describe('SitesFullView', () => {
         refetch: mockRefetch,
       });
 
-      const { getByTestId, queryByTestId } = render(<SitesFullView />);
+      const { getByTestId, queryByTestId } = renderWithProvider(
+        <SitesFullView />,
+      );
 
       expect(getByTestId('sites-list')).toBeOnTheScreen();
       expect(queryByTestId('site-item-1')).toBeNull();
@@ -450,7 +470,9 @@ describe('SitesFullView', () => {
     it('performs case-insensitive search', () => {
       setupMockWithSearchFilter();
 
-      const { getByTestId, queryByTestId } = render(<SitesFullView />);
+      const { getByTestId, queryByTestId } = renderWithProvider(
+        <SitesFullView />,
+      );
 
       // Activate search
       fireEvent.press(getByTestId('sites-full-view-header-search-toggle'));
diff --git a/app/components/Views/SitesFullView/SitesFullView.tsx b/app/components/Views/SitesFullView/SitesFullView.tsx
index cffb315c4fc..5be333dd6f8 100644
--- a/app/components/Views/SitesFullView/SitesFullView.tsx
+++ b/app/components/Views/SitesFullView/SitesFullView.tsx
@@ -1,6 +1,7 @@
 import React, { useCallback, useState, useMemo } from 'react';
 import { Platform, StyleSheet, View, RefreshControl } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
+import { useDispatch } from 'react-redux';
+import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
 import {
   SafeAreaView,
   useSafeAreaInsets,
@@ -8,12 +9,20 @@ import {
 import { useAppThemeFromContext } from '../../../util/theme';
 import { Theme } from '../../../util/theme/models';
 import { useSitesData } from '../../UI/Sites/hooks/useSiteData/useSitesData';
+import { useBrowserFavoritesSites } from '../../UI/Sites/hooks/useBrowserFavoritesSites/useBrowserFavoritesSites';
 import SitesList from '../../UI/Sites/components/SitesList/SitesList';
 import SiteSkeleton from '../../UI/Sites/components/SiteSkeleton/SiteSkeleton';
 import SitesSearchFooter from '../../UI/Sites/components/SitesSearchFooter/SitesSearchFooter';
+import { removeBookmark } from '../../../actions/bookmarks';
+import {
+  bookmarkUrlForRemoval,
+  type SiteData,
+} from '../../UI/Sites/components/SiteRowItem/SiteRowItem';
 import { strings } from '../../../../locales/i18n';
 import ListHeaderWithSearch from '../../UI/shared/ListHeaderWithSearch/ListHeaderWithSearch';
 
+type SitesFullViewParams = { mode?: 'favorites' } | undefined;
+
 const createStyles = (theme: Theme) =>
   StyleSheet.create({
     safeArea: {
@@ -34,13 +43,35 @@ const SitesFullView: React.FC = () => {
   const theme = useAppThemeFromContext();
   const styles = useMemo(() => createStyles(theme), [theme]);
   const insets = useSafeAreaInsets();
+  const dispatch = useDispatch();
   const navigation = useNavigation();
+  const route =
+    useRoute<RouteProp<{ params: SitesFullViewParams }, 'params'>>();
+  const isFavorites = route.params?.mode === 'favorites';
+
   const [searchQuery, setSearchQuery] = useState('');
   const [isSearchActive, setIsSearchActive] = useState(false);
   const [refreshing, setRefreshing] = useState(false);
 
-  // Fetch all sites (no limit)
-  const { sites, isLoading, refetch: refetchSites } = useSitesData(searchQuery);
+  // Always call both hooks unconditionally (Rules of Hooks).
+  // useSitesData has a module-level cache so the API is only called once.
+  const {
+    sites: popularSites,
+    isLoading: popularLoading,
+    refetch: popularRefetch,
+  } = useSitesData(isFavorites ? '' : searchQuery);
+  const {
+    data: favoriteSites,
+    isLoading: favoritesLoading,
+    refetch: favoritesRefetch,
+  } = useBrowserFavoritesSites(isFavorites ? searchQuery : '');
+
+  const sites = isFavorites ? favoriteSites : popularSites;
+  const isLoading = isFavorites ? favoritesLoading : popularLoading;
+  const refetchSites = isFavorites ? favoritesRefetch : popularRefetch;
+  const title = isFavorites
+    ? strings('autocomplete.favorites')
+    : strings('trending.popular_sites');
 
   const handleBackPress = useCallback(() => {
     navigation.goBack();
@@ -48,15 +79,11 @@ const SitesFullView: React.FC = () => {
 
   const handleSearchToggle = useCallback(() => {
     setIsSearchActive((prev) => {
-      if (prev) {
-        // Closing search, clear the query
-        setSearchQuery('');
-      }
+      if (prev) setSearchQuery('');
       return !prev;
     });
   }, []);
 
-  // Handle pull-to-refresh
   const handleRefresh = useCallback(async () => {
     setRefreshing(true);
     try {
@@ -78,7 +105,6 @@ const SitesFullView: React.FC = () => {
 
   const renderFooter = useMemo(() => {
     if (!isSearchActive) return null;
-
     return <SitesSearchFooter searchQuery={searchQuery} />;
   }, [isSearchActive, searchQuery]);
 
@@ -98,7 +124,7 @@ const SitesFullView: React.FC = () => {
         ]}
       >
         <ListHeaderWithSearch
-          defaultTitle={strings('trending.popular_sites')}
+          defaultTitle={title}
           isSearchVisible={isSearchActive}
           searchQuery={searchQuery}
           searchPlaceholder={strings('trending.search_sites')}
@@ -115,7 +141,19 @@ const SitesFullView: React.FC = () => {
       ) : (
         <View style={styles.listContainer}>
           <SitesList
+            key={searchQuery ? 'filtered' : 'all'}
             sites={sites}
+            onRemoveFavorite={
+              isFavorites
+                ? (site: SiteData) =>
+                    dispatch(
+                      removeBookmark({
+                        url: bookmarkUrlForRemoval(site),
+                        name: site.name,
+                      }),
+                    )
+                : undefined
+            }
             refreshControl={
               <RefreshControl
                 colors={[theme.colors.primary.default]}
diff --git a/app/components/Views/SocialLeaderboard/NotificationPreferencesView/hooks/useFollowedTraders.test.ts b/app/components/Views/SocialLeaderboard/NotificationPreferencesView/hooks/useFollowedTraders.test.ts
index 10ec450c28d..904fc75d8c1 100644
--- a/app/components/Views/SocialLeaderboard/NotificationPreferencesView/hooks/useFollowedTraders.test.ts
+++ b/app/components/Views/SocialLeaderboard/NotificationPreferencesView/hooks/useFollowedTraders.test.ts
@@ -1,5 +1,6 @@
 import { renderHook, act } from '@testing-library/react-native';
 import { useQuery } from '@metamask/react-data-query';
+import { addBreadcrumb } from '@sentry/react-native';
 import Logger from '../../../../../util/Logger';
 import { useFollowedTraders } from './useFollowedTraders';
 
@@ -9,6 +10,12 @@ jest.mock('../../../../../util/Logger', () => ({
 
 jest.mock('@metamask/react-data-query');
 
+jest.mock('@sentry/react-native', () => ({
+  addBreadcrumb: jest.fn(),
+}));
+
+const mockAddBreadcrumb = addBreadcrumb as jest.Mock;
+
 const mockRefetch = jest.fn();
 const mockUseQuery = useQuery as jest.MockedFunction<typeof useQuery>;
 
@@ -18,6 +25,7 @@ const makeQueryResult = (
   ({
     data: undefined,
     isLoading: false,
+    isFetching: false,
     error: null,
     refetch: mockRefetch,
     ...overrides,
@@ -45,6 +53,7 @@ describe('useFollowedTraders', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockUseQuery.mockReturnValue(makeQueryResult());
+    mockAddBreadcrumb.mockClear();
   });
 
   describe('query configuration', () => {
@@ -135,13 +144,17 @@ describe('useFollowedTraders', () => {
       expect(result.current.error).toBe('raw error');
     });
 
-    it('logs query errors', () => {
+    it('logs query errors with enriched extras', () => {
       const error = new Error('fetch failed');
       mockUseQuery.mockReturnValue(makeQueryResult({ error }));
       renderHook(() => useFollowedTraders());
       expect(Logger.error).toHaveBeenCalledWith(
         error,
-        'useFollowedTraders: following fetch failed',
+        expect.objectContaining({
+          message: 'useFollowedTraders: following fetch failed',
+          endpoint: 'following',
+          errorCategory: expect.any(String),
+        }),
       );
     });
 
@@ -177,8 +190,46 @@ describe('useFollowedTraders', () => {
 
       expect(Logger.error).toHaveBeenCalledWith(
         error,
-        'useFollowedTraders: refresh failed',
+        expect.objectContaining({
+          message: 'useFollowedTraders: refresh failed',
+          endpoint: 'following',
+          errorCategory: expect.any(String),
+        }),
+      );
+    });
+  });
+
+  describe('breadcrumbs', () => {
+    it('emits a failure breadcrumb when an error is set', () => {
+      const error = new Error('fetch failed');
+      mockUseQuery.mockReturnValue(makeQueryResult({ error }));
+      renderHook(() => useFollowedTraders());
+      expect(mockAddBreadcrumb).toHaveBeenCalledWith(
+        expect.objectContaining({
+          category: 'social_service',
+          level: 'error',
+          message: expect.stringContaining('social_service.following.failure'),
+        }),
+      );
+    });
+
+    it('includes httpStatus in the failure breadcrumb for HttpError', () => {
+      const error = Object.assign(new Error('Unauthorized'), {
+        httpStatus: 401,
+      });
+      mockUseQuery.mockReturnValue(makeQueryResult({ error }));
+      renderHook(() => useFollowedTraders());
+      expect(mockAddBreadcrumb.mock.calls[0][0].message).toContain(
+        'status=401',
       );
     });
+
+    it('does not emit a breadcrumb when there is no error', () => {
+      mockUseQuery.mockReturnValue(
+        makeQueryResult({ data: fixtureFollowing as never }),
+      );
+      renderHook(() => useFollowedTraders());
+      expect(mockAddBreadcrumb).not.toHaveBeenCalled();
+    });
   });
 });
diff --git a/app/components/Views/SocialLeaderboard/NotificationPreferencesView/hooks/useFollowedTraders.ts b/app/components/Views/SocialLeaderboard/NotificationPreferencesView/hooks/useFollowedTraders.ts
index e19a1c41730..dad7d878154 100644
--- a/app/components/Views/SocialLeaderboard/NotificationPreferencesView/hooks/useFollowedTraders.ts
+++ b/app/components/Views/SocialLeaderboard/NotificationPreferencesView/hooks/useFollowedTraders.ts
@@ -2,6 +2,12 @@ import { useCallback, useEffect, useMemo } from 'react';
 import { useQuery } from '@metamask/react-data-query';
 import type { FollowingResponse } from '@metamask/social-controllers';
 import Logger from '../../../../../util/Logger';
+import {
+  addSocialBreadcrumb,
+  buildSocialErrorExtras,
+  categoriseSocialError,
+  extractHttpStatus,
+} from '../../../../../util/social/socialServiceTelemetry';
 
 export interface FollowedTrader {
   /** Clicker profile ID. */
@@ -67,7 +73,14 @@ export const useFollowedTraders = (
     try {
       await refetch();
     } catch (err) {
-      Logger.error(err as Error, 'useFollowedTraders: refresh failed');
+      Logger.error(
+        err as Error,
+        buildSocialErrorExtras({
+          legacyMessage: 'useFollowedTraders: refresh failed',
+          endpoint: 'following',
+          error: err,
+        }),
+      );
       throw err;
     }
   }, [refetch]);
@@ -76,8 +89,17 @@ export const useFollowedTraders = (
     if (error) {
       Logger.error(
         error as Error,
-        'useFollowedTraders: following fetch failed',
+        buildSocialErrorExtras({
+          legacyMessage: 'useFollowedTraders: following fetch failed',
+          endpoint: 'following',
+          error,
+        }),
       );
+      addSocialBreadcrumb({
+        endpoint: 'following',
+        errorCategory: categoriseSocialError(error),
+        httpStatus: extractHttpStatus(error),
+      });
     }
   }, [error]);
 
diff --git a/app/components/Views/SocialLeaderboard/TopTradersView/TopTradersView.test.tsx b/app/components/Views/SocialLeaderboard/TopTradersView/TopTradersView.test.tsx
index 64136921239..f2603e7c76c 100644
--- a/app/components/Views/SocialLeaderboard/TopTradersView/TopTradersView.test.tsx
+++ b/app/components/Views/SocialLeaderboard/TopTradersView/TopTradersView.test.tsx
@@ -63,6 +63,7 @@ const fixtureTraders: TopTrader[] = [
 const defaultUseTopTradersResult: UseTopTradersResult = {
   traders: fixtureTraders,
   isLoading: false,
+  isFetching: false,
   error: null,
   refresh: mockRefresh as () => Promise<void>,
   toggleFollow: mockToggleFollow,
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/TraderPositionView.test.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/TraderPositionView.test.tsx
index 24483750049..8e02d0cdbaf 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/TraderPositionView.test.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/TraderPositionView.test.tsx
@@ -92,6 +92,17 @@ jest.mock('../../../../core/ClipboardManager', () => ({
   setString: jest.fn().mockResolvedValue(undefined),
 }));
 
+// Pressing buy mounts QuickBuyBottomSheet. Jest's global mock for design-system
+// `BottomSheet` (see app/util/test/testSetup.js) invokes `onOpenBottomSheet`'s
+// callback synchronously, so `QuickBuyBottomSheetContent` mounts in the same turn
+// and runs `useQuickBuyBottomSheet` (bridge selectors, device version compare,
+// NetworkController, …). This file intentionally uses a minimal Redux store, so
+// we stub the sheet here.
+jest.mock('./components/QuickBuyBottomSheet', () => ({
+  __esModule: true,
+  default: () => null,
+}));
+
 jest.mock('../../../../util/haptics', () => {
   const actual = jest.requireActual<typeof import('../../../../util/haptics')>(
     '../../../../util/haptics',
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/hooks/useTraderPosition.test.ts b/app/components/Views/SocialLeaderboard/TraderPositionView/hooks/useTraderPosition.test.ts
index 406500a237d..8a954918d20 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/hooks/useTraderPosition.test.ts
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/hooks/useTraderPosition.test.ts
@@ -1,16 +1,34 @@
 import { renderHook } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
 import { useQuery } from '@metamask/react-data-query';
+import { addBreadcrumb } from '@sentry/react-native';
 import type { Position } from '@metamask/social-controllers';
 import Logger from '../../../../../util/Logger';
+import { selectIsUnlocked } from '../../../../../selectors/keyringController';
 import { useTraderPosition } from './useTraderPosition';
 
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../../../selectors/keyringController', () => ({
+  selectIsUnlocked: jest.fn(),
+}));
+
 jest.mock('../../../../../util/Logger', () => ({
   error: jest.fn(),
 }));
 
 jest.mock('@metamask/react-data-query');
 
+jest.mock('@sentry/react-native', () => ({
+  addBreadcrumb: jest.fn(),
+}));
+
+const mockAddBreadcrumb = addBreadcrumb as jest.Mock;
+
 const mockUseQuery = useQuery as jest.MockedFunction<typeof useQuery>;
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
 
 const makeQueryResult = (
   overrides: Partial<ReturnType<typeof useQuery>> = {},
@@ -41,6 +59,10 @@ const mockPosition: Position = {
 describe('useTraderPosition', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectIsUnlocked) return true;
+      return undefined;
+    });
   });
 
   it('calls useQuery with the SocialService:fetchPositionById key', () => {
@@ -69,6 +91,20 @@ describe('useTraderPosition', () => {
     );
   });
 
+  it('disables the query when wallet is locked', () => {
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectIsUnlocked) return false;
+      return undefined;
+    });
+    mockUseQuery.mockReturnValue(makeQueryResult());
+
+    renderHook(() => useTraderPosition('position-uuid-1'));
+
+    expect(mockUseQuery).toHaveBeenCalledWith(
+      expect.objectContaining({ enabled: false }),
+    );
+  });
+
   it('returns the resolved position on success', () => {
     mockUseQuery.mockReturnValue(
       makeQueryResult({ data: mockPosition, isLoading: false }),
@@ -90,7 +126,7 @@ describe('useTraderPosition', () => {
     expect(result.current.position).toBeUndefined();
   });
 
-  it('returns the error message and logs on failure', () => {
+  it('returns the error message and logs on failure with enriched extras', () => {
     const fetchError = new Error('boom');
     mockUseQuery.mockReturnValue(makeQueryResult({ error: fetchError }));
 
@@ -99,7 +135,47 @@ describe('useTraderPosition', () => {
     expect(result.current.error).toBe('boom');
     expect(Logger.error).toHaveBeenCalledWith(
       fetchError,
-      'useTraderPosition: fetch failed',
+      expect.objectContaining({
+        message: 'useTraderPosition: fetch failed',
+        endpoint: 'position_by_id',
+        errorCategory: expect.any(String),
+      }),
     );
   });
+
+  it('emits a failure breadcrumb when an error is set', () => {
+    const fetchError = new Error('boom');
+    mockUseQuery.mockReturnValue(makeQueryResult({ error: fetchError }));
+
+    renderHook(() => useTraderPosition('position-uuid-1'));
+
+    expect(mockAddBreadcrumb).toHaveBeenCalledWith(
+      expect.objectContaining({
+        category: 'social_service',
+        level: 'error',
+        message: expect.stringContaining(
+          'social_service.position_by_id.failure',
+        ),
+      }),
+    );
+  });
+
+  it('includes httpStatus in the failure breadcrumb for HttpError', () => {
+    const fetchError = Object.assign(new Error('Unauthorized'), {
+      httpStatus: 401,
+    });
+    mockUseQuery.mockReturnValue(makeQueryResult({ error: fetchError }));
+
+    renderHook(() => useTraderPosition('position-uuid-1'));
+
+    expect(mockAddBreadcrumb.mock.calls[0][0].message).toContain('status=401');
+  });
+
+  it('does not emit a breadcrumb when there is no error', () => {
+    mockUseQuery.mockReturnValue(makeQueryResult({ data: mockPosition }));
+
+    renderHook(() => useTraderPosition('position-uuid-1'));
+
+    expect(mockAddBreadcrumb).not.toHaveBeenCalled();
+  });
 });
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/hooks/useTraderPosition.ts b/app/components/Views/SocialLeaderboard/TraderPositionView/hooks/useTraderPosition.ts
index b67f28b210e..06c6aff0f83 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/hooks/useTraderPosition.ts
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/hooks/useTraderPosition.ts
@@ -1,7 +1,15 @@
 import { useEffect } from 'react';
+import { useSelector } from 'react-redux';
 import { useQuery } from '@metamask/react-data-query';
 import type { Position } from '@metamask/social-controllers';
 import Logger from '../../../../../util/Logger';
+import {
+  addSocialBreadcrumb,
+  buildSocialErrorExtras,
+  categoriseSocialError,
+  extractHttpStatus,
+} from '../../../../../util/social/socialServiceTelemetry';
+import { selectIsUnlocked } from '../../../../../selectors/keyringController';
 
 export interface UseTraderPositionResult {
   position: Position | undefined;
@@ -17,6 +25,7 @@ export interface UseTraderPositionResult {
 export const useTraderPosition = (
   positionId: string | undefined,
 ): UseTraderPositionResult => {
+  const isUnlocked = useSelector(selectIsUnlocked);
   const fetchOptions = { positionId: positionId ?? '' };
 
   const queryKey: [string, { positionId: string }] = [
@@ -26,12 +35,24 @@ export const useTraderPosition = (
 
   const { data, isLoading, error } = useQuery<Position>({
     queryKey,
-    enabled: Boolean(positionId),
+    enabled: Boolean(positionId) && isUnlocked,
   });
 
   useEffect(() => {
     if (error) {
-      Logger.error(error as Error, 'useTraderPosition: fetch failed');
+      Logger.error(
+        error as Error,
+        buildSocialErrorExtras({
+          legacyMessage: 'useTraderPosition: fetch failed',
+          endpoint: 'position_by_id',
+          error,
+        }),
+      );
+      addSocialBreadcrumb({
+        endpoint: 'position_by_id',
+        errorCategory: categoriseSocialError(error),
+        httpStatus: extractHttpStatus(error),
+      });
     }
   }, [error]);
 
diff --git a/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderPositions.test.ts b/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderPositions.test.ts
index b1614083693..3d515e912c0 100644
--- a/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderPositions.test.ts
+++ b/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderPositions.test.ts
@@ -1,15 +1,33 @@
 import { renderHook } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
 import { useQuery } from '@metamask/react-data-query';
+import { addBreadcrumb } from '@sentry/react-native';
 import Logger from '../../../../../util/Logger';
+import { selectIsUnlocked } from '../../../../../selectors/keyringController';
 import { useTraderPositions } from './useTraderPositions';
 
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../../../selectors/keyringController', () => ({
+  selectIsUnlocked: jest.fn(),
+}));
+
 jest.mock('../../../../../util/Logger', () => ({
   error: jest.fn(),
 }));
 
 jest.mock('@metamask/react-data-query');
 
+jest.mock('@sentry/react-native', () => ({
+  addBreadcrumb: jest.fn(),
+}));
+
+const mockAddBreadcrumb = addBreadcrumb as jest.Mock;
+
 const mockUseQuery = useQuery as jest.MockedFunction<typeof useQuery>;
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
 
 const makeQueryResult = (
   overrides: Partial<ReturnType<typeof useQuery>> = {},
@@ -17,6 +35,7 @@ const makeQueryResult = (
   ({
     data: undefined,
     isLoading: false,
+    isFetching: false,
     error: null,
     refetch: jest.fn(),
     ...overrides,
@@ -64,6 +83,11 @@ describe('useTraderPositions', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockUseQuery.mockReturnValue(makeQueryResult());
+    mockAddBreadcrumb.mockClear();
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectIsUnlocked) return true;
+      return undefined;
+    });
   });
 
   describe('query configuration', () => {
@@ -90,7 +114,7 @@ describe('useTraderPositions', () => {
       );
     });
 
-    it('enables both queries when addressOrId is non-empty', () => {
+    it('enables both queries when addressOrId is non-empty and wallet is unlocked', () => {
       renderHook(() => useTraderPositions('trader-1'));
 
       expect(mockUseQuery.mock.calls[0][0]).toEqual(
@@ -112,6 +136,21 @@ describe('useTraderPositions', () => {
       );
     });
 
+    it('disables both queries when wallet is locked', () => {
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectIsUnlocked) return false;
+        return undefined;
+      });
+      renderHook(() => useTraderPositions('trader-1'));
+
+      expect(mockUseQuery.mock.calls[0][0]).toEqual(
+        expect.objectContaining({ enabled: false }),
+      );
+      expect(mockUseQuery.mock.calls[1][0]).toEqual(
+        expect.objectContaining({ enabled: false }),
+      );
+    });
+
     it('forwards refetchInterval only to the open positions query', () => {
       renderHook(() =>
         useTraderPositions('trader-1', { refetchInterval: 30_000 }),
@@ -248,7 +287,7 @@ describe('useTraderPositions', () => {
       expect(result.current.error).toBe('raw error');
     });
 
-    it('logs the combined error', () => {
+    it('logs the open error with enriched extras including the endpoint', () => {
       const error = new Error('fetch failed');
 
       mockUseQuery
@@ -259,7 +298,30 @@ describe('useTraderPositions', () => {
 
       expect(Logger.error).toHaveBeenCalledWith(
         error,
-        'useTraderPositions: positions fetch failed',
+        expect.objectContaining({
+          message: 'useTraderPositions: positions fetch failed',
+          endpoint: 'open_positions',
+          errorCategory: expect.any(String),
+        }),
+      );
+    });
+
+    it('logs the closed error with enriched extras including the endpoint', () => {
+      const error = new Error('closed fetch failed');
+
+      mockUseQuery
+        .mockReturnValueOnce(makeQueryResult())
+        .mockReturnValueOnce(makeQueryResult({ error }));
+
+      renderHook(() => useTraderPositions('trader-1'));
+
+      expect(Logger.error).toHaveBeenCalledWith(
+        error,
+        expect.objectContaining({
+          message: 'useTraderPositions: positions fetch failed',
+          endpoint: 'closed_positions',
+          errorCategory: expect.any(String),
+        }),
       );
     });
 
@@ -267,5 +329,78 @@ describe('useTraderPositions', () => {
       renderHook(() => useTraderPositions('trader-1'));
       expect(Logger.error).not.toHaveBeenCalled();
     });
+
+    it('does NOT include addressOrId in the Logger.error extras', () => {
+      const error = new Error('fetch failed');
+
+      mockUseQuery
+        .mockReturnValueOnce(makeQueryResult({ error }))
+        .mockReturnValueOnce(makeQueryResult());
+
+      renderHook(() => useTraderPositions('0xSensitiveAddress'));
+
+      const call = (Logger.error as jest.Mock).mock.calls[0];
+      const extras = call[1];
+      const serialised = JSON.stringify(extras);
+      expect(serialised).not.toContain('0xSensitiveAddress');
+      expect(Object.keys(extras)).not.toContain('addressOrId');
+    });
+  });
+
+  describe('breadcrumbs', () => {
+    it('emits a failure breadcrumb for open_positions on error', () => {
+      const error = new Error('open failed');
+      mockUseQuery
+        .mockReturnValueOnce(makeQueryResult({ error }))
+        .mockReturnValueOnce(makeQueryResult());
+
+      renderHook(() => useTraderPositions('trader-1'));
+
+      expect(mockAddBreadcrumb).toHaveBeenCalledWith(
+        expect.objectContaining({
+          level: 'error',
+          message: expect.stringContaining(
+            'social_service.open_positions.failure',
+          ),
+        }),
+      );
+    });
+
+    it('emits a failure breadcrumb for closed_positions on error', () => {
+      const error = new Error('closed failed');
+      mockUseQuery
+        .mockReturnValueOnce(makeQueryResult())
+        .mockReturnValueOnce(makeQueryResult({ error }));
+
+      renderHook(() => useTraderPositions('trader-1'));
+
+      expect(mockAddBreadcrumb).toHaveBeenCalledWith(
+        expect.objectContaining({
+          level: 'error',
+          message: expect.stringContaining(
+            'social_service.closed_positions.failure',
+          ),
+        }),
+      );
+    });
+
+    it('does not emit a breadcrumb when there are no errors', () => {
+      renderHook(() => useTraderPositions('trader-1'));
+      expect(mockAddBreadcrumb).not.toHaveBeenCalled();
+    });
+
+    it('never includes addressOrId in breadcrumb data', () => {
+      const error = new Error('open failed');
+      mockUseQuery
+        .mockReturnValueOnce(makeQueryResult({ error }))
+        .mockReturnValueOnce(makeQueryResult());
+
+      renderHook(() => useTraderPositions('0xSensitiveAddress'));
+
+      mockAddBreadcrumb.mock.calls.forEach(([breadcrumb]) => {
+        const serialised = JSON.stringify(breadcrumb);
+        expect(serialised).not.toContain('0xSensitiveAddress');
+      });
+    });
   });
 });
diff --git a/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderPositions.ts b/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderPositions.ts
index 2c47af1ae38..d083ee59c2f 100644
--- a/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderPositions.ts
+++ b/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderPositions.ts
@@ -1,4 +1,5 @@
 import { useEffect } from 'react';
+import { useSelector } from 'react-redux';
 import { useQuery } from '@metamask/react-data-query';
 import type {
   PositionsResponse,
@@ -6,6 +7,13 @@ import type {
   Position,
 } from '@metamask/social-controllers';
 import Logger from '../../../../../util/Logger';
+import {
+  addSocialBreadcrumb,
+  buildSocialErrorExtras,
+  categoriseSocialError,
+  extractHttpStatus,
+} from '../../../../../util/social/socialServiceTelemetry';
+import { selectIsUnlocked } from '../../../../../selectors/keyringController';
 
 const EMPTY_POSITIONS: Position[] = [];
 
@@ -25,6 +33,7 @@ export const useTraderPositions = (
   addressOrId: string,
   options?: UseTraderPositionsOptions,
 ): UseTraderPositionsResult => {
+  const isUnlocked = useSelector(selectIsUnlocked);
   const fetchOptions: FetchPositionsOptions = { addressOrId };
 
   const {
@@ -33,7 +42,7 @@ export const useTraderPositions = (
     error: openError,
   } = useQuery<PositionsResponse>({
     queryKey: ['SocialService:fetchOpenPositions', fetchOptions],
-    enabled: Boolean(addressOrId),
+    enabled: Boolean(addressOrId) && isUnlocked,
     refetchInterval: options?.refetchInterval,
   });
 
@@ -43,22 +52,49 @@ export const useTraderPositions = (
     error: closedError,
   } = useQuery<PositionsResponse>({
     queryKey: ['SocialService:fetchClosedPositions', fetchOptions],
-    enabled: Boolean(addressOrId),
+    enabled: Boolean(addressOrId) && isUnlocked,
   });
 
   const openPositions = openData?.positions ?? EMPTY_POSITIONS;
   const closedPositions = closedData?.positions ?? EMPTY_POSITIONS;
 
-  const combinedError = openError ?? closedError;
+  useEffect(() => {
+    if (openError) {
+      Logger.error(
+        openError as Error,
+        buildSocialErrorExtras({
+          legacyMessage: 'useTraderPositions: positions fetch failed',
+          endpoint: 'open_positions',
+          error: openError,
+        }),
+      );
+      addSocialBreadcrumb({
+        endpoint: 'open_positions',
+        errorCategory: categoriseSocialError(openError),
+        httpStatus: extractHttpStatus(openError),
+      });
+    }
+  }, [openError]);
 
   useEffect(() => {
-    if (combinedError) {
+    if (closedError) {
       Logger.error(
-        combinedError as Error,
-        'useTraderPositions: positions fetch failed',
+        closedError as Error,
+        buildSocialErrorExtras({
+          legacyMessage: 'useTraderPositions: positions fetch failed',
+          endpoint: 'closed_positions',
+          error: closedError,
+        }),
       );
+      addSocialBreadcrumb({
+        endpoint: 'closed_positions',
+        errorCategory: categoriseSocialError(closedError),
+        httpStatus: extractHttpStatus(closedError),
+      });
     }
-  }, [combinedError]);
+  }, [closedError]);
+
+  const combinedError = openError ?? closedError;
 
   return {
     openPositions,
diff --git a/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderProfile.test.ts b/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderProfile.test.ts
index cf59e980a14..1091180d52e 100644
--- a/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderProfile.test.ts
+++ b/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderProfile.test.ts
@@ -3,10 +3,15 @@ import { useSelector } from 'react-redux';
 import { useQuery } from '@metamask/react-data-query';
 import Engine from '../../../../../core/Engine';
 import Logger from '../../../../../util/Logger';
+import { selectIsUnlocked } from '../../../../../selectors/keyringController';
 import { useTraderProfile } from './useTraderProfile';
 
 jest.mock('react-redux', () => ({
-  useSelector: jest.fn().mockReturnValue([]),
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../../../selectors/keyringController', () => ({
+  selectIsUnlocked: jest.fn(),
 }));
 
 jest.mock('../../../../../selectors/socialController', () => ({
@@ -66,7 +71,10 @@ describe('useTraderProfile', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockUseQuery.mockReturnValue(makeQueryResult());
-    mockUseSelector.mockReturnValue([]);
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectIsUnlocked) return true;
+      return []; // default for other selectors (e.g. selectFollowingProfileIds)
+    });
   });
 
   describe('query configuration', () => {
@@ -83,7 +91,7 @@ describe('useTraderProfile', () => {
       );
     });
 
-    it('enables the query when addressOrId is non-empty', () => {
+    it('enables the query when addressOrId is non-empty and wallet is unlocked', () => {
       renderHook(() => useTraderProfile('trader-1'));
 
       expect(mockUseQuery).toHaveBeenCalledWith(
@@ -98,6 +106,18 @@ describe('useTraderProfile', () => {
         expect.objectContaining({ enabled: false }),
       );
     });
+
+    it('disables the query when wallet is locked', () => {
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectIsUnlocked) return false;
+        return [];
+      });
+      renderHook(() => useTraderProfile('trader-1'));
+
+      expect(mockUseQuery).toHaveBeenCalledWith(
+        expect.objectContaining({ enabled: false }),
+      );
+    });
   });
 
   describe('profile data', () => {
@@ -180,7 +200,10 @@ describe('useTraderProfile', () => {
     });
 
     it('seeds isFollowing true when traderId is in followingProfileIds', () => {
-      mockUseSelector.mockReturnValue(['trader-1']);
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectIsUnlocked) return true;
+        return ['trader-1'];
+      });
       const { result } = renderHook(() => useTraderProfile('trader-1'));
       expect(result.current.isFollowing).toBe(true);
     });
@@ -199,7 +222,10 @@ describe('useTraderProfile', () => {
     });
 
     it('calls unfollowTrader when currently following', async () => {
-      mockUseSelector.mockReturnValue(['trader-1']);
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectIsUnlocked) return true;
+        return ['trader-1'];
+      });
       const { result } = renderHook(() => useTraderProfile('trader-1'));
 
       await act(async () => {
diff --git a/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderProfile.ts b/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderProfile.ts
index a67d7e15e96..c96d0a8df3e 100644
--- a/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderProfile.ts
+++ b/app/components/Views/SocialLeaderboard/TraderProfileView/hooks/useTraderProfile.ts
@@ -1,4 +1,5 @@
 import { useCallback, useEffect } from 'react';
+import { useSelector } from 'react-redux';
 import { useQuery } from '@metamask/react-data-query';
 import type {
   TraderProfileResponse,
@@ -6,6 +7,7 @@ import type {
 } from '@metamask/social-controllers';
 import Logger from '../../../../../util/Logger';
 import { useFollowToggle } from '../../../../hooks/useFollowToggle';
+import { selectIsUnlocked } from '../../../../../selectors/keyringController';
 
 export interface UseTraderProfileOptions {
   refetchInterval?: number;
@@ -24,6 +26,7 @@ export const useTraderProfile = (
   addressOrId: string,
   options?: UseTraderProfileOptions,
 ): UseTraderProfileResult => {
+  const isUnlocked = useSelector(selectIsUnlocked);
   const fetchOptions: FetchTraderProfileOptions = { addressOrId };
 
   const queryKey: [string, FetchTraderProfileOptions] = [
@@ -33,7 +36,7 @@ export const useTraderProfile = (
 
   const { data, isLoading, error, refetch } = useQuery<TraderProfileResponse>({
     queryKey,
-    enabled: Boolean(addressOrId),
+    enabled: Boolean(addressOrId) && isUnlocked,
     refetchInterval: options?.refetchInterval,
   });
 
diff --git a/app/components/Views/TermsAndConditions/TermsAndConditions.testIds.ts b/app/components/Views/TermsAndConditions/TermsAndConditions.testIds.ts
new file mode 100644
index 00000000000..9c31a0df993
--- /dev/null
+++ b/app/components/Views/TermsAndConditions/TermsAndConditions.testIds.ts
@@ -0,0 +1,3 @@
+export const TermsAndConditionsSelectorsIDs = {
+  ACCEPT_BUTTON: 'terms-and-conditions-button-id',
+};
diff --git a/app/components/Views/TermsAndConditions/index.js b/app/components/Views/TermsAndConditions/index.js
index fe14c90100c..1dbad54b9f3 100644
--- a/app/components/Views/TermsAndConditions/index.js
+++ b/app/components/Views/TermsAndConditions/index.js
@@ -1,12 +1,11 @@
 import React, { PureComponent } from 'react';
-import { Text, StyleSheet, TouchableOpacity, Platform } from 'react-native';
+import { Text, StyleSheet, TouchableOpacity } from 'react-native';
 import PropTypes from 'prop-types';
 import { fontStyles } from '../../../styles/common';
 import { strings } from '../../../../locales/i18n';
 import AppConstants from '../../../core/AppConstants';
 import { ThemeContext, mockTheme } from '../../../util/theme';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import { TERMS_AND_CONDITIONS_BUTTON_ID } from '../../../../wdio/screen-objects/testIDs/Components/TermsAndConditions.testIds';
+import { TermsAndConditionsSelectorsIDs } from './TermsAndConditions.testIds';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -49,7 +48,7 @@ export default class TermsAndConditions extends PureComponent {
 
     return (
       <TouchableOpacity
-        {...generateTestId(Platform, TERMS_AND_CONDITIONS_BUTTON_ID)}
+        testID={TermsAndConditionsSelectorsIDs.ACCEPT_BUTTON}
         onPress={this.press}
       >
         <Text style={styles.text}>
diff --git a/app/components/Views/TrendingView/ExplorePageV1.tsx b/app/components/Views/TrendingView/ExplorePageV1.tsx
new file mode 100644
index 00000000000..f336899246e
--- /dev/null
+++ b/app/components/Views/TrendingView/ExplorePageV1.tsx
@@ -0,0 +1,268 @@
+import React, { useCallback, useMemo } from 'react';
+import { useNavigation, NavigationProp } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import { Box } from '@metamask/design-system-react-native';
+import type { ListRenderItem } from '@shopify/flash-list';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import type { PredictMarket as PredictMarketType } from '../../UI/Predict/types';
+import type { AppNavigationProp } from '../../../core/NavigationService/types';
+import type { PerpsNavigationParamList } from '../../UI/Perps/types/navigation';
+import type { SiteData } from '../../UI/Sites/components/SiteRowItem/SiteRowItem';
+import { selectPerpsEnabledFlag } from '../../UI/Perps';
+import { selectPredictEnabledFlag } from '../../UI/Predict';
+import Routes from '../../../constants/navigation/Routes';
+import { strings } from '../../../../locales/i18n';
+import { TokenDetailsSource } from '../../UI/TokenDetails/constants/constants';
+import { useTokensFeed } from './feeds/tokens/useTokensFeed';
+import { TokenRowItem } from './feeds/tokens/TokenRowItem';
+import TrendingTokensSkeleton from '../../UI/Trending/components/TrendingTokenSkeleton/TrendingTokensSkeleton';
+import { usePerpsFeed, type PerpsFeedItem } from './feeds/perps/usePerpsFeed';
+import PerpsSectionProvider from './feeds/perps/PerpsSectionProvider';
+import PerpsTileRowItem from './feeds/perps/PerpsTileRowItem';
+import PerpsMarketTileCardSkeleton from '../Homepage/Sections/Perpetuals/components/PerpsMarketTileCardSkeleton';
+import { navigateToPerpsMarketList } from './feeds/perps/perpsNavigation';
+import { usePredictionsFeed } from './feeds/predictions/usePredictionsFeed';
+import { PredictionCarouselRowItem } from './feeds/predictions/PredictionRowItem';
+import PredictionsSkeleton from './feeds/predictions/PredictionsSkeleton';
+import { navigateToPredictionsList } from './feeds/predictions/predictionsNavigation';
+import { useStocksFeed } from './feeds/stocks/useStocksFeed';
+import { SiteRowItem } from './feeds/sites/SiteRowItem';
+import SiteSkeleton from '../../UI/Sites/components/SiteSkeleton/SiteSkeleton';
+import { useSitesFeed } from './feeds/sites/useSitesFeed';
+import CardList from './components/CardList';
+import QuickActions, { type SectionId } from './components/QuickActions';
+import ExploreScroll from './components/ExploreScroll';
+import HorizontalCarousel from './components/HorizontalCarousel';
+import SectionHeader from './components/SectionHeader';
+import TileCarousel from './components/TileCarousel';
+import type { TabProps } from './hooks/useExploreRefresh';
+import { TrendingViewSelectorsIDs } from './TrendingView.testIds';
+
+interface ExploreV1PerpsBlockProps {
+  refresh: TabProps['refresh'];
+  navigation: NavigationProp<PerpsNavigationParamList>;
+}
+
+const ExploreV1PerpsBlock: React.FC<ExploreV1PerpsBlockProps> = ({
+  refresh,
+  navigation,
+}) => {
+  const perps = usePerpsFeed({
+    variant: 'all',
+    refresh,
+    withTileExtras: true,
+  });
+
+  if (!perps.isLoading && perps.data.length === 0) {
+    return null;
+  }
+
+  return (
+    <Box>
+      <SectionHeader
+        title={strings('trending.perps')}
+        onViewAll={() => navigateToPerpsMarketList(navigation)}
+        testID="section-header-view-all-perps"
+      />
+      <TileCarousel<PerpsFeedItem>
+        data={perps.data}
+        isLoading={perps.isLoading}
+        renderItem={(item) => (
+          <PerpsTileRowItem item={item} testIdPrefix="perps-market-tile-card" />
+        )}
+        keyExtractor={(item) => item.market.symbol}
+        Skeleton={PerpsMarketTileCardSkeleton}
+        onViewMore={() => navigateToPerpsMarketList(navigation)}
+        testID="explore-perps-carousel"
+        viewMoreTestID="perps-view-more-card"
+      />
+    </Box>
+  );
+};
+
+/**
+ * Legacy Explore layout: stacked sections in a single scroll (pre–tabbed Explore V2).
+ */
+const ExplorePageV1: React.FC<TabProps> = ({
+  refresh,
+  refreshing,
+  onRefresh,
+}) => {
+  const navigation = useNavigation<AppNavigationProp>();
+  const perpsNavigation =
+    useNavigation<NavigationProp<PerpsNavigationParamList>>();
+  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
+  const isPredictEnabled = useSelector(selectPredictEnabledFlag);
+
+  const predictions = usePredictionsFeed({ refresh });
+  const tokens = useTokensFeed({ refresh });
+  const stocks = useStocksFeed({ refresh });
+  const sites = useSitesFeed({ refresh });
+
+  const renderPredictionItem: ListRenderItem<PredictMarketType> = useCallback(
+    ({ item }) => (
+      <PredictionCarouselRowItem
+        market={item}
+        testIdPrefix="predict-market-row-item"
+      />
+    ),
+    [],
+  );
+
+  const renderTrendingTokenItem: ListRenderItem<TrendingAsset> = useCallback(
+    ({ item, index }) => (
+      <TokenRowItem
+        token={item}
+        index={index}
+        tokenDetailsSource={TokenDetailsSource.ExploreCryptoTrending}
+      />
+    ),
+    [],
+  );
+
+  const renderStockItem: ListRenderItem<TrendingAsset> = useCallback(
+    ({ item, index }) => (
+      <TokenRowItem
+        token={item}
+        index={index}
+        tokenDetailsSource={TokenDetailsSource.ExploreNowStocks}
+      />
+    ),
+    [],
+  );
+
+  const renderSite: ListRenderItem<SiteData> = useCallback(
+    ({ item }) => <SiteRowItem site={item} />,
+    [],
+  );
+
+  const showPredictions =
+    isPredictEnabled && (predictions.isLoading || predictions.data.length > 0);
+  const showTrendingTokens = tokens.isLoading || tokens.data.length > 0;
+  const showStocks = stocks.isLoading || stocks.data.length > 0;
+  const showSites = sites.isLoading || sites.data.length > 0;
+
+  const quickActionsEmptySections = useMemo(() => {
+    const empty = new Set<SectionId>();
+    if (!showTrendingTokens) {
+      empty.add('tokens');
+    }
+    if (!isPerpsEnabled) {
+      empty.add('perps');
+    }
+    if (!showStocks) {
+      empty.add('stocks');
+    }
+    if (!showPredictions) {
+      empty.add('predictions');
+    }
+    if (!showSites) {
+      empty.add('sites');
+    }
+    return empty;
+  }, [
+    showTrendingTokens,
+    isPerpsEnabled,
+    showStocks,
+    showPredictions,
+    showSites,
+  ]);
+
+  return (
+    <Box twClassName="flex-1" testID="explore-page-v1">
+      <ExploreScroll
+        refreshing={refreshing}
+        onRefresh={onRefresh}
+        testID={TrendingViewSelectorsIDs.TRENDING_FEED_SCROLL_VIEW}
+        includeTopPadding={false}
+      >
+        <QuickActions emptySections={quickActionsEmptySections} />
+
+        {showPredictions && (
+          <Box>
+            <SectionHeader
+              title={strings('wallet.predict')}
+              onViewAll={() =>
+                navigateToPredictionsList(navigation, 'trending')
+              }
+              testID="section-header-view-all-predictions"
+            />
+            <HorizontalCarousel<PredictMarketType>
+              data={predictions.data}
+              isLoading={predictions.isLoading}
+              renderItem={renderPredictionItem}
+              Skeleton={PredictionsSkeleton}
+              idPrefix="explore_v1_predictions"
+            />
+          </Box>
+        )}
+
+        {showTrendingTokens && (
+          <Box>
+            <SectionHeader
+              title={strings('trending.trending_tokens')}
+              onViewAll={() =>
+                navigation.navigate(Routes.WALLET.TRENDING_TOKENS_FULL_VIEW)
+              }
+              testID="section-header-view-all-tokens"
+            />
+            <CardList<TrendingAsset>
+              data={tokens.data}
+              isLoading={tokens.isLoading}
+              renderItem={renderTrendingTokenItem}
+              Skeleton={TrendingTokensSkeleton}
+              idPrefix="explore_v1_tokens"
+            />
+          </Box>
+        )}
+
+        {isPerpsEnabled && (
+          <PerpsSectionProvider>
+            <ExploreV1PerpsBlock
+              refresh={refresh}
+              navigation={perpsNavigation}
+            />
+          </PerpsSectionProvider>
+        )}
+
+        {showStocks && (
+          <Box>
+            <SectionHeader
+              title={strings('trending.stocks')}
+              onViewAll={() =>
+                navigation.navigate(Routes.WALLET.RWA_TOKENS_FULL_VIEW)
+              }
+              testID="section-header-view-all-stocks"
+            />
+            <CardList<TrendingAsset>
+              data={stocks.data}
+              isLoading={stocks.isLoading}
+              renderItem={renderStockItem}
+              Skeleton={TrendingTokensSkeleton}
+              idPrefix="explore_v1_stocks"
+            />
+          </Box>
+        )}
+
+        {showSites && (
+          <Box>
+            <SectionHeader
+              title={strings('trending.sites')}
+              onViewAll={() => navigation.navigate(Routes.SITES_FULL_VIEW)}
+              testID="section-header-view-all-sites"
+            />
+            <CardList<SiteData>
+              data={sites.data}
+              isLoading={sites.isLoading}
+              renderItem={renderSite}
+              Skeleton={SiteSkeleton}
+              idPrefix="explore_v1_sites"
+            />
+          </Box>
+        )}
+      </ExploreScroll>
+    </Box>
+  );
+};
+
+export default ExplorePageV1;
diff --git a/app/components/Views/TrendingView/TrendingView.test.tsx b/app/components/Views/TrendingView/TrendingView.test.tsx
index c06ca4c16bb..a6854d1a823 100644
--- a/app/components/Views/TrendingView/TrendingView.test.tsx
+++ b/app/components/Views/TrendingView/TrendingView.test.tsx
@@ -39,6 +39,7 @@ import { selectIsEvmNetworkSelected } from '../../../selectors/multichainNetwork
 import { selectEnabledNetworksByNamespace } from '../../../selectors/networkEnablementController';
 import { selectSelectedInternalAccountByScope } from '../../../selectors/multichainAccounts/accounts';
 import { selectBasicFunctionalityEnabled } from '../../../selectors/settings';
+import { selectExplorePageV2EnabledFlag } from '../../../selectors/featureFlagController/explorePageV2';
 import { useSelector } from 'react-redux';
 import Routes from '../../../constants/navigation/Routes';
 
@@ -128,6 +129,7 @@ describe('TrendingView', () => {
       overrides: {
         browserTabsCount?: number;
         basicFunctionalityEnabled?: boolean;
+        explorePageV2Enabled?: boolean;
       } = {},
     ) =>
     (selector: unknown) => {
@@ -172,6 +174,9 @@ describe('TrendingView', () => {
       if (selector === selectBasicFunctionalityEnabled) {
         return overrides.basicFunctionalityEnabled ?? true;
       }
+      if (selector === selectExplorePageV2EnabledFlag) {
+        return overrides.explorePageV2Enabled ?? true;
+      }
       if (selector === selectSelectedInternalAccountByScope) {
         return (_scope: string) => null;
       }
@@ -381,5 +386,22 @@ describe('TrendingView', () => {
 
       expect(getByTestId('basic-functionality-empty-state')).toBeOnTheScreen();
     });
+
+    it('renders Explore Page V1 when Explore Page V2 flag is disabled', () => {
+      mockUseSelector.mockImplementation(
+        createMockSelectorImplementation({
+          explorePageV2Enabled: false,
+          basicFunctionalityEnabled: true,
+        }),
+      );
+
+      const { getByTestId } = render(
+        <NavigationContainer>
+          <TrendingView />
+        </NavigationContainer>,
+      );
+
+      expect(getByTestId('explore-page-v1')).toBeOnTheScreen();
+    });
   });
 });
diff --git a/app/components/Views/TrendingView/TrendingView.testIds.ts b/app/components/Views/TrendingView/TrendingView.testIds.ts
index 7ad98bcb25f..f4c3d88bc20 100644
--- a/app/components/Views/TrendingView/TrendingView.testIds.ts
+++ b/app/components/Views/TrendingView/TrendingView.testIds.ts
@@ -1,16 +1,17 @@
 export const TrendingViewSelectorsIDs = {
   TRENDING_FEED_SCROLL_VIEW: 'trending-feed-scroll-view',
-  QUICK_ACTIONS_SCROLL_VIEW: 'quick-actions-scroll-view',
   EXPLORE_HEADER_ROOT: 'explore-header-root',
   EXPLORE_SAFE_AREA: 'explore-safe-area',
   SECTION_HEADER_VIEW_ALL_TOKENS: 'section-header-view-all-tokens',
   TRENDING_TOKENS_HEADER: 'trending-tokens-header',
   EXPLORE_VIEW_SEARCH_BUTTON: 'explore-view-search-button',
   EXPLORE_VIEW_SEARCH_INPUT: 'explore-view-search-input',
+  EXPLORE_VIEW_SEARCH_TEXT_INPUT: 'explore-view-search-text-input',
   TRENDING_SEARCH_RESULTS_LIST: 'trending-search-results-list',
   ALL_NETWORKS_BUTTON: 'all-networks-button',
   CLOSE_BUTTON: 'close-button',
   TRENDING_TOKENS_HEADER_SEARCH_TOGGLE: 'trending-tokens-header-search-toggle',
+  QUICK_ACTIONS_SCROLL_VIEW: 'quick-actions-scroll-view',
 } as const;
 
 export type TrendingViewSelectorsIDsType = typeof TrendingViewSelectorsIDs;
diff --git a/app/components/Views/TrendingView/TrendingView.tsx b/app/components/Views/TrendingView/TrendingView.tsx
index 6968ab420ae..6d42545cb2f 100644
--- a/app/components/Views/TrendingView/TrendingView.tsx
+++ b/app/components/Views/TrendingView/TrendingView.tsx
@@ -1,5 +1,5 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { ScrollView, TouchableOpacity, RefreshControl } from 'react-native';
+import React, { useCallback, useEffect, useRef } from 'react';
+import { TouchableOpacity } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useNavigation } from '@react-navigation/native';
 import { useSelector } from 'react-redux';
@@ -13,114 +13,54 @@ import {
   IconSize,
 } from '@metamask/design-system-react-native';
 import HeaderRoot from '../../../component-library/components-temp/HeaderRoot';
+import TabsList from '../../../component-library/components-temp/Tabs/TabsList/TabsList';
+import { TabViewProps } from '../../../component-library/components-temp/Tabs/TabsList/TabsList.types';
 import { strings } from '../../../../locales/i18n';
 import AppConstants from '../../../core/AppConstants';
 import { useBuildPortfolioUrl } from '../../hooks/useBuildPortfolioUrl';
-import { useTheme } from '../../../util/theme';
 import Routes from '../../../constants/navigation/Routes';
-import ExploreSearchBar from './components/ExploreSearchBar/ExploreSearchBar';
-import QuickActions from './components/QuickActions/QuickActions';
-import SectionHeader from './components/SectionHeader/SectionHeader';
-import { useHomeSections, SectionId } from './sections.config';
 import { selectBasicFunctionalityEnabled } from '../../../selectors/settings';
+import { selectExplorePageV2EnabledFlag } from '../../../selectors/featureFlagController/explorePageV2';
 import BasicFunctionalityEmptyState from '../../UI/BasicFunctionality/BasicFunctionalityEmptyState/BasicFunctionalityEmptyState';
 import TrendingFeedSessionManager from '../../UI/Trending/services/TrendingFeedSessionManager';
-import Section, { RefreshConfig } from './components/Sections/Section';
+import ExploreSearchBar from './components/ExploreSearchBar/ExploreSearchBar';
+import { useExploreRefresh } from './hooks/useExploreRefresh';
+import NowTab from './tabs/NowTab';
+import MacroTab from './tabs/MacroTab';
+import RwasTab from './tabs/RwasTab';
+import CryptoTab from './tabs/CryptoTab';
+import SportsTab from './tabs/SportsTab';
+import DappsTab from './tabs/DappsTab';
 import { TrendingViewSelectorsIDs } from './TrendingView.testIds';
-
-const curriedSetSectionState =
-  (setState: (updater: (prev: Set<SectionId>) => Set<SectionId>) => void) =>
-  (sectionId: SectionId) =>
-  (isActive: boolean): void => {
-    setState((prev) => {
-      const newSet = new Set(prev);
-
-      if (isActive) {
-        newSet.add(sectionId);
-      } else {
-        newSet.delete(sectionId);
-      }
-
-      return newSet;
-    });
-  };
-
-/**
- * Custom hook to track boolean state for each section
- * Returns the Set of sections with that state and callbacks to update them
- */
-const useSectionStateTracker = (
-  sections: { id: SectionId }[],
-): {
-  sectionsWithState: Set<SectionId>;
-  callbacks: Record<SectionId, (isActive: boolean) => void>;
-} => {
-  const [activeSections, setActiveSections] = useState<Set<SectionId>>(
-    new Set(),
-  );
-
-  const callbacks = useMemo(() => {
-    const result = {} as Record<SectionId, (isActive: boolean) => void>;
-    sections.forEach((s) => {
-      result[s.id] = curriedSetSectionState(setActiveSections)(s.id);
-    });
-    return result;
-  }, [sections]);
-
-  return { sectionsWithState: activeSections, callbacks };
-};
+import ExplorePageV1 from './ExplorePageV1';
+import {
+  trackExploreInteracted,
+  type ExploreTabName,
+} from './search/analytics';
+
+const TAB_NAMES: ExploreTabName[] = [
+  'Now',
+  'Macro',
+  'RWAs',
+  'Crypto',
+  'Sports',
+  'Sites',
+];
 
 export const ExploreFeed: React.FC = () => {
   const tw = useTailwind();
   const navigation = useNavigation();
   const buildPortfolioUrlWithMetrics = useBuildPortfolioUrl();
-  const { colors } = useTheme();
-  const [refreshing, setRefreshing] = useState(false);
-  const [refreshConfig, setRefreshConfig] = useState<RefreshConfig>({
-    trigger: 0,
-    silentRefresh: true,
-  });
-
-  const homeSections = useHomeSections();
-
-  // Track which sections have empty data (for QuickActions empty state)
-  const { sectionsWithState: emptySections, callbacks: emptyStateCallbacks } =
-    useSectionStateTracker(homeSections);
-
-  const noopLoadingState = useCallback((_isLoading: boolean) => undefined, []);
+  const tabProps = useExploreRefresh();
 
   const sessionManager = TrendingFeedSessionManager.getInstance();
 
-  // REMOVED FOR NOW (https://consensys.slack.com/archives/C07NF2K42LE/p1766152712027759?thread_ts=1766135783.241539&cid=C07NF2K42LE)
-  // Trigger refresh only when navigating to an already-mounted screen
-  // useEffect(() => {
-  //   const params = route.params as { refresh?: boolean } | undefined;
-
-  //   // Skip refresh on first mount
-  //   if (isFirstMount.current) {
-  //     isFirstMount.current = false;
-  //     return;
-  //   }
-
-  //   if (params?.refresh === true) {
-  //     // Silent refresh - don't show skeletons
-  //     setRefreshConfig((prev) => ({
-  //       trigger: prev.trigger + 1,
-  //       silentRefresh: false,
-  //     }));
-  //   }
-  // }, [route.params]);
-
   // Initialize session and enable AppState listener on mount
   useEffect(() => {
-    // Enable AppState listener to detect app backgrounding
     sessionManager.enableAppStateListener();
-
-    // Start session
     sessionManager.startSession('trending_feed');
 
     return () => {
-      // End session and disable listener on unmount
       sessionManager.endSession();
       sessionManager.disableAppStateListener();
     };
@@ -134,10 +74,10 @@ export const ExploreFeed: React.FC = () => {
   const isBasicFunctionalityEnabled = useSelector(
     selectBasicFunctionalityEnabled,
   );
+  const isExplorePageV2Enabled = useSelector(selectExplorePageV2EnabledFlag);
 
   const handleBrowserPress = useCallback(() => {
     if (browserTabsCount > 0) {
-      // If tabs exist, show the tabs view directly
       navigation.navigate(Routes.BROWSER.HOME, {
         screen: Routes.BROWSER.VIEW,
         params: {
@@ -147,7 +87,6 @@ export const ExploreFeed: React.FC = () => {
         },
       });
     } else {
-      // If no tabs exist, open a new tab with portfolio URL
       navigation.navigate(Routes.BROWSER.HOME, {
         screen: Routes.BROWSER.VIEW,
         params: {
@@ -163,24 +102,17 @@ export const ExploreFeed: React.FC = () => {
     navigation.navigate(Routes.EXPLORE_SEARCH);
   }, [navigation]);
 
-  // Clean up timeout when component unmounts or refreshing changes
-  useEffect(() => {
-    if (refreshing) {
-      const timeoutId = setTimeout(() => {
-        setRefreshing(false);
-      }, 1000);
-
-      return () => clearTimeout(timeoutId);
-    }
-  }, [refreshing]);
+  const previousTabRef = useRef<ExploreTabName>('Now');
 
-  const handleRefresh = useCallback(() => {
-    setRefreshing(true);
-    // Pull-to-refresh - show skeletons
-    setRefreshConfig((prev) => ({
-      trigger: prev.trigger + 1,
-      silentRefresh: true,
-    }));
+  const handleTabChange = useCallback(({ i }: { i: number }) => {
+    const destinationTab = TAB_NAMES[i];
+    if (!destinationTab) return;
+    trackExploreInteracted({
+      interaction_type: 'tab_switched',
+      tab_name: destinationTab,
+      previous_tab: previousTabRef.current,
+    });
+    previousTabRef.current = destinationTab;
   }, []);
 
   return (
@@ -195,7 +127,7 @@ export const ExploreFeed: React.FC = () => {
       />
 
       <Box twClassName="gap-4 flex-1">
-        <Box twClassName="mt-3 flex-row items-center gap-2 px-4">
+        <Box twClassName="mt-2 mb-2 flex-row items-center gap-2 px-4">
           <Box twClassName="flex-1">
             <ExploreSearchBar type="button" onPress={handleSearchPress} />
           </Box>
@@ -214,54 +146,66 @@ export const ExploreFeed: React.FC = () => {
           </TouchableOpacity>
         </Box>
 
-        {isBasicFunctionalityEnabled ? (
-          <ScrollView
-            testID={TrendingViewSelectorsIDs.TRENDING_FEED_SCROLL_VIEW}
-            style={tw.style('flex-1 px-4')}
-            showsVerticalScrollIndicator={false}
-            refreshControl={
-              <RefreshControl
-                refreshing={refreshing}
-                onRefresh={handleRefresh}
-                tintColor={colors.icon.default}
-                colors={[colors.primary.default]}
-              />
-            }
+        {!isBasicFunctionalityEnabled ? (
+          <BasicFunctionalityEmptyState />
+        ) : isExplorePageV2Enabled ? (
+          <TabsList
+            tabsListContentTwClassName="px-0 pb-3"
+            onChangeTab={handleTabChange}
           >
-            <QuickActions emptySections={emptySections} />
-
-            {homeSections.map((section) => {
-              // Hide section visually but keep mounted so it can report when data arrives
-              const isHidden = emptySections.has(section.id);
-
-              const sectionComponent = (
-                <Section
-                  sectionId={section.id}
-                  refreshConfig={refreshConfig}
-                  toggleSectionEmptyState={emptyStateCallbacks[section.id]}
-                  toggleSectionLoadingState={noopLoadingState}
-                />
-              );
-
-              return (
-                <Box
-                  key={section.id}
-                  twClassName={isHidden ? 'hidden' : undefined}
-                >
-                  <SectionHeader sectionId={section.id} />
-                  {section.SectionWrapper ? (
-                    <section.SectionWrapper>
-                      {sectionComponent}
-                    </section.SectionWrapper>
-                  ) : (
-                    sectionComponent
-                  )}
-                </Box>
-              );
-            })}
-          </ScrollView>
+            <Box
+              key="now"
+              twClassName="flex-1"
+              {...({ tabLabel: strings('trending.tabs.now') } as TabViewProps)}
+            >
+              <NowTab {...tabProps} />
+            </Box>
+            <Box
+              key="macro"
+              twClassName="flex-1"
+              {...({
+                tabLabel: strings('trending.tabs.macro'),
+              } as TabViewProps)}
+            >
+              <MacroTab {...tabProps} />
+            </Box>
+            <Box
+              key="rwas"
+              twClassName="flex-1"
+              {...({ tabLabel: strings('trending.tabs.rwas') } as TabViewProps)}
+            >
+              <RwasTab {...tabProps} />
+            </Box>
+            <Box
+              key="crypto"
+              twClassName="flex-1"
+              {...({
+                tabLabel: strings('trending.tabs.crypto'),
+              } as TabViewProps)}
+            >
+              <CryptoTab {...tabProps} />
+            </Box>
+            <Box
+              key="sports"
+              twClassName="flex-1"
+              {...({
+                tabLabel: strings('trending.tabs.sports'),
+              } as TabViewProps)}
+            >
+              <SportsTab {...tabProps} />
+            </Box>
+            <Box
+              key="dapps"
+              twClassName="flex-1"
+              {...({
+                tabLabel: strings('trending.tabs.dapps'),
+              } as TabViewProps)}
+            >
+              <DappsTab {...tabProps} />
+            </Box>
+          </TabsList>
         ) : (
-          <BasicFunctionalityEmptyState />
+          <ExplorePageV1 {...tabProps} />
         )}
       </Box>
     </SafeAreaView>
diff --git a/app/components/Views/TrendingView/Views/ExploreSearchScreen/ExploreSearchScreen.tsx b/app/components/Views/TrendingView/Views/ExploreSearchScreen/ExploreSearchScreen.tsx
index e86004ebc74..313d1b69bc6 100644
--- a/app/components/Views/TrendingView/Views/ExploreSearchScreen/ExploreSearchScreen.tsx
+++ b/app/components/Views/TrendingView/Views/ExploreSearchScreen/ExploreSearchScreen.tsx
@@ -1,12 +1,11 @@
-import React, { useState, useCallback } from 'react';
+import React, { useCallback, useState } from 'react';
 import { Keyboard, Platform } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useNavigation } from '@react-navigation/native';
 import { Box } from '@metamask/design-system-react-native';
 import ExploreSearchBar from '../../components/ExploreSearchBar/ExploreSearchBar';
-import ExploreSearchResults from '../../components/ExploreSearchResults/ExploreSearchResults';
-import { PerpsConnectionProvider } from '../../../../UI/Perps/providers/PerpsConnectionProvider';
-import { PerpsStreamProvider } from '../../../../UI/Perps/providers/PerpsStreamManager';
+import ExploreSearchResults from '../../search/ExploreSearchResults';
+import PerpsSectionProvider from '../../feeds/perps/PerpsSectionProvider';
 
 const ExploreSearchScreen: React.FC = () => {
   const insets = useSafeAreaInsets();
@@ -33,11 +32,9 @@ const ExploreSearchScreen: React.FC = () => {
         />
       </Box>
 
-      <PerpsConnectionProvider suppressErrorView>
-        <PerpsStreamProvider>
-          <ExploreSearchResults searchQuery={searchQuery} />
-        </PerpsStreamProvider>
-      </PerpsConnectionProvider>
+      <PerpsSectionProvider>
+        <ExploreSearchResults searchQuery={searchQuery} />
+      </PerpsSectionProvider>
     </Box>
   );
 };
diff --git a/app/components/Views/TrendingView/Views/ExploreSectionResultsFullView/ExploreSectionResultsFullView.test.tsx b/app/components/Views/TrendingView/Views/ExploreSectionResultsFullView/ExploreSectionResultsFullView.test.tsx
index ec4a8862c9b..d4eaeb07594 100644
--- a/app/components/Views/TrendingView/Views/ExploreSectionResultsFullView/ExploreSectionResultsFullView.test.tsx
+++ b/app/components/Views/TrendingView/Views/ExploreSectionResultsFullView/ExploreSectionResultsFullView.test.tsx
@@ -14,12 +14,12 @@ const mockTokenData = [
 ];
 
 const mockRouteParams: {
-  sectionId: string;
+  feedId: string;
   title: string;
   searchQuery: string;
   data: unknown[];
 } = {
-  sectionId: 'tokens',
+  feedId: 'tokens',
   title: 'Trending tokens',
   searchQuery: 'bitcoin',
   data: mockTokenData,
@@ -63,34 +63,53 @@ const mockCreateEventBuilder =
     typeof AnalyticsEventBuilder.createEventBuilder
   >;
 
-jest.mock('../../sections.config', () => {
+// Replace the search row dispatcher with a stub that exposes the item id so
+// taps on a specific row are testable.
+jest.mock('../../search/SearchFeedRow', () => {
   const { View } = jest.requireActual('react-native');
-  const MockRowItem = ({ item }: { item: unknown }) => (
-    <View testID={`row-item-${(item as { assetId: string }).assetId}`} />
-  );
-
+  const TapView = jest.requireActual('../../search/TapView').default;
   return {
-    SECTIONS_CONFIG: {
-      tokens: {
-        id: 'tokens',
-        title: 'Trending tokens',
-        RowItem: MockRowItem,
-        getItemIdentifier: (item: unknown) =>
-          (item as { assetId: string }).assetId,
-      },
+    __esModule: true,
+    default: ({
+      item,
+      sectionTitle,
+      searchQuery,
+      interactionType,
+    }: {
+      item: { assetId: string };
+      sectionTitle: string;
+      searchQuery: string;
+      interactionType: string;
+    }) => {
+      const { trackExploreEvent } = jest.requireActual(
+        '../../search/analytics',
+      );
+      const { MetaMetricsEvents } = jest.requireActual(
+        '../../../../../core/Analytics/MetaMetrics.events',
+      );
+      return (
+        <TapView
+          onTap={() =>
+            trackExploreEvent(MetaMetricsEvents.EXPLORE_SEARCH_INTERACTED, {
+              interaction_type: interactionType,
+              search_query: searchQuery,
+              section_name: sectionTitle,
+              item_clicked: item.assetId,
+            })
+          }
+        >
+          <View testID={`row-item-${item.assetId}`} />
+        </TapView>
+      );
     },
+    SearchFeedSkeleton: () => <View testID="skeleton" />,
   };
 });
 
-jest.mock(
-  '../../../../UI/Trending/components/TrendingTokenRowItem/TrendingTokenRowItem',
-  () => () => null,
-);
-
 describe('ExploreSectionResultsFullView', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    mockRouteParams.sectionId = 'tokens';
+    mockRouteParams.feedId = 'tokens';
     mockRouteParams.title = 'Trending tokens';
     mockRouteParams.searchQuery = 'bitcoin';
     mockRouteParams.data = mockTokenData;
@@ -104,21 +123,17 @@ describe('ExploreSectionResultsFullView', () => {
 
   it('renders the title from route params', () => {
     const { getByText } = render(<ExploreSectionResultsFullView />);
-
     expect(getByText('Trending tokens')).toBeOnTheScreen();
   });
 
   it('navigates back when back button is pressed', () => {
     const { getByLabelText } = render(<ExploreSectionResultsFullView />);
-
     fireEvent.press(getByLabelText('Go back'));
-
     expect(mockGoBack).toHaveBeenCalledTimes(1);
   });
 
   it('renders all items from the section data', () => {
     const { getByTestId } = render(<ExploreSectionResultsFullView />);
-
     expect(getByTestId('row-item-1')).toBeOnTheScreen();
     expect(getByTestId('row-item-2')).toBeOnTheScreen();
     expect(getByTestId('row-item-3')).toBeOnTheScreen();
@@ -127,9 +142,7 @@ describe('ExploreSectionResultsFullView', () => {
 
   it('renders empty list when section data is empty', () => {
     mockRouteParams.data = [];
-
     const { queryByTestId } = render(<ExploreSectionResultsFullView />);
-
     expect(queryByTestId('row-item-1')).toBeNull();
   });
 
diff --git a/app/components/Views/TrendingView/Views/ExploreSectionResultsFullView/ExploreSectionResultsFullView.tsx b/app/components/Views/TrendingView/Views/ExploreSectionResultsFullView/ExploreSectionResultsFullView.tsx
index 3652de9d111..5f0ca2f6764 100644
--- a/app/components/Views/TrendingView/Views/ExploreSectionResultsFullView/ExploreSectionResultsFullView.tsx
+++ b/app/components/Views/TrendingView/Views/ExploreSectionResultsFullView/ExploreSectionResultsFullView.tsx
@@ -21,46 +21,57 @@ import {
   BoxAlignItems,
   FontWeight,
 } from '@metamask/design-system-react-native';
-import { SECTIONS_CONFIG, type SectionId } from '../../sections.config';
-import { TrackedRowItem, useScrollTracking } from '../../utils/exploreSearch';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import type { PerpsMarketData } from '@metamask/perps-controller';
+import type { PredictMarket as PredictMarketType } from '../../../../UI/Predict/types';
+import type { SiteData } from '../../../../UI/Sites/components/SiteRowItem/SiteRowItem';
+import PerpsSectionProvider from '../../feeds/perps/PerpsSectionProvider';
+import SearchFeedRow from '../../search/SearchFeedRow';
+import { useScrollTracking } from '../../search/analytics';
+import type { SearchFeedId } from '../../search/useExploreSearch';
 
-interface SectionContentProps {
-  sectionId: SectionId;
+const SectionContent: React.FC<{
+  feedId: SearchFeedId;
   searchQuery: string;
   data: unknown[];
-}
-
-const SectionContent: React.FC<SectionContentProps> = ({
-  sectionId,
-  searchQuery,
-  data,
-}) => {
+  title: string;
+}> = ({ feedId, searchQuery, data, title }) => {
   const tw = useTailwind();
-  const section = SECTIONS_CONFIG[sectionId];
-
   const { onScrollBeginDrag } = useScrollTracking(
     'view_all_scrolled',
     searchQuery,
-    { section_name: section.title },
+    { section_name: title },
   );
 
   const renderItem: ListRenderItem<unknown> = useCallback(
     ({ item, index }) => (
-      <TrackedRowItem
-        section={section}
+      <SearchFeedRow
+        feedId={feedId}
         item={item}
         index={index}
         searchQuery={searchQuery}
+        sectionTitle={title}
         interactionType="view_all_item_clicked"
       />
     ),
-    [section, searchQuery],
+    [feedId, searchQuery, title],
   );
 
   const keyExtractor = useCallback(
-    (item: unknown, index: number) =>
-      `${sectionId}-${section.getItemIdentifier(item) || index}`,
-    [sectionId, section],
+    (item: unknown, index: number) => {
+      switch (feedId) {
+        case 'tokens':
+        case 'stocks':
+          return `${feedId}-${(item as TrendingAsset).assetId ?? index}`;
+        case 'perps':
+          return `${feedId}-${(item as PerpsMarketData).symbol ?? index}`;
+        case 'predictions':
+          return `${feedId}-${(item as PredictMarketType).id ?? index}`;
+        case 'sites':
+          return `${feedId}-${(item as SiteData).url ?? index}`;
+      }
+    },
+    [feedId],
   );
 
   return (
@@ -81,9 +92,8 @@ const ExploreSectionResultsFullView: React.FC = () => {
   const route =
     useRoute<RouteProp<RootStackParamList, 'ExploreSectionResultsFullView'>>();
 
-  const { sectionId, title, searchQuery, data } = route.params;
-  const section = SECTIONS_CONFIG[sectionId];
-  const Wrapper = section.SectionWrapper ?? React.Fragment;
+  const { feedId, title, searchQuery, data } = route.params;
+  const Wrapper = feedId === 'perps' ? PerpsSectionProvider : React.Fragment;
 
   const handleGoBack = useCallback(() => {
     navigation.goBack();
@@ -112,9 +122,10 @@ const ExploreSectionResultsFullView: React.FC = () => {
 
       <Wrapper>
         <SectionContent
-          sectionId={sectionId}
+          feedId={feedId}
           searchQuery={searchQuery}
           data={data}
+          title={title}
         />
       </Wrapper>
     </Box>
diff --git a/app/components/Views/TrendingView/components/CardList.test.tsx b/app/components/Views/TrendingView/components/CardList.test.tsx
new file mode 100644
index 00000000000..9cf76f19d15
--- /dev/null
+++ b/app/components/Views/TrendingView/components/CardList.test.tsx
@@ -0,0 +1,72 @@
+jest.mock('@shopify/flash-list', () => {
+  const RN = jest.requireActual<typeof import('react-native')>('react-native');
+  return { FlashList: RN.FlatList };
+});
+
+import React from 'react';
+import { Text } from 'react-native';
+import { render } from '@testing-library/react-native';
+import type { ListRenderItem } from '@shopify/flash-list';
+import CardList from './CardList';
+
+interface Row {
+  id: string;
+}
+
+const Skeleton = () => <Text testID="card-skeleton">sk</Text>;
+
+const renderItem: ListRenderItem<Row> = ({ item }) => (
+  <Text testID={`row-${item.id}`}>{item.id}</Text>
+);
+
+describe('CardList', () => {
+  it('renders skeleton rows while loading and hides the list', () => {
+    const { getAllByTestId, queryByTestId } = render(
+      <CardList<Row>
+        data={[{ id: 'a' }, { id: 'b' }]}
+        isLoading
+        renderItem={renderItem}
+        Skeleton={Skeleton}
+        idPrefix="pfx"
+        listTestId="card-list-flash"
+      />,
+    );
+
+    expect(getAllByTestId('card-skeleton')).toHaveLength(3);
+    expect(queryByTestId('card-list-flash')).toBeNull();
+  });
+
+  it('respects skeletonCount while loading', () => {
+    const { getAllByTestId } = render(
+      <CardList<Row>
+        data={[]}
+        isLoading
+        renderItem={renderItem}
+        Skeleton={Skeleton}
+        idPrefix="pfx"
+        skeletonCount={2}
+      />,
+    );
+    expect(getAllByTestId('card-skeleton')).toHaveLength(2);
+  });
+
+  it('slices data to max and renders rows when not loading', () => {
+    const { getByTestId, queryByTestId } = render(
+      <CardList<Row>
+        data={[{ id: '1' }, { id: '2' }, { id: '3' }, { id: '4' }]}
+        isLoading={false}
+        max={2}
+        renderItem={renderItem}
+        Skeleton={Skeleton}
+        idPrefix="pfx"
+        listTestId="card-list-flash"
+      />,
+    );
+
+    expect(getByTestId('card-list-flash')).toBeTruthy();
+    expect(getByTestId('row-1')).toBeTruthy();
+    expect(getByTestId('row-2')).toBeTruthy();
+    expect(queryByTestId('row-3')).toBeNull();
+    expect(queryByTestId('row-4')).toBeNull();
+  });
+});
diff --git a/app/components/Views/TrendingView/components/CardList.tsx b/app/components/Views/TrendingView/components/CardList.tsx
new file mode 100644
index 00000000000..ec0c06c3ad1
--- /dev/null
+++ b/app/components/Views/TrendingView/components/CardList.tsx
@@ -0,0 +1,65 @@
+import React, { useMemo } from 'react';
+import { StyleSheet } from 'react-native';
+import { FlashList, ListRenderItem } from '@shopify/flash-list';
+import Card from '../../../../component-library/components/Cards/Card';
+
+const DEFAULT_MAX_ITEMS = 3;
+
+const styles = StyleSheet.create({
+  cardContainer: {
+    padding: 0,
+    marginBottom: 28,
+    borderWidth: 0,
+  },
+});
+
+export interface CardListProps<T> {
+  data: T[];
+  isLoading: boolean;
+  renderItem: ListRenderItem<T>;
+  Skeleton: React.ComponentType;
+  /** @default 3 */
+  max?: number;
+  /** Stable id for the keyExtractor namespace. */
+  idPrefix: string;
+  listTestId?: string;
+  /** @default 3 */
+  skeletonCount?: number;
+}
+
+/**
+ * Card-wrapped vertical list rendering up to `max` items via FlashList.
+ * Shows `Skeleton` (rendered `skeletonCount` times) while loading.
+ */
+function CardList<T>({
+  data,
+  isLoading,
+  renderItem,
+  Skeleton,
+  max = DEFAULT_MAX_ITEMS,
+  idPrefix,
+  listTestId,
+  skeletonCount = DEFAULT_MAX_ITEMS,
+}: CardListProps<T>) {
+  const displayData = useMemo(() => data.slice(0, max), [data, max]);
+
+  return (
+    <Card style={styles.cardContainer} disabled>
+      {isLoading &&
+        Array.from({ length: skeletonCount }).map((_, i) => (
+          <Skeleton key={`${idPrefix}-skeleton-${i}`} />
+        ))}
+      {!isLoading && (
+        <FlashList
+          data={displayData}
+          renderItem={renderItem}
+          keyExtractor={(_, index) => `${idPrefix}-${index}`}
+          keyboardShouldPersistTaps="handled"
+          testID={listTestId}
+        />
+      )}
+    </Card>
+  );
+}
+
+export default CardList;
diff --git a/app/components/Views/TrendingView/components/ExplorePill.test.tsx b/app/components/Views/TrendingView/components/ExplorePill.test.tsx
new file mode 100644
index 00000000000..9a4ef38fd8e
--- /dev/null
+++ b/app/components/Views/TrendingView/components/ExplorePill.test.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import { Text } from 'react-native';
+import { render, fireEvent } from '@testing-library/react-native';
+import { TextColor } from '@metamask/design-system-react-native';
+import ExplorePill from './ExplorePill';
+
+describe('ExplorePill', () => {
+  it('calls onPress when pressed', () => {
+    const onPress = jest.fn();
+    const { getByTestId } = render(
+      <ExplorePill
+        onPress={onPress}
+        testID="explore-pill-test"
+        leading={<Text testID="leading">L</Text>}
+        title="SYMBOL"
+      />,
+    );
+
+    fireEvent.press(getByTestId('explore-pill-test'));
+    expect(onPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders title and optional change label when non-empty', () => {
+    const { getByText, queryByText } = render(
+      <ExplorePill
+        onPress={jest.fn()}
+        testID="pill"
+        leading={<Text>L</Text>}
+        title="BTC"
+        changeLabel="+1.00%"
+        changeTextColor={TextColor.SuccessDefault}
+      />,
+    );
+
+    expect(getByText('BTC')).toBeTruthy();
+    expect(getByText('+1.00%')).toBeTruthy();
+  });
+
+  it('does not render change line when changeLabel is undefined or empty', () => {
+    const { queryByText, rerender, getByText } = render(
+      <ExplorePill
+        onPress={jest.fn()}
+        testID="pill"
+        leading={<Text>L</Text>}
+        title="ONLY"
+      />,
+    );
+    expect(getByText('ONLY')).toBeTruthy();
+    expect(queryByText('+1.00%')).toBeNull();
+
+    rerender(
+      <ExplorePill
+        onPress={jest.fn()}
+        testID="pill"
+        leading={<Text>L</Text>}
+        title="ONLY"
+        changeLabel=""
+      />,
+    );
+    expect(queryByText('+1.00%')).toBeNull();
+  });
+});
diff --git a/app/components/Views/TrendingView/components/ExplorePill.tsx b/app/components/Views/TrendingView/components/ExplorePill.tsx
new file mode 100644
index 00000000000..70841bf21e6
--- /dev/null
+++ b/app/components/Views/TrendingView/components/ExplorePill.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import { Pressable } from 'react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  Box,
+  BoxAlignItems,
+  BoxBackgroundColor,
+  BoxFlexDirection,
+  Text,
+  TextColor,
+  TextVariant,
+  FontWeight,
+} from '@metamask/design-system-react-native';
+
+export interface ExplorePillProps {
+  onPress: () => void;
+  testID: string;
+  /** Icon or logo on the left (e.g. token logo, with or without a network badge wrapper). */
+  leading: React.ReactNode;
+  title: string;
+  changeLabel?: string;
+  changeTextColor?: TextColor;
+}
+
+/**
+ * Shared horizontal “pill” shell for Explore sections (e.g. Crypto Movers, Perps).
+ * Visual layout only; callers supply `leading` and press behavior.
+ */
+const ExplorePill: React.FC<ExplorePillProps> = ({
+  onPress,
+  testID,
+  leading,
+  title,
+  changeLabel,
+  changeTextColor = TextColor.TextAlternative,
+}) => {
+  const tw = useTailwind();
+  const showChange = changeLabel !== undefined && changeLabel.length > 0;
+
+  return (
+    <Pressable
+      onPress={onPress}
+      testID={testID}
+      accessibilityRole="button"
+      style={({ pressed }) => tw.style('shrink', pressed && 'opacity-80')}
+    >
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        gap={2}
+        backgroundColor={BoxBackgroundColor.BackgroundMuted}
+        paddingHorizontal={2}
+        paddingVertical={2}
+        twClassName="rounded-full"
+      >
+        {leading}
+        <Text
+          variant={TextVariant.BodySm}
+          fontWeight={FontWeight.Medium}
+          color={TextColor.TextDefault}
+          numberOfLines={1}
+        >
+          {title}
+        </Text>
+        {showChange ? (
+          <Text
+            variant={TextVariant.BodySm}
+            fontWeight={FontWeight.Medium}
+            color={changeTextColor}
+            numberOfLines={1}
+          >
+            {changeLabel}
+          </Text>
+        ) : null}
+      </Box>
+    </Pressable>
+  );
+};
+
+export default React.memo(ExplorePill);
diff --git a/app/components/Views/TrendingView/components/ExploreScroll.tsx b/app/components/Views/TrendingView/components/ExploreScroll.tsx
new file mode 100644
index 00000000000..54ee4544f71
--- /dev/null
+++ b/app/components/Views/TrendingView/components/ExploreScroll.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import { ScrollView, RefreshControl } from 'react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { useTheme } from '../../../../util/theme';
+
+interface ExploreScrollProps {
+  refreshing: boolean;
+  onRefresh: () => void;
+  testID?: string;
+  /**
+   * When false, omits top padding (legacy Explore V1 sits directly under the
+   * global search row; tabbed V2 uses default spacing).
+   */
+  includeTopPadding?: boolean;
+  children: React.ReactNode;
+}
+
+/**
+ * Vertical ScrollView wrapper for an Explore tab body. Owns horizontal and top
+ * padding and pull-to-refresh wiring.
+ */
+const ExploreScroll: React.FC<ExploreScrollProps> = ({
+  refreshing,
+  onRefresh,
+  testID,
+  includeTopPadding = true,
+  children,
+}) => {
+  const tw = useTailwind();
+  const { colors } = useTheme();
+
+  return (
+    <ScrollView
+      testID={testID}
+      style={tw.style('flex-1 px-4', includeTopPadding && 'pt-3')}
+      showsVerticalScrollIndicator={false}
+      refreshControl={
+        <RefreshControl
+          refreshing={refreshing}
+          onRefresh={onRefresh}
+          tintColor={colors.icon.default}
+          colors={[colors.primary.default]}
+        />
+      }
+    >
+      {children}
+    </ScrollView>
+  );
+};
+
+export default ExploreScroll;
diff --git a/app/components/Views/TrendingView/components/ExploreSearchBar/ExploreSearchBar.tsx b/app/components/Views/TrendingView/components/ExploreSearchBar/ExploreSearchBar.tsx
index 5c23eef0857..916a49e4275 100644
--- a/app/components/Views/TrendingView/components/ExploreSearchBar/ExploreSearchBar.tsx
+++ b/app/components/Views/TrendingView/components/ExploreSearchBar/ExploreSearchBar.tsx
@@ -17,6 +17,7 @@ import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { useSelector } from 'react-redux';
 import { strings } from '../../../../../../locales/i18n';
 import { selectBasicFunctionalityEnabled } from '../../../../../selectors/settings';
+import { TrendingViewSelectorsIDs } from '../../TrendingView.testIds';
 
 interface ExploreSearchBarButtonProps {
   type: 'button';
@@ -83,17 +84,23 @@ const ExploreSearchBar: React.FC<ExploreSearchBarProps> = (props) => {
         </TouchableOpacity>
       ) : (
         <>
-          <Box twClassName="flex-1" testID="explore-view-search-input">
+          <Box
+            twClassName="flex-1"
+            testID={TrendingViewSelectorsIDs.EXPLORE_VIEW_SEARCH_INPUT}
+          >
             <TextFieldSearch
               value={props.searchQuery}
               onChangeText={props.onSearchChange}
               placeholder={placeholder}
               autoFocus={props.type === 'interactive'}
-              autoCapitalize="none"
               onPressClearButton={() => {
                 props.onSearchChange('');
               }}
               clearButtonProps={{ testID: 'explore-search-clear-button' }}
+              inputProps={{
+                autoCapitalize: 'none',
+                testID: TrendingViewSelectorsIDs.EXPLORE_VIEW_SEARCH_TEXT_INPUT,
+              }}
             />
           </Box>
           <TouchableOpacity
diff --git a/app/components/Views/TrendingView/components/ExploreSearchResults/ExploreSearchResults.test.tsx b/app/components/Views/TrendingView/components/ExploreSearchResults/ExploreSearchResults.test.tsx
deleted file mode 100644
index 98c4eb59f36..00000000000
--- a/app/components/Views/TrendingView/components/ExploreSearchResults/ExploreSearchResults.test.tsx
+++ /dev/null
@@ -1,478 +0,0 @@
-import React from 'react';
-import { render, fireEvent } from '@testing-library/react-native';
-import { strings } from '../../../../../../locales/i18n';
-import ExploreSearchResults from './ExploreSearchResults';
-import { useExploreSearch } from '../../hooks/useExploreSearch';
-import { useSelector } from 'react-redux';
-import { selectBasicFunctionalityEnabled } from '../../../../../selectors/settings';
-import Routes from '../../../../../constants/navigation/Routes';
-
-const mockNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => ({
-  ...jest.requireActual('@react-navigation/native'),
-  useNavigation: () => ({
-    navigate: mockNavigate,
-  }),
-}));
-
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'),
-  useSelector: jest.fn(),
-}));
-
-jest.mock('../../hooks/useExploreSearch');
-const mockUseExploreSearch = useExploreSearch as jest.MockedFunction<
-  typeof useExploreSearch
->;
-const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
-
-// Mock child components that render individual items
-jest.mock(
-  '../../../../UI/Trending/components/TrendingTokenRowItem/TrendingTokenRowItem',
-  () => () => null,
-);
-
-jest.mock(
-  '../../../../UI/Perps/components/PerpsMarketRowItem',
-  () => () => null,
-);
-
-jest.mock('../../../../UI/Predict/components/PredictMarket', () => () => null);
-
-jest.mock(
-  '../../../../UI/Predict/components/PredictMarketRowItem',
-  () => () => null,
-);
-
-jest.mock(
-  '../../../../UI/Sites/components/SitesSearchFooter/SitesSearchFooter',
-  () => {
-    const ReactNative = jest.requireActual('react-native');
-    return jest.fn(({ searchQuery }) =>
-      searchQuery ? (
-        <ReactNative.View testID="sites-search-footer">
-          <ReactNative.Text>{searchQuery}</ReactNative.Text>
-        </ReactNative.View>
-      ) : null,
-    );
-  },
-);
-
-describe('ExploreSearchResults', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    // Mock selectBasicFunctionalityEnabled to return true by default
-    mockUseSelector.mockImplementation((selector) => {
-      if (selector === selectBasicFunctionalityEnabled) {
-        return true;
-      }
-      return undefined;
-    });
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  it('renders section headers for sections with data or loading', () => {
-    mockUseExploreSearch.mockReturnValue({
-      data: {
-        tokens: [
-          { assetId: '1', symbol: 'BTC', name: 'Bitcoin' },
-          { assetId: '2', symbol: 'ETH', name: 'Ethereum' },
-        ],
-        perps: [{ symbol: 'BTC-USD', name: 'Bitcoin' }],
-        predictions: [
-          {
-            id: '1',
-            title: 'Will Bitcoin reach 100k?',
-            outcomes: [
-              {
-                id: 'outcome-1',
-                status: 'open',
-                tokens: [{ id: 'token-1', title: 'Yes', price: 0.65 }],
-              },
-            ],
-          },
-        ],
-        stocks: [],
-        sites: [],
-      },
-      isLoading: {
-        tokens: false,
-        perps: false,
-        predictions: false,
-        stocks: false,
-        sites: false,
-      },
-      sectionsOrder: ['tokens', 'stocks', 'perps', 'predictions', 'sites'],
-    });
-
-    const { getByText, getByTestId } = render(
-      <ExploreSearchResults searchQuery="btc" />,
-    );
-
-    expect(getByTestId('trending-search-results-list')).toBeOnTheScreen();
-    expect(getByText(strings('trending.trending_tokens'))).toBeOnTheScreen();
-    expect(getByText('Perps')).toBeOnTheScreen();
-    expect(getByText('Predictions')).toBeOnTheScreen();
-  });
-
-  it('only shows sections with data or loading state', () => {
-    mockUseExploreSearch.mockReturnValue({
-      data: {
-        tokens: [{ assetId: '1', symbol: 'BTC', name: 'Bitcoin' }],
-        perps: [],
-        predictions: [],
-        stocks: [],
-        sites: [],
-      },
-      isLoading: {
-        tokens: false,
-        perps: false,
-        predictions: false,
-        stocks: false,
-        sites: false,
-      },
-      sectionsOrder: ['tokens', 'stocks', 'perps', 'predictions', 'sites'],
-    });
-
-    const { getByText, queryByText } = render(
-      <ExploreSearchResults searchQuery="btc" />,
-    );
-
-    expect(getByText(strings('trending.trending_tokens'))).toBeOnTheScreen();
-    expect(queryByText('Perps')).toBeNull();
-    expect(queryByText('Predictions')).toBeNull();
-  });
-
-  it('passes search query to useExploreSearch hook', () => {
-    mockUseExploreSearch.mockReturnValue({
-      data: {
-        tokens: [],
-        perps: [],
-        predictions: [],
-        stocks: [],
-        sites: [],
-      },
-      isLoading: {
-        tokens: false,
-        perps: false,
-        predictions: false,
-        stocks: false,
-        sites: false,
-      },
-      sectionsOrder: ['tokens', 'stocks', 'perps', 'predictions', 'sites'],
-    });
-
-    render(<ExploreSearchResults searchQuery="ethereum" />);
-
-    expect(mockUseExploreSearch).toHaveBeenCalledWith('ethereum');
-  });
-
-  describe('Footer', () => {
-    // Note: FlashList's ListFooterComponent doesn't render in test environment,
-    // so we verify the list renders correctly with the search query prop.
-    // The actual footer rendering is tested via the SitesSearchFooter unit tests.
-
-    it('renders list with search query that would trigger footer', () => {
-      // Arrange
-      mockUseExploreSearch.mockReturnValue({
-        data: {
-          tokens: [{ assetId: '1', symbol: 'BTC', name: 'Bitcoin' }],
-          perps: [],
-          predictions: [],
-          stocks: [],
-          sites: [],
-        },
-        isLoading: {
-          tokens: false,
-          perps: false,
-          predictions: false,
-          stocks: false,
-          sites: false,
-        },
-        sectionsOrder: ['tokens', 'stocks', 'perps', 'predictions', 'sites'],
-      });
-
-      // Act
-      const { getByTestId, getByText } = render(
-        <ExploreSearchResults searchQuery="bitcoin" />,
-      );
-
-      // Assert - FlashList renders with data and search query is passed to hook
-      expect(getByTestId('trending-search-results-list')).toBeOnTheScreen();
-      expect(getByText(strings('trending.trending_tokens'))).toBeOnTheScreen();
-      expect(mockUseExploreSearch).toHaveBeenCalledWith('bitcoin');
-    });
-
-    it('renders list with empty search query (no footer expected)', () => {
-      // Arrange
-      mockUseExploreSearch.mockReturnValue({
-        data: {
-          tokens: [{ assetId: '1', symbol: 'BTC', name: 'Bitcoin' }],
-          perps: [],
-          predictions: [],
-          stocks: [],
-          sites: [],
-        },
-        isLoading: {
-          tokens: false,
-          perps: false,
-          predictions: false,
-          stocks: false,
-          sites: false,
-        },
-        sectionsOrder: ['tokens', 'stocks', 'perps', 'predictions', 'sites'],
-      });
-
-      // Act
-      const { getByTestId } = render(<ExploreSearchResults searchQuery="" />);
-
-      // Assert - list renders, empty query means footer won't render
-      expect(getByTestId('trending-search-results-list')).toBeOnTheScreen();
-      expect(mockUseExploreSearch).toHaveBeenCalledWith('');
-    });
-  });
-
-  describe('loading state', () => {
-    it('renders skeleton items when section is loading', () => {
-      // Arrange
-      mockUseExploreSearch.mockReturnValue({
-        data: {
-          tokens: [],
-          perps: [],
-          predictions: [],
-          stocks: [],
-          sites: [],
-        },
-        isLoading: {
-          tokens: true,
-          perps: false,
-          predictions: false,
-          stocks: false,
-          sites: false,
-        },
-        sectionsOrder: ['tokens', 'stocks', 'perps', 'predictions', 'sites'],
-      });
-
-      // Act
-      const { getByText } = render(
-        <ExploreSearchResults searchQuery="bitcoin" />,
-      );
-
-      // Assert - shows header for loading section
-      expect(getByText(strings('trending.trending_tokens'))).toBeOnTheScreen();
-    });
-
-    it('hides section when not loading and has no data', () => {
-      // Arrange
-      mockUseExploreSearch.mockReturnValue({
-        data: {
-          tokens: [],
-          perps: [],
-          predictions: [],
-          stocks: [],
-          sites: [],
-        },
-        isLoading: {
-          tokens: false,
-          perps: false,
-          predictions: false,
-          stocks: false,
-          sites: false,
-        },
-        sectionsOrder: ['tokens', 'stocks', 'perps', 'predictions', 'sites'],
-      });
-
-      // Act
-      const { queryByText } = render(
-        <ExploreSearchResults searchQuery="test" />,
-      );
-
-      // Assert - no section headers when empty and not loading
-      expect(queryByText(strings('trending.trending_tokens'))).toBeNull();
-      expect(queryByText('Perps')).toBeNull();
-      expect(queryByText('Predictions')).toBeNull();
-    });
-  });
-
-  describe('basic functionality toggle', () => {
-    it('hides all sections when basic functionality is disabled', () => {
-      // Arrange
-      mockUseSelector.mockImplementation((selector) => {
-        if (selector === selectBasicFunctionalityEnabled) {
-          return false;
-        }
-        return undefined;
-      });
-      mockUseExploreSearch.mockReturnValue({
-        data: {
-          tokens: [{ assetId: '1', symbol: 'BTC', name: 'Bitcoin' }],
-          perps: [{ symbol: 'BTC-USD', name: 'Bitcoin' }],
-          predictions: [],
-          stocks: [],
-          sites: [],
-        },
-        isLoading: {
-          tokens: false,
-          perps: false,
-          predictions: false,
-          stocks: false,
-          sites: false,
-        },
-        sectionsOrder: ['tokens', 'stocks', 'perps', 'predictions', 'sites'],
-      });
-
-      // Act
-      const { queryByText } = render(
-        <ExploreSearchResults searchQuery="btc" />,
-      );
-
-      // Assert - all sections hidden when basic functionality disabled
-      expect(queryByText(strings('trending.trending_tokens'))).toBeNull();
-      expect(queryByText('Perps')).toBeNull();
-    });
-  });
-
-  describe('section config handling', () => {
-    it('handles undefined section config gracefully', () => {
-      // Arrange
-      mockUseExploreSearch.mockReturnValue({
-        data: {
-          tokens: [{ assetId: '1', symbol: 'BTC', name: 'Bitcoin' }],
-          perps: [],
-          predictions: [],
-          stocks: [],
-          sites: [],
-        },
-        isLoading: {
-          tokens: false,
-          perps: false,
-          predictions: false,
-          stocks: false,
-          sites: false,
-        },
-        sectionsOrder: [
-          'tokens',
-          'unknown' as 'tokens', // Intentionally invalid ID to test graceful handling
-          'stocks',
-          'perps',
-          'predictions',
-          'sites',
-        ],
-      });
-
-      // Act & Assert - should not throw
-      const { getByText } = render(<ExploreSearchResults searchQuery="btc" />);
-      expect(getByText(strings('trending.trending_tokens'))).toBeOnTheScreen();
-    });
-  });
-
-  describe('view all and item limit', () => {
-    it('shows "View all" when a section has more than 3 items', () => {
-      mockUseExploreSearch.mockReturnValue({
-        data: {
-          tokens: [
-            { assetId: '1', symbol: 'BTC', name: 'Bitcoin' },
-            { assetId: '2', symbol: 'ETH', name: 'Ethereum' },
-            { assetId: '3', symbol: 'SOL', name: 'Solana' },
-            { assetId: '4', symbol: 'USDC', name: 'USD Coin' },
-          ],
-          perps: [],
-          predictions: [],
-          stocks: [],
-          sites: [],
-        },
-        isLoading: {
-          tokens: false,
-          perps: false,
-          predictions: false,
-          stocks: false,
-          sites: false,
-        },
-        sectionsOrder: ['tokens', 'stocks', 'perps', 'predictions', 'sites'],
-      });
-
-      const { getByText } = render(<ExploreSearchResults searchQuery="test" />);
-
-      expect(getByText('View all')).toBeOnTheScreen();
-    });
-
-    it('does not show "View all" when a section has 3 or fewer items', () => {
-      mockUseExploreSearch.mockReturnValue({
-        data: {
-          tokens: [
-            { assetId: '1', symbol: 'BTC', name: 'Bitcoin' },
-            { assetId: '2', symbol: 'ETH', name: 'Ethereum' },
-          ],
-          perps: [],
-          predictions: [],
-          stocks: [],
-          sites: [],
-        },
-        isLoading: {
-          tokens: false,
-          perps: false,
-          predictions: false,
-          stocks: false,
-          sites: false,
-        },
-        sectionsOrder: ['tokens', 'stocks', 'perps', 'predictions', 'sites'],
-      });
-
-      const { queryByText } = render(
-        <ExploreSearchResults searchQuery="test" />,
-      );
-
-      expect(queryByText('View all')).toBeNull();
-    });
-
-    it('navigates to full view with section params when "View all" is pressed', () => {
-      mockUseExploreSearch.mockReturnValue({
-        data: {
-          tokens: [
-            { assetId: '1', symbol: 'BTC', name: 'Bitcoin' },
-            { assetId: '2', symbol: 'ETH', name: 'Ethereum' },
-            { assetId: '3', symbol: 'SOL', name: 'Solana' },
-            { assetId: '4', symbol: 'USDC', name: 'USD Coin' },
-          ],
-          perps: [],
-          predictions: [],
-          stocks: [],
-          sites: [],
-        },
-        isLoading: {
-          tokens: false,
-          perps: false,
-          predictions: false,
-          stocks: false,
-          sites: false,
-        },
-        sectionsOrder: ['tokens', 'stocks', 'perps', 'predictions', 'sites'],
-      });
-
-      const { getByText } = render(
-        <ExploreSearchResults searchQuery="bitcoin" />,
-      );
-
-      fireEvent.press(getByText('View all'));
-
-      expect(mockNavigate).toHaveBeenCalledWith(
-        Routes.EXPLORE_SECTION_RESULTS_FULL_VIEW,
-        {
-          sectionId: 'tokens',
-          title: strings('trending.trending_tokens'),
-          searchQuery: 'bitcoin',
-          data: [
-            { assetId: '1', symbol: 'BTC', name: 'Bitcoin' },
-            { assetId: '2', symbol: 'ETH', name: 'Ethereum' },
-            { assetId: '3', symbol: 'SOL', name: 'Solana' },
-            { assetId: '4', symbol: 'USDC', name: 'USD Coin' },
-          ],
-        },
-      );
-    });
-  });
-});
diff --git a/app/components/Views/TrendingView/components/HorizontalCarousel.tsx b/app/components/Views/TrendingView/components/HorizontalCarousel.tsx
new file mode 100644
index 00000000000..b417808a30d
--- /dev/null
+++ b/app/components/Views/TrendingView/components/HorizontalCarousel.tsx
@@ -0,0 +1,93 @@
+import React, { useMemo, useRef } from 'react';
+import { Dimensions } from 'react-native';
+import { Box, BoxBorderColor } from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { FlashList, FlashListRef, ListRenderItem } from '@shopify/flash-list';
+
+const { width: SCREEN_WIDTH } = Dimensions.get('window');
+const CARD_WIDTH = SCREEN_WIDTH * 0.8;
+const CARD_HEIGHT = 220;
+const SKELETON_PLACEHOLDER_COUNT = 3;
+
+export interface HorizontalCarouselProps<T> {
+  data: T[];
+  isLoading: boolean;
+  renderItem: ListRenderItem<T>;
+  Skeleton: React.ComponentType;
+  /** Stable id for the keyExtractor namespace. */
+  idPrefix: string;
+  /** @default 3 */
+  skeletonCount?: number;
+  testID?: string;
+}
+
+/**
+ * Horizontally-scrolling carousel of full-width cards used for predictions
+ * and any "feature card" feed. Each card is `~80%` of the screen width.
+ */
+function HorizontalCarousel<T>({
+  data,
+  isLoading,
+  renderItem,
+  Skeleton,
+  idPrefix,
+  skeletonCount = SKELETON_PLACEHOLDER_COUNT,
+  testID,
+}: HorizontalCarouselProps<T>) {
+  const tw = useTailwind();
+  const flashListRef = useRef<FlashListRef<T | undefined>>(null);
+
+  const skeletonData = useMemo(
+    () => Array.from<T | undefined>({ length: skeletonCount }),
+    [skeletonCount],
+  );
+  const displayData = isLoading ? skeletonData : data;
+
+  return (
+    <Box twClassName="-mx-4 mb-7">
+      <FlashList
+        ref={flashListRef}
+        data={displayData}
+        renderItem={({ item, index }) => {
+          const isLastItem = index === displayData.length - 1;
+          return (
+            <Box
+              style={tw.style({ width: CARD_WIDTH, minHeight: CARD_HEIGHT })}
+            >
+              <Box
+                borderColor={BoxBorderColor.BorderDefault}
+                twClassName={`rounded-2xl overflow-hidden ${
+                  !isLastItem ? 'pr-3' : ''
+                }`}
+              >
+                {isLoading ? (
+                  <Skeleton />
+                ) : (
+                  renderItem({
+                    item: item as T,
+                    index,
+                    target: 'Cell',
+                  })
+                )}
+              </Box>
+            </Box>
+          );
+        }}
+        contentContainerStyle={tw.style('px-4')}
+        keyExtractor={
+          isLoading
+            ? (_, index) => `${idPrefix}-skeleton-${index}`
+            : (_, index) => `${idPrefix}-${index}`
+        }
+        horizontal
+        pagingEnabled={false}
+        showsHorizontalScrollIndicator={false}
+        snapToInterval={CARD_WIDTH}
+        decelerationRate="fast"
+        testID={testID ?? `${idPrefix}-flash-list`}
+      />
+    </Box>
+  );
+}
+
+export default HorizontalCarousel;
diff --git a/app/components/Views/TrendingView/components/PillRow.tsx b/app/components/Views/TrendingView/components/PillRow.tsx
new file mode 100644
index 00000000000..ee35aba7cd1
--- /dev/null
+++ b/app/components/Views/TrendingView/components/PillRow.tsx
@@ -0,0 +1,81 @@
+import React from 'react';
+import { Pressable, ScrollView } from 'react-native';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  FontWeight,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+
+export interface PillOption {
+  key: string;
+  name: string;
+}
+
+interface PillRowProps {
+  pills: PillOption[];
+  activeKey: string;
+  onSelect: (key: string) => void;
+  testIdPrefix?: string;
+}
+
+const PillRow: React.FC<PillRowProps> = ({
+  pills,
+  activeKey,
+  onSelect,
+  testIdPrefix = 'pill-row',
+}) => {
+  const tw = useTailwind();
+
+  return (
+    <Box twClassName="-mx-4 mb-2">
+      <ScrollView
+        horizontal
+        showsHorizontalScrollIndicator={false}
+        keyboardShouldPersistTaps="handled"
+        testID={`${testIdPrefix}-pills`}
+        contentContainerStyle={tw.style('px-4')}
+      >
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          twClassName="gap-2"
+        >
+          {pills.map((pill) => {
+            const isSelected = activeKey === pill.key;
+            return (
+              <Pressable
+                key={pill.key}
+                accessibilityRole="button"
+                accessibilityState={{ selected: isSelected }}
+                onPress={() => onSelect(pill.key)}
+                testID={`${testIdPrefix}-pill-${pill.key}`}
+                style={tw.style(
+                  'rounded-xl px-[12px] py-2',
+                  isSelected ? 'bg-icon-default' : 'bg-muted',
+                )}
+              >
+                <Text
+                  variant={TextVariant.BodyMd}
+                  fontWeight={FontWeight.Medium}
+                  color={
+                    isSelected ? TextColor.InfoInverse : TextColor.TextDefault
+                  }
+                  testID={`${testIdPrefix}-pill-label-${pill.key}`}
+                >
+                  {pill.name}
+                </Text>
+              </Pressable>
+            );
+          })}
+        </Box>
+      </ScrollView>
+    </Box>
+  );
+};
+
+export default PillRow;
diff --git a/app/components/Views/TrendingView/components/PillScrollList.test.tsx b/app/components/Views/TrendingView/components/PillScrollList.test.tsx
new file mode 100644
index 00000000000..de5e3be2302
--- /dev/null
+++ b/app/components/Views/TrendingView/components/PillScrollList.test.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import { Text } from 'react-native';
+import { render } from '@testing-library/react-native';
+import PillScrollList from './PillScrollList';
+
+const Skeleton = () => <Text testID="pill-scroll-skeleton">loading</Text>;
+
+describe('PillScrollList', () => {
+  it('renders skeleton when loading and does not render the scroll list', () => {
+    const { getByTestId, queryByTestId } = render(
+      <PillScrollList
+        data={[{ id: 'a' }, { id: 'b' }]}
+        isLoading
+        renderItem={() => <Text>item</Text>}
+        keyExtractor={(item: { id: string }) => item.id}
+        Skeleton={Skeleton}
+        listTestId="pills-list"
+      />,
+    );
+
+    expect(getByTestId('pill-scroll-skeleton')).toBeTruthy();
+    expect(queryByTestId('pills-list')).toBeNull();
+  });
+
+  it('renders nothing in the scroll region when not loading and data is empty', () => {
+    const { queryByTestId } = render(
+      <PillScrollList
+        data={[]}
+        isLoading={false}
+        renderItem={() => <Text>item</Text>}
+        keyExtractor={(item: { id: string }) => item.id}
+        Skeleton={Skeleton}
+        listTestId="pills-list"
+      />,
+    );
+
+    expect(queryByTestId('pills-list')).toBeNull();
+  });
+
+  it('splits items across two rows and passes correct indices to renderItem', () => {
+    const renderItem = jest.fn((item: { id: string }, index: number) => (
+      <Text testID={`pill-${item.id}`}>{String(index)}</Text>
+    ));
+
+    const { getByTestId } = render(
+      <PillScrollList
+        data={[{ id: 'a' }, { id: 'b' }, { id: 'c' }]}
+        isLoading={false}
+        renderItem={renderItem}
+        keyExtractor={(item: { id: string }) => item.id}
+        Skeleton={Skeleton}
+        listTestId="pills-list"
+      />,
+    );
+
+    expect(getByTestId('pills-list')).toBeTruthy();
+    expect(getByTestId('pill-a').props.children).toBe('0');
+    expect(getByTestId('pill-b').props.children).toBe('1');
+    expect(getByTestId('pill-c').props.children).toBe('2');
+    expect(renderItem).toHaveBeenCalledTimes(3);
+  });
+
+  it('respects maxPills when slicing data before splitting', () => {
+    const { getByTestId, queryByTestId } = render(
+      <PillScrollList
+        data={[{ id: '1' }, { id: '2' }, { id: '3' }, { id: '4' }]}
+        isLoading={false}
+        maxPills={2}
+        renderItem={(item: { id: string }) => (
+          <Text testID={`pill-${item.id}`}>{item.id}</Text>
+        )}
+        keyExtractor={(item: { id: string }) => item.id}
+        Skeleton={Skeleton}
+        listTestId="pills-list"
+      />,
+    );
+
+    expect(getByTestId('pill-1')).toBeTruthy();
+    expect(getByTestId('pill-2')).toBeTruthy();
+    expect(queryByTestId('pill-3')).toBeNull();
+    expect(queryByTestId('pill-4')).toBeNull();
+  });
+});
diff --git a/app/components/Views/TrendingView/components/PillScrollList.tsx b/app/components/Views/TrendingView/components/PillScrollList.tsx
new file mode 100644
index 00000000000..128686b2cb2
--- /dev/null
+++ b/app/components/Views/TrendingView/components/PillScrollList.tsx
@@ -0,0 +1,98 @@
+import React, { useMemo } from 'react';
+import { ScrollView } from 'react-native';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+
+const DEFAULT_MAX_PILLS = 12;
+
+function splitIntoTwoRows<T>(items: T[]): [T[], T[]] {
+  if (items.length === 0) return [[], []];
+  const mid = Math.ceil(items.length / 2);
+  return [items.slice(0, mid), items.slice(mid)];
+}
+
+export interface PillScrollListProps<T> {
+  data: T[];
+  isLoading: boolean;
+  renderItem: (item: T, index: number) => React.ReactNode;
+  keyExtractor: (item: T) => string;
+  Skeleton: React.ComponentType;
+  /** @default 12 */
+  maxPills?: number;
+  listTestId?: string;
+}
+
+/**
+ * Two-row horizontal scroll of pill-shaped items. Used for "crypto movers".
+ * Splits incoming data evenly between the two rows.
+ */
+function PillScrollList<T>({
+  data,
+  isLoading,
+  renderItem,
+  keyExtractor,
+  Skeleton,
+  maxPills = DEFAULT_MAX_PILLS,
+  listTestId,
+}: PillScrollListProps<T>) {
+  const tw = useTailwind();
+  const displayData = useMemo(() => data.slice(0, maxPills), [data, maxPills]);
+  const [row1, row2] = useMemo(
+    () => splitIntoTwoRows(displayData),
+    [displayData],
+  );
+
+  const renderRow = (items: T[], startIndex: number) =>
+    items.map((item, i) => (
+      <React.Fragment key={keyExtractor(item)}>
+        {renderItem(item, startIndex + i)}
+      </React.Fragment>
+    ));
+
+  return (
+    <Box twClassName="-mx-4 bg-transparent mt-3 mb-9">
+      {isLoading && (
+        <Box twClassName="px-4">
+          <Skeleton />
+        </Box>
+      )}
+      {!isLoading && (row1.length > 0 || row2.length > 0) && (
+        <ScrollView
+          horizontal
+          showsHorizontalScrollIndicator={false}
+          keyboardShouldPersistTaps="handled"
+          testID={listTestId}
+          style={tw.style('bg-transparent')}
+          contentContainerStyle={tw.style('flex-col px-4')}
+        >
+          <Box flexDirection={BoxFlexDirection.Column} twClassName="gap-2">
+            {row1.length > 0 ? (
+              <Box
+                flexDirection={BoxFlexDirection.Row}
+                alignItems={BoxAlignItems.Center}
+                twClassName="flex-nowrap gap-2"
+              >
+                {renderRow(row1, 0)}
+              </Box>
+            ) : null}
+            {row2.length > 0 ? (
+              <Box
+                flexDirection={BoxFlexDirection.Row}
+                alignItems={BoxAlignItems.Center}
+                twClassName="flex-nowrap gap-2"
+              >
+                {renderRow(row2, row1.length)}
+              </Box>
+            ) : null}
+          </Box>
+        </ScrollView>
+      )}
+    </Box>
+  );
+}
+
+export default PillScrollList;
diff --git a/app/components/Views/TrendingView/components/PillToggleCardList.test.tsx b/app/components/Views/TrendingView/components/PillToggleCardList.test.tsx
new file mode 100644
index 00000000000..486b31e6f67
--- /dev/null
+++ b/app/components/Views/TrendingView/components/PillToggleCardList.test.tsx
@@ -0,0 +1,111 @@
+jest.mock('@shopify/flash-list', () => {
+  const RN = jest.requireActual<typeof import('react-native')>('react-native');
+  return { FlashList: RN.FlatList };
+});
+
+import React from 'react';
+import { Text } from 'react-native';
+import { render, fireEvent, act } from '@testing-library/react-native';
+import type { ListRenderItem } from '@shopify/flash-list';
+import PillToggleCardList from './PillToggleCardList';
+
+interface Row {
+  id: string;
+  label: string;
+}
+
+const Skeleton = () => <Text testID="card-list-skeleton">sk</Text>;
+
+const renderItem: ListRenderItem<Row> = ({ item }) => (
+  <Text testID={`card-row-${item.id}`}>{item.label}</Text>
+);
+
+describe('PillToggleCardList', () => {
+  const tabs = [
+    {
+      key: 'a',
+      name: 'Tab A',
+      items: [{ id: '1', label: 'One' }],
+    },
+    {
+      key: 'b',
+      name: 'Tab B',
+      items: [
+        { id: '2', label: 'Two' },
+        { id: '3', label: 'Three' },
+      ],
+    },
+  ];
+
+  it('defaults to first tab when defaultPillKey is omitted', () => {
+    const { getByTestId } = render(
+      <PillToggleCardList<Row>
+        tabs={tabs}
+        isLoading={false}
+        renderItem={renderItem}
+        Skeleton={Skeleton}
+        idPrefix="test"
+        testIdPrefix="toggle-list"
+        listTestId="card-flash"
+      />,
+    );
+
+    expect(getByTestId('toggle-list')).toBeTruthy();
+    expect(getByTestId('card-row-1')).toBeTruthy();
+  });
+
+  it('starts on defaultPillKey when provided', () => {
+    const { getByTestId, queryByTestId } = render(
+      <PillToggleCardList<Row>
+        tabs={tabs}
+        isLoading={false}
+        renderItem={renderItem}
+        Skeleton={Skeleton}
+        idPrefix="test"
+        defaultPillKey="b"
+        testIdPrefix="toggle-list"
+        listTestId="card-flash"
+      />,
+    );
+
+    expect(getByTestId('card-row-2')).toBeTruthy();
+    expect(queryByTestId('card-row-1')).toBeNull();
+  });
+
+  it('switches CardList data when a different pill is selected', () => {
+    const { getByTestId, queryByTestId } = render(
+      <PillToggleCardList<Row>
+        tabs={tabs}
+        isLoading={false}
+        renderItem={renderItem}
+        Skeleton={Skeleton}
+        idPrefix="test"
+        testIdPrefix="toggle-list"
+        listTestId="card-flash"
+      />,
+    );
+
+    act(() => {
+      fireEvent.press(getByTestId('toggle-list-pill-b'));
+    });
+
+    expect(queryByTestId('card-row-1')).toBeNull();
+    expect(getByTestId('card-row-2')).toBeTruthy();
+    expect(getByTestId('card-row-3')).toBeTruthy();
+  });
+
+  it('shows skeletons while loading', () => {
+    const { getAllByTestId } = render(
+      <PillToggleCardList<Row>
+        tabs={tabs}
+        isLoading
+        renderItem={renderItem}
+        Skeleton={Skeleton}
+        idPrefix="test"
+        testIdPrefix="toggle-list"
+      />,
+    );
+
+    expect(getAllByTestId('card-list-skeleton').length).toBeGreaterThan(0);
+  });
+});
diff --git a/app/components/Views/TrendingView/components/PillToggleCardList.tsx b/app/components/Views/TrendingView/components/PillToggleCardList.tsx
new file mode 100644
index 00000000000..38ff17105dd
--- /dev/null
+++ b/app/components/Views/TrendingView/components/PillToggleCardList.tsx
@@ -0,0 +1,74 @@
+import React, { useState } from 'react';
+import { Box } from '@metamask/design-system-react-native';
+import type { ListRenderItem } from '@shopify/flash-list';
+import PillRow, { type PillOption } from './PillRow';
+import CardList from './CardList';
+
+export interface PillToggleCardListTab<T> {
+  key: string;
+  name: string;
+  items: T[];
+}
+
+export interface PillToggleCardListProps<T> {
+  tabs: PillToggleCardListTab<T>[];
+  isLoading: boolean;
+  renderItem: ListRenderItem<T>;
+  Skeleton: React.ComponentType;
+  idPrefix: string;
+  /** Defaults to first tab. */
+  defaultPillKey?: string;
+  /** Called whenever the active pill changes. */
+  onPillChange?: (key: string) => void;
+  testIdPrefix?: string;
+  listTestId?: string;
+}
+
+const DEFAULT_TEST_ID_PREFIX = 'pill-toggle-card-list';
+
+/**
+ * Pill selector + card list composition. The active pill's `items` are passed
+ * to {@link CardList}. Used for perps "stocks vs commodities vs forex" toggles.
+ */
+function PillToggleCardList<T>({
+  tabs,
+  isLoading,
+  renderItem,
+  Skeleton,
+  idPrefix,
+  defaultPillKey,
+  onPillChange,
+  testIdPrefix = DEFAULT_TEST_ID_PREFIX,
+  listTestId,
+}: PillToggleCardListProps<T>) {
+  const firstKey = tabs[0]?.key ?? '';
+  const [activeKey, setActiveKey] = useState(defaultPillKey ?? firstKey);
+  const active = tabs.find((p) => p.key === activeKey) ?? tabs[0];
+  const pills: PillOption[] = tabs.map(({ key, name }) => ({ key, name }));
+
+  const handleSelect = (key: string) => {
+    setActiveKey(key);
+    onPillChange?.(key);
+  };
+
+  return (
+    <Box testID={testIdPrefix} twClassName="mt-2 mb-9">
+      <PillRow
+        pills={pills}
+        activeKey={activeKey}
+        onSelect={handleSelect}
+        testIdPrefix={testIdPrefix}
+      />
+      <CardList<T>
+        data={active?.items ?? []}
+        isLoading={isLoading}
+        renderItem={renderItem}
+        Skeleton={Skeleton}
+        idPrefix={idPrefix}
+        listTestId={listTestId}
+      />
+    </Box>
+  );
+}
+
+export default PillToggleCardList;
diff --git a/app/components/Views/TrendingView/components/QuickActions.tsx b/app/components/Views/TrendingView/components/QuickActions.tsx
new file mode 100644
index 00000000000..8093dccf14a
--- /dev/null
+++ b/app/components/Views/TrendingView/components/QuickActions.tsx
@@ -0,0 +1,118 @@
+import React, { useMemo } from 'react';
+import { ScrollView, TouchableOpacity } from 'react-native';
+import { useNavigation, type NavigationProp } from '@react-navigation/native';
+import {
+  Box,
+  FontWeight,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { strings } from '../../../../../locales/i18n';
+import Routes from '../../../../constants/navigation/Routes';
+import type { AppNavigationProp } from '../../../../core/NavigationService/types';
+import type { PerpsNavigationParamList } from '../../../UI/Perps/types/navigation';
+import { navigateToPerpsMarketList } from '../feeds/perps/perpsNavigation';
+import { navigateToPredictionsList } from '../feeds/predictions/predictionsNavigation';
+import { TrendingViewSelectorsIDs } from '../TrendingView.testIds';
+
+export type SectionId = 'tokens' | 'perps' | 'stocks' | 'predictions' | 'sites';
+
+interface QuickActionSection {
+  id: SectionId;
+  title: string;
+  viewAllAction: (navigation: AppNavigationProp) => void;
+}
+
+interface QuickActionsProps {
+  /** Set of section IDs that have empty data and should be hidden */
+  emptySections: Set<SectionId>;
+}
+
+/**
+ * Horizontal quick-action pills for Explore (Trending → Perps → Stocks → Predictions → Sites).
+ */
+const QuickActions: React.FC<QuickActionsProps> = ({ emptySections }) => {
+  const navigation = useNavigation<AppNavigationProp>();
+  const tw = useTailwind();
+
+  const sectionsArray = useMemo<QuickActionSection[]>(
+    () => [
+      {
+        id: 'tokens',
+        title: strings('trending.trending_tokens'),
+        viewAllAction: (nav) => {
+          nav.navigate(Routes.WALLET.TRENDING_TOKENS_FULL_VIEW);
+        },
+      },
+      {
+        id: 'perps',
+        title: strings('trending.perps'),
+        viewAllAction: (nav) => {
+          navigateToPerpsMarketList(
+            nav as NavigationProp<PerpsNavigationParamList>,
+          );
+        },
+      },
+      {
+        id: 'stocks',
+        title: strings('trending.stocks'),
+        viewAllAction: (nav) => {
+          nav.navigate(Routes.WALLET.RWA_TOKENS_FULL_VIEW);
+        },
+      },
+      {
+        id: 'predictions',
+        title: strings('wallet.predict'),
+        viewAllAction: (nav) => {
+          navigateToPredictionsList(nav, 'trending');
+        },
+      },
+      {
+        id: 'sites',
+        title: strings('trending.sites'),
+        viewAllAction: (nav) => {
+          nav.navigate(Routes.SITES_FULL_VIEW);
+        },
+      },
+    ],
+    [],
+  );
+
+  const visibleSections = sectionsArray.filter((s) => !emptySections.has(s.id));
+
+  if (visibleSections.length === 0) {
+    return null;
+  }
+
+  return (
+    <Box twClassName="mb-7 -mx-4">
+      <ScrollView
+        horizontal
+        showsHorizontalScrollIndicator={false}
+        testID={TrendingViewSelectorsIDs.QUICK_ACTIONS_SCROLL_VIEW}
+        contentContainerStyle={tw.style('px-4')}
+      >
+        <Box twClassName="flex-row gap-2">
+          {visibleSections.map((section) => (
+            <TouchableOpacity
+              key={section.id}
+              onPress={() => section.viewAllAction(navigation)}
+              // Use `tokens` suffix for E2E / View All naming (`section-header-view-all-tokens`), not `trending`
+              testID={`quick-action-${section.id}`}
+              style={tw.style(
+                'flex-row items-center justify-center rounded-xl bg-background-section py-2 pl-4 pr-3',
+              )}
+            >
+              <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+                {section.title}
+              </Text>
+            </TouchableOpacity>
+          ))}
+        </Box>
+      </ScrollView>
+    </Box>
+  );
+};
+
+export default QuickActions;
diff --git a/app/components/Views/TrendingView/components/QuickActions/QuickActions.tsx b/app/components/Views/TrendingView/components/QuickActions/QuickActions.tsx
deleted file mode 100644
index 29d85010327..00000000000
--- a/app/components/Views/TrendingView/components/QuickActions/QuickActions.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-import { ScrollView, TouchableOpacity } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
-import {
-  Box,
-  FontWeight,
-  Text,
-  TextVariant,
-} from '@metamask/design-system-react-native';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import { SectionId, useQuickActionsSectionsArray } from '../../sections.config';
-import { TrendingViewSelectorsIDs } from '../../TrendingView.testIds';
-import { AppNavigationProp } from '../../../../../core/NavigationService/types';
-
-interface QuickActionsProps {
-  /** Set of section IDs that have empty data and should be hidden */
-  emptySections: Set<SectionId>;
-}
-
-/**
- * A dynamic component that automatically generates action buttons based on the
- * centralized sections configuration. When a new section is added to SECTIONS_CONFIG,
- * a corresponding button will automatically appear here.
- */
-const QuickActions: React.FC<QuickActionsProps> = ({ emptySections }) => {
-  const navigation = useNavigation<AppNavigationProp>();
-  const tw = useTailwind();
-  const sectionsArray = useQuickActionsSectionsArray();
-
-  const visibleSections = sectionsArray.filter((s) => !emptySections.has(s.id));
-
-  return (
-    <Box twClassName="mb-7 -mx-4">
-      <ScrollView
-        horizontal
-        showsHorizontalScrollIndicator={false}
-        testID={TrendingViewSelectorsIDs.QUICK_ACTIONS_SCROLL_VIEW}
-        contentContainerStyle={tw.style('px-4')}
-      >
-        <Box twClassName="flex-row gap-2">
-          {visibleSections.map((section) => (
-            <TouchableOpacity
-              key={section.id}
-              onPress={() => section.viewAllAction(navigation)}
-              testID={`quick-action-${section.id}`}
-              style={tw.style(
-                'flex-row items-center justify-center rounded-xl bg-background-section py-2 pl-4 pr-3',
-              )}
-            >
-              <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
-                {section.title}
-              </Text>
-            </TouchableOpacity>
-          ))}
-        </Box>
-      </ScrollView>
-    </Box>
-  );
-};
-
-export default QuickActions;
diff --git a/app/components/Views/TrendingView/components/SectionHeader.tsx b/app/components/Views/TrendingView/components/SectionHeader.tsx
new file mode 100644
index 00000000000..4b188fdf712
--- /dev/null
+++ b/app/components/Views/TrendingView/components/SectionHeader.tsx
@@ -0,0 +1,66 @@
+import React, { useCallback } from 'react';
+import {
+  Text,
+  TextVariant,
+  TextColor,
+} from '@metamask/design-system-react-native';
+import BaseSectionHeader from '../../../../component-library/components-temp/SectionHeader';
+import {
+  trackExploreInteracted,
+  type ExploreTabName,
+  type ExploreSectionName,
+} from '../search/analytics';
+
+export interface SectionHeaderProps {
+  title: string;
+  subtitle?: string;
+  /** When provided, the title becomes tappable with a trailing chevron. */
+  onViewAll?: () => void;
+  testID?: string;
+  /** Tab context for analytics — required when onViewAll is set. */
+  tabName?: ExploreTabName;
+  /** Section context for analytics — required when onViewAll is set. */
+  sectionName?: ExploreSectionName;
+}
+
+const SectionHeader: React.FC<SectionHeaderProps> = ({
+  title,
+  subtitle,
+  onViewAll,
+  testID,
+  tabName,
+  sectionName,
+}) => {
+  const handleViewAll = useCallback(() => {
+    if (tabName && sectionName) {
+      trackExploreInteracted({
+        interaction_type: 'section_see_all_tapped',
+        tab_name: tabName,
+        section_name: sectionName,
+      });
+    }
+    onViewAll?.();
+  }, [onViewAll, tabName, sectionName]);
+
+  return (
+    <>
+      <BaseSectionHeader
+        testID={testID}
+        title={title}
+        onPress={onViewAll ? handleViewAll : undefined}
+        twClassName={`px-0 ${subtitle ? 'mb-0.5' : 'mb-2'}`}
+      />
+      {subtitle && (
+        <Text
+          variant={TextVariant.BodySm}
+          color={TextColor.TextAlternative}
+          twClassName="mt-1"
+        >
+          {subtitle}
+        </Text>
+      )}
+    </>
+  );
+};
+
+export default SectionHeader;
diff --git a/app/components/Views/TrendingView/components/SectionHeader/SectionHeader.test.tsx b/app/components/Views/TrendingView/components/SectionHeader/SectionHeader.test.tsx
deleted file mode 100644
index 184d58ca968..00000000000
--- a/app/components/Views/TrendingView/components/SectionHeader/SectionHeader.test.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from 'react';
-import { fireEvent } from '@testing-library/react-native';
-import { strings } from '../../../../../../locales/i18n';
-import renderWithProvider from '../../../../../util/test/renderWithProvider';
-import { backgroundState } from '../../../../../util/test/initial-root-state';
-import SectionHeader from './SectionHeader';
-
-const mockNavigate = jest.fn();
-
-jest.mock('@react-navigation/native', () => ({
-  ...jest.requireActual('@react-navigation/native'),
-  useNavigation: () => ({
-    navigate: mockNavigate,
-  }),
-}));
-
-const initialState = {
-  engine: {
-    backgroundState,
-  },
-};
-
-describe('SectionHeader', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('renders title for predictions section', () => {
-    const { getByText } = renderWithProvider(
-      <SectionHeader sectionId="predictions" />,
-      { state: initialState },
-    );
-
-    expect(getByText('Predictions')).toBeOnTheScreen();
-  });
-
-  it('renders title for tokens section', () => {
-    const { getByText } = renderWithProvider(
-      <SectionHeader sectionId="tokens" />,
-      { state: initialState },
-    );
-
-    expect(getByText(strings('trending.trending_tokens'))).toBeOnTheScreen();
-  });
-
-  it('renders title for perps section', () => {
-    const { getByText } = renderWithProvider(
-      <SectionHeader sectionId="perps" />,
-      { state: initialState },
-    );
-
-    expect(getByText('Perps')).toBeOnTheScreen();
-  });
-
-  it('calls navigation action when header is pressed', () => {
-    const { getByTestId } = renderWithProvider(
-      <SectionHeader sectionId="perps" />,
-      { state: initialState },
-    );
-
-    fireEvent.press(getByTestId('section-header-view-all-perps'));
-
-    expect(mockNavigate).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/app/components/Views/TrendingView/components/SectionHeader/SectionHeader.tsx b/app/components/Views/TrendingView/components/SectionHeader/SectionHeader.tsx
deleted file mode 100644
index c20a18237d1..00000000000
--- a/app/components/Views/TrendingView/components/SectionHeader/SectionHeader.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import { useNavigation } from '@react-navigation/native';
-import { SectionId, SECTIONS_CONFIG } from '../../sections.config';
-import SectionHeader from '../../../../../component-library/components-temp/SectionHeader';
-import { AppNavigationProp } from '../../../../../core/NavigationService/types';
-
-export interface SectionHeaderProps {
-  sectionId: SectionId;
-}
-
-/**
- * Displays a section header with title and "View All" button.
- * All configuration is pulled from sections.config.tsx based on the sectionId.
- *
- * This component is part of the centralized section management system that ensures
- * consistency between QuickActions buttons and section "View All" buttons.
- */
-const TrendingSectionHeader: React.FC<SectionHeaderProps> = ({ sectionId }) => {
-  const navigation = useNavigation<AppNavigationProp>();
-  const sectionConfig = SECTIONS_CONFIG[sectionId];
-
-  return (
-    <SectionHeader
-      testID={`section-header-view-all-${sectionId}`}
-      title={sectionConfig.title}
-      onPress={() => sectionConfig.viewAllAction(navigation)}
-      twClassName="px-0 mb-2"
-    />
-  );
-};
-
-export default TrendingSectionHeader;
diff --git a/app/components/Views/TrendingView/components/Sections/Section.tsx b/app/components/Views/TrendingView/components/Sections/Section.tsx
deleted file mode 100644
index 40d0f28d666..00000000000
--- a/app/components/Views/TrendingView/components/Sections/Section.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React, { useEffect } from 'react';
-import { SectionId, SECTIONS_CONFIG } from '../../sections.config';
-
-export interface RefreshConfig {
-  /** Incrementing counter to trigger refetch */
-  trigger: number;
-  /** Whether to show loading skeleton during this refresh */
-  silentRefresh: boolean;
-}
-
-export interface SectionProps {
-  sectionId: SectionId;
-  refreshConfig: RefreshConfig;
-  /** Callback when data empty state changes (only called after loading completes) */
-  toggleSectionEmptyState: (isEmpty: boolean) => void;
-  /** Callback when loading state changes (for silent refresh indicator) */
-  toggleSectionLoadingState: (isLoading: boolean) => void;
-}
-
-const Section: React.FC<SectionProps> = ({
-  sectionId,
-  refreshConfig,
-  toggleSectionEmptyState,
-  toggleSectionLoadingState,
-}) => {
-  const section = SECTIONS_CONFIG[sectionId];
-  const { data, isLoading, refetch } = section.useSectionData();
-
-  // Notify parent when data is empty
-  useEffect(() => {
-    if (!isLoading) {
-      toggleSectionEmptyState(data.length === 0);
-    }
-  }, [data.length, isLoading, toggleSectionEmptyState]);
-
-  // Notify parent when loading
-  useEffect(() => {
-    toggleSectionLoadingState(isLoading);
-  }, [isLoading, toggleSectionLoadingState]);
-
-  useEffect(() => {
-    if (refreshConfig && refreshConfig.trigger > 0 && refetch) {
-      refetch();
-    }
-  }, [refreshConfig, refetch]);
-
-  // Only show loading skeleton if refreshConfig allows it
-  const shouldShowSkeleton = isLoading && refreshConfig.silentRefresh;
-
-  return (
-    <section.Section
-      sectionId={sectionId}
-      data={data}
-      isLoading={shouldShowSkeleton}
-    />
-  );
-};
-
-export default Section;
diff --git a/app/components/Views/TrendingView/components/Sections/SectionTypes/PerpsExploreSection.test.tsx b/app/components/Views/TrendingView/components/Sections/SectionTypes/PerpsExploreSection.test.tsx
deleted file mode 100644
index 2ec89c18d03..00000000000
--- a/app/components/Views/TrendingView/components/Sections/SectionTypes/PerpsExploreSection.test.tsx
+++ /dev/null
@@ -1,166 +0,0 @@
-import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react-native';
-import PerpsExploreSection from './PerpsExploreSection';
-
-const mockNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => ({
-  useNavigation: () => ({ navigate: mockNavigate }),
-}));
-
-jest.mock('react-redux', () => ({
-  useSelector: jest.fn(() => ['MKT1']),
-}));
-
-jest.mock('@metamask/perps-controller', () => ({
-  PERPS_EVENT_VALUE: { SOURCE: { EXPLORE: 'explore' } },
-}));
-
-jest.mock('../../../../../../constants/navigation/Routes', () => ({
-  __esModule: true,
-  default: {
-    PERPS: {
-      ROOT: 'PerpsRoot',
-      MARKET_LIST: 'PerpsMarketList',
-      MARKET_DETAILS: 'PerpsMarketDetails',
-    },
-  },
-}));
-
-const mockUseHomepageSparklines = jest.fn(() => ({ sparklines: {} }));
-jest.mock(
-  '../../../../Homepage/Sections/Perpetuals/hooks/useHomepageSparklines',
-  () => ({
-    useHomepageSparklines: (
-      ...args: Parameters<typeof mockUseHomepageSparklines>
-    ) => mockUseHomepageSparklines(...args),
-  }),
-);
-
-jest.mock('../../../../../UI/Perps/selectors/perpsController', () => ({
-  selectPerpsWatchlistMarkets: jest.fn(),
-}));
-
-jest.mock(
-  '../../../../Homepage/Sections/Perpetuals/components/PerpsMarketTileCard',
-  () => {
-    const ReactNative = jest.requireActual('react-native');
-    return ({
-      market,
-      testID,
-    }: {
-      market: { symbol: string };
-      testID?: string;
-    }) => (
-      <ReactNative.View testID={testID}>
-        <ReactNative.Text>{market.symbol}</ReactNative.Text>
-      </ReactNative.View>
-    );
-  },
-);
-
-jest.mock(
-  '../../../../Homepage/Sections/Perpetuals/components/PerpsMarketTileCardSkeleton',
-  () => {
-    const ReactNative = jest.requireActual('react-native');
-    return () => <ReactNative.View testID="mock-skeleton" />;
-  },
-);
-
-jest.mock('../../../../Homepage/components/ViewMoreCard', () => {
-  const ReactNative = jest.requireActual('react-native');
-  return ({ onPress, testID }: { onPress: () => void; testID?: string }) => (
-    <ReactNative.TouchableOpacity onPress={onPress} testID={testID}>
-      <ReactNative.Text>View more</ReactNative.Text>
-    </ReactNative.TouchableOpacity>
-  );
-});
-
-const createMarkets = (count: number) =>
-  Array.from({ length: count }, (_, i) => ({
-    symbol: `MKT${i}`,
-    name: `Market ${i}`,
-    change24hPercent: '0',
-  }));
-
-describe('PerpsExploreSection', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockUseHomepageSparklines.mockReturnValue({ sparklines: {} });
-  });
-
-  it('renders skeleton when loading', () => {
-    render(<PerpsExploreSection sectionId="perps" data={[]} isLoading />);
-
-    expect(screen.getByTestId('mock-skeleton')).toBeOnTheScreen();
-    expect(screen.queryByTestId('explore-perps-carousel')).toBeNull();
-  });
-
-  it('renders items and ViewMoreCard when not loading', () => {
-    const data = createMarkets(3);
-
-    render(
-      <PerpsExploreSection sectionId="perps" data={data} isLoading={false} />,
-    );
-
-    expect(screen.getByTestId('explore-perps-carousel')).toBeOnTheScreen();
-    expect(screen.getByTestId('perps-market-tile-card-MKT0')).toBeOnTheScreen();
-    expect(screen.getByTestId('perps-market-tile-card-MKT1')).toBeOnTheScreen();
-    expect(screen.getByTestId('perps-market-tile-card-MKT2')).toBeOnTheScreen();
-    expect(screen.getByTestId('perps-view-more-card')).toBeOnTheScreen();
-  });
-
-  it('limits displayed items to 5', () => {
-    const data = createMarkets(8);
-
-    render(
-      <PerpsExploreSection sectionId="perps" data={data} isLoading={false} />,
-    );
-
-    expect(screen.getByTestId('perps-market-tile-card-MKT0')).toBeOnTheScreen();
-    expect(screen.getByTestId('perps-market-tile-card-MKT4')).toBeOnTheScreen();
-    expect(screen.queryByTestId('perps-market-tile-card-MKT5')).toBeNull();
-    expect(screen.queryByTestId('perps-market-tile-card-MKT7')).toBeNull();
-  });
-
-  it('navigates to market list when ViewMoreCard is pressed', () => {
-    render(
-      <PerpsExploreSection
-        sectionId="perps"
-        data={createMarkets(2)}
-        isLoading={false}
-      />,
-    );
-
-    fireEvent.press(screen.getByTestId('perps-view-more-card'));
-
-    expect(mockNavigate).toHaveBeenCalledWith(
-      'PerpsRoot',
-      expect.objectContaining({ screen: 'PerpsMarketList' }),
-    );
-  });
-
-  it('renders only ViewMoreCard when data is empty', () => {
-    render(
-      <PerpsExploreSection sectionId="perps" data={[]} isLoading={false} />,
-    );
-
-    expect(screen.getByTestId('explore-perps-carousel')).toBeOnTheScreen();
-    expect(screen.getByTestId('perps-view-more-card')).toBeOnTheScreen();
-  });
-
-  it('batches sparkline subscriptions for displayed symbols only', () => {
-    const data = createMarkets(8);
-
-    render(
-      <PerpsExploreSection sectionId="perps" data={data} isLoading={false} />,
-    );
-
-    expect(mockUseHomepageSparklines).toHaveBeenCalledWith([
-      'MKT0',
-      'MKT1',
-      'MKT2',
-      'MKT3',
-      'MKT4',
-    ]);
-  });
-});
diff --git a/app/components/Views/TrendingView/components/Sections/SectionTypes/PerpsExploreSection.tsx b/app/components/Views/TrendingView/components/Sections/SectionTypes/PerpsExploreSection.tsx
deleted file mode 100644
index 8b6b64e415d..00000000000
--- a/app/components/Views/TrendingView/components/Sections/SectionTypes/PerpsExploreSection.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, { useMemo } from 'react';
-import { ScrollView } from 'react-native';
-import { useNavigation, type NavigationProp } from '@react-navigation/native';
-import { useSelector } from 'react-redux';
-import { Box } from '@metamask/design-system-react-native';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import {
-  PERPS_EVENT_VALUE,
-  type PerpsMarketData,
-} from '@metamask/perps-controller';
-import type { PerpsNavigationParamList } from '../../../../../UI/Perps/types/navigation';
-import { selectPerpsWatchlistMarkets } from '../../../../../UI/Perps/selectors/perpsController';
-import { useHomepageSparklines } from '../../../../Homepage/Sections/Perpetuals/hooks/useHomepageSparklines';
-import PerpsMarketTileCard from '../../../../Homepage/Sections/Perpetuals/components/PerpsMarketTileCard';
-import PerpsMarketTileCardSkeleton from '../../../../Homepage/Sections/Perpetuals/components/PerpsMarketTileCardSkeleton';
-import ViewMoreCard from '../../../../Homepage/components/ViewMoreCard';
-import Routes from '../../../../../../constants/navigation/Routes';
-import type { SectionId } from '../../../sections.config';
-
-const MAX_ITEMS = 5;
-
-export interface PerpsExploreSectionProps {
-  sectionId: SectionId;
-  data: unknown[];
-  isLoading: boolean;
-}
-
-/**
- * Self-contained section that batches sparkline subscriptions and watchlist
- * reads for all visible perps tiles, then renders tiles directly.
- */
-const PerpsExploreSection: React.FC<PerpsExploreSectionProps> = ({
-  data,
-  isLoading,
-}) => {
-  const navigation = useNavigation();
-  const tw = useTailwind();
-
-  const displayMarkets = useMemo(
-    () => (data as PerpsMarketData[]).slice(0, MAX_ITEMS),
-    [data],
-  );
-  const displaySymbols = useMemo(
-    () => displayMarkets.map((m) => m.symbol),
-    [displayMarkets],
-  );
-  const { sparklines } = useHomepageSparklines(displaySymbols);
-  const watchlistSymbols = useSelector(selectPerpsWatchlistMarkets) ?? [];
-
-  return (
-    <Box twClassName="-mx-4 mb-9">
-      {isLoading ? (
-        <Box twClassName="px-4">
-          <PerpsMarketTileCardSkeleton />
-        </Box>
-      ) : (
-        <ScrollView
-          horizontal
-          showsHorizontalScrollIndicator={false}
-          contentContainerStyle={tw.style('px-4 gap-2.5')}
-          testID="explore-perps-carousel"
-        >
-          {displayMarkets.map((market) => (
-            <PerpsMarketTileCard
-              key={market.symbol}
-              market={market}
-              sparklineData={sparklines[market.symbol]}
-              showFavoriteTag={watchlistSymbols.includes(market.symbol)}
-              testID={`perps-market-tile-card-${market.symbol}`}
-              onPress={() => {
-                (
-                  navigation as NavigationProp<PerpsNavigationParamList>
-                )?.navigate(Routes.PERPS.ROOT, {
-                  screen: Routes.PERPS.MARKET_DETAILS,
-                  params: {
-                    market,
-                    source: PERPS_EVENT_VALUE.SOURCE.EXPLORE,
-                  },
-                });
-              }}
-            />
-          ))}
-          <ViewMoreCard
-            onPress={() =>
-              navigation.navigate(Routes.PERPS.ROOT, {
-                screen: Routes.PERPS.MARKET_LIST,
-                params: {
-                  defaultMarketTypeFilter: 'all',
-                  source: PERPS_EVENT_VALUE.SOURCE.EXPLORE,
-                },
-              })
-            }
-            twClassName="w-[180px] flex-1"
-            testID="perps-view-more-card"
-          />
-        </ScrollView>
-      )}
-    </Box>
-  );
-};
-
-export default PerpsExploreSection;
diff --git a/app/components/Views/TrendingView/components/Sections/SectionTypes/SectionCard.tsx b/app/components/Views/TrendingView/components/Sections/SectionTypes/SectionCard.tsx
deleted file mode 100644
index 9be62cc85fc..00000000000
--- a/app/components/Views/TrendingView/components/Sections/SectionTypes/SectionCard.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React, { useCallback } from 'react';
-import { StyleSheet } from 'react-native';
-import Card from '../../../../../../component-library/components/Cards/Card';
-import { SectionId, SECTIONS_CONFIG } from '../../../sections.config';
-import { FlashList, ListRenderItem } from '@shopify/flash-list';
-import { useNavigation } from '@react-navigation/native';
-
-const styles = StyleSheet.create({
-  cardContainer: {
-    padding: 0,
-    marginBottom: 28,
-    borderWidth: 0,
-  },
-});
-interface SectionCardProps {
-  sectionId: SectionId;
-  data: unknown[];
-  isLoading: boolean;
-}
-
-const SectionCard: React.FC<SectionCardProps> = ({
-  sectionId,
-  data,
-  isLoading,
-}) => {
-  const navigation = useNavigation();
-
-  const section = SECTIONS_CONFIG[sectionId];
-
-  const renderFlatItem: ListRenderItem<unknown> = useCallback(
-    ({ item, index }) => (
-      <section.RowItem item={item} index={index} navigation={navigation} />
-    ),
-    [navigation, section],
-  );
-
-  return (
-    <Card style={styles.cardContainer} disabled>
-      {isLoading && (
-        <>
-          <section.Skeleton />
-          <section.Skeleton />
-          <section.Skeleton />
-        </>
-      )}
-      {!isLoading && (
-        <FlashList
-          data={data.slice(0, 3)}
-          renderItem={renderFlatItem}
-          keyExtractor={(_, index) => `${section.id}-${index}`}
-          keyboardShouldPersistTaps="handled"
-          testID="perps-tokens-list"
-        />
-      )}
-    </Card>
-  );
-};
-
-export default SectionCard;
diff --git a/app/components/Views/TrendingView/components/Sections/SectionTypes/SectionCarrousel.tsx b/app/components/Views/TrendingView/components/Sections/SectionTypes/SectionCarrousel.tsx
deleted file mode 100644
index e278985ec3a..00000000000
--- a/app/components/Views/TrendingView/components/Sections/SectionTypes/SectionCarrousel.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Box, BoxBorderColor } from '@metamask/design-system-react-native';
-import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import React, { useRef } from 'react';
-import { Dimensions } from 'react-native';
-import { FlashList, FlashListRef } from '@shopify/flash-list';
-import { SectionId, SECTIONS_CONFIG } from '../../../sections.config';
-import { useNavigation } from '@react-navigation/native';
-
-const { width: SCREEN_WIDTH } = Dimensions.get('window');
-const CONTENT_WIDTH = SCREEN_WIDTH;
-const CARD_WIDTH = CONTENT_WIDTH * 0.8;
-const CARD_HEIGHT = 220;
-
-export interface SectionCarrouselProps {
-  sectionId: SectionId;
-  data: unknown[];
-  isLoading: boolean;
-}
-
-const SectionCarrousel: React.FC<SectionCarrouselProps> = ({
-  sectionId,
-  data,
-  isLoading,
-}) => {
-  const navigation = useNavigation();
-  const tw = useTailwind();
-  const flashListRef = useRef<FlashListRef<unknown>>(null);
-
-  const section = SECTIONS_CONFIG[sectionId];
-
-  const skeletonCount = 3;
-  const skeletonData = Array.from({ length: skeletonCount });
-
-  const displayData = isLoading ? skeletonData : data;
-
-  return (
-    <Box twClassName="-mx-4 mb-6">
-      <FlashList
-        ref={flashListRef}
-        data={displayData}
-        renderItem={({ item, index }) => {
-          const isLastItem = index === displayData.length - 1;
-          return (
-            <Box
-              style={tw.style({ width: CARD_WIDTH, minHeight: CARD_HEIGHT })}
-            >
-              <Box
-                borderColor={BoxBorderColor.BorderDefault}
-                twClassName={`rounded-2xl overflow-hidden ${!isLastItem ? 'pr-4' : ''}`}
-              >
-                {isLoading ? (
-                  <section.Skeleton />
-                ) : (
-                  <section.RowItem
-                    item={item}
-                    index={index}
-                    navigation={navigation}
-                  />
-                )}
-              </Box>
-            </Box>
-          );
-        }}
-        contentContainerStyle={tw.style('px-4')}
-        keyExtractor={
-          isLoading
-            ? (_, index) => `skeleton-${index}`
-            : (_, index) => `${section.id}-${index}`
-        }
-        horizontal
-        pagingEnabled={false}
-        showsHorizontalScrollIndicator={false}
-        snapToInterval={CARD_WIDTH}
-        decelerationRate="fast"
-        testID={`${sectionId}-flash-list`}
-      />
-    </Box>
-  );
-};
-
-export default SectionCarrousel;
diff --git a/app/components/Views/TrendingView/components/TileCarousel.tsx b/app/components/Views/TrendingView/components/TileCarousel.tsx
new file mode 100644
index 00000000000..650188d6361
--- /dev/null
+++ b/app/components/Views/TrendingView/components/TileCarousel.tsx
@@ -0,0 +1,80 @@
+import React, { useMemo } from 'react';
+import { ScrollView } from 'react-native';
+import { Box } from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import ViewMoreCard from '../../Homepage/components/ViewMoreCard';
+
+/** Default number of tiles shown; sparkline fetches in `usePerpsFeed` must match. */
+export const TILE_CAROUSEL_DEFAULT_MAX_TILES = 5;
+
+export interface TileCarouselProps<T> {
+  data: T[];
+  isLoading: boolean;
+  renderItem: (item: T, index: number) => React.ReactNode;
+  keyExtractor: (item: T) => string;
+  Skeleton: React.ComponentType;
+  /** Optional trailing "View more" tile press handler. Omit to hide the tile. */
+  onViewMore?: () => void;
+  /** @default 5 */
+  max?: number;
+  testID?: string;
+  viewMoreTestID?: string;
+  /**
+   * When true, uses `mb-7` after the carousel so spacing matches {@link CardList}
+   * section tails (~28px). Use for the first tile strip on Sites (Recents) to
+   * mirror Crypto "Trending" → next section rhythm.
+   */
+  compactSectionTail?: boolean;
+}
+
+/**
+ * Horizontal scrollview of fixed-width tiles. Used for perps tiles and
+ * recent dapp / network tiles. Trailing `<ViewMoreCard>` is opt-in.
+ */
+function TileCarousel<T>({
+  data,
+  isLoading,
+  renderItem,
+  keyExtractor,
+  Skeleton,
+  onViewMore,
+  max = TILE_CAROUSEL_DEFAULT_MAX_TILES,
+  testID,
+  viewMoreTestID,
+  compactSectionTail = false,
+}: TileCarouselProps<T>) {
+  const tw = useTailwind();
+  const displayItems = useMemo(() => data.slice(0, max), [data, max]);
+
+  return (
+    <Box twClassName={`-mx-4 mt-3 ${compactSectionTail ? 'mb-7' : 'mb-9'}`}>
+      {isLoading ? (
+        <Box twClassName="px-4">
+          <Skeleton />
+        </Box>
+      ) : (
+        <ScrollView
+          horizontal
+          showsHorizontalScrollIndicator={false}
+          contentContainerStyle={tw.style('px-4 gap-2.5')}
+          testID={testID}
+        >
+          {displayItems.map((item, index) => (
+            <React.Fragment key={keyExtractor(item)}>
+              {renderItem(item, index)}
+            </React.Fragment>
+          ))}
+          {onViewMore && (
+            <ViewMoreCard
+              onPress={onViewMore}
+              twClassName="w-[180px] flex-1"
+              testID={viewMoreTestID}
+            />
+          )}
+        </ScrollView>
+      )}
+    </Box>
+  );
+}
+
+export default TileCarousel;
diff --git a/app/components/Views/TrendingView/feeds/dapps/SiteTileRowItem.tsx b/app/components/Views/TrendingView/feeds/dapps/SiteTileRowItem.tsx
new file mode 100644
index 00000000000..44563f3ef44
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/dapps/SiteTileRowItem.tsx
@@ -0,0 +1,134 @@
+import React from 'react';
+import {
+  TouchableOpacity,
+  StyleSheet,
+  Image,
+  type TextStyle,
+} from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { useStyles } from '../../../../../component-library/hooks';
+import WebsiteIcon from '../../../../UI/WebsiteIcon';
+import type { SiteData } from '../../../../UI/Sites/components/SiteRowItem/SiteRowItem';
+import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
+import Routes from '../../../../../constants/navigation/Routes';
+import type { Theme } from '../../../../../util/theme/models';
+
+export const SITE_TILE_WIDTH = 180;
+export const SITE_TILE_HEIGHT = 120;
+export const SITE_TILE_BORDER_RADIUS = 12;
+
+const LOGO_SIZE = 40;
+
+const websiteIconTextStyle: TextStyle = { fontSize: 12 };
+
+const styleSheet = ({ theme }: { theme: Theme }) =>
+  StyleSheet.create({
+    card: {
+      width: SITE_TILE_WIDTH,
+      height: SITE_TILE_HEIGHT,
+      backgroundColor: theme.colors.background.section,
+      borderRadius: SITE_TILE_BORDER_RADIUS,
+      paddingHorizontal: 16,
+      paddingVertical: 12,
+    },
+    websiteIcon: {
+      width: LOGO_SIZE,
+      height: LOGO_SIZE,
+      borderRadius: LOGO_SIZE / 2,
+    },
+  });
+
+interface SiteTileRowItemProps {
+  site: SiteData;
+  /** Called synchronously before the card's navigation press fires. */
+  onCardPress?: () => void;
+}
+
+/**
+ * Compact tile (icon, title, url) for Explore "Recents" / "Networks" carousels.
+ */
+const SiteTileRowItem: React.FC<SiteTileRowItemProps> = ({
+  site,
+  onCardPress,
+}) => {
+  const navigation = useNavigation<AppNavigationProp>();
+  const { styles } = useStyles(styleSheet);
+  const tw = useTailwind();
+
+  const onPress = () => {
+    onCardPress?.();
+    navigation.navigate(Routes.BROWSER.HOME, {
+      screen: Routes.BROWSER.VIEW,
+      params: {
+        newTabUrl: site.url,
+        timestamp: Date.now(),
+        fromTrending: true,
+      },
+    });
+  };
+
+  return (
+    <TouchableOpacity
+      testID={`site-recents-tile-${site.name}`}
+      style={tw.style(styles.card, 'shrink-0 flex-col justify-start')}
+      onPress={onPress}
+      activeOpacity={0.7}
+    >
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Start}
+        justifyContent={BoxJustifyContent.Between}
+      >
+        <Box
+          style={tw.style('overflow-hidden rounded-full border border-muted')}
+        >
+          {site.logoSource ? (
+            <Image source={site.logoSource} style={styles.websiteIcon} />
+          ) : (
+            <WebsiteIcon
+              url={site.url}
+              title={site.name}
+              style={styles.websiteIcon}
+              textStyle={websiteIconTextStyle}
+              icon={site.logoUrl}
+            />
+          )}
+        </Box>
+      </Box>
+
+      <Text
+        variant={TextVariant.BodyMd}
+        color={TextColor.TextDefault}
+        numberOfLines={1}
+        fontWeight={FontWeight.Medium}
+        twClassName="pt-2"
+      >
+        {site.name}
+      </Text>
+      <Text
+        variant={TextVariant.BodySm}
+        color={TextColor.TextAlternative}
+        numberOfLines={1}
+      >
+        {site.displayUrl}
+      </Text>
+    </TouchableOpacity>
+  );
+};
+
+export default SiteTileRowItem;
diff --git a/app/components/Views/TrendingView/feeds/dapps/SiteTileSkeleton.tsx b/app/components/Views/TrendingView/feeds/dapps/SiteTileSkeleton.tsx
new file mode 100644
index 00000000000..a7f2e82947c
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/dapps/SiteTileSkeleton.tsx
@@ -0,0 +1,40 @@
+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';
+import {
+  SITE_TILE_BORDER_RADIUS,
+  SITE_TILE_HEIGHT,
+  SITE_TILE_WIDTH,
+} from './SiteTileRowItem';
+
+const SKELETON_CARD_COUNT = 3;
+
+/** Loading strip for the dapps "Recents" / "Networks" carousels. */
+const SiteTileSkeleton: React.FC = () => {
+  const { colors } = useTheme();
+  const tw = useTailwind();
+
+  return (
+    <SkeletonPlaceholder
+      backgroundColor={colors.background.section}
+      highlightColor={colors.background.subsection}
+    >
+      <View style={tw.style('flex-row gap-2.5')}>
+        {Array.from({ length: SKELETON_CARD_COUNT }, (_, i) => (
+          <View
+            key={i}
+            style={{
+              width: SITE_TILE_WIDTH,
+              height: SITE_TILE_HEIGHT,
+              borderRadius: SITE_TILE_BORDER_RADIUS,
+            }}
+          />
+        ))}
+      </View>
+    </SkeletonPlaceholder>
+  );
+};
+
+export default React.memo(SiteTileSkeleton);
diff --git a/app/components/Views/TrendingView/feeds/dapps/useFavoritesFeed.ts b/app/components/Views/TrendingView/feeds/dapps/useFavoritesFeed.ts
new file mode 100644
index 00000000000..8ba3f07fcbb
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/dapps/useFavoritesFeed.ts
@@ -0,0 +1,25 @@
+import { useBrowserFavoritesSites } from '../../../../UI/Sites/hooks/useBrowserFavoritesSites/useBrowserFavoritesSites';
+import { useFeedRefresh } from '../../hooks/useFeedRefresh';
+import type { RefreshConfig } from '../../hooks/useExploreRefresh';
+import type { SiteData } from '../../../../UI/Sites/components/SiteRowItem/SiteRowItem';
+
+interface UseFavoritesFeedOptions {
+  query?: string;
+  refresh?: RefreshConfig;
+}
+
+export interface UseFavoritesFeedResult {
+  data: SiteData[];
+  isLoading: boolean;
+  refetch: () => Promise<void>;
+}
+
+/** Bookmarked browser sites mapped to `SiteData`. */
+export const useFavoritesFeed = ({
+  query,
+  refresh,
+}: UseFavoritesFeedOptions = {}): UseFavoritesFeedResult => {
+  const { data, isLoading, refetch } = useBrowserFavoritesSites(query);
+  useFeedRefresh(refresh, refetch);
+  return { data, isLoading, refetch };
+};
diff --git a/app/components/Views/TrendingView/feeds/dapps/useNetworksFeed.ts b/app/components/Views/TrendingView/feeds/dapps/useNetworksFeed.ts
new file mode 100644
index 00000000000..f3fb060c7af
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/dapps/useNetworksFeed.ts
@@ -0,0 +1,48 @@
+import images from '../../../../../images/image-icons';
+import type { SiteData } from '../../../../UI/Sites/components/SiteRowItem/SiteRowItem';
+
+const NETWORKS: SiteData[] = [
+  {
+    id: 'network-linea',
+    name: 'Linea',
+    url: 'https://portfolio.metamask.io/explore/networks/linea',
+    displayUrl: 'Linea Hub',
+    logoSource: images['LINEA-MAINNET'],
+  },
+  {
+    id: 'network-sei',
+    name: 'Sei',
+    url: 'https://portfolio.metamask.io/explore/networks/sei',
+    displayUrl: 'Sei Hub',
+    logoSource: images.SEI,
+  },
+  {
+    id: 'network-monad',
+    name: 'Monad',
+    url: 'https://portfolio.metamask.io/explore/networks/monad',
+    displayUrl: 'Monad Hub',
+    logoSource: images.MON,
+  },
+  {
+    id: 'network-solana',
+    name: 'Solana',
+    url: 'https://portfolio.metamask.io/explore/networks/solana',
+    displayUrl: 'Solana Hub',
+    logoSource: images.SOLANA,
+  },
+];
+
+export interface UseNetworksFeedResult {
+  data: SiteData[];
+  isLoading: false;
+  refetch: () => Promise<void>;
+}
+
+/** Static list of network "hub" sites; no remote fetch. */
+export const useNetworksFeed = (): UseNetworksFeedResult => ({
+  data: NETWORKS,
+  isLoading: false,
+  refetch: async () => {
+    /* Static data; no remote refetch. */
+  },
+});
diff --git a/app/components/Views/TrendingView/feeds/dapps/useRecentsFeed.ts b/app/components/Views/TrendingView/feeds/dapps/useRecentsFeed.ts
new file mode 100644
index 00000000000..1faf93b90f7
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/dapps/useRecentsFeed.ts
@@ -0,0 +1,23 @@
+import { useBrowserRecentsSites } from '../../../../UI/Sites/hooks/useBrowserRecentsSites/useBrowserRecentsSites';
+import { useFeedRefresh } from '../../hooks/useFeedRefresh';
+import type { RefreshConfig } from '../../hooks/useExploreRefresh';
+import type { SiteData } from '../../../../UI/Sites/components/SiteRowItem/SiteRowItem';
+
+interface UseRecentsFeedOptions {
+  refresh?: RefreshConfig;
+}
+
+export interface UseRecentsFeedResult {
+  data: SiteData[];
+  isLoading: boolean;
+  refetch: () => Promise<void>;
+}
+
+/** Most-recent unique browser-history entries as `SiteData` tiles. */
+export const useRecentsFeed = ({
+  refresh,
+}: UseRecentsFeedOptions = {}): UseRecentsFeedResult => {
+  const { data, isLoading, refetch } = useBrowserRecentsSites();
+  useFeedRefresh(refresh, refetch);
+  return { data, isLoading, refetch };
+};
diff --git a/app/components/Views/TrendingView/feeds/perps/PerpsPillItem.test.tsx b/app/components/Views/TrendingView/feeds/perps/PerpsPillItem.test.tsx
new file mode 100644
index 00000000000..d0a024b2add
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/perps/PerpsPillItem.test.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import { PERPS_EVENT_VALUE } from '@metamask/perps-controller';
+import Routes from '../../../../../constants/navigation/Routes';
+import PerpsPillItem from './PerpsPillItem';
+import type { PerpsFeedItem } from './usePerpsFeed';
+
+const mockNavigate = jest.fn();
+
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: () => ({ navigate: mockNavigate }),
+}));
+
+describe('PerpsPillItem', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  const buildItem = (
+    change24hPercent: string | null | undefined,
+  ): PerpsFeedItem =>
+    ({
+      market: {
+        symbol: 'ETH',
+        change24hPercent,
+      },
+      isWatchlisted: false,
+    }) as PerpsFeedItem;
+
+  it('navigates to market details with explore source on press', () => {
+    const item = buildItem('1.5');
+    const { getByTestId } = render(<PerpsPillItem item={item} />);
+
+    fireEvent.press(getByTestId('perps-market-tile-card-ETH'));
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+      screen: Routes.PERPS.MARKET_DETAILS,
+      params: {
+        market: item.market,
+        source: PERPS_EVENT_VALUE.SOURCE.EXPLORE,
+      },
+    });
+  });
+
+  it('hides change label when change is null, empty, or not a number', () => {
+    const { queryByText, rerender } = render(
+      <PerpsPillItem item={buildItem(null)} />,
+    );
+    expect(queryByText(/%/)).toBeNull();
+
+    rerender(<PerpsPillItem item={buildItem('')} />);
+    expect(queryByText(/%/)).toBeNull();
+
+    rerender(<PerpsPillItem item={buildItem('x')} />);
+    expect(queryByText(/%/)).toBeNull();
+  });
+
+  it('renders 0.00% and signed changes for valid numbers', () => {
+    const { getByText, rerender } = render(
+      <PerpsPillItem item={buildItem('0')} />,
+    );
+    expect(getByText('0.00%')).toBeTruthy();
+
+    rerender(<PerpsPillItem item={buildItem('3.456')} />);
+    expect(getByText('+3.46%')).toBeTruthy();
+
+    rerender(<PerpsPillItem item={buildItem('-0.5')} />);
+    expect(getByText('-0.50%')).toBeTruthy();
+  });
+});
diff --git a/app/components/Views/TrendingView/feeds/perps/PerpsPillItem.tsx b/app/components/Views/TrendingView/feeds/perps/PerpsPillItem.tsx
new file mode 100644
index 00000000000..c24549de87c
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/perps/PerpsPillItem.tsx
@@ -0,0 +1,74 @@
+import React, { useMemo } from 'react';
+import { useNavigation, NavigationProp } from '@react-navigation/native';
+import {
+  PERPS_EVENT_VALUE,
+  getPerpsDisplaySymbol,
+} from '@metamask/perps-controller';
+import { TextColor } from '@metamask/design-system-react-native';
+import PerpsTokenLogo from '../../../../UI/Perps/components/PerpsTokenLogo';
+import type { PerpsNavigationParamList } from '../../../../UI/Perps/types/navigation';
+import Routes from '../../../../../constants/navigation/Routes';
+import ExplorePill from '../../components/ExplorePill';
+import type { PerpsFeedItem } from './usePerpsFeed';
+
+const LOGO_SIZE = 24;
+
+interface PerpsPillItemProps {
+  item: PerpsFeedItem;
+  /** Called synchronously before the card's navigation press fires. */
+  onCardPress?: () => void;
+}
+
+const PerpsPillItem: React.FC<PerpsPillItemProps> = ({ item, onCardPress }) => {
+  const navigation = useNavigation<NavigationProp<PerpsNavigationParamList>>();
+  const { market } = item;
+
+  const { changeLabel, changeTextColor } = useMemo(() => {
+    const raw = market.change24hPercent;
+    const n = parseFloat(String(raw));
+    if (raw == null || raw === '' || Number.isNaN(n)) {
+      return {
+        changeLabel: undefined,
+        changeTextColor: TextColor.TextAlternative,
+      };
+    }
+    if (n === 0) {
+      return {
+        changeLabel: '0.00%',
+        changeTextColor: TextColor.TextAlternative,
+      };
+    }
+    return {
+      changeLabel: `${n > 0 ? '+' : ''}${n.toFixed(2)}%`,
+      changeTextColor:
+        n > 0 ? TextColor.SuccessDefault : TextColor.ErrorDefault,
+    };
+  }, [market.change24hPercent]);
+
+  const onPress = () => {
+    onCardPress?.();
+    navigation.navigate(Routes.PERPS.ROOT, {
+      screen: Routes.PERPS.MARKET_DETAILS,
+      params: { market, source: PERPS_EVENT_VALUE.SOURCE.EXPLORE },
+    });
+  };
+
+  return (
+    <ExplorePill
+      onPress={onPress}
+      testID={`perps-market-tile-card-${market.symbol}`}
+      leading={
+        <PerpsTokenLogo
+          symbol={market.symbol}
+          size={LOGO_SIZE}
+          recyclingKey={market.symbol}
+        />
+      }
+      title={getPerpsDisplaySymbol(market.symbol)}
+      changeLabel={changeLabel}
+      changeTextColor={changeTextColor}
+    />
+  );
+};
+
+export default React.memo(PerpsPillItem);
diff --git a/app/components/Views/TrendingView/feeds/perps/PerpsRowItem.tsx b/app/components/Views/TrendingView/feeds/perps/PerpsRowItem.tsx
new file mode 100644
index 00000000000..cef900b9124
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/perps/PerpsRowItem.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import { useNavigation, NavigationProp } from '@react-navigation/native';
+import {
+  PERPS_EVENT_VALUE,
+  type PerpsMarketData,
+} from '@metamask/perps-controller';
+import PerpsMarketRowItem from '../../../../UI/Perps/components/PerpsMarketRowItem';
+import type { PerpsNavigationParamList } from '../../../../UI/Perps/types/navigation';
+import Routes from '../../../../../constants/navigation/Routes';
+
+interface PerpsRowItemProps {
+  market: PerpsMarketData;
+  /** Called synchronously before the card's navigation press fires. */
+  onCardPress?: () => void;
+}
+
+/** Compact list row for perps — used by pill-toggled lists and search. */
+const PerpsRowItem: React.FC<PerpsRowItemProps> = ({ market, onCardPress }) => {
+  const navigation = useNavigation<NavigationProp<PerpsNavigationParamList>>();
+  return (
+    <PerpsMarketRowItem
+      market={market}
+      onPress={() => {
+        onCardPress?.();
+        navigation.navigate(Routes.PERPS.ROOT, {
+          screen: Routes.PERPS.MARKET_DETAILS,
+          params: { market, source: PERPS_EVENT_VALUE.SOURCE.EXPLORE },
+        });
+      }}
+      showBadge={false}
+      compact
+    />
+  );
+};
+
+export default PerpsRowItem;
diff --git a/app/components/Views/TrendingView/feeds/perps/PerpsSectionProvider.tsx b/app/components/Views/TrendingView/feeds/perps/PerpsSectionProvider.tsx
new file mode 100644
index 00000000000..8bf601a27f3
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/perps/PerpsSectionProvider.tsx
@@ -0,0 +1,15 @@
+import React, { type PropsWithChildren } from 'react';
+import { PerpsConnectionProvider } from '../../../../UI/Perps/providers/PerpsConnectionProvider';
+import { PerpsStreamProvider } from '../../../../UI/Perps/providers/PerpsStreamManager';
+
+/**
+ * Wraps any subtree that consumes the perps feed. Required because
+ * `usePerpsMarkets` reads from the perps connection + stream contexts.
+ */
+const PerpsSectionProvider: React.FC<PropsWithChildren> = ({ children }) => (
+  <PerpsConnectionProvider suppressErrorView>
+    <PerpsStreamProvider>{children}</PerpsStreamProvider>
+  </PerpsConnectionProvider>
+);
+
+export default PerpsSectionProvider;
diff --git a/app/components/Views/TrendingView/feeds/perps/PerpsTileRowItem.tsx b/app/components/Views/TrendingView/feeds/perps/PerpsTileRowItem.tsx
new file mode 100644
index 00000000000..d640187d8fd
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/perps/PerpsTileRowItem.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { useNavigation, NavigationProp } from '@react-navigation/native';
+import { PERPS_EVENT_VALUE } from '@metamask/perps-controller';
+import PerpsMarketTileCard from '../../../Homepage/Sections/Perpetuals/components/PerpsMarketTileCard';
+import type { PerpsNavigationParamList } from '../../../../UI/Perps/types/navigation';
+import Routes from '../../../../../constants/navigation/Routes';
+import type { PerpsFeedItem } from './usePerpsFeed';
+
+interface PerpsTileRowItemProps {
+  item: PerpsFeedItem;
+  testIdPrefix: string;
+  /** Called synchronously before the card's navigation press fires. */
+  onCardPress?: () => void;
+}
+
+const PerpsTileRowItem: React.FC<PerpsTileRowItemProps> = ({
+  item,
+  testIdPrefix,
+  onCardPress,
+}) => {
+  const navigation = useNavigation<NavigationProp<PerpsNavigationParamList>>();
+  const { market, sparkline, isWatchlisted } = item;
+
+  return (
+    <PerpsMarketTileCard
+      market={market}
+      sparklineData={sparkline}
+      showFavoriteTag={isWatchlisted}
+      testID={`${testIdPrefix}-${market.symbol}`}
+      onPress={() => {
+        onCardPress?.();
+        navigation.navigate(Routes.PERPS.ROOT, {
+          screen: Routes.PERPS.MARKET_DETAILS,
+          params: { market, source: PERPS_EVENT_VALUE.SOURCE.EXPLORE },
+        });
+      }}
+    />
+  );
+};
+
+export default PerpsTileRowItem;
diff --git a/app/components/Views/TrendingView/feeds/perps/PerpsToggleBlock.test.tsx b/app/components/Views/TrendingView/feeds/perps/PerpsToggleBlock.test.tsx
new file mode 100644
index 00000000000..dd354e95942
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/perps/PerpsToggleBlock.test.tsx
@@ -0,0 +1,263 @@
+/**
+ * PerpsToggleBlock — unit tests
+ *
+ * Core concerns:
+ * 1. Renders title and the default pill's items.
+ * 2. "View All" button calls onViewAll with the active pill key and the
+ * sortOptionId prop — this is the critical wiring introduced alongside the
+ * sort-param feature.
+ * 3. Switching pills updates the key passed to onViewAll.
+ * 4. Shows skeletons while loading.
+ * 5. Analytics: trackExploreInteracted is called when a row is pressed.
+ */
+
+jest.mock('@shopify/flash-list', () => {
+  const RN = jest.requireActual<typeof import('react-native')>('react-native');
+  return { FlashList: RN.FlatList };
+});
+
+jest.mock('../../search/analytics', () => ({
+  trackExploreInteracted: jest.fn(),
+}));
+
+jest.mock('@metamask/design-system-twrnc-preset', () => {
+  const twFn = () => ({});
+  twFn.style = () => ({});
+  return { useTailwind: () => twFn };
+});
+
+import React from 'react';
+import { Text } from 'react-native';
+import { render, fireEvent, act } from '@testing-library/react-native';
+import type { PerpsMarketData, SortOptionId } from '@metamask/perps-controller';
+import { trackExploreInteracted } from '../../search/analytics';
+import PerpsToggleBlock, {
+  type PerpsToggleBlockProps,
+} from './PerpsToggleBlock';
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+const makeMarket = (symbol: string): PerpsMarketData =>
+  ({
+    symbol,
+    name: `${symbol} Market`,
+    price: '$1.00',
+    change24h: '+1%',
+    change24hPercent: '1',
+    volume: '$100M',
+    maxLeverage: '10x',
+    isHip3: true,
+    marketType: 'equity',
+  }) as PerpsMarketData;
+
+// Minimal PerpsRowItem mock — renders the symbol so assertions are simple.
+jest.mock('./PerpsRowItem', () => {
+  const { TouchableOpacity, Text: RNText } = jest.requireActual('react-native');
+  return function MockPerpsRowItem({
+    market,
+    onCardPress,
+  }: {
+    market: PerpsMarketData;
+    onCardPress?: () => void;
+  }) {
+    return (
+      <TouchableOpacity
+        testID={`perps-row-${market.symbol}`}
+        onPress={onCardPress}
+      >
+        <RNText>{market.symbol}</RNText>
+      </TouchableOpacity>
+    );
+  };
+});
+
+jest.mock('../../../../UI/Perps/components/PerpsRowSkeleton', () => {
+  const { View, Text: RNText } = jest.requireActual('react-native');
+  return function MockPerpsRowSkeleton() {
+    return (
+      <View>
+        <RNText testID="perps-row-skeleton">skeleton</RNText>
+      </View>
+    );
+  };
+});
+
+const Skeleton = () => <Text testID="skeleton-item">sk</Text>;
+
+const STOCKS_MARKETS = [makeMarket('AAPL'), makeMarket('GOOGL')];
+const COMMODITY_MARKETS = [makeMarket('GOLD')];
+
+const DEFAULT_TABS = [
+  { key: 'stocks', name: 'Stocks', items: STOCKS_MARKETS },
+  { key: 'commodities', name: 'Commodities', items: COMMODITY_MARKETS },
+];
+
+const DEFAULT_PROPS: PerpsToggleBlockProps = {
+  title: 'Stocks & Commodities',
+  tabs: DEFAULT_TABS,
+  isLoading: false,
+  defaultPillKey: 'stocks',
+  onViewAll: jest.fn(),
+  sortOptionId: 'volume',
+  tabName: 'Macro',
+  sectionName: 'perps_stocks_commodities',
+  headerTestID: 'section-header-view-all-test',
+  idPrefix: 'test',
+  testIdPrefix: 'test-toggle',
+  listTestId: 'test-list',
+};
+
+const renderBlock = (props = DEFAULT_PROPS) =>
+  render(<PerpsToggleBlock {...props} />);
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe('PerpsToggleBlock', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('rendering', () => {
+    it('renders the section title', () => {
+      const { getByText } = renderBlock();
+      expect(getByText('Stocks & Commodities')).toBeTruthy();
+    });
+
+    it('renders items for the default pill', () => {
+      const { getByTestId, queryByTestId } = renderBlock();
+      expect(getByTestId('perps-row-AAPL')).toBeTruthy();
+      expect(getByTestId('perps-row-GOOGL')).toBeTruthy();
+      expect(queryByTestId('perps-row-GOLD')).toBeNull();
+    });
+
+    it('renders pill buttons for each tab', () => {
+      const { getByTestId } = renderBlock();
+      expect(getByTestId('test-toggle-pill-stocks')).toBeTruthy();
+      expect(getByTestId('test-toggle-pill-commodities')).toBeTruthy();
+    });
+  });
+
+  describe('loading state', () => {
+    it('shows skeletons while isLoading is true', () => {
+      const { getAllByTestId } = renderBlock({
+        ...DEFAULT_PROPS,
+        isLoading: true,
+      });
+      expect(getAllByTestId('perps-row-skeleton').length).toBeGreaterThan(0);
+    });
+  });
+
+  describe('pill switching', () => {
+    it('shows the commodities items after selecting the commodities pill', () => {
+      const { getByTestId, queryByTestId } = renderBlock();
+
+      act(() => {
+        fireEvent.press(getByTestId('test-toggle-pill-commodities'));
+      });
+
+      expect(getByTestId('perps-row-GOLD')).toBeTruthy();
+      expect(queryByTestId('perps-row-AAPL')).toBeNull();
+    });
+
+    it('switching back to stocks shows stocks items again', () => {
+      const { getByTestId } = renderBlock();
+
+      act(() => {
+        fireEvent.press(getByTestId('test-toggle-pill-commodities'));
+      });
+      act(() => {
+        fireEvent.press(getByTestId('test-toggle-pill-stocks'));
+      });
+
+      expect(getByTestId('perps-row-AAPL')).toBeTruthy();
+    });
+  });
+
+  describe('View All — sort and filter forwarding', () => {
+    it('calls onViewAll with the defaultPillKey and sortOptionId before any pill change', () => {
+      const onViewAll = jest.fn();
+      const { getByTestId } = renderBlock({ ...DEFAULT_PROPS, onViewAll });
+
+      fireEvent.press(getByTestId('section-header-view-all-test'));
+
+      expect(onViewAll).toHaveBeenCalledTimes(1);
+      expect(onViewAll).toHaveBeenCalledWith('stocks', 'volume');
+    });
+
+    it('calls onViewAll with the newly active pill key after switching pills', () => {
+      const onViewAll = jest.fn();
+      const { getByTestId } = renderBlock({ ...DEFAULT_PROPS, onViewAll });
+
+      act(() => {
+        fireEvent.press(getByTestId('test-toggle-pill-commodities'));
+      });
+
+      fireEvent.press(getByTestId('section-header-view-all-test'));
+
+      expect(onViewAll).toHaveBeenCalledWith('commodities', 'volume');
+    });
+
+    it('forwards the sortOptionId prop unchanged regardless of active pill', () => {
+      const onViewAll = jest.fn();
+      const { getByTestId } = renderBlock({
+        ...DEFAULT_PROPS,
+        sortOptionId: 'priceChange',
+        onViewAll,
+      });
+
+      act(() => {
+        fireEvent.press(getByTestId('test-toggle-pill-commodities'));
+      });
+      fireEvent.press(getByTestId('section-header-view-all-test'));
+
+      expect(onViewAll).toHaveBeenCalledWith('commodities', 'priceChange');
+    });
+
+    it('calls onViewAll only once per press', () => {
+      const onViewAll = jest.fn();
+      const { getByTestId } = renderBlock({ ...DEFAULT_PROPS, onViewAll });
+
+      fireEvent.press(getByTestId('section-header-view-all-test'));
+      fireEvent.press(getByTestId('section-header-view-all-test'));
+
+      expect(onViewAll).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  describe('analytics', () => {
+    it('calls trackExploreInteracted with correct context when a row is pressed', () => {
+      const mockTrack = trackExploreInteracted as jest.Mock;
+      const { getByTestId } = renderBlock();
+
+      fireEvent.press(getByTestId('perps-row-AAPL'));
+
+      expect(mockTrack).toHaveBeenCalledWith(
+        expect.objectContaining({
+          interaction_type: 'section_item_tapped',
+          tab_name: 'Macro',
+          section_name: 'perps_stocks_commodities',
+          asset_type: 'perp',
+          item_clicked: 'AAPL',
+        }),
+      );
+    });
+
+    it('includes the correct position index in analytics', () => {
+      const mockTrack = trackExploreInteracted as jest.Mock;
+      const { getByTestId } = renderBlock();
+
+      fireEvent.press(getByTestId('perps-row-GOOGL'));
+
+      expect(mockTrack).toHaveBeenCalledWith(
+        expect.objectContaining({
+          position: 1,
+          item_clicked: 'GOOGL',
+        }),
+      );
+    });
+  });
+});
diff --git a/app/components/Views/TrendingView/feeds/perps/PerpsToggleBlock.tsx b/app/components/Views/TrendingView/feeds/perps/PerpsToggleBlock.tsx
new file mode 100644
index 00000000000..bed6dd344a3
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/perps/PerpsToggleBlock.tsx
@@ -0,0 +1,100 @@
+import React, { useCallback, useRef } from 'react';
+import { Box } from '@metamask/design-system-react-native';
+import type { ListRenderItem } from '@shopify/flash-list';
+import type { PerpsMarketData, SortOptionId } from '@metamask/perps-controller';
+import PerpsRowItem from './PerpsRowItem';
+import PerpsRowSkeleton from '../../../../UI/Perps/components/PerpsRowSkeleton';
+import PillToggleCardList, {
+  type PillToggleCardListTab,
+} from '../../components/PillToggleCardList';
+import SectionHeader from '../../components/SectionHeader';
+import {
+  type ExploreTabName,
+  type ExploreSectionName,
+  trackExploreInteracted,
+} from '../../search/analytics';
+
+const PerpsRowSingleSkeleton: React.FC = () => <PerpsRowSkeleton count={1} />;
+
+export interface PerpsToggleBlockProps {
+  title: string;
+  tabs: PillToggleCardListTab<PerpsMarketData>[];
+  isLoading: boolean;
+  defaultPillKey: string;
+  onViewAll: (filter: string, sortOptionId: SortOptionId) => void;
+  sortOptionId: SortOptionId;
+  /** Analytics context */
+  tabName: ExploreTabName;
+  sectionName: ExploreSectionName;
+  /** Test IDs */
+  headerTestID: string;
+  idPrefix: string;
+  testIdPrefix: string;
+  listTestId: string;
+}
+
+/**
+ * Shared perps section that renders a pill-toggled list of perp rows with
+ * a "See all" header. Used by MacroTab and RwasTab.
+ */
+const PerpsToggleBlock: React.FC<PerpsToggleBlockProps> = ({
+  title,
+  tabs,
+  isLoading,
+  defaultPillKey,
+  onViewAll,
+  sortOptionId,
+  tabName,
+  sectionName,
+  headerTestID,
+  idPrefix,
+  testIdPrefix,
+  listTestId,
+}) => {
+  const activePillKey = useRef<string>(defaultPillKey);
+
+  const renderItem: ListRenderItem<PerpsMarketData> = useCallback(
+    ({ item, index }) => (
+      <PerpsRowItem
+        market={item}
+        onCardPress={() =>
+          trackExploreInteracted({
+            interaction_type: 'section_item_tapped',
+            tab_name: tabName,
+            section_name: sectionName,
+            asset_type: 'perp',
+            position: index,
+            item_clicked: item.symbol,
+          })
+        }
+      />
+    ),
+    [tabName, sectionName],
+  );
+
+  return (
+    <Box>
+      <SectionHeader
+        title={title}
+        onViewAll={() => onViewAll(activePillKey.current, sortOptionId)}
+        testID={headerTestID}
+        tabName={tabName}
+        sectionName={sectionName}
+      />
+      <PillToggleCardList<PerpsMarketData>
+        tabs={tabs}
+        isLoading={isLoading}
+        renderItem={renderItem}
+        Skeleton={PerpsRowSingleSkeleton}
+        idPrefix={idPrefix}
+        onPillChange={(key) => {
+          activePillKey.current = key;
+        }}
+        testIdPrefix={testIdPrefix}
+        listTestId={listTestId}
+      />
+    </Box>
+  );
+};
+
+export default PerpsToggleBlock;
diff --git a/app/components/Views/TrendingView/feeds/perps/perpsNavigation.test.ts b/app/components/Views/TrendingView/feeds/perps/perpsNavigation.test.ts
new file mode 100644
index 00000000000..c1f0e39d246
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/perps/perpsNavigation.test.ts
@@ -0,0 +1,72 @@
+import { NavigationProp } from '@react-navigation/native';
+import { PERPS_EVENT_VALUE } from '@metamask/perps-controller';
+import type { PerpsNavigationParamList } from '../../../../UI/Perps/types/navigation';
+import Routes from '../../../../../constants/navigation/Routes';
+import { navigateToPerpsMarketList } from './perpsNavigation';
+
+describe('navigateToPerpsMarketList', () => {
+  it('navigates to market list with default filter and explore source', () => {
+    const navigate = jest.fn();
+    const navigation = {
+      navigate,
+    } as unknown as NavigationProp<PerpsNavigationParamList>;
+
+    navigateToPerpsMarketList(navigation);
+
+    expect(navigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+      screen: Routes.PERPS.MARKET_LIST,
+      params: {
+        defaultMarketTypeFilter: 'all',
+        source: PERPS_EVENT_VALUE.SOURCE.EXPLORE,
+      },
+    });
+  });
+
+  it('passes a custom market type filter', () => {
+    const navigate = jest.fn();
+    const navigation = {
+      navigate,
+    } as unknown as NavigationProp<PerpsNavigationParamList>;
+
+    navigateToPerpsMarketList(navigation, 'commodity');
+
+    expect(navigate).toHaveBeenCalledWith(
+      Routes.PERPS.ROOT,
+      expect.objectContaining({
+        params: expect.objectContaining({
+          defaultMarketTypeFilter: 'commodity',
+        }),
+      }),
+    );
+  });
+
+  it('passes a custom sort option ID', () => {
+    const navigate = jest.fn();
+    const navigation = {
+      navigate,
+    } as unknown as NavigationProp<PerpsNavigationParamList>;
+
+    navigateToPerpsMarketList(navigation, 'all', 'priceChange');
+
+    expect(navigate).toHaveBeenCalledWith(
+      Routes.PERPS.ROOT,
+      expect.objectContaining({
+        params: expect.objectContaining({
+          defaultSortOptionId: 'priceChange',
+        }),
+      }),
+    );
+  });
+
+  it('does not include defaultSortOptionId when not provided', () => {
+    const navigate = jest.fn();
+    const navigation = {
+      navigate,
+    } as unknown as NavigationProp<PerpsNavigationParamList>;
+
+    navigateToPerpsMarketList(navigation, 'crypto');
+
+    const callParams = navigate.mock.calls[0][1].params;
+    expect(callParams).not.toHaveProperty('defaultSortOptionId');
+  });
+});
diff --git a/app/components/Views/TrendingView/feeds/perps/perpsNavigation.ts b/app/components/Views/TrendingView/feeds/perps/perpsNavigation.ts
new file mode 100644
index 00000000000..df7fd5d64a2
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/perps/perpsNavigation.ts
@@ -0,0 +1,23 @@
+import { NavigationProp } from '@react-navigation/native';
+import {
+  PERPS_EVENT_VALUE,
+  type SortOptionId,
+} from '@metamask/perps-controller';
+import type { PerpsNavigationParamList } from '../../../../UI/Perps/types/navigation';
+import Routes from '../../../../../constants/navigation/Routes';
+
+/** Navigate to the perps market list, optionally pre-filtering by market type and pre-sorting by a sort option. */
+export const navigateToPerpsMarketList = (
+  navigation: NavigationProp<PerpsNavigationParamList>,
+  filter: string = 'all',
+  sortOptionId?: SortOptionId,
+): void => {
+  navigation.navigate(Routes.PERPS.ROOT, {
+    screen: Routes.PERPS.MARKET_LIST,
+    params: {
+      defaultMarketTypeFilter: filter,
+      source: PERPS_EVENT_VALUE.SOURCE.EXPLORE,
+      ...(sortOptionId !== undefined && { defaultSortOptionId: sortOptionId }),
+    },
+  });
+};
diff --git a/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.test.ts b/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.test.ts
new file mode 100644
index 00000000000..0c76f327dd6
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.test.ts
@@ -0,0 +1,226 @@
+/**
+ * usePerpsFeed — unit tests
+ *
+ * Focuses on the sorting/ordering logic that lives inside the useMemo:
+ * 1. No-query path: items sorted by the variant's comparator.
+ * 2. Query path (non-macro): Fuse.js relevance order is preserved.
+ * 3. Query path (macro): sorted by volume even when a query is present.
+ * 4. defaultSortOptionId matches PERPS_VARIANT_SORT_OPTION for each variant.
+ */
+
+import { renderHook } from '@testing-library/react-hooks';
+import type { PerpsMarketData } from '@metamask/perps-controller';
+import { usePerpsFeed, PERPS_VARIANT_SORT_OPTION } from './usePerpsFeed';
+
+// ---------------------------------------------------------------------------
+// Core dependency mocks
+// ---------------------------------------------------------------------------
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(() => []),
+}));
+
+const mockMarkets: PerpsMarketData[] = [];
+const mockRefetch = jest.fn();
+
+jest.mock('../../../../UI/Perps/hooks', () => ({
+  usePerpsMarkets: jest.fn(() => ({
+    markets: mockMarkets,
+    isLoading: false,
+    refresh: mockRefetch,
+    isRefreshing: false,
+  })),
+}));
+
+jest.mock('../../../../UI/Perps/providers/PerpsConnectionProvider', () => ({
+  PerpsConnectionContext: { _currentValue: null },
+}));
+
+jest.mock('../../../../UI/Perps/selectors/perpsController', () => ({
+  selectPerpsWatchlistMarkets: jest.fn(),
+}));
+
+jest.mock(
+  '../../../Homepage/Sections/Perpetuals/hooks/useHomepageSparklines',
+  () => ({
+    useHomepageSparklines: jest.fn(() => ({ sparklines: {} })),
+  }),
+);
+
+jest.mock('../../hooks/useFeedRefresh', () => ({
+  useFeedRefresh: jest.fn(),
+}));
+
+// ---------------------------------------------------------------------------
+// fuseSearch mock — controllable so we can verify order is preserved
+// ---------------------------------------------------------------------------
+
+const mockFuseSearch = jest.fn();
+jest.mock('../search-utils', () => ({
+  fuseSearch: (...args: unknown[]) => mockFuseSearch(...args),
+  PERPS_FUSE_OPTIONS: {},
+}));
+
+jest.mock('@metamask/perps-controller', () => ({
+  filterMarketsByQuery: jest.fn((items: unknown[]) => items),
+}));
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+import { usePerpsMarkets } from '../../../../UI/Perps/hooks';
+
+const makeMarket = (
+  symbol: string,
+  change24hPercent: string,
+  volumeNumber: number,
+): PerpsMarketData =>
+  ({
+    symbol,
+    name: symbol,
+    change24hPercent,
+    volumeNumber,
+    marketType: 'equity',
+    isHip3: false,
+  }) as unknown as PerpsMarketData;
+
+const renderFeed = (options: Parameters<typeof usePerpsFeed>[0] = {}) =>
+  renderHook(() => usePerpsFeed(options));
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe('usePerpsFeed', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // Default: fuseSearch returns items as-is
+    mockFuseSearch.mockImplementation((items: unknown[]) => items);
+  });
+
+  describe('no-query path', () => {
+    it('sorts all/crypto/rwa variants by 24h price change descending', () => {
+      const markets = [
+        makeMarket('LOW', '1', 100),
+        makeMarket('HIGH', '5', 50),
+        makeMarket('MID', '3', 75),
+      ];
+      (usePerpsMarkets as jest.Mock).mockReturnValue({
+        markets,
+        isLoading: false,
+        refresh: mockRefetch,
+        isRefreshing: false,
+      });
+
+      for (const variant of ['all', 'crypto', 'rwa'] as const) {
+        const { result } = renderFeed({ variant });
+        const symbols = result.current.data.map((d) => d.market.symbol);
+        expect(symbols).toEqual(['HIGH', 'MID', 'LOW']);
+      }
+    });
+
+    it('sorts macro variant by volume descending', () => {
+      const markets = [
+        makeMarket('LOW_VOL', '5', 10),
+        makeMarket('HIGH_VOL', '1', 200),
+        makeMarket('MID_VOL', '3', 100),
+      ].map((m) => ({ ...m, marketType: 'equity' as const }));
+
+      (usePerpsMarkets as jest.Mock).mockReturnValue({
+        markets,
+        isLoading: false,
+        refresh: mockRefetch,
+        isRefreshing: false,
+      });
+
+      const { result } = renderFeed({ variant: 'macro' });
+      const symbols = result.current.data.map((d) => d.market.symbol);
+      expect(symbols).toEqual(['HIGH_VOL', 'MID_VOL', 'LOW_VOL']);
+    });
+  });
+
+  describe('query path', () => {
+    it('preserves Fuse.js relevance order for non-macro variants', () => {
+      const markets = [
+        makeMarket('BTC', '1', 100),
+        makeMarket('ETH', '5', 50),
+        makeMarket('SOL', '3', 75),
+      ];
+      (usePerpsMarkets as jest.Mock).mockReturnValue({
+        markets,
+        isLoading: false,
+        refresh: mockRefetch,
+        isRefreshing: false,
+      });
+
+      // Fuse returns a specific relevance order (SOL first, then ETH, then BTC)
+      const fuseRelevanceOrder = [
+        makeMarket('SOL', '3', 75),
+        makeMarket('ETH', '5', 50),
+        makeMarket('BTC', '1', 100),
+      ];
+      mockFuseSearch.mockReturnValue(fuseRelevanceOrder);
+
+      for (const variant of ['all', 'crypto', 'rwa'] as const) {
+        const { result } = renderFeed({ variant, query: 'S' });
+        const symbols = result.current.data.map((d) => d.market.symbol);
+        // Must match fuse order, NOT sorted by price change (which would be ETH→SOL→BTC)
+        expect(symbols).toEqual(['SOL', 'ETH', 'BTC']);
+      }
+    });
+
+    it('sorts macro fuse results by volume, overriding relevance order', () => {
+      const markets = [
+        makeMarket('AAPL', '1', 10),
+        makeMarket('MSFT', '5', 200),
+        makeMarket('NVDA', '3', 100),
+      ].map((m) => ({ ...m, marketType: 'equity' as const }));
+
+      (usePerpsMarkets as jest.Mock).mockReturnValue({
+        markets,
+        isLoading: false,
+        refresh: mockRefetch,
+        isRefreshing: false,
+      });
+
+      // Fuse returns relevance order: AAPL first
+      mockFuseSearch.mockReturnValue([
+        markets[0], // AAPL — low volume, but top relevance match
+        markets[1], // MSFT
+        markets[2], // NVDA
+      ]);
+
+      const { result } = renderFeed({ variant: 'macro', query: 'A' });
+      const symbols = result.current.data.map((d) => d.market.symbol);
+      // Must be sorted by volume desc, NOT fuse order
+      expect(symbols).toEqual(['MSFT', 'NVDA', 'AAPL']);
+    });
+  });
+
+  describe('defaultSortOptionId', () => {
+    it.each([
+      ['all', 'priceChange'],
+      ['crypto', 'priceChange'],
+      ['rwa', 'priceChange'],
+      ['macro', 'volume'],
+    ] as const)(
+      'returns "%s" for variant "%s"',
+      (variant, expectedSortOptionId) => {
+        (usePerpsMarkets as jest.Mock).mockReturnValue({
+          markets: [],
+          isLoading: false,
+          refresh: mockRefetch,
+          isRefreshing: false,
+        });
+
+        const { result } = renderFeed({ variant });
+        expect(result.current.defaultSortOptionId).toBe(expectedSortOptionId);
+        // Also verify it matches the canonical map
+        expect(result.current.defaultSortOptionId).toBe(
+          PERPS_VARIANT_SORT_OPTION[variant],
+        );
+      },
+    );
+  });
+});
diff --git a/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.ts b/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.ts
new file mode 100644
index 00000000000..d1422a5ff6d
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.ts
@@ -0,0 +1,174 @@
+import { useContext, useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import {
+  filterMarketsByQuery,
+  type PerpsMarketData,
+  type SortOptionId,
+} from '@metamask/perps-controller';
+import { usePerpsMarkets } from '../../../../UI/Perps/hooks';
+import type { PerpsMarketDataWithVolumeNumber } from '../../../../UI/Perps/hooks/usePerpsMarkets';
+import { PerpsConnectionContext } from '../../../../UI/Perps/providers/PerpsConnectionProvider';
+import { selectPerpsWatchlistMarkets } from '../../../../UI/Perps/selectors/perpsController';
+import { useHomepageSparklines } from '../../../Homepage/Sections/Perpetuals/hooks/useHomepageSparklines';
+import { useFeedRefresh } from '../../hooks/useFeedRefresh';
+import type { RefreshConfig } from '../../hooks/useExploreRefresh';
+import { TILE_CAROUSEL_DEFAULT_MAX_TILES } from '../../components/TileCarousel';
+import { fuseSearch, PERPS_FUSE_OPTIONS } from '../search-utils';
+
+const EMPTY_WATCHLIST_SYMBOLS: string[] = [];
+
+export type PerpsVariant = 'all' | 'crypto' | 'rwa' | 'macro';
+
+interface UsePerpsFeedOptions {
+  /** @default 'all' */
+  variant?: PerpsVariant;
+  query?: string;
+  refresh?: RefreshConfig;
+  /**
+   * When true, fetch sparklines + watchlist flags and attach them to each item
+   * (tile rendering needs this; row rendering does not).
+   */
+  withTileExtras?: boolean;
+}
+
+/** Per-item enrichment merged in when `withTileExtras` is true. */
+export interface PerpsFeedItem {
+  market: PerpsMarketData;
+  sparkline?: number[];
+  isWatchlisted: boolean;
+}
+
+export interface UsePerpsFeedResult {
+  data: PerpsFeedItem[];
+  isLoading: boolean;
+  refetch: () => Promise<void>;
+  /** The sort option ID that matches this feed's sort order — pass to `navigateToPerpsMarketList` so the market list opens consistently sorted. */
+  defaultSortOptionId: SortOptionId;
+}
+
+/**
+ * Maps each feed variant to the sort option ID it uses when displaying items.
+ * This is the single source of truth — both the feed's internal sort and the
+ * "View All" navigation use this mapping so they stay in sync.
+ */
+export const PERPS_VARIANT_SORT_OPTION: Record<PerpsVariant, SortOptionId> = {
+  all: 'priceChange',
+  crypto: 'priceChange',
+  rwa: 'priceChange',
+  macro: 'volume',
+};
+
+const sortByVolumeDesc = (a: PerpsMarketData, b: PerpsMarketData) => {
+  const av = (a as PerpsMarketDataWithVolumeNumber).volumeNumber ?? 0;
+  const bv = (b as PerpsMarketDataWithVolumeNumber).volumeNumber ?? 0;
+  return bv - av;
+};
+
+const sortByChange24hDesc = (a: PerpsMarketData, b: PerpsMarketData) =>
+  (parseFloat(b.change24hPercent) || 0) - (parseFloat(a.change24hPercent) || 0);
+
+/** Maps each SortOptionId to the comparator used inside the feed. */
+const SORT_FNS: Record<
+  SortOptionId,
+  (a: PerpsMarketData, b: PerpsMarketData) => number
+> = {
+  volume: sortByVolumeDesc,
+  priceChange: sortByChange24hDesc,
+  openInterest: sortByVolumeDesc,
+  fundingRate: sortByVolumeDesc,
+};
+
+const filterByVariant = (
+  markets: PerpsMarketData[],
+  variant: PerpsVariant,
+): PerpsMarketData[] => {
+  switch (variant) {
+    case 'crypto':
+      return markets.filter((m) => !m.isHip3);
+    case 'rwa':
+      return markets.filter(
+        (m) =>
+          m.marketType === 'equity' ||
+          m.marketType === 'commodity' ||
+          m.marketType === 'forex',
+      );
+    case 'macro':
+      return markets.filter(
+        (m) => m.marketType === 'equity' || m.marketType === 'commodity',
+      );
+    case 'all':
+    default:
+      return markets;
+  }
+};
+
+/**
+ * Perps markets feed. Returns enriched items (market + optional sparkline +
+ * watchlist flag) so consumers don't have to stitch data themselves.
+ *
+ * **Consumers must be wrapped in `<PerpsSectionProvider>`** — `usePerpsMarkets`
+ * reads from perps contexts.
+ */
+export const usePerpsFeed = ({
+  variant = 'all',
+  query,
+  refresh,
+  withTileExtras = false,
+}: UsePerpsFeedOptions = {}): UsePerpsFeedResult => {
+  const connectionContext = useContext(PerpsConnectionContext);
+  const {
+    markets,
+    isLoading,
+    refresh: refetch,
+    isRefreshing,
+  } = usePerpsMarkets();
+
+  useFeedRefresh(refresh, refetch);
+
+  const filtered = useMemo<PerpsMarketData[]>(() => {
+    if (connectionContext?.error) return [];
+    const subset = filterByVariant(markets, variant);
+    const sortFn = SORT_FNS[PERPS_VARIANT_SORT_OPTION[variant]];
+    if (!query) {
+      return [...subset].sort(sortFn);
+    }
+    const queryFiltered = filterMarketsByQuery(subset, query);
+    const fused = fuseSearch(queryFiltered, query, PERPS_FUSE_OPTIONS);
+    // Preserve Fuse.js relevance ordering for variants that sort by price change
+    // (the relevance signal is more useful than a metric sort during search).
+    // Macro sorts by volume even in search results, consistent with its feed order.
+    return variant === 'macro' ? [...fused].sort(sortFn) : fused;
+  }, [connectionContext?.error, markets, variant, query]);
+
+  // Only visible carousel tiles need candle sparklines; each symbol is a stream
+  // subscription (Hyperliquid). TileCarousel caps display at TILE_CAROUSEL_DEFAULT_MAX_TILES.
+  const symbols = useMemo(
+    () =>
+      withTileExtras
+        ? filtered
+            .slice(0, TILE_CAROUSEL_DEFAULT_MAX_TILES)
+            .map((m) => m.symbol)
+        : [],
+    [filtered, withTileExtras],
+  );
+  const { sparklines } = useHomepageSparklines(symbols);
+  const watchlistSymbols =
+    useSelector(selectPerpsWatchlistMarkets) ?? EMPTY_WATCHLIST_SYMBOLS;
+
+  const data = useMemo<PerpsFeedItem[]>(
+    () =>
+      filtered.map((market) => ({
+        market,
+        sparkline: withTileExtras ? sparklines[market.symbol] : undefined,
+        isWatchlisted: watchlistSymbols.includes(market.symbol),
+      })),
+    [filtered, sparklines, watchlistSymbols, withTileExtras],
+  );
+
+  return {
+    data,
+    isLoading: connectionContext?.error ? false : isLoading || isRefreshing,
+    refetch,
+    defaultSortOptionId: PERPS_VARIANT_SORT_OPTION[variant],
+  };
+};
diff --git a/app/components/Views/TrendingView/feeds/predictions/PredictionRowItem.tsx b/app/components/Views/TrendingView/feeds/predictions/PredictionRowItem.tsx
new file mode 100644
index 00000000000..47140b46a6a
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/predictions/PredictionRowItem.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { Box } from '@metamask/design-system-react-native';
+import PredictMarket from '../../../../UI/Predict/components/PredictMarket';
+import PredictMarketRowItem from '../../../../UI/Predict/components/PredictMarketRowItem';
+import type { PredictMarket as PredictMarketType } from '../../../../UI/Predict/types';
+
+interface PredictionCarouselRowItemProps {
+  market: PredictMarketType;
+  testIdPrefix?: string;
+  /** Called synchronously before the card's navigation press fires. */
+  onCardPress?: () => void;
+  /** Called when the user taps a buy button (before betslip opens). */
+  onBuyButtonPress?: (marketId: string) => void;
+}
+
+/** Carousel-style market card used inside Explore home tabs. */
+export const PredictionCarouselRowItem: React.FC<
+  PredictionCarouselRowItemProps
+> = ({ market, testIdPrefix, onCardPress, onBuyButtonPress }) => (
+  <Box twClassName="py-2">
+    <PredictMarket
+      market={market}
+      isCarousel
+      testID={testIdPrefix ? `${testIdPrefix}-${market.id}` : undefined}
+      onCardPress={onCardPress}
+      onBuyButtonPress={onBuyButtonPress}
+    />
+  </Box>
+);
+
+interface PredictionSearchRowItemProps {
+  market: PredictMarketType;
+}
+
+/** Compact list row used inside the omni-search results. */
+export const PredictionSearchRowItem: React.FC<
+  PredictionSearchRowItemProps
+> = ({ market }) => <PredictMarketRowItem market={market} />;
diff --git a/app/components/Views/TrendingView/feeds/predictions/PredictionsSkeleton.tsx b/app/components/Views/TrendingView/feeds/predictions/PredictionsSkeleton.tsx
new file mode 100644
index 00000000000..b82dd4ca478
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/predictions/PredictionsSkeleton.tsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import PredictMarketSkeleton from '../../../../UI/Predict/components/PredictMarketSkeleton';
+
+const PredictionsSkeleton: React.FC = () => (
+  <PredictMarketSkeleton isCarousel />
+);
+
+export default PredictionsSkeleton;
diff --git a/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.test.ts b/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.test.ts
new file mode 100644
index 00000000000..5aac5ab690f
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.test.ts
@@ -0,0 +1,41 @@
+import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
+import Routes from '../../../../../constants/navigation/Routes';
+import { navigateToPredictionsList } from './predictionsNavigation';
+
+describe('navigateToPredictionsList', () => {
+  it('navigates without tab params for trending variant', () => {
+    const navigate = jest.fn();
+    const navigation = { navigate } as unknown as AppNavigationProp;
+
+    navigateToPredictionsList(navigation, 'trending');
+
+    expect(navigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
+      screen: Routes.PREDICT.MARKET_LIST,
+      params: undefined,
+    });
+  });
+
+  it('includes tab param for sports variant', () => {
+    const navigate = jest.fn();
+    const navigation = { navigate } as unknown as AppNavigationProp;
+
+    navigateToPredictionsList(navigation, 'sports');
+
+    expect(navigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
+      screen: Routes.PREDICT.MARKET_LIST,
+      params: { tab: 'sports' },
+    });
+  });
+
+  it('includes tab param for crypto variant', () => {
+    const navigate = jest.fn();
+    const navigation = { navigate } as unknown as AppNavigationProp;
+
+    navigateToPredictionsList(navigation, 'crypto');
+
+    expect(navigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
+      screen: Routes.PREDICT.MARKET_LIST,
+      params: { tab: 'crypto' },
+    });
+  });
+});
diff --git a/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.ts b/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.ts
new file mode 100644
index 00000000000..897ee5a89ca
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.ts
@@ -0,0 +1,22 @@
+import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
+import Routes from '../../../../../constants/navigation/Routes';
+import type { PredictionsVariant } from './usePredictionsFeed';
+
+const VARIANT_TO_TAB: Record<PredictionsVariant, string | undefined> = {
+  trending: undefined,
+  sports: 'sports',
+  crypto: 'crypto',
+  politics: 'politics',
+};
+
+/** Navigate to the Predict market list, optionally pre-selecting a tab. */
+export const navigateToPredictionsList = (
+  navigation: AppNavigationProp,
+  variant: PredictionsVariant,
+): void => {
+  const tab = VARIANT_TO_TAB[variant];
+  navigation.navigate(Routes.PREDICT.ROOT, {
+    screen: Routes.PREDICT.MARKET_LIST,
+    params: tab ? { tab } : undefined,
+  });
+};
diff --git a/app/components/Views/TrendingView/feeds/predictions/usePredictionsFeed.ts b/app/components/Views/TrendingView/feeds/predictions/usePredictionsFeed.ts
new file mode 100644
index 00000000000..b2a11c99805
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/predictions/usePredictionsFeed.ts
@@ -0,0 +1,43 @@
+import { useMemo } from 'react';
+import type { PredictMarket as PredictMarketType } from '../../../../UI/Predict/types';
+import { usePredictMarketData } from '../../../../UI/Predict/hooks/usePredictMarketData';
+import { useFeedRefresh } from '../../hooks/useFeedRefresh';
+import type { RefreshConfig } from '../../hooks/useExploreRefresh';
+import { fuseSearch, PREDICTIONS_FUSE_OPTIONS } from '../search-utils';
+
+export type PredictionsVariant = 'trending' | 'sports' | 'crypto' | 'politics';
+
+interface UsePredictionsFeedOptions {
+  /** @default 'trending' */
+  variant?: PredictionsVariant;
+  query?: string;
+  refresh?: RefreshConfig;
+}
+
+export interface UsePredictionsFeedResult {
+  data: PredictMarketType[];
+  isLoading: boolean;
+  refetch: () => Promise<void>;
+}
+
+/** Predict markets feed; one shape covers home tabs and search via the variant + query knobs. */
+export const usePredictionsFeed = ({
+  variant = 'trending',
+  query,
+  refresh,
+}: UsePredictionsFeedOptions = {}): UsePredictionsFeedResult => {
+  const { marketData, isFetching, refetch } = usePredictMarketData({
+    category: variant,
+    pageSize: query ? 20 : 6,
+    q: query || undefined,
+  });
+
+  useFeedRefresh(refresh, refetch);
+
+  const filteredData = useMemo(
+    () => fuseSearch(marketData, query, PREDICTIONS_FUSE_OPTIONS),
+    [marketData, query],
+  );
+
+  return { data: filteredData, isLoading: isFetching, refetch };
+};
diff --git a/app/components/Views/TrendingView/feeds/predictions/useSportsMarketsFeed.test.ts b/app/components/Views/TrendingView/feeds/predictions/useSportsMarketsFeed.test.ts
new file mode 100644
index 00000000000..6910a5821cb
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/predictions/useSportsMarketsFeed.test.ts
@@ -0,0 +1,79 @@
+import { act, renderHook } from '@testing-library/react-native';
+import {
+  usePredictMarketData,
+  type UsePredictMarketDataOptions,
+  type UsePredictMarketDataResult,
+} from '../../../../UI/Predict/hooks/usePredictMarketData';
+import { useSportsMarketsFeed } from './useSportsMarketsFeed';
+
+jest.mock('../../../../UI/Predict/hooks/usePredictMarketData');
+
+const mockUsePredictMarketData = jest.mocked(usePredictMarketData);
+
+const createResult = (refetch: jest.Mock): UsePredictMarketDataResult => ({
+  marketData: [],
+  isFetching: false,
+  isFetchingMore: false,
+  error: null,
+  hasMore: false,
+  refetch: refetch as unknown as () => Promise<void>,
+  fetchMore: jest.fn().mockResolvedValue(undefined),
+});
+
+describe('useSportsMarketsFeed', () => {
+  const refetchBySport: Record<string, jest.Mock> = {};
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    Object.keys(refetchBySport).forEach((k) => delete refetchBySport[k]);
+
+    mockUsePredictMarketData.mockImplementation(
+      (opts?: UsePredictMarketDataOptions) => {
+        const customQueryParams = opts?.customQueryParams;
+        const key =
+          customQueryParams === 'tag_id=100350'
+            ? 'soccer'
+            : customQueryParams === 'tag_id=28'
+              ? 'basketball'
+              : 'tennis';
+        if (!refetchBySport[key]) {
+          refetchBySport[key] = jest.fn().mockResolvedValue(undefined);
+        }
+        return createResult(refetchBySport[key]);
+      },
+    );
+  });
+
+  it('exposes three sport pills and defaults to soccer', () => {
+    const { result } = renderHook(() => useSportsMarketsFeed());
+
+    expect(result.current.pills).toHaveLength(3);
+    expect(result.current.pills.map((p) => p.key)).toEqual([
+      'soccer',
+      'basketball',
+      'tennis',
+    ]);
+    expect(result.current.activeKey).toBe('soccer');
+  });
+
+  it('select loads an additional sport and refetch calls all loaded feeds', async () => {
+    const { result } = renderHook(() => useSportsMarketsFeed());
+
+    await act(async () => {
+      await result.current.refetch();
+    });
+    expect(refetchBySport.soccer).toHaveBeenCalledTimes(1);
+    expect(refetchBySport.basketball).not.toHaveBeenCalled();
+
+    act(() => {
+      result.current.select('basketball');
+    });
+    expect(result.current.activeKey).toBe('basketball');
+
+    await act(async () => {
+      await result.current.refetch();
+    });
+    expect(refetchBySport.soccer).toHaveBeenCalledTimes(2);
+    expect(refetchBySport.basketball).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/app/components/Views/TrendingView/feeds/predictions/useSportsMarketsFeed.ts b/app/components/Views/TrendingView/feeds/predictions/useSportsMarketsFeed.ts
new file mode 100644
index 00000000000..aae91d83276
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/predictions/useSportsMarketsFeed.ts
@@ -0,0 +1,110 @@
+import { useCallback, useMemo, useState } from 'react';
+import {
+  usePredictMarketData,
+  type UsePredictMarketDataResult,
+} from '../../../../UI/Predict/hooks/usePredictMarketData';
+import { strings } from '../../../../../../locales/i18n';
+import { useFeedRefresh } from '../../hooks/useFeedRefresh';
+import type { RefreshConfig } from '../../hooks/useExploreRefresh';
+import type { PillOption } from '../../components/PillRow';
+
+const PAGE_SIZE = 20;
+
+// Tag IDs from gamma-api.polymarket.com/tags. To add a sport:
+// add a row here AND a usePredictMarketData call below (Rules of Hooks).
+const SOCCER = {
+  key: 'soccer',
+  labelKey: 'trending.football',
+  customQueryParams: 'tag_id=100350',
+} as const;
+const BASKETBALL = {
+  key: 'basketball',
+  labelKey: 'trending.basketball',
+  customQueryParams: 'tag_id=28',
+} as const;
+const TENNIS = {
+  key: 'tennis',
+  labelKey: 'trending.tennis',
+  customQueryParams: 'tag_id=864',
+} as const;
+
+const TABS = [SOCCER, BASKETBALL, TENNIS] as const;
+
+export interface UseSportsMarketsFeedResult {
+  pills: PillOption[];
+  activeKey: string;
+  select: (key: string) => void;
+  active: UsePredictMarketDataResult;
+  isLoading: boolean;
+  refetch: () => Promise<void>;
+}
+
+interface UseSportsMarketsFeedOptions {
+  refresh?: RefreshConfig;
+}
+
+/**
+ * Per-sport markets feed for the "All Sports" section. Owns pill state and
+ * lazily enables fetches for sports the user has visited.
+ */
+export const useSportsMarketsFeed = ({
+  refresh,
+}: UseSportsMarketsFeedOptions = {}): UseSportsMarketsFeedResult => {
+  const [activeKey, setActiveKey] = useState<string>(SOCCER.key);
+  const [loadedKeys, setLoadedKeys] = useState<Set<string>>(
+    () => new Set([SOCCER.key]),
+  );
+
+  const soccer = usePredictMarketData({
+    category: 'sports',
+    customQueryParams: SOCCER.customQueryParams,
+    pageSize: PAGE_SIZE,
+    enabled: loadedKeys.has(SOCCER.key),
+  });
+  const basketball = usePredictMarketData({
+    category: 'sports',
+    customQueryParams: BASKETBALL.customQueryParams,
+    pageSize: PAGE_SIZE,
+    enabled: loadedKeys.has(BASKETBALL.key),
+  });
+  const tennis = usePredictMarketData({
+    category: 'sports',
+    customQueryParams: TENNIS.customQueryParams,
+    pageSize: PAGE_SIZE,
+    enabled: loadedKeys.has(TENNIS.key),
+  });
+
+  const marketsByKey: Record<string, UsePredictMarketDataResult> = useMemo(
+    () => ({ soccer, basketball, tennis }),
+    [soccer, basketball, tennis],
+  );
+
+  const pills = useMemo<PillOption[]>(
+    () => TABS.map((tab) => ({ key: tab.key, name: strings(tab.labelKey) })),
+    [],
+  );
+
+  const select = useCallback((key: string) => {
+    setActiveKey(key);
+    setLoadedKeys((prev) => new Set(prev).add(key));
+  }, []);
+
+  const { refetch: refetchSoccer } = soccer;
+  const { refetch: refetchBasketball } = basketball;
+  const { refetch: refetchTennis } = tennis;
+
+  const refetch = useCallback(async () => {
+    const tasks: Promise<void>[] = [];
+    if (loadedKeys.has(SOCCER.key)) tasks.push(refetchSoccer());
+    if (loadedKeys.has(BASKETBALL.key)) tasks.push(refetchBasketball());
+    if (loadedKeys.has(TENNIS.key)) tasks.push(refetchTennis());
+    await Promise.all(tasks);
+  }, [loadedKeys, refetchSoccer, refetchBasketball, refetchTennis]);
+
+  useFeedRefresh(refresh, refetch);
+
+  const active = marketsByKey[activeKey];
+  const isLoading = active.isFetching && active.marketData.length === 0;
+
+  return { pills, activeKey, select, active, isLoading, refetch };
+};
diff --git a/app/components/Views/TrendingView/feeds/search-utils.ts b/app/components/Views/TrendingView/feeds/search-utils.ts
new file mode 100644
index 00000000000..dfc79f363fd
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/search-utils.ts
@@ -0,0 +1,74 @@
+import Fuse, { type FuseOptions } from 'fuse.js';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import type { PerpsMarketData } from '@metamask/perps-controller';
+import type { PredictMarket as PredictMarketType } from '../../../UI/Predict/types';
+import {
+  TimeOption,
+  PriceChangeOption,
+} from '../../../UI/Trending/components/TrendingTokensBottomSheet';
+import type { TrendingFilterContext } from '../../../UI/Trending/components/TrendingTokensList/TrendingTokensList';
+
+const BASE_FUSE_OPTIONS = {
+  shouldSort: true,
+  threshold: 0.2,
+  location: 0,
+  distance: 100,
+  maxPatternLength: 32,
+  minMatchCharLength: 1,
+} as const;
+
+export const TOKEN_FUSE_OPTIONS: FuseOptions<TrendingAsset> = {
+  ...BASE_FUSE_OPTIONS,
+  keys: ['symbol', 'name', 'assetId'],
+};
+
+export const PERPS_FUSE_OPTIONS: FuseOptions<PerpsMarketData> = {
+  ...BASE_FUSE_OPTIONS,
+  keys: ['symbol', 'name'],
+};
+
+export const PREDICTIONS_FUSE_OPTIONS: FuseOptions<PredictMarketType> = {
+  ...BASE_FUSE_OPTIONS,
+  keys: ['title', 'description'],
+};
+
+export const fuseSearch = <T>(
+  data: T[],
+  searchQuery: string | undefined,
+  fuseOptions: FuseOptions<T>,
+  searchSortingFn?: (a: T, b: T) => number,
+): T[] => {
+  const trimmed = searchQuery?.trim();
+  if (!trimmed) return data;
+  const fuse = new Fuse(data, fuseOptions);
+  const results = fuse.search(trimmed);
+  return searchSortingFn ? results.sort(searchSortingFn) : results;
+};
+
+export const DEFAULT_TOKENS_FILTER_CONTEXT: TrendingFilterContext = {
+  timeFilter: TimeOption.TwentyFourHours,
+  sortOption: PriceChangeOption.PriceChange,
+  networkFilter: 'all',
+  isSearchResult: false,
+};
+
+export const SEARCH_TOKENS_FILTER_CONTEXT: TrendingFilterContext = {
+  timeFilter: TimeOption.TwentyFourHours,
+  sortOption: PriceChangeOption.PriceChange,
+  networkFilter: 'all',
+  isSearchResult: true,
+};
+
+export const CRYPTO_MOVERS_SEARCH_FILTER_CONTEXT: TrendingFilterContext = {
+  timeFilter: TimeOption.TwentyFourHours,
+  sortOption: PriceChangeOption.Volume,
+  networkFilter: 'all',
+  isSearchResult: true,
+};
+
+export const CRYPTO_MOVERS_HOME_FILTER_CONTEXT: TrendingFilterContext = {
+  timeFilter: TimeOption.TwentyFourHours,
+  sortOption: PriceChangeOption.Volume,
+  networkFilter: 'all',
+  isSearchResult: false,
+};
diff --git a/app/components/Views/TrendingView/feeds/sites/SiteRowItem.tsx b/app/components/Views/TrendingView/feeds/sites/SiteRowItem.tsx
new file mode 100644
index 00000000000..0c53d1687d3
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/sites/SiteRowItem.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import { useNavigation } from '@react-navigation/native';
+import { useDispatch } from 'react-redux';
+import SiteRowItemBase, {
+  bookmarkUrlForRemoval,
+  type SiteData,
+} from '../../../../UI/Sites/components/SiteRowItem/SiteRowItem';
+import Routes from '../../../../../constants/navigation/Routes';
+import { removeBookmark } from '../../../../../actions/bookmarks';
+import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
+
+const openSiteInBrowser = (navigation: AppNavigationProp, site: SiteData) => {
+  navigation.navigate(Routes.BROWSER.HOME, {
+    screen: Routes.BROWSER.VIEW,
+    params: {
+      newTabUrl: site.url,
+      timestamp: Date.now(),
+      fromTrending: true,
+    },
+  });
+};
+
+interface SiteRowItemProps {
+  site: SiteData;
+  /** Called synchronously before the card's navigation press fires. */
+  onCardPress?: () => void;
+}
+
+/** Generic site row (sites + dapps_favorites without remove action). */
+export const SiteRowItem: React.FC<SiteRowItemProps> = ({
+  site,
+  onCardPress,
+}) => {
+  const navigation = useNavigation<AppNavigationProp>();
+  return (
+    <SiteRowItemBase
+      site={site}
+      onPress={() => {
+        onCardPress?.();
+        openSiteInBrowser(navigation, site);
+      }}
+    />
+  );
+};
+
+/** Favorite-site row with the "remove from favorites" affordance. */
+export const FavoriteSiteRowItem: React.FC<SiteRowItemProps> = ({
+  site,
+  onCardPress,
+}) => {
+  const navigation = useNavigation<AppNavigationProp>();
+  const dispatch = useDispatch();
+  return (
+    <SiteRowItemBase
+      site={site}
+      onPress={() => {
+        onCardPress?.();
+        openSiteInBrowser(navigation, site);
+      }}
+      onRemoveFavorite={() =>
+        dispatch(
+          removeBookmark({
+            url: bookmarkUrlForRemoval(site),
+            name: site.name,
+          }),
+        )
+      }
+    />
+  );
+};
diff --git a/app/components/Views/TrendingView/feeds/sites/useSitesFeed.ts b/app/components/Views/TrendingView/feeds/sites/useSitesFeed.ts
new file mode 100644
index 00000000000..e4e6c3c68c5
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/sites/useSitesFeed.ts
@@ -0,0 +1,25 @@
+import { useSitesData } from '../../../../UI/Sites/hooks/useSiteData/useSitesData';
+import { useFeedRefresh } from '../../hooks/useFeedRefresh';
+import type { RefreshConfig } from '../../hooks/useExploreRefresh';
+import type { SiteData } from '../../../../UI/Sites/components/SiteRowItem/SiteRowItem';
+
+interface UseSitesFeedOptions {
+  query?: string;
+  refresh?: RefreshConfig;
+}
+
+export interface UseSitesFeedResult {
+  data: SiteData[];
+  isLoading: boolean;
+  refetch: () => void;
+}
+
+/** Curated sites feed (Explore "Sites" section + search). */
+export const useSitesFeed = ({
+  query,
+  refresh,
+}: UseSitesFeedOptions = {}): UseSitesFeedResult => {
+  const { sites, isLoading, refetch } = useSitesData(query);
+  useFeedRefresh(refresh, refetch);
+  return { data: sites, isLoading, refetch };
+};
diff --git a/app/components/Views/TrendingView/feeds/stocks/useStocksFeed.test.ts b/app/components/Views/TrendingView/feeds/stocks/useStocksFeed.test.ts
new file mode 100644
index 00000000000..9c4bc9c15c2
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/stocks/useStocksFeed.test.ts
@@ -0,0 +1,100 @@
+import { renderHook } from '@testing-library/react-native';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import { useRwaTokens } from '../../../../UI/Trending/hooks/useRwaTokens/useRwaTokens';
+import { useStocksFeed } from './useStocksFeed';
+
+jest.mock('../../../../UI/Trending/hooks/useRwaTokens/useRwaTokens', () => ({
+  useRwaTokens: jest.fn(),
+}));
+
+const mockUseRwaTokens = jest.mocked(useRwaTokens);
+const mockRefetch = jest.fn();
+
+const makeAsset = (assetId: string, symbol: string): TrendingAsset =>
+  ({
+    assetId,
+    symbol,
+    name: symbol,
+  }) as unknown as TrendingAsset;
+
+const ETH_OUSG = makeAsset('eip155:1/erc20:0xaaa', 'OUSG');
+const ETH_BUIDL = makeAsset('eip155:1/erc20:0xbbb', 'BUIDL');
+const BNB_OUSG = makeAsset('eip155:56/erc20:0xccc', 'bOUSG');
+
+const ALL_RWA_ASSETS = [ETH_OUSG, ETH_BUIDL, BNB_OUSG];
+
+const arrangeRwaTokens = (assets = ALL_RWA_ASSETS) => {
+  mockUseRwaTokens.mockReturnValue({
+    data: assets,
+    isLoading: false,
+    refetch: mockRefetch,
+  });
+};
+
+describe('useStocksFeed', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    arrangeRwaTokens();
+  });
+
+  describe('no-query path (tab sections)', () => {
+    it('filters to Ethereum-only assets', () => {
+      const { result } = renderHook(() => useStocksFeed());
+      const symbols = result.current.data.map((d) => d.symbol);
+      expect(symbols).toEqual(['OUSG', 'BUIDL']);
+      expect(symbols).not.toContain('bOUSG');
+    });
+
+    it('passes undefined searchQuery to useRwaTokens', () => {
+      renderHook(() => useStocksFeed());
+      expect(mockUseRwaTokens).toHaveBeenCalledWith(
+        expect.objectContaining({ searchQuery: undefined }),
+      );
+    });
+  });
+
+  describe('query path (omni-search)', () => {
+    it('includes tokens from all RWA chains, not just Ethereum', () => {
+      const { result } = renderHook(() => useStocksFeed({ query: 'OUSG' }));
+      const symbols = result.current.data.map((d) => d.symbol);
+      expect(symbols).toContain('OUSG');
+      expect(symbols).toContain('bOUSG');
+    });
+
+    it('does not filter out BNB tokens when a query is present', () => {
+      const { result } = renderHook(() => useStocksFeed({ query: 'token' }));
+      expect(result.current.data).toHaveLength(ALL_RWA_ASSETS.length);
+    });
+
+    it('passes the query through to useRwaTokens as searchQuery', () => {
+      renderHook(() => useStocksFeed({ query: 'OUSG' }));
+      expect(mockUseRwaTokens).toHaveBeenCalledWith(
+        expect.objectContaining({ searchQuery: 'OUSG' }),
+      );
+    });
+
+    it('treats a whitespace-only query the same as no query (Ethereum-only)', () => {
+      const { result } = renderHook(() => useStocksFeed({ query: '   ' }));
+      const symbols = result.current.data.map((d) => d.symbol);
+      expect(symbols).toEqual(['OUSG', 'BUIDL']);
+      expect(symbols).not.toContain('bOUSG');
+    });
+  });
+
+  describe('loading and refetch passthrough', () => {
+    it('forwards isLoading from useRwaTokens', () => {
+      mockUseRwaTokens.mockReturnValue({
+        data: [],
+        isLoading: true,
+        refetch: mockRefetch,
+      });
+      const { result } = renderHook(() => useStocksFeed());
+      expect(result.current.isLoading).toBe(true);
+    });
+
+    it('forwards refetch from useRwaTokens', () => {
+      const { result } = renderHook(() => useStocksFeed());
+      expect(result.current.refetch).toBe(mockRefetch);
+    });
+  });
+});
diff --git a/app/components/Views/TrendingView/feeds/stocks/useStocksFeed.ts b/app/components/Views/TrendingView/feeds/stocks/useStocksFeed.ts
new file mode 100644
index 00000000000..73a6b7fc408
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/stocks/useStocksFeed.ts
@@ -0,0 +1,53 @@
+import { useMemo } from 'react';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import { useRwaTokens } from '../../../../UI/Trending/hooks/useRwaTokens/useRwaTokens';
+import { useFeedRefresh } from '../../hooks/useFeedRefresh';
+import type { RefreshConfig } from '../../hooks/useExploreRefresh';
+
+const ETHEREUM_CAIP_CHAIN_ID = 'eip155:1/';
+
+interface UseStocksFeedOptions {
+  query?: string;
+  refresh?: RefreshConfig;
+}
+
+export interface UseStocksFeedResult {
+  data: TrendingAsset[];
+  isLoading: boolean;
+  refetch: () => Promise<void>;
+}
+
+/**
+ * Tokenized stocks (RWAs) feed.
+ *
+ * Tab sections (no query): only Ethereum mainnet tokens are shown, matching
+ * the design intent of the RWAs/Now tab.
+ *
+ * Search (query present): all chains in RWA_CHAIN_IDS are included so users
+ * can find stocks across Ethereum and BNB.
+ *
+ * Chain filtering is done client-side (not in the request) to share the same
+ * server-side cache across all surfaces.
+ */
+export const useStocksFeed = ({
+  query,
+  refresh,
+}: UseStocksFeedOptions = {}): UseStocksFeedResult => {
+  const { data, isLoading, refetch } = useRwaTokens({
+    searchQuery: query,
+  });
+
+  const filteredData = useMemo(() => {
+    // During search, surface tokens from all supported RWA chains so the user
+    // can find any matching stock regardless of chain.
+    if (query?.trim()) return data;
+    // Tab sections only show Ethereum mainnet tokens.
+    return data.filter((asset) =>
+      asset.assetId.startsWith(ETHEREUM_CAIP_CHAIN_ID),
+    );
+  }, [data, query]);
+
+  useFeedRefresh(refresh, refetch);
+
+  return { data: filteredData, isLoading, refetch };
+};
diff --git a/app/components/Views/TrendingView/feeds/tokens/CryptoMoversPillItem.test.tsx b/app/components/Views/TrendingView/feeds/tokens/CryptoMoversPillItem.test.tsx
new file mode 100644
index 00000000000..25931d393cf
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/tokens/CryptoMoversPillItem.test.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react-native';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import CryptoMoversPillItem from './CryptoMoversPillItem';
+
+const mockOnPress = jest.fn();
+
+jest.mock(
+  '../../../../UI/Trending/hooks/useTrendingTokenPress/useTrendingTokenPress',
+  () => ({
+    useTrendingTokenPress: () => ({ onPress: mockOnPress }),
+  }),
+);
+
+describe('CryptoMoversPillItem', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  const baseToken = {
+    assetId: 'eip155:1/slip44:60',
+    symbol: 'ETH',
+    priceChangePct: {},
+  } as unknown as TrendingAsset;
+
+  it('invokes token press when the pill is pressed', () => {
+    const { getByTestId } = render(
+      <CryptoMoversPillItem token={baseToken} index={0} />,
+    );
+
+    fireEvent.press(getByTestId(`section-pill-${baseToken.assetId}`));
+    expect(mockOnPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('omits change label when 24h change is missing or not a number', () => {
+    const { queryByText, rerender } = render(
+      <CryptoMoversPillItem token={baseToken} index={0} />,
+    );
+    expect(queryByText(/%/)).toBeNull();
+
+    rerender(
+      <CryptoMoversPillItem
+        token={
+          {
+            ...baseToken,
+            priceChangePct: { h24: 'not-a-number' },
+          } as TrendingAsset
+        }
+        index={0}
+      />,
+    );
+    expect(queryByText(/%/)).toBeNull();
+  });
+
+  it('renders zero and signed positive and negative 24h changes', () => {
+    const { getByText, rerender } = render(
+      <CryptoMoversPillItem
+        token={{ ...baseToken, priceChangePct: { h24: '0' } } as TrendingAsset}
+        index={0}
+      />,
+    );
+    expect(getByText('0.00%')).toBeTruthy();
+
+    rerender(
+      <CryptoMoversPillItem
+        token={
+          { ...baseToken, priceChangePct: { h24: '2.51' } } as TrendingAsset
+        }
+        index={0}
+      />,
+    );
+    expect(getByText('+2.51%')).toBeTruthy();
+
+    rerender(
+      <CryptoMoversPillItem
+        token={
+          { ...baseToken, priceChangePct: { h24: '-1.2' } } as TrendingAsset
+        }
+        index={0}
+      />,
+    );
+    expect(getByText('-1.20%')).toBeTruthy();
+  });
+});
diff --git a/app/components/Views/TrendingView/feeds/tokens/CryptoMoversPillItem.tsx b/app/components/Views/TrendingView/feeds/tokens/CryptoMoversPillItem.tsx
new file mode 100644
index 00000000000..3500053eebc
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/tokens/CryptoMoversPillItem.tsx
@@ -0,0 +1,119 @@
+import React, { useMemo } from 'react';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import { isCaipChainId } from '@metamask/utils';
+import { TextColor } from '@metamask/design-system-react-native';
+import { TimeOption } from '../../../../UI/Trending/components/TrendingTokensBottomSheet';
+import {
+  getCaipChainIdFromAssetId,
+  getNetworkBadgeSource,
+  getPriceChangeFieldKey,
+} from '../../../../UI/Trending/components/TrendingTokenRowItem/utils';
+import TrendingTokenLogo from '../../../../UI/Trending/components/TrendingTokenLogo';
+import Badge, {
+  BadgeVariant,
+} from '../../../../../component-library/components/Badges/Badge';
+import BadgeWrapper, {
+  BadgePosition,
+} from '../../../../../component-library/components/Badges/BadgeWrapper';
+import { AvatarSize } from '../../../../../component-library/components/Avatars/Avatar';
+import { useTrendingTokenPress } from '../../../../UI/Trending/hooks/useTrendingTokenPress/useTrendingTokenPress';
+import { TokenDetailsSource } from '../../../../UI/TokenDetails/constants/constants';
+import { CRYPTO_MOVERS_HOME_FILTER_CONTEXT } from '../search-utils';
+import ExplorePill from '../../components/ExplorePill';
+
+const LOGO_SIZE = 24;
+
+interface CryptoMoversPillItemProps {
+  token: TrendingAsset;
+  index: number;
+  /** Called synchronously before the card's press handler fires. */
+  onCardPress?: () => void;
+}
+
+const CryptoMoversPillItem: React.FC<CryptoMoversPillItemProps> = ({
+  token,
+  index,
+  onCardPress,
+}) => {
+  const { onPress: defaultOnPress } = useTrendingTokenPress({
+    token,
+    index,
+    filterContext: CRYPTO_MOVERS_HOME_FILTER_CONTEXT,
+    tokenDetailsSource: TokenDetailsSource.ExploreNowMovers,
+  });
+
+  const onPress = React.useCallback(async () => {
+    onCardPress?.();
+    await defaultOnPress();
+  }, [onCardPress, defaultOnPress]);
+
+  const networkBadgeImageSource = useMemo(() => {
+    const caipChainId = getCaipChainIdFromAssetId(token.assetId);
+    if (!isCaipChainId(caipChainId)) return undefined;
+    return getNetworkBadgeSource(caipChainId);
+  }, [token.assetId]);
+
+  const { changeLabel, changeTextColor } = useMemo(() => {
+    const key = getPriceChangeFieldKey(TimeOption.TwentyFourHours);
+    const raw = token.priceChangePct?.[key];
+    const n = raw !== undefined && raw !== null ? parseFloat(String(raw)) : NaN;
+    if (isNaN(n)) {
+      return {
+        changeLabel: undefined as string | undefined,
+        changeTextColor: TextColor.TextAlternative,
+      };
+    }
+    if (n === 0) {
+      return {
+        changeLabel: '0.00%',
+        changeTextColor: TextColor.TextAlternative,
+      };
+    }
+    return {
+      changeLabel: `${n > 0 ? '+' : ''}${n.toFixed(2)}%`,
+      changeTextColor:
+        n > 0
+          ? TextColor.SuccessDefault
+          : n < 0
+            ? TextColor.ErrorDefault
+            : TextColor.TextAlternative,
+    };
+  }, [token.priceChangePct]);
+
+  const leading = useMemo(
+    () => (
+      <BadgeWrapper
+        badgePosition={BadgePosition.BottomRight}
+        badgeElement={
+          <Badge
+            size={AvatarSize.Xs}
+            variant={BadgeVariant.Network}
+            imageSource={networkBadgeImageSource}
+            isScaled={false}
+          />
+        }
+      >
+        <TrendingTokenLogo
+          assetId={token.assetId}
+          symbol={token.symbol}
+          size={LOGO_SIZE}
+          recyclingKey={token.assetId}
+        />
+      </BadgeWrapper>
+    ),
+    [networkBadgeImageSource, token.assetId, token.symbol],
+  );
+
+  return (
+    <ExplorePill
+      onPress={onPress}
+      testID={`section-pill-${token.assetId}`}
+      leading={leading}
+      title={token.symbol}
+      changeLabel={changeLabel}
+      changeTextColor={changeTextColor}
+    />
+  );
+};
+
+export default React.memo(CryptoMoversPillItem);
diff --git a/app/components/Views/TrendingView/feeds/tokens/CryptoMoversSkeleton.tsx b/app/components/Views/TrendingView/feeds/tokens/CryptoMoversSkeleton.tsx
new file mode 100644
index 00000000000..66049c0bfd5
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/tokens/CryptoMoversSkeleton.tsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import { View, StyleSheet, ScrollView } from 'react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+} from '@metamask/design-system-react-native';
+import Skeleton from '../../../../../component-library/components/Skeleton/Skeleton';
+
+const SKELETON_PILLS_PER_ROW = 6;
+const SKELETON_PILL_WIDTH = 104;
+const SKELETON_PILL_HEIGHT = 32;
+
+const styles = StyleSheet.create({
+  pill: { borderRadius: 9999 },
+});
+
+const SkeletonRow: React.FC<{ prefix: string }> = ({ prefix }) => (
+  <Box
+    flexDirection={BoxFlexDirection.Row}
+    alignItems={BoxAlignItems.Center}
+    twClassName="flex-nowrap gap-2"
+  >
+    {Array.from({ length: SKELETON_PILLS_PER_ROW }).map((_, i) => (
+      <View
+        key={`${prefix}-${i}`}
+        style={styles.pill}
+        testID="section-pills-skeleton-pill"
+      >
+        <Skeleton
+          width={SKELETON_PILL_WIDTH}
+          height={SKELETON_PILL_HEIGHT}
+          testID="section-pills-skeleton"
+        />
+      </View>
+    ))}
+  </Box>
+);
+
+const CryptoMoversSkeleton: React.FC = () => {
+  const tw = useTailwind();
+
+  return (
+    <Box marginBottom={5} twClassName="bg-transparent">
+      <ScrollView
+        horizontal
+        showsHorizontalScrollIndicator={false}
+        style={tw.style('bg-transparent')}
+        contentContainerStyle={tw.style('flex-col gap-2 pr-0')}
+      >
+        <Box flexDirection={BoxFlexDirection.Column} twClassName="gap-2">
+          <SkeletonRow prefix="r1" />
+          <SkeletonRow prefix="r2" />
+        </Box>
+      </ScrollView>
+    </Box>
+  );
+};
+
+export default CryptoMoversSkeleton;
diff --git a/app/components/Views/TrendingView/feeds/tokens/TokenRowItem.tsx b/app/components/Views/TrendingView/feeds/tokens/TokenRowItem.tsx
new file mode 100644
index 00000000000..514e607e164
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/tokens/TokenRowItem.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import TrendingTokenRowItem from '../../../../UI/Trending/components/TrendingTokenRowItem/TrendingTokenRowItem';
+import { TokenDetailsSource } from '../../../../UI/TokenDetails/constants/constants';
+import {
+  DEFAULT_TOKENS_FILTER_CONTEXT,
+  SEARCH_TOKENS_FILTER_CONTEXT,
+  CRYPTO_MOVERS_SEARCH_FILTER_CONTEXT,
+} from '../search-utils';
+
+interface TokenRowItemProps {
+  token: TrendingAsset;
+  index: number;
+  /** When omitted, defaults to {@link TokenDetailsSource.Trending} in the row item. */
+  tokenDetailsSource?: TokenDetailsSource;
+  /** Called synchronously before the card's press handler fires. */
+  onCardPress?: () => void;
+}
+
+/** Token row used inside the home tabs. */
+export const TokenRowItem: React.FC<TokenRowItemProps> = ({
+  token,
+  index,
+  tokenDetailsSource,
+  onCardPress,
+}) => (
+  <TrendingTokenRowItem
+    token={token}
+    position={index}
+    filterContext={DEFAULT_TOKENS_FILTER_CONTEXT}
+    tokenDetailsSource={tokenDetailsSource}
+    onCardPress={onCardPress}
+  />
+);
+
+/** Token row used inside the omni-search results. */
+export const TokenSearchRowItem: React.FC<TokenRowItemProps> = ({
+  token,
+  index,
+}) => (
+  <TrendingTokenRowItem
+    token={token}
+    position={index}
+    filterContext={SEARCH_TOKENS_FILTER_CONTEXT}
+  />
+);
+
+/** "Crypto movers" search row uses a dedicated analytics context. */
+export const CryptoMoversSearchRowItem: React.FC<TokenRowItemProps> = ({
+  token,
+  index,
+}) => (
+  <TrendingTokenRowItem
+    token={token}
+    position={index}
+    filterContext={CRYPTO_MOVERS_SEARCH_FILTER_CONTEXT}
+    testIdInstanceKey="crypto_movers"
+  />
+);
diff --git a/app/components/Views/TrendingView/feeds/tokens/useTokensFeed.test.ts b/app/components/Views/TrendingView/feeds/tokens/useTokensFeed.test.ts
new file mode 100644
index 00000000000..2ea1454de1c
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/tokens/useTokensFeed.test.ts
@@ -0,0 +1,208 @@
+import { renderHook, waitFor } from '@testing-library/react-native';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import { useTrendingSearch } from '../../../../UI/Trending/hooks/useTrendingSearch/useTrendingSearch';
+import type { RefreshConfig } from '../../hooks/useExploreRefresh';
+import { useTokensFeed } from './useTokensFeed';
+
+jest.mock(
+  '../../../../UI/Trending/hooks/useTrendingSearch/useTrendingSearch',
+  () => ({
+    useTrendingSearch: jest.fn(),
+  }),
+);
+
+const mockUseTrendingSearch = jest.mocked(useTrendingSearch);
+
+describe('useTokensFeed', () => {
+  const mockRefetch = jest.fn().mockResolvedValue(undefined);
+
+  const sampleTokens = [
+    {
+      assetId: 'eip155:1/erc20:0xaaa',
+      symbol: 'AAA',
+      name: 'Alpha Token',
+      marketCap: 100,
+    },
+    {
+      assetId: 'eip155:1/erc20:0xbtc',
+      symbol: 'WBTC',
+      name: 'Wrapped Bitcoin',
+      marketCap: 900,
+    },
+    {
+      assetId: 'eip155:1/erc20:0xeth',
+      symbol: 'WETH',
+      name: 'Wrapped Ether',
+      marketCap: 500,
+    },
+  ] as unknown as TrendingAsset[];
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseTrendingSearch.mockReturnValue({
+      data: sampleTokens,
+      isLoading: false,
+      refetch: mockRefetch,
+    });
+  });
+
+  it('returns underlying data unchanged when query is empty', () => {
+    const { result } = renderHook(() => useTokensFeed({ query: undefined }));
+
+    expect(result.current.data).toEqual(sampleTokens);
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.refetch).toBe(mockRefetch);
+  });
+
+  it('filters by query and sorts matches by market cap descending', () => {
+    const { result } = renderHook(() => useTokensFeed({ query: 'wrap' }));
+
+    expect(result.current.data.map((t) => t.symbol)).toEqual(['WBTC', 'WETH']);
+  });
+
+  it('refetches when refresh trigger increments past initial mount', async () => {
+    const refresh: RefreshConfig = { trigger: 0, silentRefresh: false };
+    const { rerender } = renderHook(
+      ({ r }: { r: RefreshConfig }) => useTokensFeed({ refresh: r }),
+      { initialProps: { r: refresh } },
+    );
+
+    expect(mockRefetch).not.toHaveBeenCalled();
+
+    rerender({ r: { trigger: 1, silentRefresh: false } });
+
+    await waitFor(() => {
+      expect(mockRefetch).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  it('passes searchQuery from query option into useTrendingSearch', () => {
+    renderHook(() => useTokensFeed({ query: 'sol' }));
+
+    expect(mockUseTrendingSearch).toHaveBeenCalledWith({
+      searchQuery: 'sol',
+      enableDebounce: false,
+    });
+  });
+
+  describe('hideRiskyTokens', () => {
+    const tokensWithSecurity = [
+      {
+        assetId: 'eip155:1/erc20:0x1',
+        symbol: 'VER',
+        name: 'Verified Token',
+        marketCap: 900,
+        securityData: { resultType: 'Verified' },
+      },
+      {
+        assetId: 'eip155:1/erc20:0x2',
+        symbol: 'BEN',
+        name: 'Benign Token',
+        marketCap: 800,
+        securityData: { resultType: 'Benign' },
+      },
+      {
+        assetId: 'eip155:1/erc20:0x3',
+        symbol: 'WRN',
+        name: 'Warning Token',
+        marketCap: 700,
+        securityData: { resultType: 'Warning' },
+      },
+      {
+        assetId: 'eip155:1/erc20:0x4',
+        symbol: 'SPM',
+        name: 'Spam Token',
+        marketCap: 600,
+        securityData: { resultType: 'Spam' },
+      },
+      {
+        assetId: 'eip155:1/erc20:0x5',
+        symbol: 'MAL',
+        name: 'Malicious Token',
+        marketCap: 500,
+        securityData: { resultType: 'Malicious' },
+      },
+      {
+        assetId: 'eip155:1/erc20:0x6',
+        symbol: 'UNS',
+        name: 'Unscanned Token',
+        marketCap: 400,
+      },
+    ] as unknown as TrendingAsset[];
+
+    beforeEach(() => {
+      mockUseTrendingSearch.mockReturnValue({
+        data: tokensWithSecurity,
+        isLoading: false,
+        refetch: mockRefetch,
+      });
+    });
+
+    it('returns all tokens when hideRiskyTokens is false (default)', () => {
+      const { result } = renderHook(() => useTokensFeed());
+
+      expect(result.current.data.map((t) => t.symbol)).toEqual([
+        'VER',
+        'BEN',
+        'WRN',
+        'SPM',
+        'MAL',
+        'UNS',
+      ]);
+    });
+
+    it('keeps only Verified, Benign, and unscanned tokens when hideRiskyTokens is true', () => {
+      const { result } = renderHook(() =>
+        useTokensFeed({ hideRiskyTokens: true }),
+      );
+
+      expect(result.current.data.map((t) => t.symbol)).toEqual([
+        'VER',
+        'BEN',
+        'UNS',
+      ]);
+    });
+
+    it('removes Warning tokens', () => {
+      mockUseTrendingSearch.mockReturnValue({
+        data: [tokensWithSecurity[2]],
+        isLoading: false,
+        refetch: mockRefetch,
+      });
+
+      const { result } = renderHook(() =>
+        useTokensFeed({ hideRiskyTokens: true }),
+      );
+
+      expect(result.current.data).toHaveLength(0);
+    });
+
+    it('removes Spam tokens', () => {
+      mockUseTrendingSearch.mockReturnValue({
+        data: [tokensWithSecurity[3]],
+        isLoading: false,
+        refetch: mockRefetch,
+      });
+
+      const { result } = renderHook(() =>
+        useTokensFeed({ hideRiskyTokens: true }),
+      );
+
+      expect(result.current.data).toHaveLength(0);
+    });
+
+    it('removes Malicious tokens', () => {
+      mockUseTrendingSearch.mockReturnValue({
+        data: [tokensWithSecurity[4]],
+        isLoading: false,
+        refetch: mockRefetch,
+      });
+
+      const { result } = renderHook(() =>
+        useTokensFeed({ hideRiskyTokens: true }),
+      );
+
+      expect(result.current.data).toHaveLength(0);
+    });
+  });
+});
diff --git a/app/components/Views/TrendingView/feeds/tokens/useTokensFeed.ts b/app/components/Views/TrendingView/feeds/tokens/useTokensFeed.ts
new file mode 100644
index 00000000000..e6f1d3072bb
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/tokens/useTokensFeed.ts
@@ -0,0 +1,57 @@
+import { useMemo } from 'react';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import { useTrendingSearch } from '../../../../UI/Trending/hooks/useTrendingSearch/useTrendingSearch';
+import { useFeedRefresh } from '../../hooks/useFeedRefresh';
+import type { RefreshConfig } from '../../hooks/useExploreRefresh';
+import { fuseSearch, TOKEN_FUSE_OPTIONS } from '../search-utils';
+
+interface UseTokensFeedOptions {
+  /** Search query; when present, results are sorted by market cap descending. */
+  query?: string;
+  refresh?: RefreshConfig;
+  /**
+   * When true, only Verified and Benign tokens (or unscanned ones) are shown.
+   * Use for surfaces that don't display a security badge.
+   */
+  hideRiskyTokens?: boolean;
+}
+
+export interface UseTokensFeedResult {
+  data: TrendingAsset[];
+  isLoading: boolean;
+  refetch: () => Promise<void>;
+}
+
+/** Trending tokens feed; same source for the home list, "crypto movers" pills, and search. */
+export const useTokensFeed = ({
+  query,
+  refresh,
+  hideRiskyTokens = false,
+}: UseTokensFeedOptions = {}): UseTokensFeedResult => {
+  const { data, isLoading, refetch } = useTrendingSearch({
+    searchQuery: query,
+    enableDebounce: false,
+  });
+
+  useFeedRefresh(refresh, refetch);
+
+  const filteredData = useMemo(() => {
+    const searched = fuseSearch(
+      data,
+      query,
+      TOKEN_FUSE_OPTIONS,
+      (a, b) => (b.marketCap ?? 0) - (a.marketCap ?? 0),
+    );
+
+    if (!hideRiskyTokens) return searched;
+
+    return searched.filter(({ securityData }) => {
+      const { resultType } = securityData ?? {};
+      return (
+        !resultType || resultType === 'Verified' || resultType === 'Benign'
+      );
+    });
+  }, [data, query, hideRiskyTokens]);
+
+  return { data: filteredData, isLoading, refetch };
+};
diff --git a/app/components/Views/TrendingView/hooks/useExploreRefresh.ts b/app/components/Views/TrendingView/hooks/useExploreRefresh.ts
new file mode 100644
index 00000000000..3a84dc68e16
--- /dev/null
+++ b/app/components/Views/TrendingView/hooks/useExploreRefresh.ts
@@ -0,0 +1,49 @@
+import { useCallback, useEffect, useState } from 'react';
+
+/** Refresh signal forwarded to feed hooks. */
+export interface RefreshConfig {
+  /** Incrementing counter; feed hooks refetch when this changes. */
+  trigger: number;
+  /** When true, suppress skeletons during refresh (silent refresh). */
+  silentRefresh: boolean;
+}
+
+/** Props every Explore tab consumes. Matches `useExploreRefresh`'s return shape. */
+export interface TabProps {
+  refresh: RefreshConfig;
+  refreshing: boolean;
+  onRefresh: () => void;
+}
+
+/**
+ * Owns pull-to-refresh state for the Explore page. Forward `refresh` to feed
+ * hooks; they refetch when `refresh.trigger` increments.
+ *
+ * `silentRefresh: true` means subsequent fetches should suppress skeletons;
+ * the first mount is non-silent so initial loads still show a skeleton.
+ */
+export const useExploreRefresh = (): TabProps => {
+  const [refreshing, setRefreshing] = useState(false);
+  const [refresh, setRefresh] = useState<RefreshConfig>({
+    trigger: 0,
+    silentRefresh: true,
+  });
+
+  // Hide the spinner shortly after pull-to-refresh fires; data hooks own the
+  // actual refetch lifecycle independently.
+  useEffect(() => {
+    if (!refreshing) return;
+    const timeoutId = setTimeout(() => setRefreshing(false), 1000);
+    return () => clearTimeout(timeoutId);
+  }, [refreshing]);
+
+  const onRefresh = useCallback(() => {
+    setRefreshing(true);
+    setRefresh((prev) => ({
+      trigger: prev.trigger + 1,
+      silentRefresh: true,
+    }));
+  }, []);
+
+  return { refresh, refreshing, onRefresh };
+};
diff --git a/app/components/Views/TrendingView/hooks/useExploreSearch.test.ts b/app/components/Views/TrendingView/hooks/useExploreSearch.test.ts
deleted file mode 100644
index 3485806a41a..00000000000
--- a/app/components/Views/TrendingView/hooks/useExploreSearch.test.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-import { renderHook, waitFor, act } from '@testing-library/react-native';
-import { useExploreSearch } from './useExploreSearch';
-import type { SectionId } from '../sections.config';
-
-const mockTrendingTokens = [
-  { assetId: '1', symbol: 'BTC', name: 'Bitcoin' },
-  { assetId: '2', symbol: 'ETH', name: 'Ethereum' },
-  { assetId: '3', symbol: 'SOL', name: 'Solana' },
-  { assetId: '4', symbol: 'USDC', name: 'USD Coin' },
-  { assetId: '5', symbol: 'USDT', name: 'Tether' },
-];
-
-const mockPerpsMarkets = [
-  { symbol: 'BTC-USD', name: 'Bitcoin' },
-  { symbol: 'ETH-USD', name: 'Ethereum' },
-  { symbol: 'SOL-USD', name: 'Solana' },
-  { symbol: 'DOGE-USD', name: 'Dogecoin' },
-];
-
-const mockPredictionMarkets = [
-  { id: '1', title: 'Will Bitcoin reach 100k?' },
-  { id: '2', title: 'Ethereum price prediction' },
-  { id: '3', title: 'Solana network upgrade' },
-  { id: '4', title: 'Trump election results' },
-];
-
-const mockSites = [
-  {
-    id: '1',
-    name: 'Uniswap',
-    url: 'https://uniswap.org',
-    displayUrl: 'uniswap.org',
-  },
-  {
-    id: '2',
-    name: 'OpenSea',
-    url: 'https://opensea.io',
-    displayUrl: 'opensea.io',
-  },
-  { id: '3', name: 'Aave', url: 'https://aave.com', displayUrl: 'aave.com' },
-  {
-    id: '4',
-    name: 'Compound',
-    url: 'https://compound.finance',
-    displayUrl: 'compound.finance',
-  },
-];
-
-let mockTrendingData = mockTrendingTokens;
-let mockTrendingLoading = false;
-let mockPerpsData = mockPerpsMarkets;
-let mockPerpsLoading = false;
-let mockPredictionsData = mockPredictionMarkets;
-let mockPredictionsLoading = false;
-let mockSitesData = mockSites;
-let mockSitesLoading = false;
-
-jest.mock(
-  '../../../UI/Trending/hooks/useTrendingSearch/useTrendingSearch',
-  () => ({
-    useTrendingSearch: () => ({
-      data: mockTrendingData,
-      isLoading: mockTrendingLoading,
-      refetch: jest.fn(),
-    }),
-  }),
-);
-
-jest.mock('../../../UI/Perps/hooks/usePerpsMarkets', () => ({
-  usePerpsMarkets: () => ({
-    markets: mockPerpsData,
-    isLoading: mockPerpsLoading,
-    refresh: jest.fn(),
-    isRefreshing: false,
-  }),
-}));
-
-jest.mock('../../../UI/Predict/hooks/usePredictMarketData', () => ({
-  usePredictMarketData: () => ({
-    marketData: mockPredictionsData,
-    isFetching: mockPredictionsLoading,
-    refetch: jest.fn(),
-  }),
-}));
-
-jest.mock('../../../UI/Sites/hooks/useSiteData/useSitesData', () => ({
-  useSitesData: () => ({
-    sites: mockSitesData,
-    isLoading: mockSitesLoading,
-    refetch: jest.fn(),
-  }),
-}));
-
-jest.mock('../../../UI/Trending/hooks/useRwaTokens/useRwaTokens', () => ({
-  useRwaTokens: () => ({
-    data: [],
-    isLoading: false,
-    refetch: jest.fn(),
-  }),
-}));
-
-const mockSectionsArray: { id: SectionId }[] = [
-  { id: 'tokens' },
-  { id: 'stocks' },
-  { id: 'perps' },
-  { id: 'predictions' },
-  { id: 'sites' },
-];
-
-jest.mock('../sections.config', () => {
-  const actual = jest.requireActual('../sections.config');
-  return {
-    ...actual,
-    useSearchSectionsArray: () => mockSectionsArray,
-  };
-});
-
-describe('useExploreSearch', () => {
-  beforeEach(() => {
-    jest.useFakeTimers();
-
-    // Reset to default values
-    mockTrendingData = mockTrendingTokens;
-    mockTrendingLoading = false;
-    mockPerpsData = mockPerpsMarkets;
-    mockPerpsLoading = false;
-    mockPredictionsData = mockPredictionMarkets;
-    mockPredictionsLoading = false;
-    mockSitesData = mockSites;
-    mockSitesLoading = false;
-  });
-
-  afterEach(() => {
-    jest.runOnlyPendingTimers();
-    jest.useRealTimers();
-  });
-
-  it('returns top 3 items from each section when query is empty', () => {
-    const { result } = renderHook(() => useExploreSearch(''));
-
-    expect(result.current.data.tokens).toHaveLength(3);
-    expect(result.current.data.perps).toHaveLength(3);
-    expect(result.current.data.predictions).toHaveLength(3);
-    expect(result.current.data.sites).toHaveLength(3);
-  });
-
-  it('returns top 3 items when query contains only whitespace', () => {
-    const { result } = renderHook(() => useExploreSearch('   '));
-
-    expect(result.current.data.tokens).toHaveLength(3);
-    expect(result.current.data.perps).toHaveLength(3);
-    expect(result.current.data.predictions).toHaveLength(3);
-    expect(result.current.data.sites).toHaveLength(3);
-  });
-
-  it('returns empty arrays when section hooks return no data', async () => {
-    mockTrendingData = [];
-    mockPerpsData = [];
-    mockPredictionsData = [];
-    mockSitesData = [];
-
-    const { result } = renderHook(() => useExploreSearch('test'));
-
-    await act(async () => {
-      jest.advanceTimersByTime(200);
-    });
-
-    await waitFor(() => {
-      expect(result.current.data.tokens).toHaveLength(0);
-      expect(result.current.data.perps).toHaveLength(0);
-      expect(result.current.data.predictions).toHaveLength(0);
-      expect(result.current.data.sites).toHaveLength(0);
-    });
-  });
-
-  it('debounces query changes by 200ms', async () => {
-    const { result, rerender } = renderHook(
-      ({ query }) => useExploreSearch(query),
-      { initialProps: { query: '' } },
-    );
-
-    const initialTokenCount = result.current.data.tokens.length;
-
-    rerender({ query: 'btc' });
-
-    // Before debounce completes, should still show initial count (top 3)
-    await act(async () => {
-      jest.advanceTimersByTime(100);
-    });
-
-    expect(result.current.data.tokens.length).toBe(initialTokenCount);
-
-    // After full debounce time, query should be processed
-    await act(async () => {
-      jest.advanceTimersByTime(100);
-    });
-
-    await waitFor(() => {
-      expect(result.current.data.tokens.length).toBeGreaterThan(0);
-    });
-  });
-
-  it('shows loading state while debouncing', async () => {
-    const { result, rerender } = renderHook(
-      ({ query }) => useExploreSearch(query),
-      { initialProps: { query: '' } },
-    );
-
-    expect(result.current.isLoading.tokens).toBe(false);
-
-    rerender({ query: 'test' });
-
-    expect(result.current.isLoading.tokens).toBe(true);
-    expect(result.current.isLoading.perps).toBe(true);
-    expect(result.current.isLoading.predictions).toBe(true);
-    expect(result.current.isLoading.sites).toBe(true);
-
-    await act(async () => {
-      jest.advanceTimersByTime(200);
-    });
-
-    await waitFor(() => {
-      expect(result.current.isLoading.tokens).toBe(false);
-    });
-  });
-
-  it('aggregates loading states from section hooks', () => {
-    mockTrendingLoading = true;
-    mockPerpsLoading = true;
-    mockPredictionsLoading = true;
-    mockSitesLoading = true;
-
-    const { result } = renderHook(() => useExploreSearch(''));
-
-    expect(result.current.isLoading.tokens).toBe(true);
-    expect(result.current.isLoading.perps).toBe(true);
-    expect(result.current.isLoading.predictions).toBe(true);
-    expect(result.current.isLoading.sites).toBe(true);
-  });
-
-  it('processes all sections defined in config', () => {
-    const { result } = renderHook(() => useExploreSearch(''));
-
-    mockSectionsArray.forEach((section) => {
-      expect(result.current.data[section.id]).toBeDefined();
-      expect(result.current.isLoading[section.id]).toBeDefined();
-    });
-  });
-
-  it('returns default sectionsOrder when no options provided', () => {
-    const { result } = renderHook(() => useExploreSearch(''));
-
-    expect(result.current.sectionsOrder).toEqual(
-      mockSectionsArray.map((s) => s.id),
-    );
-  });
-
-  it('returns custom sectionsOrder when provided in options', () => {
-    const customOrder = [
-      'sites',
-      'tokens',
-      'stocks',
-      'perps',
-      'predictions',
-    ] as const;
-    const { result } = renderHook(() =>
-      useExploreSearch('', { sectionsOrder: [...customOrder] }),
-    );
-
-    expect(result.current.sectionsOrder).toEqual(customOrder);
-  });
-
-  it('maintains backward compatibility - works without options parameter', () => {
-    const { result } = renderHook(() => useExploreSearch('test'));
-
-    // Should not throw and should return expected structure
-    expect(result.current.data).toBeDefined();
-    expect(result.current.isLoading).toBeDefined();
-    expect(result.current.sectionsOrder).toBeDefined();
-  });
-});
diff --git a/app/components/Views/TrendingView/hooks/useExploreSearch.ts b/app/components/Views/TrendingView/hooks/useExploreSearch.ts
deleted file mode 100644
index 10f1c145ad3..00000000000
--- a/app/components/Views/TrendingView/hooks/useExploreSearch.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { useState, useEffect, useMemo } from 'react';
-import {
-  useSearchSectionsArray,
-  useSectionsData,
-  type SectionId,
-} from '../sections.config';
-
-export interface ExploreSearchResult {
-  data: Record<SectionId, unknown[]>;
-  isLoading: Record<SectionId, boolean>;
-  sectionsOrder: SectionId[];
-}
-
-export interface ExploreSearchOptions {
-  /**
-   * Custom order of sections for display.
-   * Defaults to SECTIONS_ARRAY order (tokens, perps, predictions, sites).
-   * Browser uses ['sites', 'tokens', 'perps', 'predictions'] to show Sites first.
-   */
-  sectionsOrder?: SectionId[];
-}
-
-/**
- * GENERIC EXPLORE SEARCH HOOK
- *
- * This hook is completely generic and processes data from any sections
- * defined in sections.config.tsx. It handles:
- * - Debouncing the search query
- * - Filtering results based on section configurations
- * - Returning top 3 items when no query is present
- *
- * @param query - Search query string
- * @param options - Optional configuration including custom section order
- * @returns Search results grouped by section
- */
-export const useExploreSearch = (
-  query: string,
-  options?: ExploreSearchOptions,
-): ExploreSearchResult => {
-  const sectionsArray = useSearchSectionsArray();
-  const sectionsOrder = useMemo(
-    () => options?.sectionsOrder ?? sectionsArray.map((s) => s.id),
-    [options?.sectionsOrder, sectionsArray],
-  );
-  const [debouncedQuery, setDebouncedQuery] = useState(query);
-
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      setDebouncedQuery(query);
-    }, 200);
-
-    return () => clearTimeout(timer);
-  }, [query]);
-
-  // Fetch data for all sections using centralized hook
-  const allSectionsData = useSectionsData(debouncedQuery);
-
-  // Check if query is still debouncing (query changed but debounce hasn't completed)
-  const isDebouncing = query !== debouncedQuery;
-
-  const filteredResults = useMemo(() => {
-    const isLoading: Record<SectionId, boolean> = {} as Record<
-      SectionId,
-      boolean
-    >;
-    const data: Record<SectionId, unknown[]> = {} as Record<
-      SectionId,
-      unknown[]
-    >;
-
-    const shouldShowTopItems = !debouncedQuery.trim();
-
-    // Process each section generically
-    sectionsArray.forEach((section) => {
-      const sectionData = allSectionsData[section.id];
-      // If we're debouncing, show loading state immediately
-      // Otherwise, use the actual loading state from the data fetch
-      isLoading[section.id] = isDebouncing || sectionData.isLoading;
-
-      if (shouldShowTopItems) {
-        // Show top 3 items when no search query
-        data[section.id] = sectionData.data.slice(0, 3);
-      } else {
-        // Filter items based on section's searchable text
-        data[section.id] = sectionData.data;
-      }
-    });
-
-    return { data, isLoading, sectionsOrder };
-  }, [
-    debouncedQuery,
-    allSectionsData,
-    isDebouncing,
-    sectionsOrder,
-    sectionsArray,
-  ]);
-
-  return filteredResults;
-};
diff --git a/app/components/Views/TrendingView/hooks/useFeedRefresh.ts b/app/components/Views/TrendingView/hooks/useFeedRefresh.ts
new file mode 100644
index 00000000000..4e410d0a622
--- /dev/null
+++ b/app/components/Views/TrendingView/hooks/useFeedRefresh.ts
@@ -0,0 +1,16 @@
+import { useEffect } from 'react';
+import type { RefreshConfig } from './useExploreRefresh';
+
+/**
+ * Wires a feed's `refetch` to the page's `refresh.trigger`. Skips trigger 0
+ * (initial mount) since the underlying hook already fetches on first mount.
+ */
+export const useFeedRefresh = (
+  refresh: RefreshConfig | undefined,
+  refetch: (() => Promise<void> | void) | undefined,
+): void => {
+  useEffect(() => {
+    if (!refresh || refresh.trigger === 0 || !refetch) return;
+    refetch();
+  }, [refresh, refetch]);
+};
diff --git a/app/components/Views/TrendingView/components/ExploreSearchResults/ExploreSearchResults.tsx b/app/components/Views/TrendingView/search/ExploreSearchResults.tsx
similarity index 56%
rename from app/components/Views/TrendingView/components/ExploreSearchResults/ExploreSearchResults.tsx
rename to app/components/Views/TrendingView/search/ExploreSearchResults.tsx
index 83c111f2000..df6f3fba162 100644
--- a/app/components/Views/TrendingView/components/ExploreSearchResults/ExploreSearchResults.tsx
+++ b/app/components/Views/TrendingView/search/ExploreSearchResults.tsx
@@ -1,7 +1,7 @@
-import React, { useMemo, useCallback, useRef, useEffect } from 'react';
-import { FlashList, ListRenderItem, FlashListRef } from '@shopify/flash-list';
-import { useNavigation, NavigationProp } from '@react-navigation/native';
-import type { RootStackParamList } from '../../../../../core/NavigationService/types';
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import { Pressable } from 'react-native';
+import { useNavigation, type NavigationProp } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
 import {
   Box,
   Text,
@@ -17,22 +17,23 @@ import {
   BoxJustifyContent,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import { Pressable } from 'react-native';
-import { SECTIONS_CONFIG, type SectionId } from '../../sections.config';
-import { MetaMetricsEvents } from '../../../../../core/Analytics/MetaMetrics.events';
+import { FlashList, FlashListRef, ListRenderItem } from '@shopify/flash-list';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import type { RootStackParamList } from '../../../../core/NavigationService/types';
+import { selectBasicFunctionalityEnabled } from '../../../../selectors/settings';
+import SitesSearchFooter from '../../../UI/Sites/components/SitesSearchFooter/SitesSearchFooter';
+import { useSearchTracking } from '../../../UI/Trending/hooks/useSearchTracking/useSearchTracking';
+import { TimeOption } from '../../../UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenTimeBottomSheet';
+import { MetaMetricsEvents } from '../../../../core/Analytics/MetaMetrics.events';
+import Routes from '../../../../constants/navigation/Routes';
+import { strings } from '../../../../../locales/i18n';
+import { trackExploreEvent, useScrollTracking } from './analytics';
 import {
-  TrackedRowItem,
-  trackExploreEvent,
-  useScrollTracking,
-} from '../../utils/exploreSearch';
-import { useExploreSearch } from '../../hooks/useExploreSearch';
-import { selectBasicFunctionalityEnabled } from '../../../../../selectors/settings';
-import SitesSearchFooter from '../../../../UI/Sites/components/SitesSearchFooter/SitesSearchFooter';
-import { useSelector } from 'react-redux';
-import { useSearchTracking } from '../../../../UI/Trending/hooks/useSearchTracking/useSearchTracking';
-import { TimeOption } from '../../../../UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenTimeBottomSheet';
-import Routes from '../../../../../constants/navigation/Routes';
-import { strings } from '../../../../../../locales/i18n';
+  useExploreSearch,
+  type SearchFeedId,
+  type SearchFeedSection,
+} from './useExploreSearch';
+import SearchFeedRow, { SearchFeedSkeleton } from './SearchFeedRow';
 
 const MAX_ITEMS_PER_SECTION = 3;
 
@@ -42,20 +43,21 @@ interface ExploreSearchResultsProps {
 
 interface ListItemHeader {
   type: 'header';
-  sectionId: SectionId;
+  feedId: SearchFeedId;
   title: string;
   hasMore: boolean;
 }
 
 interface ListItemData {
   type: 'item';
-  sectionId: SectionId;
+  feedId: SearchFeedId;
+  title: string;
   data: unknown;
 }
 
 interface ListItemSkeleton {
   type: 'skeleton';
-  sectionId: SectionId;
+  feedId: SearchFeedId;
   index: number;
 }
 
@@ -66,7 +68,7 @@ const ExploreSearchResults: React.FC<ExploreSearchResultsProps> = ({
 }) => {
   const navigation = useNavigation<NavigationProp<RootStackParamList>>();
   const tw = useTailwind();
-  const { data, isLoading, sectionsOrder } = useExploreSearch(searchQuery);
+  const { sections } = useExploreSearch(searchQuery);
   const flashListRef = useRef<FlashListRef<FlatListItem>>(null);
   const isBasicFunctionalityEnabled = useSelector(
     selectBasicFunctionalityEnabled,
@@ -82,24 +84,24 @@ const ExploreSearchResults: React.FC<ExploreSearchResultsProps> = ({
   }, [searchQuery, resetScrollTracking]);
 
   const handleViewMore = useCallback(
-    (sectionId: SectionId, title: string) => {
+    (section: SearchFeedSection) => {
       trackExploreEvent(MetaMetricsEvents.EXPLORE_SEARCH_INTERACTED, {
         interaction_type: 'view_all_clicked',
         search_query: searchQuery,
-        section_name: title,
+        section_name: section.title,
       });
       navigation.navigate(Routes.EXPLORE_SECTION_RESULTS_FULL_VIEW, {
-        sectionId,
-        title,
+        feedId: section.feedId,
+        title: section.title,
         searchQuery,
-        data: data[sectionId],
+        data: section.items,
       });
     },
-    [navigation, searchQuery, data],
+    [navigation, searchQuery],
   );
 
   const renderSectionHeader = useCallback(
-    (item: ListItemHeader) => (
+    (item: ListItemHeader, section: SearchFeedSection) => (
       <Box
         flexDirection={BoxFlexDirection.Row}
         alignItems={BoxAlignItems.Center}
@@ -115,7 +117,7 @@ const ExploreSearchResults: React.FC<ExploreSearchResultsProps> = ({
         </Text>
         {item.hasMore && (
           <Pressable
-            onPress={() => handleViewMore(item.sectionId, item.title)}
+            onPress={() => handleViewMore(section)}
             hitSlop={8}
             accessibilityRole="button"
             accessibilityLabel={`${strings('trending.view_all')} ${item.title}`}
@@ -144,66 +146,44 @@ const ExploreSearchResults: React.FC<ExploreSearchResultsProps> = ({
     [handleViewMore, tw],
   );
 
-  const flatData = useMemo(() => {
+  const flatData = useMemo<FlatListItem[]>(() => {
     const result: FlatListItem[] = [];
+    const visibleSections = isBasicFunctionalityEnabled ? sections : [];
 
-    const sectionIdsToShow = isBasicFunctionalityEnabled ? sectionsOrder : [];
+    visibleSections.forEach((section) => {
+      const { feedId, title, items, isLoading } = section;
+      if (!isLoading && items.length === 0) return;
 
-    sectionIdsToShow.forEach((sectionId) => {
-      const section = SECTIONS_CONFIG[sectionId];
-      if (!section) return;
-
-      const items = data[sectionId];
-      const sectionIsLoading = isLoading[sectionId];
-
-      if ((items && items.length > 0) || sectionIsLoading) {
-        const hasMore =
-          !sectionIsLoading && (items?.length ?? 0) > MAX_ITEMS_PER_SECTION;
-
-        result.push({
-          type: 'header',
-          sectionId,
-          title: section.title,
-          hasMore,
-        });
+      const hasMore = !isLoading && items.length > MAX_ITEMS_PER_SECTION;
+      result.push({ type: 'header', feedId, title, hasMore });
 
-        if (sectionIsLoading) {
-          for (let i = 0; i < MAX_ITEMS_PER_SECTION; i++) {
-            result.push({
-              type: 'skeleton',
-              sectionId,
-              index: i,
-            });
-          }
-        } else {
-          const visibleItems = items.slice(0, MAX_ITEMS_PER_SECTION);
-          visibleItems.forEach((item) => {
-            result.push({
-              type: 'item',
-              sectionId,
-              data: item,
-            });
-          });
+      if (isLoading) {
+        for (let i = 0; i < MAX_ITEMS_PER_SECTION; i++) {
+          result.push({ type: 'skeleton', feedId, index: i });
         }
+      } else {
+        const visibleItems = items.slice(0, MAX_ITEMS_PER_SECTION);
+        visibleItems.forEach((data) => {
+          result.push({ type: 'item', feedId, title, data });
+        });
       }
     });
 
     return result;
-  }, [data, isLoading, isBasicFunctionalityEnabled, sectionsOrder]);
+  }, [isBasicFunctionalityEnabled, sections]);
 
   useEffect(() => {
     if (flatData.length > 0) {
-      flashListRef.current?.scrollToIndex({
-        index: 0,
-        animated: false,
-      });
+      flashListRef.current?.scrollToIndex({ index: 0, animated: false });
     }
   }, [searchQuery, flatData.length]);
 
+  const tokensSection = sections.find((s) => s.feedId === 'tokens');
   useSearchTracking({
     searchQuery,
-    resultsCount: data.tokens?.length || 0,
-    isLoading: isLoading.tokens,
+    resultsCount:
+      (tokensSection?.items as TrendingAsset[] | undefined)?.length ?? 0,
+    isLoading: tokensSection?.isLoading ?? false,
     timeFilter: TimeOption.TwentyFourHours,
     sortOption: 'relevance',
     networkFilter: 'all',
@@ -211,46 +191,38 @@ const ExploreSearchResults: React.FC<ExploreSearchResultsProps> = ({
 
   const renderFooter = useMemo(() => {
     if (searchQuery.length === 0) return null;
-
     return <SitesSearchFooter searchQuery={searchQuery} />;
   }, [searchQuery]);
 
   const renderFlatItem: ListRenderItem<FlatListItem> = useCallback(
     ({ item, index }) => {
       if (item.type === 'header') {
-        return renderSectionHeader(item);
+        const section = sections.find((s) => s.feedId === item.feedId);
+        if (!section) return null;
+        return renderSectionHeader(item, section);
       }
-
-      const section = SECTIONS_CONFIG[item.sectionId];
-      if (!section) return null;
-
       if (item.type === 'skeleton') {
-        if (section.OverrideSkeletonSearch) {
-          return <section.OverrideSkeletonSearch />;
-        }
-        return <section.Skeleton />;
+        return <SearchFeedSkeleton feedId={item.feedId} />;
       }
-
       return (
-        <TrackedRowItem
-          section={section}
+        <SearchFeedRow
+          feedId={item.feedId}
           item={item.data}
           index={index}
           searchQuery={searchQuery}
+          sectionTitle={item.title}
           interactionType="result_clicked"
         />
       );
     },
-    [renderSectionHeader, searchQuery],
+    [renderSectionHeader, sections, searchQuery],
   );
 
   const keyExtractor = useCallback((item: FlatListItem, index: number) => {
-    if (item.type === 'header') return `header-${item.sectionId}`;
+    if (item.type === 'header') return `header-${item.feedId}`;
     if (item.type === 'skeleton')
-      return `skeleton-${item.sectionId}-${item.index}`;
-
-    const section = SECTIONS_CONFIG[item.sectionId];
-    return section ? `${section.id}-${index}` : `item-${index}`;
+      return `skeleton-${item.feedId}-${item.index}`;
+    return `${item.feedId}-${index}`;
   }, []);
 
   return (
diff --git a/app/components/Views/TrendingView/search/SearchFeedRow.test.tsx b/app/components/Views/TrendingView/search/SearchFeedRow.test.tsx
new file mode 100644
index 00000000000..5f91705f423
--- /dev/null
+++ b/app/components/Views/TrendingView/search/SearchFeedRow.test.tsx
@@ -0,0 +1,204 @@
+import React from 'react';
+import { Pressable, Text } from 'react-native';
+import { render, fireEvent } from '@testing-library/react-native';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import type { PerpsMarketData } from '@metamask/perps-controller';
+import type { PredictMarket as PredictMarketType } from '../../../UI/Predict/types';
+import type { SiteData } from '../../../UI/Sites/components/SiteRowItem/SiteRowItem';
+import { MetaMetricsEvents } from '../../../../core/Analytics/MetaMetrics.events';
+import SearchFeedRow, {
+  SearchFeedSkeleton,
+  CryptoMoversFeedSearchRow,
+} from './SearchFeedRow';
+import { trackExploreEvent } from './analytics';
+
+const MockPressable = Pressable;
+const MockText = Text;
+
+jest.mock('./TapView', () => ({
+  __esModule: true,
+  default: ({
+    children,
+    onTap,
+  }: {
+    children: React.ReactNode;
+    onTap?: () => void;
+  }) => (
+    <MockPressable testID="search-feed-tap" onPress={onTap}>
+      {children}
+    </MockPressable>
+  ),
+}));
+
+jest.mock('./analytics', () => ({
+  trackExploreEvent: jest.fn(),
+}));
+
+jest.mock('../feeds/tokens/TokenRowItem', () => ({
+  TokenSearchRowItem: ({ token }: { token: TrendingAsset }) => (
+    <MockText testID="stub-token-row">{token.assetId}</MockText>
+  ),
+  CryptoMoversSearchRowItem: ({ token }: { token: TrendingAsset }) => (
+    <MockText testID="stub-crypto-movers-search">{token.assetId}</MockText>
+  ),
+}));
+
+jest.mock('../feeds/perps/PerpsRowItem', () => ({
+  __esModule: true,
+  default: ({ market }: { market: PerpsMarketData }) => (
+    <MockText testID="stub-perps-row">{market.symbol}</MockText>
+  ),
+}));
+
+jest.mock('../feeds/predictions/PredictionRowItem', () => ({
+  PredictionSearchRowItem: ({ market }: { market: PredictMarketType }) => (
+    <MockText testID="stub-predict-row">{market.id}</MockText>
+  ),
+}));
+
+jest.mock('../feeds/sites/SiteRowItem', () => ({
+  SiteRowItem: ({ site }: { site: SiteData }) => (
+    <MockText testID="stub-site-row">{site.url}</MockText>
+  ),
+}));
+
+jest.mock(
+  '../../../UI/Trending/components/TrendingTokenSkeleton/TrendingTokensSkeleton',
+  () => ({
+    __esModule: true,
+    default: () => (
+      <MockText testID="stub-trending-token-skeleton">sk</MockText>
+    ),
+  }),
+);
+
+jest.mock('../../../UI/Sites/components/SiteSkeleton/SiteSkeleton', () => ({
+  __esModule: true,
+  default: () => <MockText testID="stub-site-skeleton">sk</MockText>,
+}));
+
+const mockTrackExploreEvent = trackExploreEvent as jest.MockedFunction<
+  typeof trackExploreEvent
+>;
+
+describe('SearchFeedRow', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it.each([
+    ['tokens', 'asset-1', 'stub-token-row'],
+    ['stocks', 'asset-2', 'stub-token-row'],
+    ['perps', 'ETH', 'stub-perps-row'],
+    ['predictions', 'pred-9', 'stub-predict-row'],
+    ['sites', 'https://example.com', 'stub-site-row'],
+  ] as const)(
+    'renders the row for feedId %s and sends analytics with the correct item id on tap',
+    (feedId, itemClicked, rowTestId) => {
+      const token = { assetId: 'asset-1' } as TrendingAsset;
+      const perpsMarket = { symbol: 'ETH' } as PerpsMarketData;
+      const predict = { id: 'pred-9' } as PredictMarketType;
+      const site = { url: 'https://example.com' } as SiteData;
+
+      const itemByFeed = {
+        tokens: token,
+        stocks: { assetId: 'asset-2' } as TrendingAsset,
+        perps: perpsMarket,
+        predictions: predict,
+        sites: site,
+      }[feedId];
+
+      const { getByTestId } = render(
+        <SearchFeedRow
+          feedId={feedId}
+          item={itemByFeed}
+          index={0}
+          searchQuery="q"
+          sectionTitle="Tokens"
+          interactionType="row_tap"
+        />,
+      );
+
+      expect(getByTestId(rowTestId)).toBeTruthy();
+      fireEvent.press(getByTestId('search-feed-tap'));
+
+      expect(mockTrackExploreEvent).toHaveBeenCalledWith(
+        MetaMetricsEvents.EXPLORE_SEARCH_INTERACTED,
+        expect.objectContaining({
+          interaction_type: 'row_tap',
+          search_query: 'q',
+          section_name: 'Tokens',
+          item_clicked: itemClicked,
+        }),
+      );
+    },
+  );
+
+  it('uses latest searchQuery from ref when tap fires', () => {
+    const token = { assetId: 'x' } as TrendingAsset;
+    const { getByTestId, rerender } = render(
+      <SearchFeedRow
+        feedId="tokens"
+        item={token}
+        index={0}
+        searchQuery="first"
+        sectionTitle="S"
+        interactionType="t"
+      />,
+    );
+
+    rerender(
+      <SearchFeedRow
+        feedId="tokens"
+        item={token}
+        index={0}
+        searchQuery="second"
+        sectionTitle="S"
+        interactionType="t"
+      />,
+    );
+
+    fireEvent.press(getByTestId('search-feed-tap'));
+
+    expect(mockTrackExploreEvent).toHaveBeenCalledWith(
+      MetaMetricsEvents.EXPLORE_SEARCH_INTERACTED,
+      expect.objectContaining({ search_query: 'second' }),
+    );
+  });
+});
+
+describe('SearchFeedSkeleton', () => {
+  it('uses site skeleton for sites and predictions', () => {
+    const { getByTestId, rerender } = render(
+      <SearchFeedSkeleton feedId="sites" />,
+    );
+    expect(getByTestId('stub-site-skeleton')).toBeTruthy();
+
+    rerender(<SearchFeedSkeleton feedId="predictions" />);
+    expect(getByTestId('stub-site-skeleton')).toBeTruthy();
+  });
+
+  it('uses token skeleton for tokens, stocks, and perps', () => {
+    const { getByTestId, rerender } = render(
+      <SearchFeedSkeleton feedId="tokens" />,
+    );
+    expect(getByTestId('stub-trending-token-skeleton')).toBeTruthy();
+
+    rerender(<SearchFeedSkeleton feedId="stocks" />);
+    expect(getByTestId('stub-trending-token-skeleton')).toBeTruthy();
+
+    rerender(<SearchFeedSkeleton feedId="perps" />);
+    expect(getByTestId('stub-trending-token-skeleton')).toBeTruthy();
+  });
+});
+
+describe('CryptoMoversFeedSearchRow', () => {
+  it('renders CryptoMoversSearchRowItem with token and index', () => {
+    const token = { assetId: 'btc', symbol: 'BTC' } as TrendingAsset;
+    const { getByTestId } = render(
+      <CryptoMoversFeedSearchRow token={token} index={2} />,
+    );
+
+    expect(getByTestId('stub-crypto-movers-search').props.children).toBe('btc');
+  });
+});
diff --git a/app/components/Views/TrendingView/search/SearchFeedRow.tsx b/app/components/Views/TrendingView/search/SearchFeedRow.tsx
new file mode 100644
index 00000000000..3712d622c98
--- /dev/null
+++ b/app/components/Views/TrendingView/search/SearchFeedRow.tsx
@@ -0,0 +1,106 @@
+import React, { useCallback, useRef } from 'react';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import type { PerpsMarketData } from '@metamask/perps-controller';
+import type { PredictMarket as PredictMarketType } from '../../../UI/Predict/types';
+import type { SiteData } from '../../../UI/Sites/components/SiteRowItem/SiteRowItem';
+import {
+  TokenSearchRowItem,
+  CryptoMoversSearchRowItem,
+} from '../feeds/tokens/TokenRowItem';
+import TrendingTokensSkeleton from '../../../UI/Trending/components/TrendingTokenSkeleton/TrendingTokensSkeleton';
+import PerpsRowItem from '../feeds/perps/PerpsRowItem';
+import { PredictionSearchRowItem } from '../feeds/predictions/PredictionRowItem';
+import { SiteRowItem } from '../feeds/sites/SiteRowItem';
+import SiteSkeleton from '../../../UI/Sites/components/SiteSkeleton/SiteSkeleton';
+import type { SearchFeedId } from './useExploreSearch';
+import TapView from './TapView';
+import { trackExploreEvent } from './analytics';
+import { MetaMetricsEvents } from '../../../../core/Analytics/MetaMetrics.events';
+
+interface SearchFeedRowProps {
+  feedId: SearchFeedId;
+  item: unknown;
+  index: number;
+  searchQuery: string;
+  sectionTitle: string;
+  interactionType: string;
+}
+
+const renderRow = (feedId: SearchFeedId, item: unknown, index: number) => {
+  switch (feedId) {
+    case 'tokens':
+      return <TokenSearchRowItem token={item as TrendingAsset} index={index} />;
+    case 'stocks':
+      return <TokenSearchRowItem token={item as TrendingAsset} index={index} />;
+    case 'perps':
+      return <PerpsRowItem market={item as PerpsMarketData} />;
+    case 'predictions':
+      return <PredictionSearchRowItem market={item as PredictMarketType} />;
+    case 'sites':
+      return <SiteRowItem site={item as SiteData} />;
+  }
+};
+
+const getItemId = (feedId: SearchFeedId, item: unknown): string => {
+  switch (feedId) {
+    case 'tokens':
+    case 'stocks':
+      return (item as TrendingAsset).assetId ?? '';
+    case 'perps':
+      return (item as PerpsMarketData).symbol ?? '';
+    case 'predictions':
+      return (item as PredictMarketType).id ?? '';
+    case 'sites':
+      return (item as SiteData).url ?? '';
+  }
+};
+
+/** Renders a search-result row for any feed and tracks taps with analytics. */
+const SearchFeedRow: React.FC<SearchFeedRowProps> = ({
+  feedId,
+  item,
+  index,
+  searchQuery,
+  sectionTitle,
+  interactionType,
+}) => {
+  const searchQueryRef = useRef(searchQuery);
+  searchQueryRef.current = searchQuery;
+
+  const handleTap = useCallback(() => {
+    trackExploreEvent(MetaMetricsEvents.EXPLORE_SEARCH_INTERACTED, {
+      interaction_type: interactionType,
+      search_query: searchQueryRef.current,
+      section_name: sectionTitle,
+      item_clicked: getItemId(feedId, item),
+    });
+  }, [interactionType, sectionTitle, feedId, item]);
+
+  return <TapView onTap={handleTap}>{renderRow(feedId, item, index)}</TapView>;
+};
+
+/** Skeleton row appropriate for a given feed. */
+export const SearchFeedSkeleton: React.FC<{ feedId: SearchFeedId }> = ({
+  feedId,
+}) => {
+  switch (feedId) {
+    case 'sites':
+    case 'predictions':
+      return <SiteSkeleton />;
+    case 'tokens':
+    case 'stocks':
+    case 'perps':
+    default:
+      return <TrendingTokensSkeleton />;
+  }
+};
+
+/** Crypto-movers variant for the dedicated "Crypto movers" full-view header. */
+export const CryptoMoversFeedSearchRow: React.FC<{
+  token: TrendingAsset;
+  index: number;
+}> = ({ token, index }) => (
+  <CryptoMoversSearchRowItem token={token} index={index} />
+);
+
+export default SearchFeedRow;
diff --git a/app/components/Views/TrendingView/search/TapView.tsx b/app/components/Views/TrendingView/search/TapView.tsx
new file mode 100644
index 00000000000..72712f2a7f2
--- /dev/null
+++ b/app/components/Views/TrendingView/search/TapView.tsx
@@ -0,0 +1,38 @@
+import React, { useRef } from 'react';
+import { Box } from '@metamask/design-system-react-native';
+
+/** Min vertical movement (px) treated as scroll, not a tap. Absorbs jitter. */
+const SCROLL_THRESHOLD = 8;
+
+/**
+ * Wraps children and fires `onTap` only when the touch ends without a scroll
+ * gesture. Uses raw touch events so movement is detected even while a parent
+ * FlashList is absorbing a scroll.
+ */
+const TapView: React.FC<{
+  onTap?: () => void;
+  children: React.ReactNode;
+}> = ({ onTap, children }) => {
+  const startY = useRef(0);
+  const didScroll = useRef(false);
+  return (
+    <Box
+      onTouchStart={(e) => {
+        startY.current = e.nativeEvent.pageY;
+        didScroll.current = false;
+      }}
+      onTouchMove={(e) => {
+        if (Math.abs(e.nativeEvent.pageY - startY.current) > SCROLL_THRESHOLD) {
+          didScroll.current = true;
+        }
+      }}
+      onTouchEnd={() => {
+        if (!didScroll.current) onTap?.();
+      }}
+    >
+      {children}
+    </Box>
+  );
+};
+
+export default TapView;
diff --git a/app/components/Views/TrendingView/search/analytics.ts b/app/components/Views/TrendingView/search/analytics.ts
new file mode 100644
index 00000000000..2676dca8487
--- /dev/null
+++ b/app/components/Views/TrendingView/search/analytics.ts
@@ -0,0 +1,106 @@
+import { useCallback, useRef } from 'react';
+import { analytics } from '../../../../util/analytics/analytics';
+import { AnalyticsEventBuilder } from '../../../../util/analytics/AnalyticsEventBuilder';
+import { MetaMetricsEvents } from '../../../../core/Analytics/MetaMetrics.events';
+
+export type ExploreTabName =
+  | 'Now'
+  | 'Macro'
+  | 'RWAs'
+  | 'Crypto'
+  | 'Sports'
+  | 'Sites';
+
+export type ExploreSectionName =
+  | 'tokens_movers'
+  | 'tokens_trending'
+  | 'perps_movers'
+  | 'perps_stocks_commodities'
+  | 'perps_markets'
+  | 'perps_crypto'
+  | 'stocks'
+  | 'predictions_trending'
+  | 'predictions_politics'
+  | 'predictions_crypto'
+  | 'predictions_sports'
+  | 'predictions_football'
+  | 'predictions_basketball'
+  | 'predictions_tennis'
+  | 'sites_recents'
+  | 'sites_favorites'
+  | 'sites_ecosystems'
+  | 'sites_popular';
+
+export interface ExploreInteractedProperties {
+  interaction_type:
+    | 'tab_switched'
+    | 'section_see_all_tapped'
+    | 'section_item_tapped'
+    | 'prediction_voted';
+  tab_name: ExploreTabName;
+  section_name?: ExploreSectionName;
+  position?: number;
+  asset_type?: 'token' | 'stock' | 'perp' | 'prediction' | 'dapp';
+  previous_tab?: ExploreTabName;
+  token_address?: string;
+  token_symbol?: string;
+  chain_id?: string;
+  item_clicked?: string;
+}
+
+export const trackExploreInteracted = (
+  properties: ExploreInteractedProperties,
+): void => {
+  analytics.trackEvent(
+    AnalyticsEventBuilder.createEventBuilder(
+      MetaMetricsEvents.EXPLORE_INTERACTED,
+    )
+      .addProperties(properties as unknown as Record<string, unknown>)
+      .build(),
+  );
+};
+
+/** Single-line wrapper around the analytics builder boilerplate. */
+export const trackExploreEvent = (
+  event: Parameters<typeof AnalyticsEventBuilder.createEventBuilder>[0],
+  properties: Record<string, string>,
+): void => {
+  analytics.trackEvent(
+    AnalyticsEventBuilder.createEventBuilder(event)
+      .addProperties(properties)
+      .build(),
+  );
+};
+
+/**
+ * Returns a stable `onScrollBeginDrag` handler that fires a one-shot analytics
+ * event the first time the user begins scrolling.
+ */
+export const useScrollTracking = (
+  interactionType: string,
+  searchQuery: string,
+  extraProperties?: Record<string, string>,
+) => {
+  const hasTracked = useRef(false);
+  const searchQueryRef = useRef(searchQuery);
+  searchQueryRef.current = searchQuery;
+
+  const extraPropsRef = useRef(extraProperties);
+  extraPropsRef.current = extraProperties;
+
+  const onScrollBeginDrag = useCallback(() => {
+    if (hasTracked.current) return;
+    hasTracked.current = true;
+    trackExploreEvent(MetaMetricsEvents.EXPLORE_SEARCH_INTERACTED, {
+      interaction_type: interactionType,
+      search_query: searchQueryRef.current,
+      ...extraPropsRef.current,
+    });
+  }, [interactionType]);
+
+  const resetScrollTracking = useCallback(() => {
+    hasTracked.current = false;
+  }, []);
+
+  return { onScrollBeginDrag, resetScrollTracking };
+};
diff --git a/app/components/Views/TrendingView/search/useExploreSearch.ts b/app/components/Views/TrendingView/search/useExploreSearch.ts
new file mode 100644
index 00000000000..0e8b3bfc6a8
--- /dev/null
+++ b/app/components/Views/TrendingView/search/useExploreSearch.ts
@@ -0,0 +1,131 @@
+import { useEffect, useMemo, useState } from 'react';
+import { useSelector } from 'react-redux';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import type { PerpsMarketData } from '@metamask/perps-controller';
+import type { PredictMarket as PredictMarketType } from '../../../UI/Predict/types';
+import type { SiteData } from '../../../UI/Sites/components/SiteRowItem/SiteRowItem';
+import { selectPerpsEnabledFlag } from '../../../UI/Perps';
+import { strings } from '../../../../../locales/i18n';
+import { useTokensFeed } from '../feeds/tokens/useTokensFeed';
+import { usePerpsFeed } from '../feeds/perps/usePerpsFeed';
+import { useStocksFeed } from '../feeds/stocks/useStocksFeed';
+import { usePredictionsFeed } from '../feeds/predictions/usePredictionsFeed';
+import { useSitesFeed } from '../feeds/sites/useSitesFeed';
+
+/** Feeds that participate in the omni-search across the Explore page. */
+export type SearchFeedId =
+  | 'tokens'
+  | 'perps'
+  | 'stocks'
+  | 'predictions'
+  | 'sites';
+
+const DEBOUNCE_MS = 200;
+const TOP_ITEMS_WITHOUT_QUERY = 3;
+
+/** Result shape per feed so consumers can render with the right row item. */
+export type SearchFeedData =
+  | { feedId: 'tokens'; items: TrendingAsset[] }
+  | { feedId: 'stocks'; items: TrendingAsset[] }
+  | { feedId: 'perps'; items: PerpsMarketData[] }
+  | { feedId: 'predictions'; items: PredictMarketType[] }
+  | { feedId: 'sites'; items: SiteData[] };
+
+export interface SearchFeedSection<T = unknown> {
+  feedId: SearchFeedId;
+  title: string;
+  items: T[];
+  isLoading: boolean;
+}
+
+export interface ExploreSearchResult {
+  /** Ordered sections to render. Perps is omitted when the flag is disabled. */
+  sections: SearchFeedSection[];
+}
+
+/**
+ * Aggregates the 5 search-relevant feeds (tokens, perps, stocks, predictions,
+ * sites) and applies common search behavior: debouncing and top-N truncation
+ * when no query is present.
+ */
+export const useExploreSearch = (query: string): ExploreSearchResult => {
+  const [debouncedQuery, setDebouncedQuery] = useState(query);
+  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
+
+  useEffect(() => {
+    const timer = setTimeout(() => setDebouncedQuery(query), DEBOUNCE_MS);
+    return () => clearTimeout(timer);
+  }, [query]);
+
+  const isDebouncing = query !== debouncedQuery;
+
+  const tokens = useTokensFeed({ query: debouncedQuery });
+  const perps = usePerpsFeed({ query: debouncedQuery });
+  const stocks = useStocksFeed({ query: debouncedQuery });
+  const predictions = usePredictionsFeed({
+    variant: 'trending',
+    query: debouncedQuery,
+  });
+  const sites = useSitesFeed({ query: debouncedQuery });
+
+  return useMemo<ExploreSearchResult>(() => {
+    const showTopItems = !debouncedQuery.trim();
+    const trim = <T>(arr: T[]) =>
+      showTopItems ? arr.slice(0, TOP_ITEMS_WITHOUT_QUERY) : arr;
+
+    const sections: SearchFeedSection[] = [
+      {
+        feedId: 'tokens',
+        title: strings('trending.crypto'),
+        items: trim(tokens.data),
+        isLoading: isDebouncing || tokens.isLoading,
+      },
+    ];
+
+    if (isPerpsEnabled) {
+      sections.push({
+        feedId: 'perps',
+        title: strings('trending.perps'),
+        items: trim(perps.data.map((d) => d.market)),
+        isLoading: isDebouncing || perps.isLoading,
+      });
+    }
+
+    sections.push(
+      {
+        feedId: 'stocks',
+        title: strings('trending.stocks'),
+        items: trim(stocks.data),
+        isLoading: isDebouncing || stocks.isLoading,
+      },
+      {
+        feedId: 'predictions',
+        title: strings('wallet.predict'),
+        items: trim(predictions.data),
+        isLoading: isDebouncing || predictions.isLoading,
+      },
+      {
+        feedId: 'sites',
+        title: strings('trending.sites'),
+        items: trim(sites.data),
+        isLoading: isDebouncing || sites.isLoading,
+      },
+    );
+
+    return { sections };
+  }, [
+    debouncedQuery,
+    isDebouncing,
+    isPerpsEnabled,
+    tokens.data,
+    tokens.isLoading,
+    perps.data,
+    perps.isLoading,
+    stocks.data,
+    stocks.isLoading,
+    predictions.data,
+    predictions.isLoading,
+    sites.data,
+    sites.isLoading,
+  ]);
+};
diff --git a/app/components/Views/TrendingView/sections.config.test.tsx b/app/components/Views/TrendingView/sections.config.test.tsx
deleted file mode 100644
index 8bd31d6b131..00000000000
--- a/app/components/Views/TrendingView/sections.config.test.tsx
+++ /dev/null
@@ -1,296 +0,0 @@
-/**
- * Tests for sections.config.tsx
- * Covers the getItemIdentifier functions added for analytics tracking.
- */
-
-// Mock all heavy dependencies before importing SECTIONS_CONFIG
-jest.mock('../../../constants/navigation/Routes', () => ({
-  __esModule: true,
-  default: {
-    WALLET: {
-      TRENDING_TOKENS_FULL_VIEW: 'TrendingTokensFullView',
-      RWA_TOKENS_FULL_VIEW: 'RwaTokensFullView',
-    },
-    PERPS: {
-      ROOT: 'PerpsRoot',
-      MARKET_LIST: 'PerpsMarketList',
-      MARKET_DETAILS: 'PerpsMarketDetails',
-    },
-    PREDICT: {
-      ROOT: 'PredictRoot',
-      MARKET_LIST: 'PredictMarketList',
-    },
-    SITES_FULL_VIEW: 'SitesFullView',
-  },
-}));
-
-jest.mock('../../../../locales/i18n', () => ({
-  strings: (key: string) => key,
-}));
-
-jest.mock('react-redux', () => ({
-  useSelector: jest.fn(),
-  useContext: jest.fn(),
-}));
-
-jest.mock(
-  '../../UI/Trending/components/TrendingTokenRowItem/TrendingTokenRowItem',
-  () => () => null,
-);
-jest.mock(
-  '../../UI/Trending/components/TrendingTokenSkeleton/TrendingTokensSkeleton',
-  () => () => null,
-);
-jest.mock('../../UI/Perps/components/PerpsMarketRowItem', () => () => null);
-jest.mock('../../UI/Perps/hooks', () => ({ usePerpsMarkets: jest.fn() }));
-jest.mock('@metamask/perps-controller', () => ({
-  filterMarketsByQuery: jest.fn((markets: unknown[]) => markets),
-  PERPS_EVENT_VALUE: { SOURCE: { EXPLORE: 'explore' } },
-}));
-jest.mock('../../UI/Predict/hooks/usePredictMarketData', () => ({
-  usePredictMarketData: jest.fn(),
-}));
-jest.mock('../../UI/Predict/components/PredictMarketRowItem', () => () => null);
-jest.mock(
-  '../../UI/Sites/components/SiteRowItemWrapper/SiteRowItemWrapper',
-  () => () => null,
-);
-jest.mock(
-  '../../UI/Sites/components/SiteSkeleton/SiteSkeleton',
-  () => () => null,
-);
-jest.mock('../../UI/Sites/hooks/useSiteData/useSitesData', () => ({
-  useSitesData: jest.fn(),
-}));
-jest.mock(
-  '../../UI/Trending/hooks/useTrendingSearch/useTrendingSearch',
-  () => ({ useTrendingSearch: jest.fn() }),
-);
-jest.mock('../../UI/Trending/hooks/useRwaTokens/useRwaTokens', () => ({
-  useRwaTokens: jest.fn(),
-}));
-jest.mock('../../UI/Perps', () => ({ selectPerpsEnabledFlag: jest.fn() }));
-jest.mock('../../UI/Perps/providers/PerpsConnectionProvider', () => ({
-  PerpsConnectionContext: {},
-  PerpsConnectionProvider: ({ children }: { children: React.ReactNode }) =>
-    children,
-}));
-jest.mock('../../UI/Perps/providers/PerpsStreamManager', () => ({
-  PerpsStreamProvider: ({ children }: { children: React.ReactNode }) =>
-    children,
-}));
-jest.mock('./components/Sections/SectionTypes/SectionCard', () => () => null);
-jest.mock(
-  './components/Sections/SectionTypes/SectionCarrousel',
-  () => () => null,
-);
-jest.mock(
-  './components/Sections/SectionTypes/PerpsExploreSection',
-  () => () => null,
-);
-jest.mock('../../UI/Predict/components/PredictMarket', () => () => null);
-jest.mock(
-  '../../UI/Predict/components/PredictMarketSkeleton',
-  () => () => null,
-);
-jest.mock(
-  '../Homepage/Sections/Perpetuals/components/PerpsMarketTileCard',
-  () => () => null,
-);
-jest.mock(
-  '../Homepage/Sections/Perpetuals/components/PerpsMarketTileCardSkeleton',
-  () => () => null,
-);
-jest.mock('fuse.js', () =>
-  jest.fn().mockImplementation(() => ({
-    search: jest.fn().mockReturnValue([]),
-  })),
-);
-
-import { SECTIONS_CONFIG } from './sections.config';
-import { renderHook } from '@testing-library/react-native';
-import { usePerpsMarkets } from '../../UI/Perps/hooks';
-
-describe('SECTIONS_CONFIG getItemIdentifier', () => {
-  describe('tokens section', () => {
-    it('extracts assetId from a token item', () => {
-      const item = { assetId: 'token-abc-123', symbol: 'BTC', name: 'Bitcoin' };
-
-      const result = SECTIONS_CONFIG.tokens.getItemIdentifier(item);
-
-      expect(result).toBe('token-abc-123');
-    });
-
-    it('extracts assetId with special characters', () => {
-      const item = { assetId: 'eip155:1/erc20:0xabc', symbol: 'USDC' };
-
-      const result = SECTIONS_CONFIG.tokens.getItemIdentifier(item);
-
-      expect(result).toBe('eip155:1/erc20:0xabc');
-    });
-  });
-
-  describe('perps section', () => {
-    it('extracts symbol from a perps market item', () => {
-      const item = { symbol: 'BTC-USD', name: 'Bitcoin', price: 50000 };
-
-      const result = SECTIONS_CONFIG.perps.getItemIdentifier(item);
-
-      expect(result).toBe('BTC-USD');
-    });
-
-    it('extracts symbol with various market pairs', () => {
-      const item = { symbol: 'ETH-PERP', name: 'Ethereum Perpetual' };
-
-      const result = SECTIONS_CONFIG.perps.getItemIdentifier(item);
-
-      expect(result).toBe('ETH-PERP');
-    });
-  });
-
-  describe('stocks section', () => {
-    it('extracts assetId from a stocks item', () => {
-      const item = { assetId: 'stock-aapl-456', symbol: 'AAPL', name: 'Apple' };
-
-      const result = SECTIONS_CONFIG.stocks.getItemIdentifier(item);
-
-      expect(result).toBe('stock-aapl-456');
-    });
-  });
-
-  describe('predictions section', () => {
-    it('extracts id from a prediction market item', () => {
-      const item = { id: 'predict-market-789', title: 'Will BTC reach 100k?' };
-
-      const result = SECTIONS_CONFIG.predictions.getItemIdentifier(item);
-
-      expect(result).toBe('predict-market-789');
-    });
-
-    it('extracts id when item has additional fields', () => {
-      const item = {
-        id: 'market-42',
-        title: 'Election outcome',
-        description: 'Who will win?',
-        volume: 1000,
-      };
-
-      const result = SECTIONS_CONFIG.predictions.getItemIdentifier(item);
-
-      expect(result).toBe('market-42');
-    });
-  });
-
-  describe('sites section', () => {
-    it('extracts url from a site item', () => {
-      const item = {
-        url: 'https://uniswap.org',
-        name: 'Uniswap',
-        displayUrl: 'uniswap.org',
-      };
-
-      const result = SECTIONS_CONFIG.sites.getItemIdentifier(item);
-
-      expect(result).toBe('https://uniswap.org');
-    });
-
-    it('extracts url with path components', () => {
-      const item = {
-        url: 'https://app.aave.com/markets',
-        name: 'Aave Markets',
-      };
-
-      const result = SECTIONS_CONFIG.sites.getItemIdentifier(item);
-
-      expect(result).toBe('https://app.aave.com/markets');
-    });
-  });
-
-  describe('getItemIdentifier presence', () => {
-    it('is defined for all sections', () => {
-      const sectionIds = Object.keys(
-        SECTIONS_CONFIG,
-      ) as (keyof typeof SECTIONS_CONFIG)[];
-
-      sectionIds.forEach((sectionId) => {
-        expect(SECTIONS_CONFIG[sectionId].getItemIdentifier).toBeDefined();
-      });
-    });
-  });
-});
-
-describe('SECTIONS_CONFIG perps useSectionData sorting', () => {
-  const mockUsePerpsMarkets = usePerpsMarkets as jest.MockedFunction<
-    typeof usePerpsMarkets
-  >;
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('sorts markets by change24hPercent descending when no search query', () => {
-    const unsortedMarkets = [
-      { symbol: 'ETH', change24hPercent: '2.5' },
-      { symbol: 'BTC', change24hPercent: '10.0' },
-      { symbol: 'SOL', change24hPercent: '-3.0' },
-      { symbol: 'DOGE', change24hPercent: '5.0' },
-    ];
-
-    mockUsePerpsMarkets.mockReturnValue({
-      markets: unsortedMarkets,
-      isLoading: false,
-      refresh: jest.fn(),
-      isRefreshing: false,
-    } as never);
-
-    const { result } = renderHook(() => SECTIONS_CONFIG.perps.useSectionData());
-
-    const symbols = result.current.data.map(
-      (m: unknown) => (m as { symbol: string }).symbol,
-    );
-    expect(symbols).toEqual(['BTC', 'DOGE', 'ETH', 'SOL']);
-  });
-
-  it('places markets with invalid change24hPercent at the end', () => {
-    const markets = [
-      { symbol: 'ETH', change24hPercent: '5.0' },
-      { symbol: 'BAD', change24hPercent: 'invalid' },
-      { symbol: 'BTC', change24hPercent: '10.0' },
-    ];
-
-    mockUsePerpsMarkets.mockReturnValue({
-      markets,
-      isLoading: false,
-      refresh: jest.fn(),
-      isRefreshing: false,
-    } as never);
-
-    const { result } = renderHook(() => SECTIONS_CONFIG.perps.useSectionData());
-
-    const symbols = result.current.data.map(
-      (m: unknown) => (m as { symbol: string }).symbol,
-    );
-    expect(symbols).toEqual(['BTC', 'ETH', 'BAD']);
-  });
-
-  it('does not sort when search query is provided (delegates to fuse)', () => {
-    const markets = [
-      { symbol: 'ETH', change24hPercent: '2.5' },
-      { symbol: 'BTC', change24hPercent: '10.0' },
-    ];
-
-    mockUsePerpsMarkets.mockReturnValue({
-      markets,
-      isLoading: false,
-      refresh: jest.fn(),
-      isRefreshing: false,
-    } as never);
-
-    const { result } = renderHook(() =>
-      SECTIONS_CONFIG.perps.useSectionData('btc'),
-    );
-
-    // fuse.search is mocked to return [], verifying search path is taken
-    expect(result.current.data).toEqual([]);
-  });
-});
diff --git a/app/components/Views/TrendingView/sections.config.tsx b/app/components/Views/TrendingView/sections.config.tsx
deleted file mode 100644
index 324c6123595..00000000000
--- a/app/components/Views/TrendingView/sections.config.tsx
+++ /dev/null
@@ -1,520 +0,0 @@
-import React, { PropsWithChildren, useContext, useMemo } from 'react';
-import Fuse, { type FuseOptions } from 'fuse.js';
-import type { NavigationProp } from '@react-navigation/native';
-import type { TrendingAsset } from '@metamask/assets-controllers';
-import type { AppNavigationProp } from '../../../core/NavigationService/types';
-import { useSelector } from 'react-redux';
-import Routes from '../../../constants/navigation/Routes';
-import { strings } from '../../../../locales/i18n';
-import TrendingTokenRowItem from '../../UI/Trending/components/TrendingTokenRowItem/TrendingTokenRowItem';
-import TrendingTokensSkeleton from '../../UI/Trending/components/TrendingTokenSkeleton/TrendingTokensSkeleton';
-import PerpsMarketRowItem from '../../UI/Perps/components/PerpsMarketRowItem';
-import {
-  filterMarketsByQuery,
-  PERPS_EVENT_VALUE,
-  type PerpsMarketData,
-} from '@metamask/perps-controller';
-import type { PredictMarket as PredictMarketType } from '../../UI/Predict/types';
-import type { PerpsNavigationParamList } from '../../UI/Perps/types/navigation';
-import { usePredictMarketData } from '../../UI/Predict/hooks/usePredictMarketData';
-import { selectPerpsEnabledFlag } from '../../UI/Perps';
-import { selectExploreSectionsOrder } from '../../../selectors/featureFlagController/exploreSectionsOrder';
-import { usePerpsMarkets } from '../../UI/Perps/hooks';
-import {
-  PerpsConnectionContext,
-  PerpsConnectionProvider,
-} from '../../UI/Perps/providers/PerpsConnectionProvider';
-import { PerpsStreamProvider } from '../../UI/Perps/providers/PerpsStreamManager';
-import {
-  Box,
-  IconName as DSIconName,
-} from '@metamask/design-system-react-native';
-import { IconName as LocalIconName } from '../../../component-library/components/Icons/Icon/Icon.types';
-import type { SiteData } from '../../UI/Sites/components/SiteRowItem/SiteRowItem';
-import SiteRowItemWrapper from '../../UI/Sites/components/SiteRowItemWrapper/SiteRowItemWrapper';
-import SiteSkeleton from '../../UI/Sites/components/SiteSkeleton/SiteSkeleton';
-import { useSitesData } from '../../UI/Sites/hooks/useSiteData/useSitesData';
-import { useTrendingSearch } from '../../UI/Trending/hooks/useTrendingSearch/useTrendingSearch';
-import {
-  TimeOption,
-  PriceChangeOption,
-} from '../../UI/Trending/components/TrendingTokensBottomSheet';
-import type { TrendingFilterContext } from '../../UI/Trending/components/TrendingTokensList/TrendingTokensList';
-import PredictMarketRowItem from '../../UI/Predict/components/PredictMarketRowItem';
-import SectionCard from './components/Sections/SectionTypes/SectionCard';
-import { useRwaTokens } from '../../UI/Trending/hooks/useRwaTokens/useRwaTokens';
-import SectionCarrousel from './components/Sections/SectionTypes/SectionCarrousel';
-import PredictMarket from '../../UI/Predict/components/PredictMarket';
-import PredictMarketSkeleton from '../../UI/Predict/components/PredictMarketSkeleton';
-import PerpsMarketTileCard from '../Homepage/Sections/Perpetuals/components/PerpsMarketTileCard';
-import PerpsMarketTileCardSkeleton from '../Homepage/Sections/Perpetuals/components/PerpsMarketTileCardSkeleton';
-import PerpsExploreSection from './components/Sections/SectionTypes/PerpsExploreSection';
-
-export type SectionId = 'predictions' | 'tokens' | 'perps' | 'stocks' | 'sites';
-
-export type SectionIcon =
-  | { source: 'local'; name: LocalIconName }
-  | { source: 'design-system'; name: DSIconName };
-
-interface SectionData {
-  data: unknown[];
-  isLoading: boolean;
-}
-
-export interface SectionConfig {
-  id: SectionId;
-  title: string;
-  icon: SectionIcon;
-  viewAllAction: (navigation: AppNavigationProp) => void;
-  /** Returns a stable identifier for an item (e.g. assetId, symbol, url) used in analytics */
-  getItemIdentifier: (item: unknown) => string;
-  RowItem: React.ComponentType<{
-    item: unknown;
-    index: number;
-    navigation: AppNavigationProp;
-  }>;
-  OverrideRowItemSearch?: React.ComponentType<{
-    item: unknown;
-    index?: number;
-    navigation: AppNavigationProp;
-  }>;
-  Skeleton: React.ComponentType;
-  OverrideSkeletonSearch?: React.ComponentType;
-  Section: React.ComponentType<{
-    sectionId: SectionId;
-    data: unknown[];
-    isLoading: boolean;
-  }>;
-  useSectionData: (searchQuery?: string) => {
-    data: unknown[];
-    isLoading: boolean;
-    refetch: () => Promise<void> | void;
-  };
-  SectionWrapper?: React.ComponentType<PropsWithChildren>;
-}
-
-const BASE_FUSE_OPTIONS = {
-  shouldSort: true,
-  // Tweak threshold search strictness (0.0 = strict, 1.0 = lenient)
-  threshold: 0.2,
-  location: 0,
-  distance: 100,
-  maxPatternLength: 32,
-  minMatchCharLength: 1,
-} as const;
-
-const fuseSearch = <T,>(
-  data: T[],
-  searchQuery: string | undefined,
-  fuseOptions: FuseOptions<T>,
-  searchSortingFn?: (a: T, b: T) => number,
-): T[] => {
-  searchQuery = searchQuery?.trim();
-  if (!searchQuery) {
-    return data;
-  }
-  const fuse = new Fuse(data, fuseOptions);
-  const results = fuse.search(searchQuery);
-
-  if (searchSortingFn) {
-    return results.sort(searchSortingFn);
-  }
-
-  return results;
-};
-
-const TOKEN_FUSE_OPTIONS: FuseOptions<TrendingAsset> = {
-  ...BASE_FUSE_OPTIONS,
-  keys: ['symbol', 'name', 'assetId'],
-};
-
-const PERPS_FUSE_OPTIONS: FuseOptions<PerpsMarketData> = {
-  ...BASE_FUSE_OPTIONS,
-  keys: ['symbol', 'name'],
-};
-
-const PREDICTIONS_FUSE_OPTIONS: FuseOptions<PredictMarketType> = {
-  ...BASE_FUSE_OPTIONS,
-  keys: ['title', 'description'],
-};
-
-/**
- * Centralized configuration for all Trending View sections.
- * This config is used by QuickActions, SectionHeaders, Search, and TrendingView rendering.
- *
- * To add a new section (EVERYTHING IN THIS FILE):
- * 1. Add the section ID to the SectionId type above
- * 2. Add the config to SECTIONS_CONFIG, HOME_SECTIONS_ARRAY, and SECTIONS_ARRAY below
- * 3. Add the hook to useSectionsData below
- *
- * The section will automatically appear in:
- * - TrendingView main feed
- * - QuickActions buttons
- * - Search results
- * - Section headers with "View All" navigation
- */
-
-/**
- * Default filter context for tokens in the Trending View home section.
- * Used for analytics tracking of token clicks from the home page.
- */
-const DEFAULT_TOKENS_FILTER_CONTEXT: TrendingFilterContext = {
-  timeFilter: TimeOption.TwentyFourHours,
-  sortOption: PriceChangeOption.PriceChange,
-  networkFilter: 'all',
-  isSearchResult: false,
-};
-
-/**
- * Filter context for tokens in search results on the Explore page.
- * Used for analytics tracking of token clicks from search results.
- */
-const SEARCH_TOKENS_FILTER_CONTEXT: TrendingFilterContext = {
-  timeFilter: TimeOption.TwentyFourHours,
-  sortOption: PriceChangeOption.PriceChange,
-  networkFilter: 'all',
-  isSearchResult: true,
-};
-
-export const SECTIONS_CONFIG: Record<SectionId, SectionConfig> = {
-  tokens: {
-    id: 'tokens',
-    title: strings('trending.trending_tokens'),
-    icon: { source: 'design-system', name: DSIconName.Ethereum },
-    viewAllAction: (navigation) => {
-      navigation.navigate(Routes.WALLET.TRENDING_TOKENS_FULL_VIEW);
-    },
-    getItemIdentifier: (item) => (item as Partial<TrendingAsset>).assetId ?? '',
-    RowItem: ({ item, index }) => (
-      <TrendingTokenRowItem
-        token={item as TrendingAsset}
-        position={index}
-        filterContext={DEFAULT_TOKENS_FILTER_CONTEXT}
-      />
-    ),
-    OverrideRowItemSearch: ({ item, index }) => (
-      <TrendingTokenRowItem
-        token={item as TrendingAsset}
-        position={index}
-        filterContext={SEARCH_TOKENS_FILTER_CONTEXT}
-      />
-    ),
-    Skeleton: TrendingTokensSkeleton,
-    Section: SectionCard,
-    useSectionData: (searchQuery) => {
-      const { data, isLoading, refetch } = useTrendingSearch({
-        searchQuery,
-        enableDebounce: false, // Disable debouncing here because useExploreSearch already handles it
-      });
-      const filteredData = useMemo(
-        () =>
-          fuseSearch(
-            data,
-            searchQuery,
-            TOKEN_FUSE_OPTIONS,
-            // Penalize zero marketCap tokens
-            (a, b) => (b.marketCap ?? 0) - (a.marketCap ?? 0),
-          ),
-        [data, searchQuery],
-      );
-      return { data: filteredData, isLoading, refetch };
-    },
-  },
-  perps: {
-    id: 'perps',
-    title: strings('trending.perps'),
-    icon: { source: 'design-system', name: DSIconName.Candlestick },
-    viewAllAction: (navigation) => {
-      navigation.navigate(Routes.PERPS.ROOT, {
-        screen: Routes.PERPS.MARKET_LIST,
-        params: {
-          defaultMarketTypeFilter: 'all',
-          source: PERPS_EVENT_VALUE.SOURCE.EXPLORE,
-        },
-      });
-    },
-    getItemIdentifier: (item) =>
-      (item as Partial<PerpsMarketData>).symbol ?? '',
-    RowItem: ({ item, index: _index, navigation }) => (
-      <PerpsMarketTileCard
-        market={item as PerpsMarketData}
-        testID={`perps-market-tile-card-${(item as PerpsMarketData).symbol}`}
-        onPress={() => {
-          (navigation as NavigationProp<PerpsNavigationParamList>)?.navigate(
-            Routes.PERPS.ROOT,
-            {
-              screen: Routes.PERPS.MARKET_DETAILS,
-              params: {
-                market: item as PerpsMarketData,
-                source: PERPS_EVENT_VALUE.SOURCE.EXPLORE,
-              },
-            },
-          );
-        }}
-      />
-    ),
-    OverrideRowItemSearch: ({ item, index: _index, navigation }) => (
-      <PerpsMarketRowItem
-        market={item as PerpsMarketData}
-        onPress={() => {
-          (navigation as NavigationProp<PerpsNavigationParamList>)?.navigate(
-            Routes.PERPS.ROOT,
-            {
-              screen: Routes.PERPS.MARKET_DETAILS,
-              params: {
-                market: item as PerpsMarketData,
-                source: PERPS_EVENT_VALUE.SOURCE.EXPLORE,
-              },
-            },
-          );
-        }}
-        showBadge={false}
-        compact
-      />
-    ),
-
-    Skeleton: PerpsMarketTileCardSkeleton,
-    OverrideSkeletonSearch: TrendingTokensSkeleton,
-    SectionWrapper: ({ children }) => (
-      <PerpsConnectionProvider suppressErrorView>
-        <PerpsStreamProvider>{children}</PerpsStreamProvider>
-      </PerpsConnectionProvider>
-    ),
-    Section: PerpsExploreSection,
-    useSectionData: (searchQuery) => {
-      const connectionContext = useContext(PerpsConnectionContext);
-      const { markets, isLoading, refresh, isRefreshing } = usePerpsMarkets();
-
-      const filteredMarkets = useMemo(() => {
-        if (connectionContext?.error) return [];
-        if (!searchQuery) {
-          return [...markets].sort(
-            (a, b) =>
-              (parseFloat(b.change24hPercent) || 0) -
-              (parseFloat(a.change24hPercent) || 0),
-          );
-        }
-        const filteredByQuery = filterMarketsByQuery(markets, searchQuery);
-        return fuseSearch(filteredByQuery, searchQuery, PERPS_FUSE_OPTIONS);
-      }, [markets, searchQuery, connectionContext?.error]);
-
-      return {
-        data: filteredMarkets,
-        isLoading: connectionContext?.error ? false : isLoading || isRefreshing,
-        refetch: refresh,
-      };
-    },
-  },
-  stocks: {
-    id: 'stocks',
-    title: strings('trending.stocks'),
-    icon: { source: 'local', name: LocalIconName.CorporateFare },
-    viewAllAction: (navigation) => {
-      navigation.navigate(Routes.WALLET.RWA_TOKENS_FULL_VIEW);
-    },
-    getItemIdentifier: (item) => (item as Partial<TrendingAsset>).assetId ?? '',
-    RowItem: ({ item, index }) => (
-      <TrendingTokenRowItem
-        token={item as TrendingAsset}
-        position={index}
-        filterContext={DEFAULT_TOKENS_FILTER_CONTEXT}
-      />
-    ),
-    OverrideRowItemSearch: ({ item, index }) => (
-      <TrendingTokenRowItem
-        token={item as TrendingAsset}
-        position={index}
-        filterContext={SEARCH_TOKENS_FILTER_CONTEXT}
-      />
-    ),
-    Skeleton: TrendingTokensSkeleton,
-    Section: SectionCard,
-    useSectionData: (searchQuery) => {
-      const { data, isLoading, refetch } = useRwaTokens({ searchQuery });
-      return { data, isLoading, refetch };
-    },
-  },
-  predictions: {
-    id: 'predictions',
-    title: strings('wallet.predict'),
-    icon: { source: 'design-system', name: DSIconName.Speedometer },
-    viewAllAction: (navigation) => {
-      navigation.navigate(Routes.PREDICT.ROOT, {
-        screen: Routes.PREDICT.MARKET_LIST,
-      });
-    },
-    getItemIdentifier: (item) => (item as Partial<PredictMarketType>).id ?? '',
-    RowItem: ({ item, index: _index }) => (
-      <Box twClassName="py-2">
-        <PredictMarket
-          market={item as PredictMarketType}
-          isCarousel
-          testID={`predict-market-row-item-${(item as PredictMarketType).id}`}
-        />
-      </Box>
-    ),
-    OverrideRowItemSearch: ({ item }) => (
-      <PredictMarketRowItem market={item as PredictMarketType} />
-    ),
-    Skeleton: () => <PredictMarketSkeleton isCarousel />,
-    // Using sites skeleton cause PredictMarketSkeleton has too much spacing
-    OverrideSkeletonSearch: SiteSkeleton,
-    Section: SectionCarrousel,
-    useSectionData: (searchQuery) => {
-      const { marketData, isFetching, refetch } = usePredictMarketData({
-        category: 'trending',
-        pageSize: searchQuery ? 20 : 6,
-        q: searchQuery || undefined,
-      });
-
-      const filteredData = useMemo(
-        () => fuseSearch(marketData, searchQuery, PREDICTIONS_FUSE_OPTIONS),
-        [marketData, searchQuery],
-      );
-
-      return { data: filteredData, isLoading: isFetching, refetch };
-    },
-  },
-  sites: {
-    id: 'sites',
-    title: strings('trending.sites'),
-    icon: { source: 'design-system', name: DSIconName.Global },
-    viewAllAction: (navigation) => {
-      navigation.navigate(Routes.SITES_FULL_VIEW);
-    },
-    getItemIdentifier: (item) => (item as Partial<SiteData>).url ?? '',
-    RowItem: ({ item, index: _index, navigation }) => (
-      <SiteRowItemWrapper site={item as SiteData} navigation={navigation} />
-    ),
-    Skeleton: SiteSkeleton,
-    Section: SectionCard,
-    useSectionData: (searchQuery) => {
-      const { sites, isLoading, refetch } = useSitesData(searchQuery);
-      return { data: sites, isLoading, refetch };
-    },
-  },
-};
-
-const DEFAULT_HOME_ORDER: SectionId[] = [
-  SECTIONS_CONFIG.predictions.id,
-  SECTIONS_CONFIG.tokens.id,
-  SECTIONS_CONFIG.perps.id,
-  SECTIONS_CONFIG.stocks.id,
-  SECTIONS_CONFIG.sites.id,
-];
-const DEFAULT_QUICK_ACTIONS_ORDER: SectionId[] = [
-  SECTIONS_CONFIG.tokens.id,
-  SECTIONS_CONFIG.perps.id,
-  SECTIONS_CONFIG.stocks.id,
-  SECTIONS_CONFIG.predictions.id,
-  SECTIONS_CONFIG.sites.id,
-];
-const DEFAULT_SEARCH_ORDER: SectionId[] = [
-  SECTIONS_CONFIG.tokens.id,
-  SECTIONS_CONFIG.perps.id,
-  SECTIONS_CONFIG.stocks.id,
-  SECTIONS_CONFIG.predictions.id,
-  SECTIONS_CONFIG.sites.id,
-];
-
-const buildSections = (
-  order: SectionId[],
-  isPerpsEnabled: boolean,
-): (SectionConfig & { id: SectionId })[] =>
-  order
-    .filter((id) => isPerpsEnabled || id !== 'perps')
-    .map((id) => SECTIONS_CONFIG[id]);
-
-export const useHomeSections = (): (SectionConfig & { id: SectionId })[] => {
-  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
-  const orderConfig = useSelector(selectExploreSectionsOrder);
-
-  return useMemo(
-    () =>
-      buildSections(orderConfig?.home ?? DEFAULT_HOME_ORDER, isPerpsEnabled),
-    [isPerpsEnabled, orderConfig],
-  );
-};
-
-export const useQuickActionsSectionsArray = (): (SectionConfig & {
-  id: SectionId;
-})[] => {
-  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
-  const orderConfig = useSelector(selectExploreSectionsOrder);
-
-  return useMemo(
-    () =>
-      buildSections(
-        orderConfig?.quickActions ?? DEFAULT_QUICK_ACTIONS_ORDER,
-        isPerpsEnabled,
-      ),
-    [isPerpsEnabled, orderConfig],
-  );
-};
-
-export const useSearchSectionsArray = (): (SectionConfig & {
-  id: SectionId;
-})[] => {
-  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
-  const orderConfig = useSelector(selectExploreSectionsOrder);
-
-  return useMemo(
-    () =>
-      buildSections(
-        orderConfig?.search ?? DEFAULT_SEARCH_ORDER,
-        isPerpsEnabled,
-      ),
-    [isPerpsEnabled, orderConfig],
-  );
-};
-
-/**
- * Centralized hook that fetches data for all sections.
- * When adding a new section, add its hook call here.
- * This keeps all section-related logic in one file.
- *
- * @param searchQuery - Optional search query for sections that support search
- * @returns Data and loading state for all sections
- */
-export const useSectionsData = (
-  searchQuery: string,
-): Record<SectionId, SectionData> => {
-  const { data: trendingTokens, isLoading: isTokensLoading } =
-    SECTIONS_CONFIG.tokens.useSectionData(searchQuery);
-
-  const { data: perpsMarkets, isLoading: isPerpsLoading } =
-    SECTIONS_CONFIG.perps.useSectionData(searchQuery);
-
-  const { data: stocks, isLoading: isStocksLoading } =
-    SECTIONS_CONFIG.stocks.useSectionData(searchQuery);
-
-  const { data: predictionMarkets, isLoading: isPredictionsLoading } =
-    SECTIONS_CONFIG.predictions.useSectionData(searchQuery);
-
-  const { data: sites, isLoading: isSitesLoading } =
-    SECTIONS_CONFIG.sites.useSectionData(searchQuery);
-
-  return {
-    tokens: {
-      data: trendingTokens,
-      isLoading: isTokensLoading,
-    },
-    perps: {
-      data: perpsMarkets,
-      isLoading: isPerpsLoading,
-    },
-    stocks: {
-      // Avoids making 2 API calls to the search endpoint when searching on the main search
-      data: stocks,
-      isLoading: isStocksLoading,
-    },
-    predictions: {
-      data: predictionMarkets,
-      isLoading: isPredictionsLoading,
-    },
-    sites: {
-      data: sites,
-      isLoading: isSitesLoading,
-    },
-  };
-};
diff --git a/app/components/Views/TrendingView/tabs/CryptoTab.tsx b/app/components/Views/TrendingView/tabs/CryptoTab.tsx
new file mode 100644
index 00000000000..9557b4579b0
--- /dev/null
+++ b/app/components/Views/TrendingView/tabs/CryptoTab.tsx
@@ -0,0 +1,214 @@
+import React, { useCallback } from 'react';
+import { useNavigation, NavigationProp } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import { Box } from '@metamask/design-system-react-native';
+import type { ListRenderItem } from '@shopify/flash-list';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import type { PredictMarket as PredictMarketType } from '../../../UI/Predict/types';
+import type { PerpsNavigationParamList } from '../../../UI/Perps/types/navigation';
+import type { AppNavigationProp } from '../../../../core/NavigationService/types';
+import { selectPerpsEnabledFlag } from '../../../UI/Perps';
+import Routes from '../../../../constants/navigation/Routes';
+import { strings } from '../../../../../locales/i18n';
+import { TokenDetailsSource } from '../../../UI/TokenDetails/constants/constants';
+import { useTokensFeed } from '../feeds/tokens/useTokensFeed';
+import { getCaipChainIdFromAssetId } from '../../../UI/Trending/components/TrendingTokenRowItem/utils';
+import { TokenRowItem } from '../feeds/tokens/TokenRowItem';
+import TrendingTokensSkeleton from '../../../UI/Trending/components/TrendingTokenSkeleton/TrendingTokensSkeleton';
+import { usePerpsFeed, type PerpsFeedItem } from '../feeds/perps/usePerpsFeed';
+import type { SortOptionId } from '@metamask/perps-controller';
+import PerpsSectionProvider from '../feeds/perps/PerpsSectionProvider';
+import PerpsTileRowItem from '../feeds/perps/PerpsTileRowItem';
+import PerpsMarketTileCardSkeleton from '../../Homepage/Sections/Perpetuals/components/PerpsMarketTileCardSkeleton';
+import { navigateToPerpsMarketList } from '../feeds/perps/perpsNavigation';
+import { usePredictionsFeed } from '../feeds/predictions/usePredictionsFeed';
+import { PredictionCarouselRowItem } from '../feeds/predictions/PredictionRowItem';
+import PredictionsSkeleton from '../feeds/predictions/PredictionsSkeleton';
+import { navigateToPredictionsList } from '../feeds/predictions/predictionsNavigation';
+import CardList from '../components/CardList';
+import ExploreScroll from '../components/ExploreScroll';
+import HorizontalCarousel from '../components/HorizontalCarousel';
+import SectionHeader from '../components/SectionHeader';
+import TileCarousel from '../components/TileCarousel';
+import type { TabProps } from '../hooks/useExploreRefresh';
+import { trackExploreInteracted } from '../search/analytics';
+
+interface CryptoPerpsBlockProps {
+  refresh: TabProps['refresh'];
+  onViewAll: (sortOptionId: SortOptionId) => void;
+}
+
+const CryptoPerpsBlock: React.FC<CryptoPerpsBlockProps> = ({
+  refresh,
+  onViewAll,
+}) => {
+  const perps = usePerpsFeed({
+    variant: 'crypto',
+    refresh,
+    withTileExtras: true,
+  });
+
+  if (!perps.isLoading && perps.data.length === 0) return null;
+
+  return (
+    <Box>
+      <SectionHeader
+        title={strings('trending.crypto_perps_section')}
+        onViewAll={() => onViewAll(perps.defaultSortOptionId)}
+        testID="section-header-view-all-crypto_perps"
+        tabName="Crypto"
+        sectionName="perps_crypto"
+      />
+      <TileCarousel<PerpsFeedItem>
+        data={perps.data}
+        isLoading={perps.isLoading}
+        renderItem={(item, index) => (
+          <PerpsTileRowItem
+            item={item}
+            testIdPrefix="crypto-tab-perps-market-tile-card"
+            onCardPress={() =>
+              trackExploreInteracted({
+                interaction_type: 'section_item_tapped',
+                tab_name: 'Crypto',
+                section_name: 'perps_crypto',
+                asset_type: 'perp',
+                position: index,
+                item_clicked: item.market.symbol,
+              })
+            }
+          />
+        )}
+        keyExtractor={(item) => item.market.symbol}
+        Skeleton={PerpsMarketTileCardSkeleton}
+        onViewMore={() => onViewAll(perps.defaultSortOptionId)}
+        testID="explore-crypto_perps-carousel"
+        viewMoreTestID="crypto_perps-view-more-card"
+      />
+    </Box>
+  );
+};
+
+const CryptoTab: React.FC<TabProps> = ({ refresh, refreshing, onRefresh }) => {
+  const navigation = useNavigation<AppNavigationProp>();
+  const perpsNavigation =
+    useNavigation<NavigationProp<PerpsNavigationParamList>>();
+  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
+
+  const tokens = useTokensFeed({ refresh });
+  const cryptoPredictions = usePredictionsFeed({
+    variant: 'crypto',
+    refresh,
+  });
+
+  const renderTokenItem: ListRenderItem<TrendingAsset> = useCallback(
+    ({ item, index }) => (
+      <TokenRowItem
+        token={item}
+        index={index}
+        tokenDetailsSource={TokenDetailsSource.ExploreCryptoTrending}
+        onCardPress={() =>
+          trackExploreInteracted({
+            interaction_type: 'section_item_tapped',
+            tab_name: 'Crypto',
+            section_name: 'tokens_trending',
+            asset_type: 'token',
+            position: index,
+            token_symbol: item.symbol,
+            chain_id: getCaipChainIdFromAssetId(item.assetId),
+            item_clicked: item.assetId,
+          })
+        }
+      />
+    ),
+    [],
+  );
+
+  const renderPredictionItem: ListRenderItem<PredictMarketType> = useCallback(
+    ({ item, index }) => (
+      <PredictionCarouselRowItem
+        market={item}
+        testIdPrefix="predict-crypto-market-row-item"
+        onCardPress={() =>
+          trackExploreInteracted({
+            interaction_type: 'section_item_tapped',
+            tab_name: 'Crypto',
+            section_name: 'predictions_crypto',
+            asset_type: 'prediction',
+            position: index,
+            item_clicked: item.id,
+          })
+        }
+        onBuyButtonPress={(marketId) =>
+          trackExploreInteracted({
+            interaction_type: 'prediction_voted',
+            tab_name: 'Crypto',
+            section_name: 'predictions_crypto',
+            item_clicked: marketId,
+          })
+        }
+      />
+    ),
+    [],
+  );
+
+  const showTokens = tokens.isLoading || tokens.data.length > 0;
+  const showCryptoPredictions =
+    cryptoPredictions.isLoading || cryptoPredictions.data.length > 0;
+
+  return (
+    <ExploreScroll refreshing={refreshing} onRefresh={onRefresh}>
+      {showTokens && (
+        <Box>
+          <SectionHeader
+            title={strings('trending.trending_tokens')}
+            onViewAll={() =>
+              navigation.navigate(Routes.WALLET.TRENDING_TOKENS_FULL_VIEW)
+            }
+            testID="section-header-view-all-tokens"
+            tabName="Crypto"
+            sectionName="tokens_trending"
+          />
+          <CardList<TrendingAsset>
+            data={tokens.data}
+            isLoading={tokens.isLoading}
+            renderItem={renderTokenItem}
+            Skeleton={TrendingTokensSkeleton}
+            idPrefix="tokens"
+          />
+        </Box>
+      )}
+
+      {isPerpsEnabled && (
+        <PerpsSectionProvider>
+          <CryptoPerpsBlock
+            refresh={refresh}
+            onViewAll={(sortOptionId) =>
+              navigateToPerpsMarketList(perpsNavigation, 'crypto', sortOptionId)
+            }
+          />
+        </PerpsSectionProvider>
+      )}
+
+      {showCryptoPredictions && (
+        <Box>
+          <SectionHeader
+            title={strings('trending.predictions')}
+            onViewAll={() => navigateToPredictionsList(navigation, 'crypto')}
+            testID="section-header-view-all-crypto_predictions"
+            tabName="Crypto"
+            sectionName="predictions_crypto"
+          />
+          <HorizontalCarousel<PredictMarketType>
+            data={cryptoPredictions.data}
+            isLoading={cryptoPredictions.isLoading}
+            renderItem={renderPredictionItem}
+            Skeleton={PredictionsSkeleton}
+            idPrefix="crypto_predictions"
+          />
+        </Box>
+      )}
+    </ExploreScroll>
+  );
+};
+
+export default CryptoTab;
diff --git a/app/components/Views/TrendingView/tabs/DappsTab.tsx b/app/components/Views/TrendingView/tabs/DappsTab.tsx
new file mode 100644
index 00000000000..6e5ad0b18e4
--- /dev/null
+++ b/app/components/Views/TrendingView/tabs/DappsTab.tsx
@@ -0,0 +1,181 @@
+import React, { useCallback } from 'react';
+import { useNavigation } from '@react-navigation/native';
+import { Box } from '@metamask/design-system-react-native';
+import type { ListRenderItem } from '@shopify/flash-list';
+import type { AppNavigationProp } from '../../../../core/NavigationService/types';
+import type { SiteData } from '../../../UI/Sites/components/SiteRowItem/SiteRowItem';
+import Routes from '../../../../constants/navigation/Routes';
+import { strings } from '../../../../../locales/i18n';
+import SiteTileRowItem from '../feeds/dapps/SiteTileRowItem';
+import SiteTileSkeleton from '../feeds/dapps/SiteTileSkeleton';
+import { useFavoritesFeed } from '../feeds/dapps/useFavoritesFeed';
+import { useNetworksFeed } from '../feeds/dapps/useNetworksFeed';
+import { useRecentsFeed } from '../feeds/dapps/useRecentsFeed';
+import { FavoriteSiteRowItem, SiteRowItem } from '../feeds/sites/SiteRowItem';
+import SiteSkeleton from '../../../UI/Sites/components/SiteSkeleton/SiteSkeleton';
+import { useSitesFeed } from '../feeds/sites/useSitesFeed';
+import CardList from '../components/CardList';
+import ExploreScroll from '../components/ExploreScroll';
+import SectionHeader from '../components/SectionHeader';
+import TileCarousel from '../components/TileCarousel';
+import type { TabProps } from '../hooks/useExploreRefresh';
+import { trackExploreInteracted } from '../search/analytics';
+
+const DappsTab: React.FC<TabProps> = ({ refresh, refreshing, onRefresh }) => {
+  const navigation = useNavigation<AppNavigationProp>();
+
+  const recents = useRecentsFeed({ refresh });
+  const favorites = useFavoritesFeed({ refresh });
+  const networks = useNetworksFeed();
+  const sites = useSitesFeed({ refresh });
+
+  const renderFavorite: ListRenderItem<SiteData> = useCallback(
+    ({ item, index }) => (
+      <FavoriteSiteRowItem
+        site={item}
+        onCardPress={() =>
+          trackExploreInteracted({
+            interaction_type: 'section_item_tapped',
+            tab_name: 'Sites',
+            section_name: 'sites_favorites',
+            asset_type: 'dapp',
+            position: index,
+            item_clicked: item.url,
+          })
+        }
+      />
+    ),
+    [],
+  );
+
+  const renderSite: ListRenderItem<SiteData> = useCallback(
+    ({ item, index }) => (
+      <SiteRowItem
+        site={item}
+        onCardPress={() =>
+          trackExploreInteracted({
+            interaction_type: 'section_item_tapped',
+            tab_name: 'Sites',
+            section_name: 'sites_popular',
+            asset_type: 'dapp',
+            position: index,
+            item_clicked: item.url,
+          })
+        }
+      />
+    ),
+    [],
+  );
+
+  const showRecents = recents.isLoading || recents.data.length > 0;
+  const showFavorites = favorites.isLoading || favorites.data.length > 0;
+  const showSites = sites.isLoading || sites.data.length > 0;
+
+  return (
+    <ExploreScroll refreshing={refreshing} onRefresh={onRefresh}>
+      {showRecents && (
+        <Box>
+          <SectionHeader
+            title={strings('autocomplete.recents')}
+            testID="section-header-view-all-dapps_recents"
+          />
+          <TileCarousel<SiteData>
+            data={recents.data}
+            isLoading={recents.isLoading}
+            renderItem={(site, index) => (
+              <SiteTileRowItem
+                site={site}
+                onCardPress={() =>
+                  trackExploreInteracted({
+                    interaction_type: 'section_item_tapped',
+                    tab_name: 'Sites',
+                    section_name: 'sites_recents',
+                    asset_type: 'dapp',
+                    position: index,
+                    item_clicked: site.url,
+                  })
+                }
+              />
+            )}
+            keyExtractor={(site) => site.url}
+            Skeleton={SiteTileSkeleton}
+            compactSectionTail
+            testID="explore-dapps_recents-carousel"
+          />
+        </Box>
+      )}
+
+      {showFavorites && (
+        <Box>
+          <SectionHeader
+            title={strings('autocomplete.favorites')}
+            onViewAll={() =>
+              navigation.navigate(Routes.SITES_FULL_VIEW, { mode: 'favorites' })
+            }
+            testID="section-header-view-all-dapps_favorites"
+            tabName="Sites"
+            sectionName="sites_favorites"
+          />
+          <CardList<SiteData>
+            data={favorites.data}
+            isLoading={favorites.isLoading}
+            renderItem={renderFavorite}
+            Skeleton={SiteSkeleton}
+            idPrefix="dapps_favorites"
+          />
+        </Box>
+      )}
+
+      <Box>
+        <SectionHeader
+          title={strings('trending.ecosystems')}
+          subtitle={strings('trending.ecosystems_subtitle')}
+          testID="section-header-view-all-dapps_networks"
+        />
+        <TileCarousel<SiteData>
+          data={networks.data}
+          isLoading={false}
+          renderItem={(site, index) => (
+            <SiteTileRowItem
+              site={site}
+              onCardPress={() =>
+                trackExploreInteracted({
+                  interaction_type: 'section_item_tapped',
+                  tab_name: 'Sites',
+                  section_name: 'sites_ecosystems',
+                  asset_type: 'dapp',
+                  position: index,
+                  item_clicked: site.url,
+                })
+              }
+            />
+          )}
+          keyExtractor={(site) => site.url}
+          Skeleton={SiteTileSkeleton}
+          testID="explore-dapps_networks-carousel"
+        />
+      </Box>
+
+      {showSites && (
+        <Box>
+          <SectionHeader
+            title={strings('trending.popular')}
+            onViewAll={() => navigation.navigate(Routes.SITES_FULL_VIEW)}
+            testID="section-header-view-all-sites"
+            tabName="Sites"
+            sectionName="sites_popular"
+          />
+          <CardList<SiteData>
+            data={sites.data}
+            isLoading={sites.isLoading}
+            renderItem={renderSite}
+            Skeleton={SiteSkeleton}
+            idPrefix="sites"
+          />
+        </Box>
+      )}
+    </ExploreScroll>
+  );
+};
+
+export default DappsTab;
diff --git a/app/components/Views/TrendingView/tabs/MacroTab.tsx b/app/components/Views/TrendingView/tabs/MacroTab.tsx
new file mode 100644
index 00000000000..471f5aee9e5
--- /dev/null
+++ b/app/components/Views/TrendingView/tabs/MacroTab.tsx
@@ -0,0 +1,156 @@
+import React, { useCallback, useMemo } from 'react';
+import { useNavigation, NavigationProp } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import { Box } from '@metamask/design-system-react-native';
+import type { ListRenderItem } from '@shopify/flash-list';
+import type { PredictMarket as PredictMarketType } from '../../../UI/Predict/types';
+import type { PerpsMarketData, SortOptionId } from '@metamask/perps-controller';
+import type { PerpsNavigationParamList } from '../../../UI/Perps/types/navigation';
+import type { AppNavigationProp } from '../../../../core/NavigationService/types';
+import { selectPerpsEnabledFlag } from '../../../UI/Perps';
+import { selectPredictEnabledFlag } from '../../../UI/Predict';
+import { strings } from '../../../../../locales/i18n';
+import { usePerpsFeed } from '../feeds/perps/usePerpsFeed';
+import PerpsSectionProvider from '../feeds/perps/PerpsSectionProvider';
+import PerpsToggleBlock from '../feeds/perps/PerpsToggleBlock';
+import { navigateToPerpsMarketList } from '../feeds/perps/perpsNavigation';
+import { usePredictionsFeed } from '../feeds/predictions/usePredictionsFeed';
+import { PredictionCarouselRowItem } from '../feeds/predictions/PredictionRowItem';
+import PredictionsSkeleton from '../feeds/predictions/PredictionsSkeleton';
+import { navigateToPredictionsList } from '../feeds/predictions/predictionsNavigation';
+import ExploreScroll from '../components/ExploreScroll';
+import HorizontalCarousel from '../components/HorizontalCarousel';
+import type { PillToggleCardListTab } from '../components/PillToggleCardList';
+import SectionHeader from '../components/SectionHeader';
+import type { TabProps } from '../hooks/useExploreRefresh';
+import { trackExploreInteracted } from '../search/analytics';
+
+interface MacroPerpsBlockProps {
+  refresh: TabProps['refresh'];
+  onViewAll: (filter: string, sortOptionId: SortOptionId) => void;
+}
+
+const MacroPerpsBlock: React.FC<MacroPerpsBlockProps> = ({
+  refresh,
+  onViewAll,
+}) => {
+  const perps = usePerpsFeed({ variant: 'macro', refresh });
+
+  const tabs = useMemo<PillToggleCardListTab<PerpsMarketData>[]>(() => {
+    const byType = (type: PerpsMarketData['marketType']) =>
+      perps.data
+        .filter((d) => d.market.marketType === type)
+        .slice(0, 3)
+        .map((d) => d.market);
+    return [
+      {
+        key: 'stocks',
+        name: strings('trending.macro_pill_stocks'),
+        items: byType('equity'),
+      },
+      {
+        key: 'commodities',
+        name: strings('trending.macro_pill_commodities'),
+        items: byType('commodity'),
+      },
+    ];
+  }, [perps.data]);
+
+  if (!perps.isLoading && perps.data.length === 0) return null;
+
+  return (
+    <PerpsToggleBlock
+      title={strings('trending.macro_stocks_commodity_perps')}
+      tabs={tabs}
+      isLoading={perps.isLoading}
+      defaultPillKey="stocks"
+      onViewAll={onViewAll}
+      sortOptionId={perps.defaultSortOptionId}
+      tabName="Macro"
+      sectionName="perps_stocks_commodities"
+      headerTestID="section-header-view-all-macro_stocks_commodity_perps"
+      idPrefix="macro_stocks_commodity_perps"
+      testIdPrefix="macro-stocks-commodity-pills"
+      listTestId="macro-stocks-commodity-perps-list"
+    />
+  );
+};
+
+const MacroTab: React.FC<TabProps> = ({ refresh, refreshing, onRefresh }) => {
+  const appNavigation = useNavigation<AppNavigationProp>();
+  const perpsNavigation =
+    useNavigation<NavigationProp<PerpsNavigationParamList>>();
+  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
+  const isPredictEnabled = useSelector(selectPredictEnabledFlag);
+
+  const politics = usePredictionsFeed({ variant: 'politics', refresh });
+
+  const renderPredictionItem: ListRenderItem<PredictMarketType> = useCallback(
+    ({ item, index }) => (
+      <PredictionCarouselRowItem
+        market={item}
+        testIdPrefix="predict-rwa-politics-market-row-item"
+        onCardPress={() =>
+          trackExploreInteracted({
+            interaction_type: 'section_item_tapped',
+            tab_name: 'Macro',
+            section_name: 'predictions_politics',
+            asset_type: 'prediction',
+            position: index,
+            item_clicked: item.id,
+          })
+        }
+        onBuyButtonPress={(marketId) =>
+          trackExploreInteracted({
+            interaction_type: 'prediction_voted',
+            tab_name: 'Macro',
+            section_name: 'predictions_politics',
+            item_clicked: marketId,
+          })
+        }
+      />
+    ),
+    [],
+  );
+
+  const showPolitics =
+    isPredictEnabled && (politics.isLoading || politics.data.length > 0);
+
+  return (
+    <ExploreScroll refreshing={refreshing} onRefresh={onRefresh}>
+      {showPolitics && (
+        <Box>
+          <SectionHeader
+            title={strings('trending.predictions')}
+            onViewAll={() =>
+              navigateToPredictionsList(appNavigation, 'politics')
+            }
+            testID="section-header-view-all-politics_predictions"
+            tabName="Macro"
+            sectionName="predictions_politics"
+          />
+          <HorizontalCarousel<PredictMarketType>
+            data={politics.data}
+            isLoading={politics.isLoading}
+            renderItem={renderPredictionItem}
+            Skeleton={PredictionsSkeleton}
+            idPrefix="politics_predictions"
+          />
+        </Box>
+      )}
+
+      {isPerpsEnabled && (
+        <PerpsSectionProvider>
+          <MacroPerpsBlock
+            refresh={refresh}
+            onViewAll={(filter, sortOptionId) =>
+              navigateToPerpsMarketList(perpsNavigation, filter, sortOptionId)
+            }
+          />
+        </PerpsSectionProvider>
+      )}
+    </ExploreScroll>
+  );
+};
+
+export default MacroTab;
diff --git a/app/components/Views/TrendingView/tabs/NowTab.test.tsx b/app/components/Views/TrendingView/tabs/NowTab.test.tsx
new file mode 100644
index 00000000000..35927344c0c
--- /dev/null
+++ b/app/components/Views/TrendingView/tabs/NowTab.test.tsx
@@ -0,0 +1,215 @@
+import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react-native';
+import { NavigationContainer } from '@react-navigation/native';
+
+const mockNavigate = jest.fn();
+
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: () => ({ navigate: mockNavigate }),
+}));
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(),
+}));
+
+// Feed hooks — return empty/not-loading so NowTab renders without network calls.
+jest.mock('../feeds/tokens/useTokensFeed', () => ({
+  useTokensFeed: jest.fn(() => ({ data: [], isLoading: false })),
+}));
+
+const mockUsePerpsFeed = jest.fn(() => ({
+  data: [],
+  isLoading: false,
+  refetch: jest.fn(),
+  defaultSortOptionId: 'priceChange' as const,
+}));
+
+jest.mock('../feeds/perps/usePerpsFeed', () => ({
+  usePerpsFeed: () => mockUsePerpsFeed(),
+}));
+
+const mockNavigateToPerpsMarketList = jest.fn();
+jest.mock('../feeds/perps/perpsNavigation', () => ({
+  navigateToPerpsMarketList: (
+    nav: unknown,
+    filter: unknown,
+    sortOptionId: unknown,
+  ) => mockNavigateToPerpsMarketList(nav, filter, sortOptionId),
+}));
+
+jest.mock('../feeds/predictions/usePredictionsFeed', () => ({
+  usePredictionsFeed: jest.fn(() => ({ data: [], isLoading: false })),
+}));
+
+jest.mock('../feeds/stocks/useStocksFeed', () => ({
+  useStocksFeed: jest.fn(() => ({ data: [], isLoading: false })),
+}));
+
+// Mock PerpsSectionProvider as a transparent passthrough.
+jest.mock('../feeds/perps/PerpsSectionProvider', () => {
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const { createElement } = require('react');
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const { View } = require('react-native');
+  return ({ children }: { children: unknown }) =>
+    createElement(View, null, children);
+});
+
+// Mock WhatsHappeningSection to keep its transitive deps (Engine, analytics)
+// out of this unit test. We control rendering via mockWhatsHappeningImpl.
+const mockWhatsHappeningImpl = jest.fn<React.ReactElement | null, [unknown]>(
+  () => null,
+);
+
+jest.mock('../../Homepage/Sections/WhatsHappening', () => {
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const { forwardRef } = require('react');
+  return {
+    __esModule: true,
+    default: forwardRef((_props: unknown, ref: unknown) =>
+      mockWhatsHappeningImpl(ref),
+    ),
+  };
+});
+
+import { useSelector } from 'react-redux';
+import { selectPerpsEnabledFlag } from '../../../UI/Perps';
+import { selectPredictEnabledFlag } from '../../../UI/Predict';
+import { selectWhatsHappeningEnabled } from '../../../../selectors/featureFlagController/whatsHappening';
+import NowTab from './NowTab';
+import type { RefreshConfig } from '../hooks/useExploreRefresh';
+
+const defaultRefresh: RefreshConfig = { trigger: 0, silentRefresh: true };
+const defaultTabProps = {
+  refresh: defaultRefresh,
+  refreshing: false,
+  onRefresh: jest.fn(),
+};
+
+const renderNowTab = (props = defaultTabProps) =>
+  render(
+    <NavigationContainer>
+      <NowTab {...props} />
+    </NavigationContainer>,
+  );
+
+describe('NowTab — WhatsHappeningSection integration', () => {
+  const mockUseSelector = useSelector as jest.MockedFunction<
+    typeof useSelector
+  >;
+
+  const mockSelectorBase = (selector: unknown) => {
+    if (selector === selectPerpsEnabledFlag) return false;
+    if (selector === selectPredictEnabledFlag) return false;
+    return undefined;
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSelector.mockImplementation(mockSelectorBase);
+    // Default: section mock renders nothing; individual tests override as needed.
+    mockWhatsHappeningImpl.mockReturnValue(null);
+  });
+
+  it('mounts WhatsHappeningSection and renders it when the feature flag is enabled', () => {
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectWhatsHappeningEnabled) return true;
+      return mockSelectorBase(selector);
+    });
+    (mockWhatsHappeningImpl as jest.Mock).mockReturnValue(
+      React.createElement('View', {
+        testID: 'homepage-whats-happening-carousel',
+      }),
+    );
+
+    renderNowTab();
+
+    expect(
+      screen.getByTestId('homepage-whats-happening-carousel'),
+    ).toBeOnTheScreen();
+  });
+
+  it('does not mount WhatsHappeningSection when the feature flag is disabled', () => {
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectWhatsHappeningEnabled) return false;
+      return mockSelectorBase(selector);
+    });
+
+    renderNowTab();
+
+    // Section is not even mounted, so the mock should never have been called.
+    expect(mockWhatsHappeningImpl).not.toHaveBeenCalled();
+    expect(
+      screen.queryByTestId('homepage-whats-happening-carousel'),
+    ).toBeNull();
+  });
+
+  it('passes a ref to WhatsHappeningSection so pull-to-refresh can trigger it', () => {
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectWhatsHappeningEnabled) return true;
+      return mockSelectorBase(selector);
+    });
+
+    renderNowTab();
+
+    // The mock's first argument is the forwarded ref (we dropped props in the mock).
+    // It should be a React ref object so the useEffect bridge can call .refresh().
+    expect(mockWhatsHappeningImpl).toHaveBeenCalled();
+    const [forwardedRef] = mockWhatsHappeningImpl.mock.calls[0];
+    expect(forwardedRef).not.toBeNull();
+  });
+});
+
+describe('NowTab — Perps Movers "View All" navigation', () => {
+  const mockUseSelector = useSelector as jest.MockedFunction<
+    typeof useSelector
+  >;
+
+  // Selector base: perps enabled, everything else off.
+  const mockSelectorBase = (selector: unknown) => {
+    if (selector === selectPerpsEnabledFlag) return true;
+    if (selector === selectPredictEnabledFlag) return false;
+    return undefined;
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSelector.mockImplementation(mockSelectorBase);
+    mockWhatsHappeningImpl.mockReturnValue(null);
+  });
+
+  it('calls navigateToPerpsMarketList with "all" filter and the defaultSortOptionId from usePerpsFeed', () => {
+    // Return one market so PerpsBlock does not bail out with an early null return.
+    mockUsePerpsFeed.mockReturnValue({
+      data: [{ market: { symbol: 'BTC' } }] as never,
+      isLoading: false,
+      refetch: jest.fn(),
+      defaultSortOptionId: 'priceChange' as const,
+    });
+
+    renderNowTab();
+
+    fireEvent.press(screen.getByTestId('section-header-view-all-perps'));
+
+    expect(mockNavigateToPerpsMarketList).toHaveBeenCalledTimes(1);
+    expect(mockNavigateToPerpsMarketList).toHaveBeenCalledWith(
+      expect.anything(), // navigation object
+      'all',
+      'priceChange',
+    );
+  });
+
+  it('does not render the Perps Movers section when the perps flag is disabled', () => {
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectPerpsEnabledFlag) return false;
+      if (selector === selectPredictEnabledFlag) return false;
+      return undefined;
+    });
+
+    renderNowTab();
+
+    expect(screen.queryByTestId('section-header-view-all-perps')).toBeNull();
+  });
+});
diff --git a/app/components/Views/TrendingView/tabs/NowTab.tsx b/app/components/Views/TrendingView/tabs/NowTab.tsx
new file mode 100644
index 00000000000..5369fae39f3
--- /dev/null
+++ b/app/components/Views/TrendingView/tabs/NowTab.tsx
@@ -0,0 +1,277 @@
+import React, { useCallback, useEffect, useRef } from 'react';
+import { useNavigation, NavigationProp } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import { Box } from '@metamask/design-system-react-native';
+import type { ListRenderItem } from '@shopify/flash-list';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import type { PredictMarket as PredictMarketType } from '../../../UI/Predict/types';
+import type { AppNavigationProp } from '../../../../core/NavigationService/types';
+import type { PerpsNavigationParamList } from '../../../UI/Perps/types/navigation';
+import { selectPerpsEnabledFlag } from '../../../UI/Perps';
+import { selectPredictEnabledFlag } from '../../../UI/Predict';
+import Routes from '../../../../constants/navigation/Routes';
+import { strings } from '../../../../../locales/i18n';
+import { TrendingViewSelectorsIDs } from '../TrendingView.testIds';
+import { TokenDetailsSource } from '../../../UI/TokenDetails/constants/constants';
+import { useTokensFeed } from '../feeds/tokens/useTokensFeed';
+import { TokenRowItem } from '../feeds/tokens/TokenRowItem';
+import CryptoMoversPillItem from '../feeds/tokens/CryptoMoversPillItem';
+import CryptoMoversSkeleton from '../feeds/tokens/CryptoMoversSkeleton';
+import TrendingTokensSkeleton from '../../../UI/Trending/components/TrendingTokenSkeleton/TrendingTokensSkeleton';
+import { usePerpsFeed, type PerpsFeedItem } from '../feeds/perps/usePerpsFeed';
+import PerpsSectionProvider from '../feeds/perps/PerpsSectionProvider';
+import PerpsPillItem from '../feeds/perps/PerpsPillItem';
+import { navigateToPerpsMarketList } from '../feeds/perps/perpsNavigation';
+import { usePredictionsFeed } from '../feeds/predictions/usePredictionsFeed';
+import { PredictionCarouselRowItem } from '../feeds/predictions/PredictionRowItem';
+import PredictionsSkeleton from '../feeds/predictions/PredictionsSkeleton';
+import { navigateToPredictionsList } from '../feeds/predictions/predictionsNavigation';
+import { useStocksFeed } from '../feeds/stocks/useStocksFeed';
+import { getCaipChainIdFromAssetId } from '../../../UI/Trending/components/TrendingTokenRowItem/utils';
+import CardList from '../components/CardList';
+import ExploreScroll from '../components/ExploreScroll';
+import HorizontalCarousel from '../components/HorizontalCarousel';
+import PillScrollList from '../components/PillScrollList';
+import SectionHeader from '../components/SectionHeader';
+import type { TabProps } from '../hooks/useExploreRefresh';
+import { trackExploreInteracted } from '../search/analytics';
+import WhatsHappeningSection from '../../Homepage/Sections/WhatsHappening';
+import type { SectionRefreshHandle } from '../../Homepage/types';
+import { selectWhatsHappeningEnabled } from '../../../../selectors/featureFlagController/whatsHappening';
+
+interface PerpsBlockProps {
+  refresh: TabProps['refresh'];
+  navigation: NavigationProp<PerpsNavigationParamList>;
+}
+
+const PerpsBlock: React.FC<PerpsBlockProps> = ({ refresh, navigation }) => {
+  const perps = usePerpsFeed({
+    variant: 'all',
+    refresh,
+    withTileExtras: false,
+  });
+
+  if (!perps.isLoading && perps.data.length === 0) return null;
+
+  return (
+    <Box>
+      <SectionHeader
+        title={strings('trending.perps_movers')}
+        onViewAll={() =>
+          navigateToPerpsMarketList(
+            navigation,
+            'all',
+            perps.defaultSortOptionId,
+          )
+        }
+        testID="section-header-view-all-perps"
+        tabName="Now"
+        sectionName="perps_movers"
+      />
+      <PillScrollList<PerpsFeedItem>
+        data={perps.data}
+        isLoading={perps.isLoading}
+        renderItem={(item, index) => (
+          <PerpsPillItem
+            item={item}
+            onCardPress={() =>
+              trackExploreInteracted({
+                interaction_type: 'section_item_tapped',
+                tab_name: 'Now',
+                section_name: 'perps_movers',
+                asset_type: 'perp',
+                position: index,
+                item_clicked: item.market.symbol,
+              })
+            }
+          />
+        )}
+        keyExtractor={(item) => item.market.symbol}
+        Skeleton={CryptoMoversSkeleton}
+        listTestId="explore-perps-pills-list"
+      />
+    </Box>
+  );
+};
+
+const NowTab: React.FC<TabProps> = ({ refresh, refreshing, onRefresh }) => {
+  const navigation = useNavigation<AppNavigationProp>();
+  const perpsNavigation =
+    useNavigation<NavigationProp<PerpsNavigationParamList>>();
+  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
+  const isPredictEnabled = useSelector(selectPredictEnabledFlag);
+  const isWhatsHappeningEnabled = useSelector(selectWhatsHappeningEnabled);
+
+  const whatsHappeningRef = useRef<SectionRefreshHandle>(null);
+
+  useEffect(() => {
+    if (refresh.trigger === 0) return;
+    whatsHappeningRef.current?.refresh();
+  }, [refresh.trigger]);
+
+  const predictions = usePredictionsFeed({ refresh });
+  const cryptoMovers = useTokensFeed({ refresh, hideRiskyTokens: true });
+  const stocks = useStocksFeed({ refresh });
+
+  const renderPredictionItem: ListRenderItem<PredictMarketType> = useCallback(
+    ({ item, index }) => (
+      <PredictionCarouselRowItem
+        market={item}
+        testIdPrefix="predict-market-row-item"
+        onCardPress={() =>
+          trackExploreInteracted({
+            interaction_type: 'section_item_tapped',
+            tab_name: 'Now',
+            section_name: 'predictions_trending',
+            asset_type: 'prediction',
+            position: index,
+            item_clicked: item.id,
+          })
+        }
+        onBuyButtonPress={(marketId) =>
+          trackExploreInteracted({
+            interaction_type: 'prediction_voted',
+            tab_name: 'Now',
+            section_name: 'predictions_trending',
+            item_clicked: marketId,
+          })
+        }
+      />
+    ),
+    [],
+  );
+
+  const renderTokenItem: ListRenderItem<TrendingAsset> = useCallback(
+    ({ item, index }) => (
+      <TokenRowItem
+        token={item}
+        index={index}
+        tokenDetailsSource={TokenDetailsSource.ExploreNowStocks}
+        onCardPress={() =>
+          trackExploreInteracted({
+            interaction_type: 'section_item_tapped',
+            tab_name: 'Now',
+            section_name: 'stocks',
+            asset_type: 'stock',
+            position: index,
+            token_symbol: item.symbol,
+            chain_id: getCaipChainIdFromAssetId(item.assetId),
+            item_clicked: item.assetId,
+          })
+        }
+      />
+    ),
+    [],
+  );
+
+  const showPredictions =
+    isPredictEnabled && (predictions.isLoading || predictions.data.length > 0);
+  const showCryptoMovers =
+    cryptoMovers.isLoading || cryptoMovers.data.length > 0;
+  const showStocks = stocks.isLoading || stocks.data.length > 0;
+
+  return (
+    <ExploreScroll
+      refreshing={refreshing}
+      onRefresh={onRefresh}
+      testID={TrendingViewSelectorsIDs.TRENDING_FEED_SCROLL_VIEW}
+    >
+      {isWhatsHappeningEnabled && (
+        <Box twClassName="-mx-4" marginBottom={6}>
+          <WhatsHappeningSection
+            ref={whatsHappeningRef}
+            sectionIndex={0}
+            totalSectionsLoaded={1}
+          />
+        </Box>
+      )}
+
+      {showPredictions && (
+        <Box>
+          <SectionHeader
+            title={strings('wallet.predict')}
+            onViewAll={() => navigateToPredictionsList(navigation, 'trending')}
+            testID="section-header-view-all-predictions"
+            tabName="Now"
+            sectionName="predictions_trending"
+          />
+          <HorizontalCarousel<PredictMarketType>
+            data={predictions.data}
+            isLoading={predictions.isLoading}
+            renderItem={renderPredictionItem}
+            Skeleton={PredictionsSkeleton}
+            idPrefix="predictions"
+          />
+        </Box>
+      )}
+
+      {showCryptoMovers && (
+        <Box>
+          <SectionHeader
+            title={strings('trending.crypto_movers')}
+            onViewAll={() =>
+              navigation.navigate(Routes.WALLET.TRENDING_TOKENS_FULL_VIEW)
+            }
+            testID="section-header-view-all-crypto_movers"
+            tabName="Now"
+            sectionName="tokens_movers"
+          />
+          <PillScrollList<TrendingAsset>
+            data={cryptoMovers.data}
+            isLoading={cryptoMovers.isLoading}
+            renderItem={(token, index) => (
+              <CryptoMoversPillItem
+                token={token}
+                index={index}
+                onCardPress={() =>
+                  trackExploreInteracted({
+                    interaction_type: 'section_item_tapped',
+                    tab_name: 'Now',
+                    section_name: 'tokens_movers',
+                    asset_type: 'token',
+                    position: index,
+                    token_symbol: token.symbol,
+                    chain_id: getCaipChainIdFromAssetId(token.assetId),
+                    item_clicked: token.assetId,
+                  })
+                }
+              />
+            )}
+            keyExtractor={(token) => token.assetId ?? ''}
+            Skeleton={CryptoMoversSkeleton}
+            listTestId="explore-crypto_movers-pills-list"
+          />
+        </Box>
+      )}
+
+      {isPerpsEnabled && (
+        <PerpsSectionProvider>
+          <PerpsBlock refresh={refresh} navigation={perpsNavigation} />
+        </PerpsSectionProvider>
+      )}
+
+      {showStocks && (
+        <Box>
+          <SectionHeader
+            title={strings('trending.stocks')}
+            onViewAll={() =>
+              navigation.navigate(Routes.WALLET.RWA_TOKENS_FULL_VIEW)
+            }
+            testID="section-header-view-all-stocks"
+            tabName="Now"
+            sectionName="stocks"
+          />
+          <CardList<TrendingAsset>
+            data={stocks.data}
+            isLoading={stocks.isLoading}
+            renderItem={renderTokenItem}
+            Skeleton={TrendingTokensSkeleton}
+            idPrefix="stocks"
+          />
+        </Box>
+      )}
+    </ExploreScroll>
+  );
+};
+
+export default NowTab;
diff --git a/app/components/Views/TrendingView/tabs/RwasTab.tsx b/app/components/Views/TrendingView/tabs/RwasTab.tsx
new file mode 100644
index 00000000000..8b9ed6cadeb
--- /dev/null
+++ b/app/components/Views/TrendingView/tabs/RwasTab.tsx
@@ -0,0 +1,215 @@
+import React, { useCallback, useMemo } from 'react';
+import { useNavigation, NavigationProp } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import { Box } from '@metamask/design-system-react-native';
+import type { ListRenderItem } from '@shopify/flash-list';
+import type { TrendingAsset } from '@metamask/assets-controllers';
+import type { PerpsMarketData, SortOptionId } from '@metamask/perps-controller';
+import type { PerpsNavigationParamList } from '../../../UI/Perps/types/navigation';
+import type { PredictMarket as PredictMarketType } from '../../../UI/Predict/types';
+import type { AppNavigationProp } from '../../../../core/NavigationService/types';
+import { selectPerpsEnabledFlag } from '../../../UI/Perps';
+import { selectPredictEnabledFlag } from '../../../UI/Predict';
+import Routes from '../../../../constants/navigation/Routes';
+import { strings } from '../../../../../locales/i18n';
+import { TokenDetailsSource } from '../../../UI/TokenDetails/constants/constants';
+import { TokenRowItem } from '../feeds/tokens/TokenRowItem';
+import TrendingTokensSkeleton from '../../../UI/Trending/components/TrendingTokenSkeleton/TrendingTokensSkeleton';
+import { useStocksFeed } from '../feeds/stocks/useStocksFeed';
+import { getCaipChainIdFromAssetId } from '../../../UI/Trending/components/TrendingTokenRowItem/utils';
+import { usePerpsFeed } from '../feeds/perps/usePerpsFeed';
+import PerpsSectionProvider from '../feeds/perps/PerpsSectionProvider';
+import PerpsToggleBlock from '../feeds/perps/PerpsToggleBlock';
+import { navigateToPerpsMarketList } from '../feeds/perps/perpsNavigation';
+import { usePredictionsFeed } from '../feeds/predictions/usePredictionsFeed';
+import { PredictionCarouselRowItem } from '../feeds/predictions/PredictionRowItem';
+import PredictionsSkeleton from '../feeds/predictions/PredictionsSkeleton';
+import { navigateToPredictionsList } from '../feeds/predictions/predictionsNavigation';
+import CardList from '../components/CardList';
+import ExploreScroll from '../components/ExploreScroll';
+import HorizontalCarousel from '../components/HorizontalCarousel';
+import type { PillToggleCardListTab } from '../components/PillToggleCardList';
+import SectionHeader from '../components/SectionHeader';
+import type { TabProps } from '../hooks/useExploreRefresh';
+import { trackExploreInteracted } from '../search/analytics';
+
+interface RwaPerpsBlockProps {
+  refresh: TabProps['refresh'];
+  onViewAll: (filter: string, sortOptionId: SortOptionId) => void;
+}
+
+const RwaPerpsBlock: React.FC<RwaPerpsBlockProps> = ({
+  refresh,
+  onViewAll,
+}) => {
+  const perps = usePerpsFeed({ variant: 'rwa', refresh });
+
+  const tabs = useMemo<PillToggleCardListTab<PerpsMarketData>[]>(() => {
+    const byType = (type: PerpsMarketData['marketType']) =>
+      perps.data
+        .filter((d) => d.market.marketType === type)
+        .slice(0, 3)
+        .map((d) => d.market);
+    return [
+      {
+        key: 'commodities',
+        name: strings('trending.rwa_pill_commodities'),
+        items: byType('commodity'),
+      },
+      {
+        key: 'stocks',
+        name: strings('trending.rwa_pill_stocks'),
+        items: byType('equity'),
+      },
+      {
+        key: 'forex',
+        name: strings('trending.rwa_pill_forex'),
+        items: byType('forex'),
+      },
+    ];
+  }, [perps.data]);
+
+  if (!perps.isLoading && perps.data.length === 0) return null;
+
+  return (
+    <PerpsToggleBlock
+      title={strings('trending.rwa_perps_section')}
+      tabs={tabs}
+      isLoading={perps.isLoading}
+      defaultPillKey="commodities"
+      onViewAll={onViewAll}
+      sortOptionId={perps.defaultSortOptionId}
+      tabName="RWAs"
+      sectionName="perps_markets"
+      headerTestID="section-header-view-all-rwa_perps"
+      idPrefix="rwa_perps"
+      testIdPrefix="rwa-perps-pills"
+      listTestId="rwa-perps-pill-toggled-list"
+    />
+  );
+};
+
+const RwasTab: React.FC<TabProps> = ({ refresh, refreshing, onRefresh }) => {
+  const appNavigation = useNavigation<AppNavigationProp>();
+  const perpsNavigation =
+    useNavigation<NavigationProp<PerpsNavigationParamList>>();
+  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
+  const isPredictEnabled = useSelector(selectPredictEnabledFlag);
+
+  const politics = usePredictionsFeed({ variant: 'politics', refresh });
+  const stocks = useStocksFeed({ refresh });
+
+  const renderPredictionItem: ListRenderItem<PredictMarketType> = useCallback(
+    ({ item, index }) => (
+      <PredictionCarouselRowItem
+        market={item}
+        testIdPrefix="predict-rwa-politics-market-row-item"
+        onCardPress={() =>
+          trackExploreInteracted({
+            interaction_type: 'section_item_tapped',
+            tab_name: 'RWAs',
+            section_name: 'predictions_politics',
+            asset_type: 'prediction',
+            position: index,
+            item_clicked: item.id,
+          })
+        }
+        onBuyButtonPress={(marketId) =>
+          trackExploreInteracted({
+            interaction_type: 'prediction_voted',
+            tab_name: 'RWAs',
+            section_name: 'predictions_politics',
+            item_clicked: marketId,
+          })
+        }
+      />
+    ),
+    [],
+  );
+
+  const renderStockItem: ListRenderItem<TrendingAsset> = useCallback(
+    ({ item, index }) => (
+      <TokenRowItem
+        token={item}
+        index={index}
+        tokenDetailsSource={TokenDetailsSource.ExploreRwasStocks}
+        onCardPress={() =>
+          trackExploreInteracted({
+            interaction_type: 'section_item_tapped',
+            tab_name: 'RWAs',
+            section_name: 'stocks',
+            asset_type: 'stock',
+            position: index,
+            token_symbol: item.symbol,
+            chain_id: getCaipChainIdFromAssetId(item.assetId),
+            item_clicked: item.assetId,
+          })
+        }
+      />
+    ),
+    [],
+  );
+
+  const showPolitics =
+    isPredictEnabled && (politics.isLoading || politics.data.length > 0);
+  const showStocks = stocks.isLoading || stocks.data.length > 0;
+
+  return (
+    <ExploreScroll refreshing={refreshing} onRefresh={onRefresh}>
+      {showPolitics && (
+        <Box>
+          <SectionHeader
+            title={strings('trending.predictions')}
+            onViewAll={() =>
+              navigateToPredictionsList(appNavigation, 'politics')
+            }
+            testID="section-header-view-all-politics_predictions"
+            tabName="RWAs"
+            sectionName="predictions_politics"
+          />
+          <HorizontalCarousel<PredictMarketType>
+            data={politics.data}
+            isLoading={politics.isLoading}
+            renderItem={renderPredictionItem}
+            Skeleton={PredictionsSkeleton}
+            idPrefix="politics_predictions"
+          />
+        </Box>
+      )}
+
+      {showStocks && (
+        <Box>
+          <SectionHeader
+            title={strings('trending.stocks')}
+            onViewAll={() =>
+              appNavigation.navigate(Routes.WALLET.RWA_TOKENS_FULL_VIEW)
+            }
+            testID="section-header-view-all-stocks"
+            tabName="RWAs"
+            sectionName="stocks"
+          />
+          <CardList<TrendingAsset>
+            data={stocks.data}
+            isLoading={stocks.isLoading}
+            renderItem={renderStockItem}
+            Skeleton={TrendingTokensSkeleton}
+            idPrefix="stocks"
+          />
+        </Box>
+      )}
+
+      {isPerpsEnabled && (
+        <PerpsSectionProvider>
+          <RwaPerpsBlock
+            refresh={refresh}
+            onViewAll={(filter, sortOptionId) =>
+              navigateToPerpsMarketList(perpsNavigation, filter, sortOptionId)
+            }
+          />
+        </PerpsSectionProvider>
+      )}
+    </ExploreScroll>
+  );
+};
+
+export default RwasTab;
diff --git a/app/components/Views/TrendingView/tabs/SportsTab.tsx b/app/components/Views/TrendingView/tabs/SportsTab.tsx
new file mode 100644
index 00000000000..e7d6d0ed1e3
--- /dev/null
+++ b/app/components/Views/TrendingView/tabs/SportsTab.tsx
@@ -0,0 +1,276 @@
+import React, { useCallback, useRef } from 'react';
+import {
+  ActivityIndicator,
+  TouchableOpacity,
+  RefreshControl,
+} from 'react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { useNavigation } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import {
+  Box,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  FontWeight,
+  TabEmptyState,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { FlashList, type ListRenderItem } from '@shopify/flash-list';
+import type { PredictMarket as PredictMarketType } from '../../../UI/Predict/types';
+import { useTheme } from '../../../../util/theme';
+import { selectPredictEnabledFlag } from '../../../UI/Predict';
+import PredictMarket from '../../../UI/Predict/components/PredictMarket';
+import type { AppNavigationProp } from '../../../../core/NavigationService/types';
+import { strings } from '../../../../../locales/i18n';
+import { usePredictionsFeed } from '../feeds/predictions/usePredictionsFeed';
+import {
+  useSportsMarketsFeed,
+  type UseSportsMarketsFeedResult,
+} from '../feeds/predictions/useSportsMarketsFeed';
+import { PredictionCarouselRowItem } from '../feeds/predictions/PredictionRowItem';
+import PredictionsSkeleton from '../feeds/predictions/PredictionsSkeleton';
+import { navigateToPredictionsList } from '../feeds/predictions/predictionsNavigation';
+import HorizontalCarousel from '../components/HorizontalCarousel';
+import PillRow from '../components/PillRow';
+import SectionHeader from '../components/SectionHeader';
+import type { TabProps } from '../hooks/useExploreRefresh';
+import {
+  trackExploreInteracted,
+  type ExploreSectionName,
+} from '../search/analytics';
+
+const SPORT_KEY_TO_SECTION: Record<string, ExploreSectionName> = {
+  soccer: 'predictions_football',
+  basketball: 'predictions_basketball',
+  tennis: 'predictions_tennis',
+};
+
+interface SportsListHeaderProps {
+  showSportsPredictions: boolean;
+  sportsPredictionsData: PredictMarketType[];
+  sportsPredictionsLoading: boolean;
+  sportsMarkets: UseSportsMarketsFeedResult;
+  showAllSportsSkeleton: boolean;
+  showAllSportsEmpty: boolean;
+  navigation: AppNavigationProp;
+}
+
+const renderPredictionItem: ListRenderItem<PredictMarketType> = ({
+  item,
+  index,
+}) => (
+  <PredictionCarouselRowItem
+    market={item}
+    testIdPrefix="predict-sports-market-row-item"
+    onCardPress={() =>
+      trackExploreInteracted({
+        interaction_type: 'section_item_tapped',
+        tab_name: 'Sports',
+        section_name: 'predictions_sports',
+        asset_type: 'prediction',
+        position: index,
+        item_clicked: item.id,
+      })
+    }
+    onBuyButtonPress={(marketId) =>
+      trackExploreInteracted({
+        interaction_type: 'prediction_voted',
+        tab_name: 'Sports',
+        section_name: 'predictions_sports',
+        item_clicked: marketId,
+      })
+    }
+  />
+);
+
+const SportsListHeader: React.FC<SportsListHeaderProps> = ({
+  showSportsPredictions,
+  sportsPredictionsData,
+  sportsPredictionsLoading,
+  sportsMarkets,
+  showAllSportsSkeleton,
+  showAllSportsEmpty,
+  navigation,
+}) => (
+  <Box twClassName="pt-3">
+    {showSportsPredictions && (
+      <Box>
+        <SectionHeader
+          title={strings('trending.predictions')}
+          onViewAll={() => navigateToPredictionsList(navigation, 'sports')}
+          testID="section-header-view-all-sports_predictions"
+          tabName="Sports"
+          sectionName="predictions_sports"
+        />
+        <HorizontalCarousel<PredictMarketType>
+          data={sportsPredictionsData}
+          isLoading={sportsPredictionsLoading}
+          renderItem={renderPredictionItem}
+          Skeleton={PredictionsSkeleton}
+          idPrefix="sports_predictions"
+        />
+      </Box>
+    )}
+
+    <Box>
+      <SectionHeader
+        title={strings('trending.all_sports')}
+        testID="section-header-view-all-all_sports"
+      />
+      <Box twClassName="mt-2">
+        <PillRow
+          pills={sportsMarkets.pills}
+          activeKey={sportsMarkets.activeKey}
+          onSelect={sportsMarkets.select}
+          testIdPrefix="all-sports"
+        />
+      </Box>
+
+      {showAllSportsSkeleton && (
+        <Box twClassName="gap-2">
+          {[0, 1, 2].map((i) => (
+            <Box
+              key={`all-sports-skeleton-${i}`}
+              twClassName="h-[220px] w-full overflow-hidden rounded-2xl"
+            >
+              <PredictionsSkeleton />
+            </Box>
+          ))}
+        </Box>
+      )}
+
+      {showAllSportsEmpty && (
+        <Box twClassName="items-center py-8" testID="all-sports-empty-state">
+          <TabEmptyState
+            description={strings('trending.all_sports_no_markets')}
+          />
+        </Box>
+      )}
+    </Box>
+  </Box>
+);
+
+const SportsTab: React.FC<TabProps> = ({ refresh, refreshing, onRefresh }) => {
+  const tw = useTailwind();
+  const navigation = useNavigation<AppNavigationProp>();
+  const isPredictEnabled = useSelector(selectPredictEnabledFlag);
+  const { colors } = useTheme();
+
+  const sportsPredictions = usePredictionsFeed({ variant: 'sports', refresh });
+  const sportsMarkets = useSportsMarketsFeed({ refresh });
+
+  const { active, activeKey } = sportsMarkets;
+  const activeKeyRef = useRef(activeKey);
+  activeKeyRef.current = activeKey;
+
+  const renderActiveMarketItem: ListRenderItem<PredictMarketType> = useCallback(
+    ({ item, index }) => {
+      const sectionName =
+        SPORT_KEY_TO_SECTION[activeKeyRef.current] ?? 'predictions_football';
+      return (
+        <PredictMarket
+          market={item}
+          onCardPress={() =>
+            trackExploreInteracted({
+              interaction_type: 'section_item_tapped',
+              tab_name: 'Sports',
+              section_name: sectionName,
+              asset_type: 'prediction',
+              position: index,
+              item_clicked: item.id,
+            })
+          }
+          onBuyButtonPress={(marketId) =>
+            trackExploreInteracted({
+              interaction_type: 'prediction_voted',
+              tab_name: 'Sports',
+              section_name: sectionName,
+              item_clicked: marketId,
+            })
+          }
+        />
+      );
+    },
+    [],
+  );
+
+  const showSportsPredictions =
+    isPredictEnabled &&
+    (sportsPredictions.isLoading || sportsPredictions.data.length > 0);
+  const showAllSportsSkeleton =
+    active.isFetching && active.marketData.length === 0;
+  const showAllSportsEmpty =
+    !showAllSportsSkeleton && active.marketData.length === 0;
+
+  const listHeader = (
+    <SportsListHeader
+      showSportsPredictions={showSportsPredictions}
+      sportsPredictionsData={sportsPredictions.data}
+      sportsPredictionsLoading={sportsPredictions.isLoading}
+      sportsMarkets={sportsMarkets}
+      showAllSportsSkeleton={showAllSportsSkeleton}
+      showAllSportsEmpty={showAllSportsEmpty}
+      navigation={navigation}
+    />
+  );
+
+  const listFooter =
+    active.hasMore && active.marketData.length > 0 ? (
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        justifyContent={BoxJustifyContent.Center}
+        twClassName="mt-3 mb-9"
+      >
+        <TouchableOpacity
+          onPress={active.fetchMore}
+          disabled={active.isFetchingMore}
+          testID="all-sports-load-more"
+        >
+          {active.isFetchingMore ? (
+            <ActivityIndicator color={colors.primary.default} />
+          ) : (
+            <Text
+              variant={TextVariant.BodySm}
+              fontWeight={FontWeight.Medium}
+              color={TextColor.PrimaryDefault}
+            >
+              {strings('trending.load_more')}
+            </Text>
+          )}
+        </TouchableOpacity>
+      </Box>
+    ) : (
+      <Box twClassName="mb-9" />
+    );
+
+  // When loading or empty, data is empty — header renders those states.
+  const listData =
+    showAllSportsSkeleton || showAllSportsEmpty ? [] : active.marketData;
+
+  return (
+    <FlashList<PredictMarketType>
+      data={listData}
+      renderItem={renderActiveMarketItem}
+      keyExtractor={(_, index) => `all_sports-${activeKey}-${index}`}
+      getItemType={() => 'market'}
+      ListHeaderComponent={listHeader}
+      ListFooterComponent={listFooter}
+      keyboardShouldPersistTaps="handled"
+      showsVerticalScrollIndicator={false}
+      contentContainerStyle={tw.style('px-4')}
+      testID={`all-sports-list-${activeKey}`}
+      refreshControl={
+        <RefreshControl
+          refreshing={refreshing}
+          onRefresh={onRefresh}
+          tintColor={colors.icon.default}
+          colors={[colors.primary.default]}
+        />
+      }
+    />
+  );
+};
+
+export default SportsTab;
diff --git a/app/components/Views/TrendingView/utils/exploreSearch.test.tsx b/app/components/Views/TrendingView/utils/exploreSearch.test.tsx
deleted file mode 100644
index b0bb638fc4a..00000000000
--- a/app/components/Views/TrendingView/utils/exploreSearch.test.tsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import React from 'react';
-import { render, fireEvent } from '@testing-library/react-native';
-import { View, Text } from 'react-native';
-import { TapView, trackExploreEvent } from './exploreSearch';
-import { analytics } from '../../../../util/analytics/analytics';
-import { AnalyticsEventBuilder } from '../../../../util/analytics/AnalyticsEventBuilder';
-
-const mockBuild = jest.fn().mockReturnValue({});
-const mockAddProperties = jest.fn().mockReturnThis();
-const mockBuilderInstance = {
-  addProperties: mockAddProperties,
-  addSensitiveProperties: jest.fn().mockReturnThis(),
-  removeProperties: jest.fn().mockReturnThis(),
-  removeSensitiveProperties: jest.fn().mockReturnThis(),
-  setSaveDataRecording: jest.fn().mockReturnThis(),
-  build: mockBuild,
-};
-
-jest.mock('../../../../util/analytics/analytics', () => {
-  const { createAnalyticsMockModule } = jest.requireActual(
-    '../../../../util/test/analyticsMock',
-  );
-  return createAnalyticsMockModule();
-});
-
-jest.mock('../../../../util/analytics/AnalyticsEventBuilder', () => ({
-  AnalyticsEventBuilder: {
-    createEventBuilder: jest.fn(),
-  },
-}));
-
-const mockAnalyticsTrackEvent = analytics.trackEvent as jest.MockedFunction<
-  typeof analytics.trackEvent
->;
-const mockCreateEventBuilderFn =
-  AnalyticsEventBuilder.createEventBuilder as jest.MockedFunction<
-    typeof AnalyticsEventBuilder.createEventBuilder
-  >;
-
-describe('TapView', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('renders children', () => {
-    const { getByText } = render(
-      <TapView>
-        <Text>Child content</Text>
-      </TapView>,
-    );
-
-    expect(getByText('Child content')).toBeOnTheScreen();
-  });
-
-  it('calls onTap when touch ends without scroll movement', () => {
-    const onTap = jest.fn();
-    const { getByTestId } = render(
-      <TapView onTap={onTap}>
-        <View testID="content" />
-      </TapView>,
-    );
-
-    const content = getByTestId('content');
-    fireEvent(content, 'touchStart', { nativeEvent: { pageY: 100 } });
-    fireEvent(content, 'touchEnd', {});
-
-    expect(onTap).toHaveBeenCalledTimes(1);
-  });
-
-  it('does not call onTap when vertical movement exceeds scroll threshold', () => {
-    const onTap = jest.fn();
-    const { getByTestId } = render(
-      <TapView onTap={onTap}>
-        <View testID="content" />
-      </TapView>,
-    );
-
-    const content = getByTestId('content');
-    fireEvent(content, 'touchStart', { nativeEvent: { pageY: 100 } });
-    fireEvent(content, 'touchMove', { nativeEvent: { pageY: 120 } });
-    fireEvent(content, 'touchEnd', {});
-
-    expect(onTap).not.toHaveBeenCalled();
-  });
-
-  it('does not call onTap for upward scroll exceeding threshold', () => {
-    const onTap = jest.fn();
-    const { getByTestId } = render(
-      <TapView onTap={onTap}>
-        <View testID="content" />
-      </TapView>,
-    );
-
-    const content = getByTestId('content');
-    fireEvent(content, 'touchStart', { nativeEvent: { pageY: 100 } });
-    fireEvent(content, 'touchMove', { nativeEvent: { pageY: 80 } });
-    fireEvent(content, 'touchEnd', {});
-
-    expect(onTap).not.toHaveBeenCalled();
-  });
-
-  it('calls onTap when vertical movement is within threshold (micro-jitter)', () => {
-    const onTap = jest.fn();
-    const { getByTestId } = render(
-      <TapView onTap={onTap}>
-        <View testID="content" />
-      </TapView>,
-    );
-
-    const content = getByTestId('content');
-    fireEvent(content, 'touchStart', { nativeEvent: { pageY: 100 } });
-    fireEvent(content, 'touchMove', { nativeEvent: { pageY: 105 } });
-    fireEvent(content, 'touchEnd', {});
-
-    expect(onTap).toHaveBeenCalledTimes(1);
-  });
-
-  it('resets scroll detection on each new touch start', () => {
-    const onTap = jest.fn();
-    const { getByTestId } = render(
-      <TapView onTap={onTap}>
-        <View testID="content" />
-      </TapView>,
-    );
-
-    const content = getByTestId('content');
-
-    // First interaction: scroll (no tap)
-    fireEvent(content, 'touchStart', { nativeEvent: { pageY: 100 } });
-    fireEvent(content, 'touchMove', { nativeEvent: { pageY: 120 } });
-    fireEvent(content, 'touchEnd', {});
-    expect(onTap).not.toHaveBeenCalled();
-
-    // Second interaction: tap (should fire)
-    fireEvent(content, 'touchStart', { nativeEvent: { pageY: 200 } });
-    fireEvent(content, 'touchEnd', {});
-    expect(onTap).toHaveBeenCalledTimes(1);
-  });
-
-  it('does not throw when onTap is not provided', () => {
-    const { getByTestId } = render(
-      <TapView>
-        <View testID="content" />
-      </TapView>,
-    );
-
-    const content = getByTestId('content');
-    expect(() => {
-      fireEvent(content, 'touchStart', { nativeEvent: { pageY: 100 } });
-      fireEvent(content, 'touchEnd', {});
-    }).not.toThrow();
-  });
-});
-
-describe('trackExploreEvent', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockCreateEventBuilderFn.mockReturnValue(mockBuilderInstance);
-  });
-
-  it('calls analytics.trackEvent with a built event', () => {
-    const mockEvent = { category: 'Explore', action: 'Click' };
-    const properties = { search_query: 'bitcoin', section_name: 'Tokens' };
-
-    trackExploreEvent(mockEvent as never, properties);
-
-    expect(mockCreateEventBuilderFn).toHaveBeenCalledWith(mockEvent);
-    expect(mockAddProperties).toHaveBeenCalledWith(properties);
-    expect(mockBuild).toHaveBeenCalled();
-    expect(mockAnalyticsTrackEvent).toHaveBeenCalledWith(
-      mockBuild.mock.results[0].value,
-    );
-  });
-
-  it('passes all properties to the event builder', () => {
-    const mockEvent = { category: 'Explore', action: 'Scroll' };
-    const properties = {
-      search_query: 'eth',
-      section_name: 'Perps',
-      item_clicked: 'ETH-USD',
-    };
-
-    trackExploreEvent(mockEvent as never, properties);
-
-    expect(mockAddProperties).toHaveBeenCalledWith(properties);
-  });
-});
diff --git a/app/components/Views/TrendingView/utils/exploreSearch.tsx b/app/components/Views/TrendingView/utils/exploreSearch.tsx
deleted file mode 100644
index 0cae65b6594..00000000000
--- a/app/components/Views/TrendingView/utils/exploreSearch.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import React, { useCallback, useRef } from 'react';
-import { Box } from '@metamask/design-system-react-native';
-import {
-  useNavigation,
-  type NavigationProp,
-  type ParamListBase,
-} from '@react-navigation/native';
-import { analytics } from '../../../../util/analytics/analytics';
-import { AnalyticsEventBuilder } from '../../../../util/analytics/AnalyticsEventBuilder';
-import { MetaMetricsEvents } from '../../../../core/Analytics/MetaMetrics.events';
-import type { SectionConfig } from '../sections.config';
-
-/**
- * Minimum vertical movement (in pixels) to consider a touch gesture a scroll
- * rather than a tap. Absorbs micro-jitter from real taps while staying far
- * below any intentional scroll distance.
- */
-const SCROLL_THRESHOLD = 8;
-
-/**
- * Wraps children and fires `onTap` only when the touch ends without a scroll
- * gesture. Uses raw touch events (onTouchStart/Move/End) which fire
- * independently of the scroll responder system, so movement is reliably
- * detected even while a parent FlashList is absorbing a scroll.
- */
-export const TapView: React.FC<{
-  onTap?: () => void;
-  children: React.ReactNode;
-}> = ({ onTap, children }) => {
-  const startY = useRef(0);
-  const didScroll = useRef(false);
-  return (
-    <Box
-      onTouchStart={(e) => {
-        startY.current = e.nativeEvent.pageY;
-        didScroll.current = false;
-      }}
-      onTouchMove={(e) => {
-        if (Math.abs(e.nativeEvent.pageY - startY.current) > SCROLL_THRESHOLD) {
-          didScroll.current = true;
-        }
-      }}
-      onTouchEnd={() => {
-        if (!didScroll.current) onTap?.();
-      }}
-    >
-      {children}
-    </Box>
-  );
-};
-
-/**
- * Thin wrapper around the analytics event builder pattern.
- * Reduces the 5-line boilerplate at every call site to a single line.
- */
-export const trackExploreEvent = (
-  event: Parameters<typeof AnalyticsEventBuilder.createEventBuilder>[0],
-  properties: Record<string, string>,
-): void => {
-  analytics.trackEvent(
-    AnalyticsEventBuilder.createEventBuilder(event)
-      .addProperties(properties)
-      .build(),
-  );
-};
-
-/**
- * Returns a stable `onScrollBeginDrag` handler that fires a one-shot
- * analytics event the first time the user begins scrolling.
- * Uses a ref for `searchQuery` so the callback identity never changes.
- */
-export const useScrollTracking = (
-  interactionType: string,
-  searchQuery: string,
-  extraProperties?: Record<string, string>,
-) => {
-  const hasTracked = useRef(false);
-  const searchQueryRef = useRef(searchQuery);
-  searchQueryRef.current = searchQuery;
-
-  const extraPropsRef = useRef(extraProperties);
-  extraPropsRef.current = extraProperties;
-
-  const onScrollBeginDrag = useCallback(() => {
-    if (hasTracked.current) return;
-    hasTracked.current = true;
-    trackExploreEvent(MetaMetricsEvents.EXPLORE_SEARCH_INTERACTED, {
-      interaction_type: interactionType,
-      search_query: searchQueryRef.current,
-      ...extraPropsRef.current,
-    });
-  }, [interactionType]);
-
-  const resetScrollTracking = useCallback(() => {
-    hasTracked.current = false;
-  }, []);
-
-  return { onScrollBeginDrag, resetScrollTracking };
-};
-
-interface TrackedRowItemProps {
-  section: SectionConfig;
-  item: unknown;
-  index: number;
-  searchQuery: string;
-  interactionType: string;
-}
-
-/**
- * Renders a section RowItem (or its search override) wrapped in a TapView
- * that fires an analytics event on tap with the item identifier.
- */
-export const TrackedRowItem: React.FC<TrackedRowItemProps> = ({
-  section,
-  item,
-  index,
-  searchQuery,
-  interactionType,
-}) => {
-  const navigation = useNavigation<NavigationProp<ParamListBase>>();
-  const RowComponent = section.OverrideRowItemSearch ?? section.RowItem;
-
-  const searchQueryRef = useRef(searchQuery);
-  searchQueryRef.current = searchQuery;
-
-  const handleItemTouch = useCallback(() => {
-    trackExploreEvent(MetaMetricsEvents.EXPLORE_SEARCH_INTERACTED, {
-      interaction_type: interactionType,
-      search_query: searchQueryRef.current,
-      section_name: section.title,
-      item_clicked: section.getItemIdentifier(item),
-    });
-  }, [interactionType, section, item]);
-
-  return (
-    <TapView onTap={handleItemTouch}>
-      <RowComponent item={item} index={index} navigation={navigation} />
-    </TapView>
-  );
-};
diff --git a/app/components/Views/UnifiedTransactionsView/UnifiedTransactionsView.test.tsx b/app/components/Views/UnifiedTransactionsView/UnifiedTransactionsView.test.tsx
index 1013058594a..f011703e9a0 100644
--- a/app/components/Views/UnifiedTransactionsView/UnifiedTransactionsView.test.tsx
+++ b/app/components/Views/UnifiedTransactionsView/UnifiedTransactionsView.test.tsx
@@ -1,16 +1,48 @@
 import React, { ComponentType } from 'react';
 import { RefreshControl } from 'react-native';
-import { TransactionStatus } from '@metamask/transaction-controller';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import type { V1TransactionByHashResponse } from '@metamask/core-backend';
+import {
+  TransactionStatus,
+  type TransactionMeta,
+} from '@metamask/transaction-controller';
 import { Hex } from '@metamask/utils';
 import UnifiedTransactionsView from './UnifiedTransactionsView';
-import renderWithProvider from '../../../util/test/renderWithProvider';
+import _renderWithProvider from '../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import { updateIncomingTransactions } from '../../../util/transaction-controller';
 import { useUnifiedTxActions } from './useUnifiedTxActions';
+import { useTransactionsQuery } from './useTransactionsQuery';
+import { selectTransactions } from './helpers/transformations';
 
 // Type helper for UNSAFE_queryByType with mocked string components
 const asComponentType = (name: string) => name as unknown as ComponentType;
 
+type TransactionsQueryData = ReturnType<ReturnType<typeof selectTransactions>>;
+
+const emptyTransactionsQueryData: TransactionsQueryData = {
+  pageParams: [],
+  pages: [],
+};
+
+const createUseTransactionsQueryResult = (
+  data: TransactionsQueryData = emptyTransactionsQueryData,
+) => ({
+  data,
+  fetchNextPage: jest.fn(),
+  hasNextPage: false,
+  isFetchingNextPage: false,
+  refetch: jest.fn().mockResolvedValue(undefined),
+});
+
+const mockUseTransactionsQuery = (
+  data: TransactionsQueryData = emptyTransactionsQueryData,
+) => {
+  (useTransactionsQuery as jest.Mock).mockReturnValue(
+    createUseTransactionsQueryResult(data),
+  );
+};
+
 const mockNavigate = jest.fn();
 
 jest.mock('@react-navigation/native', () => ({
@@ -77,6 +109,10 @@ jest.mock('./useUnifiedTxActions', () => ({
   useUnifiedTxActions: jest.fn(() => mockDefaultUnifiedTxActionsReturn),
 }));
 
+jest.mock('./useTransactionsQuery', () => ({
+  useTransactionsQuery: jest.fn(() => createUseTransactionsQueryResult()),
+}));
+
 jest.mock('./useTransactionAutoScroll', () => ({
   useTransactionAutoScroll: () => ({
     handleScroll: jest.fn(),
@@ -185,6 +221,33 @@ jest.mock(
   }),
 );
 
+const renderWithProvider = (
+  component: React.ReactElement,
+  providerValues?: Parameters<typeof _renderWithProvider>[1],
+  includeNavigationContainer?: Parameters<typeof _renderWithProvider>[2],
+  includeFeatureFlagOverrideProvider?: Parameters<
+    typeof _renderWithProvider
+  >[3],
+) =>
+  _renderWithProvider(
+    <QueryClientProvider
+      client={
+        new QueryClient({
+          defaultOptions: {
+            queries: {
+              retry: false,
+            },
+          },
+        })
+      }
+    >
+      {component}
+    </QueryClientProvider>,
+    providerValues,
+    includeNavigationContainer,
+    includeFeatureFlagOverrideProvider,
+  );
+
 describe('UnifiedTransactionsView', () => {
   const initialState = {
     engine: {
@@ -194,6 +257,7 @@ describe('UnifiedTransactionsView', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUseTransactionsQuery();
     (useUnifiedTxActions as jest.Mock).mockImplementation(
       () => mockDefaultUnifiedTxActionsReturn,
     );
@@ -319,6 +383,13 @@ describe('UnifiedTransactionsView', () => {
 });
 
 describe('UnifiedTransactionsView with transactions', () => {
+  const ACTIVE_EVM_ADDRESS = '0x0000000000000000000000000000000000000abc';
+  const BRIDGE_TX_HASH =
+    '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890';
+  const OTHER_TX_HASH =
+    '0x1111111111111111111111111111111111111111111111111111111111111111';
+  const BRIDGE_TX_ID = 'bridge-tx-id';
+
   const stateWithTransactions = {
     engine: {
       backgroundState: {
@@ -344,8 +415,154 @@ describe('UnifiedTransactionsView with transactions', () => {
     },
   };
 
+  const stateWithConfirmedBridgeTransaction = {
+    engine: {
+      backgroundState: {
+        ...backgroundState,
+        AccountsController: {
+          ...backgroundState.AccountsController,
+          internalAccounts: {
+            accounts: {
+              'evm-account-id': {
+                id: 'evm-account-id',
+                type: 'eip155:eoa' as const,
+                address: ACTIVE_EVM_ADDRESS,
+                options: {},
+                methods: [],
+                metadata: {
+                  name: 'Account 1',
+                  keyring: { type: 'HD Key Tree' },
+                },
+              },
+            },
+            selectedAccount: 'evm-account-id',
+          },
+        },
+        TransactionController: {
+          ...backgroundState.TransactionController,
+          transactions: [
+            {
+              id: BRIDGE_TX_ID,
+              chainId: '0x1' as const,
+              hash: BRIDGE_TX_HASH,
+              status: TransactionStatus.confirmed,
+              time: Date.now(),
+              txParams: {
+                from: ACTIVE_EVM_ADDRESS,
+                to: '0x1111111111111111111111111111111111111111',
+                value: '0x0',
+                nonce: '0x1',
+              },
+            },
+          ],
+        },
+      },
+    },
+  };
+
+  const createConfirmedEvmQueryData = (
+    transactions: V1TransactionByHashResponse[] = [],
+  ) =>
+    selectTransactions({
+      address: ACTIVE_EVM_ADDRESS,
+    })({
+      pageParams: [undefined],
+      pages: [
+        {
+          data: transactions,
+          unprocessedNetworks: [],
+          pageInfo: {
+            count: transactions.length,
+            endCursor: undefined,
+            hasNextPage: false,
+          },
+        },
+      ],
+    });
+
+  const createConfirmedBridgeTransaction = (hash = BRIDGE_TX_HASH) =>
+    createConfirmedEvmQueryData([
+      {
+        accountId: `eip155:1:${ACTIVE_EVM_ADDRESS}`,
+        blockHash: '0xblock',
+        blockNumber: 1,
+        chainId: 1,
+        cumulativeGasUsed: 21000,
+        effectiveGasPrice: '1',
+        from: ACTIVE_EVM_ADDRESS,
+        gas: 21000,
+        gasPrice: '1',
+        gasUsed: 21000,
+        hash,
+        isError: false,
+        logs: [],
+        methodId: '0x',
+        nonce: 1,
+        readable: 'Transfer',
+        timestamp: '2026-04-29T19:28:41.000Z',
+        to: '0x1111111111111111111111111111111111111111',
+        transactionCategory: 'TRANSFER',
+        transactionType: 'SIMPLE_SEND',
+        value: '1',
+        valueTransfers: [],
+      } as V1TransactionByHashResponse,
+    ]);
+
+  const bridgeHistory = {
+    [BRIDGE_TX_ID]: {
+      txMetaId: BRIDGE_TX_ID,
+      account: ACTIVE_EVM_ADDRESS,
+      quote: {
+        srcChainId: 1,
+        destChainId: 8453,
+        srcAsset: {
+          symbol: 'ETH',
+          chainId: 1,
+          decimals: 18,
+          address: 'native',
+        },
+        destAsset: {
+          symbol: 'ETH',
+          chainId: 8453,
+          decimals: 18,
+          address: 'native',
+        },
+      },
+      status: {
+        srcChain: {
+          txHash: BRIDGE_TX_HASH,
+          chainId: 1,
+          amount: '1',
+        },
+        destChain: {
+          txHash:
+            '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
+          chainId: 8453,
+          amount: '1',
+        },
+        status: 'COMPLETE',
+      },
+      estimatedProcessingTimeInSeconds: 60,
+      slippagePercentage: 0,
+      completionTime: Date.now(),
+      startTime: Date.now() - 60000,
+    },
+  };
+
+  const getRenderedTransactionIds = (
+    queryAllByType: ReturnType<
+      typeof renderWithProvider
+    >['UNSAFE_queryAllByType'],
+  ) =>
+    queryAllByType(asComponentType('TransactionElement')).map(
+      ({ props }) => props.tx.id,
+    );
+
+  const apiBridgeTransactionId = `${BRIDGE_TX_HASH}-1`;
+
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUseTransactionsQuery();
     (useUnifiedTxActions as jest.Mock).mockImplementation(
       () => mockDefaultUnifiedTxActionsReturn,
     );
@@ -366,6 +583,311 @@ describe('UnifiedTransactionsView with transactions', () => {
     );
     expect(transactionElements.length).toBeGreaterThanOrEqual(0);
   });
+
+  it('uses the Accounts API bridge transaction when the source hash matches bridge history', () => {
+    mockUseTransactionsQuery(createConfirmedBridgeTransaction());
+    mockSelectBridgeHistoryForAccount.mockReturnValue(bridgeHistory);
+
+    const { UNSAFE_queryAllByType } = renderWithProvider(
+      <UnifiedTransactionsView />,
+      {
+        state: stateWithConfirmedBridgeTransaction,
+      },
+    );
+
+    const transactionIds = getRenderedTransactionIds(UNSAFE_queryAllByType);
+
+    expect(transactionIds).toContain(apiBridgeTransactionId);
+    expect(transactionIds).not.toContain(BRIDGE_TX_ID);
+  });
+
+  it('keeps the local bridge transaction when Accounts API only has a nonce collision', () => {
+    mockUseTransactionsQuery(createConfirmedBridgeTransaction(OTHER_TX_HASH));
+    mockSelectBridgeHistoryForAccount.mockReturnValue(bridgeHistory);
+
+    const { UNSAFE_queryAllByType } = renderWithProvider(
+      <UnifiedTransactionsView />,
+      {
+        state: stateWithConfirmedBridgeTransaction,
+      },
+    );
+
+    const transactionIds = getRenderedTransactionIds(UNSAFE_queryAllByType);
+
+    expect(transactionIds).toContain(BRIDGE_TX_ID);
+  });
+});
+
+describe('UnifiedTransactionsView - EVM network filter for unified list', () => {
+  const WALLET = '0xabc';
+
+  /** Required so selectLocalTransactions includes pending txs for UnifiedTransactionsView filtering. */
+  const accountsControllerForWallet = {
+    ...backgroundState.AccountsController,
+    internalAccounts: {
+      accounts: {
+        'wallet-evm-id': {
+          id: 'wallet-evm-id',
+          type: 'eip155:eoa' as const,
+          address: WALLET,
+          options: {},
+          methods: [],
+          metadata: {
+            name: 'Account 1',
+            keyring: { type: 'HD Key Tree' },
+          },
+        },
+      },
+      selectedAccount: 'wallet-evm-id',
+    },
+  };
+
+  const emptyEvmChainsState = {
+    engine: {
+      backgroundState: {
+        ...backgroundState,
+        AccountsController: accountsControllerForWallet,
+        NetworkEnablementController: {
+          ...backgroundState.NetworkEnablementController,
+          enabledNetworkMap: {
+            ...backgroundState.NetworkEnablementController.enabledNetworkMap,
+            eip155: {},
+          },
+        },
+      },
+    },
+  };
+
+  const stateOnlyOptimism = {
+    engine: {
+      backgroundState: {
+        ...backgroundState,
+        AccountsController: accountsControllerForWallet,
+        NetworkEnablementController: {
+          ...backgroundState.NetworkEnablementController,
+          enabledNetworkMap: {
+            ...backgroundState.NetworkEnablementController.enabledNetworkMap,
+            eip155: { '0xa': true },
+          },
+        },
+      },
+    },
+  };
+
+  const stateOnlyMainnet = {
+    engine: {
+      backgroundState: {
+        ...backgroundState,
+        AccountsController: accountsControllerForWallet,
+        NetworkEnablementController: {
+          ...backgroundState.NetworkEnablementController,
+          enabledNetworkMap: {
+            ...backgroundState.NetworkEnablementController.enabledNetworkMap,
+            eip155: { '0x1': true },
+          },
+        },
+      },
+    },
+  };
+
+  const createOutgoingMainnetConfirmed = (): V1TransactionByHashResponse =>
+    ({
+      accountId: `eip155:1:${WALLET}`,
+      blockHash: '0xblock',
+      blockNumber: 1,
+      chainId: 1,
+      cumulativeGasUsed: 21000,
+      effectiveGasPrice: '1',
+      from: WALLET,
+      gas: 21000,
+      gasPrice: '1',
+      gasUsed: 21000,
+      hash: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+      isError: false,
+      logs: [],
+      methodId: '0x',
+      nonce: 1,
+      readable: 'Transfer',
+      timestamp: '2026-04-29T19:28:41.000Z',
+      to: '0x1111111111111111111111111111111111111111',
+      transactionCategory: 'TRANSFER',
+      transactionType: 'SIMPLE_SEND',
+      value: '1',
+      valueTransfers: [],
+    }) as V1TransactionByHashResponse;
+
+  const queryDataMainnetConfirmed = selectTransactions({
+    address: WALLET,
+  })({
+    pageParams: [undefined],
+    pages: [
+      {
+        data: [createOutgoingMainnetConfirmed()],
+        unprocessedNetworks: [],
+        pageInfo: {
+          count: 1,
+          endCursor: undefined,
+          hasNextPage: false,
+        },
+      },
+    ],
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseTransactionsQuery();
+    (useUnifiedTxActions as jest.Mock).mockImplementation(
+      () => mockDefaultUnifiedTxActionsReturn,
+    );
+  });
+
+  it('hides confirmed EVM rows when no EVM chains are enabled', () => {
+    mockUseTransactionsQuery(queryDataMainnetConfirmed);
+
+    const { getByText } = renderWithProvider(<UnifiedTransactionsView />, {
+      state: emptyEvmChainsState,
+    });
+
+    expect(getByText('You have no transactions')).toBeOnTheScreen();
+  });
+
+  it('hides confirmed EVM rows when their chain is not in the enabled filter', () => {
+    mockUseTransactionsQuery(queryDataMainnetConfirmed);
+
+    const { getByText } = renderWithProvider(<UnifiedTransactionsView />, {
+      state: stateOnlyOptimism,
+    });
+
+    expect(getByText('You have no transactions')).toBeOnTheScreen();
+  });
+
+  it('shows confirmed EVM rows when their chain matches the enabled filter', () => {
+    mockUseTransactionsQuery(queryDataMainnetConfirmed);
+
+    const { UNSAFE_queryAllByType } = renderWithProvider(
+      <UnifiedTransactionsView />,
+      { state: stateOnlyMainnet },
+    );
+
+    expect(
+      UNSAFE_queryAllByType(asComponentType('TransactionElement')).length,
+    ).toBeGreaterThanOrEqual(1);
+  });
+
+  it('hides pending EVM transactions when their chain is not in the enabled filter', () => {
+    mockUseTransactionsQuery(emptyTransactionsQueryData);
+
+    const stateWithPendingMainnet = {
+      engine: {
+        backgroundState: {
+          ...backgroundState,
+          AccountsController: accountsControllerForWallet,
+          NetworkEnablementController:
+            stateOnlyOptimism.engine.backgroundState
+              .NetworkEnablementController,
+          TransactionController: {
+            ...backgroundState.TransactionController,
+            transactions: [
+              {
+                id: 'pending-mainnet',
+                chainId: '0x1' as const,
+                status: TransactionStatus.submitted,
+                time: Date.now(),
+                txParams: {
+                  from: WALLET,
+                  to: '0x1111111111111111111111111111111111111111',
+                  value: '0x0',
+                  nonce: '0x1',
+                },
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const { getByText } = renderWithProvider(<UnifiedTransactionsView />, {
+      state: stateWithPendingMainnet,
+    });
+
+    expect(getByText('You have no transactions')).toBeOnTheScreen();
+  });
+
+  it('hides pending EVM transactions when no EVM chains are enabled', () => {
+    mockUseTransactionsQuery(emptyTransactionsQueryData);
+
+    const stateWithPendingButNoEvmNetworks = {
+      engine: {
+        backgroundState: {
+          ...backgroundState,
+          AccountsController: accountsControllerForWallet,
+          NetworkEnablementController:
+            emptyEvmChainsState.engine.backgroundState
+              .NetworkEnablementController,
+          TransactionController: {
+            ...backgroundState.TransactionController,
+            transactions: [
+              {
+                id: 'pending-no-enabled-evm',
+                chainId: '0x1' as const,
+                status: TransactionStatus.submitted,
+                time: Date.now(),
+                txParams: {
+                  from: WALLET,
+                  to: '0x1111111111111111111111111111111111111111',
+                  value: '0x0',
+                  nonce: '0x1',
+                },
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    const { getByText } = renderWithProvider(<UnifiedTransactionsView />, {
+      state: stateWithPendingButNoEvmNetworks,
+    });
+
+    expect(getByText('You have no transactions')).toBeOnTheScreen();
+  });
+
+  it('hides pending EVM transactions when chainId is missing', () => {
+    mockUseTransactionsQuery(emptyTransactionsQueryData);
+
+    const pendingWithoutChainId = {
+      id: 'pending-missing-chain',
+      status: TransactionStatus.submitted,
+      time: Date.now(),
+      txParams: {
+        from: WALLET,
+        to: '0x1111111111111111111111111111111111111111',
+        value: '0x0',
+        nonce: '0x1',
+      },
+    } as unknown as TransactionMeta;
+
+    const stateWithPendingMissingChainId = {
+      engine: {
+        backgroundState: {
+          ...backgroundState,
+          AccountsController: accountsControllerForWallet,
+          NetworkEnablementController:
+            stateOnlyMainnet.engine.backgroundState.NetworkEnablementController,
+          TransactionController: {
+            ...backgroundState.TransactionController,
+            transactions: [pendingWithoutChainId],
+          },
+        },
+      },
+    };
+
+    const { getByText } = renderWithProvider(<UnifiedTransactionsView />, {
+      state: stateWithPendingMissingChainId,
+    });
+
+    expect(getByText('You have no transactions')).toBeOnTheScreen();
+  });
 });
 
 describe('UnifiedTransactionsView - Speed up / Cancel modal', () => {
@@ -377,6 +899,7 @@ describe('UnifiedTransactionsView - Speed up / Cancel modal', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUseTransactionsQuery();
     (useUnifiedTxActions as jest.Mock).mockImplementation(
       () => mockDefaultUnifiedTxActionsReturn,
     );
@@ -433,6 +956,7 @@ describe('UnifiedTransactionsView - refresh', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUseTransactionsQuery();
     (useUnifiedTxActions as jest.Mock).mockImplementation(
       () => mockDefaultUnifiedTxActionsReturn,
     );
@@ -454,135 +978,125 @@ describe('UnifiedTransactionsView - refresh', () => {
 });
 
 describe('UnifiedTransactionsView - token poisoning protection', () => {
-  const {
-    buildTrustedAddressSet: mockBuildTrustedAddressSet,
-    filterByAddress: mockFilterByAddress,
-    isTransactionOnChains: mockIsTransactionOnChains,
-  } = jest.requireMock('../../../util/activity');
-
   const FRIEND_ADDRESS = '0x1234000000000000000000000000000000000001';
+  const ACTIVE_EVM_ADDRESS = '0xabc';
 
   const baseState = { engine: { backgroundState } };
 
+  const createConfirmedEvmTransaction = (
+    overrides: Partial<V1TransactionByHashResponse> = {},
+  ) =>
+    ({
+      accountId: `eip155:1:${ACTIVE_EVM_ADDRESS}`,
+      blockHash: '0xblock',
+      blockNumber: 1,
+      chainId: 1,
+      cumulativeGasUsed: 21000,
+      effectiveGasPrice: '1',
+      from: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+      gas: 21000,
+      gasPrice: '1',
+      gasUsed: 21000,
+      hash: '0xhash',
+      isError: false,
+      logs: [],
+      methodId: '0x',
+      nonce: 1,
+      readable: 'Transfer',
+      timestamp: '2026-04-29T19:28:41.000Z',
+      to: ACTIVE_EVM_ADDRESS,
+      transactionCategory: 'TRANSFER',
+      transactionType: 'SIMPLE_SEND',
+      value: '1',
+      valueTransfers: [],
+      ...overrides,
+    }) as V1TransactionByHashResponse;
+
+  const createConfirmedEvmQueryData = (
+    transactions: V1TransactionByHashResponse[] = [],
+  ) =>
+    selectTransactions({
+      address: ACTIVE_EVM_ADDRESS,
+    })({
+      pageParams: [undefined],
+      pages: [
+        {
+          data: transactions,
+          unprocessedNetworks: [],
+          pageInfo: {
+            count: transactions.length,
+            endCursor: undefined,
+            hasNextPage: false,
+          },
+        },
+      ],
+    });
+
   // State with a single incoming ERC-20 transfer from an unknown sender
-  const stateWithIncomingTransfer = {
-    engine: {
-      backgroundState: {
-        ...backgroundState,
-        TransactionController: {
-          ...backgroundState.TransactionController,
-          transactions: [
-            {
-              id: 'tx-erc20',
-              chainId: '0x1' as const,
-              status: TransactionStatus.confirmed,
-              time: Date.now(),
-              isTransfer: true,
-              transferInformation: {
-                contractAddress: '0x3333333333333333333333333333333333333333',
-                decimals: 18,
-                symbol: 'TKN',
-              },
-              txParams: {
-                from: '0x9999999999999999999999999999999999999999',
-                to: '0xabc',
-                value: '0x0',
-                nonce: '0x1',
-              },
-            },
-          ],
+  const stateWithIncomingTransfer = createConfirmedEvmQueryData([
+    createConfirmedEvmTransaction({
+      hash: '0xpoison-erc20',
+      transactionType: 'TOKEN_TRANSFER',
+      valueTransfers: [
+        {
+          amount: '1',
+          contractAddress: '0x3333333333333333333333333333333333333333',
+          decimal: 18,
+          from: '0x9999999999999999999999999999999999999999',
+          name: 'Test Token',
+          symbol: 'TKN',
+          to: ACTIVE_EVM_ADDRESS,
+          transferType: 'ERC20',
         },
-      },
-    },
-  };
+      ],
+    }),
+  ]);
+
+  const stateWithIncomingNativeTransfer = createConfirmedEvmQueryData([
+    createConfirmedEvmTransaction({
+      hash: '0xpoison-native',
+      valueTransfers: [
+        {
+          amount: '1',
+          contractAddress: '',
+          decimal: 18,
+          from: '0x9999999999999999999999999999999999999999',
+          name: 'Ether',
+          symbol: 'ETH',
+          to: ACTIVE_EVM_ADDRESS,
+          transferType: 'NATIVE',
+        },
+      ],
+    }),
+  ]);
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUseTransactionsQuery();
     (useUnifiedTxActions as jest.Mock).mockImplementation(
       () => mockDefaultUnifiedTxActionsReturn,
     );
-    // Re-set implementations after any prior resetAllMocks() calls
-    (mockBuildTrustedAddressSet as jest.Mock).mockReturnValue(
-      new Set<string>(),
-    );
-    (mockFilterByAddress as jest.Mock).mockReturnValue(true);
-    // isTransactionOnChains gates the second chain filter at line 252 of the
-    // component; restore it so confirmed transactions aren't silently dropped
-    (mockIsTransactionOnChains as jest.Mock).mockReturnValue(true);
-  });
-
-  it('calls buildTrustedAddressSet on every render', () => {
-    renderWithProvider(<UnifiedTransactionsView />, { state: baseState });
-
-    expect(mockBuildTrustedAddressSet).toHaveBeenCalled();
-  });
-
-  it('calls buildTrustedAddressSet with the addressBook from state and an array of account addresses', () => {
-    const mockAddressBook = {
-      '0x1': {
-        [FRIEND_ADDRESS]: {
-          address: FRIEND_ADDRESS,
-          name: 'Friend',
-          chainId: '0x1' as Hex,
-          memo: '',
-          isEns: false,
-        },
-      },
-    };
-    const stateWithAddressBook = {
-      engine: {
-        backgroundState: {
-          ...backgroundState,
-          AddressBookController: { addressBook: mockAddressBook },
-        },
-      },
-    };
-
-    renderWithProvider(<UnifiedTransactionsView />, {
-      state: stateWithAddressBook,
-    });
-
-    expect(mockBuildTrustedAddressSet).toHaveBeenCalledWith(
-      mockAddressBook,
-      expect.any(Array),
-    );
-  });
-
-  it('passes a pre-built Set to filterByAddress (not the raw addressBook)', () => {
-    renderWithProvider(<UnifiedTransactionsView />, {
-      state: stateWithIncomingTransfer,
-    });
-
-    expect(mockFilterByAddress).toHaveBeenCalled();
-    (mockFilterByAddress as jest.Mock).mock.calls.forEach((args) => {
-      // arg[5] is trustedAddresses — must be a Set, not a plain object
-      expect(args[5]).toBeInstanceOf(Set);
-      // There is no arg[6]; the old addressBook + internalAccountAddresses
-      // params have been replaced by a single Set
-      expect(args[6]).toBeUndefined();
-    });
   });
 
   it('hides incoming ERC-20 transfer when filterByAddress returns false (unknown sender)', () => {
-    (mockFilterByAddress as jest.Mock).mockReturnValue(false);
+    mockUseTransactionsQuery(stateWithIncomingTransfer);
 
     const { getByText } = renderWithProvider(<UnifiedTransactionsView />, {
-      state: stateWithIncomingTransfer,
+      state: baseState,
     });
 
     // Transaction is filtered out → data is empty → empty state is shown
     expect(getByText('You have no transactions')).toBeOnTheScreen();
   });
 
-  it('shows incoming ERC-20 transfer when filterByAddress returns true (trusted sender)', () => {
-    (mockFilterByAddress as jest.Mock).mockReturnValue(true);
+  it('hides incoming native transfer when sender is unknown', () => {
+    mockUseTransactionsQuery(stateWithIncomingNativeTransfer);
 
-    const { queryByText } = renderWithProvider(<UnifiedTransactionsView />, {
-      state: stateWithIncomingTransfer,
+    const { getByText } = renderWithProvider(<UnifiedTransactionsView />, {
+      state: baseState,
     });
 
-    // Transaction passes filter → data is non-empty → empty state is absent
-    expect(queryByText('You have no transactions')).not.toBeOnTheScreen();
+    expect(getByText('You have no transactions')).toBeOnTheScreen();
   });
 });
 
@@ -644,6 +1158,7 @@ describe('UnifiedTransactionsView - cross-chain bridge visibility', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUseTransactionsQuery();
     (useUnifiedTxActions as jest.Mock).mockImplementation(
       () => mockDefaultUnifiedTxActionsReturn,
     );
diff --git a/app/components/Views/UnifiedTransactionsView/UnifiedTransactionsView.tsx b/app/components/Views/UnifiedTransactionsView/UnifiedTransactionsView.tsx
index 491048c8e52..c666fcd88e2 100644
--- a/app/components/Views/UnifiedTransactionsView/UnifiedTransactionsView.tsx
+++ b/app/components/Views/UnifiedTransactionsView/UnifiedTransactionsView.tsx
@@ -4,18 +4,19 @@ import { SmartTransaction } from '@metamask/smart-transactions-controller';
 import { TransactionMeta } from '@metamask/transaction-controller';
 import { numberToHex } from '@metamask/utils';
 import { useNavigation } from '@react-navigation/native';
-import { FlashList, FlashListRef } from '@shopify/flash-list';
+import {
+  FlashList,
+  type FlashListRef,
+  type ViewToken,
+} from '@shopify/flash-list';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
-import { RefreshControl, View } from 'react-native';
+import { ActivityIndicator, RefreshControl, View } from 'react-native';
 import { useSelector } from 'react-redux';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { strings } from '../../../../locales/i18n';
 import ExtendedKeyringTypes from '../../../constants/keyringTypes';
 import { RPC } from '../../../constants/network';
-import {
-  selectSelectedInternalAccount,
-  selectInternalAccounts,
-} from '../../../selectors/accountsController';
-import { selectAddressBook } from '../../../selectors/addressBookController';
+import { selectSelectedInternalAccount } from '../../../selectors/accountsController';
 import { selectCurrentCurrency } from '../../../selectors/currencyRateController';
 import { selectNonEvmTransactionsForSelectedAccountGroup } from '../../../selectors/multichain/multichain';
 import { selectSelectedAccountGroupInternalAccounts } from '../../../selectors/multichainAccounts/accountTreeController';
@@ -27,20 +28,15 @@ import {
   selectEVMEnabledNetworks,
   selectNonEVMEnabledNetworks,
 } from '../../../selectors/networkEnablementController';
-import { selectTokens } from '../../../selectors/tokensController';
-import { selectSortedEVMTransactionsForSelectedAccountGroup } from '../../../selectors/transactionController';
-import { baseStyles } from '../../../styles/common';
 import {
-  filterByAddress,
-  isTransactionOnChains,
-  sortTransactions,
-  buildTrustedAddressSet,
-} from '../../../util/activity';
+  selectLocalTransactions,
+  selectRelatedChainIdsByTransactionId,
+} from '../../../selectors/transactionController';
+import { baseStyles } from '../../../styles/common';
 import { areAddressesEqual, isHardwareAccount } from '../../../util/address';
 import { getBlockExplorerAddressUrl } from '../../../util/networks';
 import { useTheme } from '../../../util/theme';
 import { updateIncomingTransactions } from '../../../util/transaction-controller';
-import { addAccountTimeFlagFilter } from '../../../util/transactions';
 import { useStyles } from '../../hooks/useStyles';
 import PriceChartContext, {
   PriceChartProvider,
@@ -49,7 +45,6 @@ import { useBridgeHistoryItemBySrcTxHash } from '../../UI/Bridge/hooks/useBridge
 import MultichainBridgeTransactionListItem from '../../UI/MultichainBridgeTransactionListItem';
 import MultichainTransactionListItem from '../../UI/MultichainTransactionListItem';
 import TransactionElement from '../../UI/TransactionElement';
-import { filterDuplicateOutgoingTransactions } from '../../UI/Transactions/utils';
 import TransactionsFooter from '../../UI/Transactions/TransactionsFooter';
 import MultichainTransactionsFooter from '../MultichainTransactionsView/MultichainTransactionsFooter';
 import { getAddressUrl } from '../../../core/Multichain/utils';
@@ -64,30 +59,41 @@ import { TabEmptyState } from '../../../component-library/components-temp/TabEmp
 import { UnifiedTransactionsViewSelectorsIDs } from './UnifiedTransactionsView.testIds';
 import { useMultichainActivityMaliciousTokenKeys } from '../../hooks/useMultichainActivityMaliciousTokenKeys/useMultichainActivityMaliciousTokenKeys';
 import { filterMultichainTransactionsExcludingMaliciousTokenActivity } from '../../../util/multichain/multichainTransactionTokenScan';
+import { useTransactionsQuery } from './useTransactionsQuery';
+import {
+  type EvmTransaction,
+  TransactionKind,
+  type TransactionViewModel,
+  type UnifiedItem,
+} from './types';
+import {
+  isBridgeHistoryForEvmTransaction,
+  mergeTransactionsByTime,
+} from './helpers/transformations';
 
-type SmartTransactionWithId = SmartTransaction & { id: string };
-type EvmTransaction = TransactionMeta | SmartTransactionWithId;
-type TransactionMetaWithImport = TransactionMeta & {
-  insertImportTime?: boolean;
-};
+const confirmedEvmOverscan = 5;
+const visibilityConfig = { itemVisiblePercentThreshold: 1 };
 
 const getTransactionId = (tx: EvmTransaction) => tx.id;
-
-const isTransactionMetaLike = (tx: EvmTransaction): tx is TransactionMeta =>
-  'chainId' in tx && typeof tx.chainId === 'string';
+const isTransactionMetaLike = (
+  tx: TransactionMeta | SmartTransaction,
+): tx is EvmTransaction => 'id' in tx && typeof tx.id === 'string';
 
 const getEvmTransactionTime = (tx: EvmTransaction) => tx.time ?? 0;
 
 const getEvmChainId = (tx: EvmTransaction) => tx.chainId;
 
-enum TransactionKind {
-  Evm = 'evm',
-  NonEvm = 'nonEvm',
-}
+const generateKey = (item: UnifiedItem) => {
+  if (item.kind === TransactionKind.Evm) {
+    return getTransactionId(item.tx);
+  }
+
+  if (item.kind === TransactionKind.ConfirmedEvm) {
+    return getTransactionId(item.tx.transactionMeta);
+  }
 
-type UnifiedItem =
-  | { kind: TransactionKind.Evm; tx: TransactionMeta | SmartTransactionWithId }
-  | { kind: TransactionKind.NonEvm; tx: NonEvmTransaction };
+  return String(item.tx.id ?? `${item.tx.chain}-${item.tx.timestamp ?? '0'}`);
+};
 
 interface UnifiedTransactionsViewProps {
   header?: React.ReactElement;
@@ -103,12 +109,26 @@ const UnifiedTransactionsView = ({
 }: UnifiedTransactionsViewProps) => {
   const navigation = useNavigation();
   const { colors } = useTheme();
+  const tw = useTailwind();
   const { styles } = useStyles(styleSheet, {});
   const { bridgeHistoryItemsBySrcTxHash } = useBridgeHistoryItemBySrcTxHash();
 
-  const evmTransactions = useSelector(
-    selectSortedEVMTransactionsForSelectedAccountGroup,
+  const {
+    data: evmTransactions,
+    fetchNextPage,
+    hasNextPage,
+    isInitialLoading,
+    isFetchingNextPage,
+    refetch,
+  } = useTransactionsQuery();
+
+  const allConfirmedFiltered = useMemo<TransactionViewModel[]>(
+    () => evmTransactions?.pages.flatMap((page) => page.data) ?? [],
+    [evmTransactions],
   );
+
+  const submittedTxs = useSelector(selectLocalTransactions);
+
   const nonEvmState = useSelector(
     selectNonEvmTransactionsForSelectedAccountGroup,
   );
@@ -121,12 +141,9 @@ const UnifiedTransactionsView = ({
 
   // Inputs required to reproduce EVM filtering pipeline
   const selectedInternalAccount = useSelector(selectSelectedInternalAccount);
-  const tokens = useSelector(selectTokens);
   const selectedAccountGroupInternalAccounts = useSelector(
     selectSelectedAccountGroupInternalAccounts,
   );
-  const selectedAccountGroupInternalAccountsAddresses =
-    selectedAccountGroupInternalAccounts.map((account) => account.address);
   const selectedAccountGroupEvmAddress = useMemo(() => {
     const evmAccount = selectedAccountGroupInternalAccounts.find(
       (account) =>
@@ -153,6 +170,24 @@ const UnifiedTransactionsView = ({
     [enabledNonEVMNetworks],
   );
 
+  const relatedChainIdsByTransactionId = useSelector(
+    selectRelatedChainIdsByTransactionId,
+  );
+
+  /** Drop confirmed rows not on currently enabled EVM chains (guards stale query pages). */
+  const allConfirmedForEnabledChains = useMemo<TransactionViewModel[]>(() => {
+    const chains = enabledEVMChainIds ?? [];
+    if (chains.length === 0) {
+      return [];
+    }
+    const allowed = new Set(chains.map((c) => c.toLowerCase()));
+    return allConfirmedFiltered.filter(
+      (tx) =>
+        typeof tx.hexChainId === 'string' &&
+        allowed.has(tx.hexChainId.toLowerCase()),
+    );
+  }, [allConfirmedFiltered, enabledEVMChainIds]);
+
   const { maliciousTokenKeys } =
     useMultichainActivityMaliciousTokenKeys(nonEvmTransactions);
 
@@ -162,161 +197,77 @@ const UnifiedTransactionsView = ({
   );
 
   const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
-  const addressBook = useSelector(selectAddressBook);
-  const internalAccounts = useSelector(selectInternalAccounts);
-
-  const trustedAddresses = useMemo(
-    () =>
-      buildTrustedAddressSet(
-        addressBook,
-        internalAccounts.map((account) => account.address),
-      ),
-    [addressBook, internalAccounts],
-  );
 
   const unifiedTransactionSource = useMemo<{
-    evmPendingItems: UnifiedItem[];
-    evmConfirmedItems: UnifiedItem[];
+    evmPendingTxs: EvmTransaction[];
+    evmConfirmedTxs: TransactionViewModel[];
     chainFilteredNonEvmTransactionsForSelectedChain: NonEvmTransaction[];
   }>(() => {
-    // Build EVM submitted/confirmed with full filtering pipeline
-    let accountAddedTimeInsertPointFound = false;
-    const addedAccountTime = selectedInternalAccount?.metadata?.importTime;
-    const submittedTxs: EvmTransaction[] = [];
-
-    const sortedTransactions = sortTransactions(
-      evmTransactions ?? [],
-    ) as EvmTransaction[];
-
-    const allTransactionsSorted = sortedTransactions.filter(
-      (tx, index, self) => {
-        const key = getTransactionId(tx);
-        return self.findIndex((_tx) => getTransactionId(_tx) === key) === index;
-      },
+    const bridgeHistoryValues = Object.values(bridgeHistory ?? {});
+    const enabledEvmSet = new Set(
+      (enabledEVMChainIds ?? []).map((id) => id.toLowerCase()),
     );
-
-    const transactionMetaPool = allTransactionsSorted.filter(
-      isTransactionMetaLike,
-    ) as TransactionMeta[];
-
-    const allConfirmed = allTransactionsSorted.filter((tx) => {
-      if (!isTransactionMetaLike(tx)) {
-        const status = tx.status;
-        if (
-          status === 'submitted' ||
-          status === 'signed' ||
-          status === 'unapproved' ||
-          status === 'approved' ||
-          status === 'pending'
-        ) {
-          submittedTxs.push(tx as SmartTransactionWithId);
+    const submittedTxsFiltered = submittedTxs.filter(
+      (tx): tx is EvmTransaction => {
+        if (!isTransactionMetaLike(tx)) {
+          return false;
         }
-        return false;
-      }
-
-      const isReceivedOrSentTransaction =
-        selectedAccountGroupInternalAccountsAddresses.some((addr) =>
-          filterByAddress(
-            tx,
-            tokens,
-            addr,
-            transactionMetaPool,
-            bridgeHistory,
-            trustedAddresses,
-          ),
-        );
-      if (!isReceivedOrSentTransaction) return false;
 
-      const insertImportTime = addAccountTimeFlagFilter(
-        tx as unknown as object,
-        addedAccountTime as unknown as object,
-        accountAddedTimeInsertPointFound as unknown as object,
-      );
-      const updatedTx = { ...tx, insertImportTime };
-      if (updatedTx.insertImportTime) accountAddedTimeInsertPointFound = true;
-
-      // not sure if pending is a valid status for EVM transactions, but keeping
-      // it for now to avoid breaking changes
-      const status = tx.status as TransactionMeta['status'] | 'pending';
-      switch (status) {
-        case 'submitted':
-        case 'signed':
-        case 'unapproved':
-        case 'approved':
-        case 'pending':
-          submittedTxs.push(updatedTx);
-          return false;
-        case 'confirmed':
-          break;
-      }
-      return isReceivedOrSentTransaction;
-    }) as TransactionMetaWithImport[];
+        const { chainId: _chainId, txParams } = tx;
 
-    // Network filtering for confirmed EVM txs
-    const allConfirmedFiltered: TransactionMetaWithImport[] =
-      allConfirmed.filter((tx) =>
-        isTransactionOnChains(tx, enabledEVMChainIds, transactionMetaPool),
-      );
-    // Deduplicate submitted by (address + chain + nonce) and drop if already confirmed
-    const seenSubmittedNonces = new Set<string>();
-    const submittedTxsFiltered = submittedTxs.filter(
-      ({ chainId: _chainId, txParams }) => {
-        const { from, nonce, actionId } = txParams || {};
-        // Some txs don't have nonce, like intent based swaps
-        const hasNonce = nonce !== undefined && nonce !== null;
-        if (
-          !selectedAccountGroupInternalAccountsAddresses.some((addr) =>
-            areAddressesEqual(from, addr),
-          )
-        ) {
+        if (!enabledEvmSet.size) {
           return false;
         }
-        const dedupeKeyPrefix = `${_chainId}-${String(from).toLowerCase()}`;
-        const dedupeKey = hasNonce
-          ? `${dedupeKeyPrefix}-${nonce}`
-          : `${dedupeKeyPrefix}-${actionId}`;
-        if (seenSubmittedNonces.has(dedupeKey)) {
+
+        const relatedChainIds = relatedChainIdsByTransactionId.get(tx.id) ?? [
+          String(_chainId ?? '').toLowerCase(),
+        ];
+        if (!relatedChainIds.some((id) => enabledEvmSet.has(id))) {
           return false;
         }
 
-        const alreadyConfirmed = allConfirmedFiltered.find(
+        const isBridgeTransaction = isBridgeHistoryForEvmTransaction(
+          tx,
+          bridgeHistoryValues,
+        );
+        const hash = 'hash' in tx ? tx.hash : undefined;
+        const { from, nonce } = txParams || {};
+        const hasNonce = nonce !== undefined && nonce !== null;
+
+        const matchingConfirmedByHash = allConfirmedForEnabledChains.some(
+          (confirmedTx) =>
+            typeof hash === 'string' &&
+            confirmedTx.hash.toLowerCase() === hash.toLowerCase() &&
+            confirmedTx.hexChainId?.toLowerCase() === _chainId?.toLowerCase(),
+        );
+        const matchingConfirmedByNonce = allConfirmedForEnabledChains.some(
           (confirmedTx) =>
             hasNonce &&
-            confirmedTx.txParams?.nonce === nonce &&
-            selectedAccountGroupInternalAccountsAddresses.some((addr) =>
-              areAddressesEqual(confirmedTx.txParams?.from, addr),
-            ) &&
-            confirmedTx.chainId === _chainId,
+            confirmedTx.nonce === nonce &&
+            confirmedTx.hexChainId?.toLowerCase() === _chainId?.toLowerCase() &&
+            Boolean(from) &&
+            areAddressesEqual(confirmedTx.from, from),
         );
 
-        if (alreadyConfirmed) {
+        if (
+          matchingConfirmedByHash ||
+          (!isBridgeTransaction && matchingConfirmedByNonce)
+        ) {
           return false;
         }
 
-        seenSubmittedNonces.add(dedupeKey);
         return true;
       },
     );
-    // Ensure insertImportTime appears at least once if applicable
-    if (!accountAddedTimeInsertPointFound && allConfirmedFiltered?.length) {
-      const lastIndex = allConfirmedFiltered.length - 1;
-      allConfirmedFiltered[lastIndex] = {
-        ...allConfirmedFiltered[lastIndex],
-        insertImportTime: true,
-      };
-    }
 
     // EVM: pending/submitted first (desc), then confirmed (dedup outgoing)
     const evmPendingFirst = [...submittedTxsFiltered].sort(
       (a, b) => getEvmTransactionTime(b) - getEvmTransactionTime(a),
     );
-    const evmConfirmedDeduped =
-      filterDuplicateOutgoingTransactions(allConfirmedFiltered);
 
     // Non-EVM: filter by enabled chains, also include bridge txs
     // whose destination chain is enabled (e.g. Solana→Optimism bridge
     // should appear when viewing Optimism activity)
-    const bridgeHistoryValues = Object.values(bridgeHistory ?? {});
     const chainFilteredNonEvmTransactionsForSelectedChain = nonEvmTransactions
       .filter((tx) => {
         if (enabledNonEVMChainIds.includes(tx.chain)) return true;
@@ -333,30 +284,19 @@ const UnifiedTransactionsView = ({
         (tx, index, self) => index === self.findIndex((t) => t.id === tx.id),
       );
 
-    const evmPendingItems: UnifiedItem[] = evmPendingFirst.map((tx) => ({
-      kind: TransactionKind.Evm,
-      tx,
-    }));
-    const evmConfirmedItems: UnifiedItem[] = evmConfirmedDeduped.map((tx) => ({
-      kind: TransactionKind.Evm,
-      tx,
-    }));
-
     return {
-      evmPendingItems,
-      evmConfirmedItems,
+      evmPendingTxs: evmPendingFirst,
+      evmConfirmedTxs: allConfirmedForEnabledChains,
       chainFilteredNonEvmTransactionsForSelectedChain,
     };
   }, [
-    evmTransactions,
+    allConfirmedForEnabledChains,
+    submittedTxs,
     nonEvmTransactions,
-    selectedAccountGroupInternalAccountsAddresses,
     enabledEVMChainIds,
     enabledNonEVMChainIds,
-    selectedInternalAccount,
-    tokens,
     bridgeHistory,
-    trustedAddresses,
+    relatedChainIdsByTransactionId,
   ]);
 
   const { data, nonEvmTransactionsForSelectedChain } = useMemo<{
@@ -364,8 +304,8 @@ const UnifiedTransactionsView = ({
     nonEvmTransactionsForSelectedChain: NonEvmTransaction[];
   }>(() => {
     const {
-      evmPendingItems,
-      evmConfirmedItems,
+      evmPendingTxs,
+      evmConfirmedTxs,
       chainFilteredNonEvmTransactionsForSelectedChain,
     } = unifiedTransactionSource;
 
@@ -375,28 +315,14 @@ const UnifiedTransactionsView = ({
         maliciousTokenKeys,
       );
 
-    const nonEvmItems: UnifiedItem[] =
-      filteredNonEvmTransactionsForSelectedChain.map((tx) => ({
-        kind: TransactionKind.NonEvm,
-        tx,
-      }));
-
-    const confirmedUnified = [...evmConfirmedItems, ...nonEvmItems].sort(
-      (a, b) => {
-        const ta =
-          a.kind === TransactionKind.Evm
-            ? getEvmTransactionTime(a.tx)
-            : (a.tx.timestamp ?? 0) * 1000;
-        const tb =
-          b.kind === TransactionKind.Evm
-            ? getEvmTransactionTime(b.tx)
-            : (b.tx.timestamp ?? 0) * 1000;
-        return tb - ta;
-      },
+    const data = mergeTransactionsByTime(
+      evmPendingTxs,
+      evmConfirmedTxs,
+      filteredNonEvmTransactionsForSelectedChain,
     );
 
     return {
-      data: [...evmPendingItems, ...confirmedUnified],
+      data,
       nonEvmTransactionsForSelectedChain:
         filteredNonEvmTransactionsForSelectedChain,
     };
@@ -531,6 +457,14 @@ const UnifiedTransactionsView = ({
   }, [navigation, nonEvmExplorerUrl]);
 
   const footerComponent = useMemo(() => {
+    if (isFetchingNextPage) {
+      return (
+        <View style={tw.style('items-center justify-center py-4')}>
+          <ActivityIndicator />
+        </View>
+      );
+    }
+
     if (showEvmFooter) {
       return (
         <TransactionsFooter
@@ -566,9 +500,11 @@ const UnifiedTransactionsView = ({
     blockExplorerUrl,
     nonEvmExplorerUrl,
     showEvmFooter,
+    isFetchingNextPage,
     showNonEvmExplorerLink,
     showNonEvmFooter,
     configBlockExplorerUrl,
+    tw,
   ]);
 
   const [refreshing, setRefreshing] = useState(false);
@@ -589,26 +525,65 @@ const UnifiedTransactionsView = ({
   const onRefresh = useCallback(async () => {
     setRefreshing(true);
     try {
-      await updateIncomingTransactions();
+      await Promise.all([updateIncomingTransactions(), refetch()]);
     } finally {
       setRefreshing(false);
     }
-  }, []);
+  }, [refetch]);
 
-  const listRef = useRef<FlashListRef<UnifiedItem>>(null);
+  const lastConfirmedEvmIndex = useMemo(() => {
+    for (let index = data.length - 1; index >= 0; index -= 1) {
+      if (data[index].kind === TransactionKind.ConfirmedEvm) {
+        return index;
+      }
+    }
 
-  // Auto-scroll to top when new transactions are added
-  const { handleScroll } = useTransactionAutoScroll(data, listRef, {
-    keyExtractor: (item: UnifiedItem) => {
-      if (item.kind === TransactionKind.Evm) {
-        return getTransactionId(item.tx) ?? null;
+    return -1;
+  }, [data]);
+
+  const lastConfirmedEvmKey =
+    lastConfirmedEvmIndex >= 0
+      ? generateKey(data[lastConfirmedEvmIndex])
+      : undefined;
+
+  const onViewableItemsChanged = useCallback(
+    ({ viewableItems }: { viewableItems: ViewToken<UnifiedItem>[] }) => {
+      if (
+        !hasNextPage ||
+        isFetchingNextPage ||
+        !lastConfirmedEvmKey ||
+        lastConfirmedEvmIndex < 0
+      ) {
+        return;
       }
-      // For non-EVM (Solana, Bitcoin, Tron, etc.)
-      // Use same fallback as keyExtractor to ensure consistency
-      return String(
-        item.tx?.id ?? `${item.tx?.chain}-${item.tx?.timestamp ?? '0'}`,
+
+      const prefetchIndex = Math.max(
+        lastConfirmedEvmIndex - confirmedEvmOverscan,
+        0,
       );
+      const isNearPrefetchThreshold = viewableItems.some(
+        ({ index }) => typeof index === 'number' && index >= prefetchIndex,
+      );
+
+      if (!isNearPrefetchThreshold) {
+        return;
+      }
+
+      fetchNextPage();
     },
+    [
+      fetchNextPage,
+      hasNextPage,
+      isFetchingNextPage,
+      lastConfirmedEvmIndex,
+      lastConfirmedEvmKey,
+    ],
+  );
+  const listRef = useRef<FlashListRef<UnifiedItem>>(null);
+
+  // Auto-scroll to top when new transactions are added
+  const { handleScroll } = useTransactionAutoScroll(data, listRef, {
+    keyExtractor: generateKey,
   });
 
   const renderEmptyList = () => (
@@ -617,6 +592,15 @@ const UnifiedTransactionsView = ({
     </View>
   );
 
+  const renderInitialLoading = () => (
+    <View style={styles.emptyList}>
+      <ActivityIndicator color={colors.icon.default} />
+    </View>
+  );
+
+  const shouldShowTransactionList = !isInitialLoading && data.length > 0;
+  const items = shouldShowTransactionList ? data : [];
+
   const renderItem = ({
     item,
     index,
@@ -632,7 +616,9 @@ const UnifiedTransactionsView = ({
           i={index}
           navigation={navigation}
           txChainId={getEvmChainId(item.tx)}
-          selectedAddress={selectedInternalAccount?.address}
+          selectedAddress={
+            selectedAccountGroupEvmAddress || selectedInternalAccount?.address
+          }
           onSpeedUpAction={onSpeedUpAction}
           onCancelAction={onCancelAction}
           signQRTransaction={signQRTransaction}
@@ -653,6 +639,23 @@ const UnifiedTransactionsView = ({
       );
     }
 
+    if (item.kind === TransactionKind.ConfirmedEvm) {
+      return (
+        <TransactionElement
+          tx={item.tx.transactionMeta}
+          i={index}
+          navigation={navigation}
+          txChainId={item.tx.hexChainId}
+          selectedAddress={
+            selectedAccountGroupEvmAddress || selectedInternalAccount?.address
+          }
+          currentCurrency={currentCurrency}
+          showBottomBorder
+          location={location}
+        />
+      );
+    }
+
     // Render non-EVM transactions
     const srcTxHash = item.tx.id; // id is unique for multichain tx
     const bridgeHistoryItem = bridgeHistoryItemsBySrcTxHash[srcTxHash];
@@ -686,19 +689,14 @@ const UnifiedTransactionsView = ({
           {({ isChartBeingTouched }) => (
             <FlashList
               ref={listRef}
-              data={data}
+              data={items}
               testID={UnifiedTransactionsViewSelectorsIDs.CONTAINER}
               renderItem={renderItem}
-              keyExtractor={(listItem) =>
-                listItem.kind === TransactionKind.Evm
-                  ? getTransactionId(listItem.tx)
-                  : String(
-                      listItem.tx.id ??
-                        `${listItem.tx.chain}-${listItem.tx.timestamp ?? '0'}`,
-                    )
-              }
+              keyExtractor={generateKey}
               ListHeaderComponent={header}
-              ListEmptyComponent={renderEmptyList}
+              ListEmptyComponent={
+                isInitialLoading ? renderInitialLoading : renderEmptyList
+              }
               ListFooterComponent={footerComponent}
               style={baseStyles.flexGrow}
               refreshControl={
@@ -710,6 +708,8 @@ const UnifiedTransactionsView = ({
                 />
               }
               onScroll={handleScroll}
+              onViewableItemsChanged={onViewableItemsChanged}
+              viewabilityConfig={visibilityConfig}
               scrollEventThrottle={16}
               scrollEnabled={!isChartBeingTouched}
             />
diff --git a/app/components/Views/UnifiedTransactionsView/helpers/adapters.test.ts b/app/components/Views/UnifiedTransactionsView/helpers/adapters.test.ts
new file mode 100644
index 00000000000..88d2f1eaed7
--- /dev/null
+++ b/app/components/Views/UnifiedTransactionsView/helpers/adapters.test.ts
@@ -0,0 +1,172 @@
+import type { V1TransactionByHashResponse } from '@metamask/core-backend';
+import {
+  TransactionStatus,
+  TransactionType,
+} from '@metamask/transaction-controller';
+import {
+  APPROVE_FUNCTION_SIGNATURE,
+  TRANSFER_FUNCTION_SIGNATURE,
+} from '../../../../util/transactions';
+import { normalizeTransaction } from './adapters';
+
+describe('normalizeTransaction', () => {
+  const address = '0x0000000000000000000000000000000000000001';
+  const otherAddress = '0x0000000000000000000000000000000000000002';
+  const contractAddress = '0x00000000000000000000000000000000000000aa';
+
+  const buildTransaction = (
+    overrides: Partial<V1TransactionByHashResponse> = {},
+  ): V1TransactionByHashResponse =>
+    ({
+      hash: '0xhash',
+      timestamp: '2024-01-01T00:00:00Z',
+      chainId: 1,
+      blockNumber: 100,
+      blockHash: '0xblock',
+      gas: 21000,
+      gasUsed: 21000,
+      gasPrice: '1000000000',
+      effectiveGasPrice: '1000000000',
+      nonce: 0,
+      cumulativeGasUsed: 21000,
+      value: '1000',
+      to: otherAddress,
+      from: address,
+      methodId: '0x',
+      isError: false,
+      ...overrides,
+    }) as unknown as V1TransactionByHashResponse;
+
+  it('normalizes a simple outgoing send', () => {
+    const meta = normalizeTransaction(address, buildTransaction());
+
+    expect(meta).toEqual(
+      expect.objectContaining({
+        hash: '0xhash',
+        id: '0xhash-1',
+        chainId: '0x1',
+        status: TransactionStatus.confirmed,
+        type: TransactionType.simpleSend,
+        isTransfer: false,
+        networkClientId: '',
+        toSmartContract: false,
+        verifiedOnBlockchain: false,
+        blockNumber: '100',
+        time: Date.parse('2024-01-01T00:00:00Z'),
+        error: undefined,
+        transferInformation: undefined,
+      }),
+    );
+    expect(meta.txParams).toEqual(
+      expect.objectContaining({
+        chainId: '0x1',
+        from: address,
+        to: otherAddress,
+        value: '0x3e8',
+        gas: '0x5208',
+        gasPrice: '0x3b9aca00',
+        gasUsed: '0x5208',
+        nonce: '0x0',
+      }),
+    );
+  });
+
+  it('marks the transaction as failed when isError is true', () => {
+    const meta = normalizeTransaction(
+      address,
+      buildTransaction({ isError: true }),
+    );
+
+    expect(meta.status).toBe(TransactionStatus.failed);
+    expect(meta.error).toBeInstanceOf(Error);
+    expect(meta.error?.message).toBe('Transaction failed');
+  });
+
+  it('marks an outgoing transaction with no `to` and calldata as deployContract', () => {
+    const meta = normalizeTransaction(
+      address,
+      buildTransaction({
+        to: undefined as unknown as string,
+        methodId: '0xabcdef',
+      }),
+    );
+
+    expect(meta.type).toBe(TransactionType.deployContract);
+  });
+
+  it('classifies an incoming transaction', () => {
+    const meta = normalizeTransaction(
+      address,
+      buildTransaction({ from: otherAddress, to: address }),
+    );
+
+    expect(meta.type).toBe(TransactionType.incoming);
+  });
+
+  it('detects ERC20 transfer method', () => {
+    const meta = normalizeTransaction(
+      address,
+      buildTransaction({
+        methodId: TRANSFER_FUNCTION_SIGNATURE,
+        value: '0',
+      }),
+    );
+
+    expect(meta.type).toBe(TransactionType.tokenMethodTransfer);
+  });
+
+  it('detects ERC20 approve method', () => {
+    const meta = normalizeTransaction(
+      address,
+      buildTransaction({
+        methodId: APPROVE_FUNCTION_SIGNATURE,
+        value: '0',
+      }),
+    );
+
+    expect(meta.type).toBe(TransactionType.tokenMethodApprove);
+  });
+
+  it('classifies a contract interaction when calldata has value', () => {
+    const meta = normalizeTransaction(
+      address,
+      buildTransaction({
+        methodId: '0xdeadbeef',
+        value: '1000',
+      }),
+    );
+
+    expect(meta.type).toBe(TransactionType.contractInteraction);
+  });
+
+  it('extracts transfer information for an incoming token transfer and rewrites txParams', () => {
+    const meta = normalizeTransaction(
+      address,
+      buildTransaction({
+        from: otherAddress,
+        to: contractAddress,
+        value: '0',
+        valueTransfers: [
+          {
+            from: otherAddress,
+            to: address,
+            amount: '5000',
+            contractAddress,
+            decimal: 6,
+            symbol: 'USDC',
+          },
+        ],
+      } as Partial<V1TransactionByHashResponse>),
+    );
+
+    expect(meta.isTransfer).toBe(true);
+    expect(meta.transferInformation).toEqual({
+      amount: '5000',
+      contractAddress,
+      decimals: 6,
+      symbol: 'USDC',
+    });
+    expect(meta.txParams.to).toBe(address);
+    expect(meta.txParams.value).toBe('0x1388');
+  });
+});
diff --git a/app/components/Views/UnifiedTransactionsView/helpers/adapters.ts b/app/components/Views/UnifiedTransactionsView/helpers/adapters.ts
new file mode 100644
index 00000000000..865a58c2361
--- /dev/null
+++ b/app/components/Views/UnifiedTransactionsView/helpers/adapters.ts
@@ -0,0 +1,138 @@
+import type { V1TransactionByHashResponse } from '@metamask/core-backend';
+import {
+  type TransactionMeta,
+  TransactionStatus,
+  TransactionType,
+} from '@metamask/transaction-controller';
+import {
+  APPROVE_FUNCTION_SIGNATURE,
+  INCREASE_ALLOWANCE_SIGNATURE,
+  NFT_SAFE_TRANSFER_FROM_FUNCTION_SIGNATURE,
+  SET_APPROVAL_FOR_ALL_SIGNATURE,
+  TRANSFER_FROM_FUNCTION_SIGNATURE,
+  TRANSFER_FUNCTION_SIGNATURE,
+} from '../../../../util/transactions';
+import { Hex } from 'viem';
+import { toHex } from '@metamask/controller-utils';
+
+// Ported from transaction-controller
+// - AccountsApiRemoteTransactionSource
+// - determineTransactionType
+function resolveTransactionMetaType(
+  transaction: V1TransactionByHashResponse,
+  isOutgoing: boolean,
+) {
+  if (!isOutgoing) {
+    return TransactionType.incoming;
+  }
+
+  const rawData = transaction.methodId?.toLowerCase();
+  // Treat '0x' (empty calldata) the same as no methodId, since the API
+  // returns '0x' for simple ETH sends.
+  const data = rawData && rawData !== '0x' ? rawData : undefined;
+
+  if (data && !transaction.to) {
+    return TransactionType.deployContract;
+  }
+
+  const isContractAddress = Boolean(data?.length);
+
+  if (!isContractAddress) {
+    return TransactionType.simpleSend;
+  }
+
+  const hasValue = BigInt(transaction.value ?? '0') !== BigInt(0);
+
+  if (hasValue) {
+    return TransactionType.contractInteraction;
+  }
+
+  if (!data) {
+    return TransactionType.contractInteraction;
+  }
+
+  switch (data) {
+    case APPROVE_FUNCTION_SIGNATURE:
+      return TransactionType.tokenMethodApprove;
+    case SET_APPROVAL_FOR_ALL_SIGNATURE:
+      return TransactionType.tokenMethodSetApprovalForAll;
+    case TRANSFER_FUNCTION_SIGNATURE:
+      return TransactionType.tokenMethodTransfer;
+    case TRANSFER_FROM_FUNCTION_SIGNATURE:
+      return TransactionType.tokenMethodTransferFrom;
+    case NFT_SAFE_TRANSFER_FROM_FUNCTION_SIGNATURE:
+      return TransactionType.tokenMethodSafeTransferFrom;
+    case INCREASE_ALLOWANCE_SIGNATURE:
+      return TransactionType.tokenMethodIncreaseAllowance;
+    default:
+      return TransactionType.contractInteraction;
+  }
+}
+
+// Ported from transaction-controller normalizeTransaction
+export function normalizeTransaction(
+  address: string,
+  transaction: V1TransactionByHashResponse,
+) {
+  const { from, hash, methodId } = transaction;
+  const normalizedAddress = address.toLowerCase();
+
+  const status = transaction.isError
+    ? TransactionStatus.failed
+    : TransactionStatus.confirmed;
+
+  // Find token transfer that involves the current address
+  const valueTransfer = transaction.valueTransfers?.find(
+    (vt) =>
+      (vt.to?.toLowerCase() === normalizedAddress ||
+        vt.from?.toLowerCase() === normalizedAddress) &&
+      vt.contractAddress,
+  );
+
+  const isIncomingTokenTransfer =
+    valueTransfer?.to?.toLowerCase() === normalizedAddress &&
+    from.toLowerCase() !== normalizedAddress;
+  const isOutgoing = from.toLowerCase() === normalizedAddress;
+
+  const transferInformation = valueTransfer
+    ? {
+        amount: valueTransfer.amount,
+        contractAddress: valueTransfer.contractAddress,
+        decimals: valueTransfer.decimal,
+        symbol: valueTransfer.symbol,
+      }
+    : undefined;
+
+  const meta: TransactionMeta = {
+    blockNumber: String(transaction.blockNumber),
+    chainId: toHex(transaction.chainId),
+    error: transaction.isError ? new Error('Transaction failed') : undefined,
+    hash,
+    id: `${hash}-${transaction.chainId}`,
+    isTransfer: isIncomingTokenTransfer,
+    networkClientId: '',
+    status,
+    time: Date.parse(transaction.timestamp) || 0,
+    toSmartContract: false,
+    transferInformation,
+    txParams: {
+      chainId: toHex(transaction.chainId),
+      data: methodId as Hex,
+      from: from as Hex,
+      gas: toHex(transaction.gas),
+      gasPrice: toHex(transaction.gasPrice),
+      gasUsed: toHex(transaction.gasUsed),
+      nonce: toHex(transaction.nonce),
+      to: isIncomingTokenTransfer ? address : transaction.to,
+      value: toHex(
+        isIncomingTokenTransfer
+          ? (valueTransfer?.amount ?? transaction.value)
+          : transaction.value,
+      ),
+    },
+    type: resolveTransactionMetaType(transaction, isOutgoing),
+    verifiedOnBlockchain: false,
+  };
+
+  return meta;
+}
diff --git a/app/components/Views/UnifiedTransactionsView/helpers/transformations.test.ts b/app/components/Views/UnifiedTransactionsView/helpers/transformations.test.ts
new file mode 100644
index 00000000000..33169e9f302
--- /dev/null
+++ b/app/components/Views/UnifiedTransactionsView/helpers/transformations.test.ts
@@ -0,0 +1,255 @@
+import type {
+  V1TransactionByHashResponse,
+  V4MultiAccountTransactionsResponse,
+} from '@metamask/core-backend';
+import type { InfiniteData } from '@tanstack/react-query';
+import {
+  isBridgeHistoryForEvmTransaction,
+  mergeTransactionsByTime,
+  selectTransactions,
+} from './transformations';
+import { TransactionKind } from '../types';
+
+describe('selectTransactions', () => {
+  const address = '0x0000000000000000000000000000000000000001';
+  const otherAddress = '0x0000000000000000000000000000000000000002';
+
+  const buildTransaction = (
+    overrides: Partial<V1TransactionByHashResponse> = {},
+  ): V1TransactionByHashResponse =>
+    ({
+      hash: '0xhash',
+      timestamp: '2024-01-01T00:00:00Z',
+      chainId: 1,
+      blockNumber: 100,
+      blockHash: '0xblock',
+      gas: 21000,
+      gasUsed: 21000,
+      gasPrice: '1000000000',
+      effectiveGasPrice: '1000000000',
+      nonce: 0,
+      cumulativeGasUsed: 21000,
+      value: '1000',
+      to: otherAddress,
+      from: address,
+      ...overrides,
+    }) as unknown as V1TransactionByHashResponse;
+
+  const buildData = (
+    transactions: V1TransactionByHashResponse[],
+  ): InfiniteData<V4MultiAccountTransactionsResponse> =>
+    ({
+      pages: [{ data: transactions } as V4MultiAccountTransactionsResponse],
+      pageParams: [undefined],
+    }) as InfiniteData<V4MultiAccountTransactionsResponse>;
+
+  it('transforms transactions into view models with id and transactionMeta', () => {
+    const tx = buildTransaction();
+    const result = selectTransactions({ address })(buildData([tx]));
+
+    expect(result.pages).toHaveLength(1);
+    expect(result.pages[0].data).toHaveLength(1);
+    const [viewModel] = result.pages[0].data;
+    expect(viewModel.id).toBe('0xhash-1');
+    expect(viewModel.hexChainId).toBe('0x1');
+    expect(viewModel.transactionMeta).toBeDefined();
+    expect(viewModel.hash).toBe('0xhash');
+  });
+
+  it('filters out spam token transfers', () => {
+    const spam = buildTransaction({
+      hash: '0xspam',
+      transactionType: 'SPAM_TOKEN_TRANSFER',
+    } as Partial<V1TransactionByHashResponse>);
+    const normal = buildTransaction({ hash: '0xnormal' });
+
+    const result = selectTransactions({ address })(buildData([spam, normal]));
+
+    expect(result.pages[0].data).toHaveLength(1);
+    expect(result.pages[0].data[0].hash).toBe('0xnormal');
+  });
+
+  it('filters out transactions unrelated to the address', () => {
+    const unrelated = buildTransaction({
+      hash: '0xunrelated',
+      from: '0x0000000000000000000000000000000000000003',
+      to: '0x0000000000000000000000000000000000000004',
+    });
+
+    const result = selectTransactions({ address })(buildData([unrelated]));
+
+    expect(result.pages[0].data).toHaveLength(0);
+  });
+
+  it('filters out transactions with excluded hashes', () => {
+    const excluded = buildTransaction({ hash: '0xEXCLUDED' });
+    const normal = buildTransaction({ hash: '0xnormal' });
+
+    const result = selectTransactions({
+      address,
+      excludedTxHashes: new Set(['0xexcluded']),
+    })(buildData([excluded, normal]));
+
+    expect(result.pages[0].data).toHaveLength(1);
+    expect(result.pages[0].data[0].hash).toBe('0xnormal');
+  });
+
+  it('filters incoming token transfers', () => {
+    const incomingTokenTransfer = buildTransaction({
+      hash: '0xincoming-token',
+      from: otherAddress,
+      to: address,
+      valueTransfers: [
+        {
+          contractAddress: '0x00000000000000000000000000000000000000aa',
+          from: otherAddress,
+          to: address,
+        },
+      ],
+    } as Partial<V1TransactionByHashResponse>);
+    const outgoing = buildTransaction({ hash: '0xoutgoing' });
+
+    const result = selectTransactions({ address })(
+      buildData([incomingTokenTransfer, outgoing]),
+    );
+
+    expect(result.pages[0].data).toHaveLength(1);
+    expect(result.pages[0].data[0].hash).toBe('0xoutgoing');
+  });
+
+  it('filters incoming native transfers', () => {
+    const incomingNativeTransfer = buildTransaction({
+      hash: '0xincoming-native',
+      from: otherAddress,
+      to: address,
+      valueTransfers: [
+        {
+          from: otherAddress,
+          to: address,
+        },
+      ],
+    } as Partial<V1TransactionByHashResponse>);
+    const outgoing = buildTransaction({ hash: '0xoutgoing' });
+
+    const result = selectTransactions({ address })(
+      buildData([incomingNativeTransfer, outgoing]),
+    );
+
+    expect(result.pages[0].data).toHaveLength(1);
+    expect(result.pages[0].data[0].hash).toBe('0xoutgoing');
+  });
+
+  it('filters zero-value self sends without calldata or transfers', () => {
+    const selfSend = buildTransaction({
+      from: address,
+      to: address,
+      value: '0',
+      methodId: '0x',
+      valueTransfers: [],
+    });
+
+    const result = selectTransactions({ address })(buildData([selfSend]));
+
+    expect(result.pages[0].data).toHaveLength(0);
+  });
+});
+
+describe('isBridgeHistoryForEvmTransaction', () => {
+  it('matches bridge history by original transaction id', () => {
+    const tx = {
+      id: 'tx-id',
+      actionId: 'action-id',
+    };
+    const bridgeHistoryValues = [
+      {
+        txMetaId: 'different-id',
+        originalTransactionId: 'action-id',
+      },
+    ];
+
+    const result = isBridgeHistoryForEvmTransaction(
+      tx as Parameters<typeof isBridgeHistoryForEvmTransaction>[0],
+      bridgeHistoryValues as Parameters<
+        typeof isBridgeHistoryForEvmTransaction
+      >[1],
+    );
+
+    expect(result).toBe(true);
+  });
+
+  it('matches bridge history by source hash', () => {
+    const tx = {
+      id: 'tx-id',
+      hash: '0xABC',
+    };
+    const bridgeHistoryValues = [
+      {
+        txMetaId: 'different-id',
+        status: {
+          srcChain: {
+            txHash: '0xabc',
+          },
+        },
+      },
+    ];
+
+    const result = isBridgeHistoryForEvmTransaction(
+      tx as Parameters<typeof isBridgeHistoryForEvmTransaction>[0],
+      bridgeHistoryValues as Parameters<
+        typeof isBridgeHistoryForEvmTransaction
+      >[1],
+    );
+
+    expect(result).toBe(true);
+  });
+});
+
+describe('mergeTransactionsByTime', () => {
+  it('sorts unified transactions by time and removes local transactions with confirmed hashes', () => {
+    const localDuplicate = {
+      id: 'local-duplicate',
+      hash: '0xDUPLICATE',
+      time: 300,
+    };
+    const localUnique = {
+      id: 'local-unique',
+      hash: '0xlocal',
+      time: 200,
+    };
+    const confirmedDuplicate = {
+      id: 'confirmed-duplicate',
+      hash: '0xduplicate',
+      time: 400,
+    };
+    const nonEvm = {
+      id: 'non-evm',
+      timestamp: 1,
+    };
+
+    const result = mergeTransactionsByTime(
+      [localDuplicate, localUnique] as Parameters<
+        typeof mergeTransactionsByTime
+      >[0],
+      [confirmedDuplicate] as Parameters<typeof mergeTransactionsByTime>[1],
+      [nonEvm] as Parameters<typeof mergeTransactionsByTime>[2],
+    );
+
+    expect(result).toStrictEqual([
+      {
+        kind: TransactionKind.NonEvm,
+        tx: nonEvm,
+        time: 1000,
+      },
+      {
+        kind: TransactionKind.ConfirmedEvm,
+        tx: confirmedDuplicate,
+        time: 400,
+      },
+      {
+        kind: TransactionKind.Evm,
+        tx: localUnique,
+        time: 200,
+      },
+    ]);
+  });
+});
diff --git a/app/components/Views/UnifiedTransactionsView/helpers/transformations.ts b/app/components/Views/UnifiedTransactionsView/helpers/transformations.ts
new file mode 100644
index 00000000000..5c9d1ad958a
--- /dev/null
+++ b/app/components/Views/UnifiedTransactionsView/helpers/transformations.ts
@@ -0,0 +1,227 @@
+import {
+  type V1TransactionByHashResponse,
+  type V4MultiAccountTransactionsResponse,
+} from '@metamask/core-backend';
+import type { BridgeHistoryItem } from '@metamask/bridge-status-controller';
+import type { Transaction as NonEvmTransaction } from '@metamask/keyring-api';
+import type { InfiniteData } from '@tanstack/react-query';
+import { normalizeTransaction } from './adapters';
+import {
+  EvmTransaction,
+  TransactionKind,
+  TransactionViewModel,
+  UnifiedItem,
+} from '../types';
+import { equalsIgnoreCase } from '../../../../util/string';
+
+const excludedTransactionTypes = ['SPAM_TOKEN_TRANSFER'];
+
+const getOriginalTransactionId = (bridgeHistoryItem: BridgeHistoryItem) =>
+  (bridgeHistoryItem as unknown as { originalTransactionId?: string })
+    .originalTransactionId;
+
+export const isBridgeHistoryForEvmTransaction = (
+  tx: EvmTransaction & { actionId?: string; hash?: string },
+  bridgeHistoryValues: BridgeHistoryItem[],
+) =>
+  bridgeHistoryValues.some((bridgeHistoryItem) => {
+    const originalTransactionId = getOriginalTransactionId(bridgeHistoryItem);
+
+    return (
+      bridgeHistoryItem.txMetaId === tx.id ||
+      bridgeHistoryItem.txMetaId === tx.actionId ||
+      originalTransactionId === tx.id ||
+      originalTransactionId === tx.actionId ||
+      equalsIgnoreCase(bridgeHistoryItem.status?.srcChain?.txHash, tx.hash)
+    );
+  });
+
+function isIncomingTokenTransfer(
+  address: string,
+  transaction: V1TransactionByHashResponse,
+) {
+  return (
+    transaction.valueTransfers?.some(
+      (transfer) =>
+        Boolean(transfer.contractAddress) &&
+        transfer.to?.toLowerCase() === address &&
+        transaction.from?.toLowerCase() !== address,
+    ) ?? false
+  );
+}
+
+function isIncomingNativeTransfer(
+  address: string,
+  transaction: V1TransactionByHashResponse,
+) {
+  const normalizedAddress = address.toLowerCase();
+  let hasOutgoingTransfer = false;
+  let hasIncomingNativeTransfer = false;
+
+  for (const transfer of transaction.valueTransfers ?? []) {
+    if (
+      !hasOutgoingTransfer &&
+      transfer.from?.toLowerCase() === normalizedAddress
+    ) {
+      hasOutgoingTransfer = true;
+    }
+
+    if (
+      !hasIncomingNativeTransfer &&
+      transfer.to?.toLowerCase() === normalizedAddress &&
+      !transfer.contractAddress
+    ) {
+      hasIncomingNativeTransfer = true;
+    }
+
+    if (hasOutgoingTransfer && hasIncomingNativeTransfer) {
+      break;
+    }
+  }
+
+  return hasIncomingNativeTransfer && !hasOutgoingTransfer;
+}
+
+function shouldSkipTransaction(
+  address: string,
+  transaction: V1TransactionByHashResponse,
+  excludedTxHashes?: Set<string>,
+) {
+  const rawFrom = transaction.from?.toLowerCase();
+  const rawTo = transaction.to?.toLowerCase();
+  const hash = transaction.hash?.toLowerCase();
+
+  if (hash && excludedTxHashes?.has(hash)) {
+    return true;
+  }
+
+  if (rawFrom !== address && rawTo !== address) {
+    return true;
+  }
+
+  // Filter out span token transfers
+  if (excludedTransactionTypes.includes(transaction.transactionType ?? '')) {
+    return true;
+  }
+
+  // Filter out zero-value self-sends with no calldata and no transfers
+  if (
+    rawFrom === address &&
+    rawTo === address &&
+    transaction.value === '0' &&
+    !transaction.valueTransfers?.length &&
+    (!transaction.methodId || transaction.methodId === '0x')
+  ) {
+    return true;
+  }
+
+  // Filter out incoming native token transfers
+  if (isIncomingTokenTransfer(address, transaction)) {
+    return true;
+  }
+
+  return rawFrom !== address && isIncomingNativeTransfer(address, transaction);
+}
+
+function transformTransactions(
+  address: string,
+  transactions: V1TransactionByHashResponse[],
+  excludedTxHashes?: Set<string>,
+): TransactionViewModel[] {
+  const filteredTransactions = [];
+
+  for (const tx of transactions) {
+    if (shouldSkipTransaction(address, tx, excludedTxHashes)) {
+      continue;
+    }
+
+    filteredTransactions.push(tx);
+  }
+
+  return filteredTransactions.map((tx) => {
+    const transactionMeta = normalizeTransaction(address, tx);
+
+    return {
+      // Intent is to use the API response more directly
+      ...tx,
+      // But for now, we keep this until we can refactor the UI components
+      id: transactionMeta.id,
+      time: transactionMeta.time,
+      hexChainId: transactionMeta.chainId,
+      transactionMeta,
+    };
+  });
+}
+
+export function selectTransactions({
+  address,
+  excludedTxHashes,
+}: {
+  address: string;
+  excludedTxHashes?: Set<string>;
+}) {
+  return (data: InfiniteData<V4MultiAccountTransactionsResponse>) => ({
+    ...data,
+    pages: data.pages.map((page) => ({
+      ...page,
+      data: transformTransactions(address, page.data, excludedTxHashes),
+    })),
+  });
+}
+
+const getEvmTime = (tx: EvmTransaction) => tx.time ?? 0;
+const getNonEvmTime = (tx: NonEvmTransaction) => (tx.timestamp ?? 0) * 1000;
+const getEvmHash = (tx: EvmTransaction) =>
+  'hash' in tx && typeof tx.hash === 'string' ? tx.hash.toLowerCase() : '';
+
+// Merges local EVM, API-confirmed EVM and non-EVM transactions into one list
+// sorted by time (newest first), deduplicated by hash (API-confirmed wins).
+export function mergeTransactionsByTime(
+  evmLocalTransactions: EvmTransaction[],
+  evmConfirmedTransactions: TransactionViewModel[],
+  nonEvmTransactions: NonEvmTransaction[],
+) {
+  const seenHashes = new Set<string>();
+
+  const confirmedItems: UnifiedItem[] = [];
+  for (const tx of evmConfirmedTransactions) {
+    const hash = tx.hash?.toLowerCase();
+    if (hash) {
+      if (seenHashes.has(hash)) {
+        continue;
+      }
+      seenHashes.add(hash);
+    }
+    confirmedItems.push({
+      kind: TransactionKind.ConfirmedEvm,
+      tx,
+      time: tx.time ?? 0,
+    });
+  }
+
+  const localItems: UnifiedItem[] = [];
+  for (const tx of evmLocalTransactions) {
+    const hash = getEvmHash(tx);
+    if (hash) {
+      if (seenHashes.has(hash)) {
+        continue;
+      }
+      seenHashes.add(hash);
+    }
+    localItems.push({
+      kind: TransactionKind.Evm,
+      tx,
+      time: getEvmTime(tx),
+    });
+  }
+
+  const nonEvmItems: UnifiedItem[] = nonEvmTransactions.map((tx) => ({
+    kind: TransactionKind.NonEvm,
+    tx,
+    time: getNonEvmTime(tx),
+  }));
+
+  return [...localItems, ...confirmedItems, ...nonEvmItems].sort(
+    (a, b) => b.time - a.time,
+  );
+}
diff --git a/app/components/Views/UnifiedTransactionsView/types.ts b/app/components/Views/UnifiedTransactionsView/types.ts
new file mode 100644
index 00000000000..ecaa717af7a
--- /dev/null
+++ b/app/components/Views/UnifiedTransactionsView/types.ts
@@ -0,0 +1,32 @@
+import type { V1TransactionByHashResponse } from '@metamask/core-backend';
+import { SmartTransaction } from '@metamask/smart-transactions-controller';
+import type { TransactionMeta } from '@metamask/transaction-controller';
+import type { Transaction as NonEvmTransaction } from '@metamask/keyring-api';
+
+export type SmartTransactionWithId = SmartTransaction & { id: string };
+
+export type EvmTransaction = TransactionMeta | SmartTransactionWithId;
+
+export type TransactionViewModel = V1TransactionByHashResponse & {
+  // Intent is to use the API response more directly
+  id: string;
+  time: number;
+  hexChainId: string;
+  // But for now, we keep this until we can refactor the UI components
+  transactionMeta: TransactionMeta;
+};
+
+export enum TransactionKind {
+  Evm = 'evm',
+  ConfirmedEvm = 'confirmed',
+  NonEvm = 'nonEvm',
+}
+
+export type UnifiedItem =
+  | { kind: TransactionKind.Evm; tx: EvmTransaction; time: number }
+  | {
+      kind: TransactionKind.ConfirmedEvm;
+      tx: TransactionViewModel;
+      time: number;
+    }
+  | { kind: TransactionKind.NonEvm; tx: NonEvmTransaction; time: number };
diff --git a/app/components/Views/UnifiedTransactionsView/useTransactionsQuery.test.ts b/app/components/Views/UnifiedTransactionsView/useTransactionsQuery.test.ts
new file mode 100644
index 00000000000..8e94ce33cbe
--- /dev/null
+++ b/app/components/Views/UnifiedTransactionsView/useTransactionsQuery.test.ts
@@ -0,0 +1,198 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { useSelector } from 'react-redux';
+import { apiClient } from '../../../core/apiClient';
+import { selectEvmAddress } from '../../../selectors/accountsController';
+import { selectSelectedAccountGroupEvmInternalAccount } from '../../../selectors/multichainAccounts/accountTreeController';
+import { selectEvmEnabledCaipNetworks } from '../../../selectors/networkEnablementController';
+import { useTransactionsQuery } from './useTransactionsQuery';
+import { MINUTE } from '../../../constants/time';
+import { selectRequiredTransactionHashes } from '../../../selectors/transactionController';
+
+jest.mock('@tanstack/react-query', () => ({
+  useInfiniteQuery: jest.fn(),
+}));
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../core/apiClient', () => ({
+  apiClient: {
+    accounts: {
+      getV4MultiAccountTransactionsInfiniteQueryOptions: jest.fn(),
+    },
+  },
+}));
+
+jest.mock('../../../selectors/accountsController', () => ({
+  selectEvmAddress: jest.fn(),
+}));
+
+jest.mock(
+  '../../../selectors/multichainAccounts/accountTreeController',
+  () => ({
+    selectSelectedAccountGroupEvmInternalAccount: jest.fn(),
+  }),
+);
+
+jest.mock('../../../selectors/networkEnablementController', () => ({
+  selectEvmEnabledCaipNetworks: jest.fn(),
+}));
+
+jest.mock('../../../selectors/transactionController', () => ({
+  selectRequiredTransactionHashes: jest.fn(),
+}));
+
+const ADDRESS_MOCK = '0x1234567890123456789012345678901234567890';
+const GROUP_EVM_ADDRESS_MOCK = '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd';
+const NETWORKS_MOCK = ['eip155:1', 'eip155:137'];
+const QUERY_OPTIONS_MOCK = {
+  queryKey: ['transactions'],
+  queryFn: jest.fn(),
+  getNextPageParam: jest.fn(),
+};
+
+describe('useTransactionsQuery', () => {
+  const useSelectorMock = jest.mocked(useSelector);
+  const useInfiniteQueryMock = jest.mocked(useInfiniteQuery);
+  const getQueryOptionsMock = jest.mocked(
+    apiClient.accounts.getV4MultiAccountTransactionsInfiniteQueryOptions,
+  );
+
+  function setupSelectors({
+    evmAddress = ADDRESS_MOCK,
+    groupEvmAccount = null as { address: string } | null,
+    networks = NETWORKS_MOCK,
+  }: {
+    evmAddress?: string;
+    groupEvmAccount?: { address: string } | null;
+    networks?: string[];
+  } = {}) {
+    useSelectorMock.mockImplementation((selector) => {
+      if (selector === selectSelectedAccountGroupEvmInternalAccount) {
+        return groupEvmAccount;
+      }
+      if (selector === selectEvmAddress) {
+        return evmAddress;
+      }
+      if (selector === selectEvmEnabledCaipNetworks) {
+        return networks;
+      }
+      if (selector === selectRequiredTransactionHashes) {
+        return new Set<string>();
+      }
+      return undefined;
+    });
+  }
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    getQueryOptionsMock.mockReturnValue(
+      QUERY_OPTIONS_MOCK as unknown as ReturnType<typeof getQueryOptionsMock>,
+    );
+    useInfiniteQueryMock.mockReturnValue({
+      data: undefined,
+    } as unknown as ReturnType<typeof useInfiniteQueryMock>);
+  });
+
+  it('composes query options from the selected EVM account and networks', () => {
+    setupSelectors();
+
+    renderHook(() => useTransactionsQuery());
+
+    expect(getQueryOptionsMock).toHaveBeenCalledWith({
+      accountAddresses: [`eip155:0:${ADDRESS_MOCK}`],
+      networks: NETWORKS_MOCK,
+      includeTxMetadata: true,
+    });
+  });
+
+  it('delegates to useInfiniteQuery with selectFn, enabled, staleTime and retry', () => {
+    setupSelectors();
+
+    renderHook(() => useTransactionsQuery());
+
+    expect(useInfiniteQueryMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        ...QUERY_OPTIONS_MOCK,
+        select: expect.any(Function),
+        enabled: true,
+        staleTime: 5 * MINUTE,
+        retry: false,
+      }),
+    );
+  });
+
+  it('disables the query and sends no account addresses when there is no EVM address', () => {
+    setupSelectors({ evmAddress: '', groupEvmAccount: null });
+
+    renderHook(() => useTransactionsQuery());
+
+    expect(getQueryOptionsMock).toHaveBeenCalledWith(
+      expect.objectContaining({ accountAddresses: [] }),
+    );
+    expect(useInfiniteQueryMock).toHaveBeenCalledWith(
+      expect.objectContaining({ enabled: false }),
+    );
+  });
+
+  it('uses account group EVM address when globally selected account has no EVM address', () => {
+    setupSelectors({
+      evmAddress: '',
+      groupEvmAccount: { address: GROUP_EVM_ADDRESS_MOCK },
+    });
+
+    renderHook(() => useTransactionsQuery());
+
+    expect(getQueryOptionsMock).toHaveBeenCalledWith({
+      accountAddresses: [`eip155:0:${GROUP_EVM_ADDRESS_MOCK}`],
+      networks: NETWORKS_MOCK,
+      includeTxMetadata: true,
+    });
+    expect(useInfiniteQueryMock).toHaveBeenCalledWith(
+      expect.objectContaining({ enabled: true }),
+    );
+  });
+
+  it('disables the query when there are no enabled networks', () => {
+    setupSelectors({ networks: [] });
+
+    renderHook(() => useTransactionsQuery());
+
+    expect(useInfiniteQueryMock).toHaveBeenCalledWith(
+      expect.objectContaining({ enabled: false }),
+    );
+  });
+
+  it('prefers the account group EVM address over the global EVM address when both are set', () => {
+    setupSelectors({
+      evmAddress: ADDRESS_MOCK,
+      groupEvmAccount: { address: GROUP_EVM_ADDRESS_MOCK },
+    });
+
+    renderHook(() => useTransactionsQuery());
+
+    expect(getQueryOptionsMock).toHaveBeenCalledWith({
+      accountAddresses: [`eip155:0:${GROUP_EVM_ADDRESS_MOCK}`],
+      networks: NETWORKS_MOCK,
+      includeTxMetadata: true,
+    });
+  });
+
+  it('does not use global EVM address when group account has an empty string address', () => {
+    setupSelectors({
+      evmAddress: ADDRESS_MOCK,
+      groupEvmAccount: { address: '' },
+    });
+
+    renderHook(() => useTransactionsQuery());
+
+    expect(getQueryOptionsMock).toHaveBeenCalledWith(
+      expect.objectContaining({ accountAddresses: [] }),
+    );
+    expect(useInfiniteQueryMock).toHaveBeenCalledWith(
+      expect.objectContaining({ enabled: false }),
+    );
+  });
+});
diff --git a/app/components/Views/UnifiedTransactionsView/useTransactionsQuery.ts b/app/components/Views/UnifiedTransactionsView/useTransactionsQuery.ts
new file mode 100644
index 00000000000..a48a90d0d34
--- /dev/null
+++ b/app/components/Views/UnifiedTransactionsView/useTransactionsQuery.ts
@@ -0,0 +1,46 @@
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import { KnownCaipNamespace, toCaipAccountId } from '@metamask/utils';
+import { apiClient } from '../../../core/apiClient';
+import { selectEvmAddress } from '../../../selectors/accountsController';
+import { selectSelectedAccountGroupEvmInternalAccount } from '../../../selectors/multichainAccounts/accountTreeController';
+import { selectEvmEnabledCaipNetworks } from '../../../selectors/networkEnablementController';
+import { selectTransactions } from './helpers/transformations';
+import { MINUTE } from '../../../constants/time';
+import { selectRequiredTransactionHashes } from '../../../selectors/transactionController';
+
+export const useTransactionsQuery = () => {
+  const groupEvmAccount = useSelector(
+    selectSelectedAccountGroupEvmInternalAccount,
+  );
+  const globalEvmAddress = useSelector(selectEvmAddress);
+  /** Activity must load EVM history for the group's EVM account when e.g. Bitcoin is selected. */
+  const evmAddress = (groupEvmAccount?.address ?? globalEvmAddress ?? '') || '';
+  const networks = useSelector(selectEvmEnabledCaipNetworks);
+  const excludedTxHashes = useSelector(selectRequiredTransactionHashes);
+  const accountAddresses = evmAddress
+    ? [toCaipAccountId(KnownCaipNamespace.Eip155, '0', evmAddress)]
+    : [];
+
+  const queryOptions =
+    apiClient.accounts.getV4MultiAccountTransactionsInfiniteQueryOptions({
+      accountAddresses,
+      networks,
+      includeTxMetadata: true,
+    });
+
+  const selectFn = useMemo(
+    () => selectTransactions({ address: evmAddress, excludedTxHashes }),
+    [evmAddress, excludedTxHashes],
+  );
+
+  // @ts-expect-error apiClient returns v5 types, repo still in v4
+  return useInfiniteQuery({
+    ...queryOptions,
+    select: selectFn,
+    enabled: accountAddresses.length > 0 && networks.length > 0,
+    staleTime: 5 * MINUTE,
+    retry: false,
+  });
+};
diff --git a/app/components/Views/Wallet/WalletView.testIds.ts b/app/components/Views/Wallet/WalletView.testIds.ts
index 278e01c5b8e..fe2fad8b848 100644
--- a/app/components/Views/Wallet/WalletView.testIds.ts
+++ b/app/components/Views/Wallet/WalletView.testIds.ts
@@ -90,6 +90,7 @@ export const WalletViewSelectorsIDs = {
   BALANCE_EMPTY_STATE_CONTAINER: 'account-group-balance-empty-state',
   BALANCE_EMPTY_STATE_ACTION_BUTTON:
     'account-group-balance-empty-state-action-button',
+  WALLET_ACTIVITY_BUTTON: 'wallet-activity-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 2aad1303f3e..db08fc54a8f 100644
--- a/app/components/Views/Wallet/index.test.tsx
+++ b/app/components/Views/Wallet/index.test.tsx
@@ -91,6 +91,56 @@ jest.mock('../../../selectors/featureFlagController/homepage', () => ({
   selectHomepageSectionsV1Enabled: jest.fn(() => mockHomepageSectionsEnabled),
 }));
 
+// Control Money home screen feature flag per test (default false so existing tests are unaffected)
+let mockMoneyHomeScreenEnabled = false;
+jest.mock('../../UI/Money/selectors/featureFlags', () => ({
+  selectMoneyHomeScreenEnabledFlag: jest.fn(() => mockMoneyHomeScreenEnabled),
+}));
+
+// Mock MoneyBalanceCard so the integration test does not depend on its hooks/contexts.
+jest.mock('../../UI/Money/components/MoneyBalanceCard', () => {
+  const ReactMock = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: () =>
+      ReactMock.createElement(View, {
+        testID: 'money-balance-card-mock',
+      }),
+  };
+});
+
+// Mock NetworkConnectionBanner so the Wallet view's render does not depend on
+// Engine.lookupEnabledNetworks / 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);
+
+// Control discovery tabs AB test variant per test (default control so existing tests are unaffected)
+let mockDiscoveryTabsVariantName = 'control';
+jest.mock('../../../hooks', () => ({
+  ...jest.requireActual('../../../hooks'),
+  useABTest: jest.fn(() => ({
+    variantName: mockDiscoveryTabsVariantName,
+    variant: {
+      discoveryTabsEnabled: mockDiscoveryTabsVariantName === 'treatment',
+    },
+  })),
+}));
+
+// Track HomepageDiscoveryTabs renders
+const mockHomepageDiscoveryTabs = jest.fn();
+jest.mock('../Homepage/components/HomepageDiscoveryTabs', () => {
+  const React = jest.requireActual('react');
+  return {
+    __esModule: true,
+    default: React.forwardRef((props: unknown, _ref: unknown) => {
+      mockHomepageDiscoveryTabs(props);
+      return null;
+    }),
+  };
+});
+
 // Capture the HomepageScrollContext value by rendering a context-aware mock Homepage.
 // The mock is only invoked when mockHomepageSectionsEnabled=true (sections flag on),
 // so existing tests that leave the flag false are completely unaffected.
@@ -1606,6 +1656,144 @@ describe('HomepageScrollContext callbacks', () => {
   });
 });
 
+describe('HomepageDiscoveryTabs AB test', () => {
+  let mockNavigation: NavigationProp<ParamListBase>;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockHomepageSectionsEnabled = true;
+    mockDiscoveryTabsVariantName = 'control';
+    mockHomepageDiscoveryTabs.mockClear();
+
+    mockNavigation = {
+      navigate: mockNavigate,
+      setOptions: mockSetOptions,
+      addListener: jest.fn(() => jest.fn()),
+      isFocused: jest.fn(() => false),
+      dangerouslyGetParent: jest.fn(() => ({
+        dangerouslyGetState: jest.fn(() => ({ type: 'stack' })),
+        addListener: jest.fn(() => jest.fn()),
+        dangerouslyGetParent: jest.fn(() => ({
+          dangerouslyGetState: jest.fn(() => ({ type: 'tab' })),
+          addListener: jest.fn(() => jest.fn()),
+          dangerouslyGetParent: jest.fn(() => undefined),
+        })),
+      })),
+    } as unknown as NavigationProp<ParamListBase>;
+
+    jest
+      .mocked(useSelector)
+      .mockImplementation((callback: (state: unknown) => unknown) =>
+        callback(mockInitialState),
+      );
+  });
+
+  afterEach(() => {
+    mockHomepageSectionsEnabled = false;
+    mockDiscoveryTabsVariantName = 'control';
+    jest.clearAllMocks();
+  });
+
+  it('renders HomepageDiscoveryTabs when variant is treatment and sections flag is on', () => {
+    mockDiscoveryTabsVariantName = 'treatment';
+
+    renderWithProvider(
+      <Wallet
+        navigation={mockNavigation}
+        currentRouteName={Routes.WALLET_VIEW}
+      />,
+      { state: mockInitialState },
+    );
+
+    expect(mockHomepageDiscoveryTabs).toHaveBeenCalled();
+  });
+
+  it('does not render HomepageDiscoveryTabs when variant is control', () => {
+    mockDiscoveryTabsVariantName = 'control';
+
+    renderWithProvider(
+      <Wallet
+        navigation={mockNavigation}
+        currentRouteName={Routes.WALLET_VIEW}
+      />,
+      { state: mockInitialState },
+    );
+
+    expect(mockHomepageDiscoveryTabs).not.toHaveBeenCalled();
+  });
+
+  it('passes portfolioHeader, onPortfolioScroll, and refreshControl to HomepageDiscoveryTabs', () => {
+    mockDiscoveryTabsVariantName = 'treatment';
+
+    renderWithProvider(
+      <Wallet
+        navigation={mockNavigation}
+        currentRouteName={Routes.WALLET_VIEW}
+      />,
+      { state: mockInitialState },
+    );
+
+    const props = mockHomepageDiscoveryTabs.mock.calls.at(-1)?.[0] as Record<
+      string,
+      unknown
+    >;
+    expect(props).toBeDefined();
+    expect(props.portfolioHeader).toBeDefined();
+    expect(typeof props.onPortfolioScroll).toBe('function');
+    expect(props.refreshControl).toBeDefined();
+  });
+
+  it('passes walletHeaderOffset and walletHeaderHeight to HomepageDiscoveryTabs', () => {
+    mockDiscoveryTabsVariantName = 'treatment';
+
+    renderWithProvider(
+      <Wallet
+        navigation={mockNavigation}
+        currentRouteName={Routes.WALLET_VIEW}
+      />,
+      { state: mockInitialState },
+    );
+
+    const props = mockHomepageDiscoveryTabs.mock.calls.at(-1)?.[0] as Record<
+      string,
+      unknown
+    >;
+    expect(typeof props.walletHeaderOffset).toBe('number');
+    expect(typeof props.walletHeaderHeight).toBe('number');
+  });
+
+  it('renders Homepage scroll view (not HomepageDiscoveryTabs) when variant is control and sections flag is on', () => {
+    mockDiscoveryTabsVariantName = 'control';
+
+    renderWithProvider(
+      <Wallet
+        navigation={mockNavigation}
+        currentRouteName={Routes.WALLET_VIEW}
+      />,
+      { state: mockInitialState },
+    );
+
+    // HomepageDiscoveryTabs must not render; the legacy Homepage mock renders instead
+    expect(mockHomepageDiscoveryTabs).not.toHaveBeenCalled();
+    expect(capturedContext).toBeDefined();
+  });
+
+  it('does not render HomepageDiscoveryTabs when sections flag is off regardless of variant', () => {
+    mockHomepageSectionsEnabled = false;
+    mockDiscoveryTabsVariantName = 'treatment';
+
+    renderWithProvider(
+      <Wallet
+        navigation={mockNavigation}
+        currentRouteName={Routes.WALLET_VIEW}
+      />,
+      { state: mockInitialState },
+    );
+
+    expect(mockHomepageDiscoveryTabs).not.toHaveBeenCalled();
+  });
+});
+
 describe('useHomeDeepLinkEffects', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -1716,3 +1904,59 @@ describe('useHomeDeepLinkEffects', () => {
     assertCase(mocks);
   });
 });
+
+describe('MoneyBalanceCard slot', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest
+      .mocked(useSelector)
+      .mockImplementation((callback: (state: unknown) => unknown) =>
+        callback(mockInitialState),
+      );
+  });
+
+  afterEach(() => {
+    mockMoneyHomeScreenEnabled = false;
+    mockHomepageSectionsEnabled = false;
+  });
+
+  it('renders the MoneyBalanceCard when both feature flags are enabled', () => {
+    mockMoneyHomeScreenEnabled = true;
+    mockHomepageSectionsEnabled = true;
+
+    //@ts-expect-error navigation params intentionally omitted (same as render(Wallet))
+    const { getByTestId } = render(Wallet);
+
+    expect(getByTestId('money-balance-card-mock')).toBeOnTheScreen();
+  });
+
+  it('does not render the MoneyBalanceCard when only the Money flag is enabled', () => {
+    mockMoneyHomeScreenEnabled = true;
+    mockHomepageSectionsEnabled = false;
+
+    //@ts-expect-error navigation params intentionally omitted (same as render(Wallet))
+    const { queryByTestId } = render(Wallet);
+
+    expect(queryByTestId('money-balance-card-mock')).not.toBeOnTheScreen();
+  });
+
+  it('does not render the MoneyBalanceCard when only the Homepage sections flag is enabled', () => {
+    mockMoneyHomeScreenEnabled = false;
+    mockHomepageSectionsEnabled = true;
+
+    //@ts-expect-error navigation params intentionally omitted (same as render(Wallet))
+    const { queryByTestId } = render(Wallet);
+
+    expect(queryByTestId('money-balance-card-mock')).not.toBeOnTheScreen();
+  });
+
+  it('does not render the MoneyBalanceCard when both feature flags are disabled', () => {
+    mockMoneyHomeScreenEnabled = false;
+    mockHomepageSectionsEnabled = false;
+
+    //@ts-expect-error navigation params intentionally omitted (same as render(Wallet))
+    const { queryByTestId } = render(Wallet);
+
+    expect(queryByTestId('money-balance-card-mock')).not.toBeOnTheScreen();
+  });
+});
diff --git a/app/components/Views/Wallet/index.tsx b/app/components/Views/Wallet/index.tsx
index 90bfe1c8c03..582e005ad6a 100644
--- a/app/components/Views/Wallet/index.tsx
+++ b/app/components/Views/Wallet/index.tsx
@@ -22,7 +22,14 @@ import {
   StyleSheet as RNStyleSheet,
   View,
 } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
+import {
+  SafeAreaView,
+  useSafeAreaInsets,
+} from 'react-native-safe-area-context';
+import Reanimated, {
+  useSharedValue,
+  useAnimatedStyle,
+} from 'react-native-reanimated';
 import { connect, useDispatch, useSelector } from 'react-redux';
 import { strings } from '../../../../locales/i18n';
 import {
@@ -48,6 +55,8 @@ import HeaderRoot from '../../../component-library/components-temp/HeaderRoot';
 import PickerAccount from '../../../component-library/components/Pickers/PickerAccount';
 import AddressCopy from '../../UI/AddressCopy';
 import CardButton from '../../UI/Card/components/CardButton';
+import { selectMoneyHomeScreenEnabledFlag } from '../../UI/Money/selectors/featureFlags';
+import MoneyBalanceCard from '../../UI/Money/components/MoneyBalanceCard';
 import { createAccountSelectorNavDetails } from '../AccountSelector';
 import { isNotificationsFeatureEnabled } from '../../../util/notifications';
 import { AnalyticsEventBuilder } from '../../../util/analytics/AnalyticsEventBuilder';
@@ -132,6 +141,13 @@ import { Hex } from '@metamask/utils';
 import { selectIsEvmNetworkSelected } from '../../../selectors/multichainNetworkController';
 import { selectHomepageSectionsV1Enabled } from '../../../selectors/featureFlagController/homepage';
 import Homepage from '../Homepage';
+import HomepageDiscoveryTabs from '../Homepage/components/HomepageDiscoveryTabs';
+import {
+  HUB_PAGE_DISCOVERY_TABS_AB_KEY,
+  HUB_PAGE_DISCOVERY_TABS_VARIANTS,
+  HubPageDiscoveryTabsVariant,
+} from '../Homepage/abTestConfig';
+import { useABTest } from '../../../hooks';
 import { SectionRefreshHandle } from '../Homepage/types';
 import { HomepageScrollContext } from '../Homepage/context/HomepageScrollContext';
 import type { HomeSectionName } from '../Homepage/hooks/useHomeViewedEvent';
@@ -225,6 +241,13 @@ const createStyles = ({ colors }: Theme) =>
     },
     headerAccountPickerStyle: {
       marginRight: 16,
+      backgroundColor: 'transparent',
+    },
+    accountGroupBalanceContainer: {
+      marginBottom: 16,
+    },
+    walletHeaderRoot: {
+      zIndex: 2,
     },
   });
 
@@ -595,6 +618,10 @@ const Wallet = ({
   // ─── Homepage scroll context state ───────────────────────────────────────
   const [viewportHeight, setViewportHeight] = useState(0);
   const [containerScreenY, setContainerScreenY] = useState(0);
+  const [headerHeight, setHeaderHeight] = useState(0);
+  const sharedHeaderHeight = useSharedValue(0);
+  const walletHeaderTranslateY = useSharedValue(0);
+  const insets = useSafeAreaInsets();
   const { entryPoint, visitId } = useHomepageEntryPoint(navigation);
 
   // Ref to the scroll container View — used to measure its absolute screen Y
@@ -643,6 +670,10 @@ const Wallet = ({
    */
   const selectedInternalAccount = useSelector(selectSelectedInternalAccount);
 
+  const isMoneyHomeScreenEnabled = useSelector(
+    selectMoneyHomeScreenEnabledFlag,
+  );
+
   /**
    * Provider configuration for the current selected network
    */
@@ -1011,6 +1042,25 @@ const Wallet = ({
     selectHomepageSectionsV1Enabled,
   );
 
+  const { variantName: discoveryTabsVariantName } = useABTest(
+    HUB_PAGE_DISCOVERY_TABS_AB_KEY,
+    HUB_PAGE_DISCOVERY_TABS_VARIANTS,
+  );
+
+  const isDiscoveryTabsTreatment =
+    discoveryTabsVariantName === HubPageDiscoveryTabsVariant.Treatment;
+
+  // translateY slides the header up; negative marginBottom collapses the layout
+  // space it occupied so the content below moves up in sync.
+  const animatedHeaderStyle = useAnimatedStyle(() => {
+    const h = sharedHeaderHeight.value;
+    return {
+      transform: [{ translateY: walletHeaderTranslateY.value }],
+      marginBottom: walletHeaderTranslateY.value,
+      opacity: h > 0 ? Math.max(0, 1 + walletHeaderTranslateY.value / h) : 1,
+    };
+  });
+
   const isFocused = useIsFocused();
 
   const homepageRef = useRef<SectionRefreshHandle>(null);
@@ -1050,6 +1100,15 @@ const Wallet = ({
     navigation.navigate(Routes.CARD.ROOT);
   }, [navigation, trackEvent]);
 
+  const handleActivityPress = useCallback(() => {
+    trackEvent(
+      AnalyticsEventBuilder.createEventBuilder(
+        MetaMetricsEvents.ACTIVITY_CLICKED,
+      ).build(),
+    );
+    navigation.navigate(Routes.TRANSACTIONS_VIEW);
+  }, [navigation, trackEvent]);
+
   const getTokenAddedAnalyticsParams = useCallback(
     ({ address, symbol }: { address: string; symbol: string }) => {
       try {
@@ -1287,62 +1346,93 @@ const Wallet = ({
     ],
   );
 
-  const content = (
+  const bannerContent = (
+    <View style={styles.banner}>
+      {!basicFunctionalityEnabled ? (
+        <BannerAlert
+          severity={BannerAlertSeverity.Error}
+          title={strings('wallet.banner.title')}
+          description={
+            <CustomText
+              color={TextColor.Info}
+              onPress={turnOnBasicFunctionality}
+            >
+              {strings('wallet.banner.link')}
+            </CustomText>
+          }
+        />
+      ) : null}
+      <NetworkConnectionBanner />
+    </View>
+  );
+
+  const portfolioHeaderBase = (
     <>
-      <View style={styles.banner}>
-        {!basicFunctionalityEnabled ? (
-          <BannerAlert
-            severity={BannerAlertSeverity.Error}
-            title={strings('wallet.banner.title')}
-            description={
-              <CustomText
-                color={TextColor.Info}
-                onPress={turnOnBasicFunctionality}
-              >
-                {strings('wallet.banner.link')}
-              </CustomText>
-            }
-          />
-        ) : null}
-        <NetworkConnectionBanner />
-      </View>
-      <>
-        <AccountGroupBalance />
+      {bannerContent}
+      <AccountGroupBalance />
+      <AssetDetailsActions
+        displayBuyButton={displayBuyButton}
+        displaySwapsButton={displaySwapsButton}
+        goToSwaps={goToSwaps}
+        onReceive={onReceive}
+        onSend={onSend}
+        buyButtonActionID={WalletViewSelectorsIDs.WALLET_BUY_BUTTON}
+        swapButtonActionID={WalletViewSelectorsIDs.WALLET_SWAP_BUTTON}
+        sendButtonActionID={WalletViewSelectorsIDs.WALLET_SEND_BUTTON}
+        receiveButtonActionID={WalletViewSelectorsIDs.WALLET_RECEIVE_BUTTON}
+      />
+      {isCarouselBannersEnabled && <Carousel style={styles.carousel} />}
+      {isMoneyHomeScreenEnabled && <MoneyBalanceCard />}
+    </>
+  );
 
-        <AssetDetailsActions
-          displayBuyButton={displayBuyButton}
-          displaySwapsButton={displaySwapsButton}
-          goToSwaps={goToSwaps}
-          onReceive={onReceive}
-          onSend={onSend}
-          buyButtonActionID={WalletViewSelectorsIDs.WALLET_BUY_BUTTON}
-          swapButtonActionID={WalletViewSelectorsIDs.WALLET_SWAP_BUTTON}
-          sendButtonActionID={WalletViewSelectorsIDs.WALLET_SEND_BUTTON}
-          receiveButtonActionID={WalletViewSelectorsIDs.WALLET_RECEIVE_BUTTON}
-        />
+  const portfolioHeader = (
+    <>
+      {bannerContent}
+      <View style={styles.accountGroupBalanceContainer}>
+        <AccountGroupBalance />
+      </View>
+      <AssetDetailsActions
+        displayBuyButton={displayBuyButton}
+        displaySwapsButton={displaySwapsButton}
+        goToSwaps={goToSwaps}
+        onReceive={onReceive}
+        onSend={onSend}
+        buyButtonActionID={WalletViewSelectorsIDs.WALLET_BUY_BUTTON}
+        swapButtonActionID={WalletViewSelectorsIDs.WALLET_SWAP_BUTTON}
+        sendButtonActionID={WalletViewSelectorsIDs.WALLET_SEND_BUTTON}
+        receiveButtonActionID={WalletViewSelectorsIDs.WALLET_RECEIVE_BUTTON}
+      />
+      {isCarouselBannersEnabled && <Carousel style={styles.carousel} />}
+      {isMoneyHomeScreenEnabled && <MoneyBalanceCard />}
+    </>
+  );
 
-        {isCarouselBannersEnabled && <Carousel style={styles.carousel} />}
-
-        {isHomepageSectionsV1Enabled ? (
-          <>
-            {isFocused && <AssetPollingProvider chainIds={evmChainIds} />}
-            <HomepageScrollContext.Provider value={homepageScrollContextValue}>
-              <Homepage ref={homepageRef} />
-            </HomepageScrollContext.Provider>
-          </>
-        ) : (
-          <>
-            {isFocused && <AssetPollingProvider />}
-            <WalletTokensTabView
-              ref={walletTokensTabViewRef}
-              navigation={navigation}
-              onChangeTab={onChangeTab}
-              defiEnabled={defiEnabled}
-              collectiblesEnabled={collectiblesEnabled}
-            />
-          </>
-        )}
-      </>
+  // Legacy scroll view content — used only when the sections redesign is off.
+  const content = (
+    <>
+      {bannerContent}
+      <AccountGroupBalance />
+      <AssetDetailsActions
+        displayBuyButton={displayBuyButton}
+        displaySwapsButton={displaySwapsButton}
+        goToSwaps={goToSwaps}
+        onReceive={onReceive}
+        onSend={onSend}
+        buyButtonActionID={WalletViewSelectorsIDs.WALLET_BUY_BUTTON}
+        swapButtonActionID={WalletViewSelectorsIDs.WALLET_SWAP_BUTTON}
+        sendButtonActionID={WalletViewSelectorsIDs.WALLET_SEND_BUTTON}
+        receiveButtonActionID={WalletViewSelectorsIDs.WALLET_RECEIVE_BUTTON}
+      />
+      {isCarouselBannersEnabled && <Carousel style={styles.carousel} />}
+      {isFocused && <AssetPollingProvider />}
+      <WalletTokensTabView
+        ref={walletTokensTabViewRef}
+        navigation={navigation}
+        onChangeTab={onChangeTab}
+        defiEnabled={defiEnabled}
+        collectiblesEnabled={collectiblesEnabled}
+      />
     </>
   );
   const renderLoader = useCallback(
@@ -1367,37 +1457,84 @@ const Wallet = ({
         >
           {selectedInternalAccount ? (
             <>
-              <HeaderRoot
-                testID={WalletViewSelectorsIDs.WALLET_HEADER_ROOT}
-                endAccessory={
-                  <View style={styles.headerEndAccessoryContainer}>
-                    <View style={styles.headerActionButtonsContainer}>
-                      <View
-                        testID={
-                          WalletViewSelectorsIDs.NAVBAR_ADDRESS_COPY_BUTTON
-                        }
-                      >
-                        <AddressCopy hitSlop={touchAreaSlop} />
-                      </View>
-                      <CardButton
-                        onPress={handleCardPress}
-                        touchAreaSlop={touchAreaSlop}
-                      />
-                      {isNotificationsFeatureEnabled() ? (
-                        <BadgeWrapper
-                          position={BadgeWrapperPosition.TopRight}
-                          positionAnchorShape={
-                            BadgeWrapperPositionAnchorShape.Circular
+              <Reanimated.View
+                style={
+                  isDiscoveryTabsTreatment
+                    ? [styles.walletHeaderRoot, animatedHeaderStyle]
+                    : undefined
+                }
+              >
+                <HeaderRoot
+                  onLayout={
+                    isDiscoveryTabsTreatment
+                      ? (e) => {
+                          const h = e.nativeEvent.layout.height;
+                          if (h > 0) {
+                            setHeaderHeight(h);
+                            sharedHeaderHeight.value = h;
                           }
-                          badge={
-                            isNotificationEnabled &&
-                            unreadNotificationCount > 0 ? (
-                              <BadgeStatus
-                                status={BadgeStatusStatus.Attention}
-                              />
-                            ) : null
+                        }
+                      : undefined
+                  }
+                  testID={WalletViewSelectorsIDs.WALLET_HEADER_ROOT}
+                  style={undefined}
+                  endAccessory={
+                    <View style={styles.headerEndAccessoryContainer}>
+                      <View style={styles.headerActionButtonsContainer}>
+                        {isMoneyHomeScreenEnabled && (
+                          <ButtonIcon
+                            iconProps={{
+                              color: MMDSIconColor.IconDefault,
+                            }}
+                            onPress={handleActivityPress}
+                            iconName={MMDSIconName.Clock}
+                            size={ButtonIconSize.Md}
+                            testID={
+                              WalletViewSelectorsIDs.WALLET_ACTIVITY_BUTTON
+                            }
+                            hitSlop={touchAreaSlop}
+                          />
+                        )}
+                        <View
+                          testID={
+                            WalletViewSelectorsIDs.NAVBAR_ADDRESS_COPY_BUTTON
                           }
                         >
+                          <AddressCopy hitSlop={touchAreaSlop} />
+                        </View>
+                        <CardButton
+                          onPress={handleCardPress}
+                          touchAreaSlop={touchAreaSlop}
+                        />
+                        {isNotificationsFeatureEnabled() ? (
+                          <BadgeWrapper
+                            position={BadgeWrapperPosition.TopRight}
+                            positionAnchorShape={
+                              BadgeWrapperPositionAnchorShape.Circular
+                            }
+                            badge={
+                              isNotificationEnabled &&
+                              unreadNotificationCount > 0 ? (
+                                <BadgeStatus
+                                  status={BadgeStatusStatus.Attention}
+                                />
+                              ) : null
+                            }
+                          >
+                            <ButtonIcon
+                              iconProps={{
+                                color: MMDSIconColor.IconDefault,
+                              }}
+                              onPress={handleHamburgerPress}
+                              iconName={MMDSIconName.Menu}
+                              size={ButtonIconSize.Md}
+                              testID={
+                                WalletViewSelectorsIDs.WALLET_HAMBURGER_MENU_BUTTON
+                              }
+                              hitSlop={touchAreaSlop}
+                            />
+                          </BadgeWrapper>
+                        ) : (
                           <ButtonIcon
                             iconProps={{
                               color: MMDSIconColor.IconDefault,
@@ -1410,37 +1547,26 @@ const Wallet = ({
                             }
                             hitSlop={touchAreaSlop}
                           />
-                        </BadgeWrapper>
-                      ) : (
-                        <ButtonIcon
-                          iconProps={{
-                            color: MMDSIconColor.IconDefault,
-                          }}
-                          onPress={handleHamburgerPress}
-                          iconName={MMDSIconName.Menu}
-                          size={ButtonIconSize.Md}
-                          testID={
-                            WalletViewSelectorsIDs.WALLET_HAMBURGER_MENU_BUTTON
-                          }
-                          hitSlop={touchAreaSlop}
-                        />
-                      )}
+                        )}
+                      </View>
                     </View>
-                  </View>
-                }
-                twClassName="pl-1 pr-3"
-              >
-                <PickerAccount
-                  ref={walletRef}
-                  accountName={displayName}
-                  onPress={() =>
-                    navigation.navigate(...createAccountSelectorNavDetails({}))
                   }
-                  testID={WalletViewSelectorsIDs.ACCOUNT_ICON}
-                  hitSlop={touchAreaSlop}
-                  style={styles.headerAccountPickerStyle}
-                />
-              </HeaderRoot>
+                  twClassName="pl-1 pr-3"
+                >
+                  <PickerAccount
+                    ref={walletRef}
+                    accountName={displayName}
+                    onPress={() =>
+                      navigation.navigate(
+                        ...createAccountSelectorNavDetails({}),
+                      )
+                    }
+                    testID={WalletViewSelectorsIDs.ACCOUNT_ICON}
+                    hitSlop={touchAreaSlop}
+                    style={styles.headerAccountPickerStyle}
+                  />
+                </HeaderRoot>
+              </Reanimated.View>
               <View
                 ref={containerViewRef}
                 style={styles.wrapper}
@@ -1452,29 +1578,79 @@ const Wallet = ({
                   });
                 }}
               >
-                <ConditionalScrollView
-                  ref={scrollViewRef}
-                  isScrollEnabled
-                  scrollViewProps={{
-                    testID: WalletViewSelectorsIDs.WALLET_SCROLL_VIEW,
-                    contentContainerStyle: scrollViewContentStyle,
-                    showsVerticalScrollIndicator: false,
-                    onScroll: isHomepageSectionsV1Enabled
-                      ? handleHomepageScroll
-                      : undefined,
-                    scrollEventThrottle: 16,
-                    refreshControl: (
-                      <RefreshControl
-                        colors={[colors.primary.default]}
-                        tintColor={colors.icon.default}
-                        refreshing={refreshing}
-                        onRefresh={handleRefresh}
-                      />
-                    ),
-                  }}
-                >
-                  {content}
-                </ConditionalScrollView>
+                {isHomepageSectionsV1Enabled ? (
+                  <>
+                    {isFocused && (
+                      <AssetPollingProvider chainIds={evmChainIds} />
+                    )}
+                    <HomepageScrollContext.Provider
+                      value={homepageScrollContextValue}
+                    >
+                      {isDiscoveryTabsTreatment ? (
+                        <HomepageDiscoveryTabs
+                          ref={homepageRef}
+                          portfolioHeader={portfolioHeader}
+                          onPortfolioScroll={handleHomepageScroll}
+                          walletHeaderOffset={headerHeight + insets.top}
+                          walletHeaderHeight={headerHeight}
+                          walletHeaderTranslateY={walletHeaderTranslateY}
+                          refreshControl={
+                            <RefreshControl
+                              colors={[colors.primary.default]}
+                              tintColor={colors.icon.default}
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                            />
+                          }
+                        />
+                      ) : (
+                        <ConditionalScrollView
+                          ref={scrollViewRef}
+                          isScrollEnabled
+                          scrollViewProps={{
+                            testID: WalletViewSelectorsIDs.WALLET_SCROLL_VIEW,
+                            contentContainerStyle: scrollViewContentStyle,
+                            showsVerticalScrollIndicator: false,
+                            onScroll: handleHomepageScroll,
+                            scrollEventThrottle: 16,
+                            refreshControl: (
+                              <RefreshControl
+                                colors={[colors.primary.default]}
+                                tintColor={colors.icon.default}
+                                refreshing={refreshing}
+                                onRefresh={handleRefresh}
+                              />
+                            ),
+                          }}
+                        >
+                          {portfolioHeaderBase}
+                          <Homepage ref={homepageRef} />
+                        </ConditionalScrollView>
+                      )}
+                    </HomepageScrollContext.Provider>
+                  </>
+                ) : (
+                  <ConditionalScrollView
+                    ref={scrollViewRef}
+                    isScrollEnabled
+                    scrollViewProps={{
+                      testID: WalletViewSelectorsIDs.WALLET_SCROLL_VIEW,
+                      contentContainerStyle: scrollViewContentStyle,
+                      showsVerticalScrollIndicator: false,
+                      scrollEventThrottle: 16,
+                      refreshControl: (
+                        <RefreshControl
+                          colors={[colors.primary.default]}
+                          tintColor={colors.icon.default}
+                          refreshing={refreshing}
+                          onRefresh={handleRefresh}
+                        />
+                      ),
+                    }}
+                  >
+                    {content}
+                  </ConditionalScrollView>
+                )}
               </View>
             </>
           ) : (
diff --git a/app/components/Views/WhatsHappeningDetailView/WhatsHappeningDetailView.test.tsx b/app/components/Views/WhatsHappeningDetailView/WhatsHappeningDetailView.test.tsx
new file mode 100644
index 00000000000..6a4abc40527
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/WhatsHappeningDetailView.test.tsx
@@ -0,0 +1,409 @@
+import React from 'react';
+import { Pressable, View } from 'react-native';
+import { screen, fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../util/test/renderWithProvider';
+import WhatsHappeningExpandedCard from './components/WhatsHappeningExpandedCard';
+import WhatsHappeningSourcesBottomSheet from './components/WhatsHappeningSourcesBottomSheet';
+import WhatsHappeningDetailView, {
+  CARD_WIDTH,
+} from './WhatsHappeningDetailView';
+import { MetaMetricsEvents } from '../../../core/Analytics/MetaMetrics.events';
+
+const GAP = 12;
+const SNAP_INTERVAL_FOR_TEST = CARD_WIDTH + GAP;
+
+const mockGoBack = jest.fn();
+const mockRefresh = jest.fn();
+const mockTrackEvent = jest.fn();
+const mockCreateEventBuilder = jest.fn((eventName: string) => ({
+  addProperties: jest.fn((properties: Record<string, unknown>) => ({
+    build: jest.fn(() => ({ category: eventName, properties })),
+  })),
+  build: jest.fn(() => ({ category: eventName })),
+}));
+
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: jest.fn(),
+  useRoute: jest.fn(),
+}));
+
+jest.mock('./components/WhatsHappeningExpandedCard', () => ({
+  __esModule: true,
+  default: jest.fn(),
+}));
+
+jest.mock('./components/WhatsHappeningSourcesBottomSheet', () => ({
+  __esModule: true,
+  default: jest.fn(),
+}));
+
+jest.mock('../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  }),
+}));
+
+jest.mock('../Homepage/Sections/WhatsHappening/hooks', () => ({
+  useWhatsHappening: jest.fn(() => ({
+    items: [],
+    isLoading: false,
+    error: null,
+    refresh: mockRefresh,
+  })),
+}));
+
+jest.mock('./utils/getRelatedAssetImageSource', () => ({
+  getRelatedAssetImageSource: jest.fn(() => undefined),
+}));
+
+jest.mock('../../UI/Ramp/hooks/useRampNavigation', () => ({
+  useRampNavigation: () => ({ goToBuy: jest.fn() }),
+}));
+
+jest.mock('../../UI/MarketInsights/utils/marketInsightsFormatting', () => ({
+  formatRelativeTime: jest.fn(() => 'now'),
+  getUniqueSourcesByFavicon: jest.fn(() => []),
+}));
+
+jest.mock(
+  '../../UI/MarketInsights/components/SourceLogoGroup',
+  () => 'SourceLogoGroup',
+);
+
+const mockUseWhatsHappening = jest.requireMock(
+  '../Homepage/Sections/WhatsHappening/hooks',
+).useWhatsHappening;
+
+const mockNav = jest.requireMock('@react-navigation/native');
+const mockUseRoute = mockNav.useRoute as jest.Mock;
+const mockUseNavigation = mockNav.useNavigation as jest.Mock;
+
+const mockItem = {
+  id: 'trend-0',
+  title: 'The Federal Reserve pauses interest rates',
+  description: 'Reflecting the current economy.',
+  date: '2026-03-15T10:00:00.000Z',
+  category: 'macro' as const,
+  impact: 'positive' as const,
+  relatedAssets: [],
+  articles: [],
+};
+
+describe('WhatsHappeningDetailView', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseRoute.mockReturnValue({ params: { initialIndex: 0 } });
+    mockUseNavigation.mockReturnValue({ goBack: mockGoBack });
+
+    (WhatsHappeningExpandedCard as unknown as jest.Mock).mockImplementation(
+      ({
+        onSourcesPress,
+      }: {
+        onSourcesPress?: (articles: unknown[]) => void;
+      }) => (
+        <Pressable
+          testID="mock-expanded-card"
+          onPress={() =>
+            onSourcesPress?.([
+              {
+                title: 'Test',
+                source: 'coindesk.com',
+                url: 'https://coindesk.com/test',
+                date: '2026-03-15T10:00:00.000Z',
+              },
+            ])
+          }
+        />
+      ),
+    );
+
+    (
+      WhatsHappeningSourcesBottomSheet as unknown as jest.Mock
+    ).mockImplementation(({ onClose }: { onClose: () => void }) => (
+      <View testID="mock-sources-bottom-sheet">
+        <Pressable testID="mock-sources-close" onPress={onClose} />
+      </View>
+    ));
+  });
+
+  it('renders the screen title', () => {
+    renderWithProvider(<WhatsHappeningDetailView />);
+    expect(screen.getByText("What's happening")).toBeOnTheScreen();
+  });
+
+  it('renders skeleton carousel while loading', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [],
+      isLoading: true,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    expect(
+      screen.getByTestId('whats-happening-detail-skeleton'),
+    ).toBeOnTheScreen();
+    expect(screen.queryByTestId('whats-happening-detail-carousel')).toBeNull();
+  });
+
+  it('renders error state when fetch fails', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [],
+      isLoading: false,
+      error: 'Network error',
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    expect(screen.getByText(/unable to load/i)).toBeOnTheScreen();
+    expect(screen.queryByTestId('whats-happening-detail-carousel')).toBeNull();
+  });
+
+  it('calls refresh when error retry button is pressed', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [],
+      isLoading: false,
+      error: 'Network error',
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    fireEvent.press(screen.getByText('Retry'));
+    expect(mockRefresh).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders the carousel with items when data is available', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    const carousel = screen.getByTestId('whats-happening-detail-carousel');
+    expect(carousel).toBeOnTheScreen();
+    // Simulate the carousel measuring its height so cards become visible
+    fireEvent(carousel, 'layout', {
+      nativeEvent: { layout: { height: 600, width: 375, x: 0, y: 0 } },
+    });
+    expect(screen.getByTestId('mock-expanded-card')).toBeOnTheScreen();
+  });
+
+  it('does not show the skeleton or error when items are loaded', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    expect(screen.queryByTestId('whats-happening-detail-skeleton')).toBeNull();
+    expect(screen.queryByText(/unable to load/i)).toBeNull();
+  });
+
+  it('calls navigation.goBack when back button is pressed', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    fireEvent.press(screen.getByTestId('whats-happening-detail-back-button'));
+    expect(mockGoBack).toHaveBeenCalledTimes(1);
+  });
+
+  it('tracks Whats Happening Viewed once for the initial card on mount', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.WHATS_HAPPENING_VIEWED,
+    );
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        category: MetaMetricsEvents.WHATS_HAPPENING_VIEWED,
+        properties: expect.objectContaining({
+          event_id: mockItem.id,
+          card_index: 0,
+          category: 'macro',
+          impact: 'positive',
+          asset_symbols: [],
+        }),
+      }),
+    );
+  });
+
+  it('does not fire Viewed more than once for the initial card across re-renders', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    const { rerender } = renderWithProvider(<WhatsHappeningDetailView />);
+    rerender(<WhatsHappeningDetailView />);
+    const viewedCalls = mockCreateEventBuilder.mock.calls.filter(
+      ([name]) =>
+        name ===
+        (MetaMetricsEvents.WHATS_HAPPENING_VIEWED as unknown as string),
+    );
+    expect(viewedCalls).toHaveLength(1);
+  });
+
+  it('tracks Whats Happening Viewed when scrolling to a new card', () => {
+    const secondItem = {
+      ...mockItem,
+      id: 'trend-1',
+      title: 'Second trend',
+      category: 'social' as const,
+      impact: 'negative' as const,
+    };
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem, secondItem],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    mockTrackEvent.mockClear();
+    mockCreateEventBuilder.mockClear();
+    const carousel = screen.getByTestId('whats-happening-detail-carousel');
+    fireEvent(carousel, 'momentumScrollEnd', {
+      nativeEvent: { contentOffset: { x: SNAP_INTERVAL_FOR_TEST, y: 0 } },
+    });
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.WHATS_HAPPENING_VIEWED,
+    );
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        category: MetaMetricsEvents.WHATS_HAPPENING_VIEWED,
+        properties: expect.objectContaining({
+          event_id: 'trend-1',
+          card_index: 1,
+          category: 'social',
+          impact: 'negative',
+        }),
+      }),
+    );
+  });
+
+  it('does not track Viewed when scroll resolves to same index', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    mockTrackEvent.mockClear();
+    mockCreateEventBuilder.mockClear();
+    const carousel = screen.getByTestId('whats-happening-detail-carousel');
+    fireEvent(carousel, 'momentumScrollEnd', {
+      nativeEvent: { contentOffset: { x: 0, y: 0 } },
+    });
+    expect(mockCreateEventBuilder).not.toHaveBeenCalled();
+  });
+
+  it('tracks Whats Happening Closed with the visible card when back is pressed', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    fireEvent.press(screen.getByTestId('whats-happening-detail-back-button'));
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.WHATS_HAPPENING_CLOSED,
+    );
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        category: MetaMetricsEvents.WHATS_HAPPENING_CLOSED,
+        properties: expect.objectContaining({
+          event_id: mockItem.id,
+          card_index: 0,
+        }),
+      }),
+    );
+  });
+
+  it('shows the sources bottom sheet when onSourcesPress is called from a card', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    const carousel = screen.getByTestId('whats-happening-detail-carousel');
+    fireEvent(carousel, 'layout', {
+      nativeEvent: { layout: { height: 600, width: 375, x: 0, y: 0 } },
+    });
+    fireEvent.press(screen.getByTestId('mock-expanded-card'));
+    expect(screen.getByTestId('mock-sources-bottom-sheet')).toBeOnTheScreen();
+  });
+
+  it('hides the sources bottom sheet when onClose is called', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    const carousel = screen.getByTestId('whats-happening-detail-carousel');
+    fireEvent(carousel, 'layout', {
+      nativeEvent: { layout: { height: 600, width: 375, x: 0, y: 0 } },
+    });
+    fireEvent.press(screen.getByTestId('mock-expanded-card'));
+    expect(screen.getByTestId('mock-sources-bottom-sheet')).toBeOnTheScreen();
+    fireEvent.press(screen.getByTestId('mock-sources-close'));
+    expect(screen.queryByTestId('mock-sources-bottom-sheet')).toBeNull();
+  });
+
+  it('updates the active page indicator dot when the carousel is scrolled', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [
+        mockItem,
+        { ...mockItem, id: 'trend-1' },
+        { ...mockItem, id: 'trend-2' },
+      ],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    const carousel = screen.getByTestId('whats-happening-detail-carousel');
+    fireEvent(carousel, 'layout', {
+      nativeEvent: { layout: { height: 600, width: 375, x: 0, y: 0 } },
+    });
+    fireEvent(carousel, 'scroll', {
+      nativeEvent: { contentOffset: { x: 343, y: 0 } },
+    });
+    expect(screen.getByTestId('page-indicator-dot-active')).toBeOnTheScreen();
+    const inactiveDots = screen.getAllByTestId('page-indicator-dot');
+    expect(inactiveDots.length).toBe(2);
+  });
+
+  it('scrolls to initialIndex once content is wide enough', () => {
+    mockUseRoute.mockReturnValue({ params: { initialIndex: 1 } });
+    mockUseWhatsHappening.mockReturnValue({
+      items: [mockItem, { ...mockItem, id: 'trend-1' }],
+      isLoading: false,
+      error: null,
+      refresh: mockRefresh,
+    });
+    renderWithProvider(<WhatsHappeningDetailView />);
+    const carousel = screen.getByTestId('whats-happening-detail-carousel');
+    fireEvent(carousel, 'layout', {
+      nativeEvent: { layout: { height: 600, width: 375, x: 0, y: 0 } },
+    });
+    expect(() =>
+      fireEvent(carousel, 'contentSizeChange', 700, 600),
+    ).not.toThrow();
+  });
+});
diff --git a/app/components/Views/WhatsHappeningDetailView/WhatsHappeningDetailView.tsx b/app/components/Views/WhatsHappeningDetailView/WhatsHappeningDetailView.tsx
new file mode 100644
index 00000000000..da3652aaaad
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/WhatsHappeningDetailView.tsx
@@ -0,0 +1,283 @@
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import {
+  Dimensions,
+  LayoutChangeEvent,
+  NativeScrollEvent,
+  NativeSyntheticEvent,
+  SafeAreaView,
+  ScrollView,
+} from 'react-native';
+import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  ButtonIcon,
+  ButtonIconSize,
+  FontWeight,
+  IconName,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import type { Article } from '@metamask/ai-controllers';
+import type { WhatsHappeningItem } from '../Homepage/Sections/WhatsHappening/types';
+import { strings } from '../../../../locales/i18n';
+import { useWhatsHappening } from '../Homepage/Sections/WhatsHappening/hooks';
+import { WhatsHappeningCardSkeleton } from '../Homepage/Sections/WhatsHappening/components';
+import { MAX_ITEMS_DISPLAYED } from '../Homepage/Sections/WhatsHappening/constants';
+import { getWhatsHappeningEventProps } from '../Homepage/Sections/WhatsHappening/eventProperties';
+import ErrorState from '../Homepage/components/ErrorState/ErrorState';
+import WhatsHappeningExpandedCard from './components/WhatsHappeningExpandedCard';
+import WhatsHappeningSourcesBottomSheet from './components/WhatsHappeningSourcesBottomSheet';
+import PageIndicator from './components/PageIndicator';
+import { MetaMetricsEvents } from '../../../core/Analytics';
+import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
+
+const { width: SCREEN_WIDTH } = Dimensions.get('window');
+
+const HORIZONTAL_PADDING = 16;
+const GAP = 12;
+export const CARD_WIDTH = SCREEN_WIDTH - HORIZONTAL_PADDING * 2 - GAP;
+const SNAP_INTERVAL = CARD_WIDTH + GAP;
+
+const SKELETON_KEYS = Array.from(
+  { length: MAX_ITEMS_DISPLAYED },
+  (_, i) => `skeleton-${i}`,
+);
+
+interface WhatsHappeningDetailParams {
+  initialIndex: number;
+}
+
+const WhatsHappeningDetailView = () => {
+  const navigation = useNavigation();
+  const tw = useTailwind();
+  const route =
+    useRoute<RouteProp<{ params: WhatsHappeningDetailParams }, 'params'>>();
+
+  const initialIndex = route.params?.initialIndex ?? 0;
+
+  const { items, isLoading, error, refresh } =
+    useWhatsHappening(MAX_ITEMS_DISPLAYED);
+
+  const [currentIndex, setCurrentIndex] = useState(initialIndex);
+  const [cardHeight, setCardHeight] = useState(0);
+  const [sourcesContext, setSourcesContext] = useState<{
+    articles: Article[];
+    item: WhatsHappeningItem;
+    cardIndex: number;
+  } | null>(null);
+  const scrollViewRef = useRef<ScrollView>(null);
+  const hasScrolledToInitial = useRef(false);
+
+  const handleSourcesPress = useCallback(
+    (
+      articles: Article[],
+      pressedItem: WhatsHappeningItem,
+      pressedIndex: number,
+    ) => {
+      setSourcesContext({
+        articles,
+        item: pressedItem,
+        cardIndex: pressedIndex,
+      });
+    },
+    [],
+  );
+
+  const handleSourcesClose = useCallback(() => {
+    setSourcesContext(null);
+  }, []);
+  const hasTrackedViewRef = useRef(false);
+  const previousIndexRef = useRef(initialIndex);
+  const { trackEvent, createEventBuilder } = useAnalytics();
+
+  const handleCarouselLayout = useCallback((e: LayoutChangeEvent) => {
+    const { height } = e.nativeEvent.layout;
+    if (height > 0) setCardHeight(height);
+  }, []);
+
+  const handleContentSizeChange = useCallback(
+    (contentWidth: number) => {
+      if (
+        !hasScrolledToInitial.current &&
+        initialIndex > 0 &&
+        contentWidth > initialIndex * SNAP_INTERVAL &&
+        scrollViewRef.current
+      ) {
+        hasScrolledToInitial.current = true;
+        scrollViewRef.current.scrollTo({
+          x: initialIndex * SNAP_INTERVAL,
+          animated: false,
+        });
+      }
+    },
+    [initialIndex],
+  );
+
+  useEffect(() => {
+    if (
+      !isLoading &&
+      !hasTrackedViewRef.current &&
+      items.length > 0 &&
+      items[initialIndex]
+    ) {
+      hasTrackedViewRef.current = true;
+      trackEvent(
+        createEventBuilder(MetaMetricsEvents.WHATS_HAPPENING_VIEWED)
+          .addProperties(
+            getWhatsHappeningEventProps(items[initialIndex], initialIndex),
+          )
+          .build(),
+      );
+    }
+  }, [isLoading, items, initialIndex, trackEvent, createEventBuilder]);
+
+  const handleBackPress = useCallback(() => {
+    const visible = items[currentIndex];
+    if (visible) {
+      trackEvent(
+        createEventBuilder(MetaMetricsEvents.WHATS_HAPPENING_CLOSED)
+          .addProperties(getWhatsHappeningEventProps(visible, currentIndex))
+          .build(),
+      );
+    }
+    navigation.goBack();
+  }, [navigation, items, currentIndex, trackEvent, createEventBuilder]);
+
+  // Updates the dot indicator live during the drag.
+  // Flips at 20% visibility (bias = 0.8) — responsive without being erratic.
+  // No analytics here: mid-drag index changes are not reliable view signals.
+  const handleScroll = useCallback(
+    (event: NativeSyntheticEvent<NativeScrollEvent>) => {
+      const offsetX = event.nativeEvent.contentOffset.x;
+      const index = Math.max(
+        0,
+        Math.min(Math.floor(offsetX / SNAP_INTERVAL + 0.8), items.length - 1),
+      );
+      setCurrentIndex(index);
+    },
+    [items.length],
+  );
+
+  // Fires analytics once the carousel has fully settled on a card.
+  // onMomentumScrollEnd always fires with snapToInterval, giving the true
+  // final position — immune to mid-drag back-and-forth inflation.
+  const handleScrollEnd = useCallback(
+    (event: NativeSyntheticEvent<NativeScrollEvent>) => {
+      const offsetX = event.nativeEvent.contentOffset.x;
+      const index = Math.max(
+        0,
+        Math.min(Math.round(offsetX / SNAP_INTERVAL), items.length - 1),
+      );
+      const prev = previousIndexRef.current;
+      if (index !== prev) {
+        const newItem = items[index];
+        if (newItem) {
+          trackEvent(
+            createEventBuilder(MetaMetricsEvents.WHATS_HAPPENING_VIEWED)
+              .addProperties(getWhatsHappeningEventProps(newItem, index))
+              .build(),
+          );
+        }
+        previousIndexRef.current = index;
+      }
+    },
+    [items, trackEvent, createEventBuilder],
+  );
+
+  const hasError = !isLoading && items.length === 0 && !!error;
+
+  return (
+    <SafeAreaView style={tw`flex-1 bg-default`}>
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        twClassName="px-2 py-2"
+      >
+        <ButtonIcon
+          iconName={IconName.ArrowLeft}
+          size={ButtonIconSize.Md}
+          onPress={handleBackPress}
+          testID="whats-happening-detail-back-button"
+        />
+        <Box twClassName="flex-1 items-center">
+          <Text variant={TextVariant.HeadingSm} fontWeight={FontWeight.Bold}>
+            {strings('homepage.sections.whats_happening')}
+          </Text>
+        </Box>
+        <Box twClassName="w-10" />
+      </Box>
+
+      <Box twClassName="flex-1">
+        {isLoading ? (
+          <ScrollView
+            horizontal
+            showsHorizontalScrollIndicator={false}
+            contentContainerStyle={tw.style('px-4 gap-3 items-stretch')}
+            testID="whats-happening-detail-skeleton"
+          >
+            {SKELETON_KEYS.map((key) => (
+              <WhatsHappeningCardSkeleton key={key} />
+            ))}
+          </ScrollView>
+        ) : hasError ? (
+          <ErrorState
+            title={strings('homepage.error.unable_to_load', {
+              section: strings(
+                'homepage.sections.whats_happening',
+              ).toLowerCase(),
+            })}
+            onRetry={refresh}
+          />
+        ) : (
+          <>
+            <ScrollView
+              ref={scrollViewRef}
+              horizontal
+              showsHorizontalScrollIndicator={false}
+              decelerationRate="fast"
+              snapToInterval={SNAP_INTERVAL}
+              snapToAlignment="start"
+              style={tw`flex-1`}
+              contentContainerStyle={tw.style('px-4 gap-3')}
+              onLayout={handleCarouselLayout}
+              onContentSizeChange={handleContentSizeChange}
+              onScroll={handleScroll}
+              scrollEventThrottle={16}
+              onMomentumScrollEnd={handleScrollEnd}
+              testID="whats-happening-detail-carousel"
+            >
+              {cardHeight > 0 &&
+                items.map((item, index) => (
+                  <WhatsHappeningExpandedCard
+                    key={item.id}
+                    item={item}
+                    cardIndex={index}
+                    cardWidth={CARD_WIDTH}
+                    cardHeight={cardHeight}
+                    onSourcesPress={(articles) =>
+                      handleSourcesPress(articles, item, index)
+                    }
+                  />
+                ))}
+            </ScrollView>
+
+            <PageIndicator count={items.length} activeIndex={currentIndex} />
+          </>
+        )}
+      </Box>
+      {sourcesContext && (
+        <WhatsHappeningSourcesBottomSheet
+          onClose={handleSourcesClose}
+          articles={sourcesContext.articles}
+          item={sourcesContext.item}
+          cardIndex={sourcesContext.cardIndex}
+        />
+      )}
+    </SafeAreaView>
+  );
+};
+
+export default WhatsHappeningDetailView;
diff --git a/app/components/Views/WhatsHappeningDetailView/components/AssetRow.tsx b/app/components/Views/WhatsHappeningDetailView/components/AssetRow.tsx
new file mode 100644
index 00000000000..381404af394
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/AssetRow.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import {
+  AvatarToken,
+  AvatarTokenSize,
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  Button,
+  ButtonSize,
+  ButtonVariant,
+  FontWeight,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import type { RelatedAsset } from '@metamask/ai-controllers';
+import { getRelatedAssetImageSource } from '../utils/getRelatedAssetImageSource';
+
+interface AssetRowProps {
+  asset: RelatedAsset;
+  actionLabel: string;
+  accessibilityLabel: string;
+  onAction: () => void;
+}
+
+/**
+ * Shared layout for a single asset row (logo + symbol + action button).
+ * Used by TokenRow (Buy/Trade) and PerpsRow (Trade); each wrapper supplies its
+ * own hook logic and passes the resolved label and handler here.
+ */
+const AssetRow: React.FC<AssetRowProps> = ({
+  asset,
+  actionLabel,
+  accessibilityLabel,
+  onAction,
+}) => {
+  const rawImageSource = getRelatedAssetImageSource(asset);
+  const imageSource = Array.isArray(rawImageSource)
+    ? (rawImageSource[0] as { uri?: string } | undefined)
+    : (rawImageSource as number | { uri?: string } | undefined);
+
+  return (
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      alignItems={BoxAlignItems.Center}
+      gap={3}
+      twClassName="py-3"
+    >
+      <AvatarToken
+        name={asset.name}
+        size={AvatarTokenSize.Lg}
+        src={imageSource ?? undefined}
+      />
+
+      <Box
+        twClassName="flex-1"
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        justifyContent={BoxJustifyContent.Between}
+      >
+        <Text
+          variant={TextVariant.BodyMd}
+          fontWeight={FontWeight.Medium}
+          color={TextColor.TextDefault}
+        >
+          {asset.symbol}
+        </Text>
+
+        <Button
+          variant={ButtonVariant.Primary}
+          size={ButtonSize.Md}
+          onPress={onAction}
+          accessibilityLabel={accessibilityLabel}
+        >
+          {actionLabel}
+        </Button>
+      </Box>
+    </Box>
+  );
+};
+
+export default AssetRow;
diff --git a/app/components/Views/WhatsHappeningDetailView/components/PageIndicator.test.tsx b/app/components/Views/WhatsHappeningDetailView/components/PageIndicator.test.tsx
new file mode 100644
index 00000000000..8c7699f17d2
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/PageIndicator.test.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { screen } from '@testing-library/react-native';
+import renderWithProvider from '../../../../util/test/renderWithProvider';
+import PageIndicator from './PageIndicator';
+
+describe('PageIndicator', () => {
+  it('renders nothing when count is 1', () => {
+    const { toJSON } = renderWithProvider(
+      <PageIndicator count={1} activeIndex={0} />,
+    );
+    expect(toJSON()).toBeNull();
+  });
+
+  it('renders nothing when count is 0', () => {
+    const { toJSON } = renderWithProvider(
+      <PageIndicator count={0} activeIndex={0} />,
+    );
+    expect(toJSON()).toBeNull();
+  });
+
+  it('renders count dots when count > 1', () => {
+    renderWithProvider(<PageIndicator count={3} activeIndex={0} />);
+    const activeDots = screen.queryAllByTestId('page-indicator-dot-active');
+    const inactiveDots = screen.queryAllByTestId('page-indicator-dot');
+    expect(activeDots.length + inactiveDots.length).toBe(3);
+  });
+
+  it('marks the correct dot as active', () => {
+    renderWithProvider(<PageIndicator count={3} activeIndex={1} />);
+    expect(screen.queryAllByTestId('page-indicator-dot-active')).toHaveLength(
+      1,
+    );
+    expect(screen.queryAllByTestId('page-indicator-dot')).toHaveLength(2);
+  });
+
+  it('marks the first dot active when activeIndex is 0', () => {
+    renderWithProvider(<PageIndicator count={4} activeIndex={0} />);
+    expect(screen.queryAllByTestId('page-indicator-dot-active')).toHaveLength(
+      1,
+    );
+    expect(screen.queryAllByTestId('page-indicator-dot')).toHaveLength(3);
+  });
+});
diff --git a/app/components/Views/WhatsHappeningDetailView/components/PageIndicator.tsx b/app/components/Views/WhatsHappeningDetailView/components/PageIndicator.tsx
new file mode 100644
index 00000000000..314d0b765c3
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/PageIndicator.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  Box,
+  BoxFlexDirection,
+  BoxAlignItems,
+  BoxJustifyContent,
+} from '@metamask/design-system-react-native';
+
+interface PageIndicatorProps {
+  count: number;
+  activeIndex: number;
+}
+
+const PageIndicator: React.FC<PageIndicatorProps> = ({
+  count,
+  activeIndex,
+}) => {
+  const tw = useTailwind();
+
+  if (count <= 1) return null;
+
+  return (
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      alignItems={BoxAlignItems.Center}
+      justifyContent={BoxJustifyContent.Center}
+      gap={1}
+      twClassName="py-4"
+    >
+      {Array.from({ length: count }, (_, index) => (
+        <Box
+          key={index}
+          testID={
+            index === activeIndex
+              ? 'page-indicator-dot-active'
+              : 'page-indicator-dot'
+          }
+          style={
+            index === activeIndex
+              ? tw.style('w-2 h-2 rounded-full bg-icon-default')
+              : tw.style('w-2 h-2 rounded-full bg-icon-muted')
+          }
+        />
+      ))}
+    </Box>
+  );
+};
+
+export default PageIndicator;
diff --git a/app/components/Views/WhatsHappeningDetailView/components/PerpsRow.test.tsx b/app/components/Views/WhatsHappeningDetailView/components/PerpsRow.test.tsx
new file mode 100644
index 00000000000..15504e180f3
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/PerpsRow.test.tsx
@@ -0,0 +1,157 @@
+import React from 'react';
+import { screen, fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../util/test/renderWithProvider';
+import PerpsRow from './PerpsRow';
+import Routes from '../../../../constants/navigation/Routes';
+import type { RelatedAsset } from '@metamask/ai-controllers';
+import type { WhatsHappeningItem } from '../../Homepage/Sections/WhatsHappening/types';
+import { MetaMetricsEvents } from '../../../../core/Analytics/MetaMetrics.events';
+
+const mockNavigate = jest.fn();
+const mockTrackEvent = jest.fn();
+const mockCreateEventBuilder = jest.fn((eventName: string) => ({
+  addProperties: jest.fn((properties: Record<string, unknown>) => ({
+    build: jest.fn(() => ({ category: eventName, properties })),
+  })),
+  build: jest.fn(() => ({ category: eventName })),
+}));
+
+jest.mock('@react-navigation/native', () => {
+  const actual = jest.requireActual('@react-navigation/native');
+  return {
+    ...actual,
+    useNavigation: () => ({ navigate: mockNavigate }),
+  };
+});
+
+jest.mock('../utils/getRelatedAssetImageSource', () => ({
+  getRelatedAssetImageSource: jest.fn(() => undefined),
+}));
+
+jest.mock('../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  }),
+}));
+
+const perpsOnlyAsset: RelatedAsset = {
+  sourceAssetId: 'tsla',
+  symbol: 'TSLA',
+  name: 'Tesla',
+  caip19: [],
+  hlPerpsMarket: ['xyz:TSLA'],
+};
+
+const dualAsset: RelatedAsset = {
+  sourceAssetId: 'bitcoin',
+  symbol: 'BTC',
+  name: 'Bitcoin',
+  caip19: ['eip155:1/slip44:0'],
+  hlPerpsMarket: ['BTC'],
+};
+
+const mockItem: WhatsHappeningItem = {
+  id: 'trend-3',
+  title: 'TSLA earnings',
+  description: '...',
+  date: '2026-03-15T10:00:00.000Z',
+  category: 'macro',
+  impact: 'positive',
+  relatedAssets: [perpsOnlyAsset],
+  articles: [],
+};
+
+describe('PerpsRow', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the asset symbol', () => {
+    renderWithProvider(
+      <PerpsRow asset={perpsOnlyAsset} item={mockItem} cardIndex={0} />,
+    );
+    expect(screen.getByText('TSLA')).toBeOnTheScreen();
+  });
+
+  it('renders the Trade button', () => {
+    renderWithProvider(
+      <PerpsRow asset={perpsOnlyAsset} item={mockItem} cardIndex={0} />,
+    );
+    expect(screen.getByText('Trade')).toBeOnTheScreen();
+  });
+
+  it('navigates to PerpsMarketDetails with minimal market payload on Trade press', () => {
+    renderWithProvider(
+      <PerpsRow asset={perpsOnlyAsset} item={mockItem} cardIndex={0} />,
+    );
+    fireEvent.press(screen.getByText('Trade'));
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+      screen: Routes.PERPS.MARKET_DETAILS,
+      params: expect.objectContaining({
+        market: { symbol: 'xyz:TSLA', name: 'Tesla' },
+      }),
+    });
+  });
+
+  it('uses first hlPerpsMarket entry as the market symbol', () => {
+    renderWithProvider(
+      <PerpsRow asset={dualAsset} item={mockItem} cardIndex={0} />,
+    );
+    fireEvent.press(screen.getByText('Trade'));
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+      screen: Routes.PERPS.MARKET_DETAILS,
+      params: expect.objectContaining({
+        market: { symbol: 'BTC', name: 'Bitcoin' },
+      }),
+    });
+  });
+
+  it('does not navigate when hlPerpsMarket is empty', () => {
+    const assetNoPerps: RelatedAsset = {
+      ...perpsOnlyAsset,
+      hlPerpsMarket: [],
+    };
+    renderWithProvider(
+      <PerpsRow asset={assetNoPerps} item={mockItem} cardIndex={0} />,
+    );
+    fireEvent.press(screen.getByText('Trade'));
+    expect(mockNavigate).not.toHaveBeenCalled();
+  });
+
+  it('tracks Whats Happening Interaction with interaction_type=trade_pressed and asset details on Trade press', () => {
+    renderWithProvider(
+      <PerpsRow asset={perpsOnlyAsset} item={mockItem} cardIndex={1} />,
+    );
+    fireEvent.press(screen.getByText('Trade'));
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.WHATS_HAPPENING_INTERACTION,
+    );
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        category: MetaMetricsEvents.WHATS_HAPPENING_INTERACTION,
+        properties: expect.objectContaining({
+          interaction_type: 'trade_pressed',
+          asset_symbol: 'TSLA',
+          perps_market: 'xyz:TSLA',
+          event_id: 'trend-3',
+          card_index: 1,
+          category: 'macro',
+          impact: 'positive',
+        }),
+      }),
+    );
+  });
+
+  it('does not track Interaction when hlPerpsMarket is empty', () => {
+    const assetNoPerps: RelatedAsset = {
+      ...perpsOnlyAsset,
+      hlPerpsMarket: [],
+    };
+    renderWithProvider(
+      <PerpsRow asset={assetNoPerps} item={mockItem} cardIndex={0} />,
+    );
+    fireEvent.press(screen.getByText('Trade'));
+    expect(mockCreateEventBuilder).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/components/Views/WhatsHappeningDetailView/components/PerpsRow.tsx b/app/components/Views/WhatsHappeningDetailView/components/PerpsRow.tsx
new file mode 100644
index 00000000000..6996cee0154
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/PerpsRow.tsx
@@ -0,0 +1,61 @@
+import React, { useCallback } from 'react';
+import type { RelatedAsset } from '@metamask/ai-controllers';
+import { strings } from '../../../../../locales/i18n';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
+import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
+import { WhatsHappeningInteractionType } from '../../Homepage/Sections/WhatsHappening/constants';
+import { getWhatsHappeningEventProps } from '../../Homepage/Sections/WhatsHappening/eventProperties';
+import type { WhatsHappeningItem } from '../../Homepage/Sections/WhatsHappening/types';
+import AssetRow from './AssetRow';
+import useTradeNavigation from '../hooks/useTradeNavigation';
+
+interface PerpsRowProps {
+  asset: RelatedAsset;
+  item: WhatsHappeningItem;
+  cardIndex: number;
+}
+
+/**
+ * A single row in the Perps section of the expanded What's Happening card.
+ * Displays the asset logo and symbol with a Trade button that navigates to
+ * the Perps market details view. Extracted as its own component so hooks can
+ * be called per-asset (hooks cannot be called inside a loop).
+ */
+const PerpsRow: React.FC<PerpsRowProps> = ({ asset, item, cardIndex }) => {
+  const { handleTrade } = useTradeNavigation(asset);
+  const { trackEvent, createEventBuilder } = useAnalytics();
+
+  const handleTradeWithTracking = useCallback(() => {
+    if (!asset.hlPerpsMarket?.[0]) return;
+    trackEvent(
+      createEventBuilder(MetaMetricsEvents.WHATS_HAPPENING_INTERACTION)
+        .addProperties({
+          ...getWhatsHappeningEventProps(item, cardIndex),
+          interaction_type: WhatsHappeningInteractionType.TradePressed,
+          asset_symbol: asset.symbol,
+          perps_market: asset.hlPerpsMarket?.[0],
+        })
+        .build(),
+    );
+    handleTrade();
+  }, [
+    handleTrade,
+    asset.symbol,
+    asset.hlPerpsMarket,
+    item,
+    cardIndex,
+    trackEvent,
+    createEventBuilder,
+  ]);
+
+  return (
+    <AssetRow
+      asset={asset}
+      actionLabel={strings('bottom_nav.trade')}
+      accessibilityLabel={`${strings('bottom_nav.trade')} ${asset.symbol}`}
+      onAction={handleTradeWithTracking}
+    />
+  );
+};
+
+export default PerpsRow;
diff --git a/app/components/Views/WhatsHappeningDetailView/components/TokenRow.test.tsx b/app/components/Views/WhatsHappeningDetailView/components/TokenRow.test.tsx
new file mode 100644
index 00000000000..9f2ae4a4df0
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/TokenRow.test.tsx
@@ -0,0 +1,185 @@
+import React from 'react';
+import { screen, fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../util/test/renderWithProvider';
+import TokenRow from './TokenRow';
+import type { RelatedAsset } from '@metamask/ai-controllers';
+import type { WhatsHappeningItem } from '../../Homepage/Sections/WhatsHappening/types';
+import { MetaMetricsEvents } from '../../../../core/Analytics/MetaMetrics.events';
+import Routes from '../../../../constants/navigation/Routes';
+
+const mockGoToBuy = jest.fn();
+const mockTrackEvent = jest.fn();
+const mockCreateEventBuilder = jest.fn((eventName: string) => ({
+  addProperties: jest.fn((properties: Record<string, unknown>) => ({
+    build: jest.fn(() => ({ category: eventName, properties })),
+  })),
+  build: jest.fn(() => ({ category: eventName })),
+}));
+
+const mockNavigate = jest.fn();
+
+jest.mock('../../../UI/Ramp/hooks/useRampNavigation', () => ({
+  useRampNavigation: () => ({ goToBuy: mockGoToBuy }),
+}));
+
+jest.mock('@react-navigation/native', () => {
+  const actual = jest.requireActual('@react-navigation/native');
+  return {
+    ...actual,
+    useNavigation: () => ({ navigate: mockNavigate }),
+  };
+});
+
+jest.mock('../utils/getRelatedAssetImageSource', () => ({
+  getRelatedAssetImageSource: jest.fn(() => undefined),
+}));
+
+jest.mock('../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  }),
+}));
+
+const btcAsset: RelatedAsset = {
+  sourceAssetId: 'bitcoin',
+  symbol: 'BTC',
+  name: 'Bitcoin',
+  caip19: ['eip155:1/slip44:0'],
+};
+
+const dualAsset: RelatedAsset = {
+  sourceAssetId: 'eth',
+  symbol: 'ETH',
+  name: 'Ethereum',
+  caip19: ['eip155:1/slip44:60'],
+  hlPerpsMarket: ['ETH'],
+};
+
+const perpsOnlyAsset: RelatedAsset = {
+  sourceAssetId: 'tsla',
+  symbol: 'TSLA',
+  name: 'Tesla',
+  caip19: [],
+};
+
+const mockItem: WhatsHappeningItem = {
+  id: 'trend-2',
+  title: 'BTC ETF inflows',
+  description: '...',
+  date: '2026-03-15T10:00:00.000Z',
+  category: 'macro',
+  impact: 'positive',
+  relatedAssets: [btcAsset],
+  articles: [],
+};
+
+describe('TokenRow', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('when asset has only caip19 (no hlPerpsMarket)', () => {
+    it('renders the asset symbol', () => {
+      renderWithProvider(
+        <TokenRow asset={btcAsset} item={mockItem} cardIndex={0} />,
+      );
+      expect(screen.getByText('BTC')).toBeOnTheScreen();
+    });
+
+    it('renders the Buy button', () => {
+      renderWithProvider(
+        <TokenRow asset={btcAsset} item={mockItem} cardIndex={0} />,
+      );
+      expect(screen.getByText('Buy')).toBeOnTheScreen();
+    });
+
+    it('calls goToBuy with the first caip19 identifier on Buy press', () => {
+      renderWithProvider(
+        <TokenRow asset={btcAsset} item={mockItem} cardIndex={0} />,
+      );
+      fireEvent.press(screen.getByText('Buy'));
+      expect(mockGoToBuy).toHaveBeenCalledWith({
+        assetId: 'eip155:1/slip44:0',
+      });
+    });
+  });
+
+  it('calls goToBuy with assetId undefined when caip19 is empty', () => {
+    renderWithProvider(
+      <TokenRow asset={perpsOnlyAsset} item={mockItem} cardIndex={0} />,
+    );
+    fireEvent.press(screen.getByText('Buy'));
+    expect(mockGoToBuy).toHaveBeenCalledWith({ assetId: undefined });
+  });
+
+  describe('when asset has hlPerpsMarket (dual asset)', () => {
+    it('renders the Trade button instead of Buy', () => {
+      renderWithProvider(
+        <TokenRow asset={dualAsset} item={mockItem} cardIndex={0} />,
+      );
+      expect(screen.getByText('Trade')).toBeOnTheScreen();
+      expect(screen.queryByText('Buy')).toBeNull();
+    });
+
+    it('navigates to Perps market details on Trade press', () => {
+      renderWithProvider(
+        <TokenRow asset={dualAsset} item={mockItem} cardIndex={0} />,
+      );
+      fireEvent.press(screen.getByText('Trade'));
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+        screen: Routes.PERPS.MARKET_DETAILS,
+        params: expect.objectContaining({
+          market: { symbol: 'ETH', name: 'Ethereum' },
+        }),
+      });
+    });
+
+    it('does not call goToBuy when Trade is pressed', () => {
+      renderWithProvider(
+        <TokenRow asset={dualAsset} item={mockItem} cardIndex={0} />,
+      );
+      fireEvent.press(screen.getByText('Trade'));
+      expect(mockGoToBuy).not.toHaveBeenCalled();
+    });
+  });
+
+  it('tracks Whats Happening Interaction with interaction_type=buy_pressed and asset details on Buy press', () => {
+    renderWithProvider(
+      <TokenRow asset={btcAsset} item={mockItem} cardIndex={2} />,
+    );
+    fireEvent.press(screen.getByText('Buy'));
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.WHATS_HAPPENING_INTERACTION,
+    );
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        category: MetaMetricsEvents.WHATS_HAPPENING_INTERACTION,
+        properties: expect.objectContaining({
+          interaction_type: 'buy_pressed',
+          asset_symbol: 'BTC',
+          asset_caip19: 'eip155:1/slip44:0',
+          event_id: 'trend-2',
+          card_index: 2,
+          category: 'macro',
+          impact: 'positive',
+        }),
+      }),
+    );
+  });
+
+  it('tracks Interaction without asset_caip19 when caip19 is empty', () => {
+    renderWithProvider(
+      <TokenRow asset={perpsOnlyAsset} item={mockItem} cardIndex={0} />,
+    );
+    fireEvent.press(screen.getByText('Buy'));
+    const addPropertiesCall = mockCreateEventBuilder.mock.results[0]?.value
+      ?.addProperties as jest.Mock | undefined;
+    const builtProperties = addPropertiesCall?.mock?.calls?.[0]?.[0] as
+      | Record<string, string>
+      | undefined;
+    expect(builtProperties?.interaction_type).toBe('buy_pressed');
+    expect(builtProperties?.asset_symbol).toBe('TSLA');
+    expect(builtProperties).not.toHaveProperty('asset_caip19');
+  });
+});
diff --git a/app/components/Views/WhatsHappeningDetailView/components/TokenRow.tsx b/app/components/Views/WhatsHappeningDetailView/components/TokenRow.tsx
new file mode 100644
index 00000000000..4a29ff051fc
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/TokenRow.tsx
@@ -0,0 +1,97 @@
+import React, { useCallback } from 'react';
+import type { RelatedAsset } from '@metamask/ai-controllers';
+import { strings } from '../../../../../locales/i18n';
+import { useRampNavigation } from '../../../UI/Ramp/hooks/useRampNavigation';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
+import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
+import { WhatsHappeningInteractionType } from '../../Homepage/Sections/WhatsHappening/constants';
+import { getWhatsHappeningEventProps } from '../../Homepage/Sections/WhatsHappening/eventProperties';
+import type { WhatsHappeningItem } from '../../Homepage/Sections/WhatsHappening/types';
+import AssetRow from './AssetRow';
+import useTradeNavigation from '../hooks/useTradeNavigation';
+
+interface TokenRowProps {
+  asset: RelatedAsset;
+  item: WhatsHappeningItem;
+  cardIndex: number;
+}
+
+/**
+ * A single row in the Tokens section of the expanded What's Happening card.
+ * Shows a Trade button (navigating to Perps) when the asset has an
+ * `hlPerpsMarket` entry; otherwise falls back to a Buy button that opens the
+ * Ramp buy flow. Extracted as its own component so hooks can be called
+ * per-asset (hooks cannot be called inside a loop).
+ */
+const TokenRow: React.FC<TokenRowProps> = ({ asset, item, cardIndex }) => {
+  const { goToBuy } = useRampNavigation();
+  const { trackEvent, createEventBuilder } = useAnalytics();
+  const { handleTrade, canTrade } = useTradeNavigation(asset);
+
+  const handleTradeWithTracking = useCallback(() => {
+    trackEvent(
+      createEventBuilder(MetaMetricsEvents.WHATS_HAPPENING_INTERACTION)
+        .addProperties({
+          ...getWhatsHappeningEventProps(item, cardIndex),
+          interaction_type: WhatsHappeningInteractionType.TradePressed,
+          asset_symbol: asset.symbol,
+          perps_market: asset.hlPerpsMarket?.[0],
+        })
+        .build(),
+    );
+    handleTrade();
+  }, [
+    handleTrade,
+    asset.symbol,
+    asset.hlPerpsMarket,
+    item,
+    cardIndex,
+    trackEvent,
+    createEventBuilder,
+  ]);
+
+  const handleBuy = useCallback(() => {
+    const assetId = asset.caip19?.[0];
+    trackEvent(
+      createEventBuilder(MetaMetricsEvents.WHATS_HAPPENING_INTERACTION)
+        .addProperties({
+          ...getWhatsHappeningEventProps(item, cardIndex),
+          interaction_type: WhatsHappeningInteractionType.BuyPressed,
+          asset_symbol: asset.symbol,
+          ...(assetId ? { asset_caip19: assetId } : {}),
+        })
+        .build(),
+    );
+    goToBuy({ assetId });
+  }, [
+    goToBuy,
+    asset.caip19,
+    asset.symbol,
+    item,
+    cardIndex,
+    trackEvent,
+    createEventBuilder,
+  ]);
+
+  if (canTrade) {
+    return (
+      <AssetRow
+        asset={asset}
+        actionLabel={strings('bottom_nav.trade')}
+        accessibilityLabel={`${strings('bottom_nav.trade')} ${asset.symbol}`}
+        onAction={handleTradeWithTracking}
+      />
+    );
+  }
+
+  return (
+    <AssetRow
+      asset={asset}
+      actionLabel={strings('asset_overview.buy_button')}
+      accessibilityLabel={`${strings('asset_overview.buy_button')} ${asset.symbol}`}
+      onAction={handleBuy}
+    />
+  );
+};
+
+export default TokenRow;
diff --git a/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningExpandedCard.test.tsx b/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningExpandedCard.test.tsx
new file mode 100644
index 00000000000..9a687b83e32
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningExpandedCard.test.tsx
@@ -0,0 +1,298 @@
+import React from 'react';
+import { screen, fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../util/test/renderWithProvider';
+import WhatsHappeningExpandedCard from './WhatsHappeningExpandedCard';
+import type { WhatsHappeningItem } from '../../Homepage/Sections/WhatsHappening/types';
+import Routes from '../../../../constants/navigation/Routes';
+
+const mockNavigate = jest.fn();
+const mockGoToBuy = jest.fn();
+
+jest.mock('../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: jest.fn(),
+    createEventBuilder: jest.fn((eventName: string) => ({
+      addProperties: jest.fn(() => ({
+        build: jest.fn(() => ({ category: eventName })),
+      })),
+      build: jest.fn(() => ({ category: eventName })),
+    })),
+  }),
+}));
+
+jest.mock('@react-navigation/native', () => {
+  const actual = jest.requireActual('@react-navigation/native');
+  return {
+    ...actual,
+    useNavigation: () => ({ navigate: mockNavigate }),
+  };
+});
+
+jest.mock('../utils/getRelatedAssetImageSource', () => ({
+  getRelatedAssetImageSource: jest.fn(() => undefined),
+}));
+
+jest.mock('../../../UI/Ramp/hooks/useRampNavigation', () => ({
+  useRampNavigation: () => ({ goToBuy: mockGoToBuy }),
+}));
+
+jest.mock('../../../UI/MarketInsights/utils/marketInsightsFormatting', () => ({
+  formatRelativeTime: jest.fn(() => 'now'),
+  getUniqueSourcesByFavicon: jest.fn(() => []),
+}));
+
+jest.mock(
+  '../../../UI/MarketInsights/components/SourceLogoGroup',
+  () => 'SourceLogoGroup',
+);
+
+const CARD_WIDTH = 320;
+const CARD_HEIGHT = 600;
+
+const tokenAsset = {
+  sourceAssetId: 'bitcoin',
+  symbol: 'BTC',
+  name: 'Bitcoin',
+  caip19: ['eip155:1/slip44:0'],
+  hlPerpsMarket: undefined,
+};
+
+const perpsOnlyAsset = {
+  sourceAssetId: 'tsla',
+  symbol: 'TSLA',
+  name: 'Tesla',
+  caip19: [],
+  hlPerpsMarket: ['xyz:TSLA'],
+};
+
+const dualAsset = {
+  sourceAssetId: 'eth',
+  symbol: 'ETH',
+  name: 'Ethereum',
+  caip19: ['eip155:1/slip44:60'],
+  hlPerpsMarket: ['ETH'],
+};
+
+const baseItem: WhatsHappeningItem = {
+  id: 'trend-0',
+  title: 'The Federal Reserve pauses interest rates',
+  description: 'Reflecting the current economy.',
+  date: '2026-03-15T10:00:00.000Z',
+  category: 'macro',
+  impact: 'positive',
+  relatedAssets: [],
+  articles: [],
+};
+
+describe('WhatsHappeningExpandedCard', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the title and description', () => {
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={baseItem}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    expect(screen.getByText(baseItem.title)).toBeOnTheScreen();
+    expect(screen.getByText(baseItem.description)).toBeOnTheScreen();
+  });
+
+  it('renders the impact badge for positive impact', () => {
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={baseItem}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    expect(screen.getByText('Bullish')).toBeOnTheScreen();
+  });
+
+  it('renders Neutral badge when impact is explicitly neutral', () => {
+    const item = { ...baseItem, impact: 'neutral' as const };
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={item}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    expect(screen.getByText('Neutral')).toBeOnTheScreen();
+  });
+
+  it('does not render an impact badge when impact is undefined', () => {
+    const item = { ...baseItem, impact: undefined };
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={item}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    expect(screen.queryByText('Neutral')).toBeNull();
+    expect(screen.queryByText('Bullish')).toBeNull();
+    expect(screen.queryByText('Bearish')).toBeNull();
+  });
+
+  it('renders Tokens section when assets have caip19', () => {
+    const item = { ...baseItem, relatedAssets: [tokenAsset] };
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={item}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    expect(screen.getByText('Tokens')).toBeOnTheScreen();
+    expect(screen.getByText('BTC')).toBeOnTheScreen();
+    expect(screen.getByText('Buy')).toBeOnTheScreen();
+  });
+
+  it('does not render Tokens section when no assets have caip19', () => {
+    const item = { ...baseItem, relatedAssets: [perpsOnlyAsset] };
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={item}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    expect(screen.queryByText('Tokens')).toBeNull();
+    expect(screen.queryByText('Buy')).toBeNull();
+  });
+
+  it('renders Perps section when assets have hlPerpsMarket', () => {
+    const item = { ...baseItem, relatedAssets: [perpsOnlyAsset] };
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={item}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    expect(screen.getByText('Perps')).toBeOnTheScreen();
+    expect(screen.getByText('TSLA')).toBeOnTheScreen();
+    expect(screen.getByText('Trade')).toBeOnTheScreen();
+  });
+
+  it('does not render Perps section when no assets have hlPerpsMarket', () => {
+    const item = { ...baseItem, relatedAssets: [tokenAsset] };
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={item}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    expect(screen.queryByText('Perps')).toBeNull();
+    expect(screen.queryByText('Trade')).toBeNull();
+  });
+
+  it('renders both Tokens and Perps sections when there are separate token and perps-only assets', () => {
+    const item = { ...baseItem, relatedAssets: [tokenAsset, perpsOnlyAsset] };
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={item}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    expect(screen.getByText('Tokens')).toBeOnTheScreen();
+    expect(screen.getByText('Perps')).toBeOnTheScreen();
+    expect(screen.getByText('Buy')).toBeOnTheScreen();
+    expect(screen.getByText('Trade')).toBeOnTheScreen();
+  });
+
+  it('does not duplicate a dual asset (caip19 + hlPerpsMarket) into the Perps section, shows Trade for the token row', () => {
+    const item = { ...baseItem, relatedAssets: [dualAsset] };
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={item}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    expect(screen.getByText('Tokens')).toBeOnTheScreen();
+    expect(screen.getByText('Trade')).toBeOnTheScreen();
+    expect(screen.queryByText('Buy')).toBeNull();
+    expect(screen.queryByText('Perps')).toBeNull();
+  });
+
+  it('renders neither section when relatedAssets is empty', () => {
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={baseItem}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    expect(screen.queryByText('Tokens')).toBeNull();
+    expect(screen.queryByText('Perps')).toBeNull();
+  });
+
+  it('Trade button navigates to PerpsMarketDetails', () => {
+    const item = { ...baseItem, relatedAssets: [perpsOnlyAsset] };
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={item}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+      />,
+    );
+    fireEvent.press(screen.getByText('Trade'));
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
+      screen: Routes.PERPS.MARKET_DETAILS,
+      params: expect.objectContaining({
+        market: { symbol: 'xyz:TSLA', name: 'Tesla' },
+      }),
+    });
+  });
+
+  it('calls onSourcesPress with the item articles when the sources footer is pressed', () => {
+    const mockOnSourcesPress = jest.fn();
+    const article = {
+      title: 'Test article',
+      source: 'coindesk.com',
+      url: 'https://coindesk.com/test',
+      date: '2026-03-15T10:00:00.000Z',
+    };
+    const item = { ...baseItem, articles: [article] };
+
+    // Override mock so the sources footer is rendered
+    const { getUniqueSourcesByFavicon } = jest.requireMock(
+      '../../../UI/MarketInsights/utils/marketInsightsFormatting',
+    );
+    (getUniqueSourcesByFavicon as jest.Mock).mockReturnValueOnce([
+      { name: 'coindesk.com', type: 'news', url: 'https://coindesk.com' },
+    ]);
+
+    renderWithProvider(
+      <WhatsHappeningExpandedCard
+        item={item}
+        cardIndex={0}
+        cardWidth={CARD_WIDTH}
+        cardHeight={CARD_HEIGHT}
+        onSourcesPress={mockOnSourcesPress}
+      />,
+    );
+
+    fireEvent.press(screen.getByText('coindesk.com'));
+    expect(mockOnSourcesPress).toHaveBeenCalledWith([article]);
+  });
+});
diff --git a/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningExpandedCard.tsx b/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningExpandedCard.tsx
new file mode 100644
index 00000000000..10fe6ebfb3b
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningExpandedCard.tsx
@@ -0,0 +1,214 @@
+import React, { useMemo } from 'react';
+import { Pressable, ScrollView } from 'react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  FontWeight,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import type { Article, MarketInsightsSource } from '@metamask/ai-controllers';
+import type { WhatsHappeningItem } from '../../Homepage/Sections/WhatsHappening/types';
+import { strings } from '../../../../../locales/i18n';
+import {
+  getImpactLabel,
+  getImpactBackgroundClass,
+  getImpactTextColor,
+} from '../../Homepage/Sections/WhatsHappening/util/impact';
+import {
+  formatRelativeTime,
+  getUniqueSourcesByFavicon,
+} from '../../../UI/MarketInsights/utils/marketInsightsFormatting';
+import SourceLogoGroup from '../../../UI/MarketInsights/components/SourceLogoGroup';
+import PerpsRow from './PerpsRow';
+import TokenRow from './TokenRow';
+
+interface WhatsHappeningExpandedCardProps {
+  item: WhatsHappeningItem;
+  cardIndex: number;
+  cardWidth: number;
+  /** Height of the carousel container — used to give every card the same fixed height. */
+  cardHeight: number;
+  /**
+   * Called when the user taps the sources footer row. The parent is responsible
+   * for rendering the bottom sheet so it is anchored to the screen root rather
+   * than the card's positioning context.
+   */
+  onSourcesPress?: (articles: Article[]) => void;
+}
+
+const WhatsHappeningExpandedCard: React.FC<WhatsHappeningExpandedCardProps> = ({
+  item,
+  cardIndex,
+  cardWidth,
+  cardHeight,
+  onSourcesPress,
+}) => {
+  const tw = useTailwind();
+
+  const impactLabel = getImpactLabel(item.impact);
+  const impactBgClass = getImpactBackgroundClass(item.impact);
+  const impactTextColor = getImpactTextColor(item.impact);
+
+  const uniqueSources = useMemo(() => {
+    const sources: MarketInsightsSource[] = item.articles.map((article) => ({
+      name: article.source,
+      type: 'news' as const,
+      url: article.url || article.source,
+    }));
+    return getUniqueSourcesByFavicon(sources);
+  }, [item.articles]);
+
+  const sourceLabel = useMemo(() => {
+    const first = uniqueSources[0];
+    if (!first) return null;
+    const remaining = Math.max(0, uniqueSources.length - 1);
+    return remaining > 0 ? `${first.name} +${remaining}` : first.name;
+  }, [uniqueSources]);
+
+  return (
+    <Box style={{ width: cardWidth, height: cardHeight }}>
+      {/* Card surface — fills the fixed height so all cards are the same size */}
+      <Box twClassName="rounded-2xl bg-background-muted overflow-hidden flex-1">
+        {/* Scrollable main content */}
+        <ScrollView
+          showsVerticalScrollIndicator={false}
+          contentContainerStyle={tw.style('p-5 gap-4')}
+        >
+          {/* Impact badge */}
+          {item.impact && (
+            <Box twClassName={`${impactBgClass} rounded px-2 py-1 self-start`}>
+              <Text variant={TextVariant.BodySm} color={impactTextColor}>
+                {impactLabel}
+              </Text>
+            </Box>
+          )}
+
+          {/* Title */}
+          <Text
+            variant={TextVariant.HeadingLg}
+            fontWeight={FontWeight.Bold}
+            color={TextColor.TextDefault}
+          >
+            {item.title}
+          </Text>
+
+          {/* Description */}
+          {item.description && (
+            <Text
+              variant={TextVariant.BodyMd}
+              color={TextColor.TextAlternative}
+            >
+              {item.description}
+            </Text>
+          )}
+
+          {/* Tokens section */}
+          {item.relatedAssets.some((asset) => asset.caip19?.length) && (
+            <Box gap={1}>
+              <Text
+                variant={TextVariant.BodySm}
+                fontWeight={FontWeight.Medium}
+                color={TextColor.TextAlternative}
+              >
+                {strings('homepage.sections.tokens')}
+              </Text>
+
+              {item.relatedAssets
+                .filter((asset) => asset.caip19?.length)
+                .map((asset) => (
+                  <TokenRow
+                    key={asset.sourceAssetId}
+                    asset={asset}
+                    item={item}
+                    cardIndex={cardIndex}
+                  />
+                ))}
+            </Box>
+          )}
+
+          {/* Perps section — only assets that are perps-only (hlPerpsMarket set, no caip19 token) */}
+          {item.relatedAssets.some(
+            (asset) => asset.hlPerpsMarket?.length && !asset.caip19?.length,
+          ) && (
+            <Box gap={1}>
+              <Text
+                variant={TextVariant.BodySm}
+                fontWeight={FontWeight.Medium}
+                color={TextColor.TextAlternative}
+              >
+                {strings('homepage.sections.perps')}
+              </Text>
+
+              {item.relatedAssets
+                .filter(
+                  (asset) =>
+                    asset.hlPerpsMarket?.length && !asset.caip19?.length,
+                )
+                .map((asset) => (
+                  <PerpsRow
+                    key={`perp-${asset.sourceAssetId}`}
+                    asset={asset}
+                    item={item}
+                    cardIndex={cardIndex}
+                  />
+                ))}
+            </Box>
+          )}
+        </ScrollView>
+
+        {/* Fixed sources footer — always pinned to the bottom of the card */}
+        {uniqueSources.length > 0 && (
+          <Box twClassName="px-5 pb-5" gap={4}>
+            <Box twClassName="h-px bg-border-muted" />
+
+            <Pressable
+              onPress={() => onSourcesPress?.(item.articles)}
+              accessibilityRole="button"
+            >
+              {({ pressed }) => (
+                <Box
+                  flexDirection={BoxFlexDirection.Row}
+                  alignItems={BoxAlignItems.Center}
+                  justifyContent={BoxJustifyContent.Between}
+                  twClassName={pressed ? 'opacity-60' : ''}
+                >
+                  <Box
+                    flexDirection={BoxFlexDirection.Row}
+                    alignItems={BoxAlignItems.Center}
+                    gap={2}
+                  >
+                    <SourceLogoGroup sources={uniqueSources} />
+                    {sourceLabel ? (
+                      <Text
+                        variant={TextVariant.BodySm}
+                        color={TextColor.TextAlternative}
+                      >
+                        {sourceLabel}
+                      </Text>
+                    ) : null}
+                  </Box>
+
+                  {item.date ? (
+                    <Text
+                      variant={TextVariant.BodySm}
+                      color={TextColor.TextAlternative}
+                    >
+                      {formatRelativeTime(item.date, { nowLabel: 'now' })}
+                    </Text>
+                  ) : null}
+                </Box>
+              )}
+            </Pressable>
+          </Box>
+        )}
+      </Box>
+    </Box>
+  );
+};
+
+export default WhatsHappeningExpandedCard;
diff --git a/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningSourcesBottomSheet.test.tsx b/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningSourcesBottomSheet.test.tsx
new file mode 100644
index 00000000000..9be1cf1efa9
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningSourcesBottomSheet.test.tsx
@@ -0,0 +1,216 @@
+import React from 'react';
+import { Linking } from 'react-native';
+import { screen, fireEvent } from '@testing-library/react-native';
+import renderWithProvider from '../../../../util/test/renderWithProvider';
+import WhatsHappeningSourcesBottomSheet from './WhatsHappeningSourcesBottomSheet';
+import type { WhatsHappeningItem } from '../../Homepage/Sections/WhatsHappening/types';
+import { MetaMetricsEvents } from '../../../../core/Analytics/MetaMetrics.events';
+
+const mockTrackEvent = jest.fn();
+const mockCreateEventBuilder = jest.fn((eventName: string) => ({
+  addProperties: jest.fn((properties: Record<string, unknown>) => ({
+    build: jest.fn(() => ({ category: eventName, properties })),
+  })),
+  build: jest.fn(() => ({ category: eventName })),
+}));
+
+jest.mock('../../../hooks/useAnalytics/useAnalytics', () => ({
+  useAnalytics: () => ({
+    trackEvent: mockTrackEvent,
+    createEventBuilder: mockCreateEventBuilder,
+  }),
+}));
+
+jest.mock(
+  '../../../../component-library/components/BottomSheets/BottomSheet',
+  () => {
+    const ReactLib = jest.requireActual('react');
+    const { View: MockView } = jest.requireActual('react-native');
+
+    return ReactLib.forwardRef(
+      (
+        { children }: { children: React.ReactNode },
+        ref: React.Ref<{
+          onOpenBottomSheet: () => void;
+          onCloseBottomSheet: () => void;
+        }>,
+      ) => {
+        ReactLib.useImperativeHandle(ref, () => ({
+          onOpenBottomSheet: jest.fn(),
+          onCloseBottomSheet: jest.fn(),
+        }));
+        return <MockView testID="mock-bottom-sheet">{children}</MockView>;
+      },
+    );
+  },
+);
+
+jest.mock(
+  '../../../../component-library/components/BottomSheets/BottomSheetHeader',
+  () => {
+    const { View: MockView } = jest.requireActual('react-native');
+    return ({ children }: { children: React.ReactNode }) => (
+      <MockView testID="mock-bottom-sheet-header">{children}</MockView>
+    );
+  },
+);
+
+jest.mock('../../../UI/MarketInsights/utils/marketInsightsFormatting', () => ({
+  isSafeUrl: jest.fn(() => true),
+  formatRelativeTime: jest.fn(() => '2h ago'),
+  getFaviconUrl: jest.fn((url: string) => `https://favicon/${url}`),
+}));
+
+const mockOpenURL = jest.spyOn(Linking, 'openURL').mockResolvedValue(undefined);
+const mockIsSafeUrl = jest.requireMock(
+  '../../../UI/MarketInsights/utils/marketInsightsFormatting',
+).isSafeUrl;
+
+const articles = [
+  {
+    title: 'Fed pauses rate hikes',
+    url: 'https://coindesk.com/fed-pauses',
+    source: 'coindesk.com',
+    date: '2026-03-15T10:00:00.000Z',
+  },
+  {
+    title: 'Bitcoin ETF sees record inflows',
+    url: 'https://cointelegraph.com/btc-etf',
+    source: 'cointelegraph.com',
+    date: '2026-03-15T09:00:00.000Z',
+  },
+];
+
+const mockItem: WhatsHappeningItem = {
+  id: 'trend-7',
+  title: 'Fed pauses rates',
+  description: '...',
+  date: '2026-03-15T10:00:00.000Z',
+  category: 'macro',
+  impact: 'positive',
+  relatedAssets: [
+    {
+      sourceAssetId: 'btc',
+      symbol: 'BTC',
+      name: 'Bitcoin',
+      caip19: ['eip155:1/slip44:0'],
+    },
+  ],
+  articles: articles as never,
+};
+
+describe('WhatsHappeningSourcesBottomSheet', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockIsSafeUrl.mockReturnValue(true);
+  });
+
+  it('renders one row per article', () => {
+    renderWithProvider(
+      <WhatsHappeningSourcesBottomSheet
+        onClose={jest.fn()}
+        articles={articles as never}
+        item={mockItem}
+        cardIndex={0}
+      />,
+    );
+    expect(screen.getByText('coindesk.com')).toBeOnTheScreen();
+    expect(screen.getByText('cointelegraph.com')).toBeOnTheScreen();
+  });
+
+  it('opens the article URL when a row is pressed and URL is safe', () => {
+    renderWithProvider(
+      <WhatsHappeningSourcesBottomSheet
+        onClose={jest.fn()}
+        articles={articles as never}
+        item={mockItem}
+        cardIndex={0}
+      />,
+    );
+    fireEvent.press(screen.getByText('coindesk.com'));
+    expect(mockOpenURL).toHaveBeenCalledWith('https://coindesk.com/fed-pauses');
+  });
+
+  it('does not open the URL when isSafeUrl returns false', () => {
+    mockIsSafeUrl.mockReturnValue(false);
+    renderWithProvider(
+      <WhatsHappeningSourcesBottomSheet
+        onClose={jest.fn()}
+        articles={articles as never}
+        item={mockItem}
+        cardIndex={0}
+      />,
+    );
+    fireEvent.press(screen.getByText('coindesk.com'));
+    expect(mockOpenURL).not.toHaveBeenCalled();
+  });
+
+  it('renders the sheet title', () => {
+    renderWithProvider(
+      <WhatsHappeningSourcesBottomSheet
+        onClose={jest.fn()}
+        articles={articles as never}
+        item={mockItem}
+        cardIndex={0}
+      />,
+    );
+    expect(screen.getByText('News sources')).toBeOnTheScreen();
+  });
+
+  it('renders no article rows when articles array is empty', () => {
+    renderWithProvider(
+      <WhatsHappeningSourcesBottomSheet
+        onClose={jest.fn()}
+        articles={[]}
+        item={mockItem}
+        cardIndex={0}
+      />,
+    );
+    expect(screen.queryByText('coindesk.com')).toBeNull();
+  });
+
+  it('tracks Whats Happening Interaction (source_click) with the article URL on row press', () => {
+    renderWithProvider(
+      <WhatsHappeningSourcesBottomSheet
+        onClose={jest.fn()}
+        articles={articles as never}
+        item={mockItem}
+        cardIndex={3}
+      />,
+    );
+    fireEvent.press(screen.getByText('coindesk.com'));
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.WHATS_HAPPENING_INTERACTION,
+    );
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        category: MetaMetricsEvents.WHATS_HAPPENING_INTERACTION,
+        properties: expect.objectContaining({
+          interaction_type: 'source_click',
+          source: 'https://coindesk.com/fed-pauses',
+          event_id: 'trend-7',
+          card_index: 3,
+          category: 'macro',
+          impact: 'positive',
+          asset_symbols: ['BTC'],
+        }),
+      }),
+    );
+  });
+
+  it('still tracks the source_click interaction even when the URL is unsafe', () => {
+    mockIsSafeUrl.mockReturnValue(false);
+    renderWithProvider(
+      <WhatsHappeningSourcesBottomSheet
+        onClose={jest.fn()}
+        articles={articles as never}
+        item={mockItem}
+        cardIndex={0}
+      />,
+    );
+    fireEvent.press(screen.getByText('coindesk.com'));
+    expect(mockCreateEventBuilder).toHaveBeenCalledWith(
+      MetaMetricsEvents.WHATS_HAPPENING_INTERACTION,
+    );
+  });
+});
diff --git a/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningSourcesBottomSheet.tsx b/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningSourcesBottomSheet.tsx
new file mode 100644
index 00000000000..d9c2561cd6c
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningSourcesBottomSheet.tsx
@@ -0,0 +1,86 @@
+import React, { useCallback, useRef } from 'react';
+import { Linking } from 'react-native';
+import { ScrollView } from 'react-native-gesture-handler';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import {
+  FontWeight,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import type { Article } from '@metamask/ai-controllers';
+import BottomSheet, {
+  BottomSheetRef,
+} from '../../../../component-library/components/BottomSheets/BottomSheet';
+import BottomSheetHeader from '../../../../component-library/components/BottomSheets/BottomSheetHeader';
+import { strings } from '../../../../../locales/i18n';
+import ArticleRow from '../../../UI/MarketInsights/components/ArticleRow';
+import { isSafeUrl } from '../../../UI/MarketInsights/utils/marketInsightsFormatting';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
+import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
+import { WhatsHappeningInteractionType } from '../../Homepage/Sections/WhatsHappening/constants';
+import { getWhatsHappeningEventProps } from '../../Homepage/Sections/WhatsHappening/eventProperties';
+import type { WhatsHappeningItem } from '../../Homepage/Sections/WhatsHappening/types';
+
+interface WhatsHappeningSourcesBottomSheetProps {
+  onClose: () => void;
+  articles: Article[];
+  item: WhatsHappeningItem;
+  cardIndex: number;
+}
+
+const WhatsHappeningSourcesBottomSheet: React.FC<
+  WhatsHappeningSourcesBottomSheetProps
+> = ({ onClose, articles, item, cardIndex }) => {
+  const tw = useTailwind();
+  const bottomSheetRef = useRef<BottomSheetRef>(null);
+  const { trackEvent, createEventBuilder } = useAnalytics();
+
+  const handleSourcePress = useCallback(
+    (url: string) => {
+      trackEvent(
+        createEventBuilder(MetaMetricsEvents.WHATS_HAPPENING_INTERACTION)
+          .addProperties({
+            ...getWhatsHappeningEventProps(item, cardIndex),
+            interaction_type: WhatsHappeningInteractionType.SourceClick,
+            source: url,
+          })
+          .build(),
+      );
+      if (isSafeUrl(url)) {
+        Linking.openURL(url);
+      }
+    },
+    [item, cardIndex, trackEvent, createEventBuilder],
+  );
+
+  return (
+    <BottomSheet
+      ref={bottomSheetRef}
+      shouldNavigateBack={false}
+      onClose={onClose}
+    >
+      <BottomSheetHeader onClose={onClose}>
+        <Text variant={TextVariant.HeadingSm} fontWeight={FontWeight.Bold}>
+          {strings('market_insights.sources_title')}
+        </Text>
+      </BottomSheetHeader>
+
+      <ScrollView
+        style={tw.style('px-4')}
+        contentContainerStyle={tw.style('pb-12')}
+        showsVerticalScrollIndicator={false}
+      >
+        {articles.map((article, index) => (
+          <ArticleRow
+            key={article.url}
+            article={article}
+            onPress={handleSourcePress}
+            isLastItem={index === articles.length - 1}
+          />
+        ))}
+      </ScrollView>
+    </BottomSheet>
+  );
+};
+
+export default WhatsHappeningSourcesBottomSheet;
diff --git a/app/components/Views/WhatsHappeningDetailView/components/index.ts b/app/components/Views/WhatsHappeningDetailView/components/index.ts
new file mode 100644
index 00000000000..fbcca56e40d
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/components/index.ts
@@ -0,0 +1,2 @@
+export { default as WhatsHappeningExpandedCard } from './WhatsHappeningExpandedCard';
+export { default as PageIndicator } from './PageIndicator';
diff --git a/app/components/Views/WhatsHappeningDetailView/hooks/useTradeNavigation.ts b/app/components/Views/WhatsHappeningDetailView/hooks/useTradeNavigation.ts
new file mode 100644
index 00000000000..10fb8ed034c
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/hooks/useTradeNavigation.ts
@@ -0,0 +1,39 @@
+import { useCallback } from 'react';
+import { useNavigation, NavigationProp } from '@react-navigation/native';
+import { PERPS_EVENT_VALUE } from '@metamask/perps-controller';
+import type { RelatedAsset } from '@metamask/ai-controllers';
+import type { PerpsNavigationParamList } from '../../../UI/Perps/types/navigation';
+import Routes from '../../../../constants/navigation/Routes';
+
+interface UseTradeNavigationResult {
+  /** Navigate to the Perps market details view. No-op when `canTrade` is false. */
+  handleTrade: () => void;
+  /** True when the asset has at least one `hlPerpsMarket` entry. */
+  canTrade: boolean;
+}
+
+/**
+ * Provides a stable `handleTrade` callback and a `canTrade` flag for an asset.
+ * `handleTrade` is always a valid function — it is a no-op when the asset has
+ * no `hlPerpsMarket` entry. Use `canTrade` to decide whether to show a Trade
+ * button at all.
+ */
+const useTradeNavigation = (asset: RelatedAsset): UseTradeNavigationResult => {
+  const navigation = useNavigation<NavigationProp<PerpsNavigationParamList>>();
+  const hlPerpsMarket = asset.hlPerpsMarket?.[0];
+
+  const handleTrade = useCallback(() => {
+    if (!hlPerpsMarket) return;
+    navigation.navigate(Routes.PERPS.ROOT, {
+      screen: Routes.PERPS.MARKET_DETAILS,
+      params: {
+        market: { symbol: hlPerpsMarket, name: asset.name },
+        source: PERPS_EVENT_VALUE.SOURCE.HOME_SECTION,
+      },
+    });
+  }, [navigation, hlPerpsMarket, asset.name]);
+
+  return { handleTrade, canTrade: Boolean(hlPerpsMarket) };
+};
+
+export default useTradeNavigation;
diff --git a/app/components/Views/WhatsHappeningDetailView/index.ts b/app/components/Views/WhatsHappeningDetailView/index.ts
new file mode 100644
index 00000000000..b105def8161
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/index.ts
@@ -0,0 +1 @@
+export { default } from './WhatsHappeningDetailView';
diff --git a/app/components/Views/WhatsHappeningDetailView/utils/getRelatedAssetImageSource.test.ts b/app/components/Views/WhatsHappeningDetailView/utils/getRelatedAssetImageSource.test.ts
new file mode 100644
index 00000000000..4a47ffb81fd
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/utils/getRelatedAssetImageSource.test.ts
@@ -0,0 +1,152 @@
+import { getRelatedAssetImageSource } from './getRelatedAssetImageSource';
+
+// Mock image requires as numbers (React Native bundler assigns numbers to require() results)
+jest.mock('../../../../images/image-icons', () => ({
+  __esModule: true,
+  default: {
+    BTC: 100,
+    ETH: 123,
+    TRX: 456,
+    SOL: 789,
+    SVG_ICON: () => null,
+    STRING_ICON: 'string-path',
+  },
+}));
+
+const PERPS_ICONS_BASE =
+  'https://raw.githubusercontent.com/MetaMask/metamask-perps-assets/main/icons/';
+
+jest.mock('../../../UI/Perps/utils/marketUtils', () => ({
+  getAssetIconUrls: jest.fn((symbol: string) => {
+    if (!symbol) return null;
+    if (symbol.includes(':')) {
+      const [dex, assetSymbol] = symbol.split(':');
+      return {
+        primary: `${PERPS_ICONS_BASE}hip3:${dex.toLowerCase()}_${assetSymbol.toUpperCase()}.svg`,
+        fallback: `${PERPS_ICONS_BASE}${dex.toLowerCase()}:${assetSymbol.toUpperCase()}.svg`,
+      };
+    }
+    return {
+      primary: `${PERPS_ICONS_BASE}${symbol.toUpperCase()}.svg`,
+      fallback: `${PERPS_ICONS_BASE}${symbol.toUpperCase()}.svg`,
+    };
+  }),
+}));
+
+jest.mock(
+  '../../../UI/Perps/components/PerpsTokenLogo/PerpsAssetBgConfig',
+  () => ({
+    K_PREFIX_ASSETS: new Set(['KPEPE', 'KBONK']),
+  }),
+);
+
+describe('getRelatedAssetImageSource', () => {
+  describe('CAIP-19 path (highest priority — regular crypto tokens)', () => {
+    it('uses bundled icon when symbol matches image-icons', () => {
+      const result = getRelatedAssetImageSource({
+        name: 'Ethereum',
+        symbol: 'ETH',
+        caip19: ['eip155:1/slip44:60'],
+        sourceAssetId: 'ethereum',
+        hlPerpsMarket: ['ETH'], // present but must NOT trigger Perps SVG path
+      });
+
+      expect(result).toBe(123);
+      expect(typeof result).toBe('number'); // bundled PNG, not an SVG URI object
+    });
+
+    it('ignores hlPerpsMarket when caip19 is populated', () => {
+      // BTC has hlPerpsMarket but also has caip19 — must use CAIP-19 path
+      const result = getRelatedAssetImageSource({
+        name: 'Bitcoin',
+        symbol: 'BTC',
+        caip19: ['bip122:000000000019d6689c085ae165831e93/slip44:0'],
+        sourceAssetId: 'bitcoin',
+        hlPerpsMarket: ['BTC'],
+      });
+
+      // Bundled BTC icon, not a Perps SVG URI
+      expect(result).toBe(100);
+      expect(typeof result).toBe('number');
+    });
+
+    it('returns wallet CDN URI when symbol has no bundled icon', () => {
+      const result = getRelatedAssetImageSource({
+        name: 'Some Token',
+        symbol: 'UNKNOWN',
+        caip19: ['eip155:1/erc20:0xABCDEF'],
+        sourceAssetId: 'some-token',
+      });
+
+      expect(result).toEqual({
+        uri: expect.stringContaining('static.cx.metamask.io'),
+      });
+    });
+  });
+
+  describe('Perps path via hlPerpsMarket (only when caip19 is empty)', () => {
+    it('uses Perps primary SVG for a plain HL market id', () => {
+      // Hypothetical BTC with no caip19 (purely Perps context)
+      const result = getRelatedAssetImageSource({
+        name: 'Bitcoin',
+        symbol: 'BTC',
+        caip19: [],
+        sourceAssetId: 'bitcoin',
+        hlPerpsMarket: ['BTC'],
+      });
+
+      expect(result).toEqual({ uri: `${PERPS_ICONS_BASE}BTC.svg` });
+    });
+
+    it('uses Perps primary SVG for HIP-3 synthetic asset (xyz:TSLA format)', () => {
+      const result = getRelatedAssetImageSource({
+        name: 'Tesla',
+        symbol: 'TSLA',
+        caip19: [],
+        sourceAssetId: 'tsla',
+        hlPerpsMarket: ['xyz:TSLA'],
+      });
+
+      expect(result).toEqual({
+        uri: `${PERPS_ICONS_BASE}hip3:xyz_TSLA.svg`,
+      });
+    });
+
+    it('skips Perps path when caip19 is populated even if hlPerpsMarket is set', () => {
+      const result = getRelatedAssetImageSource({
+        name: 'Ethereum',
+        symbol: 'ETH',
+        caip19: ['eip155:1/slip44:60'],
+        sourceAssetId: 'ethereum',
+        hlPerpsMarket: ['ETH'],
+      });
+
+      // Must be bundled PNG, not SVG URI
+      expect(typeof result).toBe('number');
+    });
+  });
+
+  describe('symbol-only fallback', () => {
+    it('returns bundled icon by symbol when caip19 is empty and no hlPerpsMarket', () => {
+      const result = getRelatedAssetImageSource({
+        name: 'Ethereum',
+        symbol: 'ETH',
+        caip19: [],
+        sourceAssetId: 'ethereum',
+      });
+
+      expect(result).toBe(123);
+    });
+
+    it('returns undefined when no caip19, no hlPerpsMarket, and unknown symbol', () => {
+      const result = getRelatedAssetImageSource({
+        name: 'Some Token',
+        symbol: 'UNKNOWN',
+        caip19: [],
+        sourceAssetId: 'some-token',
+      });
+
+      expect(result).toBeUndefined();
+    });
+  });
+});
diff --git a/app/components/Views/WhatsHappeningDetailView/utils/getRelatedAssetImageSource.ts b/app/components/Views/WhatsHappeningDetailView/utils/getRelatedAssetImageSource.ts
new file mode 100644
index 00000000000..ff652ffd33b
--- /dev/null
+++ b/app/components/Views/WhatsHappeningDetailView/utils/getRelatedAssetImageSource.ts
@@ -0,0 +1,49 @@
+import type { RelatedAsset } from '@metamask/ai-controllers';
+import { isNonEvmChainId } from '@metamask/bridge-controller';
+import { CaipAssetType, parseCaipAssetType } from '@metamask/utils';
+import type { ImageSourcePropType } from 'react-native';
+import { getTokenIconUrl, getTokenImageSource } from '../../../UI/Bridge/utils';
+import { getAssetIconUrls } from '../../../UI/Perps/utils/marketUtils';
+import { K_PREFIX_ASSETS } from '../../../UI/Perps/components/PerpsTokenLogo/PerpsAssetBgConfig';
+
+/**
+ * Image source for a market-overview `RelatedAsset`.
+ *
+ * Resolution order: CAIP-19 wallet CDN + bundled PNG (regular crypto tokens) →
+ * Perps SVG via `hlPerpsMarket` when `caip19` is empty (synthetic-only assets
+ * like `xyz:TSLA`) → bundled icon by symbol.
+ *
+ * `hlPerpsMarket` is NOT consulted when `caip19` is populated because regular
+ * crypto tokens (BTC, ETH) carry it too, and Perps CDN only serves SVGs that
+ * `AvatarToken` cannot render remotely.
+ */
+export const getRelatedAssetImageSource = (
+  asset: RelatedAsset,
+): ImageSourcePropType | undefined => {
+  // 1. Wallet CDN via CAIP-19 (PNG — works with AvatarToken)
+  const firstCaip = asset.caip19?.[0];
+  if (firstCaip) {
+    try {
+      const { chainId } = parseCaipAssetType(firstCaip as CaipAssetType);
+      const cdnUrl = getTokenIconUrl(
+        firstCaip as CaipAssetType,
+        isNonEvmChainId(chainId),
+      );
+      return getTokenImageSource(asset.symbol, cdnUrl);
+    } catch {
+      // Invalid or unsupported CAIP-19 string — fall through
+    }
+  }
+
+  // 2. Perps SVG for assets with no CAIP-19 (e.g. xyz:TSLA via hlPerpsMarket)
+  const firstHlPerpsMarket = asset.hlPerpsMarket?.[0];
+  if (firstHlPerpsMarket && !asset.caip19?.length) {
+    const urls = getAssetIconUrls(firstHlPerpsMarket, K_PREFIX_ASSETS);
+    if (urls) {
+      return { uri: urls.primary };
+    }
+  }
+
+  // 3. Bundled icons only (symbol lookup)
+  return getTokenImageSource(asset.symbol, undefined);
+};
diff --git a/app/components/Views/confirmations/ConfirmationView.testIds.ts b/app/components/Views/confirmations/ConfirmationView.testIds.ts
index 2b147feb4bc..eedd5f5a585 100644
--- a/app/components/Views/confirmations/ConfirmationView.testIds.ts
+++ b/app/components/Views/confirmations/ConfirmationView.testIds.ts
@@ -55,6 +55,10 @@ export const ConfirmationFooterSelectorIDs = {
   CONFIRM_BUTTON: 'confirm-button',
 } as const;
 
+export const ConfirmationLoaderSelectorIDs = {
+  TRANSFER: 'confirm-loader-transfer',
+} as const;
+
 export const ConfirmAlertModalSelectorsIDs = {
   CONFIRM_ALERT_CHECKBOX: 'confirm-alert-checkbox',
   CONFIRM_ALERT_BUTTON: 'confirm-alert-confirm-button',
diff --git a/app/components/Views/confirmations/__mocks__/controllers/other-controllers-mock.ts b/app/components/Views/confirmations/__mocks__/controllers/other-controllers-mock.ts
index b70878397ea..a420d225105 100644
--- a/app/components/Views/confirmations/__mocks__/controllers/other-controllers-mock.ts
+++ b/app/components/Views/confirmations/__mocks__/controllers/other-controllers-mock.ts
@@ -234,6 +234,16 @@ export const gasFeeControllerMock = {
   },
 };
 
+export const moneyAccountControllerMock = {
+  engine: {
+    backgroundState: {
+      MoneyAccountController: {
+        moneyAccounts: {},
+      },
+    },
+  },
+};
+
 export const predictControllerMock = {
   engine: {
     backgroundState: {
@@ -400,5 +410,6 @@ export const otherControllersMock = merge(
   tokenRatesControllerMock,
   tokensControllerMock,
   gasFeeControllerMock,
+  moneyAccountControllerMock,
   predictControllerMock,
 );
diff --git a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.styles.ts b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.styles.ts
index 8ead9380d40..cd8bedab1ee 100644
--- a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.styles.ts
+++ b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.styles.ts
@@ -8,8 +8,6 @@ const stylesheet = (params: { theme: Theme }) => {
     container: {
       paddingVertical: 12,
       paddingHorizontal: 8,
-      borderBottomWidth: 1,
-      borderBottomColor: theme.colors.border.muted,
     },
     row: {
       flexDirection: 'row',
@@ -22,18 +20,14 @@ const stylesheet = (params: { theme: Theme }) => {
       gap: 8,
       flexShrink: 1,
     },
-    modalContainer: {
+    /** Full-screen wrapper for transparent Modal so BottomSheet can fill the window. */
+    modalRoot: {
       flex: 1,
-      backgroundColor: theme.colors.background.default,
     },
-    modalHeader: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      justifyContent: 'space-between',
-      paddingHorizontal: 16,
-      paddingVertical: 12,
-      borderBottomWidth: 1,
-      borderBottomColor: theme.colors.border.muted,
+    /** Lets the account list consume remaining height under HeaderCompactStandard inside BottomSheet. */
+    modalSheetBody: {
+      flex: 1,
+      minHeight: 0,
     },
     accountText: {
       flexShrink: 1,
diff --git a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.test.tsx b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.test.tsx
index 3461f6548d1..43581356c67 100644
--- a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.test.tsx
+++ b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.test.tsx
@@ -22,7 +22,9 @@ jest.mock('../../../../../component-library/hooks', () => ({
 }));
 
 jest.mock('@metamask/design-system-react-native', () => {
-  const { Text: RNText } = jest.requireActual('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
@@ -39,7 +41,34 @@ jest.mock('@metamask/design-system-react-native', () => {
     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 {
+    BottomSheet: MockBottomSheet,
     Text: MockText,
     Skeleton: MockSkeleton,
     TextVariant: { BodyMd: 'BodyMd', HeadingMd: 'HeadingMd' },
@@ -70,6 +99,19 @@ jest.mock('../../../../../component-library/components/Icons/Icon', () => {
   };
 });
 
+jest.mock(
+  '../../../../../component-library/components-temp/HeaderCompactStandard',
+  () => {
+    const { View, Text, Pressable } = jest.requireActual('react-native');
+    return ({ title, onClose }: { title: string; onClose?: () => void }) => (
+      <View testID="account-selector-modal-header">
+        <Text>{title}</Text>
+        <Pressable accessibilityRole="button" onPress={onClose} />
+      </View>
+    );
+  },
+);
+
 jest.mock('react-native', () => {
   const RN = jest.requireActual('react-native');
   const { View } = RN;
@@ -85,14 +127,12 @@ jest.mock('react-native', () => {
       testID?: string;
       animationType?: string;
       presentationStyle?: string;
+      transparent?: boolean;
       onRequestClose?: () => void;
     }) => {
       if (!visible) return null;
       return <View testID={testID}>{children}</View>;
     },
-    SafeAreaView: ({ children }: { children: React.ReactNode }) => (
-      <View>{children}</View>
-    ),
   };
 });
 
@@ -243,6 +283,9 @@ describe('AccountSelector', () => {
     fireEvent.press(getByTestId(ACCOUNT_SELECTOR_TEST_IDS.PILL));
 
     expect(getByTestId(ACCOUNT_SELECTOR_TEST_IDS.MODAL)).toBeOnTheScreen();
+    expect(
+      getByTestId(ACCOUNT_SELECTOR_TEST_IDS.BOTTOM_SHEET),
+    ).toBeOnTheScreen();
   });
 
   it('calls onAccountSelected with correct address when account is selected', () => {
@@ -278,6 +321,19 @@ describe('AccountSelector', () => {
     expect(getByText('From')).toBeOnTheScreen();
     expect(queryByText('confirm.label.to')).toBeNull();
   });
+
+  it('uses custom selector title in the sheet header when provided', () => {
+    const { getByTestId, getByText } = render(
+      <AccountSelector
+        onAccountSelected={mockOnAccountSelected}
+        selectorTitle="Custom sheet title"
+      />,
+    );
+
+    fireEvent.press(getByTestId(ACCOUNT_SELECTOR_TEST_IDS.PILL));
+
+    expect(getByText('Custom sheet title')).toBeOnTheScreen();
+  });
 });
 
 describe('AccountSelectorSkeleton', () => {
diff --git a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.tsx b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.tsx
index 45da93b1a28..019b347e374 100644
--- a/app/components/Views/confirmations/components/AccountSelector/AccountSelector.tsx
+++ b/app/components/Views/confirmations/components/AccountSelector/AccountSelector.tsx
@@ -1,6 +1,11 @@
-import React, { useCallback, useMemo, useState } from 'react';
-import { Modal, TouchableOpacity, View } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
+import {
+  Modal,
+  StyleProp,
+  TouchableOpacity,
+  View,
+  ViewStyle,
+} from 'react-native';
 import { AccountGroupObject } from '@metamask/account-tree-controller';
 import { AccountId } from '@metamask/accounts-controller';
 import { EthScope } from '@metamask/keyring-api';
@@ -15,6 +20,8 @@ import Icon, {
   IconSize,
 } from '../../../../../component-library/components/Icons/Icon';
 import {
+  BottomSheet,
+  BottomSheetRef,
   Skeleton,
   Text,
   TextColor,
@@ -22,6 +29,7 @@ import {
 } from '@metamask/design-system-react-native';
 import MultichainAccountSelectorList from '../../../../../component-library/components-temp/MultichainAccounts/MultichainAccountSelectorList/MultichainAccountSelectorList';
 import { AccountSection } from '../../../../../component-library/components-temp/MultichainAccounts/MultichainAccountSelectorList/MultichainAccountSelectorList.types';
+import HeaderCompactStandard from '../../../../../component-library/components-temp/HeaderCompactStandard';
 import { useStyles } from '../../../../../component-library/hooks/useStyles';
 import { strings } from '../../../../../../locales/i18n';
 import { selectInternalAccountsById } from '../../../../../selectors/accountsController';
@@ -35,6 +43,8 @@ import stylesheet from './AccountSelector.styles';
 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',
 };
 
 export interface AccountSelectorProps {
@@ -42,16 +52,22 @@ export interface AccountSelectorProps {
   onAccountSelected: (address: string) => void;
   /** Label shown on the left side of the row. Defaults to the "To" i18n string. */
   label?: string;
+  /** Title in the account selection bottom sheet (header). */
+  selectorTitle?: string;
+  style?: StyleProp<ViewStyle>;
 }
 
 const AccountSelector: React.FC<AccountSelectorProps> = ({
   selectedAddress,
   onAccountSelected,
   label = strings('confirm.label.to'),
+  selectorTitle = strings('bridge.select_recipient'),
+  style,
 }) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
+  const bottomSheetRef = useRef<BottomSheetRef>(null);
 
-  const { styles, theme } = useStyles(stylesheet, {});
+  const { styles } = useStyles(stylesheet, {});
 
   const internalAccountsById = useSelector(selectInternalAccountsById);
   const accountToGroupMap = useSelector(selectAccountToGroupMap);
@@ -64,6 +80,20 @@ const AccountSelector: React.FC<AccountSelectorProps> = ({
     [internalAccountsById],
   );
 
+  const openModal = useCallback(() => setIsModalVisible(true), []);
+
+  const closeAccountSheet = useCallback(() => {
+    bottomSheetRef.current?.onCloseBottomSheet();
+  }, []);
+
+  const handleSheetClosed = useCallback(() => {
+    setIsModalVisible(false);
+  }, []);
+
+  const handleModalRequestClose = useCallback(() => {
+    closeAccountSheet();
+  }, [closeAccountSheet]);
+
   const handleSelectAccount = useCallback(
     (accountGroup: AccountGroupObject) => {
       const internalAccountId = accountGroup.accounts.find((accountId) =>
@@ -72,10 +102,15 @@ const AccountSelector: React.FC<AccountSelectorProps> = ({
       if (internalAccountId) {
         const internalAccount = internalAccountsById[internalAccountId];
         onAccountSelected(internalAccount.address);
-        setIsModalVisible(false);
+        closeAccountSheet();
       }
     },
-    [getIsAccountSupported, internalAccountsById, onAccountSelected],
+    [
+      closeAccountSheet,
+      getIsAccountSupported,
+      internalAccountsById,
+      onAccountSelected,
+    ],
   );
 
   const filteredAccountSections = useMemo(() => {
@@ -116,11 +151,8 @@ const AccountSelector: React.FC<AccountSelectorProps> = ({
 
   const accountName = selectedAccountGroup?.metadata?.name;
 
-  const openModal = useCallback(() => setIsModalVisible(true), []);
-  const closeModal = useCallback(() => setIsModalVisible(false), []);
-
   return (
-    <View style={styles.container}>
+    <View style={[styles.container, style]}>
       <TouchableOpacity
         onPress={openModal}
         style={styles.row}
@@ -164,34 +196,37 @@ const AccountSelector: React.FC<AccountSelectorProps> = ({
       </TouchableOpacity>
       <Modal
         visible={isModalVisible}
-        animationType="slide"
-        presentationStyle="pageSheet"
-        onRequestClose={closeModal}
+        animationType="none"
+        transparent
+        presentationStyle="overFullScreen"
+        onRequestClose={handleModalRequestClose}
         testID={ACCOUNT_SELECTOR_TEST_IDS.MODAL}
       >
-        <SafeAreaView style={styles.modalContainer}>
-          <View style={styles.modalHeader}>
-            <Text variant={TextVariant.HeadingMd}>
-              {strings('bridge.select_recipient')}
-            </Text>
-            <TouchableOpacity onPress={closeModal}>
-              <Icon
-                name={IconName.Close}
-                size={IconSize.Md}
-                color={theme.colors.icon.default}
+        <View style={styles.modalRoot}>
+          <BottomSheet
+            testID={ACCOUNT_SELECTOR_TEST_IDS.BOTTOM_SHEET}
+            ref={bottomSheetRef}
+            isFullscreen
+            keyboardAvoidingViewEnabled={false}
+            onClose={handleSheetClosed}
+          >
+            <HeaderCompactStandard
+              title={selectorTitle}
+              onClose={() => closeAccountSheet()}
+            />
+            <View style={styles.modalSheetBody}>
+              <MultichainAccountSelectorList
+                selectedAccountGroups={
+                  selectedAccountGroup ? [selectedAccountGroup] : []
+                }
+                showFooter={false}
+                onSelectAccount={handleSelectAccount}
+                accountSections={filteredAccountSections}
+                hideAccountCellMenu
               />
-            </TouchableOpacity>
-          </View>
-          <MultichainAccountSelectorList
-            selectedAccountGroups={
-              selectedAccountGroup ? [selectedAccountGroup] : []
-            }
-            showFooter={false}
-            onSelectAccount={handleSelectAccount}
-            accountSections={filteredAccountSections}
-            hideAccountCellMenu
-          />
-        </SafeAreaView>
+            </View>
+          </BottomSheet>
+        </View>
       </Modal>
     </View>
   );
diff --git a/app/components/Views/confirmations/components/PayAccountSelector/PayAccountSelector.tsx b/app/components/Views/confirmations/components/PayAccountSelector/PayAccountSelector.tsx
index 28e85610229..7c5327ce551 100644
--- a/app/components/Views/confirmations/components/PayAccountSelector/PayAccountSelector.tsx
+++ b/app/components/Views/confirmations/components/PayAccountSelector/PayAccountSelector.tsx
@@ -1,4 +1,5 @@
 import React, { useCallback } from 'react';
+import { StyleProp, ViewStyle } from 'react-native';
 import { TransactionType } from '@metamask/transaction-controller';
 import { Hex } from '@metamask/utils';
 
@@ -9,7 +10,9 @@ import { useTransactionAccountOverride } from '../../hooks/transactions/useTrans
 import { hasTransactionType } from '../../utils/transaction';
 import AccountSelector from '../AccountSelector';
 
-const PayAccountSelector: React.FC = () => {
+const PayAccountSelector: React.FC<{ style?: StyleProp<ViewStyle> }> = ({
+  style,
+}) => {
   const transactionMeta = useTransactionMetadataRequest();
   const transactionId = transactionMeta?.id;
   const accountOverride = useTransactionAccountOverride();
@@ -43,11 +46,17 @@ const PayAccountSelector: React.FC = () => {
     ? strings('confirm.label.from')
     : undefined;
 
+  const selectorTitle = isMoneyAccountDeposit
+    ? strings('bridge.select_account')
+    : strings('bridge.select_recipient');
+
   return (
     <AccountSelector
       label={label}
+      selectorTitle={selectorTitle}
       selectedAddress={accountOverride}
       onAccountSelected={handleAccountSelected}
+      style={style}
     />
   );
 };
diff --git a/app/components/Views/confirmations/components/UI/token/token.test.tsx b/app/components/Views/confirmations/components/UI/token/token.test.tsx
index 1af2ee58d74..5ac09719001 100644
--- a/app/components/Views/confirmations/components/UI/token/token.test.tsx
+++ b/app/components/Views/confirmations/components/UI/token/token.test.tsx
@@ -6,6 +6,11 @@ import { AssetType } from '../../../types/token';
 import { Token } from './token';
 import { act, fireEvent } from '@testing-library/react-native';
 
+jest.mock(
+  '../../../../../UI/Assets/components/AssetLogo/AssetLogo',
+  () => () => null,
+);
+
 describe('Token', () => {
   const createMockToken = (overrides: Partial<AssetType> = {}): AssetType => ({
     address: '0x1234567890123456789012345678901234567890',
diff --git a/app/components/Views/confirmations/components/UI/token/token.tsx b/app/components/Views/confirmations/components/UI/token/token.tsx
index e3c76b69be0..cba9e1d4d76 100644
--- a/app/components/Views/confirmations/components/UI/token/token.tsx
+++ b/app/components/Views/confirmations/components/UI/token/token.tsx
@@ -4,7 +4,6 @@ import {
   Box,
   Text,
   TextVariant,
-  AvatarToken,
   FontWeight,
   TextColor,
 } from '@metamask/design-system-react-native';
@@ -23,6 +22,7 @@ import { AccountTypeLabel } from '../account-type-label';
 import { AssetType } from '../../../types/token';
 import { formatAmount } from '../../../../../../components/UI/SimulationDetails/formatAmount';
 import { ACCOUNT_TYPE_LABELS } from '../../../../../../constants/account-type-labels';
+import AssetLogo from '../../../../../UI/Assets/components/AssetLogo/AssetLogo';
 
 interface TokenProps {
   asset: AssetType;
@@ -75,11 +75,7 @@ export function Token({ asset, onPress }: TokenProps) {
                 ticker={asset.symbol as string}
               />
             ) : (
-              <AvatarToken
-                name={asset.symbol || asset.name || 'Token'}
-                src={asset.image ? { uri: asset.image } : undefined}
-                style={tw.style('w-10 h-10')}
-              />
+              <AssetLogo asset={asset} />
             )}
           </BadgeWrapper>
         </Box>
diff --git a/app/components/Views/confirmations/components/activity/eip-7702-sponsored-relay-api-failure.view.test.tsx b/app/components/Views/confirmations/components/activity/eip-7702-sponsored-relay-api-failure.view.test.tsx
new file mode 100644
index 00000000000..d8e9986e54c
--- /dev/null
+++ b/app/components/Views/confirmations/components/activity/eip-7702-sponsored-relay-api-failure.view.test.tsx
@@ -0,0 +1,107 @@
+/**
+ * Component-view coverage for smoke `gas-fee-tokens-eip-7702-sponsored`:
+ * (1) Activity / transaction details show Failed from `TransactionMeta.status` (not a hardcoded StatusText prop);
+ * (2) Review-step "Paid by MetaMask" gas row when sponsorship is allowed.
+ */
+import '../../../../../../tests/component-view/mocks';
+import React from 'react';
+import { cloneDeep } from 'lodash';
+import { fireEvent, waitFor } from '@testing-library/react-native';
+import { TransactionStatus } from '@metamask/transaction-controller';
+import { ConfirmationRowComponentIDs } from '../../ConfirmationView.testIds';
+import { ConfirmationContextProvider } from '../../context/confirmation-context';
+import GasFeesDetailsRow from '../rows/transactions/gas-fee-details-row/gas-fee-details-row';
+import { stakingDepositConfirmationState } from '../../../../../util/test/confirm-data-helpers';
+import { renderComponentViewScreen } from '../../../../../../tests/component-view/render';
+import { describeForPlatforms } from '../../../../../../tests/component-view/platform';
+import {
+  clearSentinelNetworksMocks,
+  setupSentinelNetworksRelayEnabledMock,
+} from '../../../../../../tests/component-view/api-mocking/sentinel-networks';
+import { TransactionDetailsStatusRow } from './transaction-details-status-row/transaction-details-status-row';
+import { STATUS_ICON_TOOLTIP_OPEN_BUTTON_TEST_ID } from '../status-icon/status-icon.testIds';
+import { strings } from '../../../../../../locales/i18n';
+
+const STAKING_TX_ID = '699ca2f0-e459-11ef-b6f6-d182277cf5e1';
+
+function relayFailedActivityState() {
+  const state = cloneDeep(stakingDepositConfirmationState);
+  const tx = state.engine.backgroundState.TransactionController.transactions[0];
+  tx.status = TransactionStatus.failed;
+  tx.error = {
+    name: 'JsonRpcError',
+    message: 'Relay submission failed',
+  };
+  return state;
+}
+
+/**
+ * Review step from the same smoke spec: simulation marks sponsorship; network fee row
+ * shows "Paid by MetaMask" (matches `RowComponents.NetworkFeePaidByMetaMask` / E2E wait
+ * before Confirm).
+ */
+function SponsoredGasFeeRowHarness() {
+  return (
+    <ConfirmationContextProvider>
+      <GasFeesDetailsRow />
+    </ConfirmationContextProvider>
+  );
+}
+
+describeForPlatforms(
+  'EIP-7702 sponsored send — relay API failure (activity / details status)',
+  () => {
+    it('maps failed transaction in state to Failed label and error tooltip (transaction details)', async () => {
+      const { getByText, getByTestId } = renderComponentViewScreen(
+        TransactionDetailsStatusRow,
+        { name: 'Eip7702RelayApiFailureActivity' },
+        { state: relayFailedActivityState() },
+        { transactionId: STAKING_TX_ID },
+      );
+
+      await waitFor(() =>
+        expect(getByText(strings('transaction.failed'))).toBeOnTheScreen(),
+      );
+
+      fireEvent.press(getByTestId(STATUS_ICON_TOOLTIP_OPEN_BUTTON_TEST_ID));
+
+      expect(getByText('Relay submission failed')).toBeOnTheScreen();
+    });
+  },
+);
+
+describeForPlatforms('EIP-7702 sponsored send — review (network fee)', () => {
+  const sponsoredGasFeeState = () => {
+    const state = cloneDeep(stakingDepositConfirmationState);
+    const tx = state.engine.backgroundState.TransactionController
+      .transactions[0] as { isGasFeeSponsored?: boolean };
+    tx.isGasFeeSponsored = true;
+    return state;
+  };
+
+  beforeEach(() => {
+    setupSentinelNetworksRelayEnabledMock();
+  });
+
+  afterEach(() => {
+    clearSentinelNetworksMocks();
+  });
+
+  it('shows Paid by MetaMask on the gas row when sponsorship is allowed (smoke review step)', async () => {
+    const { getByTestId, getByText } = renderComponentViewScreen(
+      SponsoredGasFeeRowHarness,
+      { name: 'Eip7702SponsoredGasFee' },
+      { state: sponsoredGasFeeState() },
+    );
+
+    await waitFor(
+      () => {
+        expect(
+          getByTestId(ConfirmationRowComponentIDs.PAID_BY_METAMASK),
+        ).toBeOnTheScreen();
+      },
+      { timeout: 8000 },
+    );
+    expect(getByText('Paid by MetaMask')).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.test.tsx b/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.test.tsx
index 4c31c805545..80d23ceee4e 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.test.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.test.tsx
@@ -65,4 +65,18 @@ describe('TransactionDetailsAccountRow', () => {
     const { toJSON } = render();
     expect(toJSON()).toBeNull();
   });
+
+  it.each([
+    TransactionType.moneyAccountWithdraw,
+    TransactionType.perpsWithdraw,
+    TransactionType.predictClaim,
+    TransactionType.predictWithdraw,
+  ])('renders account row for %s', (type) => {
+    useTransactionDetailsMock.mockReturnValue({
+      transactionMeta: { ...TRANSACTION_META_MOCK, type },
+    });
+
+    const { getByText } = render();
+    expect(getByText(ACCOUNT_NAME_MOCK)).toBeDefined();
+  });
 });
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.tsx b/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.tsx
index a0560a6a071..8836e92612e 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.tsx
@@ -11,6 +11,7 @@ import { TransactionType } from '@metamask/transaction-controller';
 import { hasTransactionType } from '../../../utils/transaction';
 
 const TRANSACTION_TYPES = [
+  TransactionType.moneyAccountWithdraw,
   TransactionType.perpsWithdraw,
   TransactionType.predictClaim,
   TransactionType.predictWithdraw,
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-bridge-fee-row/transaction-details-bridge-fee-row.test.tsx b/app/components/Views/confirmations/components/activity/transaction-details-bridge-fee-row/transaction-details-bridge-fee-row.test.tsx
index 187af717dd1..b2485455db1 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-bridge-fee-row/transaction-details-bridge-fee-row.test.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-bridge-fee-row/transaction-details-bridge-fee-row.test.tsx
@@ -68,6 +68,20 @@ describe('TransactionDetailsBridgeFeeRow', () => {
     expect(getByText('Provider fee')).toBeOnTheScreen();
   });
 
+  it('renders "Provider fee" label for money account withdrawals', () => {
+    useTransactionDetailsMock.mockReturnValue({
+      transactionMeta: {
+        type: TransactionType.moneyAccountWithdraw,
+        metamaskPay: {
+          bridgeFeeFiat: BRIDGE_FEE_FIAT_MOCK,
+        },
+      } as unknown as TransactionMeta,
+    });
+
+    const { getByText } = render();
+    expect(getByText('Provider fee')).toBeOnTheScreen();
+  });
+
   it('renders nothing if no bridge fee fiat', () => {
     useTransactionDetailsMock.mockReturnValue({
       transactionMeta: {
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-bridge-fee-row/transaction-details-bridge-fee-row.tsx b/app/components/Views/confirmations/components/activity/transaction-details-bridge-fee-row/transaction-details-bridge-fee-row.tsx
index 7c0832d5f1e..3f9ba65eb5d 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-bridge-fee-row/transaction-details-bridge-fee-row.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-bridge-fee-row/transaction-details-bridge-fee-row.tsx
@@ -16,8 +16,9 @@ export function TransactionDetailsBridgeFeeRow() {
   const { bridgeFeeFiat } = metamaskPay || {};
 
   const isWithdraw = hasTransactionType(transactionMeta, [
-    TransactionType.predictWithdraw,
+    TransactionType.moneyAccountWithdraw,
     TransactionType.perpsWithdraw,
+    TransactionType.predictWithdraw,
   ]);
 
   const label = isWithdraw
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.test.tsx b/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.test.tsx
index a1e8beaa100..71b9e5216b4 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.test.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.test.tsx
@@ -218,4 +218,19 @@ describe('TransactionDetailsHero', () => {
     const { queryByTestId } = render();
     expect(queryByTestId('transaction-details-hero')).toBeNull();
   });
+
+  it.each([
+    TransactionType.moneyAccountDeposit,
+    TransactionType.moneyAccountWithdraw,
+  ])('renders hero amount for %s', (type) => {
+    useTransactionDetailsMock.mockReturnValue({
+      transactionMeta: {
+        ...TRANSACTION_META_MOCK,
+        type,
+      } as unknown as TransactionMeta,
+    });
+
+    const { getByText } = render();
+    expect(getByText('$123.46')).toBeDefined();
+  });
 });
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.tsx b/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.tsx
index 9b50ec7f9a6..eed7b6300e3 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.tsx
@@ -32,6 +32,8 @@ import { RootState } from '../../../../../../reducers';
 import useNetworkInfo from '../../../hooks/useNetworkInfo';
 
 const SUPPORTED_TYPES = [
+  TransactionType.moneyAccountDeposit,
+  TransactionType.moneyAccountWithdraw,
   TransactionType.musdClaim,
   TransactionType.musdConversion,
   TransactionType.perpsDeposit,
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.test.tsx b/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.test.tsx
index 6f124188940..9e6054ed30a 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.test.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.test.tsx
@@ -65,4 +65,15 @@ describe('TransactionDetailsNetworkFeeRow', () => {
 
     expect(toJSON()).toBeNull();
   });
+
+  it('renders calculated network fee for moneyAccountWithdraw fallback', () => {
+    useTransactionDetailsMock.mockReturnValue({
+      transactionMeta: {
+        type: TransactionType.moneyAccountWithdraw,
+      } as unknown as TransactionMeta,
+    });
+
+    const { getByText } = render();
+    expect(getByText(`$${CALCULATED_FEE_MOCK}`)).toBeDefined();
+  });
 });
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.tsx b/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.tsx
index 1995466889b..0dda62e9c26 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.tsx
@@ -11,6 +11,7 @@ import { TransactionDetailsSelectorIDs } from '../TransactionDetailsModal.testId
 import { usePayFiatFormatter } from '../../../hooks/pay/usePayFiatFormatter';
 
 const FALLBACK_TYPES = [
+  TransactionType.moneyAccountWithdraw,
   TransactionType.perpsWithdraw,
   TransactionType.predictClaim,
   TransactionType.predictWithdraw,
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-summary/transaction-details-summary.test.tsx b/app/components/Views/confirmations/components/activity/transaction-details-summary/transaction-details-summary.test.tsx
index 0ddbfb64d03..c29196a6e3c 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-summary/transaction-details-summary.test.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-summary/transaction-details-summary.test.tsx
@@ -128,6 +128,20 @@ describe('TransactionDetailsSummary', () => {
     expect(getByText('ReceiveSummaryLine')).toBeDefined();
   });
 
+  it('routes moneyAccountDeposit to ReceiveSummaryLine', () => {
+    const { getByText } = render({
+      transactions: [
+        {
+          id: transactionIdMock,
+          chainId: '0x1',
+          type: TransactionType.moneyAccountDeposit,
+        },
+      ],
+    });
+
+    expect(getByText('ReceiveSummaryLine')).toBeDefined();
+  });
+
   it('routes unsupported types to DefaultSummaryLine', () => {
     const { getByText } = render({
       transactions: [
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-summary/transaction-details-summary.tsx b/app/components/Views/confirmations/components/activity/transaction-details-summary/transaction-details-summary.tsx
index 0fc9b203a0b..9903df6fac3 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-summary/transaction-details-summary.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-summary/transaction-details-summary.tsx
@@ -114,6 +114,7 @@ function SummaryLine({
 
   if (
     hasTransactionType(transactionMeta, [
+      TransactionType.moneyAccountDeposit,
       TransactionType.perpsDeposit,
       TransactionType.predictDeposit,
       TransactionType.musdConversion,
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.test.tsx b/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.test.tsx
index a36064e3d33..87b703b8a80 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.test.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.test.tsx
@@ -130,4 +130,31 @@ describe('TransactionDetailsTotalRow', () => {
     // Uses fiatUnformatted and user's currency formatter
     expect(getByText('$123.45')).toBeOnTheScreen();
   });
+
+  it('falls back to token amount for moneyAccountWithdraw without pay totals', () => {
+    useTransactionDetailsMock.mockReturnValue({
+      transactionMeta: {
+        metamaskPay: {},
+        type: TransactionType.moneyAccountWithdraw,
+      } as unknown as TransactionMeta,
+    });
+
+    const { getByText } = render();
+    expect(getByText(`$${TOKEN_TOTAL}`)).toBeOnTheScreen();
+  });
+
+  it('renders targetFiat for moneyAccountWithdraw as a receive-type', () => {
+    useTransactionDetailsMock.mockReturnValue({
+      transactionMeta: {
+        type: TransactionType.moneyAccountWithdraw,
+        metamaskPay: {
+          totalFiat: PAY_TOTAL,
+          targetFiat: '88.88',
+        },
+      } as unknown as TransactionMeta,
+    });
+
+    const { getByText } = render();
+    expect(getByText('$88.88')).toBeOnTheScreen();
+  });
 });
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.tsx b/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.tsx
index cd7c818b35b..8651ae0f574 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.tsx
@@ -12,12 +12,14 @@ import { usePayFiatFormatter } from '../../../hooks/pay/usePayFiatFormatter';
 import { USER_CURRENCY_TYPES } from '../../../constants/confirmations';
 
 const FALLBACK_TYPES = [
+  TransactionType.moneyAccountWithdraw,
   TransactionType.musdClaim,
   TransactionType.perpsWithdraw,
   TransactionType.predictWithdraw,
 ];
 
 const RECEIVE_TYPES = [
+  TransactionType.moneyAccountWithdraw,
   TransactionType.musdClaim,
   TransactionType.perpsWithdraw,
   TransactionType.predictClaim,
diff --git a/app/components/Views/confirmations/components/alert-banner/alert-system-security-failed.view.test.tsx b/app/components/Views/confirmations/components/alert-banner/alert-system-security-failed.view.test.tsx
new file mode 100644
index 00000000000..0fa96b13b6a
--- /dev/null
+++ b/app/components/Views/confirmations/components/alert-banner/alert-system-security-failed.view.test.tsx
@@ -0,0 +1,88 @@
+import '../../../../../../tests/component-view/mocks';
+import React from 'react';
+import { merge } from 'lodash';
+import { fireEvent, waitFor } from '@testing-library/react-native';
+
+import { renderComponentViewScreen } from '../../../../../../tests/component-view/render';
+import { describeForPlatforms } from '../../../../../../tests/component-view/platform';
+import { typedSignV1ConfirmationState } from '../../../../../util/test/confirm-data-helpers';
+import {
+  ConfirmationTopSheetSelectorsIDs,
+  ConfirmationTopSheetSelectorsText,
+} from '../../ConfirmationView.testIds';
+import { AlertsContextProvider } from '../../context/alert-system-context';
+import useBlockaidAlerts from '../../hooks/alerts/useBlockaidAlerts';
+import AlertBanner from './alert-banner';
+import { Reason, ResultType } from '../blockaid-banner/BlockaidBanner.types';
+
+/** Matches `messageParams.requestId` on the typed-sign fixture (ppom / security alert key). */
+const TYPED_SIGN_SECURITY_ALERT_KEY = '2453610887';
+
+/** No `req`/`chainId` so `BlockaidAlertContent` skips gzip (view env has no native gzip). */
+const securityValidationFailedResponse = {
+  result_type: ResultType.Failed,
+  reason: Reason.failed,
+  features: [] as string[],
+};
+
+/**
+ * Blockaid alerts only (same source as the first slice of `useConfirmationAlerts` for this state).
+ * Skips transaction-alert hooks that need QueryClient, hardware wallet, etc.
+ */
+function BlockaidAlertBannerHarness() {
+  const alerts = useBlockaidAlerts();
+  return (
+    <AlertsContextProvider alerts={alerts}>
+      <AlertBanner />
+    </AlertsContextProvider>
+  );
+}
+
+describeForPlatforms('Alert system (signatures)', () => {
+  /**
+   * Smoke `alert-system`: security validation API error shows the redesigned banner
+   * and failed-state copy (no signing success path).
+   */
+  it('shows security alert when validation request fails', async () => {
+    const state = merge({}, typedSignV1ConfirmationState, {
+      securityAlerts: {
+        alerts: {
+          [TYPED_SIGN_SECURITY_ALERT_KEY]: securityValidationFailedResponse,
+        },
+      },
+      engine: {
+        backgroundState: {
+          PreferencesController: {
+            securityAlertsEnabled: true,
+          },
+        },
+      },
+    });
+
+    const { getByTestId, getByText } = renderComponentViewScreen(
+      BlockaidAlertBannerHarness,
+      { name: 'SecurityValidationFailed' },
+      { state },
+    );
+
+    const bannerTestId =
+      ConfirmationTopSheetSelectorsIDs.SECURITY_ALERT_BANNER_REDESIGNED;
+
+    await waitFor(() => {
+      expect(getByTestId(bannerTestId)).toBeOnTheScreen();
+    });
+
+    expect(
+      getByText(ConfirmationTopSheetSelectorsText.BANNER_FAILED_TITLE),
+    ).toBeOnTheScreen();
+    expect(
+      getByText(ConfirmationTopSheetSelectorsText.BANNER_FAILED_DESCRIPTION),
+    ).toBeOnTheScreen();
+
+    fireEvent.press(getByTestId(bannerTestId));
+
+    await waitFor(() => {
+      expect(getByTestId(bannerTestId)).toBeOnTheScreen();
+    });
+  });
+});
diff --git a/app/components/Views/confirmations/components/alert-banner/alert-system-siwe-inline-mismatch.view.test.tsx b/app/components/Views/confirmations/components/alert-banner/alert-system-siwe-inline-mismatch.view.test.tsx
new file mode 100644
index 00000000000..3d4523ab038
--- /dev/null
+++ b/app/components/Views/confirmations/components/alert-banner/alert-system-siwe-inline-mismatch.view.test.tsx
@@ -0,0 +1,133 @@
+import '../../../../../../tests/component-view/mocks';
+import React from 'react';
+import { fireEvent, waitFor } from '@testing-library/react-native';
+import { merge } from 'lodash';
+
+import ExtendedKeyringTypes from '../../../../../constants/keyringTypes';
+import { HardwareWalletProvider } from '../../../../../core/HardwareWallet/HardwareWalletProvider';
+import { renderComponentViewScreen } from '../../../../../../tests/component-view/render';
+import { describeForPlatforms } from '../../../../../../tests/component-view/platform';
+import { siweSignatureConfirmationState } from '../../../../../util/test/confirm-data-helpers';
+import {
+  AlertModalSelectorsIDs,
+  AlertModalSelectorsText,
+  AlertTypeIDs,
+  ConfirmationFooterSelectorIDs,
+  ConfirmAlertModalSelectorsIDs,
+} from '../../ConfirmationView.testIds';
+import { AlertsContextProvider } from '../../context/alert-system-context';
+import { ConfirmationContextProvider } from '../../context/confirmation-context';
+import { QRHardwareContextProvider } from '../../context/qr-hardware-context';
+import useDomainMismatchAlerts from '../../hooks/alerts/useDomainMismatchAlerts';
+import { NetworkAndOriginRow } from '../rows/transactions/network-and-origin-row/network-and-origin-row';
+import { Footer } from '../footer/footer';
+
+/**
+ * `meta.url` origin must differ from the SIWE message domain so
+ * `isValidSIWEOrigin` fails (same idea as SIWE “bad domain” E2E).
+ */
+const SIWE_BAD_DOMAIN_STATE = merge({}, siweSignatureConfirmationState, {
+  engine: {
+    backgroundState: {
+      PreferencesController: {
+        securityAlertsEnabled: true,
+      },
+      ApprovalController: {
+        pendingApprovals: {
+          '72424261-e22f-11ef-8e59-bf627a5d8354': {
+            requestData: {
+              meta: {
+                url: 'https://malicious.example.test/fake-dapp/',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+});
+
+const SIWE_SIGNER_ADDRESS =
+  '0x8eeee1781fd885ff5ddef7789486676961873d12' as const;
+
+function seedEngineKeyringWithSiweSigner(): void {
+  const engineMock = jest.requireMock(
+    '../../../../../../app/core/Engine',
+  ) as unknown as {
+    default: {
+      context: {
+        KeyringController: { state: { keyrings: unknown[] } };
+      };
+    };
+  };
+  engineMock.default.context.KeyringController.state.keyrings = [
+    {
+      type: ExtendedKeyringTypes.hd,
+      accounts: [SIWE_SIGNER_ADDRESS],
+    },
+  ];
+}
+
+function SiweDomainMismatchInlineFlowHarness() {
+  const alerts = useDomainMismatchAlerts();
+  return (
+    <HardwareWalletProvider>
+      <ConfirmationContextProvider>
+        <AlertsContextProvider alerts={alerts}>
+          <QRHardwareContextProvider>
+            <NetworkAndOriginRow />
+            <Footer />
+          </QRHardwareContextProvider>
+        </AlertsContextProvider>
+      </ConfirmationContextProvider>
+    </HardwareWalletProvider>
+  );
+}
+
+describeForPlatforms('Alert system (SIWE inline)', () => {
+  /**
+   * Smoke `alert-system` Inline: domain mismatch → inline icon → alert modal →
+   * acknowledge → Confirm → second confirm modal → acknowledge (no broadcast assertion).
+   */
+  beforeEach(() => {
+    seedEngineKeyringWithSiweSigner();
+  });
+
+  it('inline mismatch: open modal, acknowledge, then confirm modals', async () => {
+    const { getByTestId, getByText } = renderComponentViewScreen(
+      SiweDomainMismatchInlineFlowHarness,
+      { name: 'SiweInlineMismatch' },
+      { state: SIWE_BAD_DOMAIN_STATE },
+    );
+
+    expect(getByTestId(AlertTypeIDs.INLINE_ALERT)).toBeOnTheScreen();
+
+    fireEvent.press(getByTestId(AlertTypeIDs.INLINE_ALERT));
+
+    await waitFor(() =>
+      expect(
+        getByText(AlertModalSelectorsText.ALERT_ORIGIN_MISMATCH_TITLE),
+      ).toBeOnTheScreen(),
+    );
+
+    fireEvent.press(getByTestId(AlertModalSelectorsIDs.ALERT_MODAL_CHECKBOX));
+    fireEvent.press(
+      getByTestId(AlertModalSelectorsIDs.ALERT_MODAL_ACKNOWLEDGE_BUTTON),
+    );
+
+    fireEvent.press(getByTestId(ConfirmationFooterSelectorIDs.CONFIRM_BUTTON));
+
+    await waitFor(() =>
+      expect(
+        getByTestId(ConfirmAlertModalSelectorsIDs.CONFIRM_ALERT_MODAL),
+      ).toBeOnTheScreen(),
+    );
+
+    fireEvent.press(
+      getByTestId(ConfirmAlertModalSelectorsIDs.CONFIRM_ALERT_CHECKBOX),
+    );
+    fireEvent.press(
+      getByTestId(ConfirmAlertModalSelectorsIDs.CONFIRM_ALERT_BUTTON),
+    );
+  });
+});
diff --git a/app/components/Views/confirmations/components/alert-banner/alert-system-typed-sign-blockaid.view.test.tsx b/app/components/Views/confirmations/components/alert-banner/alert-system-typed-sign-blockaid.view.test.tsx
new file mode 100644
index 00000000000..db5ae143fa3
--- /dev/null
+++ b/app/components/Views/confirmations/components/alert-banner/alert-system-typed-sign-blockaid.view.test.tsx
@@ -0,0 +1,197 @@
+/**
+ * Component-view coverage for smoke `alert-system` typed-sign security API cases:
+ * (1) Benign validation response -> no redesigned security banner (matches E2E mock
+ * `SECURITY_ALERTS_BENIGN_RESPONSE`).
+ * (2) Malicious `malicious_domain` -> banner + confirm alert modal flow (matches E2E
+ * acknowledge path; no live security API).
+ */
+import '../../../../../../tests/component-view/mocks';
+import React from 'react';
+import { merge } from 'lodash';
+import { fireEvent, waitFor } from '@testing-library/react-native';
+
+import ExtendedKeyringTypes from '../../../../../constants/keyringTypes';
+import { HardwareWalletProvider } from '../../../../../core/HardwareWallet/HardwareWalletProvider';
+import { renderComponentViewScreen } from '../../../../../../tests/component-view/render';
+import { describeForPlatforms } from '../../../../../../tests/component-view/platform';
+import { typedSignV1ConfirmationState } from '../../../../../util/test/confirm-data-helpers';
+import {
+  ConfirmationFooterSelectorIDs,
+  ConfirmationTopSheetSelectorsIDs,
+  ConfirmationTopSheetSelectorsText,
+  ConfirmAlertModalSelectorsIDs,
+} from '../../ConfirmationView.testIds';
+import { AlertsContextProvider } from '../../context/alert-system-context';
+import { ConfirmationContextProvider } from '../../context/confirmation-context';
+import { QRHardwareContextProvider } from '../../context/qr-hardware-context';
+import useBlockaidAlerts from '../../hooks/alerts/useBlockaidAlerts';
+import AlertBanner from './alert-banner';
+import { Footer } from '../footer/footer';
+import { Reason, ResultType } from '../blockaid-banner/BlockaidBanner.types';
+
+/** Matches `messageParams.requestId` on the typed-sign fixture (security alert map key). */
+const TYPED_SIGN_SECURITY_ALERT_KEY = '2453610887';
+
+const TYPED_SIGN_SIGNER_ADDRESS =
+  '0x935e73edb9ff52e23bac7f7e043a1ecd06d05477' as const;
+
+/** No `req`/`chainId` so `BlockaidAlertContent` skips gzip (view env). */
+const benignSecurityApiResponse = {
+  result_type: ResultType.Benign,
+  reason: Reason.notApplicable,
+  features: [] as string[],
+};
+
+const maliciousDomainSecurityResponse = {
+  result_type: ResultType.Malicious,
+  reason: Reason.maliciousDomain,
+  description: `You're interacting with a malicious domain. If you approve this request, you might lose your assets.`,
+  features: [] as string[],
+};
+
+function seedEngineKeyringWithTypedSignSigner(): void {
+  const engineMock = jest.requireMock(
+    '../../../../../../app/core/Engine',
+  ) as unknown as {
+    default: {
+      context: {
+        KeyringController: { state: { keyrings: unknown[] } };
+      };
+    };
+  };
+  engineMock.default.context.KeyringController.state.keyrings = [
+    {
+      type: ExtendedKeyringTypes.hd,
+      accounts: [TYPED_SIGN_SIGNER_ADDRESS],
+    },
+  ];
+}
+
+function TypedSignMaliciousBlockaidFlowHarness() {
+  const alerts = useBlockaidAlerts();
+  return (
+    <HardwareWalletProvider>
+      <ConfirmationContextProvider>
+        <AlertsContextProvider alerts={alerts}>
+          <QRHardwareContextProvider>
+            <AlertBanner />
+            <Footer />
+          </QRHardwareContextProvider>
+        </AlertsContextProvider>
+      </ConfirmationContextProvider>
+    </HardwareWalletProvider>
+  );
+}
+
+describeForPlatforms(
+  'Alert system (typed sign — benign security response)',
+  () => {
+    beforeEach(() => {
+      seedEngineKeyringWithTypedSignSigner();
+    });
+
+    it('lets user confirm without security banner or confirm-alert modal when validation is Benign', async () => {
+      const state = merge({}, typedSignV1ConfirmationState, {
+        securityAlerts: {
+          alerts: {
+            [TYPED_SIGN_SECURITY_ALERT_KEY]: benignSecurityApiResponse,
+          },
+        },
+        engine: {
+          backgroundState: {
+            PreferencesController: {
+              securityAlertsEnabled: true,
+            },
+          },
+        },
+      });
+
+      const { findByTestId, queryByTestId } = renderComponentViewScreen(
+        TypedSignMaliciousBlockaidFlowHarness,
+        { name: 'TypedSignBenignBlockaid' },
+        { state },
+      );
+
+      const confirmButton = await findByTestId(
+        ConfirmationFooterSelectorIDs.CONFIRM_BUTTON,
+      );
+
+      await waitFor(() => {
+        expect(
+          queryByTestId(
+            ConfirmationTopSheetSelectorsIDs.SECURITY_ALERT_BANNER_REDESIGNED,
+          ),
+        ).toBeNull();
+      });
+
+      fireEvent.press(confirmButton);
+
+      await waitFor(() => {
+        expect(
+          queryByTestId(ConfirmAlertModalSelectorsIDs.CONFIRM_ALERT_MODAL),
+        ).toBeNull();
+      });
+
+      expect(
+        queryByTestId(
+          ConfirmationTopSheetSelectorsIDs.SECURITY_ALERT_BANNER_REDESIGNED,
+        ),
+      ).toBeNull();
+    });
+  },
+);
+
+describeForPlatforms('Alert system (typed sign — malicious blockaid)', () => {
+  beforeEach(() => {
+    seedEngineKeyringWithTypedSignSigner();
+  });
+
+  it('shows malicious banner then confirm alert modal after Confirm (malicious_domain)', async () => {
+    const state = merge({}, typedSignV1ConfirmationState, {
+      securityAlerts: {
+        alerts: {
+          [TYPED_SIGN_SECURITY_ALERT_KEY]: maliciousDomainSecurityResponse,
+        },
+      },
+      engine: {
+        backgroundState: {
+          PreferencesController: {
+            securityAlertsEnabled: true,
+          },
+        },
+      },
+    });
+
+    const { getByTestId, getByText } = renderComponentViewScreen(
+      TypedSignMaliciousBlockaidFlowHarness,
+      { name: 'TypedSignMaliciousBlockaid' },
+      { state },
+    );
+
+    const bannerTestId =
+      ConfirmationTopSheetSelectorsIDs.SECURITY_ALERT_BANNER_REDESIGNED;
+
+    await waitFor(() => {
+      expect(getByTestId(bannerTestId)).toBeOnTheScreen();
+    });
+
+    expect(
+      getByText(ConfirmationTopSheetSelectorsText.BANNER_MALICIOUS_TITLE),
+    ).toBeOnTheScreen();
+
+    fireEvent.press(getByTestId(ConfirmationFooterSelectorIDs.CONFIRM_BUTTON));
+
+    await waitFor(() =>
+      expect(
+        getByTestId(ConfirmAlertModalSelectorsIDs.CONFIRM_ALERT_MODAL),
+      ).toBeOnTheScreen(),
+    );
+
+    fireEvent.press(
+      getByTestId(ConfirmAlertModalSelectorsIDs.CONFIRM_ALERT_CHECKBOX),
+    );
+    fireEvent.press(
+      getByTestId(ConfirmAlertModalSelectorsIDs.CONFIRM_ALERT_BUTTON),
+    );
+  });
+});
diff --git a/app/components/Views/confirmations/components/footer/footer.test.tsx b/app/components/Views/confirmations/components/footer/footer.test.tsx
index 4405915c614..97ae1debcca 100644
--- a/app/components/Views/confirmations/components/footer/footer.test.tsx
+++ b/app/components/Views/confirmations/components/footer/footer.test.tsx
@@ -156,14 +156,14 @@ describe('Footer', () => {
     });
   });
 
-  it('renders confirm button text "Get signature" if QR signing is in progress', () => {
+  it('renders confirm button text "Confirm" even if QR signing is in progress', () => {
     jest.spyOn(QRHardwareHook, 'useQRHardwareContext').mockReturnValue({
       isSigningQRObject: true,
     } as QRHardwareHook.QRHardwareContextType);
     const { getByText } = renderWithProvider(<Footer />, {
       state: personalSignatureConfirmationState,
     });
-    expect(getByText('Get signature')).toBeTruthy();
+    expect(getByText('Confirm')).toBeTruthy();
   });
 
   it('confirm button is disabled if `needsCameraPermission` is true', () => {
diff --git a/app/components/Views/confirmations/components/footer/footer.tsx b/app/components/Views/confirmations/components/footer/footer.tsx
index afbf97ac93d..20c1abd40c2 100644
--- a/app/components/Views/confirmations/components/footer/footer.tsx
+++ b/app/components/Views/confirmations/components/footer/footer.tsx
@@ -39,6 +39,7 @@ import { PredictClaimFooter } from '../predict-confirmations/predict-claim-foote
 import { useIsTransactionPayLoading } from '../../hooks/pay/useTransactionPayData';
 import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
 import { useQRHardwareContext } from '../../context/qr-hardware-context';
+import { useIsConfirmationFromQrAccount } from '../../../../../core/HardwareWallet/hooks/useIsConfirmationFromQrAccount';
 import { useIsGaslessLoading } from '../../hooks/gas/useIsGaslessLoading';
 
 const HIDE_FOOTER_BY_DEFAULT_TYPES = [
@@ -61,7 +62,7 @@ export const Footer = () => {
     hasUnconfirmedDangerAlerts,
   } = useAlerts();
   const { onConfirm, onReject } = useConfirmActions();
-  const { isSigningQRObject, needsCameraPermission } = useQRHardwareContext();
+  const { needsCameraPermission } = useQRHardwareContext();
   const { securityAlertResponse } = useSecurityAlertResponse();
   const transactionMetadata = useTransactionMetadataRequest();
   const { trackAlertMetrics } = useConfirmationAlertMetrics();
@@ -121,10 +122,6 @@ export const Footer = () => {
   });
 
   const confirmButtonLabel = () => {
-    if (isSigningQRObject) {
-      return strings('confirm.qr_get_sign');
-    }
-
     if (isPayLoading) {
       return strings('confirm.confirm');
     }
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 ebb608a003d..a3f5143b86e 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
@@ -173,9 +173,10 @@ describe('Info', () => {
     ).toBeDefined();
   });
 
-  it('renders QRInfo if user is signing using QR hardware', () => {
+  it('renders QRInfo if user is signing using QR hardware and has confirmed', () => {
     jest.spyOn(QRHardwareHook, 'useQRHardwareContext').mockReturnValue({
       isSigningQRObject: true,
+      signingConfirmed: true,
     } as unknown as QRHardwareHook.QRHardwareContextType);
     const { getByTestId } = renderWithProvider(<Info />, {
       state: personalSignatureConfirmationState,
diff --git a/app/components/Views/confirmations/components/info-root/info-root.tsx b/app/components/Views/confirmations/components/info-root/info-root.tsx
index 32fb6cb9d52..b1fe750f6ce 100644
--- a/app/components/Views/confirmations/components/info-root/info-root.tsx
+++ b/app/components/Views/confirmations/components/info-root/info-root.tsx
@@ -87,7 +87,7 @@ interface InfoProps {
 const Info = ({ route }: InfoProps) => {
   const { approvalRequest } = useApprovalRequest();
   const transactionMetadata = useTransactionMetadataRequest();
-  const { isSigningQRObject } = useQRHardwareContext();
+  const { isSigningQRObject, signingConfirmed } = useQRHardwareContext();
   const { isDowngrade, isUpgradeOnly } = use7702TransactionType();
   // Refresh STX liveness for the transaction's network
   useRefreshSmartTransactionsLiveness(transactionMetadata?.chainId);
@@ -100,7 +100,7 @@ const Info = ({ route }: InfoProps) => {
     return <SwitchAccountType />;
   }
 
-  if (isSigningQRObject) {
+  if (isSigningQRObject && signingConfirmed) {
     return <QRInfo />;
   }
 
diff --git a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.styles.test.ts b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.styles.test.ts
index d2b89ceb2c1..042909bc736 100644
--- a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.styles.test.ts
+++ b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.styles.test.ts
@@ -1,4 +1,5 @@
 import { Platform } from 'react-native';
+import { mockTheme } from '../../../../../../util/theme';
 import { Theme } from '../../../../../../util/theme/models';
 import styleSheet from './custom-amount-info.styles';
 
@@ -19,7 +20,7 @@ describe('custom-amount-info.styles', () => {
         writable: true,
       });
 
-      const styles = styleSheet({ theme: {} as Theme });
+      const styles = styleSheet({ theme: mockTheme as Theme });
 
       expect(styles.extraBottomPadding.paddingBottom).toBe(56);
     });
@@ -30,7 +31,7 @@ describe('custom-amount-info.styles', () => {
         writable: true,
       });
 
-      const styles = styleSheet({ theme: {} as Theme });
+      const styles = styleSheet({ theme: mockTheme as Theme });
 
       expect(styles.extraBottomPadding.paddingBottom).toBe(0);
     });
diff --git a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.styles.ts b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.styles.ts
index 802b0710b28..9515d68a40e 100644
--- a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.styles.ts
+++ b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.styles.ts
@@ -3,8 +3,9 @@ import { Theme } from '../../../../../../util/theme/models';
 
 const EXTRA_ANDROID_BOTTOM_PADDING = 56;
 
-const styleSheet = (_params: { theme: Theme }) =>
-  StyleSheet.create({
+const styleSheet = (params: { theme: Theme }) => {
+  const { theme } = params;
+  return StyleSheet.create({
     container: {
       flex: 1,
       flexDirection: 'column',
@@ -30,6 +31,12 @@ const styleSheet = (_params: { theme: Theme }) =>
     footerText: {
       alignSelf: 'center',
     },
+
+    separator: {
+      borderBottomWidth: 1,
+      borderBottomColor: theme.colors.border.muted,
+    },
   });
+};
 
 export default styleSheet;
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 55e69ffe02a..6983f5e8096 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
@@ -39,7 +39,9 @@ import { CustomAmountInfoTestIds } from './custom-amount-info.testIds';
 import { useTransactionMetadataRequest } from '../../../hooks/transactions/useTransactionMetadataRequest';
 import { useTokenFiatRates } from '../../../hooks/tokens/useTokenFiatRates';
 import { useTransactionPayWithdraw } from '../../../hooks/pay/useTransactionPayWithdraw';
+import { useTransactionAccountOverride } from '../../../hooks/transactions/useTransactionAccountOverride';
 import Engine from '../../../../../../core/Engine';
+import Logger from '../../../../../../util/Logger';
 
 jest.mock('../../../hooks/ui/useClearConfirmationOnBackSwipe');
 jest.mock('../../../hooks/tokens/useTokenFiatRates');
@@ -63,7 +65,9 @@ jest.mock('../../../hooks/pay/useTransactionPayWithdraw', () => ({
     canSelectWithdrawToken: false,
   })),
 }));
+jest.mock('../../../hooks/transactions/useTransactionAccountOverride');
 jest.mock('../../../../../../util/transaction-controller', () => ({}));
+jest.mock('../../../../../../util/Logger');
 jest.mock('../../../../../../core/Engine', () => ({
   context: {
     TransactionPayController: {
@@ -78,6 +82,9 @@ jest.mock('../../PayAccountSelector', () => {
     default: () => <View testID="pay-account-selector" />,
   };
 });
+jest.mock('../../projected-five-year-balance', () => ({
+  ProjectedFiveYearBalance: () => null,
+}));
 jest.mock('../../../hooks/metrics/useConfirmationAlertMetrics', () => ({
   useConfirmationAlertMetrics: () => ({
     trackInlineAlertClicked: jest.fn(),
@@ -196,10 +203,15 @@ describe('CustomAmountInfo', () => {
 
   const useTokenFiatRatesMock = jest.mocked(useTokenFiatRates);
   const useTransactionPayWithdrawMock = jest.mocked(useTransactionPayWithdraw);
+  const useTransactionAccountOverrideMock = jest.mocked(
+    useTransactionAccountOverride,
+  );
 
   beforeEach(() => {
     jest.resetAllMocks();
 
+    useTransactionAccountOverrideMock.mockReturnValue(undefined);
+
     useTransactionPayWithdrawMock.mockReturnValue({
       isWithdraw: false,
       canSelectWithdrawToken: false,
@@ -227,7 +239,7 @@ describe('CustomAmountInfo', () => {
       isInputChanged: false,
       updatePendingAmount: noop,
       updatePendingAmountPercentage: noop,
-      updateTokenAmount: noop,
+      updateTokenAmount: jest.fn(),
     });
 
     useConfirmationContextMock.mockReturnValue({
@@ -449,7 +461,7 @@ describe('CustomAmountInfo', () => {
     expect(mockOnAmountSubmit).toHaveBeenCalledTimes(1);
   });
 
-  it('calls updateTokenAmount when Done is pressed for non-moneyAccountDeposit transactions', async () => {
+  it('calls updateTokenAmount when Done is pressed', async () => {
     const updateTokenAmountMock = jest.fn();
     useTransactionCustomAmountMock.mockReturnValue({
       amountFiat: '123.45',
@@ -471,8 +483,13 @@ describe('CustomAmountInfo', () => {
     expect(updateTokenAmountMock).toHaveBeenCalledTimes(1);
   });
 
-  it('does not call updateTokenAmount when Done is pressed for moneyAccountDeposit transactions', async () => {
-    const updateTokenAmountMock = jest.fn();
+  it('still runs UI cleanup and logs the error when updateTokenAmount rejects on Done', async () => {
+    const error = new Error('update failed');
+    const updateTokenAmountMock = jest.fn().mockRejectedValue(error);
+    const mockOnAmountSubmit = jest.fn();
+    const loggerErrorMock = jest.mocked(Logger.error);
+    loggerErrorMock.mockClear();
+
     useTransactionCustomAmountMock.mockReturnValue({
       amountFiat: '123.45',
       amountHuman: '0',
@@ -484,20 +501,18 @@ describe('CustomAmountInfo', () => {
       updateTokenAmount: updateTokenAmountMock,
     });
 
-    useTransactionMetadataRequestMock.mockReturnValue({
-      type: TransactionType.moneyAccountDeposit,
-      txParams: { from: '0x123' },
-    } as never);
-
-    const { getByText } = render({
-      transactionType: TransactionType.moneyAccountDeposit,
-    });
+    const { getByText } = render({ onAmountSubmit: mockOnAmountSubmit });
 
     await act(async () => {
       fireEvent.press(getByText(strings('confirm.edit_amount_done')));
     });
 
-    expect(updateTokenAmountMock).not.toHaveBeenCalled();
+    expect(updateTokenAmountMock).toHaveBeenCalledTimes(1);
+    expect(mockOnAmountSubmit).toHaveBeenCalledTimes(1);
+    expect(loggerErrorMock).toHaveBeenCalledWith(
+      error,
+      expect.stringContaining('Failed to apply custom amount on Done press'),
+    );
   });
 
   it('renders PayAccountSelector when supportAccountSelection is true', () => {
@@ -577,7 +592,7 @@ describe('CustomAmountInfo', () => {
         isInputChanged: false,
         updatePendingAmount: noop,
         updatePendingAmountPercentage: noop,
-        updateTokenAmount: noop,
+        updateTokenAmount: jest.fn(),
       });
     });
 
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 a0c343562c6..bd5500828a1 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
@@ -2,6 +2,7 @@ import React, { ReactNode, memo, useCallback, useState } from 'react';
 import { toCaipAssetType } from '@metamask/utils';
 import { TransactionType } from '@metamask/transaction-controller';
 import { PayTokenAmount, PayTokenAmountSkeleton } from '../../pay-token-amount';
+import { ProjectedFiveYearBalance } from '../../projected-five-year-balance';
 import { PayWithRow, PayWithRowSkeleton } from '../../rows/pay-with-row';
 import { BridgeFeeRow } from '../../rows/bridge-fee-row';
 import { BridgeTimeRow } from '../../rows/bridge-time-row';
@@ -61,6 +62,7 @@ import { AlertKeys } from '../../../constants/alerts';
 import { useConfirmActions } from '../../../hooks/useConfirmActions';
 import EngineService from '../../../../../../core/EngineService';
 import Engine from '../../../../../../core/Engine';
+import Logger from '../../../../../../util/Logger';
 import { ConfirmationFooterSelectorIDs } from '../../../ConfirmationView.testIds';
 import { useTransactionPayToken } from '../../../hooks/pay/useTransactionPayToken';
 import { getNativeTokenAddress } from '@metamask/assets-controllers';
@@ -167,24 +169,30 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
       pendingTokenAmount: amountHumanDebounced,
     });
 
-    const handleDone = useCallback(() => {
-      if (selectedFiatPaymentMethodId && transactionId) {
-        Engine.context.TransactionPayController.updateFiatPayment({
-          transactionId,
-          callback: (fp) => {
-            fp.amountFiat = amountFiat;
-          },
-        });
-      } else if (!isMoneyAccountDeposit) {
-        updateTokenAmount();
+    const handleDone = useCallback(async () => {
+      try {
+        if (selectedFiatPaymentMethodId && transactionId) {
+          Engine.context.TransactionPayController.updateFiatPayment({
+            transactionId,
+            callback: (fp) => {
+              fp.amountFiat = amountFiat;
+            },
+          });
+        } else {
+          await updateTokenAmount();
+        }
+      } catch (error) {
+        Logger.error(
+          error as Error,
+          'Failed to apply custom amount on Done press',
+        );
+      } finally {
+        EngineService.flushState();
+        setIsKeyboardVisible(false);
+        onAmountSubmit?.();
       }
-
-      EngineService.flushState();
-      setIsKeyboardVisible(false);
-      onAmountSubmit?.();
     }, [
       amountFiat,
-      isMoneyAccountDeposit,
       onAmountSubmit,
       selectedFiatPaymentMethodId,
       transactionId,
@@ -208,12 +216,16 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
             onPress={handleAmountPress}
             disabled={!hasTokens}
           />
-          {!hidePayTokenAmount && disablePay !== true && (
-            <PayTokenAmount
-              amountHuman={amountHuman}
-              disabled={!hasTokens || isAccountSelectionNeeded}
-            />
-          )}
+          {!hidePayTokenAmount &&
+            disablePay !== true &&
+            (isMoneyAccountDeposit ? (
+              <ProjectedFiveYearBalance amountFiat={amountFiat} />
+            ) : (
+              <PayTokenAmount
+                amountHuman={amountHuman}
+                disabled={!hasTokens || isAccountSelectionNeeded}
+              />
+            ))}
           {!hidePayTokenAmount && children}
         </Box>
         <Box
@@ -222,10 +234,17 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
           style={hasExtraBottomPadding && styles.extraBottomPadding}
         >
           <AlertMessage alertMessage={alertMessage} />
-          {supportAccountSelection && <PayAccountSelector />}
-          {!isResultReady && disablePay !== true && hasTokens && <PayWithRow />}
+          {!isResultReady && (
+            <>
+              {supportAccountSelection && (
+                <PayAccountSelector style={styles.separator} />
+              )}
+              {disablePay !== true && hasTokens && <PayWithRow />}
+            </>
+          )}
           {isResultReady && (
             <Box>
+              {supportAccountSelection && <PayAccountSelector />}
               {disablePay !== true && hasTokens && <PayWithRow />}
               {showPaymentDetails && (
                 <>
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 9248bc0c10e..bfa0640e27f 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
@@ -25,7 +25,8 @@ jest.mock('../custom-amount-info', () => ({
 }));
 
 jest.mock('../../../../../../../locales/i18n', () => ({
-  strings: (key: string) => key,
+  strings: (key: string) =>
+    ({ 'confirm.title.money_account_add_money': 'Add money' })[key] ?? key,
 }));
 
 describe('MoneyAccountDepositInfo', () => {
@@ -48,9 +49,7 @@ describe('MoneyAccountDepositInfo', () => {
 
     render(<MoneyAccountDepositInfo />);
 
-    expect(useNavbar).toHaveBeenCalledWith(
-      'confirm.title.money_account_deposit',
-    );
+    expect(useNavbar).toHaveBeenCalledWith('Add money');
   });
 
   it('MONEY_ACCOUNT_CURRENCY is usd', () => {
@@ -66,4 +65,14 @@ describe('MoneyAccountDepositInfo', () => {
       ][0];
     expect(lastCall.supportAccountSelection).toBe(true);
   });
+
+  it('passes hasMax=true to CustomAmountInfo', () => {
+    render(<MoneyAccountDepositInfo />);
+
+    const lastCall =
+      mockCustomAmountInfo.mock.calls[
+        mockCustomAmountInfo.mock.calls.length - 1
+      ][0];
+    expect(lastCall.hasMax).toBe(true);
+  });
 });
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 e5f63d2b80c..7c51bdb89da 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
@@ -6,11 +6,12 @@ import { strings } from '../../../../../../../locales/i18n';
 export const MONEY_ACCOUNT_CURRENCY = 'usd';
 
 export function MoneyAccountDepositInfo() {
-  useNavbar(strings('confirm.title.money_account_deposit'));
+  useNavbar(strings('confirm.title.money_account_add_money'));
 
   return (
     <CustomAmountInfo
       currency={MONEY_ACCOUNT_CURRENCY}
+      hasMax
       supportAccountSelection
     />
   );
diff --git a/app/components/Views/confirmations/components/info/money-account-withdraw-info/money-account-withdraw-info.test.tsx b/app/components/Views/confirmations/components/info/money-account-withdraw-info/money-account-withdraw-info.test.tsx
index 08bbade8f6d..1f0fd32c9c6 100644
--- a/app/components/Views/confirmations/components/info/money-account-withdraw-info/money-account-withdraw-info.test.tsx
+++ b/app/components/Views/confirmations/components/info/money-account-withdraw-info/money-account-withdraw-info.test.tsx
@@ -27,7 +27,9 @@ jest.mock('../custom-amount-info', () => ({
 }));
 
 jest.mock('../../../../../../../locales/i18n', () => ({
-  strings: (key: string) => key,
+  strings: (key: string) =>
+    ({ 'confirm.title.money_account_transfer_money': 'Transfer money' })[key] ??
+    key,
 }));
 
 jest.mock('../../../hooks/pay/useTransactionPayWithdraw', () => ({
@@ -63,9 +65,7 @@ describe('MoneyAccountWithdrawInfo', () => {
 
     render(<MoneyAccountWithdrawInfo />);
 
-    expect(useNavbar).toHaveBeenCalledWith(
-      'confirm.title.money_account_withdraw',
-    );
+    expect(useNavbar).toHaveBeenCalledWith('Transfer money');
   });
 
   it('MONEY_ACCOUNT_CURRENCY is usd', () => {
diff --git a/app/components/Views/confirmations/components/info/money-account-withdraw-info/money-account-withdraw-info.tsx b/app/components/Views/confirmations/components/info/money-account-withdraw-info/money-account-withdraw-info.tsx
index 1af668fb8cd..3f839745486 100644
--- a/app/components/Views/confirmations/components/info/money-account-withdraw-info/money-account-withdraw-info.tsx
+++ b/app/components/Views/confirmations/components/info/money-account-withdraw-info/money-account-withdraw-info.tsx
@@ -16,7 +16,7 @@ import useMoneyAccountBalance from '../../../../../UI/Money/hooks/useMoneyAccoun
 export const MONEY_ACCOUNT_CURRENCY = 'usd';
 
 export function MoneyAccountWithdrawInfo() {
-  useNavbar(strings('confirm.title.money_account_withdraw'));
+  useNavbar(strings('confirm.title.money_account_transfer_money'));
 
   const { canSelectWithdrawToken } = useTransactionPayWithdraw();
 
diff --git a/app/components/Views/confirmations/components/modals/pay-with-modal/pay-with-modal.test.tsx b/app/components/Views/confirmations/components/modals/pay-with-modal/pay-with-modal.test.tsx
index 9fa37b9ad46..5030fc40dd6 100644
--- a/app/components/Views/confirmations/components/modals/pay-with-modal/pay-with-modal.test.tsx
+++ b/app/components/Views/confirmations/components/modals/pay-with-modal/pay-with-modal.test.tsx
@@ -294,10 +294,10 @@ describe('PayWithModal', () => {
   });
 
   describe('on token select', () => {
-    it('sets pay asset', () => {
-      const { getByText } = render();
+    it('sets pay asset', async () => {
+      const { findByText } = render();
 
-      fireEvent.press(getByText('Test Token 1'));
+      fireEvent.press(await findByText('Test Token 1'));
 
       expect(setPayTokenMock).toHaveBeenCalledWith({
         address: TOKENS_MOCK[1].address,
@@ -305,7 +305,7 @@ describe('PayWithModal', () => {
       });
     });
 
-    it('calls onPerpsPaymentTokenChange via close callback when type is perpsDepositAndOrder', () => {
+    it('calls onPerpsPaymentTokenChange via close callback when type is perpsDepositAndOrder', async () => {
       useTransactionMetadataRequestMock.mockReturnValue({
         id: transactionIdMock,
         chainId: CHAIN_ID_1_MOCK,
@@ -316,9 +316,9 @@ describe('PayWithModal', () => {
         type: TransactionType.perpsDepositAndOrder,
       } as unknown as ReturnType<typeof useTransactionMetadataRequest>);
 
-      const { getByText } = render();
+      const { findByText } = render();
 
-      fireEvent.press(getByText('Test Token 1'));
+      fireEvent.press(await findByText('Test Token 1'));
 
       expect(onPerpsPaymentTokenChangeMock).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -465,9 +465,9 @@ describe('PayWithModal', () => {
         jest.fn(() => [zeroBalanceToken]),
       );
 
-      const { getByText } = render();
+      const { findByText } = render();
 
-      fireEvent.press(getByText('Zero Token'));
+      fireEvent.press(await findByText('Zero Token'));
 
       await waitFor(() => {
         expect(setPayTokenMock).toHaveBeenCalled();
@@ -497,11 +497,9 @@ describe('PayWithModal', () => {
         jest.fn(() => [zeroBalanceToken]),
       );
 
-      const { getByText } = render();
+      const { findByText } = render();
 
-      await waitFor(() => {
-        fireEvent.press(getByText('Zero Token'));
-      });
+      fireEvent.press(await findByText('Zero Token'));
 
       expect(mockAddTokens).toHaveBeenCalledWith(
         [
diff --git a/app/components/Views/confirmations/components/pay-token-amount/pay-token-amount.test.tsx b/app/components/Views/confirmations/components/pay-token-amount/pay-token-amount.test.tsx
index f701742f159..789eaf12a6d 100644
--- a/app/components/Views/confirmations/components/pay-token-amount/pay-token-amount.test.tsx
+++ b/app/components/Views/confirmations/components/pay-token-amount/pay-token-amount.test.tsx
@@ -123,6 +123,7 @@ describe('PayTokenAmount', () => {
   });
 
   it.each([
+    TransactionType.moneyAccountDeposit,
     TransactionType.perpsDeposit,
     TransactionType.perpsDepositAndOrder,
     TransactionType.predictDeposit,
diff --git a/app/components/Views/confirmations/components/pay-token-amount/pay-token-amount.tsx b/app/components/Views/confirmations/components/pay-token-amount/pay-token-amount.tsx
index c5438726cbb..269dc46babb 100644
--- a/app/components/Views/confirmations/components/pay-token-amount/pay-token-amount.tsx
+++ b/app/components/Views/confirmations/components/pay-token-amount/pay-token-amount.tsx
@@ -80,15 +80,17 @@ export function PayTokenAmount({ amountHuman, disabled }: PayTokenAmountProps) {
     return null;
   }
 
-  // Don't render token amount for perps and predict deposit transactions
-  const isPerpsOrPredictDeposit = hasTransactionType(transaction, [
+  // Don't render token amount for perps, predict, and money-account deposit
+  // transactions — they have custom amount entry UIs.
+  const isCustomAmountDeposit = hasTransactionType(transaction, [
+    TransactionType.moneyAccountDeposit,
     TransactionType.perpsDeposit,
     TransactionType.perpsDepositAndOrder,
     TransactionType.predictDeposit,
     TransactionType.predictDepositAndOrder,
   ]);
 
-  if (isPerpsOrPredictDeposit) {
+  if (isCustomAmountDeposit) {
     return null;
   }
 
diff --git a/app/components/Views/confirmations/components/perps-confirmations/perps-withdraw-balance/perps-withdraw-balance.test.tsx b/app/components/Views/confirmations/components/perps-confirmations/perps-withdraw-balance/perps-withdraw-balance.test.tsx
index e5b43b020d2..167a1d7909d 100644
--- a/app/components/Views/confirmations/components/perps-confirmations/perps-withdraw-balance/perps-withdraw-balance.test.tsx
+++ b/app/components/Views/confirmations/components/perps-confirmations/perps-withdraw-balance/perps-withdraw-balance.test.tsx
@@ -28,7 +28,8 @@ describe('PerpsWithdrawBalance', () => {
     } as never);
     mockUsePerpsLiveAccount.mockReturnValue({
       account: {
-        availableBalance: '$1,232.39',
+        spendableBalance: '$1,232.39',
+        withdrawableBalance: '$1,232.39',
       },
       isInitialLoading: false,
     } as never);
@@ -51,7 +52,7 @@ describe('PerpsWithdrawBalance', () => {
     // $50.39 for an underlying 50.389 balance, one cent higher than the
     // Max button computed via BigNumber.ROUND_DOWN.
     mockUsePerpsLiveAccount.mockReturnValue({
-      account: { availableBalance: '50.389' },
+      account: { withdrawableBalance: '50.389' },
       isInitialLoading: false,
     } as never);
 
diff --git a/app/components/Views/confirmations/components/perps-confirmations/perps-withdraw-balance/perps-withdraw-balance.tsx b/app/components/Views/confirmations/components/perps-confirmations/perps-withdraw-balance/perps-withdraw-balance.tsx
index 6319aea25cb..3965131ec3a 100644
--- a/app/components/Views/confirmations/components/perps-confirmations/perps-withdraw-balance/perps-withdraw-balance.tsx
+++ b/app/components/Views/confirmations/components/perps-confirmations/perps-withdraw-balance/perps-withdraw-balance.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { strings } from '../../../../../../../locales/i18n';
 import Text, {
   TextColor,
@@ -15,15 +15,20 @@ export function PerpsWithdrawBalance() {
   const { styles } = useStyles(styleSheet, {});
   const { account } = usePerpsLiveAccount();
 
-  const availableBalance =
-    account?.availableToTradeBalance ?? account?.availableBalance;
+  // formatPerpsBalance truncates (ROUND_DOWN) to 2 decimals so the displayed
+  // balance matches the Max button value and never overstates what the user
+  // can actually withdraw.
+  const balanceFormatted = useMemo(
+    () => formatPerpsBalance(account?.withdrawableBalance),
+    [account?.withdrawableBalance],
+  );
 
   return (
     <Box alignItems={AlignItems.center} style={styles.container}>
       <Text
         variant={TextVariant.BodyMDMedium}
         color={TextColor.Alternative}
-      >{`${strings('confirm.available_balance')}${formatPerpsBalance(availableBalance)}`}</Text>
+      >{`${strings('confirm.available_balance')}${balanceFormatted}`}</Text>
     </Box>
   );
 }
diff --git a/app/components/Views/confirmations/components/projected-five-year-balance/index.ts b/app/components/Views/confirmations/components/projected-five-year-balance/index.ts
new file mode 100644
index 00000000000..b3b174c59bb
--- /dev/null
+++ b/app/components/Views/confirmations/components/projected-five-year-balance/index.ts
@@ -0,0 +1,2 @@
+export { ProjectedFiveYearBalance } from './projected-five-year-balance';
+export type { ProjectedFiveYearBalanceProps } from './projected-five-year-balance';
diff --git a/app/components/Views/confirmations/components/projected-five-year-balance/projected-five-year-balance.test.tsx b/app/components/Views/confirmations/components/projected-five-year-balance/projected-five-year-balance.test.tsx
new file mode 100644
index 00000000000..0595405c7d5
--- /dev/null
+++ b/app/components/Views/confirmations/components/projected-five-year-balance/projected-five-year-balance.test.tsx
@@ -0,0 +1,145 @@
+import React from 'react';
+import { render } from '@testing-library/react-native';
+import BigNumber from 'bignumber.js';
+import { ProjectedFiveYearBalance } from './projected-five-year-balance';
+import useMoneyAccountBalance from '../../../../UI/Money/hooks/useMoneyAccountBalance';
+import useFiatFormatter from '../../../../UI/SimulationDetails/FiatDisplay/useFiatFormatter';
+import { strings } from '../../../../../../locales/i18n';
+
+jest.mock('../../../../UI/Money/hooks/useMoneyAccountBalance');
+jest.mock('../../../../UI/SimulationDetails/FiatDisplay/useFiatFormatter');
+
+const useMoneyAccountBalanceMock = jest.mocked(useMoneyAccountBalance);
+const useFiatFormatterMock = jest.mocked(useFiatFormatter);
+
+const LABEL = strings('confirm.custom_amount.projected_five_year_balance');
+
+function mockBalance({
+  apy,
+  isLoading = false,
+}: {
+  apy: number | undefined;
+  isLoading?: boolean;
+}) {
+  useMoneyAccountBalanceMock.mockReturnValue({
+    vaultApyQuery: {
+      data: apy === undefined ? undefined : { apy },
+      isLoading,
+    },
+  } as unknown as ReturnType<typeof useMoneyAccountBalance>);
+}
+
+describe('ProjectedFiveYearBalance', () => {
+  const formatFiat = jest.fn(
+    (value: BigNumber) => `$${value.toFixed(2, BigNumber.ROUND_HALF_UP)}`,
+  );
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    useFiatFormatterMock.mockReturnValue(formatFiat);
+  });
+
+  it('renders label and projected balance for $1,000 at 5% APY over 5 years (~$1,276.28)', () => {
+    mockBalance({ apy: 5 });
+
+    const { getByTestId, getByText } = render(
+      <ProjectedFiveYearBalance amountFiat="1000" />,
+    );
+
+    expect(getByTestId('projected-five-year-balance')).toBeOnTheScreen();
+    expect(getByText(LABEL, { exact: false })).toBeOnTheScreen();
+    // 1000 * (1.05)^5 = 1276.2815625
+    expect(getByText('$1276.28')).toBeOnTheScreen();
+  });
+
+  it('matches the Figma example: $1,000 at the design APY rounds to $1,114.36 when APY=2.18', () => {
+    mockBalance({ apy: 2.18 });
+
+    const { getByText } = render(
+      <ProjectedFiveYearBalance amountFiat="1000" />,
+    );
+
+    // 1000 * (1.0218)^5 ≈ 1113.86 — sanity-checks the compounding formula
+    // tracks the figma direction (label + green dollar amount); exact APY/value
+    // is product-driven, this just guards the math.
+    expect(getByText(/^\$1\d{3}\.\d{2}$/)).toBeOnTheScreen();
+  });
+
+  it('returns null while APY is loading', () => {
+    mockBalance({ apy: undefined, isLoading: true });
+
+    const { queryByTestId } = render(
+      <ProjectedFiveYearBalance amountFiat="1000" />,
+    );
+
+    expect(queryByTestId('projected-five-year-balance')).toBeNull();
+  });
+
+  it('returns null when APY data is unavailable', () => {
+    mockBalance({ apy: undefined });
+
+    const { queryByTestId } = render(
+      <ProjectedFiveYearBalance amountFiat="1000" />,
+    );
+
+    expect(queryByTestId('projected-five-year-balance')).toBeNull();
+  });
+
+  it('returns null when APY is negative', () => {
+    mockBalance({ apy: -1 });
+
+    const { queryByTestId } = render(
+      <ProjectedFiveYearBalance amountFiat="1000" />,
+    );
+
+    expect(queryByTestId('projected-five-year-balance')).toBeNull();
+  });
+
+  it('returns null when APY is not finite', () => {
+    mockBalance({ apy: Number.POSITIVE_INFINITY });
+
+    const { queryByTestId } = render(
+      <ProjectedFiveYearBalance amountFiat="1000" />,
+    );
+
+    expect(queryByTestId('projected-five-year-balance')).toBeNull();
+  });
+
+  it('renders $0.00 when apy is 0% (compounding identity)', () => {
+    mockBalance({ apy: 0 });
+
+    const { getByText } = render(<ProjectedFiveYearBalance amountFiat="0" />);
+
+    expect(getByText('$0.00')).toBeOnTheScreen();
+  });
+
+  it('treats empty amountFiat as zero', () => {
+    mockBalance({ apy: 5 });
+
+    const { getByText } = render(<ProjectedFiveYearBalance amountFiat="" />);
+
+    expect(getByText('$0.00')).toBeOnTheScreen();
+  });
+
+  it('passes a BigNumber to the fiat formatter', () => {
+    mockBalance({ apy: 5 });
+
+    render(<ProjectedFiveYearBalance amountFiat="1000" />);
+
+    expect(formatFiat).toHaveBeenCalledTimes(1);
+    const passed = formatFiat.mock.calls[0][0];
+    expect(BigNumber.isBigNumber(passed)).toBe(true);
+    // 1000 * 1.05^5 = 1276.2815625
+    expect(passed.toFixed(4)).toBe('1276.2816');
+  });
+
+  it('returns null when amountFiat is non-numeric', () => {
+    mockBalance({ apy: 5 });
+
+    const { queryByTestId } = render(
+      <ProjectedFiveYearBalance amountFiat="abc" />,
+    );
+
+    expect(queryByTestId('projected-five-year-balance')).toBeNull();
+  });
+});
diff --git a/app/components/Views/confirmations/components/projected-five-year-balance/projected-five-year-balance.tsx b/app/components/Views/confirmations/components/projected-five-year-balance/projected-five-year-balance.tsx
new file mode 100644
index 00000000000..527af80e6ed
--- /dev/null
+++ b/app/components/Views/confirmations/components/projected-five-year-balance/projected-five-year-balance.tsx
@@ -0,0 +1,56 @@
+import React, { useMemo } from 'react';
+import { View } from 'react-native';
+import BigNumber from 'bignumber.js';
+import {
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import useMoneyAccountBalance from '../../../../UI/Money/hooks/useMoneyAccountBalance';
+import useFiatFormatter from '../../../../UI/SimulationDetails/FiatDisplay/useFiatFormatter';
+import { strings } from '../../../../../../locales/i18n';
+
+const PROJECTION_YEARS = 5;
+
+export interface ProjectedFiveYearBalanceProps {
+  amountFiat: string;
+}
+
+export function ProjectedFiveYearBalance({
+  amountFiat,
+}: ProjectedFiveYearBalanceProps) {
+  const { vaultApyQuery } = useMoneyAccountBalance();
+  const formatFiat = useFiatFormatter();
+
+  const projected = useMemo(() => {
+    const apy = vaultApyQuery.data?.apy;
+    if (typeof apy !== 'number' || !isFinite(apy) || apy < 0) {
+      return null;
+    }
+
+    const amount = new BigNumber(amountFiat || '0');
+    if (!amount.isFinite()) {
+      return null;
+    }
+
+    const growthFactor = new BigNumber(1).plus(
+      new BigNumber(apy).dividedBy(100),
+    );
+    return amount.multipliedBy(growthFactor.pow(PROJECTION_YEARS));
+  }, [amountFiat, vaultApyQuery.data?.apy]);
+
+  if (vaultApyQuery.isLoading || projected === null) {
+    return null;
+  }
+
+  return (
+    <View testID="projected-five-year-balance">
+      <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+        {strings('confirm.custom_amount.projected_five_year_balance')}{' '}
+        <Text variant={TextVariant.BodyMd} color={TextColor.SuccessDefault}>
+          {formatFiat(projected)}
+        </Text>
+      </Text>
+    </View>
+  );
+}
diff --git a/app/components/Views/confirmations/components/recipient-input/recipient-input.test.tsx b/app/components/Views/confirmations/components/recipient-input/recipient-input.test.tsx
index 95faf9246de..d91a1ce1a23 100644
--- a/app/components/Views/confirmations/components/recipient-input/recipient-input.test.tsx
+++ b/app/components/Views/confirmations/components/recipient-input/recipient-input.test.tsx
@@ -80,7 +80,6 @@ describe('RecipientInput', () => {
       loading: false,
       resolvedAddress: undefined,
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: undefined,
       toAddressWarning: undefined,
     });
diff --git a/app/components/Views/confirmations/components/rows/origin-row/origin-row.test.tsx b/app/components/Views/confirmations/components/rows/origin-row/origin-row.test.tsx
index 84d7ca2d967..ee80171fcf8 100644
--- a/app/components/Views/confirmations/components/rows/origin-row/origin-row.test.tsx
+++ b/app/components/Views/confirmations/components/rows/origin-row/origin-row.test.tsx
@@ -22,7 +22,7 @@ describe('InfoRowOrigin', () => {
       state: siweSignatureConfirmationState,
     });
     expect(getByText('Signing in with')).toBeDefined();
-    expect(getByText('0x935E7...05477')).toBeDefined();
+    expect(getByText('0x8Eeee...73D12')).toBeDefined();
   });
 
   it('does not render origin for wallet originated approvals', async () => {
diff --git a/app/components/Views/confirmations/components/rows/pay-with-row/pay-with-row.tsx b/app/components/Views/confirmations/components/rows/pay-with-row/pay-with-row.tsx
index 273d4fcc9cf..40976915551 100644
--- a/app/components/Views/confirmations/components/rows/pay-with-row/pay-with-row.tsx
+++ b/app/components/Views/confirmations/components/rows/pay-with-row/pay-with-row.tsx
@@ -47,6 +47,7 @@ import {
 import { useConfirmationMetricEvents } from '../../../hooks/metrics/useConfirmationMetricEvents';
 import { type PaymentMethod } from '@metamask/ramps-controller';
 import { useMoneyAccountPayToken } from '../../../hooks/pay/useMoneyAccountPayToken';
+
 export function PayWithRow() {
   const navigation = useNavigation();
   const { payToken } = useTransactionPayToken();
diff --git a/app/components/Views/confirmations/components/send/RedesignedSendView.testIds.ts b/app/components/Views/confirmations/components/send/RedesignedSendView.testIds.ts
index 7d047936d7b..9e7b77a3337 100644
--- a/app/components/Views/confirmations/components/send/RedesignedSendView.testIds.ts
+++ b/app/components/Views/confirmations/components/send/RedesignedSendView.testIds.ts
@@ -1,6 +1,7 @@
 export const RedesignedSendViewSelectorsIDs = {
   SEND_AMOUNT: 'send_amount',
   EDIT_AMOUNT_KEYBOARD: 'edit-amount-keyboard',
+  PERCENTAGE_BUTTON_50: 'percentage-button-50',
   PERCENTAGE_BUTTON_100: 'percentage-button-100',
   RECIPIENT_ADDRESS_INPUT: 'recipient-address-input',
   REVIEW_BUTTON: 'review-button',
diff --git a/app/components/Views/confirmations/components/send/recipient/recipient.test.tsx b/app/components/Views/confirmations/components/send/recipient/recipient.test.tsx
index 7a8aae5cbca..75220003613 100644
--- a/app/components/Views/confirmations/components/send/recipient/recipient.test.tsx
+++ b/app/components/Views/confirmations/components/send/recipient/recipient.test.tsx
@@ -10,6 +10,7 @@ import { useContacts } from '../../../hooks/send/useContacts';
 import { useToAddressValidation } from '../../../hooks/send/useToAddressValidation';
 import { useRecipientSelectionMetrics } from '../../../hooks/send/metrics/useRecipientSelectionMetrics';
 import { useSendActions } from '../../../hooks/send/useSendActions';
+import { useSendAlerts } from '../../../hooks/send/alerts/useSendAlerts';
 import { useSendType } from '../../../hooks/send/useSendType';
 import { RecipientType } from '../../UI/recipient';
 import { Recipient } from './recipient';
@@ -65,6 +66,10 @@ jest.mock('../../../hooks/send/useToAddressValidation', () => ({
   useToAddressValidation: jest.fn(),
 }));
 
+jest.mock('../../../hooks/send/alerts/useSendAlerts', () => ({
+  useSendAlerts: jest.fn(),
+}));
+
 jest.mock('../../../hooks/send/metrics/useRecipientSelectionMetrics', () => ({
   useRecipientSelectionMetrics: jest.fn(),
 }));
@@ -149,21 +154,20 @@ jest.mock('../send-alert-modal', () => ({
     isOpen,
     onAcknowledge,
     onClose,
-    title,
-    errorMessage,
+    alerts,
   }: {
     isOpen: boolean;
     onAcknowledge: () => void;
     onClose: () => void;
-    title: string;
-    errorMessage: string;
+    alerts: { title: string; message: string }[];
   }) => {
     const { View, Text, Pressable } = jest.requireActual('react-native');
-    if (!isOpen) return null;
+    if (!isOpen || !alerts?.length) return null;
+    const first = alerts[0];
     return (
       <View testID="send-alert-modal">
-        <Text testID="alert-modal-title">{title}</Text>
-        <Text testID="alert-modal-error">{errorMessage}</Text>
+        <Text testID="alert-modal-title">{first.title}</Text>
+        <Text testID="alert-modal-error">{first.message}</Text>
         <Pressable testID="alert-modal-acknowledge" onPress={onAcknowledge}>
           <Text>Acknowledge</Text>
         </Pressable>
@@ -199,6 +203,7 @@ const mockUseRecipientSelectionMetrics = jest.mocked(
   useRecipientSelectionMetrics,
 );
 const mockUseSendActions = jest.mocked(useSendActions);
+const mockUseSendAlerts = jest.mocked(useSendAlerts);
 const mockUseSendType = jest.mocked(useSendType);
 
 function createMockUseSendType(
@@ -239,11 +244,17 @@ describe('Recipient', () => {
       loading: false,
       resolvedAddress: undefined,
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: undefined,
       toAddressWarning: undefined,
     });
 
+    mockUseSendAlerts.mockReturnValue({
+      alerts: [],
+      hasUnacknowledgedAlerts: false,
+      acknowledgeAlerts: jest.fn(),
+      isAlertCheckPending: false,
+    });
+
     mockUseRecipientSelectionMetrics.mockReturnValue({
       captureRecipientSelected: mockCaptureRecipientSelected,
     });
@@ -342,7 +353,6 @@ describe('Recipient', () => {
       loading: false,
       resolvedAddress: 'some_dummy_address',
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: undefined,
       toAddressWarning: undefined,
     });
@@ -435,7 +445,6 @@ describe('Recipient', () => {
       loading: false,
       resolvedAddress: undefined,
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: undefined,
       toAddressWarning: 'Warning',
     });
@@ -463,7 +472,6 @@ describe('Recipient', () => {
       loading: false,
       resolvedAddress: undefined,
       toAddressError: 'Error',
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: undefined,
       toAddressWarning: 'Warning',
     });
@@ -501,7 +509,6 @@ describe('Recipient', () => {
       loading: true,
       resolvedAddress: undefined,
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: undefined,
       toAddressWarning: 'Warning',
     });
@@ -569,7 +576,6 @@ describe('Recipient pastedRecipient effect gating (lines 96-101)', () => {
       loading: false,
       resolvedAddress: '0xresolved',
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: '0xother',
       toAddressWarning: undefined,
     });
@@ -585,7 +591,6 @@ describe('Recipient pastedRecipient effect gating (lines 96-101)', () => {
       loading: false,
       resolvedAddress: '0xresolved',
       toAddressError: 'Invalid address',
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: '0xvalid',
       toAddressWarning: undefined,
     });
@@ -601,7 +606,6 @@ describe('Recipient pastedRecipient effect gating (lines 96-101)', () => {
       loading: false,
       resolvedAddress: '0xresolved',
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: '0xvalid',
       toAddressWarning: 'Warning',
     });
@@ -617,7 +621,6 @@ describe('Recipient pastedRecipient effect gating (lines 96-101)', () => {
       loading: true,
       resolvedAddress: '0xresolved',
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: '0xvalid',
       toAddressWarning: undefined,
     });
@@ -634,7 +637,6 @@ describe('Recipient pastedRecipient effect gating (lines 96-101)', () => {
       loading: false,
       resolvedAddress: undefined,
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: undefined,
       toAddressWarning: undefined,
     });
@@ -668,7 +670,6 @@ describe('Recipient pastedRecipient effect gating (lines 96-101)', () => {
       loading: false,
       resolvedAddress: undefined,
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: undefined,
       toAddressWarning: undefined,
     });
@@ -706,7 +707,6 @@ describe('Recipient pastedRecipient effect gating (lines 96-101)', () => {
       loading: false,
       resolvedAddress: undefined,
       toAddressError: 'Error',
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: undefined,
       toAddressWarning: undefined,
     });
@@ -744,7 +744,10 @@ describe('SendAlertModal integration', () => {
   let mockHandleSubmitPressLocal: jest.Mock;
 
   const setupTokenContractScenario = (
-    overrides: Partial<ReturnType<typeof useToAddressValidation>> = {},
+    validationOverrides: Partial<
+      ReturnType<typeof useToAddressValidation>
+    > = {},
+    sendAlertsOverrides: Partial<ReturnType<typeof useSendAlerts>> = {},
   ) => {
     mockHandleSubmitPressLocal = jest.fn();
     mockUseSendActions.mockReturnValue({
@@ -771,11 +774,24 @@ describe('SendAlertModal integration', () => {
     mockUseToAddressValidation.mockReturnValue({
       loading: false,
       resolvedAddress: undefined,
-      toAddressError: 'Token contract warning',
-      toAddressErrorAllowAcknowledge: true,
+      toAddressError: undefined,
       toAddressValidated: '0x1234567890123456789012345678901234567890',
       toAddressWarning: undefined,
-      ...overrides,
+      ...validationOverrides,
+    });
+
+    mockUseSendAlerts.mockReturnValue({
+      alerts: [
+        {
+          key: 'tokenContract',
+          title: 'Smart contract address',
+          message: 'You are sending to a smart contract address',
+        },
+      ],
+      hasUnacknowledgedAlerts: true,
+      acknowledgeAlerts: jest.fn(),
+      isAlertCheckPending: false,
+      ...sendAlertsOverrides,
     });
 
     mockUseRecipientSelectionMetrics.mockReturnValue({
@@ -793,7 +809,7 @@ describe('SendAlertModal integration', () => {
     jest.clearAllMocks();
   });
 
-  it('opens alert modal when review pressed and toAddressErrorAllowAcknowledge is true', () => {
+  it('opens alert modal when review pressed and has unacknowledged send alerts', () => {
     setupTokenContractScenario();
 
     const { getByTestId } = renderWithProvider(<Recipient />);
@@ -841,11 +857,16 @@ describe('SendAlertModal integration', () => {
     );
   });
 
-  it('does not show alert modal when toAddressErrorAllowAcknowledge is false', () => {
-    setupTokenContractScenario({
-      toAddressError: 'Some error',
-      toAddressErrorAllowAcknowledge: false,
-    });
+  it('does not show alert modal when there are no unacknowledged send alerts', () => {
+    setupTokenContractScenario(
+      {
+        toAddressError: 'Some error',
+      },
+      {
+        alerts: [],
+        hasUnacknowledgedAlerts: false,
+      },
+    );
 
     const { getByTestId, queryByTestId } = renderWithProvider(<Recipient />);
 
@@ -892,11 +913,17 @@ describe('SendAlertModal integration', () => {
       loading: false,
       resolvedAddress: undefined,
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: '0xvalid',
       toAddressWarning: undefined,
     });
 
+    mockUseSendAlerts.mockReturnValue({
+      alerts: [],
+      hasUnacknowledgedAlerts: false,
+      acknowledgeAlerts: jest.fn(),
+      isAlertCheckPending: false,
+    });
+
     mockUseAccounts.mockReturnValue(mockAccounts);
     mockUseContacts.mockReturnValue(mockContacts);
     mockUseSendType.mockReturnValue({
diff --git a/app/components/Views/confirmations/components/send/recipient/recipient.tsx b/app/components/Views/confirmations/components/send/recipient/recipient.tsx
index 3fce15c9076..178ff99b9ac 100644
--- a/app/components/Views/confirmations/components/send/recipient/recipient.tsx
+++ b/app/components/Views/confirmations/components/send/recipient/recipient.tsx
@@ -15,6 +15,7 @@ import Banner, {
 } 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';
 import { useRecipientSelectionMetrics } from '../../../hooks/send/metrics/useRecipientSelectionMetrics';
 import { useAccounts } from '../../../hooks/send/useAccounts';
 import { useContacts } from '../../../hooks/send/useContacts';
@@ -41,15 +42,20 @@ export const Recipient = () => {
   const styles = styleSheet();
   const {
     toAddressError,
-    toAddressErrorAllowAcknowledge,
     toAddressWarning,
     toAddressValidated,
     loading,
     resolvedAddress,
   } = useToAddressValidation();
 
-  const hasBlockingError =
-    Boolean(toAddressError) && !toAddressErrorAllowAcknowledge;
+  const {
+    alerts,
+    hasUnacknowledgedAlerts,
+    acknowledgeAlerts,
+    isAlertCheckPending,
+  } = useSendAlerts();
+
+  const hasBlockingError = Boolean(toAddressError);
   // This hook needs to be called to update ERC721 NFTs in send flow
   // because that flow is triggered directly from the asset details page and user is redirected to the recipient page
   useRouteParams();
@@ -98,15 +104,16 @@ export const Recipient = () => {
 
   const handleAlertModalAcknowledge = useCallback(async () => {
     setIsAlertModalOpen(false);
+    acknowledgeAlerts();
     await proceedWithSubmit(false);
-  }, [proceedWithSubmit]);
+  }, [acknowledgeAlerts, proceedWithSubmit]);
 
   const handleReview = useCallback(
     async (isPasted?: boolean) => {
       if (hasBlockingError || isSubmittingTransaction) {
         return;
       }
-      if (toAddressErrorAllowAcknowledge) {
+      if (hasUnacknowledgedAlerts) {
         setIsAlertModalOpen(true);
         return;
       }
@@ -114,7 +121,7 @@ export const Recipient = () => {
     },
     [
       hasBlockingError,
-      toAddressErrorAllowAcknowledge,
+      hasUnacknowledgedAlerts,
       isSubmittingTransaction,
       proceedWithSubmit,
     ],
@@ -126,7 +133,9 @@ export const Recipient = () => {
       pastedRecipient === toAddressValidated &&
       !toAddressError &&
       !toAddressWarning &&
-      !loading
+      !loading &&
+      !isAlertCheckPending &&
+      !hasUnacknowledgedAlerts
     ) {
       handleReview(true);
     }
@@ -137,6 +146,8 @@ export const Recipient = () => {
     toAddressValidated,
     toAddressWarning,
     loading,
+    isAlertCheckPending,
+    hasUnacknowledgedAlerts,
   ]);
 
   const onRecipientSelected = useCallback(
@@ -240,7 +251,10 @@ export const Recipient = () => {
                 twClassName="w-full"
                 isDanger={!loading && hasBlockingError}
                 disabled={
-                  hasBlockingError || isSubmittingTransaction || loading
+                  hasBlockingError ||
+                  isSubmittingTransaction ||
+                  loading ||
+                  isAlertCheckPending
                 }
                 isLoading={isSubmittingTransaction || loading}
               >
@@ -250,8 +264,7 @@ export const Recipient = () => {
           )}
           <SendAlertModal
             isOpen={isAlertModalOpen}
-            title={strings('send.smart_contract_address')}
-            errorMessage={strings('send.smart_contract_address_warning')}
+            alerts={alerts}
             onAcknowledge={handleAlertModalAcknowledge}
             onClose={handleAlertModalClose}
           />
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 4327e5fbe17..e01f8ab64b0 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
@@ -2,6 +2,7 @@ import React from 'react';
 import { fireEvent } from '@testing-library/react-native';
 
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
+import type { SendAlert } from '../../../hooks/send/alerts/types';
 import { SendAlertModal } from './send-alert-modal';
 
 jest.mock('../../../../../../../locales/i18n', () => ({
@@ -9,6 +10,8 @@ jest.mock('../../../../../../../locales/i18n', () => ({
     const mockStrings: Record<string, string> = {
       'send.cancel': 'Cancel',
       'send.i_understand': 'I understand',
+      'send.alert_navigation_previous': 'Previous alert',
+      'send.alert_navigation_next': 'Next alert',
     };
     return mockStrings[key] || key;
   }),
@@ -70,11 +73,32 @@ jest.mock(
   },
 );
 
+const singleAlert: SendAlert[] = [
+  {
+    key: 'tokenContract',
+    title: 'Token Contract Address',
+    message: 'Sending to a token contract may result in lost tokens.',
+  },
+];
+
+const twoAlerts: SendAlert[] = [
+  {
+    key: 'tokenContract',
+    title: 'Smart contract address',
+    message: 'Token contract warning text.',
+  },
+  {
+    key: 'firstTimeInteraction',
+    title: 'New address',
+    message: 'First time message',
+    acknowledgeButtonLabel: 'Continue',
+  },
+];
+
 describe('SendAlertModal', () => {
   const defaultProps = {
     isOpen: true,
-    title: 'Token Contract Address',
-    errorMessage: 'Sending to a token contract may result in lost tokens.',
+    alerts: singleAlert,
     onAcknowledge: jest.fn(),
     onClose: jest.fn(),
   };
@@ -91,6 +115,14 @@ describe('SendAlertModal', () => {
     expect(toJSON()).toBeNull();
   });
 
+  it('returns null when alerts is empty', () => {
+    const { toJSON } = renderWithProvider(
+      <SendAlertModal {...defaultProps} alerts={[]} />,
+    );
+
+    expect(toJSON()).toBeNull();
+  });
+
   it('renders modal content when isOpen is true', () => {
     const { getByText } = renderWithProvider(
       <SendAlertModal {...defaultProps} />,
@@ -102,22 +134,6 @@ describe('SendAlertModal', () => {
     ).toBeOnTheScreen();
   });
 
-  it('displays the title text', () => {
-    const { getByText } = renderWithProvider(
-      <SendAlertModal {...defaultProps} title="Custom Title" />,
-    );
-
-    expect(getByText('Custom Title')).toBeOnTheScreen();
-  });
-
-  it('displays the error message text', () => {
-    const { getByText } = renderWithProvider(
-      <SendAlertModal {...defaultProps} errorMessage="Custom error message" />,
-    );
-
-    expect(getByText('Custom error message')).toBeOnTheScreen();
-  });
-
   it('calls onClose when cancel button is pressed', () => {
     const onClose = jest.fn();
     const { getByTestId } = renderWithProvider(
@@ -129,7 +145,7 @@ describe('SendAlertModal', () => {
     expect(onClose).toHaveBeenCalledTimes(1);
   });
 
-  it('calls onAcknowledge when acknowledge button is pressed', () => {
+  it('calls onAcknowledge when acknowledge is pressed on last alert', () => {
     const onAcknowledge = jest.fn();
     const { getByTestId } = renderWithProvider(
       <SendAlertModal {...defaultProps} onAcknowledge={onAcknowledge} />,
@@ -140,37 +156,22 @@ describe('SendAlertModal', () => {
     expect(onAcknowledge).toHaveBeenCalledTimes(1);
   });
 
-  it('does not call onAcknowledge when cancel is pressed', () => {
+  it('advances to second alert when multiple alerts and first acknowledge', () => {
     const onAcknowledge = jest.fn();
-    const onClose = jest.fn();
-    const { getByTestId } = renderWithProvider(
+    const { getByText, getByTestId } = renderWithProvider(
       <SendAlertModal
         {...defaultProps}
+        alerts={twoAlerts}
         onAcknowledge={onAcknowledge}
-        onClose={onClose}
       />,
     );
 
-    fireEvent.press(getByTestId('send-alert-modal-cancel-button'));
-
+    expect(getByText('Smart contract address')).toBeOnTheScreen();
+    fireEvent.press(getByTestId('send-alert-modal-acknowledge-button'));
+    expect(getByText('New address')).toBeOnTheScreen();
     expect(onAcknowledge).not.toHaveBeenCalled();
-    expect(onClose).toHaveBeenCalledTimes(1);
-  });
-
-  it('does not call onClose when acknowledge is pressed', () => {
-    const onAcknowledge = jest.fn();
-    const onClose = jest.fn();
-    const { getByTestId } = renderWithProvider(
-      <SendAlertModal
-        {...defaultProps}
-        onAcknowledge={onAcknowledge}
-        onClose={onClose}
-      />,
-    );
 
     fireEvent.press(getByTestId('send-alert-modal-acknowledge-button'));
-
-    expect(onClose).not.toHaveBeenCalled();
     expect(onAcknowledge).toHaveBeenCalledTimes(1);
   });
 });
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 5fa80651a23..aa65df44b5a 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
@@ -1,8 +1,10 @@
-import React, { useRef } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import {
   Box,
   BoxAlignItems,
   BoxFlexDirection,
+  BoxJustifyContent,
+  ButtonIcon,
   Icon,
   IconColor,
   IconName,
@@ -20,38 +22,138 @@ import {
   ButtonSize,
   ButtonVariants,
 } from '../../../../../../component-library/components/Buttons/Button';
+import type { SendAlert } from '../../../hooks/send/alerts/types';
 import { SendAlertModalProps } from './send-alert-modal.types';
 
+function PageNavigation({
+  alerts,
+  selectedIndex,
+  onBack,
+  onForward,
+}: {
+  alerts: SendAlert[];
+  selectedIndex: number;
+  onBack: () => void;
+  onForward: () => void;
+}) {
+  if (alerts.length <= 1) {
+    return null;
+  }
+
+  return (
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      alignItems={BoxAlignItems.Center}
+      justifyContent={BoxJustifyContent.Between}
+      twClassName="w-full px-4 pb-2"
+    >
+      <Box twClassName="w-10 items-start justify-center">
+        {selectedIndex > 0 ? (
+          <ButtonIcon
+            accessibilityLabel={strings('send.alert_navigation_previous')}
+            iconName={IconName.ArrowLeft}
+            onPress={onBack}
+            testID="send-alert-modal-nav-back"
+          />
+        ) : (
+          <Box twClassName="w-10" />
+        )}
+      </Box>
+      <Box twClassName="w-10 items-end justify-center">
+        {selectedIndex < alerts.length - 1 ? (
+          <ButtonIcon
+            accessibilityLabel={strings('send.alert_navigation_next')}
+            iconName={IconName.ArrowRight}
+            onPress={onForward}
+            testID="send-alert-modal-nav-forward"
+          />
+        ) : (
+          <Box twClassName="w-10" />
+        )}
+      </Box>
+    </Box>
+  );
+}
+
 export const SendAlertModal = ({
   isOpen,
-  title,
-  errorMessage,
+  alerts,
   onAcknowledge,
   onClose,
 }: SendAlertModalProps) => {
   const bottomSheetRef = useRef<BottomSheetRef>(null);
+  const [currentIndex, setCurrentIndex] = useState(0);
+
+  const alertKeys = alerts.map((a) => a.key).join('|');
+
+  useEffect(() => {
+    setCurrentIndex(0);
+  }, [isOpen, alertKeys]);
+
+  const safeIndex = Math.min(currentIndex, Math.max(alerts.length - 1, 0));
+  const currentAlert = alerts[safeIndex];
+
+  const goToPrevious = useCallback(() => {
+    setCurrentIndex((prev) => Math.max(prev - 1, 0));
+  }, []);
+
+  const goToNext = useCallback(() => {
+    setCurrentIndex((prev) => Math.min(prev + 1, alerts.length - 1));
+  }, [alerts.length]);
+
+  const isOnLastAlert = safeIndex >= Math.max(alerts.length - 1, 0);
+
+  const handleAcknowledgeStep = useCallback(() => {
+    if (isOnLastAlert) {
+      onAcknowledge();
+      return;
+    }
+    goToNext();
+  }, [goToNext, isOnLastAlert, onAcknowledge]);
 
   if (!isOpen) {
     return null;
   }
 
+  if (!currentAlert) {
+    return null;
+  }
+
+  const acknowledgeLabel =
+    currentAlert.acknowledgeButtonLabel ?? strings('send.i_understand');
+
   return (
     <BottomSheet ref={bottomSheetRef} onClose={onClose}>
+      <PageNavigation
+        alerts={alerts}
+        selectedIndex={safeIndex}
+        onBack={goToPrevious}
+        onForward={goToNext}
+      />
       <Box
         flexDirection={BoxFlexDirection.Column}
         alignItems={BoxAlignItems.Center}
         gap={3}
-        twClassName="px-4 pt-4 pb-2"
+        twClassName="px-4 pt-2 pb-2"
       >
         <Icon
           name={IconName.Danger}
           size={IconSize.Xl}
           color={IconColor.WarningDefault}
         />
-        <Text variant={TextVariant.HeadingMd}>{title}</Text>
-        <Text variant={TextVariant.BodyMd} twClassName="text-center">
-          {errorMessage}
-        </Text>
+        <Text variant={TextVariant.HeadingMd}>{currentAlert.title}</Text>
+        <Box twClassName="w-full max-w-full">
+          {typeof currentAlert.message === 'string' ? (
+            <Text
+              variant={TextVariant.BodyMd}
+              twClassName="text-center break-words"
+            >
+              {currentAlert.message}
+            </Text>
+          ) : (
+            currentAlert.message
+          )}
+        </Box>
       </Box>
       <BottomSheetFooter
         buttonsAlignment={ButtonsAlignment.Horizontal}
@@ -66,8 +168,8 @@ export const SendAlertModal = ({
           {
             variant: ButtonVariants.Primary,
             size: ButtonSize.Lg,
-            label: strings('send.i_understand'),
-            onPress: onAcknowledge,
+            label: acknowledgeLabel,
+            onPress: handleAcknowledgeStep,
             testID: 'send-alert-modal-acknowledge-button',
           },
         ]}
diff --git a/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.types.ts b/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.types.ts
index ebb4cd421c3..a1a3632ac51 100644
--- a/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.types.ts
+++ b/app/components/Views/confirmations/components/send/send-alert-modal/send-alert-modal.types.ts
@@ -1,7 +1,8 @@
+import type { SendAlert } from '../../../hooks/send/alerts/types';
+
 export interface SendAlertModalProps {
   isOpen: boolean;
-  title: string;
-  errorMessage: string;
+  alerts: SendAlert[];
   onAcknowledge: () => void;
   onClose: () => void;
 }
diff --git a/app/components/Views/confirmations/components/send/send.non-evm.view.test.tsx b/app/components/Views/confirmations/components/send/send.non-evm.view.test.tsx
new file mode 100644
index 00000000000..ab0bb5c503b
--- /dev/null
+++ b/app/components/Views/confirmations/components/send/send.non-evm.view.test.tsx
@@ -0,0 +1,480 @@
+import '../../../../../../tests/component-view/mocks';
+import React from 'react';
+import { fireEvent, screen, waitFor } from '@testing-library/react-native';
+import { renderScreenWithRoutes } from '../../../../../../tests/component-view/render';
+import {
+  buildAddressBookOverridesWithEvmContact,
+  buildNonEvmSendAccountsOverrides,
+  buildTronSendFixture,
+  NON_EVM_BTC_ACCOUNT_ID,
+  NON_EVM_SOLANA_ACCOUNT_ID,
+  sendViewOverrides,
+} from '../../../../../../tests/component-view/presets/send';
+import { initialStateWallet } from '../../../../../../tests/component-view/presets/wallet';
+import { describeForPlatforms } from '../../../../../../tests/component-view/platform';
+import Routes from '../../../../../constants/navigation/Routes';
+import {
+  getRecipientRowTestId,
+  getSelectedRecipientTestId,
+  RedesignedSendViewSelectorsIDs,
+} from './RedesignedSendView.testIds';
+import { Send } from './send';
+import { HardwareWalletProvider } from '../../../../../core/HardwareWallet/HardwareWalletProvider';
+import {
+  clearSnapControllerHandleRequestMock,
+  setupSnapControllerHandleRequestMock,
+} from '../../../../../../tests/component-view/helpers/snapRequests';
+
+const BTC_MAINNET_CHAIN_ID = 'bip122:000000000019d6689c085ae165831e93' as const;
+
+const SOLANA_MAINNET_CHAIN_ID =
+  'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' as const;
+
+const TRON_MAINNET_CHAIN_ID = 'tron:728126428' as const;
+
+const NON_EVM_NETWORK_OVERRIDE = {
+  engine: {
+    backgroundState: {
+      MultichainNetworkController: {
+        isEvmSelected: false,
+      },
+    },
+  },
+} as unknown as Record<string, unknown>;
+
+/** Native SOL (smoke `send-solana-token` / non-EVM send tests). */
+const SOLANA_NATIVE_ASSET = {
+  address: `${SOLANA_MAINNET_CHAIN_ID}/native`,
+  chainId: SOLANA_MAINNET_CHAIN_ID,
+  symbol: 'SOL',
+  decimals: 9,
+  balance: '100',
+  rawBalance: '100',
+};
+
+const SOLANA_NATIVE_ASSET_SEND_FIVE = {
+  ...SOLANA_NATIVE_ASSET,
+  balance: '10',
+  rawBalance: '10000000000',
+  accountId: NON_EVM_SOLANA_ACCOUNT_ID,
+};
+
+const BTC_NATIVE_ASSET_SEND_FIVE = {
+  address: `${BTC_MAINNET_CHAIN_ID}/slip44:0`,
+  chainId: BTC_MAINNET_CHAIN_ID,
+  symbol: 'BTC',
+  decimals: 8,
+  balance: '10',
+  rawBalance: '0x3B9ACA00', // 10 BTC in sats
+  isNative: true,
+  accountId: NON_EVM_BTC_ACCOUNT_ID,
+};
+
+/** Native BTC with 1 satoshi on-chain balance — any full-unit input exceeds it. */
+const MINIMAL_BTC_BALANCE_ASSET = {
+  address: `${BTC_MAINNET_CHAIN_ID}/slip44:0`,
+  chainId: BTC_MAINNET_CHAIN_ID,
+  symbol: 'BTC',
+  decimals: 8,
+  balance: '0.00000001',
+  rawBalance: '0x1',
+  isNative: true,
+};
+
+const TRON_NATIVE_ASSET_SEND_FIVE = {
+  address: `${TRON_MAINNET_CHAIN_ID}/native`,
+  chainId: TRON_MAINNET_CHAIN_ID,
+  symbol: 'TRX',
+  decimals: 6,
+  balance: '10',
+  rawBalance: '0x989680', // 10 TRX in sun
+  accountId: 'tron-acc-1',
+};
+
+const VALID_SOLANA_RECIPIENT = '11111111111111111111111111111111';
+const VALID_BTC_RECIPIENT = 'bc1qxy2kgdygjrsqtzq2n0yrf2493p83kkfjhx0wlh';
+
+function SendFlowWithHardwareWalletProvider() {
+  return (
+    <HardwareWalletProvider>
+      <Send />
+    </HardwareWalletProvider>
+  );
+}
+
+describeForPlatforms('Send (Non-EVM)', () => {
+  let snapHandleRequestSpy: jest.SpyInstance;
+
+  beforeEach(() => {
+    snapHandleRequestSpy = setupSnapControllerHandleRequestMock({
+      onAmountInputResponse: { valid: true, errors: [] },
+      confirmSendResponse: { valid: true },
+    });
+  });
+
+  afterEach(() => {
+    clearSnapControllerHandleRequestMock();
+  });
+
+  // Regression test for Issue #22789 and related to #23251
+  // TRON send flow: selecting a destination account must move the flow forward
+  // (previously it stayed on the recipient list and did not navigate).
+  it('TRON send: selecting destination account updates selection', async () => {
+    const { tronOverrides, recipientAddresses } = buildTronSendFixture();
+
+    const state = initialStateWallet().withOverrides(tronOverrides).build();
+
+    const tronAsset = {
+      address: `${TRON_MAINNET_CHAIN_ID}/native`,
+      chainId: TRON_MAINNET_CHAIN_ID,
+      symbol: 'TRX',
+      decimals: 6,
+      balance: '100',
+      rawBalance: '0x64',
+      accountId: 'tron-acc-1',
+    };
+
+    const { getByTestId, getByRole, findByTestId } = renderScreenWithRoutes(
+      Send as unknown as React.ComponentType,
+      { name: Routes.SEND.DEFAULT },
+      [],
+      { state },
+      { screen: Routes.SEND.AMOUNT, params: { asset: tronAsset } },
+    );
+
+    expect(
+      getByTestId(RedesignedSendViewSelectorsIDs.SEND_AMOUNT),
+    ).toBeOnTheScreen();
+
+    fireEvent.press(
+      getByTestId(RedesignedSendViewSelectorsIDs.PERCENTAGE_BUTTON_100),
+    );
+    fireEvent.press(getByRole('button', { name: 'Continue' }));
+
+    expect(
+      await findByTestId(
+        RedesignedSendViewSelectorsIDs.RECIPIENT_ADDRESS_INPUT,
+      ),
+    ).toBeOnTheScreen();
+
+    const recipientItem = await findByTestId(
+      getRecipientRowTestId(recipientAddresses[0]),
+      {},
+      { timeout: 10000 },
+    );
+    fireEvent.press(recipientItem);
+
+    expect(
+      await findByTestId(
+        getSelectedRecipientTestId(recipientAddresses[0]),
+        {},
+        { timeout: 10000 },
+      ),
+    ).toBeOnTheScreen();
+  });
+
+  /**
+   * Regression test for issue #22205
+   * EVM contacts must not appear in non-EVM (e.g. Solana, BTC) send flow Recipient screen.
+   * Only contacts for the current chain/protocol should be shown.
+   */
+  it('Solana send Recipient screen does not show EVM contacts', async () => {
+    const EVM_CONTACT_ADDRESS = '0x1234567890123456789012345678901234567890';
+
+    const addressBookOverrides =
+      buildAddressBookOverridesWithEvmContact(EVM_CONTACT_ADDRESS);
+
+    const state = initialStateWallet()
+      .withOverrides(sendViewOverrides)
+      .withOverrides(addressBookOverrides)
+      .build();
+
+    const { findByTestId, queryByTestId } = renderScreenWithRoutes(
+      Send as unknown as React.ComponentType,
+      { name: Routes.SEND.DEFAULT },
+      [],
+      { state },
+      {
+        screen: Routes.SEND.RECIPIENT,
+        params: { asset: SOLANA_NATIVE_ASSET },
+      },
+    );
+
+    expect(
+      await findByTestId(
+        RedesignedSendViewSelectorsIDs.RECIPIENT_ADDRESS_INPUT,
+      ),
+    ).toBeOnTheScreen();
+
+    const evmContactRow = queryByTestId(
+      getRecipientRowTestId(EVM_CONTACT_ADDRESS),
+    );
+    expect(evmContactRow).not.toBeOnTheScreen();
+  });
+
+  it('Bitcoin send Recipient screen does not show EVM contacts', async () => {
+    const EVM_CONTACT_ADDRESS = '0x1234567890123456789012345678901234567890';
+
+    const addressBookOverrides =
+      buildAddressBookOverridesWithEvmContact(EVM_CONTACT_ADDRESS);
+
+    const state = initialStateWallet()
+      .withOverrides(sendViewOverrides)
+      .withOverrides(addressBookOverrides)
+      .build();
+
+    const { findByTestId, queryByTestId } = renderScreenWithRoutes(
+      Send as unknown as React.ComponentType,
+      { name: Routes.SEND.DEFAULT },
+      [],
+      { state },
+      {
+        screen: Routes.SEND.RECIPIENT,
+        params: { asset: MINIMAL_BTC_BALANCE_ASSET },
+      },
+    );
+
+    expect(
+      await findByTestId(
+        RedesignedSendViewSelectorsIDs.RECIPIENT_ADDRESS_INPUT,
+      ),
+    ).toBeOnTheScreen();
+
+    const evmContactRow = queryByTestId(
+      getRecipientRowTestId(EVM_CONTACT_ADDRESS),
+    );
+    expect(evmContactRow).not.toBeOnTheScreen();
+  });
+
+  it('Solana native: Amount screen shows Send title and SOL', async () => {
+    const state = initialStateWallet()
+      .withOverrides(sendViewOverrides)
+      .withOverrides(NON_EVM_NETWORK_OVERRIDE)
+      .build();
+
+    const { getByTestId } = renderScreenWithRoutes(
+      Send as unknown as React.ComponentType,
+      { name: Routes.SEND.DEFAULT },
+      [],
+      { state },
+      { screen: Routes.SEND.AMOUNT, params: { asset: SOLANA_NATIVE_ASSET } },
+    );
+
+    expect(
+      getByTestId(RedesignedSendViewSelectorsIDs.SEND_AMOUNT),
+    ).toBeOnTheScreen();
+    // Title and/or other copy may repeat "Send" — mirror E2E "text displayed" checks
+    expect(screen.getAllByText('Send').length).toBeGreaterThanOrEqual(1);
+    expect(screen.getAllByText('SOL').length).toBeGreaterThanOrEqual(1);
+  });
+
+  it('Solana native: digit 5 submits and opens transfer confirmation route', async () => {
+    const state = initialStateWallet()
+      .withOverrides(sendViewOverrides)
+      .withOverrides(NON_EVM_NETWORK_OVERRIDE)
+      .withOverrides(buildNonEvmSendAccountsOverrides())
+      .build();
+
+    const { getByTestId, getByText, getByRole, findByTestId } =
+      renderScreenWithRoutes(
+        SendFlowWithHardwareWalletProvider as unknown as React.ComponentType,
+        { name: Routes.SEND.DEFAULT },
+        [{ name: Routes.TRANSACTIONS_VIEW }],
+        { state },
+        {
+          screen: Routes.SEND.AMOUNT,
+          params: { asset: SOLANA_NATIVE_ASSET_SEND_FIVE },
+        },
+      );
+
+    expect(
+      getByTestId(RedesignedSendViewSelectorsIDs.SEND_AMOUNT),
+    ).toBeOnTheScreen();
+
+    fireEvent.press(getByText('5'));
+
+    const continueButton = getByRole('button', { name: 'Continue' });
+    await waitFor(() => expect(continueButton).toBeEnabled(), {
+      timeout: 5000,
+    });
+    fireEvent.press(continueButton);
+
+    const recipientInput = await findByTestId(
+      RedesignedSendViewSelectorsIDs.RECIPIENT_ADDRESS_INPUT,
+      {},
+      { timeout: 5000 },
+    );
+    fireEvent.changeText(recipientInput, VALID_SOLANA_RECIPIENT);
+
+    const reviewButton = await findByTestId(
+      RedesignedSendViewSelectorsIDs.REVIEW_BUTTON,
+      {},
+      { timeout: 5000 },
+    );
+    await waitFor(() => expect(reviewButton).toBeEnabled(), {
+      timeout: 5000,
+    });
+    fireEvent.press(reviewButton);
+
+    await waitFor(() => {
+      expect(snapHandleRequestSpy).toHaveBeenCalledWith(
+        'SnapController:handleRequest',
+        expect.objectContaining({
+          request: expect.objectContaining({ method: 'confirmSend' }),
+        }),
+      );
+    });
+
+    expect(await findByTestId('route-TransactionsView')).toBeOnTheScreen();
+  }, 20000);
+
+  it('Bitcoin Amount: exceeding balance shows Insufficient funds', async () => {
+    const state = initialStateWallet()
+      .withOverrides(sendViewOverrides)
+      .withOverrides(NON_EVM_NETWORK_OVERRIDE)
+      .build();
+
+    const { getByTestId, getByText, findByRole } = renderScreenWithRoutes(
+      Send as unknown as React.ComponentType,
+      { name: Routes.SEND.DEFAULT },
+      [],
+      { state },
+      {
+        screen: Routes.SEND.AMOUNT,
+        params: { asset: MINIMAL_BTC_BALANCE_ASSET },
+      },
+    );
+
+    expect(
+      getByTestId(RedesignedSendViewSelectorsIDs.SEND_AMOUNT),
+    ).toBeOnTheScreen();
+
+    // One satoshi balance; keypad "1" is 1 BTC — far exceeds balance
+    fireEvent.press(getByText('1'));
+
+    expect(
+      await findByRole(
+        'button',
+        { name: 'Insufficient funds' },
+        { timeout: 5000 },
+      ),
+    ).toBeOnTheScreen();
+  });
+
+  it('Bitcoin native: digit 5 submits and opens transfer confirmation route', async () => {
+    const state = initialStateWallet()
+      .withOverrides(sendViewOverrides)
+      .withOverrides(NON_EVM_NETWORK_OVERRIDE)
+      .withOverrides(buildNonEvmSendAccountsOverrides())
+      .build();
+
+    const { getByTestId, getByText, getByRole, findByTestId } =
+      renderScreenWithRoutes(
+        SendFlowWithHardwareWalletProvider as unknown as React.ComponentType,
+        { name: Routes.SEND.DEFAULT },
+        [{ name: Routes.TRANSACTIONS_VIEW }],
+        { state },
+        {
+          screen: Routes.SEND.AMOUNT,
+          params: { asset: BTC_NATIVE_ASSET_SEND_FIVE },
+        },
+      );
+
+    expect(
+      getByTestId(RedesignedSendViewSelectorsIDs.SEND_AMOUNT),
+    ).toBeOnTheScreen();
+
+    fireEvent.press(getByText('5'));
+
+    const continueButton = getByRole('button', { name: 'Continue' });
+    await waitFor(() => expect(continueButton).toBeEnabled(), {
+      timeout: 5000,
+    });
+    fireEvent.press(continueButton);
+
+    const recipientInput = await findByTestId(
+      RedesignedSendViewSelectorsIDs.RECIPIENT_ADDRESS_INPUT,
+      {},
+      { timeout: 5000 },
+    );
+    fireEvent.changeText(recipientInput, VALID_BTC_RECIPIENT);
+
+    const reviewButton = await findByTestId(
+      RedesignedSendViewSelectorsIDs.REVIEW_BUTTON,
+      {},
+      { timeout: 5000 },
+    );
+    await waitFor(() => expect(reviewButton).toBeEnabled(), {
+      timeout: 5000,
+    });
+    fireEvent.press(reviewButton);
+
+    await waitFor(() => {
+      expect(snapHandleRequestSpy).toHaveBeenCalledWith(
+        'SnapController:handleRequest',
+        expect.objectContaining({
+          request: expect.objectContaining({ method: 'confirmSend' }),
+        }),
+      );
+    });
+
+    expect(await findByTestId('route-TransactionsView')).toBeOnTheScreen();
+  }, 20000);
+
+  it('TRON native: digit 5 submits and opens transfer confirmation route', async () => {
+    const { tronOverrides, recipientAddresses } = buildTronSendFixture();
+    const state = initialStateWallet().withOverrides(tronOverrides).build();
+
+    const { getByTestId, getByText, getByRole, findByTestId } =
+      renderScreenWithRoutes(
+        SendFlowWithHardwareWalletProvider as unknown as React.ComponentType,
+        { name: Routes.SEND.DEFAULT },
+        [{ name: Routes.TRANSACTIONS_VIEW }],
+        { state },
+        {
+          screen: Routes.SEND.AMOUNT,
+          params: { asset: TRON_NATIVE_ASSET_SEND_FIVE },
+        },
+      );
+
+    expect(
+      getByTestId(RedesignedSendViewSelectorsIDs.SEND_AMOUNT),
+    ).toBeOnTheScreen();
+
+    fireEvent.press(getByText('5'));
+
+    const continueButton = getByRole('button', { name: 'Continue' });
+    await waitFor(() => expect(continueButton).toBeEnabled(), {
+      timeout: 5000,
+    });
+    fireEvent.press(continueButton);
+
+    const recipientInput = await findByTestId(
+      RedesignedSendViewSelectorsIDs.RECIPIENT_ADDRESS_INPUT,
+      {},
+      { timeout: 5000 },
+    );
+    fireEvent.changeText(recipientInput, recipientAddresses[0]);
+
+    const reviewButton = await findByTestId(
+      RedesignedSendViewSelectorsIDs.REVIEW_BUTTON,
+      {},
+      { timeout: 5000 },
+    );
+    await waitFor(() => expect(reviewButton).toBeEnabled(), {
+      timeout: 5000,
+    });
+    fireEvent.press(reviewButton);
+
+    await waitFor(() => {
+      expect(snapHandleRequestSpy).toHaveBeenCalledWith(
+        'SnapController:handleRequest',
+        expect.objectContaining({
+          request: expect.objectContaining({ method: 'confirmSend' }),
+        }),
+      );
+    });
+
+    expect(await findByTestId('route-TransactionsView')).toBeOnTheScreen();
+  }, 20000);
+});
diff --git a/app/components/Views/confirmations/components/send/send.view.test.tsx b/app/components/Views/confirmations/components/send/send.view.test.tsx
index a70bb4c7f41..67330dcc3b4 100644
--- a/app/components/Views/confirmations/components/send/send.view.test.tsx
+++ b/app/components/Views/confirmations/components/send/send.view.test.tsx
@@ -2,24 +2,22 @@ import '../../../../../../tests/component-view/mocks';
 import React from 'react';
 import { fireEvent, screen, waitFor } from '@testing-library/react-native';
 import { renderScreenWithRoutes } from '../../../../../../tests/component-view/render';
-import {
-  buildAddressBookOverridesWithEvmContact,
-  buildTronSendFixture,
-  sendViewOverrides,
-} from '../../../../../../tests/component-view/presets/send';
+import { sendViewOverrides } from '../../../../../../tests/component-view/presets/send';
 import { initialStateWallet } from '../../../../../../tests/component-view/presets/wallet';
 import { describeForPlatforms } from '../../../../../../tests/component-view/platform';
 import Routes from '../../../../../constants/navigation/Routes';
 import { TokenStandard } from '../../types/token';
+import { HardwareWalletProvider } from '../../../../../core/HardwareWallet/HardwareWalletProvider';
 import {
   getNftRowTestId,
   getRecipientAvatarTestId,
   getRecipientRowTestId,
-  getSelectedRecipientTestId,
   RedesignedSendViewSelectorsIDs,
 } from './RedesignedSendView.testIds';
 import { Send } from './send';
 import { SendAlertModalSelectorIDs } from './send-alert-modal/send-alert-modal.testIds';
+import { strings } from '../../../../../../locales/i18n';
+import { ConfirmationLoaderSelectorIDs } from '../../ConfirmationView.testIds';
 
 /** A minimal ETH asset with 2 ETH balance, suitable for EVM send tests. */
 const EVM_ETH_ASSET = {
@@ -31,117 +29,39 @@ const EVM_ETH_ASSET = {
   rawBalance: '0x1BC16D674EC80000', // 2 ETH
 };
 
+/**
+ * Native ETH with high balance so keypad "5" is within available funds (smoke
+ * `send-native-token` uses ~10 ETH from balances API).
+ */
+const EVM_NATIVE_ETH_ASSET_SEND_FIVE = {
+  ...EVM_ETH_ASSET,
+  balance: '10',
+  rawBalance: '0x8AC7230489E80000', // 10 ETH
+};
+
 const VALID_EVM_RECIPIENT = '0x0000000000000000000000000000000000000002';
 const TOKEN_CONTRACT_ADDRESS = '0x0000000000000000000000000000000000000003';
 
-describeForPlatforms('Send', () => {
-  describe('Non-EVM', () => {
-    // Regression test for Issue #22789 and related to #23251
-    // TRON send flow: selecting a destination account must move the flow forward
-    // (previously it stayed on the recipient list and did not navigate).
-    it('TRON send: selecting destination account updates selection', async () => {
-      const { tronOverrides, recipientAddresses } = buildTronSendFixture();
-
-      const state = initialStateWallet().withOverrides(tronOverrides).build();
-
-      const TRON_MAINNET_CHAIN_ID = 'tron:728126428';
-
-      const tronAsset = {
-        address: `${TRON_MAINNET_CHAIN_ID}/native`,
-        chainId: TRON_MAINNET_CHAIN_ID,
-        symbol: 'TRX',
-        decimals: 6,
-        balance: '100',
-        rawBalance: '0x64',
-        accountId: 'tron-acc-1',
-      };
-
-      const { getByTestId, getByRole, findByTestId } = renderScreenWithRoutes(
-        Send as unknown as React.ComponentType,
-        { name: Routes.SEND.DEFAULT },
-        [],
-        { state },
-        { screen: Routes.SEND.AMOUNT, params: { asset: tronAsset } },
-      );
-
-      expect(
-        getByTestId(RedesignedSendViewSelectorsIDs.SEND_AMOUNT),
-      ).toBeOnTheScreen();
-
-      fireEvent.press(
-        getByTestId(RedesignedSendViewSelectorsIDs.PERCENTAGE_BUTTON_100),
-      );
-      fireEvent.press(getByRole('button', { name: 'Continue' }));
-
-      expect(
-        await findByTestId(
-          RedesignedSendViewSelectorsIDs.RECIPIENT_ADDRESS_INPUT,
-        ),
-      ).toBeOnTheScreen();
-
-      const recipientItem = await findByTestId(
-        getRecipientRowTestId(recipientAddresses[0]),
-        {},
-        { timeout: 10000 },
-      );
-      fireEvent.press(recipientItem);
-
-      expect(
-        await findByTestId(
-          getSelectedRecipientTestId(recipientAddresses[0]),
-          {},
-          { timeout: 10000 },
-        ),
-      ).toBeOnTheScreen();
-    });
-
-    /**
-     * Regression test for issue #22205
-     * EVM contacts must not appear in non-EVM (e.g. Solana, BTC) send flow Recipient screen.
-     * Only contacts for the current chain/protocol should be shown.
-     */
-    it('Solana send Recipient screen does not show EVM contacts', async () => {
-      const SOLANA_CHAIN_ID = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';
-      const EVM_CONTACT_ADDRESS = '0x1234567890123456789012345678901234567890';
-
-      const addressBookOverrides =
-        buildAddressBookOverridesWithEvmContact(EVM_CONTACT_ADDRESS);
-
-      const solanaAsset = {
-        address: `${SOLANA_CHAIN_ID}/native`,
-        chainId: SOLANA_CHAIN_ID,
-        symbol: 'SOL',
-        decimals: 9,
-        balance: '100',
-        rawBalance: '100',
-      };
-
-      const state = initialStateWallet()
-        .withOverrides(sendViewOverrides)
-        .withOverrides(addressBookOverrides)
-        .build();
-
-      const { findByTestId, queryByTestId } = renderScreenWithRoutes(
-        Send as unknown as React.ComponentType,
-        { name: Routes.SEND.DEFAULT },
-        [],
-        { state },
-        { screen: Routes.SEND.RECIPIENT, params: { asset: solanaAsset } },
-      );
-
-      expect(
-        await findByTestId(
-          RedesignedSendViewSelectorsIDs.RECIPIENT_ADDRESS_INPUT,
-        ),
-      ).toBeOnTheScreen();
+/** Mainnet USDC (6 decimals), high balance — mirrors smoke ERC-20 send E2E fixture. */
+const EVM_USDC_ASSET = {
+  address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+  chainId: '0x1',
+  symbol: 'USDC',
+  decimals: 6,
+  balance: '10000',
+  rawBalance: '0x2540BE400', // 10_000 * 10^6
+  standard: TokenStandard.ERC20,
+};
 
-      const evmContactRow = queryByTestId(
-        getRecipientRowTestId(EVM_CONTACT_ADDRESS),
-      );
-      expect(evmContactRow).not.toBeOnTheScreen();
-    });
-  });
+function SendFlowWithHardwareWalletProvider() {
+  return (
+    <HardwareWalletProvider>
+      <Send />
+    </HardwareWalletProvider>
+  );
+}
 
+describeForPlatforms('Send', () => {
   describe('ERC-721', () => {
     /**
      * Regression test for issue #12317
@@ -271,8 +191,9 @@ describeForPlatforms('Send', () => {
     });
 
     /**
-     * Core EVM send happy path: Amount → Continue → Recipient.
-     * Typing a valid address must enable the Review button.
+     * Core EVM native ETH path: Amount (100%) → Continue → Recipient → Review.
+     * Uses the same `Amount` / `useAmountValidation` stack as ERC-20; native vs
+     * token is determined by asset (zero address vs contract).
      */
     it('ETH: Amount → Continue → Recipient, valid address enables Review', async () => {
       const state = initialStateWallet()
@@ -313,6 +234,175 @@ describeForPlatforms('Send', () => {
       });
     });
 
+    /**
+     * Native ETH keyed amount mirrors the smoke `send-native-token` happy path:
+     * 5 ETH -> Continue -> Recipient -> Review -> transfer confirmation route.
+     */
+    it('Native ETH: digit 5 submits and opens transfer confirmation route', async () => {
+      const state = initialStateWallet()
+        .withOverrides(sendViewOverrides)
+        .build();
+
+      const engineMock = jest.requireMock(
+        '../../../../../../app/core/Engine',
+      ) as unknown as {
+        default: {
+          context: {
+            TransactionController: { addTransaction: jest.Mock };
+          };
+        };
+      };
+      const addTransactionSpy =
+        engineMock.default.context.TransactionController.addTransaction;
+      addTransactionSpy.mockClear();
+
+      const { getByTestId, getByText, getByRole, findByTestId } =
+        renderScreenWithRoutes(
+          SendFlowWithHardwareWalletProvider as unknown as React.ComponentType,
+          { name: Routes.SEND.DEFAULT },
+          [],
+          { state },
+          {
+            screen: Routes.SEND.AMOUNT,
+            params: { asset: EVM_NATIVE_ETH_ASSET_SEND_FIVE },
+          },
+        );
+
+      expect(
+        getByTestId(RedesignedSendViewSelectorsIDs.SEND_AMOUNT),
+      ).toBeOnTheScreen();
+
+      fireEvent.press(getByText('5'));
+      fireEvent.press(getByRole('button', { name: 'Continue' }));
+
+      const recipientInput = await findByTestId(
+        RedesignedSendViewSelectorsIDs.RECIPIENT_ADDRESS_INPUT,
+        {},
+        { timeout: 5000 },
+      );
+      fireEvent.changeText(recipientInput, VALID_EVM_RECIPIENT);
+
+      const reviewButton = await findByTestId(
+        RedesignedSendViewSelectorsIDs.REVIEW_BUTTON,
+        {},
+        { timeout: 5000 },
+      );
+
+      await waitFor(() => expect(reviewButton).toBeEnabled(), {
+        timeout: 5000,
+      });
+      fireEvent.press(reviewButton);
+
+      await waitFor(() => {
+        expect(addTransactionSpy).toHaveBeenCalledTimes(1);
+      });
+
+      expect(
+        await findByTestId(ConfirmationLoaderSelectorIDs.TRANSFER),
+      ).toBeOnTheScreen();
+    });
+
+    /**
+     * Covers smoke `send-erc20-token`: 50% of balance through Recipient / Review
+     * into the transfer confirmation route.
+     */
+    it('ERC-20 USDC: 50% submits and opens transfer confirmation route', async () => {
+      const state = initialStateWallet()
+        .withOverrides(sendViewOverrides)
+        .build();
+
+      const engineMock = jest.requireMock(
+        '../../../../../../app/core/Engine',
+      ) as unknown as {
+        default: {
+          context: {
+            TransactionController: { addTransaction: jest.Mock };
+          };
+        };
+      };
+      const addTransactionSpy =
+        engineMock.default.context.TransactionController.addTransaction;
+      addTransactionSpy.mockClear();
+
+      const { getByTestId, getByRole, findByTestId } = renderScreenWithRoutes(
+        SendFlowWithHardwareWalletProvider as unknown as React.ComponentType,
+        { name: Routes.SEND.DEFAULT },
+        [],
+        { state },
+        { screen: Routes.SEND.AMOUNT, params: { asset: EVM_USDC_ASSET } },
+      );
+
+      expect(
+        getByTestId(RedesignedSendViewSelectorsIDs.SEND_AMOUNT),
+      ).toBeOnTheScreen();
+
+      fireEvent.press(
+        getByTestId(RedesignedSendViewSelectorsIDs.PERCENTAGE_BUTTON_50),
+      );
+      fireEvent.press(getByRole('button', { name: 'Continue' }));
+
+      const recipientInput = await findByTestId(
+        RedesignedSendViewSelectorsIDs.RECIPIENT_ADDRESS_INPUT,
+        {},
+        { timeout: 5000 },
+      );
+      fireEvent.changeText(recipientInput, VALID_EVM_RECIPIENT);
+
+      const reviewButton = await findByTestId(
+        RedesignedSendViewSelectorsIDs.REVIEW_BUTTON,
+        {},
+        { timeout: 5000 },
+      );
+
+      await waitFor(() => expect(reviewButton).toBeEnabled(), {
+        timeout: 5000,
+      });
+      fireEvent.press(reviewButton);
+
+      await waitFor(() => {
+        expect(addTransactionSpy).toHaveBeenCalledTimes(1);
+      });
+
+      expect(
+        await findByTestId(ConfirmationLoaderSelectorIDs.TRANSFER),
+      ).toBeOnTheScreen();
+    });
+
+    /**
+     * Send Max ETH → Continue → Recipient
+     */
+    it('Send Max → Continue → Recipient screen', async () => {
+      const state = initialStateWallet()
+        .withOverrides(sendViewOverrides)
+        .build();
+
+      const { getByTestId, getByRole, findByTestId } = renderScreenWithRoutes(
+        Send as unknown as React.ComponentType,
+        { name: Routes.SEND.DEFAULT },
+        [],
+        { state },
+        {
+          screen: Routes.SEND.AMOUNT,
+          params: { asset: EVM_NATIVE_ETH_ASSET_SEND_FIVE },
+        },
+      );
+
+      expect(
+        getByTestId(RedesignedSendViewSelectorsIDs.SEND_AMOUNT),
+      ).toBeOnTheScreen();
+
+      fireEvent.press(getByRole('button', { name: 'Max' }));
+      fireEvent.press(getByRole('button', { name: 'Continue' }));
+
+      expect(
+        await findByTestId(
+          RedesignedSendViewSelectorsIDs.RECIPIENT_ADDRESS_INPUT,
+          {},
+          { timeout: 5000 },
+        ),
+      ).toBeOnTheScreen();
+    });
+
     /**
      * Typing an invalid address (not a valid hex, ENS, or non-EVM address)
      * must disable the Review button and show an error label.
@@ -345,6 +435,13 @@ describeForPlatforms('Send', () => {
       await waitFor(() => expect(reviewButton).toBeDisabled(), {
         timeout: 5000,
       });
+      expect(
+        await screen.findByRole(
+          'button',
+          { name: strings('send.invalid_address') },
+          { timeout: 5000 },
+        ),
+      ).toBeOnTheScreen();
     });
 
     /**
diff --git a/app/components/Views/confirmations/components/status-icon/status-icon.testIds.ts b/app/components/Views/confirmations/components/status-icon/status-icon.testIds.ts
new file mode 100644
index 00000000000..5f20caf74b0
--- /dev/null
+++ b/app/components/Views/confirmations/components/status-icon/status-icon.testIds.ts
@@ -0,0 +1,3 @@
+export const STATUS_ICON_TOOLTIP_TEST_ID = 'status-tooltip';
+
+export const STATUS_ICON_TOOLTIP_OPEN_BUTTON_TEST_ID = `${STATUS_ICON_TOOLTIP_TEST_ID}-open-btn`;
diff --git a/app/components/Views/confirmations/components/status-icon/status-icon.tsx b/app/components/Views/confirmations/components/status-icon/status-icon.tsx
index ce752275950..d61a4ffc2cb 100644
--- a/app/components/Views/confirmations/components/status-icon/status-icon.tsx
+++ b/app/components/Views/confirmations/components/status-icon/status-icon.tsx
@@ -8,6 +8,7 @@ import { ButtonIconSizes } from '../../../../../component-library/components/But
 import { useStyles } from '../../../../hooks/useStyles';
 import Tooltip from '../UI/Tooltip';
 import styleSheet from './status-icon.styles';
+import { STATUS_ICON_TOOLTIP_TEST_ID } from './status-icon.testIds';
 
 export type Severity = 'success' | 'error' | 'warning';
 
@@ -29,7 +30,7 @@ export function StatusIcon({
         iconName={iconName}
         iconSize={ButtonIconSizes.Md}
         iconStyle={styles.tooltipIcon}
-        tooltipTestId="status-tooltip"
+        tooltipTestId={STATUS_ICON_TOOLTIP_TEST_ID}
         content={tooltip}
       />
     );
diff --git a/app/components/Views/confirmations/context/qr-hardware-context/qr-hardware-context.test.tsx b/app/components/Views/confirmations/context/qr-hardware-context/qr-hardware-context.test.tsx
index c161d2f132f..7d62cfec35d 100644
--- a/app/components/Views/confirmations/context/qr-hardware-context/qr-hardware-context.test.tsx
+++ b/app/components/Views/confirmations/context/qr-hardware-context/qr-hardware-context.test.tsx
@@ -57,6 +57,17 @@ jest.mock('../../../../../core/HardwareWallet', () => ({
 
 jest.mock('../../hooks/gas/useGasFeeToken');
 
+jest.mock('../../hooks/useIsConfirmationFromLedgerAccount', () => ({
+  useIsConfirmationFromLedgerAccount: jest.fn(() => false),
+}));
+
+jest.mock(
+  '../../../../../core/HardwareWallet/hooks/useIsConfirmationFromQrAccount',
+  () => ({
+    useIsConfirmationFromQrAccount: jest.fn(() => false),
+  }),
+);
+
 jest.mock('../../hooks/ui/useFullScreenConfirmation', () => ({
   useFullScreenConfirmation: jest.fn(() => ({
     isFullScreenConfirmation: true,
@@ -177,7 +188,7 @@ describe('QRHardwareContext', () => {
     expect(getByText('Scan with your hardware wallet')).toBeTruthy();
   });
 
-  it('passes correct value of scannerVisible to child components', async () => {
+  it('renders Confirm button when QR signing is in progress', async () => {
     createCameraSpy({ cameraError: undefined, hasCameraPermission: true });
     createQRHardwareAwarenessSpy({
       isSigningQRObject: true,
@@ -194,10 +205,7 @@ describe('QRHardwareContext', () => {
         state: personalSignatureConfirmationState,
       },
     );
-    await userEvent.press(getByText('Get signature'));
-    expect(
-      getByText('Scan your hardware wallet to confirm the transaction'),
-    ).toBeTruthy();
+    expect(getByText('Confirm')).toBeTruthy();
   });
 });
 
diff --git a/app/components/Views/confirmations/context/qr-hardware-context/qr-hardware-context.tsx b/app/components/Views/confirmations/context/qr-hardware-context/qr-hardware-context.tsx
index c9ad624e4f0..272ff214c69 100644
--- a/app/components/Views/confirmations/context/qr-hardware-context/qr-hardware-context.tsx
+++ b/app/components/Views/confirmations/context/qr-hardware-context/qr-hardware-context.tsx
@@ -22,6 +22,8 @@ export interface QRHardwareContextType {
   scannerVisible: boolean;
   setRequestCompleted: () => void;
   setScannerVisible: (visibility: boolean) => void;
+  setSigningConfirmed: () => void;
+  signingConfirmed: boolean;
 }
 
 export const QRHardwareContext = createContext<QRHardwareContextType>({
@@ -33,6 +35,8 @@ export const QRHardwareContext = createContext<QRHardwareContextType>({
   scannerVisible: false,
   setRequestCompleted: () => undefined,
   setScannerVisible: () => undefined,
+  setSigningConfirmed: () => undefined,
+  signingConfirmed: false,
 });
 
 export const QRHardwareContextProvider: React.FC<{
@@ -43,6 +47,7 @@ export const QRHardwareContextProvider: React.FC<{
   const { cameraError, hasCameraPermission } = useCamera(isSigningQRObject);
   const [scannerVisible, setScannerVisible] = useState(false);
   const [isRequestCompleted, setRequestCompleted] = useState(false);
+  const [signingConfirmed, setSigningConfirmed] = useState(false);
 
   const cancelRequest = useCallback(
     (e: { preventDefault: () => void; data: { action: NavigationAction } }) => {
@@ -87,6 +92,8 @@ export const QRHardwareContextProvider: React.FC<{
         scannerVisible,
         setRequestCompleted: () => setRequestCompleted(true),
         setScannerVisible,
+        setSigningConfirmed: () => setSigningConfirmed(true),
+        signingConfirmed,
       }}
     >
       {children}
diff --git a/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.test.ts b/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.test.ts
index 09dba85068a..98716fd9595 100644
--- a/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.test.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.test.ts
@@ -290,6 +290,17 @@ describe('useInsufficientBalanceAlert', () => {
     expect(result.current).toStrictEqual([]);
   });
 
+  it('returns empty array if transaction type is moneyAccountWithdraw', () => {
+    mockUseTransactionMetadataRequest.mockReturnValue({
+      ...mockTransaction,
+      type: TransactionType.moneyAccountWithdraw,
+    } as unknown as TransactionMeta);
+
+    const { result } = renderHook(() => useInsufficientBalanceAlert());
+
+    expect(result.current).toStrictEqual([]);
+  });
+
   it('returns empty array when using pay source amounts', () => {
     useTransactionPayHasSourceAmountMock.mockReturnValue(true);
 
diff --git a/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.ts b/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.ts
index 217c52367ab..48c421b4939 100644
--- a/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useInsufficientBalanceAlert.ts
@@ -17,6 +17,7 @@ import { useHasInsufficientBalance } from '../useHasInsufficientBalance';
 import { useIsTransactionPayLoading } from '../pay/useTransactionPayData';
 
 const IGNORE_TYPES = [
+  TransactionType.moneyAccountWithdraw,
   TransactionType.perpsWithdraw,
   TransactionType.predictWithdraw,
 ];
diff --git a/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.test.ts b/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.test.ts
index 82f00d35c50..421031ca88f 100644
--- a/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.test.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.test.ts
@@ -24,11 +24,12 @@ jest.mock('../transactions/useTransactionMetadataRequest');
 jest.mock('../useTokenAmount');
 jest.mock('../pay/useTransactionPayData');
 
-const mockPerpsState = (availableBalance: string | null = '45.31') => ({
+const mockPerpsState = (withdrawableBalance: string | null = '45.31') => ({
   engine: {
     backgroundState: {
       PerpsController: {
-        accountState: availableBalance !== null ? { availableBalance } : null,
+        accountState:
+          withdrawableBalance !== null ? { withdrawableBalance } : null,
       },
     },
   },
@@ -36,14 +37,14 @@ const mockPerpsState = (availableBalance: string | null = '45.31') => ({
 
 function runHook({
   pendingAmount,
-  availableBalance = '45.31',
+  withdrawableBalance = '45.31',
 }: {
   pendingAmount?: string;
-  availableBalance?: string | null;
+  withdrawableBalance?: string | null;
 } = {}) {
   return renderHookWithProvider(
     () => useInsufficientPerpsBalanceAlert({ pendingAmount }),
-    { state: mockPerpsState(availableBalance) },
+    { state: mockPerpsState(withdrawableBalance) },
   );
 }
 
@@ -144,7 +145,7 @@ describe('useInsufficientPerpsBalanceAlert', () => {
   it('returns no alert if perps controller state is unavailable', () => {
     const { result } = runHook({
       pendingAmount: '50',
-      availableBalance: null,
+      withdrawableBalance: null,
     });
 
     expect(result.current).toStrictEqual([]);
diff --git a/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.ts b/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.ts
index 17e83587576..1b4da77dacf 100644
--- a/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useInsufficientPerpsBalanceAlert.ts
@@ -30,18 +30,12 @@ export function useInsufficientPerpsBalanceAlert({
   const quotes = useTransactionPayQuotes();
   const hasQuotes = Boolean(quotes?.length);
 
-  // For Unified Account Mode users, `availableBalance` mirrors HL's
-  // `clearinghouseState.withdrawable` which is $0 (collateral lives in spot).
-  // `availableToTradeBalance` is the unified-aware value computed by
-  // `addSpotBalanceToAccountState` and matches what `withdraw3` actually draws
-  // from. Fall back to `availableBalance` for legacy / Standard-mode accounts
-  // where the unified field is undefined.
-  const availableBalance = useSelector(
+  // `withdrawableBalance` is the Unified-aware value populated by
+  // `addSpotBalanceToAccountState` and matches what `withdraw3` draws from.
+  const withdrawableBalance = useSelector(
     (state: RootState) =>
       state.engine.backgroundState.PerpsController?.accountState
-        ?.availableToTradeBalance ??
-      state.engine.backgroundState.PerpsController?.accountState
-        ?.availableBalance,
+        ?.withdrawableBalance,
   );
 
   const isPerpsWithdraw = hasTransactionType(transactionMeta, [
@@ -54,9 +48,9 @@ export function useInsufficientPerpsBalanceAlert({
     if (!isPerpsWithdraw) return false;
 
     if (
-      availableBalance !== undefined &&
-      availableBalance !== null &&
-      new BigNumber(availableBalance).isLessThan(amountHuman)
+      withdrawableBalance !== undefined &&
+      withdrawableBalance !== null &&
+      new BigNumber(withdrawableBalance).isLessThan(amountHuman)
     ) {
       return true;
     }
@@ -86,7 +80,7 @@ export function useInsufficientPerpsBalanceAlert({
     hasQuotes,
     isPendingInput,
     isPerpsWithdraw,
-    availableBalance,
+    withdrawableBalance,
     totals,
   ]);
 
diff --git a/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.test.ts b/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.test.ts
index e60f9af843c..4001a91a69b 100644
--- a/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.test.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.test.ts
@@ -13,6 +13,7 @@ import { strings } from '../../../../../../locales/i18n';
 import {
   useIsTransactionPayLoading,
   useTransactionPayFiatPayment,
+  useTransactionPayIsMaxAmount,
   useTransactionPayIsPostQuote,
   useTransactionPayQuotes,
   useTransactionPayRequiredTokens,
@@ -78,6 +79,7 @@ describe('useNoPayTokenQuotesAlert', () => {
     useTransactionPayIsPostQuoteMock.mockReturnValue(false);
     useTransactionPayRequiredTokensMock.mockReturnValue([]);
     jest.mocked(useTransactionPayFiatPayment).mockReturnValue(undefined);
+    jest.mocked(useTransactionPayIsMaxAmount).mockReturnValue(false);
   });
 
   it('returns alert if pay token selected and no quotes available', () => {
@@ -209,4 +211,78 @@ describe('useNoPayTokenQuotesAlert', () => {
       }),
     ]);
   });
+
+  // Money account withdraw MUSD -> MUSD: `calculatePostQuoteSourceAmounts`
+  // filters out same-token/same-chain entries, so `sourceAmounts` is empty
+  // even when the user has entered a positive amount. The alert must still
+  // fire so the Withdraw button stays disabled.
+  it('returns alert for post-quote when sourceAmounts is empty but a required token has a positive amount', () => {
+    useTransactionPayIsPostQuoteMock.mockReturnValue(true);
+    useTransactionPaySourceAmountsMock.mockReturnValue([]);
+    useTransactionPayQuotesMock.mockReturnValue([]);
+
+    useTransactionPayRequiredTokensMock.mockReturnValue([
+      {
+        address: ADDRESS_MOCK,
+        chainId: CHAIN_ID_MOCK,
+        amountRaw: '10000',
+        skipIfBalance: false,
+      } as TransactionPayRequiredToken,
+    ]);
+
+    const { result } = runHook();
+
+    expect(result.current).toEqual([
+      expect.objectContaining({
+        key: AlertKeys.NoPayTokenQuotes,
+        severity: Severity.Danger,
+        isBlocking: true,
+      }),
+    ]);
+  });
+
+  it('returns no alerts for post-quote with empty sourceAmounts when the required token amount is zero', () => {
+    useTransactionPayIsPostQuoteMock.mockReturnValue(true);
+    useTransactionPaySourceAmountsMock.mockReturnValue([]);
+    useTransactionPayQuotesMock.mockReturnValue([]);
+
+    useTransactionPayRequiredTokensMock.mockReturnValue([
+      {
+        address: ADDRESS_MOCK,
+        chainId: CHAIN_ID_MOCK,
+        amountRaw: '0',
+        skipIfBalance: false,
+      } as TransactionPayRequiredToken,
+    ]);
+
+    const { result } = runHook();
+
+    expect(result.current).toStrictEqual([]);
+  });
+
+  it('returns alert for post-quote with empty sourceAmounts when isMaxAmount is true', () => {
+    useTransactionPayIsPostQuoteMock.mockReturnValue(true);
+    useTransactionPaySourceAmountsMock.mockReturnValue([]);
+    useTransactionPayQuotesMock.mockReturnValue([]);
+    jest.mocked(useTransactionPayIsMaxAmount).mockReturnValue(true);
+
+    useTransactionPayRequiredTokensMock.mockReturnValue([
+      {
+        address: ADDRESS_MOCK,
+        chainId: CHAIN_ID_MOCK,
+        amountRaw: '0',
+        skipIfBalance: false,
+      } as TransactionPayRequiredToken,
+    ]);
+
+    const { result } = runHook();
+
+    expect(result.current).toEqual([
+      expect.objectContaining({
+        key: AlertKeys.NoPayTokenQuotes,
+        severity: Severity.Danger,
+        isBlocking: true,
+      }),
+    ]);
+  });
 });
diff --git a/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.ts b/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.ts
index 72f311cb6a5..994b7d4f14f 100644
--- a/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useNoPayTokenQuotesAlert.ts
@@ -7,6 +7,7 @@ import { strings } from '../../../../../../locales/i18n';
 import {
   useIsTransactionPayLoading,
   useTransactionPayFiatPayment,
+  useTransactionPayIsMaxAmount,
   useTransactionPayIsPostQuote,
   useTransactionPayQuotes,
   useTransactionPayRequiredTokens,
@@ -21,6 +22,7 @@ export function useNoPayTokenQuotesAlert() {
   const sourceAmounts = useTransactionPaySourceAmounts();
   const requiredTokens = useTransactionPayRequiredTokens();
   const isPostQuote = useTransactionPayIsPostQuote();
+  const isMaxAmount = useTransactionPayIsMaxAmount();
 
   const fiatAmount = Number(fiatPayment?.amountFiat);
   const hasValidFiatAmount = Number.isFinite(fiatAmount) && fiatAmount > 0;
@@ -57,8 +59,29 @@ export function useNoPayTokenQuotesAlert() {
     sourceAmounts?.length === 0 &&
     quotes?.length === 0;
 
+  // Post-quote flows (e.g. money account withdraw MUSD -> MUSD) can end up with
+  // an empty `sourceAmounts` when the source and destination tokens match and
+  // get filtered out in `calculatePostQuoteSourceAmounts`. In that case the
+  // non-fiat branch above never fires, so we also emit the alert whenever the
+  // user has entered a positive input amount but no quote is available.
+  const hasPositiveRequiredAmount = (requiredTokens ?? []).some(
+    (t) =>
+      !t.skipIfBalance &&
+      (isMaxAmount || (Boolean(t.amountRaw) && t.amountRaw !== '0')),
+  );
+
+  const shouldShowPostQuoteNoQuotesAlert =
+    isPostQuote &&
+    Boolean(payToken) &&
+    !isQuotesLoading &&
+    !sourceAmounts?.length &&
+    !quotes?.length &&
+    hasPositiveRequiredAmount;
+
   const showAlert =
-    shouldShowNonFiatNoQuotesAlert || shouldShowFiatNoQuotesAlert;
+    shouldShowNonFiatNoQuotesAlert ||
+    shouldShowFiatNoQuotesAlert ||
+    shouldShowPostQuoteNoQuotesAlert;
 
   return useMemo(() => {
     if (!showAlert) {
diff --git a/app/components/Views/confirmations/hooks/alerts/usePendingAmountAlerts.test.ts b/app/components/Views/confirmations/hooks/alerts/usePendingAmountAlerts.test.ts
index 52d968b8cde..446734ae657 100644
--- a/app/components/Views/confirmations/hooks/alerts/usePendingAmountAlerts.test.ts
+++ b/app/components/Views/confirmations/hooks/alerts/usePendingAmountAlerts.test.ts
@@ -42,7 +42,11 @@ jest.mock('./useAccountNoFundsAlert', () => ({
 }));
 
 jest.mock('./useInsufficientMoneyAccountBalanceAlert', () => ({
-  useInsufficientMoneyAccountBalanceAlert: () => [],
+  useInsufficientMoneyAccountBalanceAlert: () => [
+    {
+      id: 'alert-7',
+    },
+  ],
 }));
 
 describe('usePendingAmountAlerts', () => {
@@ -56,6 +60,7 @@ describe('usePendingAmountAlerts', () => {
       { id: 'alert-3' },
       { id: 'alert-4' },
       { id: 'alert-5' },
+      { id: 'alert-7' },
       { id: 'alert-6' },
     ]);
   });
diff --git a/app/components/Views/confirmations/hooks/alerts/useSignedOrSubmittedAlert.ts b/app/components/Views/confirmations/hooks/alerts/useSignedOrSubmittedAlert.ts
index bb55df4cb9f..e8875264771 100644
--- a/app/components/Views/confirmations/hooks/alerts/useSignedOrSubmittedAlert.ts
+++ b/app/components/Views/confirmations/hooks/alerts/useSignedOrSubmittedAlert.ts
@@ -16,6 +16,7 @@ import { isHardwareAccount } from '../../../../../util/address';
 import { selectMetaMaskPayHardwareFlags } from '../../../../../selectors/featureFlagController/confirmations';
 
 export const PAY_TYPES = [
+  TransactionType.moneyAccountDeposit,
   TransactionType.perpsDeposit,
   TransactionType.predictDeposit,
 ];
diff --git a/app/components/Views/confirmations/hooks/gas/useIsGaslessSupported.test.ts b/app/components/Views/confirmations/hooks/gas/useIsGaslessSupported.test.ts
index 85e26b8fbd9..231121c3e82 100644
--- a/app/components/Views/confirmations/hooks/gas/useIsGaslessSupported.test.ts
+++ b/app/components/Views/confirmations/hooks/gas/useIsGaslessSupported.test.ts
@@ -8,12 +8,17 @@ import { transferTransactionStateMock } from '../../__mocks__/transfer-transacti
 import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
 import { useIsGaslessSupported } from './useIsGaslessSupported';
 import { useGaslessSupportedSmartTransactions } from './useGaslessSupportedSmartTransactions';
+import { isHardwareAccount } from '../../../../../util/address';
 
 jest.mock('../../../../../util/transactions/sentinel-api');
 jest.mock('../../../../../util/transaction-controller');
 jest.mock('../../../../../util/transactions/transaction-relay');
 jest.mock('../transactions/useTransactionMetadataRequest');
 jest.mock('./useGaslessSupportedSmartTransactions');
+jest.mock('../../../../../util/address', () => ({
+  ...jest.requireActual('../../../../../util/address'),
+  isHardwareAccount: jest.fn(),
+}));
 
 const SMART_TRANSACTIONS_ENABLED_STATE = {
   swaps: {
@@ -54,6 +59,7 @@ describe('useIsGaslessSupported', () => {
   const useGaslessSupportedSmartTransactionsMock = jest.mocked(
     useGaslessSupportedSmartTransactions,
   );
+  const isHardwareAccountMock = jest.mocked(isHardwareAccount);
 
   beforeEach(() => {
     mockUseTransactionMetadataRequest.mockReturnValue({
@@ -66,6 +72,7 @@ describe('useIsGaslessSupported', () => {
       isSupported: false,
       pending: false,
     });
+    isHardwareAccountMock.mockReturnValue(false);
   });
 
   describe('Gasless Smart Transactions', () => {
@@ -94,6 +101,32 @@ describe('useIsGaslessSupported', () => {
       );
     });
 
+    it('returns isSupported false when smart transactions are enabled but sender is a hardware wallet', async () => {
+      const stateWithSmartTransactionEnabled = merge(
+        {},
+        transferConfirmationState,
+        SMART_TRANSACTIONS_ENABLED_STATE,
+      );
+      useGaslessSupportedSmartTransactionsMock.mockReturnValue({
+        isSmartTransaction: true,
+        isSupported: true,
+        pending: false,
+      });
+      isHardwareAccountMock.mockReturnValue(true);
+
+      const { result } = renderHookWithProvider(() => useIsGaslessSupported(), {
+        state: stateWithSmartTransactionEnabled,
+      });
+
+      await waitFor(() =>
+        expect(result.current).toEqual({
+          isSupported: false,
+          isSmartTransaction: true,
+          pending: false,
+        }),
+      );
+    });
+
     it('returns isSupported and isSmartTransaction as false when smart transactions are disabled', async () => {
       const { result } = renderHookWithProvider(() => useIsGaslessSupported(), {
         state: transferTransactionStateMock,
@@ -153,6 +186,24 @@ describe('useIsGaslessSupported', () => {
       });
     });
 
+    it('returns isSupported false when the sender is a hardware wallet even if relay is supported', async () => {
+      isRelaySupportedMock.mockResolvedValue(true);
+      isHardwareAccountMock.mockReturnValue(true);
+
+      const state = merge({}, transferTransactionStateMock);
+      const { result } = renderHookWithProvider(() => useIsGaslessSupported(), {
+        state,
+      });
+
+      await waitFor(() => {
+        expect(result.current).toEqual({
+          isSupported: false,
+          isSmartTransaction: false,
+          pending: false,
+        });
+      });
+    });
+
     it('returns isSupported false and isSmartTransaction: false when relay not supported', async () => {
       isRelaySupportedMock.mockResolvedValue(false);
 
diff --git a/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.test.ts b/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.test.ts
index a4ec0278757..5914481b92d 100644
--- a/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.test.ts
+++ b/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.test.ts
@@ -234,6 +234,48 @@ describe('useTransactionPayMetrics', () => {
     });
   });
 
+  it('includes simulation_sending_assets_total_value for money account deposit', async () => {
+    useTransactionPayTokenMock.mockReturnValue({
+      payToken: PAY_TOKEN_MOCK,
+      setPayToken: noop,
+    } as ReturnType<typeof useTransactionPayToken>);
+
+    runHook({ type: TransactionType.moneyAccountDeposit });
+
+    await act(async () => noop());
+
+    expect(updateConfirmationMetricMock).toHaveBeenCalledWith({
+      id: transactionIdMock,
+      params: {
+        properties: expect.objectContaining({
+          simulation_sending_assets_total_value: 1.23,
+        }),
+        sensitiveProperties: {},
+      },
+    });
+  });
+
+  it('omits simulation_sending_assets_total_value for money account withdraw', async () => {
+    useTransactionPayTokenMock.mockReturnValue({
+      payToken: PAY_TOKEN_MOCK,
+      setPayToken: noop,
+    } as ReturnType<typeof useTransactionPayToken>);
+
+    runHook({ type: TransactionType.moneyAccountWithdraw });
+
+    await act(async () => noop());
+
+    const calledProps = (
+      updateConfirmationMetricMock.mock.calls[0]?.[0] as {
+        params: { properties: Record<string, unknown> };
+      }
+    )?.params?.properties;
+
+    expect(calledProps).not.toHaveProperty(
+      'simulation_sending_assets_total_value',
+    );
+  });
+
   describe('mm_pay_quote_requested', () => {
     it('is false initially', async () => {
       useTransactionPayTokenMock.mockReturnValue({
diff --git a/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.ts b/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.ts
index 283e436f2af..0a06177a7c0 100644
--- a/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.ts
+++ b/app/components/Views/confirmations/hooks/pay/useTransactionPayMetrics.ts
@@ -87,7 +87,10 @@ export function useTransactionPayMetrics() {
   if (
     payToken &&
     (hasTransactionType(transactionMeta, [TransactionType.perpsDeposit]) ||
-      hasTransactionType(transactionMeta, [TransactionType.predictDeposit]))
+      hasTransactionType(transactionMeta, [TransactionType.predictDeposit]) ||
+      hasTransactionType(transactionMeta, [
+        TransactionType.moneyAccountDeposit,
+      ]))
   ) {
     properties.simulation_sending_assets_total_value = sendingValue;
   }
diff --git a/app/components/Views/confirmations/hooks/pay/useTransactionPayPostQuote.test.ts b/app/components/Views/confirmations/hooks/pay/useTransactionPayPostQuote.test.ts
index 51678cbdec8..03f6313da56 100644
--- a/app/components/Views/confirmations/hooks/pay/useTransactionPayPostQuote.test.ts
+++ b/app/components/Views/confirmations/hooks/pay/useTransactionPayPostQuote.test.ts
@@ -236,4 +236,31 @@ describe('useTransactionPayPostQuote', () => {
     expect(config.refundTo).toBe(PROXY_ADDRESS_MOCK);
     expect(config.isHyperliquidSource).toBeUndefined();
   });
+
+  it('skips refundTo and isHyperliquidSource for moneyAccountWithdraw', () => {
+    useTransactionMetadataRequestMock.mockReturnValue({
+      id: TRANSACTION_ID_MOCK,
+      txParams: { from: FROM_MOCK },
+      type: TransactionType.moneyAccountWithdraw,
+    } as never);
+    useTransactionPayWithdrawMock.mockReturnValue({
+      isWithdraw: true,
+      canSelectWithdrawToken: true,
+    });
+
+    renderHook(() => useTransactionPayPostQuote());
+
+    const callback = setTransactionConfigMock.mock.calls[0][1];
+    const config = {} as {
+      isPostQuote?: boolean;
+      refundTo?: Hex;
+      isHyperliquidSource?: boolean;
+    };
+    callback(config);
+
+    expect(config.isPostQuote).toBe(true);
+    expect(config.refundTo).toBeUndefined();
+    expect(config.isHyperliquidSource).toBeUndefined();
+    expect(computeProxyAddressMock).not.toHaveBeenCalled();
+  });
 });
diff --git a/app/components/Views/confirmations/hooks/pay/useTransactionPayPostQuote.ts b/app/components/Views/confirmations/hooks/pay/useTransactionPayPostQuote.ts
index 2c69db22f97..dfc279f8752 100644
--- a/app/components/Views/confirmations/hooks/pay/useTransactionPayPostQuote.ts
+++ b/app/components/Views/confirmations/hooks/pay/useTransactionPayPostQuote.ts
@@ -30,6 +30,9 @@ export function useTransactionPayPostQuote(): void {
   const isPerpsWithdraw = hasTransactionType(transactionMeta, [
     TransactionType.perpsWithdraw,
   ]);
+  const isMoneyAccountWithdraw = hasTransactionType(transactionMeta, [
+    TransactionType.moneyAccountWithdraw,
+  ]);
 
   useEffect(() => {
     if (
@@ -45,12 +48,15 @@ export function useTransactionPayPostQuote(): void {
       const from = transactionMeta?.txParams?.from as Hex | undefined;
 
       // Predict withdrawals refund to the Safe proxy address.
-      // Perps withdrawals don't use refundTo -- funds go HyperCore -> Relay directly.
-      const refundTo = isPerpsWithdraw
-        ? undefined
-        : from
-          ? computeProxyAddress(from)
-          : undefined;
+      // Perps and money-account withdrawals don't use refundTo -- funds land
+      // on the user's address directly (HyperCore -> Relay for perps; vault
+      // teller -> user for money account).
+      const refundTo =
+        isPerpsWithdraw || isMoneyAccountWithdraw
+          ? undefined
+          : from
+            ? computeProxyAddress(from)
+            : undefined;
 
       TransactionPayController.setTransactionConfig(transactionId, (config) => {
         config.isPostQuote = true;
@@ -70,6 +76,7 @@ export function useTransactionPayPostQuote(): void {
         transactionId,
         refundTo,
         isPerpsWithdraw,
+        isMoneyAccountWithdraw,
       });
     } catch (error) {
       log('Error initializing post-quote transaction', {
@@ -79,6 +86,7 @@ export function useTransactionPayPostQuote(): void {
     }
   }, [
     canSelectWithdrawToken,
+    isMoneyAccountWithdraw,
     isPerpsWithdraw,
     transactionId,
     transactionMeta?.txParams?.from,
diff --git a/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.test.ts b/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.test.ts
new file mode 100644
index 00000000000..12c3177dd38
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.test.ts
@@ -0,0 +1,262 @@
+import { merge } from 'lodash';
+import { renderHookWithProvider } from '../../../../../util/test/renderWithProvider';
+import { useUpdateTransactionPayAmount } from './useUpdateTransactionPayAmount';
+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 { updateAtomicBatchData } from '../../../../../util/transaction-controller';
+import {
+  updateMoneyAccountDepositTokenAmount,
+  updateMoneyAccountWithdrawTokenAmount,
+} from '../../../../UI/Money/utils/moneyAccountTransactions';
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
+import { useUpdateTokenAmount } from '../transactions/useUpdateTokenAmount';
+import Logger from '../../../../../util/Logger';
+
+jest.mock('../../../../../util/transaction-controller');
+jest.mock('../../../../UI/Money/utils/moneyAccountTransactions');
+jest.mock('../transactions/useUpdateTokenAmount');
+jest.mock('../../../../../util/Logger');
+
+const moneyAccountDepositMeta: Partial<TransactionMeta> = {
+  type: TransactionType.moneyAccountDeposit,
+};
+
+const moneyAccountWithdrawMeta: Partial<TransactionMeta> = {
+  type: TransactionType.moneyAccountWithdraw,
+};
+
+function runHook({
+  transactionMeta,
+}: {
+  transactionMeta?: Partial<TransactionMeta>;
+} = {}) {
+  return renderHookWithProvider(useUpdateTransactionPayAmount, {
+    state: merge(
+      {},
+      simpleSendTransactionControllerMock,
+      transactionApprovalControllerMock,
+      otherControllersMock,
+      transactionMeta
+        ? {
+            engine: {
+              backgroundState: {
+                TransactionController: {
+                  transactions: [transactionMeta],
+                },
+              },
+            },
+          }
+        : {},
+    ),
+  });
+}
+
+describe('useUpdateTransactionPayAmount', () => {
+  const updateAtomicBatchDataMock = jest.mocked(updateAtomicBatchData);
+  const updateMoneyAccountDepositTokenAmountMock = jest.mocked(
+    updateMoneyAccountDepositTokenAmount,
+  );
+  const updateMoneyAccountWithdrawTokenAmountMock = jest.mocked(
+    updateMoneyAccountWithdrawTokenAmount,
+  );
+  const useUpdateTokenAmountMock = jest.mocked(useUpdateTokenAmount);
+  const updateTokenAmountMock = jest.fn();
+  const loggerErrorMock = jest.mocked(Logger.error);
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    updateAtomicBatchDataMock.mockResolvedValue('0x0');
+    useUpdateTokenAmountMock.mockReturnValue({
+      updateTokenAmount: updateTokenAmountMock,
+    });
+  });
+
+  async function flushPromises() {
+    await Promise.resolve();
+    await Promise.resolve();
+  }
+
+  it('calls updateAtomicBatchData for each update returned from updateMoneyAccountDepositTokenAmount', async () => {
+    updateMoneyAccountDepositTokenAmountMock.mockResolvedValue([
+      { nestedTransactionIndex: 0, transactionData: '0xaaaa' },
+      { nestedTransactionIndex: 2, transactionData: '0xbbbb' },
+    ]);
+
+    const { result } = runHook({ transactionMeta: moneyAccountDepositMeta });
+
+    result.current.updateTransactionPayAmount('1.23');
+
+    await flushPromises();
+
+    expect(updateMoneyAccountDepositTokenAmountMock).toHaveBeenCalledTimes(1);
+    expect(updateMoneyAccountDepositTokenAmountMock).toHaveBeenCalledWith(
+      expect.any(Object),
+      '1.23',
+    );
+    expect(updateAtomicBatchDataMock).toHaveBeenCalledTimes(2);
+    expect(updateAtomicBatchDataMock).toHaveBeenNthCalledWith(1, {
+      transactionId: expect.any(String),
+      transactionIndex: 0,
+      transactionData: '0xaaaa',
+    });
+    expect(updateAtomicBatchDataMock).toHaveBeenNthCalledWith(2, {
+      transactionId: expect.any(String),
+      transactionIndex: 2,
+      transactionData: '0xbbbb',
+    });
+    expect(updateTokenAmountMock).not.toHaveBeenCalled();
+  });
+
+  it('does not call updateAtomicBatchData when no updates are returned', async () => {
+    updateMoneyAccountDepositTokenAmountMock.mockResolvedValue([]);
+
+    const { result } = runHook({ transactionMeta: moneyAccountDepositMeta });
+
+    result.current.updateTransactionPayAmount('1.23');
+
+    await flushPromises();
+
+    expect(updateAtomicBatchDataMock).not.toHaveBeenCalled();
+  });
+
+  it('does not call updateMoneyAccountDepositTokenAmount when there is no transaction meta', async () => {
+    const { result } = renderHookWithProvider(useUpdateTransactionPayAmount, {
+      state: merge(
+        {},
+        transactionApprovalControllerMock,
+        otherControllersMock,
+        {
+          engine: {
+            backgroundState: {
+              TransactionController: { transactions: [] },
+            },
+          },
+        },
+      ),
+    });
+
+    result.current.updateTransactionPayAmount('1.23');
+
+    await flushPromises();
+
+    expect(updateMoneyAccountDepositTokenAmountMock).not.toHaveBeenCalled();
+    expect(updateMoneyAccountWithdrawTokenAmountMock).not.toHaveBeenCalled();
+    expect(updateAtomicBatchDataMock).not.toHaveBeenCalled();
+    expect(updateTokenAmountMock).not.toHaveBeenCalled();
+  });
+
+  it('delegates to updateTokenAmount for transactions that are neither money account deposit nor withdraw', () => {
+    const { result } = runHook();
+
+    result.current.updateTransactionPayAmount('1.23');
+
+    expect(updateTokenAmountMock).toHaveBeenCalledWith('1.23');
+    expect(updateMoneyAccountDepositTokenAmountMock).not.toHaveBeenCalled();
+    expect(updateMoneyAccountWithdrawTokenAmountMock).not.toHaveBeenCalled();
+    expect(updateAtomicBatchDataMock).not.toHaveBeenCalled();
+  });
+
+  it('logs an error when updateAtomicBatchData rejects', async () => {
+    const error = new Error('boom');
+    updateAtomicBatchDataMock.mockRejectedValue(error);
+    updateMoneyAccountDepositTokenAmountMock.mockResolvedValue([
+      { nestedTransactionIndex: 0, transactionData: '0xaaaa' },
+    ]);
+
+    const { result } = runHook({ transactionMeta: moneyAccountDepositMeta });
+
+    result.current.updateTransactionPayAmount('1.23');
+
+    await flushPromises();
+
+    expect(loggerErrorMock).toHaveBeenCalledWith(
+      error,
+      expect.stringContaining(
+        'Failed to update transaction pay amount in nested transaction',
+      ),
+    );
+  });
+
+  it('logs an error when updateMoneyAccountDepositTokenAmount rejects', async () => {
+    const error = new Error('rpc failure');
+    updateMoneyAccountDepositTokenAmountMock.mockRejectedValue(error);
+
+    const { result } = runHook({ transactionMeta: moneyAccountDepositMeta });
+
+    result.current.updateTransactionPayAmount('1.23');
+
+    await flushPromises();
+
+    expect(updateAtomicBatchDataMock).not.toHaveBeenCalled();
+    expect(loggerErrorMock).toHaveBeenCalledWith(
+      error,
+      expect.stringContaining('Failed to prepare Money Account deposit'),
+    );
+  });
+
+  it('calls updateAtomicBatchData for each update returned from updateMoneyAccountWithdrawTokenAmount', async () => {
+    updateMoneyAccountWithdrawTokenAmountMock.mockResolvedValue([
+      { nestedTransactionIndex: 0, transactionData: '0xcccc' },
+      { nestedTransactionIndex: 1, transactionData: '0xdddd' },
+    ]);
+
+    const { result } = runHook({ transactionMeta: moneyAccountWithdrawMeta });
+
+    result.current.updateTransactionPayAmount('4.56');
+
+    await flushPromises();
+
+    expect(updateMoneyAccountWithdrawTokenAmountMock).toHaveBeenCalledTimes(1);
+    expect(updateMoneyAccountWithdrawTokenAmountMock).toHaveBeenCalledWith(
+      expect.any(Object),
+      '4.56',
+    );
+    expect(updateAtomicBatchDataMock).toHaveBeenCalledTimes(2);
+    expect(updateAtomicBatchDataMock).toHaveBeenNthCalledWith(1, {
+      transactionId: expect.any(String),
+      transactionIndex: 0,
+      transactionData: '0xcccc',
+    });
+    expect(updateAtomicBatchDataMock).toHaveBeenNthCalledWith(2, {
+      transactionId: expect.any(String),
+      transactionIndex: 1,
+      transactionData: '0xdddd',
+    });
+    expect(updateMoneyAccountDepositTokenAmountMock).not.toHaveBeenCalled();
+    expect(updateTokenAmountMock).not.toHaveBeenCalled();
+  });
+
+  it('does not call updateAtomicBatchData when withdraw updater returns no updates', async () => {
+    updateMoneyAccountWithdrawTokenAmountMock.mockResolvedValue([]);
+
+    const { result } = runHook({ transactionMeta: moneyAccountWithdrawMeta });
+
+    result.current.updateTransactionPayAmount('4.56');
+
+    await flushPromises();
+
+    expect(updateMoneyAccountWithdrawTokenAmountMock).toHaveBeenCalledTimes(1);
+    expect(updateAtomicBatchDataMock).not.toHaveBeenCalled();
+  });
+
+  it('logs an error when updateMoneyAccountWithdrawTokenAmount rejects', async () => {
+    const error = new Error('withdraw rpc failure');
+    updateMoneyAccountWithdrawTokenAmountMock.mockRejectedValue(error);
+
+    const { result } = runHook({ transactionMeta: moneyAccountWithdrawMeta });
+
+    result.current.updateTransactionPayAmount('4.56');
+
+    await flushPromises();
+
+    expect(updateAtomicBatchDataMock).not.toHaveBeenCalled();
+    expect(loggerErrorMock).toHaveBeenCalledWith(
+      error,
+      expect.stringContaining('Failed to prepare Money Account withdraw'),
+    );
+  });
+});
diff --git a/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.ts b/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.ts
new file mode 100644
index 00000000000..3d514a5b40d
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/pay/useUpdateTransactionPayAmount.ts
@@ -0,0 +1,102 @@
+import { useCallback } from 'react';
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
+import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
+import { useUpdateTokenAmount } from '../transactions/useUpdateTokenAmount';
+import { updateAtomicBatchData } from '../../../../../util/transaction-controller';
+import {
+  updateMoneyAccountDepositTokenAmount,
+  updateMoneyAccountWithdrawTokenAmount,
+} from '../../../../UI/Money/utils/moneyAccountTransactions';
+import { UpdateTransactionPayAmountCall } from '../../types/transactions';
+import { hasTransactionType } from '../../utils/transaction';
+import Logger from '../../../../../util/Logger';
+
+type MoneyAccountAmountUpdater = (
+  transactionMeta: TransactionMeta,
+  amountHuman: string,
+) => Promise<UpdateTransactionPayAmountCall[]>;
+
+export function useUpdateTransactionPayAmount() {
+  const transactionMeta = useTransactionMetadataRequest();
+  const { updateTokenAmount } = useUpdateTokenAmount();
+
+  const applyMoneyAccountAmountUpdates = useCallback(
+    async (
+      amountHuman: string,
+      updater: MoneyAccountAmountUpdater,
+      preparationErrorMessage: string,
+    ) => {
+      if (!transactionMeta) {
+        return;
+      }
+
+      try {
+        const updates = await updater(transactionMeta, amountHuman);
+
+        const results = await Promise.allSettled(
+          updates.map(({ nestedTransactionIndex, transactionData }) =>
+            updateAtomicBatchData({
+              transactionId: transactionMeta.id,
+              transactionIndex: nestedTransactionIndex,
+              transactionData,
+            }),
+          ),
+        );
+
+        for (const result of results) {
+          if (result.status === 'rejected') {
+            Logger.error(
+              result.reason as Error,
+              'Failed to update transaction pay amount in nested transaction',
+            );
+          }
+        }
+      } catch (error) {
+        Logger.error(error as Error, preparationErrorMessage);
+      }
+    },
+    [transactionMeta],
+  );
+
+  const updateTransactionPayAmount = useCallback(
+    async (amountHuman: string) => {
+      if (!transactionMeta) {
+        return;
+      }
+
+      if (
+        hasTransactionType(transactionMeta, [
+          TransactionType.moneyAccountDeposit,
+        ])
+      ) {
+        await applyMoneyAccountAmountUpdates(
+          amountHuman,
+          updateMoneyAccountDepositTokenAmount,
+          'Failed to prepare Money Account deposit amount update',
+        );
+        return;
+      }
+
+      if (
+        hasTransactionType(transactionMeta, [
+          TransactionType.moneyAccountWithdraw,
+        ])
+      ) {
+        await applyMoneyAccountAmountUpdates(
+          amountHuman,
+          updateMoneyAccountWithdrawTokenAmount,
+          'Failed to prepare Money Account withdraw amount update',
+        );
+        return;
+      }
+
+      updateTokenAmount(amountHuman);
+    },
+    [transactionMeta, applyMoneyAccountAmountUpdates, updateTokenAmount],
+  );
+
+  return { updateTransactionPayAmount };
+}
diff --git a/app/components/Views/confirmations/hooks/send/alerts/types.ts b/app/components/Views/confirmations/hooks/send/alerts/types.ts
new file mode 100644
index 00000000000..a82e82b60f9
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/send/alerts/types.ts
@@ -0,0 +1,8 @@
+import type { ReactNode } from 'react';
+
+export interface SendAlert {
+  key: string;
+  title: string;
+  message: ReactNode;
+  acknowledgeButtonLabel?: string;
+}
diff --git a/app/components/Views/confirmations/hooks/send/alerts/useFirstTimeInteractionSendAlert.test.tsx b/app/components/Views/confirmations/hooks/send/alerts/useFirstTimeInteractionSendAlert.test.tsx
new file mode 100644
index 00000000000..b8e97de0d16
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/send/alerts/useFirstTimeInteractionSendAlert.test.tsx
@@ -0,0 +1,217 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { useSelector } from 'react-redux';
+
+import { checkFirstTimeInteraction } from '../../../../../../util/transaction-controller';
+import { useAsyncResult } from '../../../../../hooks/useAsyncResult';
+import { useSendContext } from '../../../context/send-context/send-context';
+import { TrustSignalDisplayState } from '../../../types/trustSignals';
+import { useAddressTrustSignal } from '../../useAddressTrustSignals';
+import { useFirstTimeInteractionSendAlert } from './useFirstTimeInteractionSendAlert';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../context/send-context/send-context', () => ({
+  useSendContext: jest.fn(),
+}));
+
+jest.mock('../../useAddressTrustSignals', () => ({
+  useAddressTrustSignal: jest.fn(),
+}));
+
+jest.mock('../../../../../hooks/useAsyncResult', () => ({
+  useAsyncResult: jest.fn(),
+}));
+
+jest.mock('../../../../../../util/transaction-controller', () => ({
+  checkFirstTimeInteraction: jest.fn(),
+}));
+
+jest.mock('../../../../../../../locales/i18n', () => ({
+  strings: (key: string) => {
+    const map: Record<string, string> = {
+      'send.new_address_title': 'New address',
+      'send.new_address_message': 'First time message',
+      'send.continue': 'Continue',
+    };
+    return map[key] || key;
+  },
+}));
+
+const mockUseSendContext = jest.mocked(useSendContext);
+const mockUseSelector = jest.mocked(useSelector);
+const mockUseAddressTrustSignal = jest.mocked(useAddressTrustSignal);
+const mockUseAsyncResult = jest.mocked(useAsyncResult);
+
+describe('useFirstTimeInteractionSendAlert', () => {
+  const TO = '0xRecipientAddress';
+  const FROM = '0xSenderAddress';
+  const CHAIN_ID = '0x1';
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    mockUseSendContext.mockReturnValue({
+      to: TO,
+      from: FROM,
+      chainId: CHAIN_ID,
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    mockUseSelector.mockReturnValue([]);
+
+    mockUseAddressTrustSignal.mockReturnValue({
+      state: TrustSignalDisplayState.Unknown,
+      label: null,
+    });
+
+    mockUseAsyncResult.mockReturnValue({ pending: false, value: true });
+  });
+
+  it('returns alert when first-time interaction is detected', () => {
+    const { result } = renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(result.current.alert).not.toBeNull();
+    expect(result.current.alert?.key).toBe('firstTimeInteraction');
+    expect(result.current.alert?.title).toBe('New address');
+    expect(result.current.alert?.acknowledgeButtonLabel).toBe('Continue');
+    expect(result.current.isPending).toBe(false);
+  });
+
+  it('returns null alert when to is missing', () => {
+    mockUseSendContext.mockReturnValue({
+      to: undefined,
+      from: FROM,
+      chainId: CHAIN_ID,
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    const { result } = renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(result.current.alert).toBeNull();
+    expect(result.current.isPending).toBe(false);
+  });
+
+  it('returns null alert when from is missing', () => {
+    mockUseSendContext.mockReturnValue({
+      to: TO,
+      from: undefined,
+      chainId: CHAIN_ID,
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    const { result } = renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(result.current.alert).toBeNull();
+  });
+
+  it('returns null alert when chainId is missing', () => {
+    mockUseSendContext.mockReturnValue({
+      to: TO,
+      from: FROM,
+      chainId: undefined,
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    const { result } = renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(result.current.alert).toBeNull();
+  });
+
+  it('returns null alert when to is an internal account', () => {
+    mockUseSelector.mockReturnValue([{ address: TO.toLowerCase() }]);
+
+    const { result } = renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(result.current.alert).toBeNull();
+  });
+
+  it('returns null alert when address is verified', () => {
+    mockUseAddressTrustSignal.mockReturnValue({
+      state: TrustSignalDisplayState.Verified,
+      label: null,
+    });
+
+    const { result } = renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(result.current.alert).toBeNull();
+  });
+
+  it('returns isPending true when trust signal is loading', () => {
+    mockUseAddressTrustSignal.mockReturnValue({
+      state: TrustSignalDisplayState.Loading,
+      label: null,
+    });
+
+    const { result } = renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(result.current.alert).toBeNull();
+    expect(result.current.isPending).toBe(true);
+  });
+
+  it('returns isPending true when async check is pending', () => {
+    mockUseAsyncResult.mockReturnValue({ pending: true });
+
+    const { result } = renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(result.current.alert).toBeNull();
+    expect(result.current.isPending).toBe(true);
+  });
+
+  it('returns null alert when isFirstTime is false', () => {
+    mockUseAsyncResult.mockReturnValue({ pending: false, value: false });
+
+    const { result } = renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(result.current.alert).toBeNull();
+    expect(result.current.isPending).toBe(false);
+  });
+
+  it('returns null alert when isFirstTime is undefined', () => {
+    mockUseAsyncResult.mockReturnValue({ pending: false, value: undefined });
+
+    const { result } = renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(result.current.alert).toBeNull();
+  });
+
+  it('passes correct arguments to checkFirstTimeInteraction via useAsyncResult', () => {
+    renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(mockUseAsyncResult).toHaveBeenCalled();
+    const asyncFn = mockUseAsyncResult.mock.calls[0][0];
+
+    asyncFn();
+
+    expect(checkFirstTimeInteraction).toHaveBeenCalledWith({
+      from: FROM,
+      to: TO,
+      chainId: 1,
+    });
+  });
+
+  it('skips the async call when shouldSkip is true', async () => {
+    mockUseSendContext.mockReturnValue({
+      to: undefined,
+      from: FROM,
+      chainId: CHAIN_ID,
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    renderHook(() => useFirstTimeInteractionSendAlert());
+
+    const asyncFn = mockUseAsyncResult.mock.calls[0][0];
+
+    await expect(asyncFn()).resolves.toBeUndefined();
+    expect(checkFirstTimeInteraction).not.toHaveBeenCalled();
+  });
+
+  it('returns isPending false when shouldSkip is true even if async is pending', () => {
+    mockUseSendContext.mockReturnValue({
+      to: undefined,
+      from: FROM,
+      chainId: CHAIN_ID,
+    } as unknown as ReturnType<typeof useSendContext>);
+    mockUseAsyncResult.mockReturnValue({ pending: true });
+
+    const { result } = renderHook(() => useFirstTimeInteractionSendAlert());
+
+    expect(result.current.isPending).toBe(false);
+  });
+});
diff --git a/app/components/Views/confirmations/hooks/send/alerts/useFirstTimeInteractionSendAlert.tsx b/app/components/Views/confirmations/hooks/send/alerts/useFirstTimeInteractionSendAlert.tsx
new file mode 100644
index 00000000000..4f3a21f1828
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/send/alerts/useFirstTimeInteractionSendAlert.tsx
@@ -0,0 +1,102 @@
+import {
+  Box,
+  BoxFlexDirection,
+  BoxFlexWrap,
+  FontWeight,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { InternalAccount } from '@metamask/keyring-internal-api';
+import { Hex, hexToNumber } from '@metamask/utils';
+import React, { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+
+import { strings } from '../../../../../../../locales/i18n';
+import { selectInternalAccounts } from '../../../../../../selectors/accountsController';
+import { checkFirstTimeInteraction } from '../../../../../../util/transaction-controller';
+import { useAsyncResult } from '../../../../../hooks/useAsyncResult';
+import { useSendContext } from '../../../context/send-context/send-context';
+import { TrustSignalDisplayState } from '../../../types/trustSignals';
+import { useAddressTrustSignal } from '../../useAddressTrustSignals';
+import type { SendAlert } from './types';
+
+export function useFirstTimeInteractionSendAlert(): {
+  alert: SendAlert | null;
+  isPending: boolean;
+} {
+  const { to, from, chainId } = useSendContext();
+  const internalAccounts = useSelector(
+    selectInternalAccounts,
+  ) as InternalAccount[];
+
+  const trustSignalResult = useAddressTrustSignal(to ?? '', chainId ?? '');
+
+  const isInternalAccount = useMemo(() => {
+    if (!to) {
+      return false;
+    }
+    return internalAccounts.some(
+      (account) => account.address?.toLowerCase() === to.toLowerCase(),
+    );
+  }, [internalAccounts, to]);
+
+  const isVerifiedAddress =
+    trustSignalResult.state === TrustSignalDisplayState.Verified;
+
+  const isTrustSignalLoading =
+    trustSignalResult.state === TrustSignalDisplayState.Loading;
+
+  const shouldSkip =
+    !to ||
+    !from ||
+    !chainId ||
+    isInternalAccount ||
+    isVerifiedAddress ||
+    isTrustSignalLoading;
+
+  const { pending, value: isFirstTime } = useAsyncResult(async () => {
+    if (shouldSkip) {
+      return undefined;
+    }
+    const chainIdNum = hexToNumber(chainId as Hex);
+    return checkFirstTimeInteraction({ from, to, chainId: chainIdNum });
+  }, [to, from, chainId, shouldSkip]);
+
+  const isPending = isTrustSignalLoading || (!shouldSkip && pending);
+
+  if (shouldSkip || pending || isFirstTime !== true) {
+    return { alert: null, isPending };
+  }
+
+  const message = (
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      flexWrap={BoxFlexWrap.Wrap}
+      twClassName="w-full justify-center"
+    >
+      <Text
+        variant={TextVariant.BodyMd}
+        twClassName="text-center text-alternative"
+      >
+        {strings('send.new_address_message')}{' '}
+      </Text>
+      <Text
+        variant={TextVariant.BodyMd}
+        fontWeight={FontWeight.Medium}
+        twClassName="text-center break-words max-w-full"
+      >
+        {to}
+      </Text>
+    </Box>
+  );
+
+  return {
+    alert: {
+      key: 'firstTimeInteraction',
+      title: strings('send.new_address_title'),
+      message,
+      acknowledgeButtonLabel: strings('send.continue'),
+    },
+    isPending: false,
+  };
+}
diff --git a/app/components/Views/confirmations/hooks/send/alerts/useSendAlerts.test.ts b/app/components/Views/confirmations/hooks/send/alerts/useSendAlerts.test.ts
new file mode 100644
index 00000000000..261e34fd501
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/send/alerts/useSendAlerts.test.ts
@@ -0,0 +1,174 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+
+import { useSendContext } from '../../../context/send-context/send-context';
+import { useFirstTimeInteractionSendAlert } from './useFirstTimeInteractionSendAlert';
+import { useTokenContractSendAlert } from './useTokenContractSendAlert';
+import { useSendAlerts } from './useSendAlerts';
+
+jest.mock('../../../context/send-context/send-context', () => ({
+  useSendContext: jest.fn(),
+}));
+
+jest.mock('./useFirstTimeInteractionSendAlert', () => ({
+  useFirstTimeInteractionSendAlert: jest.fn(),
+}));
+
+jest.mock('./useTokenContractSendAlert', () => ({
+  useTokenContractSendAlert: jest.fn(),
+}));
+
+const mockUseSendContext = jest.mocked(useSendContext);
+const mockUseFirstTimeInteraction = jest.mocked(
+  useFirstTimeInteractionSendAlert,
+);
+const mockUseTokenContract = jest.mocked(useTokenContractSendAlert);
+
+const TOKEN_ALERT = {
+  key: 'tokenContract',
+  title: 'Smart contract address',
+  message: 'Token contract warning',
+};
+
+const FIRST_TIME_ALERT = {
+  key: 'firstTimeInteraction',
+  title: 'New address',
+  message: 'First time message',
+  acknowledgeButtonLabel: 'Continue',
+};
+
+describe('useSendAlerts', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    mockUseSendContext.mockReturnValue({
+      to: '0xRecipient',
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    mockUseTokenContract.mockReturnValue({
+      alert: null,
+      isPending: false,
+    });
+
+    mockUseFirstTimeInteraction.mockReturnValue({
+      alert: null,
+      isPending: false,
+    });
+  });
+
+  it('returns empty alerts when no sub-hooks produce alerts', () => {
+    const { result } = renderHook(() => useSendAlerts());
+
+    expect(result.current.alerts).toEqual([]);
+    expect(result.current.hasUnacknowledgedAlerts).toBe(false);
+    expect(result.current.isAlertCheckPending).toBe(false);
+  });
+
+  it('collects token contract alert', () => {
+    mockUseTokenContract.mockReturnValue({
+      alert: TOKEN_ALERT,
+      isPending: false,
+    });
+
+    const { result } = renderHook(() => useSendAlerts());
+
+    expect(result.current.alerts).toEqual([TOKEN_ALERT]);
+    expect(result.current.hasUnacknowledgedAlerts).toBe(true);
+  });
+
+  it('collects first-time interaction alert', () => {
+    mockUseFirstTimeInteraction.mockReturnValue({
+      alert: FIRST_TIME_ALERT,
+      isPending: false,
+    });
+
+    const { result } = renderHook(() => useSendAlerts());
+
+    expect(result.current.alerts).toEqual([FIRST_TIME_ALERT]);
+    expect(result.current.hasUnacknowledgedAlerts).toBe(true);
+  });
+
+  it('collects both alerts in order: token contract first', () => {
+    mockUseTokenContract.mockReturnValue({
+      alert: TOKEN_ALERT,
+      isPending: false,
+    });
+    mockUseFirstTimeInteraction.mockReturnValue({
+      alert: FIRST_TIME_ALERT,
+      isPending: false,
+    });
+
+    const { result } = renderHook(() => useSendAlerts());
+
+    expect(result.current.alerts).toEqual([TOKEN_ALERT, FIRST_TIME_ALERT]);
+    expect(result.current.hasUnacknowledgedAlerts).toBe(true);
+  });
+
+  it('reports isAlertCheckPending when token contract check is pending', () => {
+    mockUseTokenContract.mockReturnValue({
+      alert: null,
+      isPending: true,
+    });
+
+    const { result } = renderHook(() => useSendAlerts());
+
+    expect(result.current.isAlertCheckPending).toBe(true);
+  });
+
+  it('reports isAlertCheckPending when first-time check is pending', () => {
+    mockUseFirstTimeInteraction.mockReturnValue({
+      alert: null,
+      isPending: true,
+    });
+
+    const { result } = renderHook(() => useSendAlerts());
+
+    expect(result.current.isAlertCheckPending).toBe(true);
+  });
+
+  it('acknowledgeAlerts sets hasUnacknowledgedAlerts to false', () => {
+    mockUseTokenContract.mockReturnValue({
+      alert: TOKEN_ALERT,
+      isPending: false,
+    });
+
+    const { result } = renderHook(() => useSendAlerts());
+
+    expect(result.current.hasUnacknowledgedAlerts).toBe(true);
+
+    act(() => {
+      result.current.acknowledgeAlerts();
+    });
+
+    expect(result.current.hasUnacknowledgedAlerts).toBe(false);
+  });
+
+  it('resets acknowledged state when to changes', () => {
+    mockUseTokenContract.mockReturnValue({
+      alert: TOKEN_ALERT,
+      isPending: false,
+    });
+
+    const { result, rerender } = renderHook(() => useSendAlerts());
+
+    act(() => {
+      result.current.acknowledgeAlerts();
+    });
+
+    expect(result.current.hasUnacknowledgedAlerts).toBe(false);
+
+    mockUseSendContext.mockReturnValue({
+      to: '0xNewRecipient',
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    rerender();
+
+    expect(result.current.hasUnacknowledgedAlerts).toBe(true);
+  });
+
+  it('returns hasUnacknowledgedAlerts false when alerts are empty even without acknowledging', () => {
+    const { result } = renderHook(() => useSendAlerts());
+
+    expect(result.current.alerts).toEqual([]);
+    expect(result.current.hasUnacknowledgedAlerts).toBe(false);
+  });
+});
diff --git a/app/components/Views/confirmations/hooks/send/alerts/useSendAlerts.ts b/app/components/Views/confirmations/hooks/send/alerts/useSendAlerts.ts
new file mode 100644
index 00000000000..7eca5ff4de2
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/send/alerts/useSendAlerts.ts
@@ -0,0 +1,50 @@
+import { useCallback, useEffect, useMemo, useState } from 'react';
+
+import { useSendContext } from '../../../context/send-context/send-context';
+import { useFirstTimeInteractionSendAlert } from './useFirstTimeInteractionSendAlert';
+import { useTokenContractSendAlert } from './useTokenContractSendAlert';
+import type { SendAlert } from './types';
+
+export function useSendAlerts(): {
+  alerts: SendAlert[];
+  hasUnacknowledgedAlerts: boolean;
+  acknowledgeAlerts: () => void;
+  isAlertCheckPending: boolean;
+} {
+  const { to } = useSendContext();
+  const { alert: tokenContractAlert, isPending: tokenContractPending } =
+    useTokenContractSendAlert();
+  const { alert: firstTimeAlert, isPending: firstTimePending } =
+    useFirstTimeInteractionSendAlert();
+  const [acknowledged, setAcknowledged] = useState(false);
+
+  const isAlertCheckPending = tokenContractPending || firstTimePending;
+
+  const alerts = useMemo(() => {
+    const result: SendAlert[] = [];
+    if (tokenContractAlert) {
+      result.push(tokenContractAlert);
+    }
+    if (firstTimeAlert) {
+      result.push(firstTimeAlert);
+    }
+    return result;
+  }, [tokenContractAlert, firstTimeAlert]);
+
+  useEffect(() => {
+    setAcknowledged(false);
+  }, [to]);
+
+  const acknowledgeAlerts = useCallback(() => {
+    setAcknowledged(true);
+  }, []);
+
+  const hasUnacknowledgedAlerts = alerts.length > 0 && !acknowledged;
+
+  return {
+    alerts,
+    hasUnacknowledgedAlerts,
+    acknowledgeAlerts,
+    isAlertCheckPending,
+  };
+}
diff --git a/app/components/Views/confirmations/hooks/send/alerts/useTokenContractSendAlert.test.ts b/app/components/Views/confirmations/hooks/send/alerts/useTokenContractSendAlert.test.ts
new file mode 100644
index 00000000000..89f494a76d8
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/send/alerts/useTokenContractSendAlert.test.ts
@@ -0,0 +1,207 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+
+import {
+  memoizedGetTokenStandardAndDetails,
+  type TokenDetails,
+} from '../../../utils/token';
+import { useSendContext } from '../../../context/send-context/send-context';
+import { useSendType } from '../useSendType';
+import { useTokenContractSendAlert } from './useTokenContractSendAlert';
+
+type TokenResult = TokenDetails | Record<string, never>;
+
+jest.mock('../../../context/send-context/send-context', () => ({
+  useSendContext: jest.fn(),
+}));
+
+jest.mock('../useSendType', () => ({
+  useSendType: jest.fn(),
+}));
+
+jest.mock('../../../utils/token', () => ({
+  memoizedGetTokenStandardAndDetails: jest.fn(),
+}));
+
+jest.mock('../../../../../../core/Engine', () => ({
+  context: {
+    NetworkController: {
+      findNetworkClientIdByChainId: jest.fn().mockReturnValue('mainnet'),
+    },
+  },
+}));
+
+jest.mock('../../../../../../util/address', () => ({
+  isValidHexAddress: jest.fn((addr: string) => addr.startsWith('0x')),
+  toChecksumAddress: jest.fn((addr: string) => addr),
+}));
+
+jest.mock('../../../../../../../locales/i18n', () => ({
+  strings: (key: string) => {
+    const map: Record<string, string> = {
+      'send.smart_contract_address': 'Smart contract address',
+      'send.smart_contract_address_warning': 'Token contract warning',
+    };
+    return map[key] || key;
+  },
+}));
+
+const mockUseSendContext = jest.mocked(useSendContext);
+const mockUseSendType = jest.mocked(useSendType);
+const mockGetTokenDetails = jest.mocked(memoizedGetTokenStandardAndDetails);
+
+describe('useTokenContractSendAlert', () => {
+  const TOKEN_CONTRACT = '0x935E73EDb9fF52E23BaC7F7e043A1ecD06d05477';
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    mockUseSendContext.mockReturnValue({
+      to: TOKEN_CONTRACT,
+      chainId: '0x1',
+      asset: { address: '0xDifferentAddress' },
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    mockUseSendType.mockReturnValue({
+      isEvmSendType: true,
+    } as unknown as ReturnType<typeof useSendType>);
+
+    mockGetTokenDetails.mockResolvedValue({});
+  });
+
+  it('returns null alert when to is missing', () => {
+    mockUseSendContext.mockReturnValue({
+      to: undefined,
+      chainId: '0x1',
+      asset: {},
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    const { result } = renderHook(() => useTokenContractSendAlert());
+
+    expect(result.current.alert).toBeNull();
+    expect(result.current.isPending).toBe(false);
+  });
+
+  it('returns null alert when chainId is missing', () => {
+    mockUseSendContext.mockReturnValue({
+      to: TOKEN_CONTRACT,
+      chainId: undefined,
+      asset: {},
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    const { result } = renderHook(() => useTokenContractSendAlert());
+
+    expect(result.current.alert).toBeNull();
+  });
+
+  it('returns null alert when not an EVM send type', () => {
+    mockUseSendType.mockReturnValue({
+      isEvmSendType: false,
+    } as unknown as ReturnType<typeof useSendType>);
+
+    const { result } = renderHook(() => useTokenContractSendAlert());
+
+    expect(result.current.alert).toBeNull();
+  });
+
+  it('returns null alert when to address equals asset address', () => {
+    mockUseSendContext.mockReturnValue({
+      to: TOKEN_CONTRACT,
+      chainId: '0x1',
+      asset: { address: TOKEN_CONTRACT },
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    const { result } = renderHook(() => useTokenContractSendAlert());
+
+    expect(result.current.alert).toBeNull();
+  });
+
+  it('returns alert when address is a token contract', async () => {
+    mockGetTokenDetails.mockResolvedValue({
+      standard: 'ERC20',
+    } as Awaited<ReturnType<typeof memoizedGetTokenStandardAndDetails>>);
+
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useTokenContractSendAlert(),
+    );
+
+    await waitForNextUpdate();
+
+    expect(result.current.alert).not.toBeNull();
+    expect(result.current.alert?.key).toBe('tokenContract');
+    expect(result.current.alert?.title).toBe('Smart contract address');
+    expect(result.current.alert?.message).toBe('Token contract warning');
+    expect(result.current.isPending).toBe(false);
+  });
+
+  it('returns null alert when address is not a token contract', async () => {
+    mockGetTokenDetails.mockResolvedValue({});
+
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useTokenContractSendAlert(),
+    );
+
+    await waitForNextUpdate();
+
+    expect(result.current.alert).toBeNull();
+    expect(result.current.isPending).toBe(false);
+  });
+
+  it('returns null alert when token details lookup throws', async () => {
+    mockGetTokenDetails.mockRejectedValue(new Error('lookup failed'));
+
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useTokenContractSendAlert(),
+    );
+
+    await waitForNextUpdate();
+
+    expect(result.current.alert).toBeNull();
+    expect(result.current.isPending).toBe(false);
+  });
+
+  it('reports isPending while the token check is in progress', async () => {
+    let resolvePromise: (v: TokenResult) => void = () => undefined;
+    mockGetTokenDetails.mockReturnValue(
+      new Promise<TokenResult>((resolve) => {
+        resolvePromise = resolve;
+      }),
+    );
+
+    const { result } = renderHook(() => useTokenContractSendAlert());
+
+    expect(result.current.isPending).toBe(true);
+
+    await act(async () => {
+      resolvePromise({});
+    });
+  });
+
+  it('cancels in-flight check when to changes', async () => {
+    let resolveFirst: (v: TokenResult) => void = () => undefined;
+    mockGetTokenDetails.mockReturnValueOnce(
+      new Promise<TokenResult>((resolve) => {
+        resolveFirst = resolve;
+      }),
+    );
+
+    const { result, rerender } = renderHook(() => useTokenContractSendAlert());
+
+    expect(result.current.isPending).toBe(true);
+
+    mockUseSendContext.mockReturnValue({
+      to: '0xNewAddress',
+      chainId: '0x1',
+      asset: { address: '0xDifferentAddress' },
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    mockGetTokenDetails.mockResolvedValueOnce({});
+
+    rerender();
+
+    await act(async () => {
+      resolveFirst({ standard: 'ERC20' } as TokenResult);
+    });
+
+    expect(result.current.alert).toBeNull();
+  });
+});
diff --git a/app/components/Views/confirmations/hooks/send/alerts/useTokenContractSendAlert.ts b/app/components/Views/confirmations/hooks/send/alerts/useTokenContractSendAlert.ts
new file mode 100644
index 00000000000..6e45d92fbc4
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/send/alerts/useTokenContractSendAlert.ts
@@ -0,0 +1,85 @@
+import { Hex } from '@metamask/utils';
+import { useEffect, useState } from 'react';
+
+import { strings } from '../../../../../../../locales/i18n';
+import Engine from '../../../../../../core/Engine';
+import {
+  isValidHexAddress,
+  toChecksumAddress,
+} from '../../../../../../util/address';
+import { memoizedGetTokenStandardAndDetails } from '../../../utils/token';
+import { useSendContext } from '../../../context/send-context/send-context';
+import { useSendType } from '../useSendType';
+import type { SendAlert } from './types';
+
+export function useTokenContractSendAlert(): {
+  alert: SendAlert | null;
+  isPending: boolean;
+} {
+  const { to, chainId, asset } = useSendContext();
+  const { isEvmSendType } = useSendType();
+  const [isTokenContract, setIsTokenContract] = useState(false);
+  const [checkComplete, setCheckComplete] = useState(true);
+
+  useEffect(() => {
+    let cancelled = false;
+    setIsTokenContract(false);
+
+    if (!to || !chainId || !isEvmSendType || !isValidHexAddress(to)) {
+      setCheckComplete(true);
+      return undefined;
+    }
+
+    if (to?.toLowerCase() === asset?.address?.toLowerCase()) {
+      setCheckComplete(true);
+      return undefined;
+    }
+
+    setCheckComplete(false);
+
+    const checksummedAddress = toChecksumAddress(to);
+    const { NetworkController } = Engine.context;
+    const networkClientId = NetworkController.findNetworkClientIdByChainId(
+      chainId as Hex,
+    );
+
+    memoizedGetTokenStandardAndDetails({
+      tokenAddress: checksummedAddress,
+      tokenId: undefined,
+      userAddress: undefined,
+      networkClientId,
+    })
+      .then((token) => {
+        if (!cancelled && token?.standard) {
+          setIsTokenContract(true);
+        }
+      })
+      .catch(() => {
+        // Not a token address
+      })
+      .finally(() => {
+        if (!cancelled) {
+          setCheckComplete(true);
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [to, chainId, isEvmSendType, asset?.address]);
+
+  const isPending = !checkComplete;
+
+  if (!isTokenContract) {
+    return { alert: null, isPending };
+  }
+
+  return {
+    alert: {
+      key: 'tokenContract',
+      title: strings('send.smart_contract_address'),
+      message: strings('send.smart_contract_address_warning'),
+    },
+    isPending: false,
+  };
+}
diff --git a/app/components/Views/confirmations/hooks/send/useSendActions.test.ts b/app/components/Views/confirmations/hooks/send/useSendActions.test.ts
index 8eb38809f7a..184cd08f98d 100644
--- a/app/components/Views/confirmations/hooks/send/useSendActions.test.ts
+++ b/app/components/Views/confirmations/hooks/send/useSendActions.test.ts
@@ -77,20 +77,20 @@ describe('useSendActions', () => {
     expect(result.current.handleCancelPress).toBeDefined();
   });
 
-  it('calls navigation.navigate with correct params when evm ', () => {
+  it('calls navigation.navigate with correct params when evm ', async () => {
     const { result } = renderHookWithProvider(
       () => useSendActions(),
       mockState,
     );
     jest.spyOn(SendUtils, 'submitEvmTransaction').mockImplementation(jest.fn());
-    result.current.handleSubmitPress();
+    await result.current.handleSubmitPress();
     expect(mockNavigate).toHaveBeenCalledWith('RedesignedConfirmations', {
       params: { maxValueMode: undefined },
       loader: 'transfer',
     });
   });
 
-  it('normalizes trailing dot values before submitting evm transaction', () => {
+  it('normalizes trailing dot values before submitting evm transaction', async () => {
     mockUseSendContext.mockReturnValue({
       asset: {
         chainId: '0x1',
@@ -111,7 +111,7 @@ describe('useSendActions', () => {
       () => useSendActions(),
       mockState,
     );
-    result.current.handleSubmitPress();
+    await result.current.handleSubmitPress();
 
     expect(submitSpy).toHaveBeenCalledWith(
       expect.objectContaining({ value: '0' }),
diff --git a/app/components/Views/confirmations/hooks/send/useSendScreenNavigation.test.ts b/app/components/Views/confirmations/hooks/send/useSendScreenNavigation.test.ts
index 14c3501fd31..4ef9c9830a6 100644
--- a/app/components/Views/confirmations/hooks/send/useSendScreenNavigation.test.ts
+++ b/app/components/Views/confirmations/hooks/send/useSendScreenNavigation.test.ts
@@ -49,13 +49,21 @@ describe('useSendScreenNavigation', () => {
       mockState,
     );
     const { gotToSendScreen } = result.current;
+    const expectedParams = {
+      asset: {
+        chainId: '0x1',
+        address: '0x935E73EDb9fF52E23BaC7F7e043A1ecD06d05477',
+      },
+    };
     gotToSendScreen();
     expect(mockNavigate).toHaveBeenCalledWith('Send', {
       screen: Routes.SEND.AMOUNT,
+      params: expectedParams,
     });
     gotToSendScreen(Routes.SEND.RECIPIENT);
     expect(mockNavigate).toHaveBeenCalledWith('Send', {
       screen: Routes.SEND.RECIPIENT,
+      params: expectedParams,
     });
   });
 });
diff --git a/app/components/Views/confirmations/hooks/send/useSendScreenNavigation.ts b/app/components/Views/confirmations/hooks/send/useSendScreenNavigation.ts
index bcbb8b52f93..10f2f7acd7d 100644
--- a/app/components/Views/confirmations/hooks/send/useSendScreenNavigation.ts
+++ b/app/components/Views/confirmations/hooks/send/useSendScreenNavigation.ts
@@ -1,18 +1,20 @@
 import { useCallback } from 'react';
-import { useNavigation } from '@react-navigation/native';
+import { useNavigation, useRoute } from '@react-navigation/native';
 
 import Routes from '../../../../../constants/navigation/Routes';
 
 export const useSendScreenNavigation = () => {
   const navigation = useNavigation();
+  const route = useRoute();
 
   const gotToSendScreen = useCallback(
     (screen = Routes.SEND.AMOUNT) => {
       navigation.navigate(Routes.SEND.DEFAULT, {
         screen,
+        params: route.params,
       });
     },
-    [navigation],
+    [navigation, route.params],
   );
 
   return { gotToSendScreen };
diff --git a/app/components/Views/confirmations/hooks/send/useToAddressValidation.test.ts b/app/components/Views/confirmations/hooks/send/useToAddressValidation.test.ts
index 560cbcfeb55..342f69961db 100644
--- a/app/components/Views/confirmations/hooks/send/useToAddressValidation.test.ts
+++ b/app/components/Views/confirmations/hooks/send/useToAddressValidation.test.ts
@@ -46,7 +46,6 @@ describe('useToAddressValidation', () => {
       loading: false,
       resolvedAddress: undefined,
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: undefined,
       toAddressWarning: undefined,
     });
@@ -64,7 +63,6 @@ describe('useToAddressValidation', () => {
       loading: false,
       resolvedAddress: undefined,
       toAddressError: undefined,
-      toAddressErrorAllowAcknowledge: false,
       toAddressValidated: undefined,
       toAddressWarning: undefined,
     });
@@ -92,7 +90,6 @@ describe('useToAddressValidation', () => {
         loading: false,
         resolvedAddress: undefined,
         toAddressError: 'Invalid address',
-        toAddressErrorAllowAcknowledge: false,
         toAddressValidated: '0x123',
         toAddressWarning: undefined,
       });
@@ -114,7 +111,6 @@ describe('useToAddressValidation', () => {
         loading: false,
         resolvedAddress: undefined,
         toAddressError: 'Invalid address',
-        toAddressErrorAllowAcknowledge: false,
         toAddressValidated: 'dummy',
         toAddressWarning: undefined,
       });
@@ -143,7 +139,6 @@ describe('useToAddressValidation', () => {
         loading: false,
         resolvedAddress: undefined,
         toAddressError: 'Invalid address',
-        toAddressErrorAllowAcknowledge: false,
         toAddressValidated: 'dummy',
         toAddressWarning: undefined,
       });
diff --git a/app/components/Views/confirmations/hooks/send/useToAddressValidation.ts b/app/components/Views/confirmations/hooks/send/useToAddressValidation.ts
index bdd9eca301d..40b4a22ee91 100644
--- a/app/components/Views/confirmations/hooks/send/useToAddressValidation.ts
+++ b/app/components/Views/confirmations/hooks/send/useToAddressValidation.ts
@@ -20,7 +20,6 @@ interface ValidationResult {
   error?: string;
   warning?: string;
   resolvedAddress?: string;
-  allowAcknowledge?: boolean;
 }
 
 export const useToAddressValidation = () => {
@@ -113,14 +112,12 @@ export const useToAddressValidation = () => {
     error,
     warning: toAddressWarning,
     resolvedAddress,
-    allowAcknowledge,
   } = result ?? {};
 
   return {
     loading,
     resolvedAddress,
     toAddressError: error,
-    toAddressErrorAllowAcknowledge: allowAcknowledge === true,
     toAddressValidated,
     toAddressWarning,
   };
diff --git a/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.test.ts b/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.test.ts
index 7c6feb19e5e..8a582bfeb2c 100644
--- a/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.test.ts
+++ b/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.test.ts
@@ -396,6 +396,96 @@ describe('useTransactionConfirm', () => {
     );
   });
 
+  describe('isGasFeeSponsored override', () => {
+    it('clears isGasFeeSponsored when gasless is not supported', async () => {
+      useIsGaslessSupportedMock.mockReturnValue({
+        isSmartTransaction: false,
+        isSupported: false,
+        pending: false,
+      });
+
+      useTransactionMetadataRequestMock.mockReturnValue({
+        id: transactionIdMock,
+        chainId: CHAIN_ID_MOCK,
+        origin: ORIGIN_METAMASK,
+        txParams: {},
+        isGasFeeSponsored: true,
+      } as unknown as TransactionMeta);
+
+      const { result } = renderHook();
+
+      await act(async () => {
+        await result.current.onConfirm();
+      });
+
+      expect(onApprovalConfirm).toHaveBeenCalledWith(expect.anything(), {
+        txMeta: expect.objectContaining({
+          isGasFeeSponsored: false,
+        }),
+      });
+    });
+
+    it('preserves isGasFeeSponsored when gasless is supported', async () => {
+      useIsGaslessSupportedMock.mockReturnValue({
+        isSmartTransaction: true,
+        isSupported: true,
+        pending: false,
+      });
+
+      useTransactionMetadataRequestMock.mockReturnValue({
+        id: transactionIdMock,
+        chainId: CHAIN_ID_MOCK,
+        origin: ORIGIN_METAMASK,
+        txParams: {},
+        isGasFeeSponsored: true,
+      } as unknown as TransactionMeta);
+
+      const { result } = renderHook();
+
+      await act(async () => {
+        await result.current.onConfirm();
+      });
+
+      expect(onApprovalConfirm).toHaveBeenCalledWith(expect.anything(), {
+        txMeta: expect.objectContaining({
+          isGasFeeSponsored: true,
+        }),
+      });
+    });
+
+    it('clears isGasFeeSponsored even without selectedGasFeeToken', async () => {
+      useIsGaslessSupportedMock.mockReturnValue({
+        isSmartTransaction: false,
+        isSupported: false,
+        pending: false,
+      });
+
+      useSelectedGasFeeTokenMock.mockReturnValue(
+        undefined as unknown as ReturnType<typeof useSelectedGasFeeToken>,
+      );
+
+      useTransactionMetadataRequestMock.mockReturnValue({
+        id: transactionIdMock,
+        chainId: CHAIN_ID_MOCK,
+        origin: ORIGIN_METAMASK,
+        txParams: {},
+        isGasFeeSponsored: true,
+      } as unknown as TransactionMeta);
+
+      const { result } = renderHook();
+
+      await act(async () => {
+        await result.current.onConfirm();
+      });
+
+      expect(onApprovalConfirm).toHaveBeenCalledWith(expect.anything(), {
+        txMeta: expect.objectContaining({
+          isGasFeeSponsored: false,
+        }),
+      });
+    });
+  });
+
   describe('handleSmartTransaction', () => {
     beforeEach(() => {
       useGaslessSupportedSmartTransactionsMock.mockReturnValue({
diff --git a/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts b/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts
index 46e03709ff6..96f4ee759d6 100644
--- a/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts
+++ b/app/components/Views/confirmations/hooks/transactions/useTransactionConfirm.ts
@@ -22,6 +22,8 @@ import { useMusdConfirmNavigation } from '../../../../UI/Earn/hooks/useMusdConfi
 const log = createProjectLogger('transaction-confirm');
 
 export const GO_BACK_TYPES = [
+  TransactionType.moneyAccountDeposit,
+  TransactionType.moneyAccountWithdraw,
   TransactionType.perpsWithdraw,
   TransactionType.predictClaim,
   TransactionType.predictDeposit,
@@ -70,24 +72,8 @@ export function useTransactionConfirm() {
       updatedMetadata.txParams.maxFeePerGas = selectedGasFeeToken.maxFeePerGas;
       updatedMetadata.txParams.maxPriorityFeePerGas =
         selectedGasFeeToken.maxPriorityFeePerGas;
-
-      // If the gasless flow is not supported (e.g. stx is disabled by the user,
-      // or 7702 is not supported in the chain), we override the
-      // `isGasFeeSponsored` flag to `false` so the transaction meta object in
-      // state has the correct value for the transaction details on the activity
-      // list to not show as sponsored. One limitation on the activity list will
-      // be that pre-populated transactions on fresh installs will not show as
-      // sponsored even if they were because this is not easily observable onchain
-      // for all cases.
-      updatedMetadata.isGasFeeSponsored =
-        isGaslessSupported && transactionMetadata?.isGasFeeSponsored;
     },
-    [
-      selectedGasFeeToken,
-      isGasFeeTokenIgnoredIfBalance,
-      isGaslessSupported,
-      transactionMetadata?.isGasFeeSponsored,
-    ],
+    [selectedGasFeeToken, isGasFeeTokenIgnoredIfBalance],
   );
 
   const handleGasless7702 = useCallback(
@@ -97,15 +83,8 @@ export function useTransactionConfirm() {
       }
 
       updatedMetadata.isExternalSign = true;
-      updatedMetadata.isGasFeeSponsored =
-        isGaslessSupported && transactionMetadata?.isGasFeeSponsored;
     },
-    [
-      isGasFeeTokenIgnoredIfBalance,
-      isGaslessSupported,
-      selectedGasFeeToken,
-      transactionMetadata?.isGasFeeSponsored,
-    ],
+    [isGasFeeTokenIgnoredIfBalance, selectedGasFeeToken],
   );
 
   const onConfirm = useCallback(
@@ -119,7 +98,13 @@ export function useTransactionConfirm() {
 
       const updatedMetadata = cloneDeep(transactionMetadata);
 
-      if (isGaslessSupportedSTX && !isHardwareWallet) {
+      // Ensure the persisted `isGasFeeSponsored` flag reflects whether gasless
+      // is actually supported (e.g. HW wallets don't support gasless, so the
+      // flag must be cleared so the activity list does not show "Paid by MetaMask").
+      updatedMetadata.isGasFeeSponsored =
+        isGaslessSupported && transactionMetadata?.isGasFeeSponsored;
+
+      if (isGaslessSupportedSTX) {
         handleSmartTransaction(updatedMetadata);
       } else if (selectedGasFeeToken && !isHardwareWallet) {
         handleGasless7702(updatedMetadata);
@@ -167,6 +152,7 @@ export function useTransactionConfirm() {
       handleGasless7702,
       handleSmartTransaction,
       isFullScreenConfirmation,
+      isGaslessSupported,
       isGaslessSupportedSTX,
       navigation,
       musdConversionNavigateOnConfirm,
diff --git a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.test.ts b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.test.ts
index 5431d8329c7..a76e5338cff 100644
--- a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.test.ts
+++ b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.test.ts
@@ -11,7 +11,7 @@ import { transactionApprovalControllerMock } from '../../__mocks__/controllers/a
 import { act } from 'react';
 import { useTokenFiatRate } from '../tokens/useTokenFiatRates';
 import { useTransactionPayToken } from '../pay/useTransactionPayToken';
-import { useUpdateTokenAmount } from './useUpdateTokenAmount';
+import { useUpdateTransactionPayAmount } from '../pay/useUpdateTransactionPayAmount';
 import {
   TransactionMeta,
   TransactionType,
@@ -38,7 +38,7 @@ import { useConfirmationMetricEvents } from '../metrics/useConfirmationMetricEve
 import Engine from '../../../../../core/Engine';
 
 jest.mock('../tokens/useTokenFiatRates');
-jest.mock('../transactions/useUpdateTokenAmount');
+jest.mock('../pay/useUpdateTransactionPayAmount');
 jest.mock('../pay/useTransactionPayToken');
 jest.mock('../pay/useTransactionPayData');
 jest.mock('../pay/useTransactionPayHasSourceAmount');
@@ -103,7 +103,9 @@ function runHook({
 
 describe('useTransactionCustomAmount', () => {
   const useTokenFiatRateMock = jest.mocked(useTokenFiatRate);
-  const useUpdateTokenAmountMock = jest.mocked(useUpdateTokenAmount);
+  const useUpdateTransactionPayAmountMock = jest.mocked(
+    useUpdateTransactionPayAmount,
+  );
   const useTransactionPayTokenMock = jest.mocked(useTransactionPayToken);
   const useParamsMock = jest.mocked(useParams);
   const usePredictBalanceMock = jest.mocked(usePredictBalance);
@@ -125,9 +127,9 @@ describe('useTransactionCustomAmount', () => {
     useConfirmationMetricEvents,
   );
 
-  const updateTokenAmountMock: ReturnType<
-    typeof useUpdateTokenAmount
-  >['updateTokenAmount'] = jest.fn();
+  const updateTransactionPayAmountMock: ReturnType<
+    typeof useUpdateTransactionPayAmount
+  >['updateTransactionPayAmount'] = jest.fn();
 
   const setConfirmationMetricMock = jest.fn();
 
@@ -136,9 +138,9 @@ describe('useTransactionCustomAmount', () => {
 
     useTokenFiatRateMock.mockReturnValue(2);
 
-    useUpdateTokenAmountMock.mockReturnValue({
-      updateTokenAmount: updateTokenAmountMock,
-    } as ReturnType<typeof useUpdateTokenAmountMock>);
+    useUpdateTransactionPayAmountMock.mockReturnValue({
+      updateTransactionPayAmount: updateTransactionPayAmountMock,
+    } as ReturnType<typeof useUpdateTransactionPayAmountMock>);
 
     useTransactionPayTokenMock.mockReturnValue({
       payToken: {
@@ -255,7 +257,7 @@ describe('useTransactionCustomAmount', () => {
     expect(result.current.amountFiat).toBe('1'.repeat(27));
   });
 
-  it('updateTokenAmount updates token amount in transaction data', async () => {
+  it('updateTokenAmount delegates to updateTransactionPayAmount with the human amount', async () => {
     const { result } = runHook();
 
     await act(async () => {
@@ -266,7 +268,7 @@ describe('useTransactionCustomAmount', () => {
       result.current.updateTokenAmount();
     });
 
-    expect(updateTokenAmountMock).toHaveBeenCalledWith('61.725');
+    expect(updateTransactionPayAmountMock).toHaveBeenCalledWith('61.725');
   });
 
   it('sets mm_pay_quote_requested metric only when hasSourceAmount becomes true after updateTokenAmount was called', async () => {
@@ -514,7 +516,8 @@ describe('useTransactionCustomAmount', () => {
       (Engine.context as Record<string, unknown>).PerpsController = {
         state: {
           accountState: {
-            availableBalance: '500.00',
+            spendableBalance: '500.00',
+            withdrawableBalance: '500.00',
           },
         },
       };
@@ -539,7 +542,8 @@ describe('useTransactionCustomAmount', () => {
       (Engine.context as Record<string, unknown>).PerpsController = {
         state: {
           accountState: {
-            availableBalance: '50.389',
+            spendableBalance: '50.389',
+            withdrawableBalance: '50.389',
           },
         },
       };
@@ -566,7 +570,8 @@ describe('useTransactionCustomAmount', () => {
       (Engine.context as Record<string, unknown>).PerpsController = {
         state: {
           accountState: {
-            availableBalance: '500.00',
+            spendableBalance: '500.00',
+            withdrawableBalance: '500.00',
           },
         },
       };
@@ -592,7 +597,8 @@ describe('useTransactionCustomAmount', () => {
       (Engine.context as Record<string, unknown>).PerpsController = {
         state: {
           accountState: {
-            availableBalance: '500.00',
+            spendableBalance: '500.00',
+            withdrawableBalance: '500.00',
           },
         },
       };
diff --git a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.ts b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.ts
index b1ebdf85532..3942c106171 100644
--- a/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.ts
+++ b/app/components/Views/confirmations/hooks/transactions/useTransactionCustomAmount.ts
@@ -7,7 +7,7 @@ import {
   TransactionType,
 } from '@metamask/transaction-controller';
 import { useTransactionPayToken } from '../pay/useTransactionPayToken';
-import { useUpdateTokenAmount } from './useUpdateTokenAmount';
+import { useUpdateTransactionPayAmount } from '../pay/useUpdateTransactionPayAmount';
 import { getTokenAddress } from '../../utils/transaction-pay';
 import { useParams } from '../../../../../util/navigation/navUtils';
 import { debounce } from 'lodash';
@@ -80,8 +80,7 @@ export function useTransactionCustomAmount({
     : payTokenFiatRate;
   const balanceUsd = useTokenBalance(tokenFiatRate);
 
-  const { updateTokenAmount: updateTokenAmountCallback } =
-    useUpdateTokenAmount();
+  const { updateTransactionPayAmount } = useUpdateTransactionPayAmount();
 
   const amountFiat = useMemo(() => {
     const targetAmountUsd = totals?.targetAmount.usd;
@@ -206,10 +205,10 @@ export function useTransactionCustomAmount({
     ],
   );
 
-  const updateTokenAmount = useCallback(() => {
-    updateTokenAmountCallback(amountHuman);
+  const updateTokenAmount = useCallback(async () => {
+    await updateTransactionPayAmount(amountHuman);
     setIsTokenAmountUpdated(true);
-  }, [amountHuman, updateTokenAmountCallback]);
+  }, [amountHuman, updateTransactionPayAmount]);
 
   useEffect(() => {
     if (isTokenAmountUpdated && (hasSourceAmount || isPostQuote)) {
@@ -258,14 +257,8 @@ function useTokenBalance(tokenUsdRate: number) {
 
   if (hasTransactionType(transactionMeta, [TransactionType.perpsWithdraw])) {
     const perpsState = Engine.context.PerpsController?.state;
-    // Prefer `availableToTradeBalance` so Unified Account / Portfolio Margin
-    // users see the correct balance behind the percentage buttons. Falls back
-    // to `availableBalance` for Standard-mode accounts where the unified
-    // field isn't populated.
-    const availableBalance =
-      perpsState?.accountState?.availableToTradeBalance ??
-      perpsState?.accountState?.availableBalance;
-    return availableBalance ? parseFloat(availableBalance) : 0;
+    const withdrawableBalance = perpsState?.accountState?.withdrawableBalance;
+    return withdrawableBalance ? parseFloat(withdrawableBalance) : 0;
   }
 
   if (
diff --git a/app/components/Views/confirmations/hooks/useConfirmActions.test.ts b/app/components/Views/confirmations/hooks/useConfirmActions.test.ts
index c8fbcf586b8..0b4d2852295 100644
--- a/app/components/Views/confirmations/hooks/useConfirmActions.test.ts
+++ b/app/components/Views/confirmations/hooks/useConfirmActions.test.ts
@@ -19,11 +19,27 @@ jest.mock('./useIsConfirmationFromLedgerAccount', () => ({
   useIsConfirmationFromLedgerAccount: jest.fn().mockReturnValue(false),
 }));
 
+jest.mock(
+  '../../../../core/HardwareWallet/hooks/useIsConfirmationFromQrAccount',
+  () => ({
+    useIsConfirmationFromQrAccount: jest.fn().mockReturnValue(false),
+  }),
+);
+
 const mockOnLedgerConfirm = jest.fn().mockResolvedValue(undefined);
 jest.mock('./useLedgerConfirm', () => ({
   useLedgerConfirm: () => ({ onConfirm: mockOnLedgerConfirm }),
 }));
 
+const mockOnQrConfirm = jest.fn().mockResolvedValue(undefined);
+jest.mock('../../../../core/HardwareWallet/hooks/useQrConfirm', () => ({
+  useQrConfirm: () => ({ onConfirm: mockOnQrConfirm }),
+}));
+
+const mockIsConfirmationFromQrAccount = jest.requireMock(
+  '../../../../core/HardwareWallet/hooks/useIsConfirmationFromQrAccount',
+).useIsConfirmationFromQrAccount;
+
 jest.mock('@react-navigation/native', () => ({
   ...jest.requireActual('@react-navigation/native'),
   useNavigation: jest.fn(),
@@ -79,20 +95,23 @@ describe('useConfirmAction', () => {
     });
   });
 
-  it('call setScannerVisible if QR signing is in progress', async () => {
+  it('sets signing confirmed and shows scanner when QR signing is in progress', async () => {
     const clearSecurityAlertResponseSpy = jest.spyOn(
       PPOMUtil,
       'clearSignatureSecurityAlertResponse',
     );
     const mockSetScannerVisible = jest.fn().mockResolvedValue(undefined);
+    const mockSetSigningConfirmed = jest.fn();
     jest.spyOn(QRHardwareHook, 'useQRHardwareContext').mockReturnValue({
       isSigningQRObject: true,
       setScannerVisible: mockSetScannerVisible,
+      setSigningConfirmed: mockSetSigningConfirmed,
     } as unknown as QRHardwareHook.QRHardwareContextType);
     const { result } = renderHookWithProvider(() => useConfirmActions(), {
       state: personalSignatureConfirmationState,
     });
     result?.current?.onConfirm();
+    expect(mockSetSigningConfirmed).toHaveBeenCalledTimes(1);
     expect(mockSetScannerVisible).toHaveBeenCalledTimes(1);
     expect(mockSetScannerVisible).toHaveBeenLastCalledWith(true);
     expect(Engine.acceptPendingApproval).toHaveBeenCalledTimes(0);
@@ -101,6 +120,79 @@ describe('useConfirmAction', () => {
     expect(clearSecurityAlertResponseSpy).toHaveBeenCalledTimes(0);
   });
 
+  it('delegates to useQrConfirm when account is QR hardware and request is a transaction', async () => {
+    mockIsConfirmationFromQrAccount.mockReturnValue(true);
+    mockOnQrConfirm.mockClear();
+
+    const { result } = renderHookWithProvider(() => useConfirmActions(), {
+      state: stakingDepositConfirmationState,
+    });
+
+    await result?.current?.onConfirm();
+
+    expect(mockOnQrConfirm).toHaveBeenCalledTimes(1);
+    expect(Engine.acceptPendingApproval).not.toHaveBeenCalled();
+
+    mockIsConfirmationFromQrAccount.mockReturnValue(false);
+  });
+
+  it('delegates to useQrConfirm when account is QR hardware and request is a signature', async () => {
+    mockIsConfirmationFromQrAccount.mockReturnValue(true);
+    mockOnQrConfirm.mockClear();
+
+    const { result } = renderHookWithProvider(() => useConfirmActions(), {
+      state: personalSignatureConfirmationState,
+    });
+
+    await result?.current?.onConfirm();
+
+    expect(mockOnQrConfirm).toHaveBeenCalledTimes(1);
+    expect(Engine.acceptPendingApproval).not.toHaveBeenCalled();
+
+    mockIsConfirmationFromQrAccount.mockReturnValue(false);
+  });
+
+  it('calls setSigningConfirmed before executeApproval on default confirm path', async () => {
+    const mockSetSigningConfirmed = jest.fn();
+    jest.spyOn(QRHardwareHook, 'useQRHardwareContext').mockReturnValue({
+      isSigningQRObject: false,
+      setScannerVisible: jest.fn(),
+      setSigningConfirmed: mockSetSigningConfirmed,
+    } as unknown as QRHardwareHook.QRHardwareContextType);
+    const { result } = renderHookWithProvider(() => useConfirmActions(), {
+      state: personalSignatureConfirmationState,
+    });
+    result?.current?.onConfirm();
+    expect(mockSetSigningConfirmed).toHaveBeenCalledTimes(1);
+    expect(Engine.acceptPendingApproval).toHaveBeenCalledTimes(1);
+    await flushPromises();
+  });
+
+  it('calls setSigningConfirmed before confirming a transaction', async () => {
+    const mockSetSigningConfirmed = jest.fn();
+    const mockTransactionConfirm = jest.fn().mockResolvedValue(undefined);
+    useTransactionConfirmMock.mockReturnValue({
+      onConfirm: mockTransactionConfirm,
+    });
+    jest.spyOn(QRHardwareHook, 'useQRHardwareContext').mockReturnValue({
+      isSigningQRObject: false,
+      setScannerVisible: jest.fn(),
+      setSigningConfirmed: mockSetSigningConfirmed,
+    } as unknown as QRHardwareHook.QRHardwareContextType);
+
+    const { result } = renderHookWithProvider(() => useConfirmActions(), {
+      state: stakingDepositConfirmationState,
+    });
+
+    await result?.current?.onConfirm();
+
+    expect(mockSetSigningConfirmed).toHaveBeenCalledTimes(1);
+    expect(mockTransactionConfirm).toHaveBeenCalledTimes(1);
+    expect(mockSetSigningConfirmed.mock.invocationCallOrder[0]).toBeLessThan(
+      mockTransactionConfirm.mock.invocationCallOrder[0],
+    );
+  });
+
   it('delegates to useLedgerConfirm when account is Ledger', async () => {
     const { useIsConfirmationFromLedgerAccount } = jest.requireMock(
       './useIsConfirmationFromLedgerAccount',
diff --git a/app/components/Views/confirmations/hooks/useConfirmActions.ts b/app/components/Views/confirmations/hooks/useConfirmActions.ts
index 70987647f6c..4459bdf0331 100644
--- a/app/components/Views/confirmations/hooks/useConfirmActions.ts
+++ b/app/components/Views/confirmations/hooks/useConfirmActions.ts
@@ -5,13 +5,16 @@ import { ApprovalType } from '@metamask/controller-utils';
 import PPOMUtil from '../../../../lib/ppom/ppom-util';
 import Routes from '../../../../constants/navigation/Routes';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
+
 import { isSignatureRequest } from '../utils/confirm';
 import { useQRHardwareContext } from '../context/qr-hardware-context';
 import useApprovalRequest from './useApprovalRequest';
 import { useSignatureMetrics } from './signatures/useSignatureMetrics';
 import { useTransactionConfirm } from './transactions/useTransactionConfirm';
 import { useIsConfirmationFromLedgerAccount } from './useIsConfirmationFromLedgerAccount';
+import { useIsConfirmationFromQrAccount } from '../../../../core/HardwareWallet/hooks/useIsConfirmationFromQrAccount';
 import { useLedgerConfirm } from './useLedgerConfirm';
+import { useQrConfirm } from '../../../../core/HardwareWallet/hooks/useQrConfirm';
 
 export const useConfirmActions = () => {
   const {
@@ -21,8 +24,12 @@ export const useConfirmActions = () => {
   } = useApprovalRequest();
   const { onConfirm: onTransactionConfirm } = useTransactionConfirm();
   const { captureSignatureMetrics } = useSignatureMetrics();
-  const { cancelQRScanRequestIfPresent, isSigningQRObject, setScannerVisible } =
-    useQRHardwareContext();
+  const {
+    cancelQRScanRequestIfPresent,
+    isSigningQRObject,
+    setScannerVisible,
+    setSigningConfirmed,
+  } = useQRHardwareContext();
   const navigation = useNavigation();
   const approvalType = approvalRequest?.type;
   const isSignatureReq = approvalType && isSignatureRequest(approvalType);
@@ -30,6 +37,7 @@ export const useConfirmActions = () => {
     approvalType && approvalType === ApprovalType.Transaction;
 
   const isLedgerAccount = useIsConfirmationFromLedgerAccount();
+  const isQrAccount = useIsConfirmationFromQrAccount();
 
   const onReject = useCallback(
     async (error?: Error, skipNavigation = false, navigateToHome = false) => {
@@ -83,7 +91,7 @@ export const useConfirmActions = () => {
     captureSignatureMetrics,
   ]);
 
-  const ledgerConfirmOptions = useMemo(
+  const sharedConfirmOptions = useMemo(
     () => ({
       onReject,
       onTransactionConfirm,
@@ -93,7 +101,8 @@ export const useConfirmActions = () => {
     [onReject, onTransactionConfirm, executeApproval, isTransactionReq],
   );
 
-  const { onConfirm: onLedgerConfirm } = useLedgerConfirm(ledgerConfirmOptions);
+  const { onConfirm: onLedgerConfirm } = useLedgerConfirm(sharedConfirmOptions);
+  const { onConfirm: onQrConfirm } = useQrConfirm(sharedConfirmOptions);
 
   const onConfirm = useCallback(async () => {
     if (isLedgerAccount) {
@@ -101,25 +110,36 @@ export const useConfirmActions = () => {
       return;
     }
 
+    if (isQrAccount) {
+      await onQrConfirm();
+      return;
+    }
+
     if (isSigningQRObject) {
+      setSigningConfirmed();
       setScannerVisible(true);
       return;
     }
 
     if (isTransactionReq) {
+      setSigningConfirmed();
       await onTransactionConfirm();
       return;
     }
 
+    setSigningConfirmed();
     await executeApproval();
   }, [
     isLedgerAccount,
+    isQrAccount,
     isSigningQRObject,
     isTransactionReq,
     setScannerVisible,
+    setSigningConfirmed,
     onTransactionConfirm,
     executeApproval,
     onLedgerConfirm,
+    onQrConfirm,
   ]);
 
   return { onConfirm, onReject };
diff --git a/app/components/Views/confirmations/hooks/useTokenAsset.test.ts b/app/components/Views/confirmations/hooks/useTokenAsset.test.ts
index 1cea8d9af91..f0c460feed1 100644
--- a/app/components/Views/confirmations/hooks/useTokenAsset.test.ts
+++ b/app/components/Views/confirmations/hooks/useTokenAsset.test.ts
@@ -161,6 +161,7 @@ describe('useTokenAsset', () => {
         name: MUSD_TOKEN.name,
         decimals: MUSD_TOKEN.decimals,
         address: MUSD_TOKEN_ADDRESS,
+        image: MUSD_TOKEN.image,
       });
     });
 
diff --git a/app/components/Views/confirmations/hooks/useTokenAsset.ts b/app/components/Views/confirmations/hooks/useTokenAsset.ts
index 826bd04ec30..5aea31777b4 100644
--- a/app/components/Views/confirmations/hooks/useTokenAsset.ts
+++ b/app/components/Views/confirmations/hooks/useTokenAsset.ts
@@ -52,19 +52,24 @@ export const useTokenAsset = () => {
       ({ address }) => address.toLowerCase() === tokenAddress,
     ) as TokenI;
 
+    if (isMusdClaim) {
+      // Handle both "not in wallet" and "in wallet without logo" in one place.
+      // mUSD can be added to the wallet before the token list service hydrates its
+      // image URL, so we always fall back to the known logo for this tx type.
+      return {
+        asset: {
+          ...asset,
+          symbol: asset?.symbol ?? MUSD_TOKEN.symbol,
+          name: asset?.name ?? MUSD_TOKEN.name,
+          decimals: asset?.decimals ?? MUSD_TOKEN.decimals,
+          address: MUSD_TOKEN_ADDRESS,
+          image: asset?.image ?? MUSD_TOKEN.image,
+        } as Partial<TokenI>,
+        displayName: asset?.ticker ?? asset?.symbol ?? MUSD_TOKEN.symbol,
+      };
+    }
+
     if (!asset) {
-      // For musdClaim, fall back to known mUSD constants when token isn't in user's wallet
-      if (isMusdClaim) {
-        return {
-          asset: {
-            symbol: MUSD_TOKEN.symbol,
-            name: MUSD_TOKEN.name,
-            decimals: MUSD_TOKEN.decimals,
-            address: MUSD_TOKEN_ADDRESS,
-          } as Partial<TokenI>,
-          displayName: MUSD_TOKEN.symbol,
-        };
-      }
       return { asset: {}, displayName: strings('token.unknown') };
     }
 
diff --git a/app/components/Views/confirmations/types/transactions.ts b/app/components/Views/confirmations/types/transactions.ts
new file mode 100644
index 00000000000..65ed3660310
--- /dev/null
+++ b/app/components/Views/confirmations/types/transactions.ts
@@ -0,0 +1,6 @@
+import { Hex } from '@metamask/utils';
+
+export interface UpdateTransactionPayAmountCall {
+  nestedTransactionIndex: number;
+  transactionData: Hex;
+}
diff --git a/app/components/Views/confirmations/utils/send-address-validations.test.ts b/app/components/Views/confirmations/utils/send-address-validations.test.ts
index 48d3c05ae5d..99604d29ffe 100644
--- a/app/components/Views/confirmations/utils/send-address-validations.test.ts
+++ b/app/components/Views/confirmations/utils/send-address-validations.test.ts
@@ -7,8 +7,6 @@ import {
   validateSolanaAddress,
   validateTronAddress,
 } from './send-address-validations';
-import { memoizedGetTokenStandardAndDetails, TokenDetailsERC20 } from './token';
-
 jest.mock('./token', () => ({
   memoizedGetTokenStandardAndDetails: jest.fn().mockResolvedValue(undefined),
 }));
@@ -21,10 +19,6 @@ jest.mock('../../../../core/Engine', () => ({
   },
 }));
 
-const mockMemoizedGetTokenStandardAndDetails = jest.mocked(
-  memoizedGetTokenStandardAndDetails,
-);
-
 describe('validateHexAddress', () => {
   it('returns error if address is burn address', async () => {
     expect(
@@ -70,20 +64,13 @@ describe('validateHexAddress', () => {
     ).toStrictEqual({});
   });
 
-  it('returns warning if address is contract address', async () => {
-    mockMemoizedGetTokenStandardAndDetails.mockResolvedValue({
-      standard: 'ERC20',
-    } as unknown as TokenDetailsERC20);
+  it('does not flag token contract addresses (handled in send flow alerts)', async () => {
     expect(
       await validateHexAddress(
         '0x935E73EDb9fF52E23BaC7F7e043A1ecD06d05477',
         '0x1',
       ),
-    ).toStrictEqual({
-      allowAcknowledge: true,
-      error:
-        'This address is a token contract address. If you send tokens to this address, you will lose them.',
-    });
+    ).toStrictEqual({});
   });
 });
 
diff --git a/app/components/Views/confirmations/utils/send-address-validations.ts b/app/components/Views/confirmations/utils/send-address-validations.ts
index d3cb04483c8..e9a4dff7645 100644
--- a/app/components/Views/confirmations/utils/send-address-validations.ts
+++ b/app/components/Views/confirmations/utils/send-address-validations.ts
@@ -2,14 +2,11 @@ import { Hex } from '@metamask/utils';
 import { isAddress as isSolanaAddress } from '@solana/addresses';
 
 import { strings } from '../../../../../locales/i18n';
-import Engine from '../../../../core/Engine';
-import { toChecksumAddress } from '../../../../util/address';
 import {
   collectConfusables,
   getConfusablesExplanations,
   hasZeroWidthPoints,
 } from '../../../../util/confusables';
-import { memoizedGetTokenStandardAndDetails } from './token';
 import {
   isBtcMainnetAddress,
   isTronAddress,
@@ -38,7 +35,6 @@ export const validateHexAddress = async (
 ): Promise<{
   error?: string;
   warning?: string;
-  allowAcknowledge?: boolean;
 }> => {
   if (LOWER_CASED_BURN_ADDRESSES.includes(toAddress?.toLowerCase())) {
     return {
@@ -52,30 +48,6 @@ export const validateHexAddress = async (
     };
   }
 
-  const checksummedAddress = toChecksumAddress(toAddress);
-  if (chainId) {
-    const { NetworkController } = Engine.context;
-
-    try {
-      const networkClientId = NetworkController.findNetworkClientIdByChainId(
-        chainId as Hex,
-      );
-      const token = await memoizedGetTokenStandardAndDetails({
-        tokenAddress: checksummedAddress,
-        tokenId: undefined,
-        userAddress: undefined,
-        networkClientId,
-      });
-      if (token?.standard) {
-        return {
-          error: strings('send.token_contract_warning'),
-          allowAcknowledge: true,
-        };
-      }
-    } catch {
-      // Not a token address
-    }
-  }
   return {};
 };
 
diff --git a/app/components/hooks/useBlockExplorer.test.ts b/app/components/hooks/useBlockExplorer.test.ts
index 53490066498..c0b7256cab5 100644
--- a/app/components/hooks/useBlockExplorer.test.ts
+++ b/app/components/hooks/useBlockExplorer.test.ts
@@ -1,3 +1,4 @@
+import { RpcEndpointType } from '@metamask/network-controller';
 import { useNavigation } from '@react-navigation/native';
 import Routes from '../../constants/navigation/Routes';
 import { backgroundState } from '../../util/test/initial-root-state';
@@ -457,4 +458,68 @@ describe('useBlockExplorer', () => {
       });
     });
   });
+
+  describe('NetworkController block explorer for token chain', () => {
+    const stateWithEthereumSelectedAndGnosisConfigured = {
+      ...mockInitialState,
+      engine: {
+        ...mockInitialState.engine,
+        backgroundState: {
+          ...mockInitialState.engine.backgroundState,
+          NetworkController: mockNetworkState(
+            {
+              chainId: '0x1',
+              id: 'mainnet',
+              type: RpcEndpointType.Infura,
+              nickname: 'Ethereum Mainnet',
+              ticker: 'ETH',
+              blockExplorerUrl: 'https://etherscan.io',
+            },
+            {
+              chainId: '0x64',
+              id: 'gnosis',
+              nickname: 'Gnosis Chain',
+              ticker: 'xDAI',
+              blockExplorerUrl: 'https://gnosisscan.io',
+            },
+          ),
+        },
+      },
+    };
+
+    beforeEach(() => {
+      const reactRedux =
+        jest.requireMock<typeof import('react-redux')>('react-redux');
+      jest
+        .spyOn(reactRedux, 'useSelector')
+        .mockImplementation((fn) =>
+          fn(stateWithEthereumSelectedAndGnosisConfigured),
+        );
+    });
+
+    afterEach(() => {
+      const reactRedux =
+        jest.requireMock<typeof import('react-redux')>('react-redux');
+      jest.mocked(reactRedux.useSelector).mockRestore();
+    });
+
+    it('resolves Gnosis block explorer from network configurations when Ethereum is selected', () => {
+      const { result } = renderHookWithProvider(() => useBlockExplorer());
+      const tokenChainId = '0x64';
+      const address = '0x0000000000000000000000000000000000000001';
+
+      expect(result.current.getBlockExplorerBaseUrl(tokenChainId)).toBe(
+        'https://gnosisscan.io',
+      );
+      expect(result.current.getBlockExplorerUrl(address, tokenChainId)).toBe(
+        `https://gnosisscan.io/address/${address}`,
+      );
+    });
+
+    it('resolves block explorer name from configured explorer URL for that chain', () => {
+      const { result } = renderHookWithProvider(() => useBlockExplorer());
+      const name = result.current.getBlockExplorerName('0x64');
+      expect(name).toMatch(/gnosis/i);
+    });
+  });
 });
diff --git a/app/components/hooks/useBlockExplorer.ts b/app/components/hooks/useBlockExplorer.ts
index 651acc3856a..676b50370da 100644
--- a/app/components/hooks/useBlockExplorer.ts
+++ b/app/components/hooks/useBlockExplorer.ts
@@ -2,6 +2,7 @@ import { useCallback } from 'react';
 import { RPC } from '../../constants/network';
 import {
   findBlockExplorerForRpc,
+  findBlockExplorerUrlForChain,
   getBlockExplorerName as getBlockExplorerNameFromUrl,
   getHexEvmChainId,
 } from '../../util/networks';
@@ -95,6 +96,13 @@ const useBlockExplorer = (chainId?: string) => {
         if (baseUrl) {
           return `${baseUrl}/address/${address}`;
         }
+        const explorerFromNetworkConfig = findBlockExplorerUrlForChain(
+          currentChainId,
+          networkConfigurations,
+        );
+        if (explorerFromNetworkConfig) {
+          return `${explorerFromNetworkConfig}/address/${address}`;
+        }
       }
 
       // For RPC networks, try to find custom block explorer
@@ -167,6 +175,13 @@ const useBlockExplorer = (chainId?: string) => {
         if (baseUrl) {
           return baseUrl;
         }
+        const explorerFromNetworkConfig = findBlockExplorerUrlForChain(
+          currentChainId,
+          networkConfigurations,
+        );
+        if (explorerFromNetworkConfig) {
+          return explorerFromNetworkConfig;
+        }
       }
 
       // For RPC networks, try to find custom block explorer
@@ -231,6 +246,13 @@ const useBlockExplorer = (chainId?: string) => {
         if (baseUrl) {
           return getBlockExplorerNameFromUrl(baseUrl);
         }
+        const explorerFromNetworkConfig = findBlockExplorerUrlForChain(
+          currentChainId,
+          networkConfigurations,
+        );
+        if (explorerFromNetworkConfig) {
+          return getBlockExplorerNameFromUrl(explorerFromNetworkConfig);
+        }
       }
 
       // For RPC networks, try to find custom block explorer
diff --git a/app/components/hooks/useKeyringId.test.ts b/app/components/hooks/useKeyringId.test.ts
index b208c7f9bac..9103f148830 100644
--- a/app/components/hooks/useKeyringId.test.ts
+++ b/app/components/hooks/useKeyringId.test.ts
@@ -29,8 +29,6 @@ const solanaAccount = createMockSnapInternalAccount(
 );
 solanaAccount.metadata.snap = {
   id: SOLANA_WALLET_SNAP_ID,
-  name: 'Solana Wallet Snap',
-  enabled: true,
 };
 
 const snapAccount = createMockSnapInternalAccount(
diff --git a/app/constants/deeplinks.ts b/app/constants/deeplinks.ts
index c39179e338e..5d5da122f02 100644
--- a/app/constants/deeplinks.ts
+++ b/app/constants/deeplinks.ts
@@ -46,6 +46,7 @@ export enum ACTIONS {
   PREDICT = 'predict',
   ONBOARDING = 'onboarding',
   TRENDING = 'trending',
+  SOCIAL_LEADERBOARD = 'social-leaderboard',
   SOCIAL_TRADER_POSITION = 'social-trader-position',
   EARN_MUSD = 'earn-musd',
   NFT = 'nft',
@@ -81,6 +82,7 @@ export const PREFIXES = {
   [ACTIONS.CARD_HOME]: '',
   [ACTIONS.CARD_KYC_NOTIFICATION]: '',
   [ACTIONS.TRENDING]: '',
+  [ACTIONS.SOCIAL_LEADERBOARD]: '',
   [ACTIONS.SOCIAL_TRADER_POSITION]: '',
   [ACTIONS.EARN_MUSD]: '',
   [ACTIONS.NFT]: '',
diff --git a/app/constants/navigation/Routes.ts b/app/constants/navigation/Routes.ts
index f06ea72ac9c..c2ec31e80f8 100644
--- a/app/constants/navigation/Routes.ts
+++ b/app/constants/navigation/Routes.ts
@@ -1,4 +1,5 @@
 const Routes = {
+  HOME_TABS: 'Home',
   WALLET_VIEW: 'WalletView',
   BROWSER_TAB_HOME: 'BrowserTabHome',
   BROWSER_VIEW: 'BrowserView',
@@ -111,10 +112,17 @@ const Routes = {
   REWARDS_SEASON_ONE_CAMPAIGN_DETAILS_VIEW: 'RewardsSeasonOneCampaignDetails',
   REWARDS_CAMPAIGN_MECHANICS: 'RewardsCampaignMechanics',
   REWARDS_ONDO_CAMPAIGN_LEADERBOARD: 'RewardsOndoCampaignLeaderboard',
+  REWARDS_PERPS_TRADING_CAMPAIGN_WINNING_VIEW:
+    'RewardsPerpsTradingCampaignWinning',
   REWARDS_ONDO_CAMPAIGN_RWA_ASSET_SELECTOR: 'RewardsOndoRwaAssetSelector',
   REWARDS_ONDO_CAMPAIGN_PORTFOLIO_VIEW: 'RewardsOndoCampaignPortfolioView',
   REWARDS_ONDO_CAMPAIGN_STATS: 'RewardsOndoCampaignStats',
   REWARDS_CAMPAIGN_TOUR_STEP: 'RewardsCampaignTourStep',
+  REWARDS_PERPS_TRADING_CAMPAIGN_DETAILS_VIEW:
+    'RewardsPerpsTradingCampaignDetails',
+  REWARDS_PERPS_TRADING_CAMPAIGN_LEADERBOARD:
+    'RewardsPerpsTradingCampaignLeaderboard',
+  REWARDS_PERPS_TRADING_CAMPAIGN_STATS: 'RewardsPerpsTradingCampaignStats',
   TRENDING_VIEW: 'TrendingView',
   TRENDING_FEED: 'TrendingFeed',
   WHATS_HAPPENING_DETAIL: 'WhatsHappeningDetailView',
@@ -407,7 +415,6 @@ const Routes = {
     LENDING_WITHDRAWAL_CONFIRMATION: 'EarnLendingWithdrawalConfirmation',
     MUSD: {
       CONVERSION_EDUCATION: 'EarnMusdConversionEducation',
-      QUICK_CONVERT: 'EarnMusdQuickConvert',
     },
     MODALS: {
       ROOT: 'EarnModals',
@@ -420,9 +427,15 @@ const Routes = {
     HOME: 'MoneyHome',
     ACTIVITY: 'MoneyActivity',
     HOW_IT_WORKS: 'MoneyHowItWorks',
+    POTENTIAL_EARNINGS: 'MoneyPotentialEarnings',
     MODALS: {
       ROOT: 'MoneyModals',
       ADD_MONEY_SHEET: 'MoneyAddMoneySheet',
+      MORE_SHEET: 'MoneyMoreSheet',
+      TRANSFER_MONEY_SHEET: 'MoneyTransferSheet',
+      APY_INFO_SHEET: 'MoneyApyInfoSheet',
+      EARNINGS_INFO_SHEET: 'MoneyEarningsInfoSheet',
+      MONEY_BALANCE_INFO_SHEET: 'MoneyBalanceInfoSheet',
     },
   },
   FULL_SCREEN_CONFIRMATIONS: {
diff --git a/app/constants/navigation/clearStackNavigatorOptions.ts b/app/constants/navigation/clearStackNavigatorOptions.ts
index ae81976ad80..4e088e3b355 100644
--- a/app/constants/navigation/clearStackNavigatorOptions.ts
+++ b/app/constants/navigation/clearStackNavigatorOptions.ts
@@ -1,3 +1,4 @@
+import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 import type { StackNavigationOptions } from '@react-navigation/stack';
 
 /** Transparent stack with no transition animation; used for modal-style flows. */
@@ -22,3 +23,30 @@ export const clearStackNavigatorOptionsWithTransitionAnimation: StackNavigationO
     }),
     animationEnabled: false,
   };
+
+/**
+ * Native-stack counterpart to {@link clearStackNavigatorOptions}.
+ * Use with `createNativeStackNavigator` only (`contentStyle` / `animation`, not `cardStyle` / `animationEnabled`).
+ *
+ * Includes `animation: 'none'` — omit this preset on screens where you want the default push/modal animation.
+ */
+export const clearNativeStackNavigatorOptions: NativeStackNavigationOptions = {
+  headerShown: false,
+  contentStyle: {
+    backgroundColor: 'transparent',
+  },
+  animation: 'none',
+};
+
+/**
+ * Per-screen options for overlay-style screens on native stack.
+ * Replaces the JS-stack `cardStyleInterpolator` trick (overlay opacity 0) — native stack keeps the
+ * presenting screen mounted and does not dim it when `presentation: 'transparentModal'` is used.
+ *
+ * Often spread **after** {@link clearNativeStackNavigatorOptions} for fully static overlays.
+ * Skip `clearNativeStackNavigatorOptions` when this screen should keep the default stack animation
+ * (it sets `animation: 'none'`).
+ */
+export const transparentModalScreenOptions: NativeStackNavigationOptions = {
+  presentation: 'transparentModal',
+};
diff --git a/app/constants/ota.ts b/app/constants/ota.ts
index 40780bbcc38..9f9698e005e 100644
--- a/app/constants/ota.ts
+++ b/app/constants/ota.ts
@@ -12,7 +12,7 @@ import otaConfig from '../../ota.config.js';
  * Reset when releasing a new native build as appropriate for that line.
  * Kept here (not only in ota.config.js) so changes there do not alter the Expo fingerprint and break CI.
  */
-export const OTA_VERSION: string = 'v7.76.3';
+export const OTA_VERSION: string = 'vX.XX.X';
 export const RUNTIME_VERSION = otaConfig.RUNTIME_VERSION;
 export const PROJECT_ID = otaConfig.PROJECT_ID;
 export const UPDATE_URL = otaConfig.UPDATE_URL;
diff --git a/app/controllers/perps/PerpsController.test.ts b/app/controllers/perps/PerpsController.test.ts
index 2f956de3a46..4b818e0f367 100644
--- a/app/controllers/perps/PerpsController.test.ts
+++ b/app/controllers/perps/PerpsController.test.ts
@@ -438,7 +438,8 @@ describe('PerpsController', () => {
     // Add default mock return values for all provider methods
     mockProvider.getPositions.mockResolvedValue([]);
     mockProvider.getAccountState.mockResolvedValue({
-      availableBalance: '10000',
+      spendableBalance: '10000',
+      withdrawableBalance: '10000',
       totalBalance: '10000',
       marginUsed: '0',
       unrealizedPnl: '0',
@@ -1068,7 +1069,8 @@ describe('PerpsController', () => {
   describe('getAccountState', () => {
     it('gets account state successfully', async () => {
       const mockAccountState = {
-        availableBalance: '1000',
+        spendableBalance: '1000',
+        withdrawableBalance: '1000',
         marginUsed: '500',
         unrealizedPnl: '100',
         returnOnEquity: '20.0',
@@ -2130,7 +2132,8 @@ describe('PerpsController', () => {
       controller.subscribeToAccount({ callback: originalCallback });
 
       const accountState = {
-        availableBalance: '5000',
+        spendableBalance: '5000',
+        withdrawableBalance: '5000',
         totalBalance: '5000',
         marginUsed: '0',
         unrealizedPnl: '0',
@@ -4344,7 +4347,8 @@ describe('PerpsController', () => {
       // Complete AccountState mock with all required fields
       const createMockAccountState = (overrides = {}) => ({
         totalBalance: '50000',
-        availableBalance: '45000',
+        spendableBalance: '45000',
+        withdrawableBalance: '45000',
         marginUsed: '5000',
         unrealizedPnl: '1000',
         returnOnEquity: '20',
@@ -4385,7 +4389,8 @@ describe('PerpsController', () => {
         // Arrange - no activeProviderInstance set (pre-initialization)
         const mockAccountState = createMockAccountState({
           totalBalance: '25000',
-          availableBalance: '20000',
+          spendableBalance: '20000',
+          withdrawableBalance: '20000',
         });
         const tempMockProvider = createMockHyperLiquidProvider();
         tempMockProvider.getAccountState.mockResolvedValue(mockAccountState);
@@ -5258,7 +5263,8 @@ describe('PerpsController', () => {
             orders: [],
             accountState: {
               totalBalance: '5000',
-              availableBalance: '4000',
+              spendableBalance: '4000',
+              withdrawableBalance: '4000',
               marginUsed: '1000',
               unrealizedPnl: '0',
               returnOnEquity: '0',
@@ -5317,7 +5323,8 @@ describe('PerpsController', () => {
         orders: [],
         accountState: {
           totalBalance: '5000',
-          availableBalance: '4000',
+          spendableBalance: '4000',
+          withdrawableBalance: '4000',
           marginUsed: '1000',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -5664,7 +5671,8 @@ describe('PerpsController', () => {
       preloadMockProvider = createMockHyperLiquidProvider();
       preloadMockProvider.getPositions.mockResolvedValue([]);
       preloadMockProvider.getAccountState.mockResolvedValue({
-        availableBalance: '10000',
+        spendableBalance: '10000',
+        withdrawableBalance: '10000',
         totalBalance: '10000',
         marginUsed: '0',
         unrealizedPnl: '0',
@@ -5706,7 +5714,8 @@ describe('PerpsController', () => {
       ];
       const mockAccountState: AccountState = {
         totalBalance: '50000',
-        availableBalance: '45000',
+        spendableBalance: '45000',
+        withdrawableBalance: '45000',
         marginUsed: '5000',
         unrealizedPnl: '1000',
         returnOnEquity: '20',
@@ -5766,7 +5775,8 @@ describe('PerpsController', () => {
       ];
       const mockAccountState: AccountState = {
         totalBalance: '50000',
-        availableBalance: '45000',
+        spendableBalance: '45000',
+        withdrawableBalance: '45000',
         marginUsed: '5000',
         unrealizedPnl: '1000',
         returnOnEquity: '20',
@@ -5871,7 +5881,8 @@ describe('PerpsController', () => {
       preloadMockProvider.getPositions.mockResolvedValue([]);
       preloadMockProvider.getOpenOrders.mockResolvedValue([]);
       preloadMockProvider.getAccountState.mockResolvedValue({
-        availableBalance: '100',
+        spendableBalance: '100',
+        withdrawableBalance: '100',
         totalBalance: '100',
         marginUsed: '0',
         unrealizedPnl: '0',
@@ -6168,7 +6179,8 @@ describe('PerpsController', () => {
           orders: [],
           accountState: {
             totalBalance: '50000',
-            availableBalance: '45000',
+            spendableBalance: '45000',
+            withdrawableBalance: '45000',
             marginUsed: '5000',
             unrealizedPnl: '1000',
             returnOnEquity: '20',
@@ -6204,7 +6216,8 @@ describe('PerpsController', () => {
           orders: [],
           accountState: {
             totalBalance: '50000',
-            availableBalance: '45000',
+            spendableBalance: '45000',
+            withdrawableBalance: '45000',
             marginUsed: '5000',
             unrealizedPnl: '1000',
             returnOnEquity: '20',
diff --git a/app/controllers/perps/aggregation/SubscriptionMultiplexer.test.ts b/app/controllers/perps/aggregation/SubscriptionMultiplexer.test.ts
index 4f0ffcf99c5..2cc701902a3 100644
--- a/app/controllers/perps/aggregation/SubscriptionMultiplexer.test.ts
+++ b/app/controllers/perps/aggregation/SubscriptionMultiplexer.test.ts
@@ -432,7 +432,8 @@ describe('SubscriptionMultiplexer', () => {
   describe('subscribeToAccount', () => {
     const createMockAccount = (balance: string): AccountState =>
       ({
-        availableBalance: balance,
+        spendableBalance: balance,
+        withdrawableBalance: balance,
         totalBalance: balance,
         marginUsed: '0',
         unrealizedPnl: '0',
@@ -454,7 +455,8 @@ describe('SubscriptionMultiplexer', () => {
       expect(callback).toHaveBeenCalledWith(
         expect.arrayContaining([
           expect.objectContaining({
-            availableBalance: '10000',
+            spendableBalance: '10000',
+            withdrawableBalance: '10000',
             providerId: 'hyperliquid',
           }),
         ]),
@@ -479,13 +481,15 @@ describe('SubscriptionMultiplexer', () => {
       expect(lastCall).toHaveLength(2);
       expect(lastCall).toContainEqual(
         expect.objectContaining({
-          availableBalance: '10000',
+          spendableBalance: '10000',
+          withdrawableBalance: '10000',
           providerId: 'hyperliquid',
         }),
       );
       expect(lastCall).toContainEqual(
         expect.objectContaining({
-          availableBalance: '5000',
+          spendableBalance: '5000',
+          withdrawableBalance: '5000',
           providerId: 'myx',
         }),
       );
diff --git a/app/controllers/perps/constants/hyperLiquidConfig.ts b/app/controllers/perps/constants/hyperLiquidConfig.ts
index ef7d4726dff..6551915bea6 100644
--- a/app/controllers/perps/constants/hyperLiquidConfig.ts
+++ b/app/controllers/perps/constants/hyperLiquidConfig.ts
@@ -411,7 +411,7 @@ export const MAINNET_HIP3_CONFIG = {
  * HIP-3 margin management configuration
  * Controls margin buffers and auto-rebalance behavior for HIP-3 DEXes with isolated margin
  *
- * Background: HyperLiquid validates availableBalance >= totalRequiredMargin BEFORE reallocating
+ * Background: HyperLiquid validates spendableBalance >= totalRequiredMargin BEFORE reallocating
  * existing locked margin. This requires temporary over-funding when increasing positions,
  * followed by automatic cleanup to minimize locked capital.
  */
diff --git a/app/controllers/perps/constants/perpsConfig.ts b/app/controllers/perps/constants/perpsConfig.ts
index 701dd00ca73..07e13d1d4aa 100644
--- a/app/controllers/perps/constants/perpsConfig.ts
+++ b/app/controllers/perps/constants/perpsConfig.ts
@@ -404,11 +404,24 @@ export const PROVIDER_CONFIG = {
   MYX_TESTNET_ONLY: false,
 } as const;
 
-// Disk-backed cold-start cache keys and throttle interval
+// Disk-backed cold-start cache keys and throttle interval.
+// The user-data key ends in _V2 because the AccountState balance contract
+// changed (TAT-3047) and has no in-payload version field. Bumping the key
+// forces a one-time empty cache on upgrade — consumers fall through to
+// skeleton/fallback until the first WS tick, avoiding stale legacy-shape
+// reads that would surface as $0 balances.
 export const PERPS_DISK_CACHE_MARKETS = 'PERPS_DISK_CACHE_MARKETS';
-export const PERPS_DISK_CACHE_USER_DATA = 'PERPS_DISK_CACHE_USER_DATA';
+export const PERPS_DISK_CACHE_USER_DATA = 'PERPS_DISK_CACHE_USER_DATA_V2';
 export const PERPS_DISK_CACHE_THROTTLE_MS = 30_000;
 
+/**
+ * Minimum interval between WebSocket-triggered HL `userAbstraction`
+ * refreshes. Balances picking up HL-web mode flips (Unified ↔ Standard)
+ * promptly against burning REST quota on every spot tick. Covers the
+ * observed user pattern of flipping mode once per session at most.
+ */
+export const ABSTRACTION_MODE_REFRESH_THROTTLE_MS = 60_000;
+
 /**
  * Build the standard provider:network cache key from controller state.
  *
diff --git a/app/controllers/perps/providers/AggregatedPerpsProvider.test.ts b/app/controllers/perps/providers/AggregatedPerpsProvider.test.ts
index 9c326ac7285..9856d371d6a 100644
--- a/app/controllers/perps/providers/AggregatedPerpsProvider.test.ts
+++ b/app/controllers/perps/providers/AggregatedPerpsProvider.test.ts
@@ -23,7 +23,8 @@ const createMockProvider = (providerId: string): jest.Mocked<PerpsProvider> => {
     // Read operations
     getPositions: jest.fn().mockResolvedValue([]),
     getAccountState: jest.fn().mockResolvedValue({
-      availableBalance: '10000',
+      spendableBalance: '10000',
+      withdrawableBalance: '10000',
       totalBalance: '10000',
       marginUsed: '0',
       unrealizedPnl: '0',
@@ -302,7 +303,8 @@ describe('AggregatedPerpsProvider', () => {
   describe('Read Operations - getAccountState', () => {
     it('returns account state from default provider with providerId injected', async () => {
       const mockState = {
-        availableBalance: '1000',
+        spendableBalance: '1000',
+        withdrawableBalance: '1000',
         totalBalance: '1000',
         marginUsed: '0',
         unrealizedPnl: '0',
diff --git a/app/controllers/perps/providers/HyperLiquidProvider.test.ts b/app/controllers/perps/providers/HyperLiquidProvider.test.ts
index d665ace78f4..36a36d18816 100644
--- a/app/controllers/perps/providers/HyperLiquidProvider.test.ts
+++ b/app/controllers/perps/providers/HyperLiquidProvider.test.ts
@@ -181,6 +181,9 @@ const createMockInfoClient = (overrides: Record<string, unknown> = {}) => ({
   spotClearinghouseState: jest.fn().mockResolvedValue({
     balances: [{ coin: 'USDC', hold: '1000', total: '10000' }],
   }),
+  // Mode-aware fold gate reads userAbstraction; default to unifiedAccount
+  // so tests that predated the gate still see spot folded into spendable/withdrawable.
+  userAbstraction: jest.fn().mockResolvedValue('unifiedAccount'),
   meta: jest.fn().mockResolvedValue({
     universe: [
       { name: 'BTC', szDecimals: 3, maxLeverage: 50 },
@@ -216,7 +219,6 @@ const createMockInfoClient = (overrides: Record<string, unknown> = {}) => ({
     ],
   ]),
   perpDexs: jest.fn().mockResolvedValue([null]),
-  userAbstraction: jest.fn().mockResolvedValue('default'),
   allMids: jest.fn().mockResolvedValue({ BTC: '50000', ETH: '3000' }),
   frontendOpenOrders: jest.fn().mockResolvedValue([]),
   referral: jest.fn().mockResolvedValue({
@@ -1224,7 +1226,7 @@ describe('HyperLiquidProvider', () => {
       );
     });
 
-    it('validates price requirement before attempting order placement', async () => {
+    it('retries with adjusted USD when price-less order hits $10 minimum (uses fetched price from allMids)', async () => {
       // Create provider with PUMP in the asset mapping
       provider = createTestProvider({
         initialAssetMapping: [
@@ -1254,24 +1256,38 @@ describe('HyperLiquidProvider', () => {
         isBuy: true,
         size: '2553',
         orderType: 'market',
+        // No currentPrice: provider fetches live price (0.003918) and uses it
+        // for both validation and the $10-minimum retry path.
       };
 
+      const mockOrder = jest
+        .fn()
+        .mockRejectedValueOnce(
+          new Error('Order must have minimum value of $10'),
+        )
+        .mockResolvedValueOnce({
+          status: 'ok',
+          response: {
+            data: {
+              statuses: [
+                { filled: { oid: 123, totalSz: '2553', avgPx: '0.004' } },
+              ],
+            },
+          },
+        });
+
       mockClientService.getExchangeClient = jest.fn().mockReturnValue({
         ...createMockExchangeClient(),
-        order: jest
-          .fn()
-          .mockRejectedValueOnce(
-            new Error('Order must have minimum value of $10'),
-          ),
+        order: mockOrder,
       });
 
       const result = await provider.placeOrder(orderParams);
 
-      expect(result.success).toBe(false);
-      expect(result.error).toBe(PERPS_ERROR_CODES.ORDER_PRICE_REQUIRED);
-      expect(
-        mockClientService.getExchangeClient().order,
-      ).not.toHaveBeenCalled();
+      // The live price is fetched → validation passes → order is submitted →
+      // first call hits $10 minimum → retry uses fetched price to compute
+      // adjusted usdAmount → second call succeeds.
+      expect(result.success).toBe(true);
+      expect(mockOrder).toHaveBeenCalledTimes(2);
     });
 
     it('closes a position successfully', async () => {
@@ -2220,11 +2236,12 @@ describe('HyperLiquidProvider', () => {
 
       const accountState = await hip3Provider.getAccountState();
 
-      expect(accountState.availableToTradeBalance).toBe('0');
+      expect(accountState.spendableBalance).toBe('0');
+      expect(accountState.withdrawableBalance).toBe('0');
       expect(accountState.totalBalance).toBe('0');
     });
 
-    it('folds USDC spot balance into availableToTradeBalance in Unified Account mode', async () => {
+    it('folds USDC spot balance into spendable/withdrawable in Unified Account mode', async () => {
       const hip3Provider = createTestProvider({
         hip3Enabled: true,
         allowlistMarkets: ['xyz:*'],
@@ -2258,8 +2275,8 @@ describe('HyperLiquidProvider', () => {
 
       const accountState = await hip3Provider.getAccountState();
 
-      expect(accountState.availableBalance).toBe('0');
-      expect(accountState.availableToTradeBalance).toBe('90');
+      expect(accountState.spendableBalance).toBe('90');
+      expect(accountState.withdrawableBalance).toBe('90');
       expect(accountState.totalBalance).toBe('90');
     });
 
@@ -2299,7 +2316,8 @@ describe('HyperLiquidProvider', () => {
 
         const accountState = await hip3Provider.getAccountState();
 
-        expect(accountState.availableToTradeBalance).toBe('0');
+        expect(accountState.spendableBalance).toBe('0');
+        expect(accountState.withdrawableBalance).toBe('0');
         expect(accountState.totalBalance).toBe('90');
       },
     );
@@ -2808,6 +2826,7 @@ describe('HyperLiquidProvider', () => {
     });
 
     it('handles missing price data', async () => {
+      mockSubscriptionService.getCachedPrice.mockReturnValueOnce(undefined);
       (
         mockClientService.getInfoClient().allMids as jest.Mock
       ).mockResolvedValueOnce({});
@@ -2821,8 +2840,10 @@ describe('HyperLiquidProvider', () => {
 
       const result = await provider.placeOrder(orderParams);
 
+      // allMids returns {} so #getOrFetchPrice parses price as 0, which is
+      // invalid. The error surfaces from #getAssetInfo before validation runs.
       expect(result.success).toBe(false);
-      expect(result.error).toContain(PERPS_ERROR_CODES.ORDER_PRICE_REQUIRED);
+      expect(result.error).toContain('Invalid price for BTC: 0');
     });
 
     it('handles missing position in close operation', async () => {
@@ -3541,19 +3562,45 @@ describe('HyperLiquidProvider', () => {
         expect(result.error).toContain('Failed to update leverage');
       });
 
-      it('fails market order without current price or usdAmount', async () => {
+      it('succeeds with market order without current price or usdAmount (uses fetched price)', async () => {
+        // The provider now fetches the live price before validation so callers
+        // that intentionally omit currentPrice (e.g. flipPosition) work correctly.
         const orderParams: OrderParams = {
           symbol: 'BTC',
           isBuy: true,
           size: '0.1',
           orderType: 'market',
-          // No currentPrice or usdAmount provided - should fail validation
+          // No currentPrice or usdAmount: provider fetches live price (50000)
         };
 
         const result = await provider.placeOrder(orderParams);
 
-        expect(result.success).toBe(false);
-        expect(result.error).toContain(PERPS_ERROR_CODES.ORDER_PRICE_REQUIRED);
+        expect(result.success).toBe(true);
+        expect(mockClientService.getExchangeClient().order).toHaveBeenCalled();
+      });
+
+      it('placeOrder validates against fetched price when params omit currentPrice (flipPosition path)', async () => {
+        // Simulate the exact OrderParams shape that TradingService.flipPosition
+        // builds: symbol + isBuy + size + orderType + leverage, no price fields.
+        const flipOrderParams: OrderParams = {
+          symbol: 'BTC',
+          isBuy: false, // flipping long → short
+          size: '1', // 2× the 0.5 BTC position
+          orderType: 'market',
+          leverage: 10,
+          // currentPrice, usdAmount, price intentionally absent
+        };
+
+        const result = await provider.placeOrder(flipOrderParams);
+
+        // Live price (50000) is fetched from allMids → validation passes
+        // (0.1 BTC × $50 000 = $5 000 >> $10 minimum) → order executes.
+        expect(result.success).toBe(true);
+        expect(
+          mockClientService.getExchangeClient().order,
+        ).toHaveBeenCalledWith(
+          expect.objectContaining({ orders: expect.any(Array) }),
+        );
       });
 
       it('handles order with custom slippage', async () => {
@@ -4348,7 +4395,8 @@ describe('HyperLiquidProvider', () => {
         // Mock account state for balance validation
         Object.defineProperty(provider, 'getAccountState', {
           value: jest.fn().mockResolvedValue({
-            availableBalance: '5000',
+            spendableBalance: '5000',
+            withdrawableBalance: '5000',
           }),
           writable: true,
         });
@@ -4371,7 +4419,7 @@ describe('HyperLiquidProvider', () => {
         });
       });
 
-      it('validates withdrawal against availableToTradeBalance when Unified Account has zero availableBalance', async () => {
+      it('validates withdrawal against withdrawableBalance populated by spot fold for Unified Account', async () => {
         const exchangeClient = createMockExchangeClient();
         mockClientService.getExchangeClient = jest
           .fn()
@@ -4379,8 +4427,8 @@ describe('HyperLiquidProvider', () => {
 
         Object.defineProperty(provider, 'getAccountState', {
           value: jest.fn().mockResolvedValue({
-            availableBalance: '0',
-            availableToTradeBalance: '2500',
+            spendableBalance: '2500',
+            withdrawableBalance: '2500',
             totalBalance: '2500',
             marginUsed: '0',
             unrealizedPnl: '0',
@@ -4417,7 +4465,8 @@ describe('HyperLiquidProvider', () => {
         // Mock account state for balance validation
         Object.defineProperty(provider, 'getAccountState', {
           value: jest.fn().mockResolvedValue({
-            availableBalance: '5000',
+            spendableBalance: '5000',
+            withdrawableBalance: '5000',
           }),
           writable: true,
         });
@@ -5645,6 +5694,7 @@ describe('HyperLiquidProvider', () => {
         spotClearinghouseState: jest.fn().mockResolvedValue({
           balances: [{ coin: 'USDC', hold: '1000', total: '10000' }],
         }),
+        userAbstraction: jest.fn().mockResolvedValue('unifiedAccount'),
         meta: jest.fn().mockResolvedValue({
           universe: [
             { name: 'BTC', szDecimals: 3, maxLeverage: 50 },
@@ -5776,6 +5826,7 @@ describe('HyperLiquidProvider', () => {
         spotClearinghouseState: jest.fn().mockResolvedValue({
           balances: [{ coin: 'USDC', hold: '1000', total: '10000' }],
         }),
+        userAbstraction: jest.fn().mockResolvedValue('unifiedAccount'),
         meta: jest.fn().mockResolvedValue({
           universe: [
             { name: 'BTC', szDecimals: 3, maxLeverage: 50 },
@@ -5912,7 +5963,7 @@ describe('HyperLiquidProvider', () => {
       const result = await provider.placeOrder(orderParams);
 
       // PR #25334: Builder fee approval is now non-blocking (fire-and-forget)
-      // to prevent QR popup spam for hardware wallets.
+      // to prevent repeated signing prompts for hardware wallets.
       // Order should proceed even if builder fee approval fails.
       expect(result.success).toBe(true);
       expect(result.orderId).toBeDefined();
@@ -8906,12 +8957,12 @@ describe('HyperLiquidProvider', () => {
     });
 
     // ─────────────────────────────────────────────────
-    // dexAbstraction → unifiedAccount migration on init
+    // Signing-backed unifiedAccount migration on init
     //
-    // The transition requires an EIP-712 prompt (HL blocks the agent path),
-    // so software-wallet users migrate during initial setup to ensure the
-    // first trade sees unified collateral. Hardware wallets remain deferred
-    // to avoid QR / Ledger prompt spam while browsing.
+    // Some transitions require an EIP-712 prompt, so software-wallet users
+    // migrate during initial setup to ensure the first trade sees unified
+    // collateral. Hardware wallets remain deferred to avoid repeated signing
+    // prompts while browsing.
     // ─────────────────────────────────────────────────
 
     it('calls userSetAbstraction on init for software-wallet dexAbstraction users', async () => {
@@ -9049,33 +9100,36 @@ describe('HyperLiquidProvider', () => {
       ).toHaveBeenCalledWith(USER_ADDRESS, 'unifiedAccount');
     });
 
-    it('defers dexAbstraction migration on init for hardware wallets', async () => {
-      // Arrange
-      mockWalletService.isSelectedHardwareWallet.mockReturnValue(true);
-      const mockExchangeClient = createMockExchangeClient();
-      mockClientService.getInfoClient = jest.fn().mockReturnValue(
-        createMockInfoClient({
-          userAbstraction: jest.fn().mockResolvedValue('dexAbstraction'),
-        }),
-      );
-      mockClientService.getExchangeClient = jest
-        .fn()
-        .mockReturnValue(mockExchangeClient);
+    it.each(['dexAbstraction', 'default', 'disabled'] as const)(
+      'defers %s migration on init for hardware wallets',
+      async (currentMode) => {
+        // Arrange
+        mockWalletService.isSelectedHardwareWallet.mockReturnValue(true);
+        const mockExchangeClient = createMockExchangeClient();
+        mockClientService.getInfoClient = jest.fn().mockReturnValue(
+          createMockInfoClient({
+            userAbstraction: jest.fn().mockResolvedValue(currentMode),
+          }),
+        );
+        mockClientService.getExchangeClient = jest
+          .fn()
+          .mockReturnValue(mockExchangeClient);
 
-      // Act - init path
-      await provider.getMarketDataWithPrices();
+        // Act - init path
+        await provider.getMarketDataWithPrices();
 
-      // Assert - no browsing-time hardware prompt; action-time setup can still run.
-      expect(mockExchangeClient.userSetAbstraction).not.toHaveBeenCalled();
-      expect(mockExchangeClient.agentSetAbstraction).not.toHaveBeenCalled();
-      expect(
-        (TradingReadinessCache as jest.Mocked<typeof TradingReadinessCache>)
-          .set,
-      ).not.toHaveBeenCalled();
-      expect(
-        mockSubscriptionService.setUserAbstractionMode,
-      ).not.toHaveBeenCalled();
-    });
+        // Assert - no browsing-time hardware prompt; action-time setup can still run.
+        expect(mockExchangeClient.userSetAbstraction).not.toHaveBeenCalled();
+        expect(mockExchangeClient.agentSetAbstraction).not.toHaveBeenCalled();
+        expect(
+          (TradingReadinessCache as jest.Mocked<typeof TradingReadinessCache>)
+            .set,
+        ).not.toHaveBeenCalled();
+        expect(
+          mockSubscriptionService.setUserAbstractionMode,
+        ).not.toHaveBeenCalled();
+      },
+    );
 
     it('does NOT call setUserAbstractionMode when migration fails', async () => {
       const mockExchangeClient = createMockExchangeClient();
@@ -9610,6 +9664,8 @@ describe('HyperLiquidProvider', () => {
         frontendOpenOrders: jest.fn(),
         perpDexs: jest.fn().mockResolvedValue([null]),
         spotClearinghouseState: jest.fn().mockResolvedValue({ balances: [] }),
+        // Mode-aware fold gate requires userAbstraction on standalone info
+        // clients as well; default to unifiedAccount for pre-existing tests.
         userAbstraction: jest.fn().mockResolvedValue('unifiedAccount'),
       };
     });
@@ -9819,7 +9875,8 @@ describe('HyperLiquidProvider', () => {
 
         // Assert — all DEX queries failed, aggregateAccountStates([]) returns fallback
         expect(result).toEqual({
-          availableBalance: '--',
+          spendableBalance: '--',
+          withdrawableBalance: '--',
           totalBalance: '--',
           marginUsed: '--',
           unrealizedPnl: '--',
diff --git a/app/controllers/perps/providers/HyperLiquidProvider.ts b/app/controllers/perps/providers/HyperLiquidProvider.ts
index ef4b49991df..38f2161646c 100644
--- a/app/controllers/perps/providers/HyperLiquidProvider.ts
+++ b/app/controllers/perps/providers/HyperLiquidProvider.ts
@@ -128,7 +128,8 @@ import {
   addSpotBalanceToAccountState,
   aggregateAccountStates,
 } from '../utils/accountUtils';
-import { ensureError } from '../utils/errorUtils';
+import { ensureError, isKeyringLockedError } from '../utils/errorUtils';
+import { shouldDeferUnifiedAccountSetup } from '../utils/hyperLiquidAbstraction';
 import {
   adaptAccountStateFromSDK,
   adaptHyperLiquidLedgerUpdateToUserHistoryItem,
@@ -627,7 +628,8 @@ export class HyperLiquidProvider implements PerpsProvider {
     const network = this.#clientService.isTestnetMode() ? 'testnet' : 'mainnet';
 
     // Check global cache first to avoid repeated signing requests
-    // This is CRITICAL for hardware wallets to prevent QR popup spam
+    // This is CRITICAL for hardware wallets to prevent repeated signing prompts
+    // while browsing.
     const cachedStatus = TradingReadinessCache.get(network, userAddress);
     if (cachedStatus?.attempted) {
       this.#deps.debugLogger.log(
@@ -726,14 +728,14 @@ export class HyperLiquidProvider implements PerpsProvider {
         return;
       }
 
-      // Defer the user-signed transition until the user attempts an action.
+      // Defer signing-backed transitions until the user attempts an action.
       // Cache is intentionally left untouched so the next entry re-evaluates;
       // the read-only userAbstraction call is cheap and gated by the in-flight
       // lock, preventing concurrent prompts.
-      if (currentMode === 'dexAbstraction' && !allowUserSigning) {
+      if (shouldDeferUnifiedAccountSetup(currentMode, allowUserSigning)) {
         this.#deps.debugLogger.log(
-          'HyperLiquidProvider: Deferring dexAbstraction → unifiedAccount migration to action time',
-          { user: userAddress, network },
+          'HyperLiquidProvider: Deferring unified account migration to action time',
+          { user: userAddress, network, mode: currentMode },
         );
         completeInFlight();
         return;
@@ -815,7 +817,7 @@ export class HyperLiquidProvider implements PerpsProvider {
       completeInFlight();
     } catch (error) {
       // If keyring is locked, don't cache so it retries when unlocked
-      if (ensureError(error).message === PERPS_ERROR_CODES.KEYRING_LOCKED) {
+      if (isKeyringLockedError(error)) {
         this.#deps.debugLogger.log(
           '[ensureUnifiedAccountEnabled] Keyring locked, will retry later',
         );
@@ -927,10 +929,10 @@ export class HyperLiquidProvider implements PerpsProvider {
       }
 
       // Attempt Unified Account migration as early as possible so users aren't
-      // blocked when they try to trade. Software-wallet dexAbstraction users can
-      // complete the one-time EIP-712 migration during initial setup so the first
-      // trade sees the unified balance. Hardware wallets remain deferred to
-      // action time to avoid QR / Ledger prompt spam while browsing.
+      // blocked when they try to trade. Software wallets can complete the
+      // signing-backed migration during initial setup so the first trade sees
+      // the unified balance. Hardware wallets remain deferred to action time to
+      // avoid repeated signing prompts while browsing.
       await this.#ensureUnifiedAccountEnabled({
         allowUserSigning: !this.#walletService.isSelectedHardwareWallet(),
       });
@@ -963,7 +965,7 @@ export class HyperLiquidProvider implements PerpsProvider {
    * - Builder fee approval (required for orders)
    * - Referral code setup (attribution)
    *
-   * These operations are DEFERRED from ensureReady() to avoid QR popup spam
+   * These operations are DEFERRED from ensureReady() to avoid hardware wallet prompt spam
    * when users are just viewing the Perps section (critical for hardware wallets).
    *
    * Call this method before any trading operation (placeOrder, cancelOrder, etc.)
@@ -2542,11 +2544,12 @@ export class HyperLiquidProvider implements PerpsProvider {
     const cacheKey = this.#getCacheKey(network, userAddress);
 
     // Check GLOBAL cache first to avoid repeated signing requests across reconnections
-    // This is CRITICAL for hardware wallets to prevent QR popup spam
+    // This is CRITICAL for hardware wallets to prevent repeated signing prompts
+    // while browsing.
     const globalCached = PerpsSigningCache.getBuilderFee(network, userAddress);
     if (globalCached?.attempted) {
       this.#deps.debugLogger.log(
-        '[ensureBuilderFeeApproval] Using global cache (prevents QR popup spam)',
+        '[ensureBuilderFeeApproval] Using global cache (prevents hardware wallet prompt spam)',
         { network, success: globalCached.success },
       );
       if (globalCached.success) {
@@ -2721,7 +2724,7 @@ export class HyperLiquidProvider implements PerpsProvider {
 
     const accountState = await infoClient.clearinghouseState(queryParams);
     const adapted = adaptAccountStateFromSDK(accountState);
-    return parseFloat(adapted.availableBalance);
+    return parseFloat(adapted.withdrawableBalance);
   }
 
   /**
@@ -3014,7 +3017,7 @@ export class HyperLiquidProvider implements PerpsProvider {
       const orderIsLong = isBuy;
 
       if (existingIsLong === orderIsLong) {
-        // Increasing position - HyperLiquid validates availableBalance >= totalRequiredMargin
+        // Increasing position - HyperLiquid validates spendableBalance >= totalRequiredMargin
         // BEFORE reallocating existing locked margin. Must transfer TOTAL margin temporarily.
         const existingSize = Math.abs(parseFloat(existingPosition.size));
         const existingMargin = parseFloat(existingPosition.marginUsed);
@@ -3130,7 +3133,7 @@ export class HyperLiquidProvider implements PerpsProvider {
             '🔄 HyperLiquidProvider: Auto-rebalancing excess margin back to main DEX',
             {
               dex: dexName,
-              availableBalance: postOrderBalance.toFixed(2),
+              spendableBalance: postOrderBalance.toFixed(2),
               desiredBuffer: desiredBuffer.toFixed(2),
               excessAmount: excessAmount.toFixed(2),
               destinationDex: transferInfo.sourceDex,
@@ -3543,6 +3546,9 @@ export class HyperLiquidProvider implements PerpsProvider {
    * @returns A promise that resolves to the result.
    */
   async placeOrder(params: OrderParams, retryCount = 0): Promise<OrderResult> {
+    // Hoisted so the retry path in the catch block can use the fetched price
+    // even when the caller (e.g. flipPosition) omits currentPrice from params.
+    let effectivePrice: number | undefined;
     try {
       this.#deps.debugLogger.log('Placing order via HyperLiquid SDK:', params);
 
@@ -3557,38 +3563,18 @@ export class HyperLiquidProvider implements PerpsProvider {
         throw new Error(validation.error);
       }
 
-      // Validate order at provider level (enforces USD validation rules)
-      await this.#validateOrderBeforePlacement(params);
-
-      // Ensure provider is ready for trading (includes signing operations)
-      await this.#ensureReadyForTrading();
-
-      // Debug: Log asset map state before order placement
-      const allMapKeys = Array.from(this.#symbolToAssetId.keys());
-      const hip3Keys = allMapKeys.filter((key) => key.includes(':'));
-      const assetExists = this.#symbolToAssetId.has(params.symbol);
-      this.#deps.debugLogger.log('Asset map state at order time', {
-        requestedCoin: params.symbol,
-        assetExistsInMap: assetExists,
-        totalAssetsInMap: this.#symbolToAssetId.size,
-        hip3AssetsCount: hip3Keys.length,
-        hip3AssetsSample: hip3Keys.slice(0, 10),
-        hip3Enabled: this.#hip3Enabled,
-        allowlistMarkets: this.#allowlistMarkets,
-        blocklistMarkets: this.#blocklistMarkets,
-      });
-
       // Extract DEX name for API calls (main DEX = null)
       const { dex: dexName } = parseAssetName(params.symbol);
 
-      // 1. Get asset info and current price
+      // 1. Get asset info and current price before validation so price-less
+      // callers (e.g. flipPosition) can validate against the live fetched price.
       const { assetInfo, currentPrice, meta } = await this.#getAssetInfo({
         symbol: params.symbol,
         dexName,
       });
 
-      // Allow override with UI-provided price (optimization to avoid API call)
-      const effectivePrice =
+      // Allow override with UI-provided price (optimization to avoid API call).
+      effectivePrice =
         params.currentPrice && params.currentPrice > 0
           ? params.currentPrice
           : currentPrice;
@@ -3601,6 +3587,35 @@ export class HyperLiquidProvider implements PerpsProvider {
         });
       }
 
+      // Validate order at provider level (enforces USD validation rules).
+      // Pass effectivePrice so price-less market orders (e.g. flipPosition)
+      // validate against the live fetched price instead of failing with
+      // ORDER_PRICE_REQUIRED.
+      await this.#validateOrderBeforePlacement({
+        ...params,
+        currentPrice: effectivePrice,
+      });
+
+      // Ensure provider is ready for trading (includes signing operations).
+      // Kept after validation so invalid orders never trigger signature prompts
+      // (builder-fee approval, DEX abstraction enablement, etc.).
+      await this.#ensureReadyForTrading();
+
+      // Debug: Log asset map state before order placement
+      const allMapKeys = Array.from(this.#symbolToAssetId.keys());
+      const hip3Keys = allMapKeys.filter((key) => key.includes(':'));
+      const assetExists = this.#symbolToAssetId.has(params.symbol);
+      this.#deps.debugLogger.log('Asset map state at order time', {
+        requestedCoin: params.symbol,
+        assetExistsInMap: assetExists,
+        totalAssetsInMap: this.#symbolToAssetId.size,
+        hip3AssetsCount: hip3Keys.length,
+        hip3AssetsSample: hip3Keys.slice(0, 10),
+        hip3Enabled: this.#hip3Enabled,
+        allowlistMarkets: this.#allowlistMarkets,
+        blocklistMarkets: this.#blocklistMarkets,
+      });
+
       // 2. Calculate final position size with USD reconciliation
       const { finalPositionSize } = calculateFinalPositionSize({
         usdAmount: params.usdAmount,
@@ -3706,10 +3721,13 @@ export class HyperLiquidProvider implements PerpsProvider {
           // USD-based order: adjust the USD amount directly
           originalValue = params.usdAmount;
           adjustedUsdAmount = (parseFloat(params.usdAmount) * 1.015).toFixed(2);
-        } else if (params.currentPrice) {
-          // Size-based order: calculate USD from size and adjust
+        } else if (effectivePrice) {
+          // Size-based order: calculate USD from size and adjust.
+          // Use the hoisted effectivePrice (fetched live price) so callers that
+          // omit currentPrice (e.g. flipPosition) can still recover from the
+          // $10-minimum edge case.
           const sizeValue = parseFloat(params.size);
-          const estimatedUsd = sizeValue * params.currentPrice;
+          const estimatedUsd = sizeValue * effectivePrice;
           originalValue = `${estimatedUsd.toFixed(2)} (calculated from size ${params.size})`;
           adjustedUsdAmount = (estimatedUsd * 1.015).toFixed(2);
         } else {
@@ -4769,6 +4787,20 @@ export class HyperLiquidProvider implements PerpsProvider {
         ntli,
       });
 
+      // Guard: confirm spendableBalance can cover margin addition.
+      // spendableBalance is already mode-aware (includes free spot in Unified,
+      // excludes it in Standard), so no extra spot fetch needed.
+      if (amountFloat > 0) {
+        const accountState = await this.getAccountState();
+        const spendable = parseFloat(accountState.spendableBalance);
+
+        if (spendable < amountFloat) {
+          throw new Error(
+            `Insufficient balance for margin addition: need ${amountFloat}, available ${spendable.toFixed(2)}`,
+          );
+        }
+      }
+
       // Call SDK to update isolated margin
       const exchangeClient = this.#clientService.getExchangeClient();
       const result = await exchangeClient.updateIsolatedMargin({
@@ -5852,7 +5884,9 @@ export class HyperLiquidProvider implements PerpsProvider {
         this.#clientService.isTestnetMode() ? 'TESTNET' : 'MAINNET',
       );
 
-      // Get Spot balance (global, not DEX-specific) and Perps states across all DEXs.
+      // Get Spot balance, Perps states across DEXs, and the HL abstraction
+      // mode (Unified / Standard / Portfolio / DEX-abstraction). Mode decides
+      // whether spot USDC is perps collateral — see addSpotBalanceToAccountState.
       // One transient DEX failure should not blank the entire account state.
       const [spotStateResult, perpsStateResult, abstractionResult] =
         await Promise.allSettled([
@@ -5947,7 +5981,8 @@ export class HyperLiquidProvider implements PerpsProvider {
           `DEX ${result.dex ?? 'main'} account state:`,
           {
             totalBalance: dexAccountState.totalBalance,
-            availableBalance: dexAccountState.availableBalance,
+            spendableBalance: dexAccountState.spendableBalance,
+            withdrawableBalance: dexAccountState.withdrawableBalance,
             marginUsed: dexAccountState.marginUsed,
             unrealizedPnl: dexAccountState.unrealizedPnl,
           },
@@ -5957,15 +5992,17 @@ export class HyperLiquidProvider implements PerpsProvider {
       const aggregatedAccountState = addSpotBalanceToAccountState(
         aggregateAccountStates(dexAccountStates),
         spotState,
-        {
-          foldIntoCollateral: hyperLiquidModeFoldsSpot(abstractionMode),
-        },
+        { foldIntoCollateral: hyperLiquidModeFoldsSpot(abstractionMode) },
       );
 
       // Build per-sub-account breakdown (HIP-3 DEXs map to sub-accounts)
       const subAccountBreakdown: Record<
         string,
-        { availableBalance: string; totalBalance: string }
+        {
+          spendableBalance: string;
+          withdrawableBalance: string;
+          totalBalance: string;
+        }
       > = {};
       perpsStateResults.forEach((result) => {
         const { dex, data: perpsState } = result;
@@ -5973,7 +6010,8 @@ export class HyperLiquidProvider implements PerpsProvider {
         const subAccountKey = dex ?? ''; // Empty string for main DEX
 
         subAccountBreakdown[subAccountKey] = {
-          availableBalance: dexAccountState.availableBalance,
+          spendableBalance: dexAccountState.spendableBalance,
+          withdrawableBalance: dexAccountState.withdrawableBalance,
           totalBalance: dexAccountState.totalBalance,
         };
       });
@@ -7056,16 +7094,10 @@ export class HyperLiquidProvider implements PerpsProvider {
         'HyperLiquidProvider: CHECKING ACCOUNT BALANCE',
       );
       const accountState = await this.getAccountState();
-      // Release-branch bridge for Unified Account: availableToTradeBalance
-      // includes collateral HL can draw in target mode. The larger balance
-      // contract will replace this with an explicit withdrawableBalance field.
-      const availableBalance = parseFloat(
-        accountState.availableToTradeBalance ?? accountState.availableBalance,
-      );
+      const withdrawableBalance = parseFloat(accountState.withdrawableBalance);
       this.#deps.debugLogger.log('HyperLiquidProvider: ACCOUNT BALANCE', {
-        availableBalance,
-        clearinghouseAvailableBalance: accountState.availableBalance,
-        availableToTradeBalance: accountState.availableToTradeBalance,
+        withdrawableBalance,
+        spendableBalance: accountState.spendableBalance,
         totalBalance: accountState.totalBalance,
         marginUsed: accountState.marginUsed,
         unrealizedPnl: accountState.unrealizedPnl,
@@ -7083,13 +7115,17 @@ export class HyperLiquidProvider implements PerpsProvider {
       const withdrawAmount = parseFloat(params.amount);
       this.#deps.debugLogger.log('HyperLiquidProvider: WITHDRAWAL AMOUNT', {
         requestedAmount: withdrawAmount,
-        availableBalance,
-        sufficientBalance: withdrawAmount <= availableBalance,
+        withdrawableBalance,
+        sufficientBalance: withdrawAmount <= withdrawableBalance,
       });
 
+      // Validate against withdrawableBalance — the mode-aware cap.
+      // No spot sweep: withdrawableBalance already reflects what withdraw3
+      // can pull. In Unified mode HL handles cross-wallet internally; in
+      // Standard mode spot is not withdrawable via perps.
       const balanceValidation = validateBalance(
         withdrawAmount,
-        availableBalance,
+        withdrawableBalance,
       );
       if (!balanceValidation.isValid) {
         this.#deps.debugLogger.log(
@@ -7097,8 +7133,8 @@ export class HyperLiquidProvider implements PerpsProvider {
           {
             error: balanceValidation.error,
             requestedAmount: withdrawAmount,
-            availableBalance,
-            difference: withdrawAmount - availableBalance,
+            withdrawableBalance,
+            difference: withdrawAmount - withdrawableBalance,
           },
         );
         throw new Error(balanceValidation.error);
@@ -8344,7 +8380,7 @@ export class HyperLiquidProvider implements PerpsProvider {
     const globalCached = PerpsSigningCache.getReferral(network, userAddress);
     if (globalCached?.attempted) {
       this.#deps.debugLogger.log(
-        '[ensureReferralSet] Using global cache (prevents QR popup spam)',
+        '[ensureReferralSet] Using global cache (prevents hardware wallet prompt spam)',
         { network, success: globalCached.success },
       );
       return;
diff --git a/app/controllers/perps/providers/MYXProvider.test.ts b/app/controllers/perps/providers/MYXProvider.test.ts
index 11c39105216..22c39d3a9ce 100644
--- a/app/controllers/perps/providers/MYXProvider.test.ts
+++ b/app/controllers/perps/providers/MYXProvider.test.ts
@@ -596,7 +596,8 @@ describe('MYXProvider', () => {
       const result = await provider.getAccountState();
 
       expect(result).toEqual({
-        availableBalance: '0',
+        spendableBalance: '0',
+        withdrawableBalance: '0',
         totalBalance: '0',
         marginUsed: '0',
         unrealizedPnl: '0',
@@ -769,7 +770,8 @@ describe('MYXProvider', () => {
       jest.advanceTimersByTime(1);
 
       expect(callback).toHaveBeenCalledWith({
-        availableBalance: '0',
+        spendableBalance: '0',
+        withdrawableBalance: '0',
         totalBalance: '0',
         marginUsed: '0',
         unrealizedPnl: '0',
@@ -1006,7 +1008,8 @@ describe('MYXProvider', () => {
         ) as { adaptAccountStateFromMYX: jest.Mock };
         mockAdapt.mockReturnValue({
           totalBalance: '1000',
-          availableBalance: '800',
+          spendableBalance: '800',
+          withdrawableBalance: '800',
           marginUsed: '200',
           unrealizedPnl: '50',
           returnOnEquity: '5',
diff --git a/app/controllers/perps/providers/MYXProvider.ts b/app/controllers/perps/providers/MYXProvider.ts
index 3586c57ded5..f1aa230f734 100644
--- a/app/controllers/perps/providers/MYXProvider.ts
+++ b/app/controllers/perps/providers/MYXProvider.ts
@@ -687,7 +687,8 @@ export class MYXProvider implements PerpsProvider {
         ...this.#getErrorContext('getAccountState'),
       });
       return {
-        availableBalance: '0',
+        spendableBalance: '0',
+        withdrawableBalance: '0',
         totalBalance: '0',
         marginUsed: '0',
         unrealizedPnl: '0',
@@ -958,7 +959,8 @@ export class MYXProvider implements PerpsProvider {
     setTimeout(
       () =>
         params.callback({
-          availableBalance: '0',
+          spendableBalance: '0',
+          withdrawableBalance: '0',
           totalBalance: '0',
           marginUsed: '0',
           unrealizedPnl: '0',
diff --git a/app/controllers/perps/services/HyperLiquidSubscriptionService.test.ts b/app/controllers/perps/services/HyperLiquidSubscriptionService.test.ts
index 6bff83dcb33..c7bec4fdf7e 100644
--- a/app/controllers/perps/services/HyperLiquidSubscriptionService.test.ts
+++ b/app/controllers/perps/services/HyperLiquidSubscriptionService.test.ts
@@ -7,6 +7,7 @@
 import type { CaipAccountId, Hex } from '@metamask/utils';
 
 import { createMockInfrastructure } from '../../../components/UI/Perps/__mocks__/serviceMocks';
+import { ABSTRACTION_MODE_REFRESH_THROTTLE_MS } from '../constants/perpsConfig';
 import type {
   SubscribeOrderBookParams,
   SubscribeOrderFillsParams,
@@ -65,7 +66,8 @@ jest.mock('../utils/hyperLiquidAdapter', () => ({
       : {}),
   })),
   adaptAccountStateFromSDK: jest.fn(() => ({
-    availableBalance: '1000.00',
+    spendableBalance: '1000.00',
+    withdrawableBalance: '1000.00',
     marginUsed: '500.00',
     unrealizedPnl: '100.00',
     returnOnEquity: '20.0',
@@ -388,6 +390,8 @@ describe('HyperLiquidSubscriptionService', () => {
       getSubscriptionClient: jest.fn(() => mockSubscriptionClient),
       getInfoClient: jest.fn(() => ({
         spotClearinghouseState: mockSpotClearinghouseState,
+        // Mode-aware fold gate reads userAbstraction; default to unifiedAccount
+        // so existing spot-fold assertions behave as before the gate was added.
         userAbstraction: jest.fn().mockResolvedValue('unifiedAccount'),
       })),
       isTestnetMode: jest.fn(() => false),
@@ -3833,8 +3837,12 @@ describe('HyperLiquidSubscriptionService', () => {
       expect(accountCallback).toHaveBeenCalled();
       const recoveredCall = accountCallback.mock.calls.at(-1)?.[0];
       // unifiedAccount → fold=true → spot USDC ($123.45) folds into
-      // availableToTradeBalance (default $1000 perps + $123.45 spot ≈ $1123.45).
-      expect(parseFloat(recoveredCall?.availableToTradeBalance)).toBeCloseTo(
+      // spendable/withdrawable (default $1000 perps + $123.45 spot ≈ $1123.45).
+      expect(parseFloat(recoveredCall?.spendableBalance)).toBeCloseTo(
+        1123.45,
+        2,
+      );
+      expect(parseFloat(recoveredCall?.withdrawableBalance)).toBeCloseTo(
         1123.45,
         2,
       );
@@ -3874,6 +3882,161 @@ describe('HyperLiquidSubscriptionService', () => {
       unsubscribe();
     });
 
+    it('refreshes abstraction mode per user when spotState ticks overlap account switches', async () => {
+      const userA = '0xaaa';
+      const userB = '0xbbb';
+      const accountA = 'eip155:42161:0xaaa' as CaipAccountId;
+      const accountB = 'eip155:42161:0xbbb' as CaipAccountId;
+      const spotState = {
+        balances: [
+          {
+            coin: 'USDC',
+            token: 0,
+            hold: '0',
+            total: '100',
+            entryNtl: '100',
+          },
+        ],
+      };
+      const spotListeners = new Map<string, (event: any) => void>();
+      let resolveUserARefresh: (mode: 'unifiedAccount') => void = () =>
+        undefined;
+      let userACalls = 0;
+      let userBCalls = 0;
+      const userAbstraction = jest.fn(({ user }: { user: string }) => {
+        const normalizedUser = user.toLowerCase();
+
+        if (normalizedUser === userA) {
+          userACalls += 1;
+          if (userACalls === 1) {
+            return Promise.resolve('unifiedAccount');
+          }
+          return new Promise<'unifiedAccount'>((resolve) => {
+            resolveUserARefresh = resolve;
+          });
+        }
+
+        if (normalizedUser === userB) {
+          userBCalls += 1;
+          if (userBCalls === 1) {
+            return Promise.reject(new Error('transient userAbstraction error'));
+          }
+          return Promise.resolve('disabled');
+        }
+
+        return Promise.resolve('unifiedAccount');
+      });
+
+      jest.mocked(adaptAccountStateFromSDK).mockImplementation(() => ({
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
+        totalBalance: '10100.00',
+        marginUsed: '500.00',
+        unrealizedPnl: '100.00',
+        returnOnEquity: '20.0',
+      }));
+      mockSpotClearinghouseState.mockResolvedValue(spotState);
+      mockClientService.getInfoClient.mockReturnValue({
+        spotClearinghouseState: mockSpotClearinghouseState,
+        userAbstraction,
+      } as any);
+      mockWalletService.getUserAddressWithDefault.mockImplementation(
+        async (accountId?: CaipAccountId) =>
+          accountId === accountB ? (userB as Hex) : (userA as Hex),
+      );
+      mockSubscriptionClient.spotState.mockImplementation(
+        (_params: any, callback: any) => {
+          spotListeners.set(_params.user.toLowerCase(), callback);
+          return Promise.resolve({
+            unsubscribe: jest.fn().mockResolvedValue(undefined),
+          });
+        },
+      );
+
+      const unsubscribeA = service.subscribeToAccount({
+        accountId: accountA,
+        callback: jest.fn(),
+      });
+      await jest.runAllTimersAsync();
+
+      jest.advanceTimersByTime(ABSTRACTION_MODE_REFRESH_THROTTLE_MS + 1);
+      spotListeners.get(userA)?.({ user: userA, spotState });
+      expect(userACalls).toBe(2);
+
+      const callbackB = jest.fn();
+      const unsubscribeB = service.subscribeToAccount({
+        accountId: accountB,
+        callback: callbackB,
+      });
+      await jest.runAllTimersAsync();
+
+      const bCallsBeforeTick = userBCalls;
+      spotListeners.get(userB)?.({ user: userB, spotState });
+      await jest.runAllTimersAsync();
+
+      expect(bCallsBeforeTick).toBe(1);
+      expect(userBCalls).toBe(2);
+      expect(userAbstraction).toHaveBeenLastCalledWith({ user: userB });
+      expect(callbackB.mock.calls.at(-1)[0].spendableBalance).toBe('1000');
+      expect(callbackB.mock.calls.at(-1)[0].withdrawableBalance).toBe('1000');
+
+      resolveUserARefresh('unifiedAccount');
+      await jest.runAllTimersAsync();
+
+      unsubscribeB();
+      unsubscribeA();
+    });
+
+    it('refreshes abstraction mode on the first spotState tick even inside the throttle window', async () => {
+      const user = '0xaaa';
+      const accountId = 'eip155:42161:0xaaa' as CaipAccountId;
+      const callback = jest.fn();
+      const spotState = {
+        balances: [
+          {
+            coin: 'USDC',
+            token: 0,
+            hold: '0',
+            total: '100',
+            entryNtl: '100',
+          },
+        ],
+      };
+      const userAbstraction = jest
+        .fn()
+        .mockResolvedValueOnce('unifiedAccount')
+        .mockResolvedValueOnce('disabled');
+
+      jest.mocked(adaptAccountStateFromSDK).mockImplementation(() => ({
+        spendableBalance: '1000.00',
+        withdrawableBalance: '1000.00',
+        totalBalance: '10100.00',
+        marginUsed: '500.00',
+        unrealizedPnl: '100.00',
+        returnOnEquity: '20.0',
+      }));
+      mockSpotClearinghouseState.mockResolvedValue(spotState);
+      mockClientService.getInfoClient.mockReturnValue({
+        spotClearinghouseState: mockSpotClearinghouseState,
+        userAbstraction,
+      } as any);
+      mockWalletService.getUserAddressWithDefault.mockResolvedValue(
+        user as Hex,
+      );
+
+      service.subscribeToAccount({ accountId, callback });
+      await jest.runAllTimersAsync();
+
+      expect(userAbstraction).toHaveBeenCalledTimes(1);
+
+      const spotListener = mockSubscriptionClient.spotState.mock.calls[0][1];
+      spotListener({ user, spotState });
+      await jest.runAllTimersAsync();
+
+      expect(userAbstraction).toHaveBeenCalledTimes(2);
+      expect(userAbstraction).toHaveBeenLastCalledWith({ user });
+    });
+
     it('unsubscribes spotState when the last account subscriber leaves', async () => {
       const unsubSpot = jest.fn().mockResolvedValue(undefined);
       mockSubscriptionClient.spotState.mockResolvedValueOnce({
@@ -3929,13 +4092,14 @@ describe('HyperLiquidSubscriptionService', () => {
       accountCallback.mockClear();
 
       // Switch the recorded mode to dexAbstraction (no fold). Account state
-      // hash flips because availableToTradeBalance drops the folded spot.
+      // hash flips because spendable/withdrawable drop the folded spot.
       service.setUserAbstractionMode('0x123', 'dexAbstraction');
       await jest.runAllTimersAsync();
 
       expect(accountCallback).toHaveBeenCalled();
       const lastCall = accountCallback.mock.calls.at(-1)?.[0];
-      expect(lastCall?.availableToTradeBalance).toBeDefined();
+      expect(lastCall?.spendableBalance).toBeDefined();
+      expect(lastCall?.withdrawableBalance).toBeDefined();
 
       unsubscribe();
     });
@@ -4003,7 +4167,8 @@ describe('HyperLiquidSubscriptionService', () => {
   describe('spot-adjusted account balance parity', () => {
     it('includes spot balance exactly once in streamed totalBalance across multiple DEXs', async () => {
       jest.mocked(adaptAccountStateFromSDK).mockImplementation(() => ({
-        availableBalance: '0',
+        spendableBalance: '0',
+        withdrawableBalance: '0',
         totalBalance: '0',
         marginUsed: '0',
         unrealizedPnl: '0',
@@ -4057,21 +4222,34 @@ describe('HyperLiquidSubscriptionService', () => {
 
       expect(mockCallback).toHaveBeenCalled();
       const accountState = mockCallback.mock.calls.at(-1)[0];
+      // Unified-mode default: spot USDC folds into total, spendable, and
+      // withdrawable (all three carry the same value when perps balances
+      // are zero). Per-DEX subAccountBreakdown entries stay perps-only —
+      // the fold is applied once at the aggregation level, not per DEX.
       expect(accountState.totalBalance).toBe('100.76531791');
-      expect(accountState.availableBalance).toBe('0');
-      expect(accountState.availableToTradeBalance).toBe('100.76531791');
+      expect(accountState.spendableBalance).toBe('100.76531791');
+      expect(accountState.withdrawableBalance).toBe('100.76531791');
       expect(accountState.subAccountBreakdown).toEqual({
-        main: { availableBalance: '0', totalBalance: '0' },
-        xyz: { availableBalance: '0', totalBalance: '0' },
+        main: {
+          spendableBalance: '0',
+          withdrawableBalance: '0',
+          totalBalance: '0',
+        },
+        xyz: {
+          spendableBalance: '0',
+          withdrawableBalance: '0',
+          totalBalance: '0',
+        },
       });
       expect(mockSpotClearinghouseState).toHaveBeenCalledTimes(1);
 
       unsubscribe();
     });
 
-    it('does not use non-USDC spot coins in streamed availableToTradeBalance', async () => {
+    it('does not use non-USDC spot coins in streamed spendable/withdrawable', async () => {
       jest.mocked(adaptAccountStateFromSDK).mockImplementation(() => ({
-        availableBalance: '0',
+        spendableBalance: '0',
+        withdrawableBalance: '0',
         totalBalance: '0',
         marginUsed: '0',
         unrealizedPnl: '0',
@@ -4135,7 +4313,8 @@ describe('HyperLiquidSubscriptionService', () => {
       await jest.runAllTimersAsync();
 
       const accountState = mockCallback.mock.calls.at(-1)[0];
-      expect(accountState.availableToTradeBalance).toBe('0');
+      expect(accountState.spendableBalance).toBe('0');
+      expect(accountState.withdrawableBalance).toBe('0');
       expect(accountState.totalBalance).toBe('0');
 
       unsubscribe();
@@ -4143,7 +4322,8 @@ describe('HyperLiquidSubscriptionService', () => {
 
     it('includes spot balance in webData2 (single-DEX) account updates without flickering', async () => {
       jest.mocked(adaptAccountStateFromSDK).mockImplementation(() => ({
-        availableBalance: '50',
+        spendableBalance: '50',
+        withdrawableBalance: '50',
         totalBalance: '200',
         marginUsed: '10',
         unrealizedPnl: '5',
@@ -4190,8 +4370,14 @@ describe('HyperLiquidSubscriptionService', () => {
 
       expect(mockCallback).toHaveBeenCalled();
       const firstUpdate = mockCallback.mock.calls.at(-1)[0];
+      // Unified-mode default: freeSpot ($100.77) folds into spendable and
+      // withdrawable on top of perps-side values, and into total.
+      //   total       = perps.accountValue (200) + spot (100.77) = 300.77
+      //   spendable   = perps.withdrawable (50)  + spot (100.77) = 150.77
+      //   withdrawable = perps.withdrawable (50) + spot (100.77) = 150.77
       expect(firstUpdate.totalBalance).toBe('300.76531791');
-      expect(firstUpdate.availableBalance).toBe('50');
+      expect(firstUpdate.spendableBalance).toBe('150.76531791');
+      expect(firstUpdate.withdrawableBalance).toBe('150.76531791');
 
       // Simulate a second WebSocket tick — should still include spot balance,
       // not revert to perps-only 200.
@@ -4226,7 +4412,8 @@ describe('HyperLiquidSubscriptionService', () => {
     it('calculates positive ROE when unrealizedPnl is positive', async () => {
       // Override the adapter mock
       jest.mocked(adaptAccountStateFromSDK).mockImplementation(() => ({
-        availableBalance: '100',
+        spendableBalance: '100',
+        withdrawableBalance: '100',
         totalBalance: '1100',
         marginUsed: '1000',
         unrealizedPnl: '100',
@@ -4271,7 +4458,8 @@ describe('HyperLiquidSubscriptionService', () => {
     it('calculates negative ROE when unrealizedPnl is negative', async () => {
       // Override the adapter mock
       jest.mocked(adaptAccountStateFromSDK).mockImplementation(() => ({
-        availableBalance: '0',
+        spendableBalance: '0',
+        withdrawableBalance: '0',
         totalBalance: '950',
         marginUsed: '1000',
         unrealizedPnl: '-50',
@@ -4316,7 +4504,8 @@ describe('HyperLiquidSubscriptionService', () => {
     it('returns zero ROE when marginUsed is zero', async () => {
       // Override the adapter mock
       jest.mocked(adaptAccountStateFromSDK).mockImplementation(() => ({
-        availableBalance: '1000',
+        spendableBalance: '1000',
+        withdrawableBalance: '1000',
         totalBalance: '1000',
         marginUsed: '0',
         unrealizedPnl: '0',
@@ -4361,7 +4550,8 @@ describe('HyperLiquidSubscriptionService', () => {
     it('calculates correct ROE with mixed profit and loss positions', async () => {
       // Override the adapter mock
       jest.mocked(adaptAccountStateFromSDK).mockImplementation(() => ({
-        availableBalance: '75',
+        spendableBalance: '75',
+        withdrawableBalance: '75',
         totalBalance: '1575',
         marginUsed: '1500',
         unrealizedPnl: '75',
@@ -4407,7 +4597,8 @@ describe('HyperLiquidSubscriptionService', () => {
     it('calculates high ROE with large percentage gains', async () => {
       // Override the adapter mock
       jest.mocked(adaptAccountStateFromSDK).mockImplementation(() => ({
-        availableBalance: '200',
+        spendableBalance: '200',
+        withdrawableBalance: '200',
         totalBalance: '300',
         marginUsed: '100',
         unrealizedPnl: '200',
@@ -4452,7 +4643,8 @@ describe('HyperLiquidSubscriptionService', () => {
     it('stores raw ROE without rounding', async () => {
       // Override the adapter mock
       jest.mocked(adaptAccountStateFromSDK).mockImplementation(() => ({
-        availableBalance: '100',
+        spendableBalance: '100',
+        withdrawableBalance: '100',
         totalBalance: '433',
         marginUsed: '333',
         unrealizedPnl: '100',
@@ -5393,5 +5585,35 @@ describe('HyperLiquidSubscriptionService', () => {
       expect(mockDeps.logger.error).toHaveBeenCalled();
       expect(typeof unsubscribe).toBe('function');
     });
+
+    it('logs method name (not class name) for transient SDK errors', async () => {
+      // Arrange: make activeAssetCtx reject with a WebSocketRequestError
+      const transientError = new Error(
+        'Unknown error while making a WebSocket request',
+      );
+      transientError.name = 'WebSocketRequestError';
+      mockSubscriptionClient.activeAssetCtx.mockRejectedValue(transientError);
+
+      // Act
+      await service.subscribeToPrices({
+        symbols: ['BTC'],
+        callback: jest.fn(),
+        includeMarketData: true,
+      });
+      await jest.runAllTimersAsync();
+
+      // Assert: debugLogger received method context, not the class name
+      expect(mockDeps.debugLogger.log).toHaveBeenCalledWith(
+        expect.stringContaining('ensureActiveAssetSubscription'),
+      );
+      expect(mockDeps.debugLogger.log).not.toHaveBeenCalledWith(
+        expect.stringContaining('HyperLiquidSubscriptionService:'),
+      );
+      // Sentry logger should NOT have been called with the transient error
+      expect(mockDeps.logger.error).not.toHaveBeenCalledWith(
+        transientError,
+        expect.anything(),
+      );
+    });
   });
 });
diff --git a/app/controllers/perps/services/HyperLiquidSubscriptionService.ts b/app/controllers/perps/services/HyperLiquidSubscriptionService.ts
index 3a7f4f755f9..d9cfbfc841e 100644
--- a/app/controllers/perps/services/HyperLiquidSubscriptionService.ts
+++ b/app/controllers/perps/services/HyperLiquidSubscriptionService.ts
@@ -19,7 +19,11 @@ import type {
 
 import type { HyperLiquidClientService } from './HyperLiquidClientService';
 import type { HyperLiquidWalletService } from './HyperLiquidWalletService';
-import { TP_SL_CONFIG, PERPS_CONSTANTS } from '../constants/perpsConfig';
+import {
+  TP_SL_CONFIG,
+  PERPS_CONSTANTS,
+  ABSTRACTION_MODE_REFRESH_THROTTLE_MS,
+} from '../constants/perpsConfig';
 import { WebSocketConnectionState } from '../types';
 import type {
   PriceUpdate,
@@ -39,11 +43,12 @@ import type {
   PerpsPlatformDependencies,
   PerpsLogger,
 } from '../types';
-import { hyperLiquidModeFoldsSpot } from '../types/hyperliquid-types';
 import type {
   SpotClearinghouseStateResponse,
+  HyperLiquidAbstractionMode,
   UserAbstractionResponse,
 } from '../types/hyperliquid-types';
+import { hyperLiquidModeFoldsSpot } from '../types/hyperliquid-types';
 import {
   addSpotBalanceToAccountState,
   calculateWeightedReturnOnEquity,
@@ -178,9 +183,27 @@ export class HyperLiquidSubscriptionService {
 
   #cachedSpotState: SpotClearinghouseStateResponse | null = null;
 
-  #cachedSpotStateUserAddress: string | null = null;
+  // HL abstraction mode (Unified / Standard / Portfolio / DEX-abstraction).
+  // Gates spot→perps folding in addSpotBalanceToAccountState. Keyed by user
+  // address so an in-flight refresh or late response for one wallet cannot
+  // overwrite another wallet's fold semantics after an account switch.
+  readonly #abstractionModeByUser = new Map<
+    string,
+    HyperLiquidAbstractionMode
+  >();
+
+  // Timestamp of the last successful WS-driven userAbstraction refresh per
+  // user. This throttle intentionally does not count the initial bootstrap
+  // fetch so the first spot tick after app launch can still detect an HL-web
+  // mode flip immediately.
+  readonly #abstractionModeLastWsRefreshAtByUser = new Map<string, number>();
+
+  // In-flight promises for WS-triggered refreshes, keyed by user so concurrent
+  // ticks for the same wallet share one fetch while account switches can start
+  // their own refresh immediately.
+  readonly #abstractionModeInflightByUser = new Map<string, Promise<void>>();
 
-  readonly #abstractionModeByUser = new Map<string, UserAbstractionResponse>();
+  #cachedSpotStateUserAddress: string | null = null;
 
   #spotStatePromise?: Promise<void>;
 
@@ -330,13 +353,44 @@ export class HyperLiquidSubscriptionService {
     if (this.#isClearing) {
       return;
     }
+    if (this.#isTransientSdkError(error)) {
+      // Expected SDK lifecycle: reconnect churn, intentional terminations, or
+      // request-side aborts. Forwarding these to Sentry pollutes the error
+      // budget with handled events the SDK already recovers from. Keep them
+      // visible locally via debugLogger for diagnosis.
+      this.#deps.debugLogger.log(
+        `[Perps transient SDK error] ${(context?.context?.data?.method as string) ?? 'unknown'}: ${error.message}`,
+      );
+      return;
+    }
     this.#deps.logger.error(error, context);
   }
 
-  #isTransientAssetCtxsError(error: unknown): boolean {
+  /**
+   * Detects transient SDK errors that are part of normal WebSocket / HTTP
+   * lifecycle and should not surface to Sentry. The Hyperliquid SDK
+   * (`@nktkas/hyperliquid`) and its `@nktkas/rews` v2 transport surface several
+   * error classes that are caught and recovered automatically by the SDK or
+   * by our own teardown paths.
+   *
+   * Returns true for `WebSocketRequestError` (rews queue rejection on close),
+   * `ReconnectingWebSocketError` (rews v2 lifecycle: RECONNECTION_LIMIT,
+   * TERMINATED_BY_USER, UNKNOWN_ERROR — v1 silently hung), `TimeoutError`
+   * with "Signal timed out" message (AbortSignal.timeout shim firing inside
+   * the SDK transport as designed), and reconnect-churn fallbacks (unknown
+   * or undefined errors while in Connecting / Disconnected states).
+   *
+   * Used both to drop these from Sentry (`#logErrorUnlessClearing`) and to
+   * decide whether to retry on the assetCtxs subscription path.
+   *
+   * @param error - The error thrown by the SDK or rews transport.
+   * @returns True if the error is part of normal SDK lifecycle and should
+   * be downgraded from Sentry capture to debug logging.
+   */
+  #isTransientSdkError(error: unknown): boolean {
     const ensuredError = ensureError(
       error,
-      'HyperLiquidSubscriptionService.createAssetCtxsSubscription',
+      'HyperLiquidSubscriptionService.isTransientSdkError',
     );
     const connectionState = this.#clientService.getConnectionState?.();
     const messageParts = [
@@ -354,6 +408,9 @@ export class HyperLiquidSubscriptionService {
     return (
       messageParts.includes('websocketrequesterror') ||
       messageParts.includes('unknown error while making a websocket request') ||
+      messageParts.includes('reconnectingwebsocketerror') ||
+      (messageParts.includes('timeouterror') &&
+        messageParts.includes('signal timed out')) ||
       (isReconnectChurn &&
         (messageParts.includes('unknown error (no details provided)') ||
           messageParts.includes('undefined')))
@@ -719,9 +776,7 @@ export class HyperLiquidSubscriptionService {
   }
 
   #hashAccountState(account: AccountState): string {
-    return `${account.availableBalance}:${account.availableToTradeBalance ?? ''}:${
-      account.totalBalance
-    }:${account.marginUsed}:${account.unrealizedPnl}`;
+    return `${account.spendableBalance}:${account.withdrawableBalance}:${account.totalBalance}:${account.marginUsed}:${account.unrealizedPnl}`;
   }
 
   // Cache hashes to avoid recomputation
@@ -977,9 +1032,14 @@ export class HyperLiquidSubscriptionService {
   #aggregateAccountStates(): AccountState {
     const subAccountBreakdown: Record<
       string,
-      { availableBalance: string; totalBalance: string }
+      {
+        spendableBalance: string;
+        withdrawableBalance: string;
+        totalBalance: string;
+      }
     > = {};
-    let totalAvailableBalance = 0;
+    let totalSpendableBalance = 0;
+    let totalWithdrawableBalance = 0;
     let totalBalance = 0;
     let totalMarginUsed = 0;
     let totalUnrealizedPnl = 0;
@@ -995,10 +1055,12 @@ export class HyperLiquidSubscriptionService {
       ([currentDex, state]) => {
         const dexKey = currentDex === '' ? 'main' : currentDex;
         subAccountBreakdown[dexKey] = {
-          availableBalance: state.availableBalance,
+          spendableBalance: state.spendableBalance,
+          withdrawableBalance: state.withdrawableBalance,
           totalBalance: state.totalBalance,
         };
-        totalAvailableBalance += parseFloat(state.availableBalance);
+        totalSpendableBalance += parseFloat(state.spendableBalance);
+        totalWithdrawableBalance += parseFloat(state.withdrawableBalance);
         totalBalance += parseFloat(state.totalBalance);
         totalMarginUsed += parseFloat(state.marginUsed);
         totalUnrealizedPnl += parseFloat(state.unrealizedPnl);
@@ -1021,7 +1083,8 @@ export class HyperLiquidSubscriptionService {
     return addSpotBalanceToAccountState(
       {
         ...firstDexAccount,
-        availableBalance: totalAvailableBalance.toString(),
+        spendableBalance: totalSpendableBalance.toString(),
+        withdrawableBalance: totalWithdrawableBalance.toString(),
         totalBalance: totalBalance.toString(),
         marginUsed: totalMarginUsed.toString(),
         unrealizedPnl: totalUnrealizedPnl.toString(),
@@ -1033,13 +1096,22 @@ export class HyperLiquidSubscriptionService {
     );
   }
 
+  /**
+   * Return the cached HL abstraction mode for the given user address.
+   *
+   * Returns `null` when the address is unknown or this user has not been
+   * fetched yet — callers pass this through `hyperLiquidModeFoldsSpot`,
+   * which fail-closes (no fold) when the mode is unresolved.
+   *
+   * @param userAddress - Current user address; null/empty returns null.
+   * @returns Cached abstraction mode when the user matches; otherwise null.
+   */
   #getAbstractionModeForUser(
     userAddress?: string | null,
-  ): UserAbstractionResponse | null {
+  ): HyperLiquidAbstractionMode | null {
     if (!userAddress) {
       return null;
     }
-
     return this.#abstractionModeByUser.get(userAddress.toLowerCase()) ?? null;
   }
 
@@ -1054,36 +1126,107 @@ export class HyperLiquidSubscriptionService {
   /**
    * Record a user's resolved abstraction mode and immediately re-aggregate.
    * Call after the provider has confirmed the on-chain mode (already-enabled
-   * or just-migrated). Setting the mode (rather than deleting it) ensures
-   * `hyperLiquidModeFoldsSpot` returns the correct fold decision on the next
-   * aggregation — a delete would leave the user pinned to fail-closed
-   * (no fold) until the next refresh, under-reporting balance for Unified
-   * and Portfolio Margin users.
-   *
-   * Seals `#cachedSpotStateUserAddress` if spot is already cached for this
-   * user (fast-path optimization for the next `#ensureSpotState`). Skips the
-   * seal if spot belongs to a different user — the next refresh will sort
-   * everything out.
+   * or just-migrated) so the WS-driven aggregator picks up the correct fold
+   * decision on the next tick.
    *
    * @param userAddress - The EVM address whose mode is being recorded.
    * @param mode - The current abstraction mode for this user.
    */
   public setUserAbstractionMode(
     userAddress: string,
-    mode: UserAbstractionResponse,
+    mode: HyperLiquidAbstractionMode,
   ): void {
     const lower = userAddress.toLowerCase();
     this.#abstractionModeByUser.set(lower, mode);
 
-    // No need to seal #cachedSpotStateUserAddress here — the WS handler and
-    // #refreshSpotState success path always set it to the spot owner. The
-    // re-aggregation below will pick up the new mode via the now-populated
-    // #abstractionModeByUser entry.
     if (this.#dexAccountCache.size > 0) {
       this.#aggregateAndNotifySubscribers();
     }
   }
 
+  /**
+   * Fetch userAbstraction and update the cache, throttled so the long-lived
+   * spotState WebSocket can trigger a background refresh on every tick
+   * without burning REST quota. Handles HL-web mode flips propagating back
+   * to mobile without requiring a restart or account switch.
+   *
+   * Concurrent callers share the same in-flight promise so an in-flight
+   * fetch (especially a slow-failing one) doesn't ratchet the throttle
+   * forward on every WS tick and leave mode stale during a network hang.
+   *
+   * @param userAddress - Current user address to refresh the cache for.
+   * @returns Promise that resolves once the refresh completes (or immediately when throttled).
+   */
+  async #refreshAbstractionModeThrottled(userAddress: string): Promise<void> {
+    const normalizedUser = userAddress.toLowerCase();
+    const existing = this.#abstractionModeInflightByUser.get(normalizedUser);
+    if (existing) {
+      await existing;
+      return undefined;
+    }
+    const now = Date.now();
+    const lastWsRefreshAt =
+      this.#abstractionModeLastWsRefreshAtByUser.get(normalizedUser) ?? 0;
+    if (now - lastWsRefreshAt < ABSTRACTION_MODE_REFRESH_THROTTLE_MS) {
+      return undefined;
+    }
+    const inflight: Promise<void> = (async (): Promise<void> => {
+      try {
+        const infoClient = this.#clientService.getInfoClient();
+        const mode = await infoClient.userAbstraction({ user: userAddress });
+        const previousMode =
+          this.#abstractionModeByUser.get(normalizedUser) ?? null;
+        this.#abstractionModeByUser.set(normalizedUser, mode);
+        // Set timestamp only on success; a hanging/failed fetch must not
+        // ratchet the throttle window forward (which would silence every
+        // subsequent spot WS tick for the full throttle duration).
+        this.#abstractionModeLastWsRefreshAtByUser.set(
+          normalizedUser,
+          Date.now(),
+        );
+
+        // If the fold semantics actually changed for this user, trigger a
+        // re-aggregation so balance-dependent UI (withdraw cap, order-entry
+        // validation) picks up the new mode immediately — otherwise a
+        // Unified→Standard flip can stay folded with old semantics until the
+        // next spot/account event happens to arrive.
+        const foldChanged =
+          hyperLiquidModeFoldsSpot(previousMode) !==
+          hyperLiquidModeFoldsSpot(mode);
+        if (foldChanged && this.#dexAccountCache.size > 0) {
+          this.#aggregateAndNotifySubscribers();
+        }
+      } catch (error) {
+        // Non-fatal — preserve the last known mode for this user. Leave
+        // timestamp at its previous value so a genuine retry on the next
+        // WS tick is allowed (no forward ratchet on slow failures). Route
+        // through the shared Sentry helper so repeated failures become
+        // visible on the perps ops dashboard (consistent with other async
+        // boundary errors in this file, e.g. #refreshSpotState).
+        this.#logErrorUnlessClearing(
+          ensureError(
+            error,
+            'HyperLiquidSubscriptionService.refreshAbstractionModeThrottled',
+          ),
+          this.#getErrorContext('refreshAbstractionModeThrottled', {
+            user: normalizedUser,
+          }),
+        );
+      }
+    })();
+    this.#abstractionModeInflightByUser.set(normalizedUser, inflight);
+    try {
+      await inflight;
+    } finally {
+      if (
+        this.#abstractionModeInflightByUser.get(normalizedUser) === inflight
+      ) {
+        this.#abstractionModeInflightByUser.delete(normalizedUser);
+      }
+    }
+    return undefined;
+  }
+
   async #ensureSpotState(accountId?: CaipAccountId): Promise<void> {
     const userAddress =
       await this.#walletService.getUserAddressWithDefault(accountId);
@@ -1150,14 +1293,33 @@ export class HyperLiquidSubscriptionService {
       // correctly handles the generation-changed case (seal + re-aggregate
       // instead of overwriting WS spot).
       const infoClient = this.#clientService.getInfoClient();
+      const lowerUserAddress = userAddress.toLowerCase();
+      // Fetch spot state + abstraction mode in parallel — mode decides
+      // whether the spot fold applies in addSpotBalanceToAccountState.
+      // Register the userAbstraction call in `#abstractionModeInflightByUser`
+      // so a concurrent WS-driven `#refreshAbstractionModeThrottled` awaits
+      // this fetch instead of duplicating the REST round-trip.
+      const abstractionFetch = infoClient.userAbstraction({
+        user: userAddress,
+      }) as Promise<UserAbstractionResponse>;
+      const trackedAbstraction = abstractionFetch.then(
+        () => undefined,
+        () => undefined,
+      );
+      this.#abstractionModeInflightByUser.set(
+        lowerUserAddress,
+        trackedAbstraction,
+      );
       const [spotResult, abstractionResult] = await Promise.allSettled([
-        infoClient.spotClearinghouseState({
-          user: userAddress,
-        }),
-        infoClient.userAbstraction({ user: userAddress }),
+        infoClient.spotClearinghouseState({ user: userAddress }),
+        abstractionFetch,
       ]);
-
-      const lowerUserAddress = userAddress.toLowerCase();
+      if (
+        this.#abstractionModeInflightByUser.get(lowerUserAddress) ===
+        trackedAbstraction
+      ) {
+        this.#abstractionModeInflightByUser.delete(lowerUserAddress);
+      }
 
       // Record the abstraction mode regardless of generation. The mode is
       // user-keyed (independent of the spot snapshot generation) so a WS
@@ -1269,6 +1431,17 @@ export class HyperLiquidSubscriptionService {
             // by checking #abstractionModeByUser.has(...).
             this.#cachedSpotStateUserAddress = userAddress.toLowerCase();
 
+            // Kick a throttled userAbstraction refresh so HL-web mode
+            // flips (Unified → Standard or vice versa) propagate back to
+            // mobile while the app stays open. Fire-and-forget: the
+            // refresh updates the per-user abstraction-mode cache and the next
+            // fold picks up the new value.
+            this.#refreshAbstractionModeThrottled(
+              event.user.toLowerCase(),
+            ).catch(() => {
+              // Errors are logged inside the throttled refresh helper.
+            });
+
             if (this.#dexAccountCache.size > 0) {
               this.#aggregateAndNotifySubscribers();
             }
@@ -2289,6 +2462,10 @@ export class HyperLiquidSubscriptionService {
       this.#cachedSpotState = null;
       this.#cachedSpotStateUserAddress = null;
       this.#abstractionModeByUser.clear();
+      this.#abstractionModeLastWsRefreshAtByUser.clear();
+      // Drop in-flight refresh handles so stale hanging userAbstraction
+      // requests from the prior connection can't be awaited by future calls.
+      this.#abstractionModeInflightByUser.clear();
       // Bump generation so any in-flight spot fetch from a prior user discards
       // its result instead of re-populating the cache post-cleanup.
       this.#spotStateGeneration += 1;
@@ -3339,10 +3516,7 @@ export class HyperLiquidSubscriptionService {
               'HyperLiquidSubscriptionService.createAssetCtxsSubscription',
             );
             const isLastAttempt = attempt === maxAttempts;
-            if (
-              isLastAttempt ||
-              !this.#isTransientAssetCtxsError(ensuredError)
-            ) {
+            if (isLastAttempt || !this.#isTransientSdkError(ensuredError)) {
               throw ensuredError;
             }
 
@@ -4068,6 +4242,8 @@ export class HyperLiquidSubscriptionService {
     this.#cachedSpotState = null;
     this.#cachedSpotStateUserAddress = null;
     this.#abstractionModeByUser.clear();
+    this.#abstractionModeLastWsRefreshAtByUser.clear();
+    this.#abstractionModeInflightByUser.clear();
     this.#spotStateGeneration += 1;
     this.#spotStatePromise = undefined;
     this.#spotStatePromiseUserAddress = undefined;
diff --git a/app/controllers/perps/services/HyperLiquidWalletService.test.ts b/app/controllers/perps/services/HyperLiquidWalletService.test.ts
index 3b7495633c5..ab052c0b9b5 100644
--- a/app/controllers/perps/services/HyperLiquidWalletService.test.ts
+++ b/app/controllers/perps/services/HyperLiquidWalletService.test.ts
@@ -322,7 +322,13 @@ describe('HyperLiquidWalletService', () => {
       expect(service.isSelectedHardwareWallet()).toBe(false);
     });
 
-    it('returns true for Ledger hardware wallet', () => {
+    it.each([
+      'Ledger Hardware',
+      'Trezor Hardware',
+      'OneKey Hardware',
+      'Lattice Hardware',
+      'QR Hardware Wallet Device',
+    ])('returns true for %s wallet', (keyringType) => {
       (mockMessenger.call as jest.Mock).mockImplementation((action: string) => {
         if (
           action === 'AccountTreeController:getAccountsFromSelectedAccountGroup'
@@ -332,28 +338,7 @@ describe('HyperLiquidWalletService', () => {
               ...mockEvmAccount,
               metadata: {
                 ...mockEvmAccount.metadata,
-                keyring: { type: 'Ledger Hardware' },
-              },
-            },
-          ];
-        }
-        return undefined;
-      });
-
-      expect(service.isSelectedHardwareWallet()).toBe(true);
-    });
-
-    it('returns true for QR hardware wallet', () => {
-      (mockMessenger.call as jest.Mock).mockImplementation((action: string) => {
-        if (
-          action === 'AccountTreeController:getAccountsFromSelectedAccountGroup'
-        ) {
-          return [
-            {
-              ...mockEvmAccount,
-              metadata: {
-                ...mockEvmAccount.metadata,
-                keyring: { type: 'QR Hardware Wallet Device' },
+                keyring: { type: keyringType },
               },
             },
           ];
diff --git a/app/controllers/perps/services/HyperLiquidWalletService.ts b/app/controllers/perps/services/HyperLiquidWalletService.ts
index 144f53af326..1f8dbcbbf8b 100644
--- a/app/controllers/perps/services/HyperLiquidWalletService.ts
+++ b/app/controllers/perps/services/HyperLiquidWalletService.ts
@@ -18,6 +18,9 @@ import { findEvmAccount, getSelectedEvmAccount } from '../utils/accountUtils';
 // service portable between mobile and the core monorepo.
 const HARDWARE_KEYRING_TYPES = new Set<string>([
   'Ledger Hardware',
+  'Trezor Hardware',
+  'OneKey Hardware',
+  'Lattice Hardware',
   'QR Hardware Wallet Device',
 ]);
 
@@ -55,7 +58,7 @@ export class HyperLiquidWalletService {
   /**
    * Check whether the selected EVM account is backed by hardware.
    *
-   * @returns True for Ledger / QR hardware keyrings; false for software accounts.
+   * @returns True for MetaMask hardware keyrings; false for software accounts.
    */
   public isSelectedHardwareWallet(): boolean {
     const selectedEvmAccount = findEvmAccount(
diff --git a/app/controllers/perps/services/MarketDataService.test.ts b/app/controllers/perps/services/MarketDataService.test.ts
index fd91334c4df..21b2708a6fa 100644
--- a/app/controllers/perps/services/MarketDataService.test.ts
+++ b/app/controllers/perps/services/MarketDataService.test.ts
@@ -470,7 +470,8 @@ describe('MarketDataService', () => {
   describe('getAccountState', () => {
     it('fetches account state and updates state', async () => {
       const mockAccountState: AccountState = {
-        availableBalance: '10000',
+        spendableBalance: '10000',
+        withdrawableBalance: '10000',
         totalBalance: '15000',
         marginUsed: '5000',
         unrealizedPnl: '1000',
@@ -529,7 +530,8 @@ describe('MarketDataService', () => {
 
     it('passes source param in trace tags', async () => {
       const mockAccountState: AccountState = {
-        availableBalance: '10000',
+        spendableBalance: '10000',
+        withdrawableBalance: '10000',
         totalBalance: '15000',
         marginUsed: '5000',
         unrealizedPnl: '1000',
diff --git a/app/controllers/perps/services/TradingReadinessCache.ts b/app/controllers/perps/services/TradingReadinessCache.ts
index 082c7e27b04..2f2b79d98f3 100644
--- a/app/controllers/perps/services/TradingReadinessCache.ts
+++ b/app/controllers/perps/services/TradingReadinessCache.ts
@@ -2,7 +2,8 @@
  * Global singleton cache for Perps signing operations
  *
  * This cache persists across provider reconnections to prevent repeated
- * signing requests for hardware wallets. Critical for preventing QR popup spam.
+ * signing requests for hardware wallets. Critical for preventing repeated
+ * hardware wallet signing prompts.
  *
  * Cache is intentionally kept separate from provider instances because providers
  * are recreated on account/network changes, which would reset instance-level caches.
diff --git a/app/controllers/perps/types/hyperliquid-types.ts b/app/controllers/perps/types/hyperliquid-types.ts
index f0e0f8795e1..18bb3c3c5ea 100644
--- a/app/controllers/perps/types/hyperliquid-types.ts
+++ b/app/controllers/perps/types/hyperliquid-types.ts
@@ -20,6 +20,19 @@ import type {
   UserAbstractionResponse,
 } from '@nktkas/hyperliquid';
 
+/**
+ * HL account abstraction mode returned by the `userAbstraction` info endpoint.
+ * Re-exported here to keep HL-specific types centralised.
+ *
+ * `unifiedAccount` / `portfolioMargin`: spot is unified with perps;
+ * `withdraw3` draws from the unified ledger, spot folds into perps collateral.
+ *
+ * `disabled` (Standard) / `dexAbstraction` (deprecated) / `default` (unset):
+ * spot and perps are separate ledgers; spot is NOT auto-collateral until the
+ * user is migrated to unified mode.
+ */
+export type HyperLiquidAbstractionMode = UserAbstractionResponse;
+
 /**
  * Wire codes accepted by `agentSetAbstraction({ abstraction })`. The SDK
  * types these as a `"i" | "u" | "p"` literal union with no exported constant.
@@ -43,23 +56,25 @@ export const HL_ABSTRACTION_WIRE = {
 export const HL_UNIFIED_ACCOUNT_MODE = 'unifiedAccount' as const;
 
 /**
- * True when the given HL abstraction mode treats spot balances as perps
- * collateral. Fail-CLOSED on missing mode: until userAbstraction has been
- * resolved we do not fold spot, because over-reporting withdrawable funds
- * for Standard / dexAbstraction users (which `withdraw3` cannot actually
- * draw) is worse than briefly under-reporting for Unified users during the
- * initial subscription window or a transient REST outage.
+ * True when the given HL abstraction mode treats spot USDC as perps collateral.
+ * Used by the provider + subscription service to gate `addSpotBalanceToAccountState`'s
+ * `foldIntoCollateral` option.
+ *
+ * Fail-CLOSED on missing mode: until userAbstraction has been resolved we do
+ * NOT fold spot, because over-reporting withdrawable funds for Standard /
+ * dexAbstraction users (which `withdraw3` cannot actually draw) is worse than
+ * briefly under-reporting for Unified users during the initial subscription
+ * window or a transient REST outage.
  *
- * @param mode - Abstraction mode returned by HyperLiquid.
- * @returns Whether spot balances should fold into perps collateral.
+ * @param mode - Abstraction mode from `userAbstraction` endpoint; null/undefined means unknown.
+ * @returns `true` when spot folds into spendable/withdrawable (Unified / Portfolio); `false` for Standard / DEX abstraction / unknown.
  */
 export function hyperLiquidModeFoldsSpot(
-  mode?: UserAbstractionResponse | null,
+  mode?: HyperLiquidAbstractionMode | null,
 ): boolean {
   if (mode === null || mode === undefined) {
     return false;
   }
-
   return mode === 'unifiedAccount' || mode === 'portfolioMargin';
 }
 
diff --git a/app/controllers/perps/types/index.ts b/app/controllers/perps/types/index.ts
index 5ea8521416e..33f99ce3908 100644
--- a/app/controllers/perps/types/index.ts
+++ b/app/controllers/perps/types/index.ts
@@ -212,12 +212,34 @@ export type Position = {
 
 // Using 'type' instead of 'interface' for BaseController Json compatibility
 export type AccountState = {
-  availableBalance: string; // Based on HyperLiquid: withdrawable
-  availableToTradeBalance?: string; // withdrawable + unreserved spot collateral (order-entry path)
-  totalBalance: string; // Based on HyperLiquid: accountValue
-  marginUsed: string; // Based on HyperLiquid: marginUsed
-  unrealizedPnl: string; // Based on HyperLiquid: unrealizedPnl
-  returnOnEquity: string; // Based on HyperLiquid: returnOnEquity adjusted for weighted margin
+  /**
+   * Total USD equity on this venue — collateral + unrealized PnL. Live MTM.
+   * HL: crossMarginSummary.accountValue + spot(USDC) − spot.hold
+   * MYX: walletBalance + marginUsed + unrealizedPnl
+   */
+  totalBalance: string;
+  /**
+   * Max USD that can immediately collateralize a new position on this venue,
+   * with no internal transfer required.
+   * HL Unified: withdrawable + freeSpotUSDC
+   * HL Standard: withdrawable
+   * MYX: walletBalance
+   */
+  spendableBalance: string;
+  /**
+   * Max USD that can leave this venue to the user's external wallet.
+   * UI reads this value without branching on provider; the provider
+   * contract guarantees HL's own abstraction (Unified) or the direct
+   * perps-clearinghouse (Standard) is what actually settles the
+   * withdraw — no client-side spot→perps sweep is performed.
+   * HL Unified: withdrawable + freeSpotUSDC (USDC only; `freeSpotUSDC = spot.total - spot.hold`, and HL withdraw3 draws from the unified ledger server-side)
+   * HL Standard: withdrawable (perps-clearinghouse only; spot is a separate ledger)
+   * MYX: walletBalance
+   */
+  withdrawableBalance: string;
+  marginUsed: string;
+  unrealizedPnl: string;
+  returnOnEquity: string;
   /**
    * Per-sub-account balance breakdown (protocol-specific, optional)
    * Maps sub-account identifier to its balance details.
@@ -233,7 +255,8 @@ export type AccountState = {
   subAccountBreakdown?: Record<
     string,
     {
-      availableBalance: string;
+      spendableBalance: string;
+      withdrawableBalance: string;
       totalBalance: string;
     }
   >;
diff --git a/app/controllers/perps/utils/accountUtils.test.ts b/app/controllers/perps/utils/accountUtils.test.ts
index 4a1b6f25b98..ba604a1e290 100644
--- a/app/controllers/perps/utils/accountUtils.test.ts
+++ b/app/controllers/perps/utils/accountUtils.test.ts
@@ -10,7 +10,8 @@ import {
 
 describe('aggregateAccountStates', () => {
   const fallback: AccountState = {
-    availableBalance: PERPS_CONSTANTS.FallbackDataDisplay,
+    spendableBalance: PERPS_CONSTANTS.FallbackDataDisplay,
+    withdrawableBalance: PERPS_CONSTANTS.FallbackDataDisplay,
     totalBalance: PERPS_CONSTANTS.FallbackDataDisplay,
     marginUsed: PERPS_CONSTANTS.FallbackDataDisplay,
     unrealizedPnl: PERPS_CONSTANTS.FallbackDataDisplay,
@@ -23,7 +24,8 @@ describe('aggregateAccountStates', () => {
 
   it('returns the single state unchanged when given one element', () => {
     const single: AccountState = {
-      availableBalance: '100',
+      spendableBalance: '100',
+      withdrawableBalance: '100',
       totalBalance: '200',
       marginUsed: '50',
       unrealizedPnl: '10',
@@ -34,14 +36,16 @@ describe('aggregateAccountStates', () => {
 
   it('sums numeric fields from two states and recalculates ROE', () => {
     const stateA: AccountState = {
-      availableBalance: '100',
+      spendableBalance: '100',
+      withdrawableBalance: '100',
       totalBalance: '200',
       marginUsed: '50',
       unrealizedPnl: '10',
       returnOnEquity: '20',
     };
     const stateB: AccountState = {
-      availableBalance: '50',
+      spendableBalance: '50',
+      withdrawableBalance: '50',
       totalBalance: '150',
       marginUsed: '30',
       unrealizedPnl: '6',
@@ -50,7 +54,8 @@ describe('aggregateAccountStates', () => {
 
     const result = aggregateAccountStates([stateA, stateB]);
 
-    expect(parseFloat(result.availableBalance)).toBe(150);
+    expect(parseFloat(result.spendableBalance)).toBe(150);
+    expect(parseFloat(result.withdrawableBalance)).toBe(150);
     expect(parseFloat(result.totalBalance)).toBe(350);
     expect(parseFloat(result.marginUsed)).toBe(80);
     expect(parseFloat(result.unrealizedPnl)).toBe(16);
@@ -61,21 +66,24 @@ describe('aggregateAccountStates', () => {
   it('sums numeric fields from three states', () => {
     const states: AccountState[] = [
       {
-        availableBalance: '100',
+        spendableBalance: '100',
+        withdrawableBalance: '100',
         totalBalance: '200',
         marginUsed: '50',
         unrealizedPnl: '10',
         returnOnEquity: '20',
       },
       {
-        availableBalance: '200',
+        spendableBalance: '200',
+        withdrawableBalance: '200',
         totalBalance: '300',
         marginUsed: '100',
         unrealizedPnl: '30',
         returnOnEquity: '30',
       },
       {
-        availableBalance: '50',
+        spendableBalance: '50',
+        withdrawableBalance: '50',
         totalBalance: '100',
         marginUsed: '50',
         unrealizedPnl: '5',
@@ -85,7 +93,8 @@ describe('aggregateAccountStates', () => {
 
     const result = aggregateAccountStates(states);
 
-    expect(parseFloat(result.availableBalance)).toBe(350);
+    expect(parseFloat(result.spendableBalance)).toBe(350);
+    expect(parseFloat(result.withdrawableBalance)).toBe(350);
     expect(parseFloat(result.totalBalance)).toBe(600);
     expect(parseFloat(result.marginUsed)).toBe(200);
     expect(parseFloat(result.unrealizedPnl)).toBe(45);
@@ -95,7 +104,8 @@ describe('aggregateAccountStates', () => {
 
   it('does not mutate the input state object', () => {
     const single: AccountState = {
-      availableBalance: '100',
+      spendableBalance: '100',
+      withdrawableBalance: '100',
       totalBalance: '200',
       marginUsed: '50',
       unrealizedPnl: '10',
@@ -110,7 +120,8 @@ describe('aggregateAccountStates', () => {
 
   it('sets ROE to 0 when total marginUsed is 0', () => {
     const state: AccountState = {
-      availableBalance: '100',
+      spendableBalance: '100',
+      withdrawableBalance: '100',
       totalBalance: '100',
       marginUsed: '0',
       unrealizedPnl: '0',
@@ -122,14 +133,16 @@ describe('aggregateAccountStates', () => {
 
   it('handles negative unrealizedPnl correctly', () => {
     const stateA: AccountState = {
-      availableBalance: '80',
+      spendableBalance: '80',
+      withdrawableBalance: '80',
       totalBalance: '180',
       marginUsed: '100',
       unrealizedPnl: '-20',
       returnOnEquity: '-20',
     };
     const stateB: AccountState = {
-      availableBalance: '40',
+      spendableBalance: '40',
+      withdrawableBalance: '40',
       totalBalance: '90',
       marginUsed: '50',
       unrealizedPnl: '-10',
@@ -146,14 +159,16 @@ describe('aggregateAccountStates', () => {
 
   it('handles decimal values correctly', () => {
     const stateA: AccountState = {
-      availableBalance: '100.50',
+      spendableBalance: '100.50',
+      withdrawableBalance: '100.50',
       totalBalance: '200.75',
       marginUsed: '50.25',
       unrealizedPnl: '10.10',
       returnOnEquity: '20.1',
     };
     const stateB: AccountState = {
-      availableBalance: '50.50',
+      spendableBalance: '50.50',
+      withdrawableBalance: '50.50',
       totalBalance: '150.25',
       marginUsed: '30.75',
       unrealizedPnl: '6.90',
@@ -162,7 +177,8 @@ describe('aggregateAccountStates', () => {
 
     const result = aggregateAccountStates([stateA, stateB]);
 
-    expect(parseFloat(result.availableBalance)).toBeCloseTo(151, 0);
+    expect(parseFloat(result.spendableBalance)).toBeCloseTo(151, 0);
+    expect(parseFloat(result.withdrawableBalance)).toBeCloseTo(151, 0);
     expect(parseFloat(result.totalBalance)).toBeCloseTo(351, 0);
     expect(parseFloat(result.marginUsed)).toBeCloseTo(81, 0);
     expect(parseFloat(result.unrealizedPnl)).toBeCloseTo(17, 0);
@@ -174,9 +190,10 @@ describe('spot balance helpers', () => {
     expect(getSpotBalance()).toBe(0);
   });
 
-  it('adds spot balance to totalBalance without mutating the input state', () => {
+  it('bumps totalBalance, spendableBalance, and withdrawableBalance by spot USDC without mutating the input', () => {
     const accountState: AccountState = {
-      availableBalance: '0',
+      spendableBalance: '0',
+      withdrawableBalance: '0',
       totalBalance: '100',
       marginUsed: '0',
       unrealizedPnl: '0',
@@ -195,15 +212,17 @@ describe('spot balance helpers', () => {
     );
 
     // Only USDC contributes — non-stablecoin spot assets are not convertible
-    // to perps collateral and must not inflate totalBalance.
+    // to perps collateral and must not inflate balances.
     expect(result.totalBalance).toBe('125.5');
-    expect(result.availableToTradeBalance).toBe('25.5');
+    expect(result.spendableBalance).toBe('25.5');
+    expect(result.withdrawableBalance).toBe('25.5');
     expect(accountState.totalBalance).toBe('100');
   });
 
   it('ignores non-collateral spot balances entirely', () => {
     const accountState: AccountState = {
-      availableBalance: '0',
+      spendableBalance: '0',
+      withdrawableBalance: '0',
       totalBalance: '50',
       marginUsed: '0',
       unrealizedPnl: '0',
@@ -217,15 +236,13 @@ describe('spot balance helpers', () => {
       ],
     } as never);
 
-    // spotBalance is 0 (no USDC), so totalBalance is unchanged but
-    // availableToTradeBalance is computed from availableBalance.
-    expect(result.totalBalance).toBe('50');
-    expect(result.availableToTradeBalance).toBe('0');
+    expect(result).toBe(accountState);
   });
 
   it('excludes USDH-only spot balance from funded-state totals', () => {
     const accountState: AccountState = {
-      availableBalance: '0',
+      spendableBalance: '0',
+      withdrawableBalance: '0',
       totalBalance: '0',
       marginUsed: '0',
       unrealizedPnl: '0',
@@ -239,55 +256,40 @@ describe('spot balance helpers', () => {
       ],
     } as never);
 
-    // spotBalance is 0 (no USDC), so totalBalance is unchanged but
-    // availableToTradeBalance is computed from availableBalance.
-    expect(result.totalBalance).toBe('0');
-    expect(result.availableToTradeBalance).toBe('0');
+    expect(result).toBe(accountState);
   });
 
   it('adds only the USDC portion when USDC and USDH are both present', () => {
     const accountState: AccountState = {
-      availableBalance: '0',
+      spendableBalance: '0',
+      withdrawableBalance: '0',
       totalBalance: '10',
       marginUsed: '0',
       unrealizedPnl: '0',
       returnOnEquity: '0',
     };
 
-    const result = addSpotBalanceToAccountState(accountState, {
-      balances: [
-        { coin: 'USDC', total: '20' },
-        { coin: 'USDH', total: '30' },
-        { coin: 'HYPE', total: '9999' },
-      ],
-    } as never);
+    const result = addSpotBalanceToAccountState(
+      accountState,
+      {
+        balances: [
+          { coin: 'USDC', total: '20' },
+          { coin: 'USDH', total: '30' },
+          { coin: 'HYPE', total: '9999' },
+        ],
+      } as never,
+      { foldIntoCollateral: true },
+    );
 
     expect(result.totalBalance).toBe('30');
+    expect(result.spendableBalance).toBe('20');
+    expect(result.withdrawableBalance).toBe('20');
   });
 
-  it('does not add non-USDC spot balances to availableToTradeBalance', () => {
-    const accountState: AccountState = {
-      availableBalance: '0',
-      totalBalance: '10',
-      marginUsed: '0',
-      unrealizedPnl: '0',
-      returnOnEquity: '0',
-    };
-
-    const result = addSpotBalanceToAccountState(accountState, {
-      balances: [
-        { coin: 'mUSD', total: '25', hold: '5' },
-        { coin: 'HYPE', total: '999' },
-      ],
-    } as never);
-
-    expect(result.totalBalance).toBe('10');
-    expect(result.availableToTradeBalance).toBe('0');
-  });
-
-  it('does not fold USDC spot collateral into availableToTradeBalance for Standard modes', () => {
+  it('does not fold USDC spot collateral into spendable/withdrawable for Standard modes', () => {
     const accountState: AccountState = {
-      availableBalance: '7',
+      spendableBalance: '7',
+      withdrawableBalance: '7',
       totalBalance: '10',
       marginUsed: '0',
       unrealizedPnl: '0',
@@ -299,22 +301,22 @@ describe('spot balance helpers', () => {
       {
         balances: [{ coin: 'USDC', total: '25', hold: '5' }],
       } as never,
-      {
-        foldIntoCollateral: false,
-      },
+      { foldIntoCollateral: false },
     );
 
     expect(result.totalBalance).toBe('30');
-    expect(result.availableToTradeBalance).toBe('7');
+    expect(result.spendableBalance).toBe('7');
+    expect(result.withdrawableBalance).toBe('7');
   });
 
-  it('keeps spot USDC separate from availableToTradeBalance even when withdrawable=0 in Standard mode', () => {
+  it('keeps spot USDC separate from withdrawable even when withdrawable=0 in Standard mode', () => {
     // Standard / DEX-abstraction users with $0 perps withdrawable but free
-    // spot USDC must NOT see spot fold into availableToTradeBalance —
-    // withdraw3 only draws from the perps ledger in those modes. Folding
-    // would surface a withdrawable amount the API can't actually fulfill.
+    // spot USDC must NOT see spot fold into withdrawable — withdraw3 only
+    // draws from the perps ledger in those modes. Folding would surface a
+    // withdrawable amount the API can't actually fulfill.
     const accountState: AccountState = {
-      availableBalance: '0',
+      spendableBalance: '0',
+      withdrawableBalance: '0',
       totalBalance: '0',
       marginUsed: '0',
       unrealizedPnl: '0',
@@ -329,14 +331,16 @@ describe('spot balance helpers', () => {
       { foldIntoCollateral: false },
     );
 
-    expect(result.availableToTradeBalance).toBe('0');
+    expect(result.spendableBalance).toBe('0');
+    expect(result.withdrawableBalance).toBe('0');
     expect(result.totalBalance).toBe('2500');
   });
 
-  it('keeps spot separate when Standard mode has both perps and spot balances', () => {
+  it('subtracts spot hold from total and only folds free spot into spendable/withdrawable', () => {
     const accountState: AccountState = {
-      availableBalance: '7',
-      totalBalance: '10',
+      spendableBalance: '10',
+      withdrawableBalance: '10',
+      totalBalance: '100',
       marginUsed: '0',
       unrealizedPnl: '0',
       returnOnEquity: '0',
@@ -345,27 +349,79 @@ describe('spot balance helpers', () => {
     const result = addSpotBalanceToAccountState(
       accountState,
       {
-        balances: [{ coin: 'USDC', total: '25', hold: '0' }],
+        balances: [{ coin: 'USDC', total: '40', hold: '15' }],
       } as never,
-      { foldIntoCollateral: false },
+      { foldIntoCollateral: true },
     );
 
-    expect(result.availableToTradeBalance).toBe('7');
-    expect(result.totalBalance).toBe('35');
+    // totalBalance += spotTotal - spotHold = 100 + 40 - 15 = 125
+    expect(parseFloat(result.totalBalance)).toBe(125);
+    // spendable/withdrawable += freeSpot = 10 + (40 - 15) = 35
+    expect(parseFloat(result.spendableBalance)).toBe(35);
+    expect(parseFloat(result.withdrawableBalance)).toBe(35);
   });
 
-  it('returns the original account state when spot balance is zero', () => {
+  it('returns the input untouched when no collateral spot balance is present', () => {
     const accountState: AccountState = {
-      availableBalance: '1',
+      spendableBalance: '1',
+      withdrawableBalance: '1',
       totalBalance: '2',
       marginUsed: '3',
       unrealizedPnl: '4',
       returnOnEquity: '5',
     };
 
-    expect(
-      addSpotBalanceToAccountState(accountState, { balances: [] } as never),
-    ).toEqual(expect.objectContaining(accountState));
+    const result = addSpotBalanceToAccountState(accountState, {
+      balances: [],
+    } as never);
+
+    expect(result).toBe(accountState);
+  });
+
+  it('does NOT fold spot into spendable/withdrawable when foldIntoCollateral is false (e.g. HL Standard mode)', () => {
+    const accountState: AccountState = {
+      spendableBalance: '5',
+      withdrawableBalance: '5',
+      totalBalance: '5',
+      marginUsed: '0',
+      unrealizedPnl: '0',
+      returnOnEquity: '0',
+    };
+
+    const result = addSpotBalanceToAccountState(
+      accountState,
+      { balances: [{ coin: 'USDC', total: '30' }] } as never,
+      { foldIntoCollateral: false },
+    );
+
+    // Total still reflects combined wealth (display).
+    expect(parseFloat(result.totalBalance)).toBe(35);
+    // Spendable/withdrawable must remain perps-only — spot isn't auto-collateral
+    // on Standard mode, so surfacing a folded value would mislead the validation
+    // hook into approving submissions HL will reject.
+    expect(result.spendableBalance).toBe('5');
+    expect(result.withdrawableBalance).toBe('5');
+  });
+
+  it('folds spot into spendable/withdrawable when foldIntoCollateral is explicitly true', () => {
+    const accountState: AccountState = {
+      spendableBalance: '5',
+      withdrawableBalance: '5',
+      totalBalance: '5',
+      marginUsed: '0',
+      unrealizedPnl: '0',
+      returnOnEquity: '0',
+    };
+
+    const result = addSpotBalanceToAccountState(
+      accountState,
+      { balances: [{ coin: 'USDC', total: '30' }] } as never,
+      { foldIntoCollateral: true },
+    );
+
+    expect(parseFloat(result.totalBalance)).toBe(35);
+    expect(parseFloat(result.spendableBalance)).toBe(35);
+    expect(parseFloat(result.withdrawableBalance)).toBe(35);
   });
 });
 
diff --git a/app/controllers/perps/utils/accountUtils.ts b/app/controllers/perps/utils/accountUtils.ts
index 13c90d960a0..747cdd7620b 100644
--- a/app/controllers/perps/utils/accountUtils.ts
+++ b/app/controllers/perps/utils/accountUtils.ts
@@ -90,14 +90,6 @@ export function calculateWeightedReturnOnEquity(
   return weightedROE.toString();
 }
 
-export type AddSpotBalanceOptions = {
-  /**
-   * Whether the user's abstraction mode folds spot balances into perps
-   * collateral. Standard / DEX abstraction keep spot separate.
-   */
-  foldIntoCollateral?: boolean;
-};
-
 // The release-branch balance bridge is USDC-only. Non-USDC spot assets must
 // not inflate the balances shown or validated by withdraw/payment flows.
 const SPOT_COLLATERAL_COINS = new Set<string>(['USDC']);
@@ -140,6 +132,40 @@ export function getSpotHold(
   );
 }
 
+/**
+ * Options controlling how `addSpotBalanceToAccountState` folds spot balance
+ * into the three-field AccountState contract.
+ */
+export type AddSpotBalanceOptions = {
+  /**
+   * When `true`, free spot USDC contributes to both `spendableBalance` and
+   * `withdrawableBalance` in addition to `totalBalance` — appropriate for
+   * venues where spot is automatically used as perps collateral (e.g.
+   * HyperLiquid Unified/Portfolio mode, where `withdraw3` draws from the
+   * unified ledger).
+   *
+   * When `false`, free spot contributes to `totalBalance` only; spendable
+   * and withdrawable stay perps-only — appropriate for venues where spot
+   * is a separate ledger the backend cannot auto-draw from (e.g. HL
+   * Standard mode). The caller is responsible for translating
+   * provider-specific state into this flag.
+   *
+   * Defaults to `true` for backward compatibility with call sites that
+   * haven't yet been wired with provider-specific context.
+   */
+  foldIntoCollateral?: boolean;
+};
+
+/**
+ * Add spot USDC to the AccountState contract. Caller decides whether the
+ * spot balance counts as perps collateral via `options.foldIntoCollateral`
+ * — the util stays provider-agnostic.
+ *
+ * @param accountState - Base AccountState produced by a provider adapter.
+ * @param spotState - Raw spot clearinghouse response (HL-shaped); null or missing means no spot balance and the state is returned unchanged.
+ * @param options - See {@link AddSpotBalanceOptions}.
+ * @returns AccountState with spot folded into `totalBalance` always, and into spendable/withdrawable when `foldIntoCollateral` is true.
+ */
 export function addSpotBalanceToAccountState(
   accountState: AccountState,
   spotState?: SpotClearinghouseStateResponse | null,
@@ -149,12 +175,14 @@ export function addSpotBalanceToAccountState(
   // A caller that omits `options` should NOT silently fold spot — that would
   // over-report withdrawable funds for Standard / dexAbstraction users.
   const foldIntoCollateral = options?.foldIntoCollateral ?? false;
+
   const spotBalance = getSpotBalance(spotState);
   const spotHold = getSpotHold(spotState);
   const freeSpot = Math.max(0, spotBalance - spotHold);
 
   const currentTotal = parseFloat(accountState.totalBalance);
-  const currentAvailable = parseFloat(accountState.availableBalance);
+  const currentSpendable = parseFloat(accountState.spendableBalance);
+  const currentWithdrawable = parseFloat(accountState.withdrawableBalance);
 
   // Preserve sentinel totals (e.g. PERPS_CONSTANTS.FallbackDataDisplay '--')
   // rather than coercing them to NaN.
@@ -163,40 +191,65 @@ export function addSpotBalanceToAccountState(
   }
 
   if (spotBalance === 0) {
-    return {
-      ...accountState,
-      availableToTradeBalance: Number.isFinite(currentAvailable)
-        ? currentAvailable.toString()
-        : accountState.availableBalance,
-    };
+    // No spot wealth means no hold either in the HL payload shape, so the
+    // later totalBalance adjustment would also be a no-op.
+    return accountState;
   }
 
-  // Folding is gated strictly on the resolved abstraction mode. Standard /
-  // DEX-abstraction users keep perps and spot independent, so spot must NOT
-  // surface as a perps-withdrawable balance for them — withdraw3 only draws
-  // from the perps ledger in those modes. Unified / portfolio-margin users
-  // get the fold; live callers fail-CLOSED via `hyperLiquidModeFoldsSpot`
-  // when mode is unresolved (avoids over-reporting funds withdraw3 cannot
-  // actually draw during the initial subscription window).
-  let availableToTrade = accountState.availableBalance;
-  if (foldIntoCollateral) {
-    availableToTrade = Number.isFinite(currentAvailable)
-      ? (currentAvailable + freeSpot).toString()
-      : freeSpot.toString();
-  }
+  // Folding is gated strictly on the resolved abstraction mode (see callers'
+  // `foldIntoCollateral` argument). Standard / DEX-abstraction users keep
+  // perps and spot independent, so spot must NOT surface as a perps-
+  // withdrawable balance for them — withdraw3 only draws from the perps
+  // ledger in those modes. Unified / portfolio-margin users get the fold;
+  // live callers fail-CLOSED via `hyperLiquidModeFoldsSpot` when mode is
+  // unresolved.
+  const nextSpendable = resolveFoldedBalance(
+    currentSpendable,
+    accountState.spendableBalance,
+    freeSpot,
+    foldIntoCollateral,
+  );
+  const nextWithdrawable = resolveFoldedBalance(
+    currentWithdrawable,
+    accountState.withdrawableBalance,
+    freeSpot,
+    foldIntoCollateral,
+  );
 
-  // Subtract spotHold to avoid double-counting on Unified/PM accounts:
-  // marginSummary.accountValue already includes the margin that HL
-  // surfaces via spot.hold. Standard mode has spotHold = 0, no-op.
+  // Total always reflects combined wealth: subtract spotHold to avoid
+  // double-counting on Unified/PM accounts where marginSummary.accountValue
+  // already includes the margin that HL surfaces via spot.hold. Standard
+  // mode has spotHold = 0 by construction, so the subtraction is a no-op.
   const nextTotal = currentTotal + spotBalance - spotHold;
 
   return {
     ...accountState,
     totalBalance: nextTotal.toString(),
-    availableToTradeBalance: availableToTrade,
+    spendableBalance: nextSpendable,
+    withdrawableBalance: nextWithdrawable,
   };
 }
 
+function resolveFoldedBalance(
+  currentNumeric: number,
+  currentRaw: string,
+  freeSpot: number,
+  foldIntoCollateral: boolean,
+): string {
+  if (!foldIntoCollateral) {
+    return currentRaw;
+  }
+  if (Number.isFinite(currentNumeric)) {
+    return (currentNumeric + freeSpot).toString();
+  }
+  // Non-finite currentNumeric means the adapter passed a sentinel like
+  // `PERPS_CONSTANTS.FallbackDataDisplay` ("--") during loading. Preserve
+  // the sentinel rather than synthesising a numeric fold; the caller's
+  // UI treats "--" as "loading" and would otherwise show a misleading
+  // spot-only figure while the per-DEX perps fetch is still in flight.
+  return currentRaw;
+}
+
 /**
  * Aggregate multiple per-DEX AccountState objects into one by summing numeric fields.
  * ROE is recalculated as (totalUnrealizedPnl / totalMarginUsed) * 100.
@@ -206,7 +259,8 @@ export function addSpotBalanceToAccountState(
  */
 export function aggregateAccountStates(states: AccountState[]): AccountState {
   const fallback: AccountState = {
-    availableBalance: PERPS_CONSTANTS.FallbackDataDisplay,
+    spendableBalance: PERPS_CONSTANTS.FallbackDataDisplay,
+    withdrawableBalance: PERPS_CONSTANTS.FallbackDataDisplay,
     totalBalance: PERPS_CONSTANTS.FallbackDataDisplay,
     marginUsed: PERPS_CONSTANTS.FallbackDataDisplay,
     unrealizedPnl: PERPS_CONSTANTS.FallbackDataDisplay,
@@ -221,25 +275,15 @@ export function aggregateAccountStates(states: AccountState[]): AccountState {
     if (index === 0) {
       return { ...state };
     }
-    const accAvailableToTrade = parseFloat(
-      acc.availableToTradeBalance ?? acc.availableBalance,
-    );
-    const stateAvailableToTrade = parseFloat(
-      state.availableToTradeBalance ?? state.availableBalance,
-    );
-    const availableToTradeSum =
-      Number.isFinite(accAvailableToTrade) &&
-      Number.isFinite(stateAvailableToTrade)
-        ? (accAvailableToTrade + stateAvailableToTrade).toString()
-        : undefined;
 
     return {
-      availableBalance: (
-        parseFloat(acc.availableBalance) + parseFloat(state.availableBalance)
+      spendableBalance: (
+        parseFloat(acc.spendableBalance) + parseFloat(state.spendableBalance)
+      ).toString(),
+      withdrawableBalance: (
+        parseFloat(acc.withdrawableBalance) +
+        parseFloat(state.withdrawableBalance)
       ).toString(),
-      ...(availableToTradeSum !== undefined && {
-        availableToTradeBalance: availableToTradeSum,
-      }),
       totalBalance: (
         parseFloat(acc.totalBalance) + parseFloat(state.totalBalance)
       ).toString(),
diff --git a/app/controllers/perps/utils/errorUtils.ts b/app/controllers/perps/utils/errorUtils.ts
index 2e0725361f2..49a80cb0244 100644
--- a/app/controllers/perps/utils/errorUtils.ts
+++ b/app/controllers/perps/utils/errorUtils.ts
@@ -4,6 +4,8 @@
  */
 import { hasProperty } from '@metamask/utils';
 
+import { PERPS_ERROR_CODES } from '../perpsErrorCodes';
+
 /**
  * Detects expected cancellation/abort errors that should not be reported to Sentry.
  * These occur during normal navigation or view teardown when in-flight fetch requests
@@ -23,6 +25,30 @@ export function isAbortError(error: unknown): boolean {
   return false;
 }
 
+/**
+ * Detects keyring-locked errors, including SDK-wrapped errors that preserve the
+ * original error in `cause`.
+ *
+ * @param error - The error to check.
+ * @returns True if any error in the cause chain is KEYRING_LOCKED.
+ */
+export function isKeyringLockedError(error: unknown): boolean {
+  let current: unknown = error;
+  const seen = new Set<unknown>();
+
+  while (current instanceof Error && !seen.has(current)) {
+    seen.add(current);
+
+    if (current.message === PERPS_ERROR_CODES.KEYRING_LOCKED) {
+      return true;
+    }
+
+    current = (current as { cause?: unknown }).cause;
+  }
+
+  return false;
+}
+
 /**
  * Ensures we have a proper Error object for logging.
  * Converts unknown/string errors to proper Error instances.
diff --git a/app/controllers/perps/utils/hyperLiquidAbstraction.test.ts b/app/controllers/perps/utils/hyperLiquidAbstraction.test.ts
new file mode 100644
index 00000000000..553d9822ebc
--- /dev/null
+++ b/app/controllers/perps/utils/hyperLiquidAbstraction.test.ts
@@ -0,0 +1,24 @@
+import { shouldDeferUnifiedAccountSetup } from './hyperLiquidAbstraction';
+
+describe('shouldDeferUnifiedAccountSetup', () => {
+  it.each(['dexAbstraction', 'default', 'disabled'] as const)(
+    'defers %s setup when signing is not allowed',
+    (currentMode) => {
+      expect(shouldDeferUnifiedAccountSetup(currentMode, false)).toBe(true);
+    },
+  );
+
+  it.each(['dexAbstraction', 'default', 'disabled'] as const)(
+    'allows %s setup when signing is allowed',
+    (currentMode) => {
+      expect(shouldDeferUnifiedAccountSetup(currentMode, true)).toBe(false);
+    },
+  );
+
+  it.each(['unifiedAccount', 'portfolioMargin', undefined] as const)(
+    'does not defer %s because no migration is required',
+    (currentMode) => {
+      expect(shouldDeferUnifiedAccountSetup(currentMode, false)).toBe(false);
+    },
+  );
+});
diff --git a/app/controllers/perps/utils/hyperLiquidAbstraction.ts b/app/controllers/perps/utils/hyperLiquidAbstraction.ts
new file mode 100644
index 00000000000..7f45768b26a
--- /dev/null
+++ b/app/controllers/perps/utils/hyperLiquidAbstraction.ts
@@ -0,0 +1,26 @@
+import type { HyperLiquidAbstractionMode } from '../types/hyperliquid-types';
+
+const MIGRATABLE_ABSTRACTION_MODES = new Set<HyperLiquidAbstractionMode>([
+  'dexAbstraction',
+  'default',
+  'disabled',
+]);
+
+/**
+ * Determine whether unified-account setup should be deferred until a user
+ * explicitly starts a trading or withdrawal action.
+ *
+ * @param currentMode - The user's current HyperLiquid abstraction mode.
+ * @param allowUserSigning - Whether the caller is allowed to trigger wallet signing.
+ * @returns True when migration would require a signing-backed mutation that should be deferred.
+ */
+export function shouldDeferUnifiedAccountSetup(
+  currentMode: HyperLiquidAbstractionMode | undefined,
+  allowUserSigning: boolean,
+): boolean {
+  return (
+    !allowUserSigning &&
+    currentMode !== undefined &&
+    MIGRATABLE_ABSTRACTION_MODES.has(currentMode)
+  );
+}
diff --git a/app/controllers/perps/utils/hyperLiquidAdapter.ts b/app/controllers/perps/utils/hyperLiquidAdapter.ts
index 64762acc544..549fcdc351e 100644
--- a/app/controllers/perps/utils/hyperLiquidAdapter.ts
+++ b/app/controllers/perps/utils/hyperLiquidAdapter.ts
@@ -290,9 +290,10 @@ export function adaptAccountStateFromSDK(
 
   const perpsBalance = parseFloat(perpsState.marginSummary.accountValue);
 
+  const withdrawable = perpsState.withdrawable || '0';
   const accountState: AccountState = {
-    availableBalance: perpsState.withdrawable || '0',
-    availableToTradeBalance: perpsState.withdrawable || '0',
+    spendableBalance: withdrawable,
+    withdrawableBalance: withdrawable,
     totalBalance: perpsBalance.toString() || '0',
     marginUsed: perpsState.marginSummary.totalMarginUsed || '0',
     unrealizedPnl: totalUnrealizedPnl.toString() || '0',
diff --git a/app/controllers/perps/utils/hyperLiquidValidation.ts b/app/controllers/perps/utils/hyperLiquidValidation.ts
index f3d80dacdeb..cdd593c5b44 100644
--- a/app/controllers/perps/utils/hyperLiquidValidation.ts
+++ b/app/controllers/perps/utils/hyperLiquidValidation.ts
@@ -288,30 +288,30 @@ export function validateAssetSupport(
  * Validate balance against withdrawal amount.
  *
  * @param withdrawAmount - The amount to withdraw
- * @param availableBalance - The available balance
+ * @param withdrawableBalance - Max USD that can leave the venue right now
  * @param debugLogger - Optional debug logger for detailed logging
  * @returns Validation result with isValid flag and optional error message
  */
 export function validateBalance(
   withdrawAmount: number,
-  availableBalance: number,
+  withdrawableBalance: number,
   debugLogger?: ValidationDebugLogger,
 ): { isValid: boolean; error?: string } {
   debugLogger?.log('validateBalance: Checking balance sufficiency', {
     withdrawAmount,
-    availableBalance,
-    difference: availableBalance - withdrawAmount,
+    withdrawableBalance,
+    difference: withdrawableBalance - withdrawAmount,
   });
 
-  if (withdrawAmount > availableBalance) {
-    const shortfall = withdrawAmount - availableBalance;
+  if (withdrawAmount > withdrawableBalance) {
+    const shortfall = withdrawAmount - withdrawableBalance;
 
     debugLogger?.log('validateBalance: Insufficient balance', {
       error: PERPS_ERROR_CODES.WITHDRAW_INSUFFICIENT_BALANCE,
       withdrawAmount,
-      availableBalance,
+      withdrawableBalance,
       shortfall,
-      percentageOfAvailable: `${((withdrawAmount / availableBalance) * 100).toFixed(2)}%`,
+      percentageOfAvailable: `${((withdrawAmount / withdrawableBalance) * 100).toFixed(2)}%`,
     });
 
     return {
@@ -320,12 +320,12 @@ export function validateBalance(
     };
   }
 
-  const remainingBalance = availableBalance - withdrawAmount;
+  const remainingBalance = withdrawableBalance - withdrawAmount;
   debugLogger?.log('validateBalance: Balance is sufficient', {
     withdrawAmount,
-    availableBalance,
+    withdrawableBalance,
     remainingBalance,
-    percentageUsed: `${((withdrawAmount / availableBalance) * 100).toFixed(2)}%`,
+    percentageUsed: `${((withdrawAmount / withdrawableBalance) * 100).toFixed(2)}%`,
   });
 
   return { isValid: true };
diff --git a/app/controllers/perps/utils/myxAdapter.test.ts b/app/controllers/perps/utils/myxAdapter.test.ts
index c7ace150b9a..f24ff528a8a 100644
--- a/app/controllers/perps/utils/myxAdapter.test.ts
+++ b/app/controllers/perps/utils/myxAdapter.test.ts
@@ -478,7 +478,7 @@ describe('myxAdapter', () => {
 
       expect(Number(result.marginUsed)).toBe(1000);
       expect(Number(result.unrealizedPnl)).toBe(50);
-      expect(Number(result.availableBalance)).toBe(500);
+      expect(Number(result.spendableBalance)).toBe(500);
       // totalBalance = balance + marginUsed + unrealizedPnl = 500 + 1000 + 50
       expect(Number(result.totalBalance)).toBe(1550);
     });
@@ -489,13 +489,13 @@ describe('myxAdapter', () => {
       expect(Number(result.marginUsed)).toBe(0);
       expect(Number(result.unrealizedPnl)).toBe(0);
       expect(Number(result.totalBalance)).toBe(0);
-      expect(Number(result.availableBalance)).toBe(0);
+      expect(Number(result.spendableBalance)).toBe(0);
     });
 
     it('returns zeros when walletBalance is undefined', () => {
       const result = adaptAccountStateFromMYX(undefined, undefined);
 
-      expect(Number(result.availableBalance)).toBe(0);
+      expect(Number(result.spendableBalance)).toBe(0);
     });
   });
 
diff --git a/app/controllers/perps/utils/myxAdapter.ts b/app/controllers/perps/utils/myxAdapter.ts
index ee9b348ad9b..80659026ec4 100644
--- a/app/controllers/perps/utils/myxAdapter.ts
+++ b/app/controllers/perps/utils/myxAdapter.ts
@@ -462,10 +462,10 @@ export function adaptAccountStateFromMYX(
   const balance = walletBalance ? fromMYXCollateral(walletBalance) : 0;
 
   const totalBalance = balance + marginUsed + unrealizedPnl;
-  const availableBalance = balance;
 
   return {
-    availableBalance: availableBalance.toString(),
+    spendableBalance: balance.toString(),
+    withdrawableBalance: balance.toString(),
     totalBalance: totalBalance.toString(),
     marginUsed: marginUsed.toString(),
     unrealizedPnl: unrealizedPnl.toString(),
diff --git a/app/controllers/perps/utils/orderCalculations.ts b/app/controllers/perps/utils/orderCalculations.ts
index facfa45d3f3..b5e70f85ce4 100644
--- a/app/controllers/perps/utils/orderCalculations.ts
+++ b/app/controllers/perps/utils/orderCalculations.ts
@@ -30,7 +30,7 @@ type MarginRequiredParams = {
 };
 
 type MaxAllowedAmountParams = {
-  availableBalance: number;
+  spendableBalance: number;
   assetPrice: number;
   assetSzDecimals: number;
   leverage: number;
@@ -146,13 +146,13 @@ export function calculateMarginRequired(params: MarginRequiredParams): string {
 }
 
 export function getMaxAllowedAmount(params: MaxAllowedAmountParams): number {
-  const { availableBalance, assetPrice, assetSzDecimals, leverage } = params;
-  if (availableBalance === 0 || !assetPrice || assetSzDecimals === undefined) {
+  const { spendableBalance, assetPrice, assetSzDecimals, leverage } = params;
+  if (spendableBalance === 0 || !assetPrice || assetSzDecimals === undefined) {
     return 0;
   }
 
-  // The theoretical maximum is simply availableBalance * leverage
-  const theoreticalMax = availableBalance * leverage;
+  // The theoretical maximum is simply spendableBalance * leverage
+  const theoreticalMax = spendableBalance * leverage;
 
   // But we need to account for position size rounding
   // Find the largest whole dollar amount that fits within this limit
@@ -169,7 +169,7 @@ export function getMaxAllowedAmount(params: MaxAllowedAmountParams): number {
   const requiredMargin = actualNotionalValue / leverage;
 
   // If rounding caused us to exceed available balance, step down by one position increment
-  if (requiredMargin > availableBalance) {
+  if (requiredMargin > spendableBalance) {
     const minPositionSizeIncrement = 1 / Math.pow(10, assetSzDecimals);
     const positionSizeIncrementUsd = Math.ceil(
       minPositionSizeIncrement * assetPrice,
diff --git a/app/core/Analytics/MetaMetrics.events.ts b/app/core/Analytics/MetaMetrics.events.ts
index 799b583407a..0ff23276af6 100644
--- a/app/core/Analytics/MetaMetrics.events.ts
+++ b/app/core/Analytics/MetaMetrics.events.ts
@@ -645,6 +645,7 @@ enum EVENT_NAME {
   REWARDS_VERSION_GUARD_VIEWED = 'Rewards Version Guard Viewed',
   REWARDS_VERSION_GUARD_UPDATE_CLICKED = 'Rewards Version Guard Update Clicked',
   REWARDS_CAMPAIGN_OPT_IN_COMPLETED = 'Rewards Campaign Opt In Completed',
+  REWARDS_CAMPAIGN_REMINDER_SUBSCRIBED = 'Rewards Campaign Reminder Subscribed',
   REWARDS_PAGE_VIEWED = 'Rewards Page Viewed',
 
   // Predict
@@ -662,6 +663,9 @@ enum EVENT_NAME {
   // Explore Search
   EXPLORE_SEARCH_INTERACTED = 'Explore Search Interacted',
 
+  // Explore
+  EXPLORE_INTERACTED = 'Explore Page Interacted',
+
   // Market Insights
   MARKET_INSIGHTS_CARD_SCROLLED_TO_VIEW = 'Market Insights Card Scrolled to View',
   MARKET_INSIGHTS_OPENED = 'Market Insights Opened',
@@ -669,6 +673,13 @@ enum EVENT_NAME {
   MARKET_INSIGHTS_INTERACTION = 'Market Insights Interaction',
   MARKET_INSIGHTS_CLOSED = 'Market Insights Closed',
 
+  // Whats Happening
+  WHATS_HAPPENING_CARD_SCROLLED_TO_VIEW = 'Whats Happening Card Scrolled to View',
+  WHATS_HAPPENING_OPENED = 'Whats Happening Opened',
+  WHATS_HAPPENING_VIEWED = 'Whats Happening Viewed',
+  WHATS_HAPPENING_INTERACTION = 'Whats Happening Interaction',
+  WHATS_HAPPENING_CLOSED = 'Whats Happening Closed',
+
   // Share
   SHARE_ACTION = 'Share Action',
 
@@ -688,21 +699,21 @@ enum EVENT_NAME {
   MUSD_CLAIM_BONUS_BUTTON_CLICKED = 'mUSD Claim Bonus Button Clicked',
   MUSD_CLAIM_BONUS_CTA_DISPLAYED = 'mUSD Claim Bonus CTA Displayed',
   MUSD_CLAIM_BONUS_STATUS_UPDATED = 'mUSD Claim Bonus Status Updated',
-  MUSD_QUICK_CONVERT_SCREEN_VIEWED = 'mUSD Quick Convert Screen Viewed',
   MUSD_BONUS_TERMS_OF_USE_PRESSED = 'mUSD Bonus Terms of Use Pressed',
   MUSD_BONUS_LEARN_MORE_PRESSED = 'mUSD Bonus Learn More Pressed',
-  MUSD_QUICK_CONVERT_TOKEN_ROW_BUTTON_CLICKED = 'mUSD Quick Convert Token Row Button Clicked',
 
   // Money Hub
   MONEY_HUB_SCREEN_VIEWED = 'Money Hub Screen Viewed',
   MONEY_HUB_TOKEN_ROW_CONVERT_CLICKED = 'Money Hub Token Row Convert Clicked',
   MONEY_HUB_CONVERT_BUTTON_CLICKED = 'Money Hub Convert Button Clicked',
-  MONEY_HUB_LEARN_MORE_PRESSED = 'Money Hub Learn More Pressed',
   MONEY_HUB_SWAP_BUTTON_CLICKED = 'Money Hub Swap Button Clicked',
   MONEY_HUB_BUY_BUTTON_CLICKED = 'Money Hub Buy Button Clicked',
 
   // Assets
   ASSETS_FIRST_INIT_FETCH_COMPLETED = 'Assets First Init Fetch Completed',
+
+  // Activity
+  ACTIVITY_CLICKED = 'Activity Clicked',
 }
 
 export enum HARDWARE_WALLET_BUTTON_TYPE {
@@ -1649,6 +1660,16 @@ const events = {
     EVENT_NAME.MARKET_INSIGHTS_INTERACTION,
   ),
   MARKET_INSIGHTS_CLOSED: generateOpt(EVENT_NAME.MARKET_INSIGHTS_CLOSED),
+  // Whats Happening
+  WHATS_HAPPENING_CARD_SCROLLED_TO_VIEW: generateOpt(
+    EVENT_NAME.WHATS_HAPPENING_CARD_SCROLLED_TO_VIEW,
+  ),
+  WHATS_HAPPENING_OPENED: generateOpt(EVENT_NAME.WHATS_HAPPENING_OPENED),
+  WHATS_HAPPENING_VIEWED: generateOpt(EVENT_NAME.WHATS_HAPPENING_VIEWED),
+  WHATS_HAPPENING_INTERACTION: generateOpt(
+    EVENT_NAME.WHATS_HAPPENING_INTERACTION,
+  ),
+  WHATS_HAPPENING_CLOSED: generateOpt(EVENT_NAME.WHATS_HAPPENING_CLOSED),
   // Card
   CARD_BUTTON_VIEWED: generateOpt(EVENT_NAME.CARD_BUTTON_VIEWED),
   CARD_HOME_CLICKED: generateOpt(EVENT_NAME.CARD_HOME_CLICKED),
@@ -1749,6 +1770,9 @@ const events = {
   REWARDS_CAMPAIGN_OPT_IN_COMPLETED: generateOpt(
     EVENT_NAME.REWARDS_CAMPAIGN_OPT_IN_COMPLETED,
   ),
+  REWARDS_CAMPAIGN_REMINDER_SUBSCRIBED: generateOpt(
+    EVENT_NAME.REWARDS_CAMPAIGN_REMINDER_SUBSCRIBED,
+  ),
   REWARDS_PAGE_VIEWED: generateOpt(EVENT_NAME.REWARDS_PAGE_VIEWED),
   // Predict
   PREDICT_TRADE_TRANSACTION: generateOpt(EVENT_NAME.PREDICT_TRADE_TRANSACTION),
@@ -1767,6 +1791,8 @@ const events = {
 
   EXPLORE_SEARCH_INTERACTED: generateOpt(EVENT_NAME.EXPLORE_SEARCH_INTERACTED),
 
+  EXPLORE_INTERACTED: generateOpt(EVENT_NAME.EXPLORE_INTERACTED),
+
   // Share
   SHARE_ACTION: generateOpt(EVENT_NAME.SHARE_ACTION),
 
@@ -1805,18 +1831,12 @@ const events = {
   MUSD_CLAIM_BONUS_STATUS_UPDATED: generateOpt(
     EVENT_NAME.MUSD_CLAIM_BONUS_STATUS_UPDATED,
   ),
-  MUSD_QUICK_CONVERT_SCREEN_VIEWED: generateOpt(
-    EVENT_NAME.MUSD_QUICK_CONVERT_SCREEN_VIEWED,
-  ),
   MUSD_BONUS_TERMS_OF_USE_PRESSED: generateOpt(
     EVENT_NAME.MUSD_BONUS_TERMS_OF_USE_PRESSED,
   ),
   MUSD_BONUS_LEARN_MORE_PRESSED: generateOpt(
     EVENT_NAME.MUSD_BONUS_LEARN_MORE_PRESSED,
   ),
-  MUSD_QUICK_CONVERT_TOKEN_ROW_BUTTON_CLICKED: generateOpt(
-    EVENT_NAME.MUSD_QUICK_CONVERT_TOKEN_ROW_BUTTON_CLICKED,
-  ),
   MONEY_HUB_SCREEN_VIEWED: generateOpt(EVENT_NAME.MONEY_HUB_SCREEN_VIEWED),
   MONEY_HUB_TOKEN_ROW_CONVERT_CLICKED: generateOpt(
     EVENT_NAME.MONEY_HUB_TOKEN_ROW_CONVERT_CLICKED,
@@ -1824,15 +1844,13 @@ const events = {
   MONEY_HUB_CONVERT_BUTTON_CLICKED: generateOpt(
     EVENT_NAME.MONEY_HUB_CONVERT_BUTTON_CLICKED,
   ),
-  MONEY_HUB_LEARN_MORE_PRESSED: generateOpt(
-    EVENT_NAME.MONEY_HUB_LEARN_MORE_PRESSED,
-  ),
   MONEY_HUB_SWAP_BUTTON_CLICKED: generateOpt(
     EVENT_NAME.MONEY_HUB_SWAP_BUTTON_CLICKED,
   ),
   MONEY_HUB_BUY_BUTTON_CLICKED: generateOpt(
     EVENT_NAME.MONEY_HUB_BUY_BUTTON_CLICKED,
   ),
+  ACTIVITY_CLICKED: generateOpt(EVENT_NAME.ACTIVITY_CLICKED),
 };
 
 /**
diff --git a/app/core/Analytics/MetaMetrics.types.ts b/app/core/Analytics/MetaMetrics.types.ts
index abb4658e3b5..1b663295cf6 100644
--- a/app/core/Analytics/MetaMetrics.types.ts
+++ b/app/core/Analytics/MetaMetrics.types.ts
@@ -161,6 +161,7 @@ export enum MonetizedPrimitive {
   Ramps = 'ramps',
   Predict = 'predict',
   MmPay = 'mm_pay',
+  MoneyAccount = 'money_account',
 }
 
 /**
diff --git a/app/core/Analytics/events/transactions/utils.ts b/app/core/Analytics/events/transactions/utils.ts
index 08ee3f2c01a..f531ff786b1 100644
--- a/app/core/Analytics/events/transactions/utils.ts
+++ b/app/core/Analytics/events/transactions/utils.ts
@@ -23,6 +23,9 @@ export function getMonetizedPrimitive(
     case TransactionType.predictWithdraw:
     case TransactionType.predictClaim:
       return MonetizedPrimitive.Predict;
+    case TransactionType.moneyAccountDeposit:
+    case TransactionType.moneyAccountWithdraw:
+      return MonetizedPrimitive.MoneyAccount;
     default:
       return undefined;
   }
diff --git a/app/core/BackgroundBridge/BackgroundBridge.js b/app/core/BackgroundBridge/BackgroundBridge.js
index 43941a5846b..97bc46a9eaf 100644
--- a/app/core/BackgroundBridge/BackgroundBridge.js
+++ b/app/core/BackgroundBridge/BackgroundBridge.js
@@ -217,13 +217,10 @@ export class BackgroundBridge extends EventEmitter {
       this.sendStateUpdate,
     );
 
-    Engine.controllerMessenger.subscribe(
-      'KeyringController:lock',
-      this.onLock.bind(this),
-    );
+    Engine.controllerMessenger.subscribe('KeyringController:lock', this.onLock);
     Engine.controllerMessenger.subscribe(
       'KeyringController:unlock',
-      this.onUnlock.bind(this),
+      this.onUnlock,
     );
 
     // Enable multichain functionality for all connections except for WalletConnect and MMSDK v1.
@@ -250,17 +247,18 @@ export class BackgroundBridge extends EventEmitter {
     try {
       const pc = Engine.context.PermissionController;
       const controllerMessenger = Engine.controllerMessenger;
+      this._handlePermissionControllerStateChange = (subjectWithPermission) => {
+        DevLogger.log(
+          `PermissionController:stateChange event`,
+          subjectWithPermission,
+        );
+        // Inform dapp about updated permissions
+        const selectedAddress = this.getState().selectedAddress;
+        this.notifySelectedAddressChanged(selectedAddress);
+      };
       controllerMessenger.subscribe(
         `${pc.name}:stateChange`,
-        (subjectWithPermission) => {
-          DevLogger.log(
-            `PermissionController:stateChange event`,
-            subjectWithPermission,
-          );
-          // Inform dapp about updated permissions
-          const selectedAddress = this.getState().selectedAddress;
-          this.notifySelectedAddressChanged(selectedAddress);
-        },
+        this._handlePermissionControllerStateChange,
         (state) => state.subjects[this.channelId],
       );
     } catch (err) {
@@ -287,7 +285,7 @@ export class BackgroundBridge extends EventEmitter {
     return this.isWalletConnect || this.isMMSDK ? this.channelId : this.origin;
   }
 
-  onUnlock() {
+  onUnlock = () => {
     // TODO UNSUBSCRIBE EVENT INSTEAD
     if (this.disconnected) return;
 
@@ -302,9 +300,9 @@ export class BackgroundBridge extends EventEmitter {
       method: NOTIFICATION_NAMES.unlockStateChanged,
       params: true,
     });
-  }
+  };
 
-  onLock() {
+  onLock = () => {
     // TODO UNSUBSCRIBE EVENT INSTEAD
     if (this.disconnected) return;
 
@@ -319,7 +317,7 @@ export class BackgroundBridge extends EventEmitter {
       method: NOTIFICATION_NAMES.unlockStateChanged,
       params: false,
     });
-  }
+  };
 
   async getProviderNetworkState(
     origin = METAMASK_DOMAIN,
@@ -490,11 +488,14 @@ export class BackgroundBridge extends EventEmitter {
   };
 
   onDisconnect = () => {
+    if (this.disconnected) return;
+    this.disconnected = true;
+
     const {
       controllerMessenger,
       context: { AccountsController, PermissionController },
     } = Engine;
-    this.disconnected = true;
+
     controllerMessenger.tryUnsubscribe(
       AppConstants.NETWORK_STATE_CHANGE_EVENT,
       this.sendStateUpdate,
@@ -507,41 +508,53 @@ export class BackgroundBridge extends EventEmitter {
       'AccountsController:selectedAccountChange',
       this.sendStateUpdate,
     );
+    controllerMessenger.tryUnsubscribe(
+      'SelectedNetworkController:stateChange',
+      this.sendStateUpdate,
+    );
+    controllerMessenger.tryUnsubscribe('KeyringController:lock', this.onLock);
+    controllerMessenger.tryUnsubscribe(
+      'KeyringController:unlock',
+      this.onUnlock,
+    );
+    controllerMessenger.tryUnsubscribe(
+      `${PermissionController.name}:stateChange`,
+      this._handlePermissionControllerStateChange,
+    );
 
-    // Enable multichain functionality for all connections except for WalletConnect and MMSDK v1.
     if (!(this.isMMSDK && this.sdkVersion === 'v1') && !this.isWalletConnect) {
-      controllerMessenger.unsubscribe(
+      controllerMessenger.tryUnsubscribe(
         `${PermissionController.name}:stateChange`,
         this.handleCaipSessionScopeChanges,
       );
-      controllerMessenger.unsubscribe(
+      controllerMessenger.tryUnsubscribe(
         `${PermissionController.name}:stateChange`,
         this.handleSolanaAccountChangedFromScopeChanges,
       );
-      controllerMessenger.unsubscribe(
+      controllerMessenger.tryUnsubscribe(
         `${AccountsController.name}:selectedAccountChange`,
         this.handleSolanaAccountChangedFromSelectedAccountChanges,
       );
-      controllerMessenger.unsubscribe(
+      controllerMessenger.tryUnsubscribe(
         `${AccountTreeController.name}:selectedAccountGroupChange`,
         this.handleSolanaAccountChangedFromSelectedAccountGroupChanges,
       );
       ///: BEGIN:ONLY_INCLUDE_IF(tron)
-      controllerMessenger.unsubscribe(
+      controllerMessenger.tryUnsubscribe(
         `${PermissionController.name}:stateChange`,
         this.handleTronAccountChangedFromScopeChanges,
       );
-      controllerMessenger.unsubscribe(
+      controllerMessenger.tryUnsubscribe(
         `${AccountsController.name}:selectedAccountChange`,
         this.handleTronAccountChangedFromSelectedAccountChanges,
       );
-      controllerMessenger.unsubscribe(
+      controllerMessenger.tryUnsubscribe(
         `${AccountTreeController.name}:selectedAccountGroupChange`,
         this.handleTronAccountChangedFromSelectedAccountGroupChanges,
       );
       ///: END:ONLY_INCLUDE_IF
 
-      controllerMessenger.unsubscribe(
+      controllerMessenger.tryUnsubscribe(
         `${AccountTreeController.name}:selectedAccountGroupChange`,
         this.handleSessionChangedFromSelectedAccountGroupChanges,
       );
diff --git a/app/core/BackgroundBridge/BackgroundBridge.test.js b/app/core/BackgroundBridge/BackgroundBridge.test.js
index 7d42135159c..89552b78217 100644
--- a/app/core/BackgroundBridge/BackgroundBridge.test.js
+++ b/app/core/BackgroundBridge/BackgroundBridge.test.js
@@ -46,12 +46,14 @@ jest.mock('../Engine', () => ({
   },
   context: {
     AccountsController: {
+      name: 'AccountsController',
       listAccounts: jest.fn(),
       listMultichainAccounts: jest.fn(),
       getSelectedAccount: jest.fn(),
       getAccountByAddress: jest.fn(),
     },
     PermissionController: {
+      name: 'PermissionController',
       createPermissionMiddleware: jest.fn(),
       requestPermissions: jest.fn(),
       getCaveat: jest.fn(),
@@ -275,7 +277,7 @@ describe('BackgroundBridge', () => {
         chainId: '0x2',
         networkVersion: '2',
       };
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const mmBridge = setupBackgroundBridge(url, true);
       // Mock the getProviderNetworkState method to return the expected network state
@@ -305,7 +307,7 @@ describe('BackgroundBridge', () => {
         chainId: '0x1',
         networkVersion: '1',
       };
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(bridge, 'sendNotificationEip1193');
       const getProviderSpy = jest.spyOn(bridge, 'getProviderNetworkState');
@@ -435,7 +437,7 @@ describe('BackgroundBridge', () => {
 
   describe('notifySolanaAccountChangedForCurrentAccount', () => {
     it('emits nothing if there is no CAIP-25 permission', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -448,7 +450,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if there are no permitted solana scopes and `solana_accountChanged_notifications` session property is set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -476,7 +478,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if there are permitted solana accounts, but the `solana_accountChanged_notifications` session property is not set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -502,7 +504,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if there are permitted solana scopes but no accounts and the `solana_accountChanged_notifications` session property is set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -530,7 +532,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits a solana accountChanged event when there are permitted solana accounts and the `solana_accountChanged_notifications` session property is set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -567,7 +569,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('prioritizes solana account from selected account group over scope accounts', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -615,7 +617,7 @@ describe('BackgroundBridge', () => {
 
   describe('handleSolanaAccountChangedFromScopeChanges', () => {
     it('emits nothing if the current and previous permissions both did not have `solana_accountChanged_notifications` session property set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -653,7 +655,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if currently and previously selected solana accounts did not change', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -695,7 +697,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits the currently selected solana account if the currently selected solana accounts did change', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -748,7 +750,7 @@ describe('BackgroundBridge', () => {
 
   describe('handleSolanaAccountChangedFromSelectedAccountChanges', () => {
     it('emits nothing if the selected account is not a solana account', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -779,7 +781,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if the selected account did not change from the last seen solana account', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -811,7 +813,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if there is no CAIP-25 permission', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -828,7 +830,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if the `solana_accountChanged_notifications` session property is not set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -857,7 +859,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if the selected account does not match a permitted solana account', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -888,7 +890,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits a solana accountChanged event for the selected account if it does match a permitted solana account', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -934,7 +936,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing when AccountTreeController returns no accounts', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const handleSolanaAccountSpy = jest.spyOn(
         bridge,
@@ -953,7 +955,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing when AccountTreeController returns only non-Solana accounts', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const handleSolanaAccountSpy = jest.spyOn(
         bridge,
@@ -977,7 +979,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('calls handleSolanaAccountChangedFromSelectedAccountChanges when AccountTreeController returns a Solana account', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const handleSolanaAccountSpy = jest.spyOn(
         bridge,
@@ -1002,7 +1004,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('processes only the first Solana account when multiple valid Solana accounts exist', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const handleSolanaAccountSpy = jest.spyOn(
         bridge,
@@ -1041,7 +1043,7 @@ describe('BackgroundBridge', () => {
 
   describe('notifyTronAccountChangedForCurrentAccount', () => {
     it('emits nothing if there is no CAIP-25 permission', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1054,7 +1056,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if there are no permitted tron scopes and `tron_accountChanged_notifications` session property is set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1082,7 +1084,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if there are permitted tron accounts, but the `tron_accountChanged_notifications` session property is not set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1108,7 +1110,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if there are permitted tron scopes but no accounts and the `tron_accountChanged_notifications` session property is set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1136,7 +1138,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits a tron accountChanged event when there are permitted tron accounts and the `tron_accountChanged_notifications` session property is set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1173,7 +1175,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('prioritizes tron account from selected account group over scope accounts', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1219,7 +1221,7 @@ describe('BackgroundBridge', () => {
 
   describe('handleTronAccountChangedFromScopeChanges', () => {
     it('emits nothing if the current and previous permissions both did not have `tron_accountChanged_notifications` session property set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1257,7 +1259,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if currently and previously selected tron accounts did not change', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1299,7 +1301,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits the currently selected tron account if the currently selected tron accounts did change', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1352,7 +1354,7 @@ describe('BackgroundBridge', () => {
 
   describe('handleTronAccountChangedFromSelectedAccountChanges', () => {
     it('emits nothing if the selected account is not a tron account', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1383,7 +1385,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if the selected account did not change from the last seen tron account', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1415,7 +1417,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if there is no CAIP-25 permission', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1432,7 +1434,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if the `tron_accountChanged_notifications` session property is not set', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1461,7 +1463,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing if the selected account does not match a permitted tron account', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1492,7 +1494,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits a tron accountChanged event for the selected account if it does match a permitted tron account', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const sendNotificationSpy = jest.spyOn(
         bridge,
@@ -1538,7 +1540,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing when AccountTreeController returns no accounts', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const handleTronAccountSpy = jest.spyOn(
         bridge,
@@ -1557,7 +1559,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('emits nothing when AccountTreeController returns only non-Tron accounts', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const handleTronAccountSpy = jest.spyOn(
         bridge,
@@ -1581,7 +1583,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('calls handleTronAccountChangedFromSelectedAccountChanges when AccountTreeController returns a Tron account', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const handleTronAccountSpy = jest.spyOn(
         bridge,
@@ -1606,7 +1608,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('processes only the first Tron account when multiple valid Tron accounts exist', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const handleTronAccountSpy = jest.spyOn(
         bridge,
@@ -1643,6 +1645,84 @@ describe('BackgroundBridge', () => {
     });
   });
 
+  describe('onDisconnect', () => {
+    const eventsUnsubscribedByStableRef = [
+      [AppConstants.NETWORK_STATE_CHANGE_EVENT],
+      ['PreferencesController:stateChange'],
+      ['AccountsController:selectedAccountChange'],
+      ['SelectedNetworkController:stateChange'],
+      ['KeyringController:lock'],
+      ['KeyringController:unlock'],
+    ];
+
+    it.each(eventsUnsubscribedByStableRef)(
+      'unsubscribes from %s using the handler reference that was subscribed',
+      (eventName) => {
+        const bridge = setupBackgroundBridge('https://www.mock.io');
+        const subscribeCall =
+          Engine.controllerMessenger.subscribe.mock.calls.find(
+            (call) => call[0] === eventName,
+          );
+        expect(subscribeCall).toBeDefined();
+        const subscribedHandler = subscribeCall[1];
+
+        bridge.onDisconnect();
+
+        expect(Engine.controllerMessenger.tryUnsubscribe).toHaveBeenCalledWith(
+          eventName,
+          subscribedHandler,
+        );
+      },
+    );
+
+    it('unsubscribes every PermissionController:stateChange handler that was subscribed in the constructor', () => {
+      const bridge = setupBackgroundBridge('https://www.mock.io');
+      const subscribedHandlers = Engine.controllerMessenger.subscribe.mock.calls
+        .filter((call) => call[0] === 'PermissionController:stateChange')
+        .map((call) => call[1]);
+
+      expect(subscribedHandlers.length).toBeGreaterThan(0);
+
+      bridge.onDisconnect();
+
+      const unsubscribedHandlers = [
+        ...Engine.controllerMessenger.tryUnsubscribe.mock.calls,
+        ...Engine.controllerMessenger.unsubscribe.mock.calls,
+      ]
+        .filter((call) => call[0] === 'PermissionController:stateChange')
+        .map((call) => call[1]);
+
+      subscribedHandlers.forEach((handler) => {
+        expect(unsubscribedHandlers).toContain(handler);
+      });
+    });
+
+    it('does not throw when called multiple times', () => {
+      const bridge = setupBackgroundBridge('https://www.mock.io');
+
+      expect(() => {
+        bridge.onDisconnect();
+        bridge.onDisconnect();
+      }).not.toThrow();
+    });
+
+    it('does not repeat teardown work on subsequent calls', () => {
+      const bridge = setupBackgroundBridge('https://www.mock.io');
+
+      bridge.onDisconnect();
+      const firstCallCount =
+        Engine.controllerMessenger.tryUnsubscribe.mock.calls.length +
+        Engine.controllerMessenger.unsubscribe.mock.calls.length;
+
+      bridge.onDisconnect();
+      const secondCallCount =
+        Engine.controllerMessenger.tryUnsubscribe.mock.calls.length +
+        Engine.controllerMessenger.unsubscribe.mock.calls.length;
+
+      expect(secondCallCount).toBe(firstCallCount);
+    });
+  });
+
   describe('handleSessionChangedFromSelectedAccountGroupChanges', () => {
     beforeEach(() => {
       jest.useFakeTimers();
@@ -1655,7 +1735,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('does nothing if there is no CAIP-25 permission', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       bridge.multichainEngine = { emit: jest.fn() };
 
@@ -1670,7 +1750,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('does nothing if getCaveat returns falsy', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       bridge.multichainEngine = { emit: jest.fn() };
 
@@ -1683,7 +1763,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('calls notifyCaipAuthorizationChange with the refetched caveat value', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const notifySpy = jest.spyOn(bridge, 'notifyCaipAuthorizationChange');
 
@@ -1730,7 +1810,7 @@ describe('BackgroundBridge', () => {
     });
 
     it('does not call notifyCaipAuthorizationChange if the caveat is revoked before the setTimeout fires', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const notifySpy = jest.spyOn(bridge, 'notifyCaipAuthorizationChange');
 
@@ -1763,7 +1843,7 @@ describe('BackgroundBridge', () => {
 
   describe('notifyCaipAuthorizationChange', () => {
     it('emits a wallet_sessionChanged notification with session scopes', () => {
-      const url = 'https:www.mock.io';
+      const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       bridge.multichainEngine = { emit: jest.fn() };
 
diff --git a/app/core/BackupVault/backupVault.test.ts b/app/core/BackupVault/backupVault.test.ts
index a3af35265b9..2273ee96ad5 100644
--- a/app/core/BackupVault/backupVault.test.ts
+++ b/app/core/BackupVault/backupVault.test.ts
@@ -186,6 +186,32 @@ describe('backupVault file', () => {
       expect(response).toEqual(mockedSuccessResponse);
     });
 
+    it('should still succeed if reading the existing backup throws (e.g. Android Keystore key invalidation)', async () => {
+      const newVault = 'new-vault';
+
+      // Simulate a stale entry already in the keychain
+      await setInternetCredentials(
+        VAULT_BACKUP_KEY,
+        VAULT_BACKUP_KEY,
+        dummyPassword,
+      );
+
+      // Simulate Android Keystore throwing on the read
+      (getInternetCredentials as jest.Mock).mockImplementationOnce(() => {
+        throw new Error('Android Keystore key permanently invalidated');
+      });
+
+      const keyringState: KeyringControllerState = {
+        vault: newVault,
+        keyrings: [],
+        isUnlocked: false,
+      };
+
+      const response = await backupVault(keyringState);
+
+      expect(response).toEqual({ success: true, vault: newVault });
+    });
+
     it('should reset vault before backup', async () => {
       const mockedSuccessResponse = { success: true };
 
diff --git a/app/core/BackupVault/backupVault.ts b/app/core/BackupVault/backupVault.ts
index 600fd4569a3..2773905e9f2 100644
--- a/app/core/BackupVault/backupVault.ts
+++ b/app/core/BackupVault/backupVault.ts
@@ -65,7 +65,20 @@ export async function backupVault(
 
   try {
     // Does a primary backup exist?
-    const existingBackup = await getInternetCredentials(VAULT_BACKUP_KEY);
+    // Wrapped in its own try/catch because Android Keystore key invalidation
+    // (e.g. biometric enrollment change, Android 16 behavioural change) causes
+    // getInternetCredentials to throw rather than return false/undefined.
+    // If the read fails we treat it as "no existing backup" so the fresh
+    // backup can still be written below.
+    let existingBackup;
+    try {
+      existingBackup = await getInternetCredentials(VAULT_BACKUP_KEY);
+    } catch (readError) {
+      Logger.log(
+        readError,
+        'backupVault: failed to read existing backup, proceeding with fresh backup',
+      );
+    }
 
     // An existing backup exists, backup it to the temp key
     if (existingBackup && existingBackup.password) {
diff --git a/app/core/DeeplinkManager/handlers/legacy/__tests__/handleSocialLeaderboardUrl.test.ts b/app/core/DeeplinkManager/handlers/legacy/__tests__/handleSocialLeaderboardUrl.test.ts
new file mode 100644
index 00000000000..7d57c32e94c
--- /dev/null
+++ b/app/core/DeeplinkManager/handlers/legacy/__tests__/handleSocialLeaderboardUrl.test.ts
@@ -0,0 +1,23 @@
+import NavigationService from '../../../../NavigationService';
+import Routes from '../../../../../constants/navigation/Routes';
+import { handleSocialLeaderboardUrl } from '../handleSocialLeaderboardUrl';
+
+jest.mock('../../../../NavigationService', () => ({
+  navigation: {
+    navigate: jest.fn(),
+  },
+}));
+
+describe('handleSocialLeaderboardUrl', () => {
+  const mockNavigate = NavigationService.navigation.navigate as jest.Mock;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('navigates to the social leaderboard view', () => {
+    handleSocialLeaderboardUrl();
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.SOCIAL_LEADERBOARD.VIEW);
+  });
+});
diff --git a/app/core/DeeplinkManager/handlers/legacy/__tests__/handleUniversalLink.test.ts b/app/core/DeeplinkManager/handlers/legacy/__tests__/handleUniversalLink.test.ts
index 223b5dc7b61..045e37f1d51 100644
--- a/app/core/DeeplinkManager/handlers/legacy/__tests__/handleUniversalLink.test.ts
+++ b/app/core/DeeplinkManager/handlers/legacy/__tests__/handleUniversalLink.test.ts
@@ -16,6 +16,7 @@ import handleBrowserUrl from '../handleBrowserUrl';
 import { DeepLinkModalLinkType } from '../../../../../components/UI/DeepLinkModal';
 import handleMetaMaskDeeplink from '../handleMetaMaskDeeplink';
 import { SHIELD_WEBSITE_URL } from '../../../../../constants/shield';
+import { handleSocialLeaderboardUrl } from '../handleSocialLeaderboardUrl';
 import { handleSocialTraderPositionUrl } from '../handleSocialTraderPositionUrl';
 // eslint-disable-next-line import-x/no-namespace
 import * as signatureUtils from '../../../utils/verifySignature';
@@ -41,6 +42,7 @@ jest.mock('../handleRewardsUrl');
 jest.mock('../handlePredictUrl');
 jest.mock('../handleFastOnboarding');
 jest.mock('../handleTrendingUrl');
+jest.mock('../handleSocialLeaderboardUrl');
 jest.mock('../handleSocialTraderPositionUrl');
 jest.mock('../../../../redux', () => ({
   __esModule: true,
@@ -861,6 +863,32 @@ describe('handleUniversalLink', () => {
     });
   });
 
+  describe('ACTIONS.SOCIAL_LEADERBOARD', () => {
+    it('navigates to social leaderboard without showing interstitial', async () => {
+      const leaderboardUrl = `${PROTOCOLS.HTTPS}://${AppConstants.MM_UNIVERSAL_LINK_HOST}/${ACTIONS.SOCIAL_LEADERBOARD}?ignored=true`;
+      const leaderboardUrlObj = {
+        ...urlObj,
+        hostname: AppConstants.MM_UNIVERSAL_LINK_HOST,
+        href: leaderboardUrl,
+        pathname: `/${ACTIONS.SOCIAL_LEADERBOARD}`,
+        search: '?ignored=true',
+      };
+
+      await handleUniversalLink({
+        instance,
+        handled,
+        urlObj: leaderboardUrlObj,
+        browserCallBack: mockBrowserCallBack,
+        url: leaderboardUrl,
+        source: 'test-source',
+      });
+
+      expect(mockHandleDeepLinkModalDisplay).not.toHaveBeenCalled();
+      expect(handleSocialLeaderboardUrl).toHaveBeenCalledTimes(1);
+      expect(handled).toHaveBeenCalled();
+    });
+  });
+
   describe('ACTIONS.WC', () => {
     const testCases = [
       {
diff --git a/app/core/DeeplinkManager/handlers/legacy/handleRewardsUrl.ts b/app/core/DeeplinkManager/handlers/legacy/handleRewardsUrl.ts
index 5801fde33d7..ba9c24ac4f8 100644
--- a/app/core/DeeplinkManager/handlers/legacy/handleRewardsUrl.ts
+++ b/app/core/DeeplinkManager/handlers/legacy/handleRewardsUrl.ts
@@ -18,7 +18,7 @@ interface HandleRewardsUrlParams {
 interface RewardsNavigationParams {
   referral?: string;
   page?: 'campaigns' | 'musd' | 'benefits';
-  campaign?: 'ondo' | 'season1';
+  campaign?: 'ondo' | 'season1' | 'perps-comp';
 }
 
 /**
@@ -34,7 +34,7 @@ const parseRewardsNavigationParams = (
   );
 
   const pageParam = urlParams.get('page');
-  const campaignParam = urlParams.get('campaign');
+  const campaignParam = urlParams.get('campaign') ?? urlParams.get('~campaign');
 
   return {
     referral:
@@ -43,7 +43,7 @@ const parseRewardsNavigationParams = (
     page: (['campaigns', 'musd', 'benefits'].includes(pageParam ?? '')
       ? pageParam
       : undefined) as RewardsNavigationParams['page'],
-    campaign: (['ondo', 'season1'].includes(campaignParam ?? '')
+    campaign: (['ondo', 'season1', 'perps-comp'].includes(campaignParam ?? '')
       ? campaignParam
       : undefined) as RewardsNavigationParams['campaign'],
   };
diff --git a/app/core/DeeplinkManager/handlers/legacy/handleSocialLeaderboardUrl.ts b/app/core/DeeplinkManager/handlers/legacy/handleSocialLeaderboardUrl.ts
new file mode 100644
index 00000000000..d58c65c10ce
--- /dev/null
+++ b/app/core/DeeplinkManager/handlers/legacy/handleSocialLeaderboardUrl.ts
@@ -0,0 +1,6 @@
+import Routes from '../../../../constants/navigation/Routes';
+import NavigationService from '../../../NavigationService';
+
+export const handleSocialLeaderboardUrl = () => {
+  NavigationService.navigation.navigate(Routes.SOCIAL_LEADERBOARD.VIEW);
+};
diff --git a/app/core/DeeplinkManager/handlers/legacy/handleUniversalLink.ts b/app/core/DeeplinkManager/handlers/legacy/handleUniversalLink.ts
index 1ce38637483..28e404d2f2e 100644
--- a/app/core/DeeplinkManager/handlers/legacy/handleUniversalLink.ts
+++ b/app/core/DeeplinkManager/handlers/legacy/handleUniversalLink.ts
@@ -30,6 +30,7 @@ import { handleCardOnboarding } from './handleCardOnboarding';
 import { handleCardHome } from './handleCardHome';
 import { handleCardKycNotification } from './handleCardKycNotification';
 import { handleTrendingUrl } from './handleTrendingUrl';
+import { handleSocialLeaderboardUrl } from './handleSocialLeaderboardUrl';
 import { handleSocialTraderPositionUrl } from './handleSocialTraderPositionUrl';
 import { handleEarnMusd } from './handleEarnMusd';
 import { handleAssetUrl } from './handleAssetUrl';
@@ -85,6 +86,7 @@ const SUPPORTED_ACTIONS = {
   CARD_HOME: ACTIONS.CARD_HOME,
   CARD_KYC_NOTIFICATION: ACTIONS.CARD_KYC_NOTIFICATION,
   TRENDING: ACTIONS.TRENDING,
+  SOCIAL_LEADERBOARD: ACTIONS.SOCIAL_LEADERBOARD,
   SOCIAL_TRADER_POSITION: ACTIONS.SOCIAL_TRADER_POSITION,
   SHIELD: ACTIONS.SHIELD,
   EARN_MUSD: ACTIONS.EARN_MUSD,
@@ -118,6 +120,7 @@ const WHITELISTED_ACTIONS: SUPPORTED_ACTIONS[] = [
   SUPPORTED_ACTIONS.SELL,
   SUPPORTED_ACTIONS.SELL_CRYPTO,
   SUPPORTED_ACTIONS.TRENDING,
+  SUPPORTED_ACTIONS.SOCIAL_LEADERBOARD,
   SUPPORTED_ACTIONS.SOCIAL_TRADER_POSITION,
   SUPPORTED_ACTIONS.SHIELD,
   SUPPORTED_ACTIONS.EARN_MUSD,
@@ -636,6 +639,10 @@ async function handleUniversalLink({
       });
       break;
     }
+    case SUPPORTED_ACTIONS.SOCIAL_LEADERBOARD: {
+      handleSocialLeaderboardUrl();
+      break;
+    }
     case SUPPORTED_ACTIONS.SOCIAL_TRADER_POSITION: {
       handleSocialTraderPositionUrl({
         actionPath: actionBasedRampPath,
diff --git a/app/core/DeeplinkManager/types/deepLink.types.ts b/app/core/DeeplinkManager/types/deepLink.types.ts
index b799f122894..c78941890a5 100644
--- a/app/core/DeeplinkManager/types/deepLink.types.ts
+++ b/app/core/DeeplinkManager/types/deepLink.types.ts
@@ -132,6 +132,7 @@ export const SUPPORTED_ACTIONS = [
   ACTIONS.ONBOARDING,
   ACTIONS.PREDICT,
   ACTIONS.TRENDING,
+  ACTIONS.SOCIAL_LEADERBOARD,
   ACTIONS.SOCIAL_TRADER_POSITION,
   ACTIONS.CARD_ONBOARDING,
   ACTIONS.CARD_HOME,
diff --git a/app/core/DeeplinkManager/types/deepLinkAnalytics.types.ts b/app/core/DeeplinkManager/types/deepLinkAnalytics.types.ts
index 34806e6b770..82a69c8245d 100644
--- a/app/core/DeeplinkManager/types/deepLinkAnalytics.types.ts
+++ b/app/core/DeeplinkManager/types/deepLinkAnalytics.types.ts
@@ -51,6 +51,7 @@ export enum DeepLinkRoute {
   PREDICT = 'predict',
   SHIELD = 'shield',
   TRENDING = 'trending',
+  SOCIAL_LEADERBOARD = 'social-leaderboard',
   SOCIAL_TRADER_POSITION = 'social-trader-position',
   CARD_ONBOARDING = 'card-onboarding',
   CARD_HOME = 'card-home',
diff --git a/app/core/DeeplinkManager/util/deeplinks/deepLinkAnalytics.test.ts b/app/core/DeeplinkManager/util/deeplinks/deepLinkAnalytics.test.ts
index 66ba76554be..6d3cc82f4ec 100644
--- a/app/core/DeeplinkManager/util/deeplinks/deepLinkAnalytics.test.ts
+++ b/app/core/DeeplinkManager/util/deeplinks/deepLinkAnalytics.test.ts
@@ -455,6 +455,7 @@ describe('deepLinkAnalytics', () => {
       [ACTIONS.DAPP, DeepLinkRoute.DAPP],
       [ACTIONS.WC, DeepLinkRoute.WC],
       [ACTIONS.CREATE_ACCOUNT, DeepLinkRoute.CREATE_ACCOUNT],
+      [ACTIONS.SOCIAL_LEADERBOARD, DeepLinkRoute.SOCIAL_LEADERBOARD],
       [ACTIONS.SOCIAL_TRADER_POSITION, DeepLinkRoute.SOCIAL_TRADER_POSITION],
     ] as const)(
       'maps action %s to its corresponding route',
@@ -527,6 +528,13 @@ describe('deepLinkAnalytics', () => {
       expect(result).toBe(DeepLinkRoute.SOCIAL_TRADER_POSITION);
     });
 
+    it('extract social leaderboard route', () => {
+      const result = extractRouteFromUrl(
+        'https://link.metamask.io/social-leaderboard?ignored=true',
+      );
+      expect(result).toBe(DeepLinkRoute.SOCIAL_LEADERBOARD);
+    });
+
     it('extract home route for empty path', () => {
       const result = extractRouteFromUrl('https://link.metamask.io/');
       expect(result).toBe(DeepLinkRoute.HOME);
diff --git a/app/core/DeeplinkManager/util/deeplinks/deepLinkAnalytics.ts b/app/core/DeeplinkManager/util/deeplinks/deepLinkAnalytics.ts
index 3510dd289f6..685599c60fc 100644
--- a/app/core/DeeplinkManager/util/deeplinks/deepLinkAnalytics.ts
+++ b/app/core/DeeplinkManager/util/deeplinks/deepLinkAnalytics.ts
@@ -463,6 +463,7 @@ const routeExtractors: Record<
   [DeepLinkRoute.PREDICT]: extractPredictProperties,
   [DeepLinkRoute.SHIELD]: extractShieldProperties,
   [DeepLinkRoute.TRENDING]: extractTrendingProperties,
+  [DeepLinkRoute.SOCIAL_LEADERBOARD]: extractInvalidProperties,
   [DeepLinkRoute.SOCIAL_TRADER_POSITION]: extractInvalidProperties,
   [DeepLinkRoute.CARD_ONBOARDING]: extractCardOnboardingProperties,
   [DeepLinkRoute.CARD_HOME]: extractCardHomeProperties,
@@ -594,6 +595,8 @@ export const mapSupportedActionToRoute = (
       return DeepLinkRoute.SHIELD;
     case ACTIONS.TRENDING:
       return DeepLinkRoute.TRENDING;
+    case ACTIONS.SOCIAL_LEADERBOARD:
+      return DeepLinkRoute.SOCIAL_LEADERBOARD;
     case ACTIONS.SOCIAL_TRADER_POSITION:
       return DeepLinkRoute.SOCIAL_TRADER_POSITION;
     case ACTIONS.CARD_ONBOARDING:
@@ -650,6 +653,8 @@ export const extractRouteFromUrl = (url: string): DeepLinkRoute => {
         return DeepLinkRoute.SHIELD;
       case 'trending':
         return DeepLinkRoute.TRENDING;
+      case 'social-leaderboard':
+        return DeepLinkRoute.SOCIAL_LEADERBOARD;
       case 'social-trader-position':
         return DeepLinkRoute.SOCIAL_TRADER_POSITION;
       case 'card-onboarding':
diff --git a/app/core/Engine/Engine.test.ts b/app/core/Engine/Engine.test.ts
index ccd3dc512ee..d623d9aaa01 100644
--- a/app/core/Engine/Engine.test.ts
+++ b/app/core/Engine/Engine.test.ts
@@ -21,6 +21,7 @@ import ReduxService from '../redux';
 import configureStore from '../../util/test/configureStore';
 import { SnapKeyring } from '@metamask/eth-snap-keyring';
 import { isEmpty } from 'lodash';
+import { store } from '../../store';
 
 jest.mock('react-native-device-info', () => ({
   getVersion: jest.fn().mockReturnValue('7.44.0'),
@@ -512,23 +513,29 @@ describe('Engine', () => {
     };
 
     it('calculates when theres no balances', () => {
-      const engine = Engine.init(
-        TEST_ANALYTICS_ID,
-        {
-          ...state,
-          AccountTrackerController: {
-            accountsByChainId: {
-              [chainId]: {
-                [selectedAddress]: {
-                  balance: '0',
-                  stakedBalance: '0',
+      const engine = Engine.init(TEST_ANALYTICS_ID, state);
+
+      (store.getState as jest.Mock).mockReturnValueOnce({
+        onboarding: {
+          completedOnboarding: true,
+        },
+        engine: {
+          backgroundState: {
+            ...state,
+            AccountTrackerController: {
+              accountsByChainId: {
+                [chainId]: {
+                  [selectedAddress]: {
+                    balance: '0',
+                    stakedBalance: '0',
+                  },
                 },
               },
             },
           },
         },
-        null,
-      );
+      });
+
       const totalFiatBalance = engine.getTotalEvmFiatAccountBalance();
       expect(totalFiatBalance).toStrictEqual({
         ethFiat: 0,
@@ -543,22 +550,27 @@ describe('Engine', () => {
     it('calculates when theres only ETH', () => {
       const ethPricePercentChange1d = 5; // up 5%
 
-      const engine = Engine.init(
-        TEST_ANALYTICS_ID,
-        {
-          ...state,
-          TokenRatesController: {
-            marketData: {
-              [chainId]: {
-                [zeroAddress()]: {
-                  pricePercentChange1d: ethPricePercentChange1d,
-                } as Partial<MarketDataDetails> as MarketDataDetails,
+      const engine = Engine.init(TEST_ANALYTICS_ID, state);
+
+      (store.getState as jest.Mock).mockReturnValueOnce({
+        onboarding: {
+          completedOnboarding: true,
+        },
+        engine: {
+          backgroundState: {
+            ...state,
+            TokenRatesController: {
+              marketData: {
+                [chainId]: {
+                  [zeroAddress()]: {
+                    pricePercentChange1d: ethPricePercentChange1d,
+                  } as Partial<MarketDataDetails> as MarketDataDetails,
+                },
               },
             },
           },
         },
-        null,
-      );
+      });
 
       const totalFiatBalance = engine.getTotalEvmFiatAccountBalance();
 
@@ -598,56 +610,61 @@ describe('Engine', () => {
         },
       ];
 
-      const engine = Engine.init(
-        TEST_ANALYTICS_ID,
-        {
-          ...state,
-          TokensController: {
-            allTokens: {
-              [chainId]: {
-                [selectedAddress]: tokens.map(
-                  ({ address, balance, decimals, symbol }) => ({
-                    address,
-                    balance,
-                    decimals,
-                    symbol,
-                  }),
-                ),
+      const engine = Engine.init(TEST_ANALYTICS_ID, state);
+
+      (store.getState as jest.Mock).mockReturnValueOnce({
+        onboarding: {
+          completedOnboarding: true,
+        },
+        engine: {
+          backgroundState: {
+            ...state,
+            TokensController: {
+              allTokens: {
+                [chainId]: {
+                  [selectedAddress]: tokens.map(
+                    ({ address, balance, decimals, symbol }) => ({
+                      address,
+                      balance,
+                      decimals,
+                      symbol,
+                    }),
+                  ),
+                },
               },
+              allIgnoredTokens: {},
+              allDetectedTokens: {},
             },
-            allIgnoredTokens: {},
-            allDetectedTokens: {},
-          },
-          TokenBalancesController: {
-            tokenBalances: {
-              [selectedAddress as Hex]: {
-                [chainId]: {
-                  [token1Address]: '0x0de0b6b3a7640000', // 1 token with 18 decimals in hex
-                  [token2Address]: '0x1bc16d674ec80000', // 2 tokens with 18 decimals in hex
+            TokenBalancesController: {
+              tokenBalances: {
+                [selectedAddress as Hex]: {
+                  [chainId]: {
+                    [token1Address]: '0x0de0b6b3a7640000', // 1 token with 18 decimals in hex
+                    [token2Address]: '0x1bc16d674ec80000', // 2 tokens with 18 decimals in hex
+                  },
                 },
               },
             },
-          },
-          TokenRatesController: {
-            marketData: {
-              [chainId]: {
-                [zeroAddress()]: {
-                  pricePercentChange1d: ethPricePercentChange1d,
-                } as unknown as MarketDataDetails,
-                [token1Address]: {
-                  price: tokens[0].price,
-                  pricePercentChange1d: tokens[0].pricePercentChange1d,
-                } as unknown as MarketDataDetails,
-                [token2Address]: {
-                  price: tokens[1].price,
-                  pricePercentChange1d: tokens[1].pricePercentChange1d,
-                } as unknown as MarketDataDetails,
+            TokenRatesController: {
+              marketData: {
+                [chainId]: {
+                  [zeroAddress()]: {
+                    pricePercentChange1d: ethPricePercentChange1d,
+                  } as unknown as MarketDataDetails,
+                  [token1Address]: {
+                    price: tokens[0].price,
+                    pricePercentChange1d: tokens[0].pricePercentChange1d,
+                  } as unknown as MarketDataDetails,
+                  [token2Address]: {
+                    price: tokens[1].price,
+                    pricePercentChange1d: tokens[1].pricePercentChange1d,
+                  } as unknown as MarketDataDetails,
+                },
               },
             },
           },
         },
-        null,
-      );
+      });
 
       const totalFiatBalance = engine.getTotalEvmFiatAccountBalance();
 
@@ -698,68 +715,74 @@ describe('Engine', () => {
         },
       ];
 
-      const engine = Engine.init(
-        TEST_ANALYTICS_ID,
-        {
-          ...state,
-          AccountTrackerController: {
-            accountsByChainId: {
-              [chainId]: {
-                [selectedAddress]: {
-                  balance: (ethBalance * 1e18).toString(),
-                  stakedBalance: (stakedEthBalance * 1e18).toString(),
+      const engine = Engine.init(TEST_ANALYTICS_ID, state);
+
+      (store.getState as jest.Mock).mockReturnValueOnce({
+        onboarding: {
+          completedOnboarding: true,
+        },
+        engine: {
+          backgroundState: {
+            ...state,
+            AccountTrackerController: {
+              accountsByChainId: {
+                [chainId]: {
+                  [selectedAddress]: {
+                    balance: (ethBalance * 1e18).toString(),
+                    stakedBalance: (stakedEthBalance * 1e18).toString(),
+                  },
                 },
               },
             },
-          },
-          TokensController: {
-            allTokens: {
-              [chainId]: {
-                [selectedAddress]: tokens.map(
-                  ({ address, balance, decimals, symbol }) => ({
-                    address,
-                    balance,
-                    decimals,
-                    symbol,
-                  }),
-                ),
+            TokensController: {
+              allTokens: {
+                [chainId]: {
+                  [selectedAddress]: tokens.map(
+                    ({ address, balance, decimals, symbol }) => ({
+                      address,
+                      balance,
+                      decimals,
+                      symbol,
+                    }),
+                  ),
+                },
               },
+              allIgnoredTokens: {},
+              allDetectedTokens: {},
             },
-            allIgnoredTokens: {},
-            allDetectedTokens: {},
-          },
-          TokenBalancesController: {
-            tokenBalances: {
-              [selectedAddress as Hex]: {
-                [chainId]: {
-                  [token1Address]: '0x0de0b6b3a7640000', // 1 token with 18 decimals in hex
-                  [token2Address]: '0x1bc16d674ec80000', // 2 tokens with 18 decimals in hex
+            TokenBalancesController: {
+              tokenBalances: {
+                [selectedAddress as Hex]: {
+                  [chainId]: {
+                    [token1Address]: '0x0de0b6b3a7640000',
+                    [token2Address]: '0x1bc16d674ec80000',
+                  },
                 },
               },
             },
-          },
-          TokenRatesController: {
-            marketData: {
-              [chainId]: {
-                [zeroAddress()]: {
-                  pricePercentChange1d: ethPricePercentChange1d,
-                } as unknown as MarketDataDetails,
-                [token1Address]: {
-                  price: tokens[0].price,
-                  pricePercentChange1d: tokens[0].pricePercentChange1d,
-                } as unknown as MarketDataDetails,
-                [token2Address]: {
-                  price: tokens[1].price,
-                  pricePercentChange1d: tokens[1].pricePercentChange1d,
-                } as unknown as MarketDataDetails,
+            TokenRatesController: {
+              marketData: {
+                [chainId]: {
+                  [zeroAddress()]: {
+                    pricePercentChange1d: ethPricePercentChange1d,
+                  } as unknown as MarketDataDetails,
+                  [token1Address]: {
+                    price: tokens[0].price,
+                    pricePercentChange1d: tokens[0].pricePercentChange1d,
+                  } as unknown as MarketDataDetails,
+                  [token2Address]: {
+                    price: tokens[1].price,
+                    pricePercentChange1d: tokens[1].pricePercentChange1d,
+                  } as unknown as MarketDataDetails,
+                },
               },
             },
           },
         },
-        null,
-      );
+      });
 
       const totalFiatBalance = engine.getTotalEvmFiatAccountBalance();
+
       const ethFiat = (ethBalance + stakedEthBalance) * ethConversionRate;
       const [tokenFiat, tokenFiat1dAgo] = tokens.reduce(
         ([fiat, fiat1d], token) => {
@@ -1334,7 +1357,8 @@ describe('Engine', () => {
             'state' in controller &&
             Boolean(controller.state) &&
             (!isEmpty(controller.state) ||
-              controllerName === 'ComplianceController'),
+              controllerName === 'ComplianceController' ||
+              controllerName === 'MoneyAccountUpgradeController'),
         )
         .map(([controllerName]) => controllerName);
 
@@ -1345,4 +1369,17 @@ describe('Engine', () => {
       expect(sortedControllersInState).toEqual(sortedExpectedControllers);
     });
   });
+
+  describe('resetState', () => {
+    it('calls MoneyAccountController.clearState', async () => {
+      const engine = Engine.init(TEST_ANALYTICS_ID, backgroundState);
+      const clearStateSpy = jest
+        .spyOn(engine.context.MoneyAccountController, 'clearState')
+        .mockImplementation(() => undefined);
+
+      await engine.resetState();
+
+      expect(clearStateSpy).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/app/core/Engine/Engine.ts b/app/core/Engine/Engine.ts
index 5344330aab0..cde53327a7e 100644
--- a/app/core/Engine/Engine.ts
+++ b/app/core/Engine/Engine.ts
@@ -110,6 +110,14 @@ import {
   getRootExtendedMessenger,
 } from './types';
 import { STATELESS_NON_CONTROLLER_NAMES } from './constants';
+import {
+  getAccountTrackerControllerAccountsByChainId,
+  getCurrencyRateControllerCurrencyRates,
+  getCurrencyRateControllerCurrentCurrency,
+  getTokenBalancesControllerTokenBalances,
+  getTokenRatesControllerMarketData,
+  getTokensControllerAllTokens,
+} from '../../selectors/assets/assets-migration';
 import { getGlobalChainId } from '../../util/networks/global-network';
 import { logEngineCreation } from './utils/logger';
 import { initMessengerClients } from './utils';
@@ -187,6 +195,8 @@ import { clientControllerInit } from './controllers/client-controller-init';
 import { transakServiceInit } from './controllers/ramps-controller/transak-service-init';
 import { complianceServiceInit } from './controllers/compliance/compliance-service-init';
 import { complianceControllerInit } from './controllers/compliance/compliance-controller-init';
+import { chompApiServiceInit } from './controllers/chomp-api-service-init';
+import { moneyAccountUpgradeControllerInit } from './controllers/money-account-upgrade-controller-init';
 
 // TODO: Replace "any" with type
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -391,6 +401,8 @@ export class Engine {
         CardController: cardControllerInit,
         ComplianceService: complianceServiceInit,
         ComplianceController: complianceControllerInit,
+        ChompApiService: chompApiServiceInit,
+        MoneyAccountUpgradeController: moneyAccountUpgradeControllerInit,
       },
       persistedState: initialState as EngineState,
       baseControllerMessenger: this.controllerMessenger,
@@ -623,6 +635,9 @@ export class Engine {
       ClientController: clientController,
       ComplianceService: complianceService,
       ComplianceController: complianceController,
+      ChompApiService: messengerClientsByName.ChompApiService,
+      MoneyAccountUpgradeController:
+        messengerClientsByName.MoneyAccountUpgradeController,
     };
 
     const childControllers = Object.assign({}, this.context);
@@ -835,15 +850,7 @@ export class Engine {
     totalNativeTokenBalance: string;
     ticker: string;
   } => {
-    const {
-      CurrencyRateController,
-      AccountsController,
-      AccountTrackerController,
-      TokenBalancesController,
-      TokenRatesController,
-      TokensController,
-      NetworkController,
-    } = this.context;
+    const { AccountsController, NetworkController } = this.context;
 
     const selectedInternalAccount =
       account ??
@@ -865,11 +872,14 @@ export class Engine {
     const selectedInternalAccountFormattedAddress = toFormattedAddress(
       selectedInternalAccount.address,
     );
-    const { currentCurrency } = CurrencyRateController.state;
-    const { settings: { showFiatOnTestnets } = {} } = store.getState();
+    const state = store.getState();
+    const currentCurrency = getCurrencyRateControllerCurrentCurrency(state);
+    const { settings: { showFiatOnTestnets } = {} } = state;
 
-    const { accountsByChainId } = AccountTrackerController.state;
-    const { marketData } = TokenRatesController.state;
+    const accountsByChainId =
+      getAccountTrackerControllerAccountsByChainId(state);
+    const marketData = getTokenRatesControllerMarketData(state);
+    const currencyRates = getCurrencyRateControllerCurrencyRates(state);
 
     let totalEthFiat = 0;
     let totalEthFiat1dAgo = 0;
@@ -905,9 +915,7 @@ export class Engine {
         return;
       }
 
-      const conversionRate =
-        CurrencyRateController.state?.currencyRates?.[ticker]?.conversionRate ??
-        0;
+      const conversionRate = currencyRates?.[ticker]?.conversionRate ?? 0;
 
       if (conversionRate === 0) {
         return;
@@ -971,14 +979,13 @@ export class Engine {
       }
 
       const tokens =
-        TokensController.state.allTokens?.[chainIdHex]?.[
+        getTokensControllerAllTokens(state)?.[chainIdHex]?.[
           selectedInternalAccount.address
         ] || [];
       const tokenExchangeRates = marketData?.[chainIdHex];
 
       if (tokens.length > 0) {
-        const { tokenBalances: allTokenBalances } =
-          TokenBalancesController.state;
+        const allTokenBalances = getTokenBalancesControllerTokenBalances(state);
         const tokenBalances =
           allTokenBalances?.[selectedInternalAccount.address as Hex]?.[
             chainId
@@ -1159,6 +1166,7 @@ export class Engine {
       SnapController,
       ///: END:ONLY_INCLUDE_IF
       LoggingController,
+      MoneyAccountController,
     } = this.context;
 
     // Remove all permissions.
@@ -1189,6 +1197,9 @@ export class Engine {
     }));
 
     LoggingController.clear();
+
+    // Accounts:
+    MoneyAccountController.clearState();
   };
 
   removeAllListeners() {
@@ -1418,6 +1429,7 @@ export default {
       ///: END:ONLY_INCLUDE_IF
       ProfileMetricsController,
       MoneyAccountController,
+      MoneyAccountUpgradeController,
     } = instance.context;
 
     return {
@@ -1493,6 +1505,7 @@ export default {
       ///: END:ONLY_INCLUDE_IF
       ProfileMetricsController: ProfileMetricsController.state,
       MoneyAccountController: MoneyAccountController.state,
+      MoneyAccountUpgradeController: MoneyAccountUpgradeController.state,
     };
   },
 
diff --git a/app/core/Engine/constants.ts b/app/core/Engine/constants.ts
index 8500a263bf4..14eb2fa5e40 100644
--- a/app/core/Engine/constants.ts
+++ b/app/core/Engine/constants.ts
@@ -23,6 +23,7 @@ export const STATELESS_NON_CONTROLLER_NAMES = [
   'SocialService',
   'AuthenticatedUserStorageService',
   'MoneyAccountBalanceService',
+  'ChompApiService',
 ] as const;
 
 export const BACKGROUND_STATE_CHANGE_EVENT_NAMES = [
@@ -80,6 +81,7 @@ export const BACKGROUND_STATE_CHANGE_EVENT_NAMES = [
   'BridgeStatusController:stateChange',
   'EarnController:stateChange',
   'MoneyAccountController:stateChange',
+  'MoneyAccountUpgradeController:stateChanged',
   'PerpsController:stateChange',
   'RewardsController:stateChange',
   'DeFiPositionsController:stateChange',
diff --git a/app/core/Engine/controllers/assets-controller/assets-controller-init.test.ts b/app/core/Engine/controllers/assets-controller/assets-controller-init.test.ts
index 4b145963f31..06fc8887a49 100644
--- a/app/core/Engine/controllers/assets-controller/assets-controller-init.test.ts
+++ b/app/core/Engine/controllers/assets-controller/assets-controller-init.test.ts
@@ -160,7 +160,6 @@ describe('assetsControllerInit', () => {
     expect(controllerMock).toHaveBeenCalledWith(
       expect.objectContaining({
         messenger: expect.any(Object),
-        state: expect.any(Object),
         isBasicFunctionality: expect.any(Function),
         isEnabled: expect.any(Function),
         isOnboarded: expect.any(Function),
@@ -199,7 +198,7 @@ describe('assetsControllerInit', () => {
     );
   });
 
-  it('uses empty state when persisted state is not available', () => {
+  it('passes undefined state when persisted state is not available', () => {
     const requestMock = getInitRequestMock();
     requestMock.persistedState = {};
 
@@ -208,7 +207,7 @@ describe('assetsControllerInit', () => {
     const controllerMock = jest.mocked(AssetsController);
     expect(controllerMock).toHaveBeenCalledWith(
       expect.objectContaining({
-        state: expect.any(Object),
+        state: undefined,
       }),
     );
   });
diff --git a/app/core/Engine/controllers/assets-controller/assets-controller-init.ts b/app/core/Engine/controllers/assets-controller/assets-controller-init.ts
index 515b404fb48..fdddbaa0c32 100644
--- a/app/core/Engine/controllers/assets-controller/assets-controller-init.ts
+++ b/app/core/Engine/controllers/assets-controller/assets-controller-init.ts
@@ -129,11 +129,7 @@ export const assetsControllerInit: MessengerClientInitFunction<
   // Create the controller - it now creates all data sources internally
   const controller = new AssetsController({
     messenger: controllerMessenger,
-    state: persistedState?.AssetsController ?? {
-      assetPreferences: {},
-      assetsInfo: {},
-      assetsBalance: {},
-    },
+    state: persistedState?.AssetsController,
     isBasicFunctionality: () =>
       selectBasicFunctionalityEnabled(store.getState()),
     isEnabled,
diff --git a/app/core/Engine/controllers/chomp-api-service-init.test.ts b/app/core/Engine/controllers/chomp-api-service-init.test.ts
new file mode 100644
index 00000000000..a9214447bca
--- /dev/null
+++ b/app/core/Engine/controllers/chomp-api-service-init.test.ts
@@ -0,0 +1,85 @@
+import { ChompApiService } from '@metamask/chomp-api-service';
+import { MOCK_ANY_NAMESPACE, MockAnyNamespace } from '@metamask/messenger';
+import { buildMessengerClientInitRequestMock } from '../utils/test-utils';
+import { ExtendedMessenger } from '../../ExtendedMessenger';
+import {
+  getChompApiServiceInitMessenger,
+  getChompApiServiceMessenger,
+} from '../messengers/chomp-api-service-messenger';
+import { chompApiServiceInit } from './chomp-api-service-init';
+import Logger from '../../../util/Logger';
+
+jest.mock('@metamask/chomp-api-service');
+
+jest.mock('../../../util/Logger', () => ({
+  log: jest.fn(),
+}));
+
+function getInitRequestMock({
+  remoteFeatureFlags,
+}: {
+  remoteFeatureFlags: Record<string, unknown>;
+}) {
+  const baseMessenger = new ExtendedMessenger<MockAnyNamespace, never, never>({
+    namespace: MOCK_ANY_NAMESPACE,
+  });
+
+  baseMessenger.registerActionHandler(
+    // @ts-expect-error: Action not allowed on the mock messenger namespace.
+    'RemoteFeatureFlagController:getState',
+    jest.fn().mockReturnValue({ remoteFeatureFlags }),
+  );
+
+  return {
+    ...buildMessengerClientInitRequestMock(baseMessenger),
+    controllerMessenger: getChompApiServiceMessenger(baseMessenger),
+    initMessenger: getChompApiServiceInitMessenger(baseMessenger),
+  };
+}
+
+describe('chompApiServiceInit', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns a ChompApiService instance', () => {
+    const { controller } = chompApiServiceInit(
+      getInitRequestMock({
+        remoteFeatureFlags: {
+          earnChompApiConfig: { baseUrl: 'https://chomp.example.com' },
+        },
+      }),
+    );
+
+    expect(controller).toBeInstanceOf(ChompApiService);
+  });
+
+  it('passes the configured base URL when the feature flag is hydrated', () => {
+    chompApiServiceInit(
+      getInitRequestMock({
+        remoteFeatureFlags: {
+          earnChompApiConfig: { baseUrl: 'https://chomp.example.com' },
+        },
+      }),
+    );
+
+    expect(jest.mocked(ChompApiService)).toHaveBeenCalledWith({
+      messenger: expect.any(Object),
+      baseUrl: 'https://chomp.example.com',
+    });
+  });
+
+  it('falls back to the dev URL and logs when the feature flag is missing', () => {
+    chompApiServiceInit(getInitRequestMock({ remoteFeatureFlags: {} }));
+
+    expect(jest.mocked(ChompApiService)).toHaveBeenCalledWith({
+      messenger: expect.any(Object),
+      baseUrl: 'https://chomp.dev-api.cx.metamask.io',
+    });
+    expect(Logger.log).toHaveBeenCalledWith(
+      '[ChompApiServiceInit]',
+      'chompApiConfig feature flag not set; falling back to dev URL',
+      { fallback: 'https://chomp.dev-api.cx.metamask.io' },
+    );
+  });
+});
diff --git a/app/core/Engine/controllers/chomp-api-service-init.ts b/app/core/Engine/controllers/chomp-api-service-init.ts
new file mode 100644
index 00000000000..ee87e8da8e6
--- /dev/null
+++ b/app/core/Engine/controllers/chomp-api-service-init.ts
@@ -0,0 +1,55 @@
+import {
+  ChompApiService,
+  type ChompApiServiceMessenger,
+} from '@metamask/chomp-api-service';
+import type { MessengerClientInitFunction } from '../types';
+import type { ChompApiServiceInitMessenger } from '../messengers/chomp-api-service-messenger';
+import { parseChompApiConfig } from '../../../selectors/featureFlagController/chompApi';
+import Logger from '../../../util/Logger';
+
+const LOG_PREFIX = '[ChompApiServiceInit]';
+
+// Fallback used only when the remote feature flag has not hydrated yet (e.g.
+// first launch, offline). Points at dev so unconfigured builds will fail fast
+// against a non-prod backend.
+const FALLBACK_CHOMP_API_URL = 'https://chomp.dev-api.cx.metamask.io';
+
+/**
+ * Initialize the ChompApiService.
+ *
+ * @param request - The request object.
+ * @param request.controllerMessenger - The messenger to use for the service.
+ * @param request.initMessenger - The init messenger for reading feature flags.
+ * @returns The initialized service.
+ */
+export const chompApiServiceInit: MessengerClientInitFunction<
+  ChompApiService,
+  ChompApiServiceMessenger,
+  ChompApiServiceInitMessenger
+> = ({ controllerMessenger, initMessenger }) => {
+  const featureState = initMessenger.call(
+    'RemoteFeatureFlagController:getState',
+  );
+  const chompApiConfig = parseChompApiConfig(
+    featureState.remoteFeatureFlags?.earnChompApiConfig,
+  );
+
+  let baseUrl: string;
+  if (chompApiConfig) {
+    baseUrl = chompApiConfig.baseUrl;
+  } else {
+    Logger.log(
+      LOG_PREFIX,
+      'chompApiConfig feature flag not set; falling back to dev URL',
+      { fallback: FALLBACK_CHOMP_API_URL },
+    );
+    baseUrl = FALLBACK_CHOMP_API_URL;
+  }
+
+  const controller = new ChompApiService({
+    messenger: controllerMessenger,
+    baseUrl,
+  });
+
+  return { controller };
+};
diff --git a/app/core/Engine/controllers/keyring-controller/keyring-controller-init.test.ts b/app/core/Engine/controllers/keyring-controller/keyring-controller-init.test.ts
index 63b5bf74af5..f2cdc3d0576 100644
--- a/app/core/Engine/controllers/keyring-controller/keyring-controller-init.test.ts
+++ b/app/core/Engine/controllers/keyring-controller/keyring-controller-init.test.ts
@@ -1,12 +1,4 @@
 import { buildMessengerClientInitRequestMock } from '../../utils/test-utils';
-
-jest.mock('../../../../lib/Money/feature-flags', () => ({
-  isMoneyAccountEnabled: jest.fn(),
-}));
-
-const mockIsMoneyAccountEnabled = jest.requireMock(
-  '../../../../lib/Money/feature-flags',
-).isMoneyAccountEnabled as jest.Mock;
 import { ExtendedMessenger } from '../../../ExtendedMessenger';
 import { getKeyringControllerMessenger } from '../../messengers/keyring-controller-messenger';
 import { MessengerClientInitRequest } from '../../types';
@@ -72,7 +64,6 @@ function getInitRequestMock(): jest.Mocked<
 describe('keyringControllerInit', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    mockIsMoneyAccountEnabled.mockReturnValue(true);
   });
 
   it('initializes the controller', () => {
@@ -108,26 +99,12 @@ describe('keyringControllerInit', () => {
       return builder;
     }
 
-    it('includes a MoneyKeyring builder when the flag is enabled', () => {
-      mockIsMoneyAccountEnabled.mockReturnValue(true);
-
+    it('always includes a MoneyKeyring builder', () => {
       const builder = getMoneyKeyringBuilder();
 
       expect(builder).toBeDefined();
     });
 
-    it('does not include a MoneyKeyring builder when the flag is disabled', () => {
-      mockIsMoneyAccountEnabled.mockReturnValue(false);
-
-      keyringControllerInit(getInitRequestMock());
-
-      const { keyringBuilders } = jest.mocked(KeyringController).mock
-        .calls[0][0] as { keyringBuilders: KeyringBuilder[] };
-
-      const builder = keyringBuilders.find((b) => b.type === MoneyKeyring.type);
-      expect(builder).toBeUndefined();
-    });
-
     it('creates a MoneyKeyring instance when invoked', () => {
       const builder = getMoneyKeyringBuilder();
 
diff --git a/app/core/Engine/controllers/keyring-controller/keyring-controller-init.ts b/app/core/Engine/controllers/keyring-controller/keyring-controller-init.ts
index f134b2f8922..514fed8f278 100644
--- a/app/core/Engine/controllers/keyring-controller/keyring-controller-init.ts
+++ b/app/core/Engine/controllers/keyring-controller/keyring-controller-init.ts
@@ -1,5 +1,4 @@
 import { MessengerClientInitFunction } from '../../types';
-import { isMoneyAccountEnabled } from '../../../../lib/Money/feature-flags';
 import { CryptographicFunctions } from '@metamask/key-tree';
 import { encodeMnemonic } from '@metamask/keyring-sdk';
 import {
@@ -44,10 +43,6 @@ export const keyringControllerInit: MessengerClientInitFunction<
   qrKeyringScanner,
   getMessengerClient,
 }) => {
-  const { remoteFeatureFlags } = getMessengerClient(
-    'RemoteFeatureFlagController',
-  ).state;
-
   // Required by the HD keyring and money keyring to use native crypto functions.
   const cryptographicFunctions: CryptographicFunctions = {
     pbkdf2Sha512: pbkdf2,
@@ -81,35 +76,34 @@ export const keyringControllerInit: MessengerClientInitFunction<
   hdKeyringBuilder.type = HdKeyring.type;
   additionalKeyrings.push(hdKeyringBuilder);
 
-  // We only need this keyring if Money accounts are enabled.
-  if (isMoneyAccountEnabled(remoteFeatureFlags)) {
-    const moneyKeyringBuilder = () =>
-      new MoneyKeyring({
-        cryptographicFunctions,
-        getMnemonic: async (entropySource: string) =>
-          // This builder needs the controller itself, so we re-use `getMessengerClient` to access
-          // the controller instance as it will be available when this method gets called.
-          // NOTE: This is required since we cannot self-use our own actions with the init messenger.
-          getMessengerClient('KeyringController').withKeyringUnsafe(
-            {
-              filter: (keyring, metadata): keyring is HdKeyring =>
-                keyring.type === KeyringTypes.hd &&
-                metadata.id === entropySource,
-            },
-            async ({ keyring }) => {
-              if (!keyring?.mnemonic) {
-                throw new Error(
-                  `Unable to get mnemonic to initialize MoneyKeyring`,
-                );
-              }
+  // The builder is always registered so the KeyringController can recognise the
+  // MoneyKeyring type during vault deserialization (even if the feature flag is
+  // disabled at that time).
+  const moneyKeyringBuilder = () =>
+    new MoneyKeyring({
+      cryptographicFunctions,
+      getMnemonic: async (entropySource: string) =>
+        // This builder needs the controller itself, so we re-use `getMessengerClient` to access
+        // the controller instance as it will be available when this method gets called.
+        // NOTE: This is required since we cannot self-use our own actions with the init messenger.
+        getMessengerClient('KeyringController').withKeyringUnsafe(
+          {
+            filter: (keyring, metadata): keyring is HdKeyring =>
+              keyring.type === KeyringTypes.hd && metadata.id === entropySource,
+          },
+          async ({ keyring }) => {
+            if (!keyring?.mnemonic) {
+              throw new Error(
+                `Unable to get mnemonic to initialize MoneyKeyring`,
+              );
+            }
 
-              return encodeMnemonic(keyring.mnemonic);
-            },
-          ),
-      });
-    moneyKeyringBuilder.type = MoneyKeyring.type;
-    additionalKeyrings.push(moneyKeyringBuilder);
-  }
+            return encodeMnemonic(keyring.mnemonic);
+          },
+        ),
+    });
+  moneyKeyringBuilder.type = MoneyKeyring.type;
+  additionalKeyrings.push(moneyKeyringBuilder);
 
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   const snapKeyringBuilder = getMessengerClient('SnapKeyringBuilder');
diff --git a/app/core/Engine/controllers/money-account-controller-init.test.ts b/app/core/Engine/controllers/money-account-controller-init.test.ts
index 68f948762dd..4f120d04acf 100644
--- a/app/core/Engine/controllers/money-account-controller-init.test.ts
+++ b/app/core/Engine/controllers/money-account-controller-init.test.ts
@@ -1,6 +1,10 @@
 import { buildMessengerClientInitRequestMock } from '../utils/test-utils';
 import { ExtendedMessenger } from '../../ExtendedMessenger';
-import { getMoneyAccountControllerMessenger } from '../messengers/money-account-controller-messenger';
+import {
+  getMoneyAccountControllerInitMessenger,
+  getMoneyAccountControllerMessenger,
+  MoneyAccountControllerInitMessenger,
+} from '../messengers/money-account-controller-messenger';
 import { MessengerClientInitRequest } from '../types';
 import { moneyAccountControllerInit } from './money-account-controller-init';
 import {
@@ -8,31 +12,86 @@ import {
   MoneyAccountControllerMessenger,
 } from '@metamask/money-account-controller';
 import { MOCK_ANY_NAMESPACE, MockAnyNamespace } from '@metamask/messenger';
+import { RemoteFeatureFlagControllerStateChangeEvent } from '@metamask/remote-feature-flag-controller';
+import { isMoneyAccountEnabled } from '../../../lib/Money/feature-flags';
+import Logger from '../../../util/Logger';
 
 jest.mock('@metamask/money-account-controller');
+jest.mock('../../../lib/Money/feature-flags');
+jest.mock('../../../util/Logger');
+
+const EMPTY_MONEY_ACCOUNTS = { moneyAccounts: {} };
+const NON_EMPTY_MONEY_ACCOUNTS = { moneyAccounts: { 'mock-account-id': {} } };
 
-function getInitRequestMock(): jest.Mocked<
-  MessengerClientInitRequest<MoneyAccountControllerMessenger>
-> {
-  const baseMessenger = new ExtendedMessenger<MockAnyNamespace, never, never>({
+function buildInitRequestMock<
+  Events extends RemoteFeatureFlagControllerStateChangeEvent = never,
+>(
+  baseMessenger = new ExtendedMessenger<MockAnyNamespace, never, Events>({
     namespace: MOCK_ANY_NAMESPACE,
-  });
+  }),
+): {
+  requestMock: jest.Mocked<
+    MessengerClientInitRequest<
+      MoneyAccountControllerMessenger,
+      MoneyAccountControllerInitMessenger
+    >
+  >;
+  baseMessenger: ExtendedMessenger<MockAnyNamespace, never, Events>;
+} {
+  baseMessenger.registerActionHandler(
+    // @ts-expect-error: Action not allowed on root messenger.
+    'RemoteFeatureFlagController:getState',
+    jest.fn().mockReturnValue({ remoteFeatureFlags: {} }),
+  );
 
-  return {
+  baseMessenger.registerActionHandler(
+    // @ts-expect-error: Action not allowed on root messenger.
+    'KeyringController:getState',
+    jest.fn().mockReturnValue({ isUnlocked: true }),
+  );
+
+  const requestMock = {
     ...buildMessengerClientInitRequestMock(baseMessenger),
     controllerMessenger: getMoneyAccountControllerMessenger(baseMessenger),
-    initMessenger: undefined,
-  };
+    initMessenger: getMoneyAccountControllerInitMessenger(baseMessenger),
+  } as jest.Mocked<
+    MessengerClientInitRequest<
+      MoneyAccountControllerMessenger,
+      MoneyAccountControllerInitMessenger
+    >
+  >;
+
+  return { requestMock, baseMessenger };
+}
+
+function publishStateChange(
+  baseMessenger: ExtendedMessenger<
+    MockAnyNamespace,
+    never,
+    RemoteFeatureFlagControllerStateChangeEvent
+  >,
+) {
+  baseMessenger.publish(
+    'RemoteFeatureFlagController:stateChange',
+    { remoteFeatureFlags: {}, cacheTimestamp: 0 },
+    [],
+  );
 }
 
 describe('moneyAccountControllerInit', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('initializes the controller', () => {
-    const { controller } = moneyAccountControllerInit(getInitRequestMock());
+    const { requestMock } = buildInitRequestMock();
+    const { controller } = moneyAccountControllerInit(requestMock);
     expect(controller).toBeInstanceOf(MoneyAccountController);
   });
 
   it('passes the proper arguments to the controller', () => {
-    moneyAccountControllerInit(getInitRequestMock());
+    const { requestMock } = buildInitRequestMock();
+    moneyAccountControllerInit(requestMock);
 
     const controllerMock = jest.mocked(MoneyAccountController);
     expect(controllerMock).toHaveBeenCalledWith({
@@ -40,4 +99,116 @@ describe('moneyAccountControllerInit', () => {
       state: undefined,
     });
   });
+
+  describe('RemoteFeatureFlagController:stateChange subscription', () => {
+    function buildStateChangeSetup() {
+      const baseMessenger = new ExtendedMessenger<
+        MockAnyNamespace,
+        never,
+        RemoteFeatureFlagControllerStateChangeEvent
+      >({ namespace: MOCK_ANY_NAMESPACE });
+
+      const { requestMock } = buildInitRequestMock(baseMessenger);
+      return { requestMock, baseMessenger };
+    }
+
+    it('calls controller.init() when flag is enabled and keyring is unlocked', async () => {
+      jest.mocked(isMoneyAccountEnabled).mockReturnValue(true);
+
+      const { requestMock, baseMessenger } = buildStateChangeSetup();
+      const { controller } = moneyAccountControllerInit(requestMock);
+      (controller as unknown as { state: unknown }).state =
+        EMPTY_MONEY_ACCOUNTS;
+
+      publishStateChange(baseMessenger);
+      await Promise.resolve();
+
+      expect(jest.mocked(controller.init)).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not call controller.init() when flag is enabled but keyring is locked', async () => {
+      jest.mocked(isMoneyAccountEnabled).mockReturnValue(true);
+
+      const { requestMock, baseMessenger } = buildStateChangeSetup();
+
+      baseMessenger.unregisterActionHandler(
+        // @ts-expect-error: Action not allowed on root messenger.
+        'KeyringController:getState',
+      );
+      baseMessenger.registerActionHandler(
+        // @ts-expect-error: Action not allowed on root messenger.
+        'KeyringController:getState',
+        jest.fn().mockReturnValue({ isUnlocked: false }),
+      );
+
+      const { controller } = moneyAccountControllerInit(requestMock);
+      (controller as unknown as { state: unknown }).state =
+        EMPTY_MONEY_ACCOUNTS;
+
+      publishStateChange(baseMessenger);
+      await Promise.resolve();
+
+      expect(jest.mocked(controller.init)).not.toHaveBeenCalled();
+    });
+
+    it('does not call controller.init() when flag is enabled but money account already exists', async () => {
+      jest.mocked(isMoneyAccountEnabled).mockReturnValue(true);
+
+      const { requestMock, baseMessenger } = buildStateChangeSetup();
+      const { controller } = moneyAccountControllerInit(requestMock);
+      (controller as unknown as { state: unknown }).state =
+        NON_EMPTY_MONEY_ACCOUNTS;
+
+      publishStateChange(baseMessenger);
+      await Promise.resolve();
+
+      expect(jest.mocked(controller.init)).not.toHaveBeenCalled();
+    });
+
+    it('calls controller.clearState() when flag is disabled and money accounts exist', async () => {
+      jest.mocked(isMoneyAccountEnabled).mockReturnValue(false);
+
+      const { requestMock, baseMessenger } = buildStateChangeSetup();
+      const { controller } = moneyAccountControllerInit(requestMock);
+      (controller as unknown as { state: unknown }).state =
+        NON_EMPTY_MONEY_ACCOUNTS;
+
+      publishStateChange(baseMessenger);
+      await Promise.resolve();
+
+      expect(jest.mocked(controller.clearState)).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not call controller.clearState() when flag is disabled and no money accounts exist', async () => {
+      jest.mocked(isMoneyAccountEnabled).mockReturnValue(false);
+
+      const { requestMock, baseMessenger } = buildStateChangeSetup();
+      const { controller } = moneyAccountControllerInit(requestMock);
+      (controller as unknown as { state: unknown }).state =
+        EMPTY_MONEY_ACCOUNTS;
+
+      publishStateChange(baseMessenger);
+      await Promise.resolve();
+
+      expect(jest.mocked(controller.clearState)).not.toHaveBeenCalled();
+    });
+
+    it('logs an error when the stateChange callback throws', async () => {
+      const error = new Error('mock error');
+      jest.mocked(isMoneyAccountEnabled).mockImplementation(() => {
+        throw error;
+      });
+
+      const { requestMock, baseMessenger } = buildStateChangeSetup();
+      moneyAccountControllerInit(requestMock);
+
+      publishStateChange(baseMessenger);
+      await Promise.resolve();
+
+      expect(jest.mocked(Logger.error)).toHaveBeenCalledWith(
+        error,
+        'MoneyAccountController: error handling RemoteFeatureFlagController state change',
+      );
+    });
+  });
 });
diff --git a/app/core/Engine/controllers/money-account-controller-init.ts b/app/core/Engine/controllers/money-account-controller-init.ts
index 48e653df89b..c493253bed1 100644
--- a/app/core/Engine/controllers/money-account-controller-init.ts
+++ b/app/core/Engine/controllers/money-account-controller-init.ts
@@ -3,6 +3,9 @@ import {
   MoneyAccountController,
   MoneyAccountControllerMessenger,
 } from '@metamask/money-account-controller';
+import { MoneyAccountControllerInitMessenger } from '../messengers/money-account-controller-messenger';
+import { isMoneyAccountEnabled } from '../../../lib/Money/feature-flags';
+import Logger from '../../../util/Logger';
 
 /**
  * Initialize the money account controller.
@@ -15,12 +18,46 @@ import {
  */
 export const moneyAccountControllerInit: MessengerClientInitFunction<
   MoneyAccountController,
-  MoneyAccountControllerMessenger
-> = ({ controllerMessenger, persistedState }) => {
+  MoneyAccountControllerMessenger,
+  MoneyAccountControllerInitMessenger
+> = ({ controllerMessenger, initMessenger, persistedState }) => {
   const controller = new MoneyAccountController({
     messenger: controllerMessenger,
     state: persistedState.MoneyAccountController,
   });
 
+  // Re-check the Money account feature flag whenever remote flags are updated.
+  initMessenger.subscribe(
+    'RemoteFeatureFlagController:stateChange',
+    async ({ remoteFeatureFlags }) => {
+      try {
+        const isEnabled = isMoneyAccountEnabled(remoteFeatureFlags);
+        const hasMoneyAccount =
+          Object.keys(controller.state.moneyAccounts).length > 0;
+
+        if (isEnabled && !hasMoneyAccount) {
+          const { isUnlocked } = initMessenger.call(
+            'KeyringController:getState',
+          );
+          // Check for the `KeyringController` to be unlocked, otherwise we won't be able
+          // to create the Money keyring if it doesn't exist yet!
+          if (isUnlocked) {
+            // This call is idempotent, so it is safe to call even if the
+            // controller is already initialized.
+            await controller.init();
+          }
+        } else if (!isEnabled && hasMoneyAccount) {
+          // Clear state if we had a previous Money account and FF is off.
+          controller.clearState();
+        }
+      } catch (error) {
+        Logger.error(
+          error as Error,
+          'MoneyAccountController: error handling RemoteFeatureFlagController state change',
+        );
+      }
+    },
+  );
+
   return { controller };
 };
diff --git a/app/core/Engine/controllers/money-account-upgrade-controller-init.test.ts b/app/core/Engine/controllers/money-account-upgrade-controller-init.test.ts
new file mode 100644
index 00000000000..609d428b579
--- /dev/null
+++ b/app/core/Engine/controllers/money-account-upgrade-controller-init.test.ts
@@ -0,0 +1,222 @@
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import { MoneyAccountUpgradeController } from '@metamask/money-account-upgrade-controller';
+import { MOCK_ANY_NAMESPACE, MockAnyNamespace } from '@metamask/messenger';
+import { ExtendedMessenger } from '../../ExtendedMessenger';
+import { buildMessengerClientInitRequestMock } from '../utils/test-utils';
+import {
+  getMoneyAccountUpgradeControllerInitMessenger,
+  getMoneyAccountUpgradeControllerMessenger,
+} from '../messengers/money-account-upgrade-controller-messenger';
+import { getDeleGatorEnvironment } from '../../Delegation/environment';
+import {
+  __resetMoneyAccountUpgradeBootstrapForTesting,
+  moneyAccountUpgradeControllerInit,
+  whenMoneyAccountUpgradeReady,
+} from './money-account-upgrade-controller-init';
+import Logger from '../../../util/Logger';
+
+jest.mock('@metamask/money-account-upgrade-controller');
+
+jest.mock('../../Delegation/environment', () => ({
+  getDeleGatorEnvironment: jest.fn(),
+}));
+
+jest.mock('../../../util/Logger', () => ({
+  error: jest.fn(),
+}));
+
+const MUSD_TOKEN_ADDRESS = '0x000000000000000000000000000000000000dead';
+const DELEGATOR_IMPL = '0x0000000000000000000000000000000000000001';
+const REDEEMER_ENFORCER = '0x0000000000000000000000000000000000000002';
+const VALUE_LTE_ENFORCER = '0x0000000000000000000000000000000000000003';
+
+const SERVICE_DETAILS = {
+  chains: {
+    [CHAIN_IDS.ARBITRUM]: {
+      protocol: {
+        vedaProtocol: {
+          supportedTokens: [{ tokenAddress: MUSD_TOKEN_ADDRESS }],
+        },
+      },
+    },
+  },
+};
+
+function getInitRequestMock({
+  isUnlocked,
+  serviceDetails = SERVICE_DETAILS,
+}: {
+  isUnlocked: boolean;
+  serviceDetails?: unknown;
+}) {
+  const baseMessenger = new ExtendedMessenger<MockAnyNamespace, never, never>({
+    namespace: MOCK_ANY_NAMESPACE,
+  });
+
+  baseMessenger.registerActionHandler(
+    // @ts-expect-error: Action not allowed on the mock messenger namespace.
+    'KeyringController:getState',
+    jest.fn().mockReturnValue({ isUnlocked }),
+  );
+
+  const getServiceDetails = jest.fn().mockResolvedValue(serviceDetails);
+  baseMessenger.registerActionHandler(
+    // @ts-expect-error: Action not allowed on the mock messenger namespace.
+    'ChompApiService:getServiceDetails',
+    getServiceDetails,
+  );
+
+  const requestMock = {
+    ...buildMessengerClientInitRequestMock(baseMessenger),
+    controllerMessenger:
+      getMoneyAccountUpgradeControllerMessenger(baseMessenger),
+    initMessenger: getMoneyAccountUpgradeControllerInitMessenger(baseMessenger),
+  };
+
+  return { requestMock, baseMessenger, getServiceDetails };
+}
+
+const flushAsync = () => new Promise(process.nextTick);
+
+describe('moneyAccountUpgradeControllerInit', () => {
+  let mockedController: jest.Mocked<MoneyAccountUpgradeController>;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    __resetMoneyAccountUpgradeBootstrapForTesting();
+
+    mockedController = {
+      init: jest.fn().mockResolvedValue(undefined),
+    } as unknown as jest.Mocked<MoneyAccountUpgradeController>;
+    jest
+      .mocked(MoneyAccountUpgradeController)
+      .mockImplementation(() => mockedController);
+
+    jest.mocked(getDeleGatorEnvironment).mockReturnValue({
+      EIP7702StatelessDeleGatorImpl: DELEGATOR_IMPL,
+      caveatEnforcers: {
+        RedeemerEnforcer: REDEEMER_ENFORCER,
+        ValueLteEnforcer: VALUE_LTE_ENFORCER,
+      },
+    } as unknown as ReturnType<typeof getDeleGatorEnvironment>);
+  });
+
+  it('returns a MoneyAccountUpgradeController instance', () => {
+    const { requestMock } = getInitRequestMock({ isUnlocked: false });
+
+    const { controller } = moneyAccountUpgradeControllerInit(requestMock);
+
+    expect(controller).toBe(mockedController);
+  });
+
+  describe('whenMoneyAccountUpgradeReady', () => {
+    it('rejects when bootstrap has not been scheduled yet', async () => {
+      await expect(whenMoneyAccountUpgradeReady()).rejects.toThrow(
+        'MoneyAccountUpgradeController bootstrap has not been scheduled yet',
+      );
+    });
+
+    it('resolves once bootstrap completes when keyring is already unlocked', async () => {
+      const { requestMock } = getInitRequestMock({ isUnlocked: true });
+
+      moneyAccountUpgradeControllerInit(requestMock);
+
+      await expect(whenMoneyAccountUpgradeReady()).resolves.toBeUndefined();
+      expect(mockedController.init).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  it('initializes the controller with addresses from service details and the delegator environment when unlocked', async () => {
+    const { requestMock, getServiceDetails } = getInitRequestMock({
+      isUnlocked: true,
+    });
+
+    moneyAccountUpgradeControllerInit(requestMock);
+    await flushAsync();
+
+    expect(getServiceDetails).toHaveBeenCalledWith([CHAIN_IDS.ARBITRUM]);
+    expect(getDeleGatorEnvironment).toHaveBeenCalledWith(
+      Number(CHAIN_IDS.ARBITRUM),
+    );
+    expect(mockedController.init).toHaveBeenCalledWith(CHAIN_IDS.ARBITRUM, {
+      musdTokenAddress: MUSD_TOKEN_ADDRESS,
+      delegatorImplAddress: DELEGATOR_IMPL,
+      redeemerEnforcer: REDEEMER_ENFORCER,
+      valueLteEnforcer: VALUE_LTE_ENFORCER,
+    });
+  });
+
+  it('defers bootstrap until KeyringController:unlock fires when keyring is locked', async () => {
+    const { requestMock, baseMessenger } = getInitRequestMock({
+      isUnlocked: false,
+    });
+
+    moneyAccountUpgradeControllerInit(requestMock);
+    await flushAsync();
+
+    expect(mockedController.init).not.toHaveBeenCalled();
+
+    // @ts-expect-error: Event not allowed on the mock messenger namespace.
+    baseMessenger.publish('KeyringController:unlock');
+    await flushAsync();
+
+    expect(mockedController.init).toHaveBeenCalledTimes(1);
+  });
+
+  it('only bootstraps once even if KeyringController:unlock fires multiple times', async () => {
+    const { requestMock, baseMessenger } = getInitRequestMock({
+      isUnlocked: false,
+    });
+
+    moneyAccountUpgradeControllerInit(requestMock);
+    // @ts-expect-error: Event not allowed on the mock messenger namespace.
+    baseMessenger.publish('KeyringController:unlock');
+    // @ts-expect-error: Event not allowed on the mock messenger namespace.
+    baseMessenger.publish('KeyringController:unlock');
+    await flushAsync();
+
+    expect(mockedController.init).toHaveBeenCalledTimes(1);
+  });
+
+  it('logs an error when CHOMP service details are missing', async () => {
+    const { requestMock } = getInitRequestMock({
+      isUnlocked: true,
+      serviceDetails: null,
+    });
+
+    moneyAccountUpgradeControllerInit(requestMock);
+    await flushAsync();
+
+    expect(mockedController.init).not.toHaveBeenCalled();
+    expect(Logger.error).toHaveBeenCalledWith(
+      expect.objectContaining({
+        message: `Missing CHOMP service details for chain ${CHAIN_IDS.ARBITRUM}`,
+      }),
+      'MoneyAccountUpgradeController bootstrap',
+    );
+  });
+
+  it('logs an error when the MUSD token address is missing from service details', async () => {
+    const { requestMock } = getInitRequestMock({
+      isUnlocked: true,
+      serviceDetails: {
+        chains: {
+          [CHAIN_IDS.ARBITRUM]: {
+            protocol: { vedaProtocol: { supportedTokens: [] } },
+          },
+        },
+      },
+    });
+
+    moneyAccountUpgradeControllerInit(requestMock);
+    await flushAsync();
+
+    expect(mockedController.init).not.toHaveBeenCalled();
+    expect(Logger.error).toHaveBeenCalledWith(
+      expect.objectContaining({
+        message: `Missing MUSD token address for chain ${CHAIN_IDS.ARBITRUM} in CHOMP service details`,
+      }),
+      'MoneyAccountUpgradeController bootstrap',
+    );
+  });
+});
diff --git a/app/core/Engine/controllers/money-account-upgrade-controller-init.ts b/app/core/Engine/controllers/money-account-upgrade-controller-init.ts
new file mode 100644
index 00000000000..4247d0d4ac9
--- /dev/null
+++ b/app/core/Engine/controllers/money-account-upgrade-controller-init.ts
@@ -0,0 +1,114 @@
+import {
+  MoneyAccountUpgradeController,
+  type MoneyAccountUpgradeControllerMessenger,
+} from '@metamask/money-account-upgrade-controller';
+import { type Hex, hexToNumber } from '@metamask/utils';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import type { MessengerClientInitFunction } from '../types';
+import type { MoneyAccountUpgradeControllerInitMessenger } from '../messengers/money-account-upgrade-controller-messenger';
+import { getDeleGatorEnvironment } from '../../Delegation/environment';
+import Logger from '../../../util/Logger';
+
+// TODO: source this from a feature flag (parallel to ChompApiConfig.baseUrl)
+// so we can add/swap MUSD chains without a code deploy.
+const MUSD_CHAIN_ID: Hex = CHAIN_IDS.ARBITRUM;
+
+let bootstrapPromise: Promise<void> | null = null;
+
+/**
+ * Promise that resolves once `MoneyAccountUpgradeController.init()` has run.
+ * Rejects if bootstrap fails, or if it hasn't been scheduled yet (i.e. the
+ * keyring is still locked). Callers that depend on the controller being
+ * initialized — e.g. `upgradeAccount` — should `await` this first.
+ */
+export const whenMoneyAccountUpgradeReady = (): Promise<void> => {
+  if (!bootstrapPromise) {
+    return Promise.reject(
+      new Error(
+        'MoneyAccountUpgradeController bootstrap has not been scheduled yet',
+      ),
+    );
+  }
+  return bootstrapPromise;
+};
+
+/** @internal For test use only. */
+export const __resetMoneyAccountUpgradeBootstrapForTesting = () => {
+  bootstrapPromise = null;
+};
+
+/**
+ * Initialize the MoneyAccountUpgradeController.
+ *
+ * The upgrade controller needs a bearer token (via ChompApiService →
+ * AuthenticationController) to fetch service details, which is only available
+ * once the keyring is unlocked. We therefore defer bootstrapping until the
+ * first unlock event (or run it immediately if the keyring is already
+ * unlocked).
+ *
+ * @param request - The request object.
+ * @param request.controllerMessenger - The messenger to use for the controller.
+ * @param request.initMessenger - The init messenger for unlock signals.
+ * @returns The initialized controller.
+ */
+export const moneyAccountUpgradeControllerInit: MessengerClientInitFunction<
+  MoneyAccountUpgradeController,
+  MoneyAccountUpgradeControllerMessenger,
+  MoneyAccountUpgradeControllerInitMessenger
+> = ({ controllerMessenger, initMessenger }) => {
+  const controller = new MoneyAccountUpgradeController({
+    messenger: controllerMessenger,
+  });
+
+  const bootstrap = async () => {
+    const serviceDetails = await controllerMessenger.call(
+      'ChompApiService:getServiceDetails',
+      [MUSD_CHAIN_ID],
+    );
+
+    if (!serviceDetails) {
+      throw new Error(
+        `Missing CHOMP service details for chain ${MUSD_CHAIN_ID}`,
+      );
+    }
+
+    const chain = serviceDetails.chains[MUSD_CHAIN_ID];
+    const musdTokenAddress =
+      chain?.protocol.vedaProtocol?.supportedTokens[0]?.tokenAddress;
+    if (!musdTokenAddress) {
+      throw new Error(
+        `Missing MUSD token address for chain ${MUSD_CHAIN_ID} in CHOMP service details`,
+      );
+    }
+
+    const environment = getDeleGatorEnvironment(hexToNumber(MUSD_CHAIN_ID));
+
+    await controller.init(MUSD_CHAIN_ID, {
+      musdTokenAddress,
+      delegatorImplAddress: environment.EIP7702StatelessDeleGatorImpl,
+      redeemerEnforcer: environment.caveatEnforcers.RedeemerEnforcer,
+      valueLteEnforcer: environment.caveatEnforcers.ValueLteEnforcer,
+    });
+  };
+
+  const runBootstrap = () => {
+    bootstrapPromise = bootstrap();
+    bootstrapPromise.catch((error) => {
+      Logger.error(error as Error, 'MoneyAccountUpgradeController bootstrap');
+    });
+  };
+
+  const keyringState = initMessenger.call('KeyringController:getState');
+
+  if (keyringState.isUnlocked) {
+    runBootstrap();
+  } else {
+    const onUnlock = () => {
+      initMessenger.unsubscribe('KeyringController:unlock', onUnlock);
+      runBootstrap();
+    };
+    initMessenger.subscribe('KeyringController:unlock', onUnlock);
+  }
+
+  return { controller };
+};
diff --git a/app/core/Engine/controllers/rewards-controller/RewardsController-method-action-types.ts b/app/core/Engine/controllers/rewards-controller/RewardsController-method-action-types.ts
index f5fda37b14b..31448df55bd 100644
--- a/app/core/Engine/controllers/rewards-controller/RewardsController-method-action-types.ts
+++ b/app/core/Engine/controllers/rewards-controller/RewardsController-method-action-types.ts
@@ -514,10 +514,26 @@ export type RewardsControllerGetOndoCampaignDepositsAction = {
   handler: RewardsController['getOndoCampaignDeposits'];
 };
 
+/**
+ * Fetch the participant outcome for the current user in a completed Perps Trading campaign.
+ * Results are cached for 10 minutes using a private in-memory Map.
+ *
+ * @param campaignId - The campaign ID.
+ * @param subscriptionId - The subscription ID for authentication.
+ * @returns The participant outcome DTO, or null if unavailable.
+ */
+export type RewardsControllerGetPerpsTradingCampaignParticipantOutcomeAction = {
+  type: `RewardsController:getPerpsTradingCampaignParticipantOutcome`;
+  handler: RewardsController['getPerpsTradingCampaignParticipantOutcome'];
+};
+
 /**
  * Get the current user's position on the campaign leaderboard.
  * This is an authenticated endpoint.
- * Results are cached for 5 minutes.
+ * Always fetches fresh from the API so the user's rank stays in sync with
+ * their latest trades; the result is mirrored to
+ * `state.ondoCampaignLeaderboardPositions` so selectors can read the latest
+ * snapshot.
  *
  * @param campaignId - The campaign ID to get position for.
  * @param subscriptionId - The subscription ID for authentication.
@@ -536,9 +552,10 @@ export type RewardsControllerGetOndoCampaignParticipantOutcomeAction = {
 /**
  * Get the current user's Ondo GM portfolio for a campaign.
  * This is an authenticated endpoint.
- * Results are cached for 5 minutes under
+ * Always fetches fresh from the API; the result is mirrored to
  * `state.ondoCampaignPortfolio[subscriptionId:campaignId]` as
- * {@link OndoGmPortfolioState}. Null API responses are not written to the cache.
+ * {@link OndoGmPortfolioState} so selectors can read the latest snapshot.
+ * Null API responses are not written to the cache.
  *
  * @param campaignId - The campaign ID to get portfolio for.
  * @param subscriptionId - The subscription ID for authentication.
@@ -551,9 +568,11 @@ export type RewardsControllerGetOndoCampaignPortfolioPositionAction = {
 
 /**
  * Get paginated activity for an Ondo GM campaign.
- * First page is cached for 1 minute; subsequent pages are always fetched fresh.
- * When `forceFresh` is true the cache is bypassed but a last-updated check
- * avoids redundant fetches if the server data hasn't changed.
+ * Always fetches fresh from the API; the first-page result is mirrored to
+ * `state.ondoCampaignActivity` so selectors can read the latest snapshot.
+ * Subsequent pages (cursor provided) are fetched directly without going
+ * through the cache. When `forceFresh` is true a last-updated check avoids
+ * redundant fetches if the server data hasn't changed.
  *
  * @param params - Campaign ID, subscription ID, pagination cursor, and optional forceFresh flag.
  * @returns Paginated activity entries.
@@ -702,6 +721,50 @@ export type RewardsControllerInvalidateSubscriptionCacheAction = {
   handler: RewardsController['invalidateSubscriptionCache'];
 };
 
+/**
+ * Get the perps trading campaign leaderboard.
+ * This is a public endpoint - no authentication required.
+ * Results are cached for 5 minutes.
+ *
+ * @param campaignId - The campaign ID to get leaderboard for.
+ * @returns The leaderboard entries and metadata.
+ */
+export type RewardsControllerGetPerpsTradingCampaignLeaderboardAction = {
+  type: `RewardsController:getPerpsTradingCampaignLeaderboard`;
+  handler: RewardsController['getPerpsTradingCampaignLeaderboard'];
+};
+
+/**
+ * Get the current user's position on the perps trading campaign leaderboard.
+ * This is an authenticated endpoint.
+ * Always fetches fresh from the API so the user's rank stays in sync with
+ * their latest trades; the result is mirrored to
+ * `state.perpsTradingCampaignLeaderboardPositions` so selectors can read the
+ * latest snapshot.
+ *
+ * @param campaignId - The campaign ID to get position for.
+ * @param subscriptionId - The subscription ID for authentication.
+ * @returns The user's leaderboard position, or null if not found.
+ */
+export type RewardsControllerGetPerpsTradingCampaignLeaderboardPositionAction =
+  {
+    type: `RewardsController:getPerpsTradingCampaignLeaderboardPosition`;
+    handler: RewardsController['getPerpsTradingCampaignLeaderboardPosition'];
+  };
+
+/**
+ * Get the perps trading campaign aggregate volume (public stats).
+ * This is a public endpoint - no authentication required.
+ * Results are cached for 1 minute.
+ *
+ * @param campaignId - The campaign ID to get volume for.
+ * @returns Current aggregate notional volume for the campaign.
+ */
+export type RewardsControllerGetPerpsTradingCampaignVolumeAction = {
+  type: `RewardsController:getPerpsTradingCampaignVolume`;
+  handler: RewardsController['getPerpsTradingCampaignVolume'];
+};
+
 /**
  * Union of all RewardsController action types.
  */
@@ -756,6 +819,7 @@ export type RewardsControllerMethodActions =
   | RewardsControllerGetCampaignParticipantStatusAction
   | RewardsControllerGetOndoCampaignLeaderboardAction
   | RewardsControllerGetOndoCampaignDepositsAction
+  | RewardsControllerGetPerpsTradingCampaignParticipantOutcomeAction
   | RewardsControllerGetOndoCampaignLeaderboardPositionAction
   | RewardsControllerGetOndoCampaignParticipantOutcomeAction
   | RewardsControllerGetOndoCampaignPortfolioPositionAction
@@ -771,4 +835,7 @@ export type RewardsControllerMethodActions =
   | RewardsControllerApplyBonusCodeAction
   | RewardsControllerGetClientVersionRequirementsAction
   | RewardsControllerInvalidateReferralDetailsCacheAction
-  | RewardsControllerInvalidateSubscriptionCacheAction;
+  | RewardsControllerInvalidateSubscriptionCacheAction
+  | RewardsControllerGetPerpsTradingCampaignLeaderboardAction
+  | RewardsControllerGetPerpsTradingCampaignLeaderboardPositionAction
+  | RewardsControllerGetPerpsTradingCampaignVolumeAction;
diff --git a/app/core/Engine/controllers/rewards-controller/RewardsController.test.ts b/app/core/Engine/controllers/rewards-controller/RewardsController.test.ts
index 4c61d9b9d8e..f9e12651ca4 100644
--- a/app/core/Engine/controllers/rewards-controller/RewardsController.test.ts
+++ b/app/core/Engine/controllers/rewards-controller/RewardsController.test.ts
@@ -16124,6 +16124,9 @@ describe('RewardsController', () => {
       ondoCampaignLeaderboard: {},
       ondoCampaignLeaderboardPositions: {},
       ondoCampaignPortfolio: {},
+      perpsTradingCampaignLeaderboard: {},
+      perpsTradingCampaignLeaderboardPositions: {},
+      perpsTradingCampaignVolume: {},
       pointsEstimateHistory: [],
       pointsEvents: {},
       seasonStatuses: {},
@@ -16150,6 +16153,9 @@ describe('RewardsController', () => {
       ondoCampaignLeaderboard: {},
       ondoCampaignLeaderboardPositions: {},
       ondoCampaignPortfolio: {},
+      perpsTradingCampaignLeaderboard: {},
+      perpsTradingCampaignLeaderboardPositions: {},
+      perpsTradingCampaignVolume: {},
       pointsEstimateHistory: [],
       pointsEvents: {},
       rewardsEnvUrl: null,
@@ -16181,6 +16187,9 @@ describe('RewardsController', () => {
       ondoCampaignLeaderboard: {},
       ondoCampaignLeaderboardPositions: {},
       ondoCampaignPortfolio: {},
+      perpsTradingCampaignLeaderboard: {},
+      perpsTradingCampaignLeaderboardPositions: {},
+      perpsTradingCampaignVolume: {},
       pointsEvents: {},
       rewardsEnvUrl: null,
       seasonStatuses: {},
@@ -19796,9 +19805,13 @@ describe('RewardsController', () => {
       ).toBeDefined();
     });
 
-    it('returns cached position when cache is fresh', async () => {
-      const recentTime = Date.now() - 30000; // 30 seconds ago (within 1 minute threshold)
+    it('always fetches fresh leaderboard position even when a recent cache entry exists', async () => {
+      const recentTime = Date.now() - 30000; // 30 seconds ago
       const cacheKey = `${mockSubscriptionId}:${mockCampaignId}`;
+      const freshPosition = {
+        ...mockPosition,
+        rank: (mockPosition.rank ?? 0) + 1,
+      };
       const ctrl = new RewardsController({
         messenger: ondoLeaderboardPositionMessenger,
         state: {
@@ -19812,13 +19825,19 @@ describe('RewardsController', () => {
         },
       });
 
+      ondoLeaderboardPositionMessenger.call.mockResolvedValue(freshPosition);
+
       const result = await ctrl.getOndoCampaignLeaderboardPosition(
         mockCampaignId,
         mockSubscriptionId,
       );
 
-      expect(result).toEqual(mockPosition);
-      expect(ondoLeaderboardPositionMessenger.call).not.toHaveBeenCalled();
+      expect(ondoLeaderboardPositionMessenger.call).toHaveBeenCalledWith(
+        'RewardsDataService:getOndoCampaignLeaderboardPosition',
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+      expect(result).toEqual(freshPosition);
     });
 
     it('returns null and caches a not-found sentinel when API returns null (user not on leaderboard)', async () => {
@@ -19844,7 +19863,7 @@ describe('RewardsController', () => {
       );
     });
 
-    it('does not re-fetch when a fresh not-found sentinel is cached (TTL respected)', async () => {
+    it('re-fetches even when a fresh not-found sentinel is cached', async () => {
       const cacheKey = `${mockSubscriptionId}:${mockCampaignId}`;
       const ctrl = new RewardsController({
         messenger: ondoLeaderboardPositionMessenger,
@@ -19853,19 +19872,25 @@ describe('RewardsController', () => {
           ondoCampaignLeaderboardPositions: {
             [cacheKey]: {
               notFound: true as const,
-              lastFetched: Date.now() - 30000, // 30 seconds ago (within 1 minute threshold)
+              lastFetched: Date.now() - 30000, // 30 seconds ago
             },
           },
         },
       });
 
+      ondoLeaderboardPositionMessenger.call.mockResolvedValue(mockPosition);
+
       const result = await ctrl.getOndoCampaignLeaderboardPosition(
         mockCampaignId,
         mockSubscriptionId,
       );
 
-      expect(result).toBeNull();
-      expect(ondoLeaderboardPositionMessenger.call).not.toHaveBeenCalled();
+      expect(result).toEqual(mockPosition);
+      expect(ondoLeaderboardPositionMessenger.call).toHaveBeenCalledWith(
+        'RewardsDataService:getOndoCampaignLeaderboardPosition',
+        mockCampaignId,
+        mockSubscriptionId,
+      );
     });
 
     it('logs when fetching fresh position', async () => {
@@ -19973,9 +19998,13 @@ describe('RewardsController', () => {
       expect(ctrl.state.ondoCampaignPortfolio[cacheKey]).toBeDefined();
     });
 
-    it('returns cached portfolio when cache is fresh', async () => {
-      const recentTime = Date.now() - 30000; // 30 seconds ago (within 1 minute threshold)
+    it('always fetches fresh portfolio even when a recent cache entry exists', async () => {
+      const recentTime = Date.now() - 30000; // 30 seconds ago
       const cacheKey = `${mockSubscriptionId}:${mockCampaignId}`;
+      const freshPortfolio = {
+        ...mockPortfolio,
+        computedAt: '2024-03-20T12:05:00.000Z',
+      };
       const ctrl = new RewardsController({
         messenger: ondoPortfolioMessenger,
         state: {
@@ -19989,13 +20018,19 @@ describe('RewardsController', () => {
         },
       });
 
+      ondoPortfolioMessenger.call.mockResolvedValue(freshPortfolio);
+
       const result = await ctrl.getOndoCampaignPortfolioPosition(
         mockCampaignId,
         mockSubscriptionId,
       );
 
-      expect(result).toEqual(mockPortfolio);
-      expect(ondoPortfolioMessenger.call).not.toHaveBeenCalled();
+      expect(ondoPortfolioMessenger.call).toHaveBeenCalledWith(
+        'RewardsDataService:getOndoCampaignPortfolioPosition',
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+      expect(result).toEqual(freshPortfolio);
     });
 
     it('returns null when API returns null and does not cache', async () => {
@@ -20186,30 +20221,43 @@ describe('RewardsController', () => {
       );
     });
 
-    it('returns cached activity when cache is fresh', async () => {
+    it('always re-checks activity freshness even when a recent cache entry exists', async () => {
       const recentTime = Date.now() - 30000;
       const cacheKey = `${mockSubscriptionId}:${mockCampaignId}`;
+      const freshActivity = {
+        ...mockActivity,
+        cursor: 'fresh-cursor',
+      };
       const ctrl = new RewardsController({
         messenger: ondoActivityMessenger,
         state: {
           ...getRewardsControllerDefaultState(),
           ondoCampaignActivity: {
             [cacheKey]: {
-              ...mockActivity,
+              has_more: false,
+              cursor: null,
+              results: [],
               lastFetched: recentTime,
             },
           },
         },
       });
 
+      ondoActivityMessenger.call.mockResolvedValue(freshActivity as any);
+
       const result = await ctrl.getOndoCampaignActivity({
         campaignId: mockCampaignId,
         subscriptionId: mockSubscriptionId,
         cursor: null,
       });
 
-      expect(result).toEqual(mockActivity);
-      expect(ondoActivityMessenger.call).not.toHaveBeenCalled();
+      expect(ondoActivityMessenger.call).toHaveBeenCalledWith(
+        'RewardsDataService:getOndoCampaignActivity',
+        mockCampaignId,
+        mockSubscriptionId,
+        null,
+      );
+      expect(result).toEqual(freshActivity);
     });
   });
 
@@ -20480,4 +20528,159 @@ describe('RewardsController', () => {
       );
     });
   });
+
+  describe('getPerpsTradingCampaignParticipantOutcome', () => {
+    let perpsParticipantOutcomeMessenger: jest.Mocked<RewardsControllerMessenger>;
+    const mockCampaignId = 'perps-outcome-campaign-1';
+    const mockSubscriptionId = 'sub-perps-outcome-1';
+    const mockOutcome = {
+      subscriptionId: mockSubscriptionId,
+      outcomeStatus: 'pending' as const,
+      winnerVerificationCode: 'VERIFY-123',
+      rank: 1,
+    };
+
+    beforeEach(() => {
+      perpsParticipantOutcomeMessenger = {
+        subscribe: jest.fn(),
+        call: jest.fn(),
+        registerActionHandler: jest.fn(),
+        registerMethodActionHandlers: jest.fn(),
+        unregisterActionHandler: jest.fn(),
+        publish: jest.fn(),
+        clearEventSubscriptions: jest.fn(),
+        registerInitialEventPayload: jest.fn(),
+        unsubscribe: jest.fn(),
+      } as unknown as jest.Mocked<RewardsControllerMessenger>;
+    });
+
+    it('returns null when rewards feature flag is disabled', async () => {
+      const disabledController = new RewardsController({
+        messenger: perpsParticipantOutcomeMessenger,
+        state: getRewardsControllerDefaultState(),
+        isDisabled: () => true,
+      });
+
+      const result =
+        await disabledController.getPerpsTradingCampaignParticipantOutcome(
+          mockCampaignId,
+          mockSubscriptionId,
+        );
+
+      expect(result).toBeNull();
+      expect(perpsParticipantOutcomeMessenger.call).not.toHaveBeenCalled();
+    });
+
+    it('fetches outcome from API and caches result', async () => {
+      const ctrl = new RewardsController({
+        messenger: perpsParticipantOutcomeMessenger,
+        state: getRewardsControllerDefaultState(),
+      });
+
+      perpsParticipantOutcomeMessenger.call.mockResolvedValue(mockOutcome);
+
+      const result = await ctrl.getPerpsTradingCampaignParticipantOutcome(
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+
+      expect(perpsParticipantOutcomeMessenger.call).toHaveBeenCalledWith(
+        'RewardsDataService:getPerpsTradingCampaignParticipantOutcome',
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+      expect(result).toEqual(mockOutcome);
+    });
+
+    it('returns cached outcome on second call within TTL', async () => {
+      const ctrl = new RewardsController({
+        messenger: perpsParticipantOutcomeMessenger,
+        state: getRewardsControllerDefaultState(),
+      });
+
+      perpsParticipantOutcomeMessenger.call.mockResolvedValue(mockOutcome);
+
+      await ctrl.getPerpsTradingCampaignParticipantOutcome(
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+
+      perpsParticipantOutcomeMessenger.call.mockClear();
+
+      const result = await ctrl.getPerpsTradingCampaignParticipantOutcome(
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+
+      expect(result).toEqual(mockOutcome);
+      expect(perpsParticipantOutcomeMessenger.call).not.toHaveBeenCalled();
+    });
+
+    it('returns null when API returns null and does not cache', async () => {
+      const ctrl = new RewardsController({
+        messenger: perpsParticipantOutcomeMessenger,
+        state: getRewardsControllerDefaultState(),
+      });
+
+      perpsParticipantOutcomeMessenger.call.mockResolvedValue(null);
+
+      const result = await ctrl.getPerpsTradingCampaignParticipantOutcome(
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+
+      expect(result).toBeNull();
+
+      perpsParticipantOutcomeMessenger.call.mockClear();
+      perpsParticipantOutcomeMessenger.call.mockResolvedValue(mockOutcome);
+      const second = await ctrl.getPerpsTradingCampaignParticipantOutcome(
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+      expect(perpsParticipantOutcomeMessenger.call).toHaveBeenCalledTimes(1);
+      expect(second).toEqual(mockOutcome);
+    });
+
+    it('returns null and logs on API error', async () => {
+      const ctrl = new RewardsController({
+        messenger: perpsParticipantOutcomeMessenger,
+        state: getRewardsControllerDefaultState(),
+      });
+
+      perpsParticipantOutcomeMessenger.call.mockRejectedValue(
+        new Error('Perps API error'),
+      );
+      mockLogger.error.mockClear();
+
+      const result = await ctrl.getPerpsTradingCampaignParticipantOutcome(
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+
+      expect(result).toBeNull();
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        expect.any(Error),
+        'RewardsController: Failed to fetch Perps Trading participant outcome',
+      );
+    });
+
+    it('logs when fetching fresh outcome', async () => {
+      const ctrl = new RewardsController({
+        messenger: perpsParticipantOutcomeMessenger,
+        state: getRewardsControllerDefaultState(),
+      });
+
+      perpsParticipantOutcomeMessenger.call.mockResolvedValue(mockOutcome);
+      mockLogger.log.mockClear();
+
+      await ctrl.getPerpsTradingCampaignParticipantOutcome(
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+
+      expect(mockLogger.log).toHaveBeenCalledWith(
+        'RewardsController: Fetching Perps Trading campaign participant outcome',
+      );
+    });
+  });
 });
diff --git a/app/core/Engine/controllers/rewards-controller/RewardsController.ts b/app/core/Engine/controllers/rewards-controller/RewardsController.ts
index 89e20a88234..93db5ca5d96 100644
--- a/app/core/Engine/controllers/rewards-controller/RewardsController.ts
+++ b/app/core/Engine/controllers/rewards-controller/RewardsController.ts
@@ -29,7 +29,11 @@ import {
   type OndoGmPortfolioState,
   type OndoGmCampaignDepositsDto,
   type OndoGmCampaignParticipantOutcomeDto,
+  type PerpsTradingCampaignLeaderboardDto,
+  type PerpsTradingCampaignLeaderboardPositionDto,
+  type PerpsTradingCampaignVolumeDto,
   type PaginatedOndoGmActivityDto,
+  type PerpsTradingCampaignParticipantOutcomeDto,
   type OndoGmActivityState,
   type PointsEstimateHistoryEntry,
   ClaimRewardDto,
@@ -128,10 +132,12 @@ const CAMPAIGN_PARTICIPANT_STATUS_CACHE_THRESHOLD_MS = 1000 * 60 * 5; // 5 minut
 const ONDO_CAMPAIGN_LEADERBOARD_CACHE_THRESHOLD_MS = 1000 * 60 * 5; // 5 minutes
 
 // Campaign leaderboard position cache threshold
-const ONDO_CAMPAIGN_LEADERBOARD_POSITION_CACHE_THRESHOLD_MS = 1000 * 60 * 1; // 1 minute
+// Disabled to keep the user's rank in sync with their latest trades.
+const ONDO_CAMPAIGN_LEADERBOARD_POSITION_CACHE_THRESHOLD_MS = 0;
 
 // Campaign portfolio position cache threshold
-const ONDO_CAMPAIGN_PORTFOLIO_POSITION_CACHE_THRESHOLD_MS = 1000 * 60 * 1; // 1 minute
+// Disabled to keep positions in sync with the activity list after rebalances.
+const ONDO_CAMPAIGN_PORTFOLIO_POSITION_CACHE_THRESHOLD_MS = 0;
 
 // Campaign deposits cache threshold
 const ONDO_CAMPAIGN_DEPOSITS_CACHE_THRESHOLD_MS = 1000 * 60 * 1; // 1 minute
@@ -140,11 +146,25 @@ const ONDO_CAMPAIGN_DEPOSITS_CACHE_THRESHOLD_MS = 1000 * 60 * 1; // 1 minute
 const POINTS_EVENTS_CACHE_THRESHOLD_MS = 1000 * 60 * 1; // 1 minute cache
 
 // Campaign activity cache threshold (first page only)
-const ONDO_CAMPAIGN_ACTIVITY_CACHE_THRESHOLD_MS = 1000 * 60 * 1; // 1 minute cache
+// Disabled to keep the activity feed in sync with the user's latest trades.
+const ONDO_CAMPAIGN_ACTIVITY_CACHE_THRESHOLD_MS = 0;
 
 // Campaign participant outcome cache threshold
 const ONDO_CAMPAIGN_PARTICIPANT_OUTCOME_CACHE_THRESHOLD_MS = 1000 * 60 * 10; // 10 minutes
 
+// Perps Trading Campaign leaderboard cache threshold (HyperTracker refreshes every ~15 min)
+const PERPS_TRADING_CAMPAIGN_LEADERBOARD_CACHE_THRESHOLD_MS = 1000 * 60 * 5; // 5 minutes
+
+// Perps Trading Campaign leaderboard position cache threshold
+// Disabled to keep the user's rank in sync with their latest trades.
+const PERPS_TRADING_CAMPAIGN_LEADERBOARD_POSITION_CACHE_THRESHOLD_MS = 0;
+
+// Perps Trading Campaign volume cache threshold
+const PERPS_TRADING_CAMPAIGN_VOLUME_CACHE_THRESHOLD_MS = 1000 * 60 * 1; // 1 minute
+
+// Perps Trading participant outcome cache threshold
+const PERPS_TRADING_PARTICIPANT_OUTCOME_CACHE_THRESHOLD_MS = 1000 * 60 * 10; // 10 minutes
+
 // Opt-in status stale threshold for not opted-in accounts to force a fresh check
 const NOT_OPTED_IN_OIS_STALE_CACHE_THRESHOLD_MS = 1000 * 60 * 60; // 1 hour
 
@@ -257,6 +277,24 @@ const metadata: StateMetadata<RewardsControllerState> = {
     includeInDebugSnapshot: false,
     usedInUi: true,
   },
+  perpsTradingCampaignLeaderboard: {
+    includeInStateLogs: true,
+    persist: true,
+    includeInDebugSnapshot: false,
+    usedInUi: true,
+  },
+  perpsTradingCampaignLeaderboardPositions: {
+    includeInStateLogs: true,
+    persist: true,
+    includeInDebugSnapshot: false,
+    usedInUi: true,
+  },
+  perpsTradingCampaignVolume: {
+    includeInStateLogs: true,
+    persist: true,
+    includeInDebugSnapshot: false,
+    usedInUi: true,
+  },
   pointsEstimateHistory: {
     includeInStateLogs: true,
     persist: true,
@@ -387,7 +425,11 @@ const MESSENGER_EXPOSED_METHODS = [
   'getOndoCampaignActivity',
   'getOndoCampaignPortfolioPosition',
   'getOndoCampaignParticipantOutcome',
+  'getPerpsTradingCampaignLeaderboard',
+  'getPerpsTradingCampaignLeaderboardPosition',
+  'getPerpsTradingCampaignVolume',
   'getOptInStatus',
+  'getPerpsTradingCampaignParticipantOutcome',
   'getPerpsDiscountForAccount',
   'getPointsEvents',
   'getPointsEventsIfChanged',
@@ -444,6 +486,13 @@ export class RewardsController extends BaseController<
   #isBitcoinOptinEnabled: () => boolean;
   #isTronOptinEnabled: () => boolean;
   #reauthPromises: Map<string, Promise<void>> = new Map();
+  #perpsTradingParticipantOutcomeCache: Map<
+    string,
+    {
+      payload: PerpsTradingCampaignParticipantOutcomeDto | null;
+      lastFetched: number;
+    }
+  > = new Map();
 
   /**
    * Calculate tier status and next tier information
@@ -3636,10 +3685,65 @@ export class RewardsController extends BaseController<
     return result;
   }
 
+  /**
+   * Fetch the participant outcome for the current user in a completed Perps Trading campaign.
+   * Results are cached for 10 minutes using a private in-memory Map.
+   * @param campaignId - The campaign ID.
+   * @param subscriptionId - The subscription ID for authentication.
+   * @returns The participant outcome DTO, or null if unavailable.
+   */
+  async getPerpsTradingCampaignParticipantOutcome(
+    campaignId: string,
+    subscriptionId: string,
+  ): Promise<PerpsTradingCampaignParticipantOutcomeDto | null> {
+    if (!this.isRewardsFeatureEnabled()) {
+      return null;
+    }
+    const key = `${subscriptionId}:${campaignId}`;
+    try {
+      return await wrapWithCache<PerpsTradingCampaignParticipantOutcomeDto | null>(
+        {
+          key,
+          ttl: PERPS_TRADING_PARTICIPANT_OUTCOME_CACHE_THRESHOLD_MS,
+          readCache: (k) =>
+            this.#perpsTradingParticipantOutcomeCache.get(k) ?? undefined,
+          fetchFresh: async () =>
+            this.#withAuthRetry(async () => {
+              Logger.log(
+                'RewardsController: Fetching Perps Trading campaign participant outcome',
+              );
+              return this.messenger.call(
+                'RewardsDataService:getPerpsTradingCampaignParticipantOutcome',
+                campaignId,
+                subscriptionId,
+              );
+            }, subscriptionId),
+          writeCache: (k, payload) => {
+            if (payload !== null) {
+              this.#perpsTradingParticipantOutcomeCache.set(k, {
+                payload,
+                lastFetched: Date.now(),
+              });
+            }
+          },
+        },
+      );
+    } catch (error) {
+      Logger.error(
+        error as Error,
+        'RewardsController: Failed to fetch Perps Trading participant outcome',
+      );
+      return null;
+    }
+  }
+
   /**
    * Get the current user's position on the campaign leaderboard.
    * This is an authenticated endpoint.
-   * Results are cached for 5 minutes.
+   * Always fetches fresh from the API so the user's rank stays in sync with
+   * their latest trades; the result is mirrored to
+   * `state.ondoCampaignLeaderboardPositions` so selectors can read the latest
+   * snapshot.
    * @param campaignId - The campaign ID to get position for.
    * @param subscriptionId - The subscription ID for authentication.
    * @returns The user's leaderboard position, or null if not found.
@@ -3766,9 +3870,10 @@ export class RewardsController extends BaseController<
   /**
    * Get the current user's Ondo GM portfolio for a campaign.
    * This is an authenticated endpoint.
-   * Results are cached for 5 minutes under
+   * Always fetches fresh from the API; the result is mirrored to
    * `state.ondoCampaignPortfolio[subscriptionId:campaignId]` as
-   * {@link OndoGmPortfolioState}. Null API responses are not written to the cache.
+   * {@link OndoGmPortfolioState} so selectors can read the latest snapshot.
+   * Null API responses are not written to the cache.
    * @param campaignId - The campaign ID to get portfolio for.
    * @param subscriptionId - The subscription ID for authentication.
    * @returns The portfolio, or null if not found.
@@ -3837,9 +3942,11 @@ export class RewardsController extends BaseController<
 
   /**
    * Get paginated activity for an Ondo GM campaign.
-   * First page is cached for 1 minute; subsequent pages are always fetched fresh.
-   * When `forceFresh` is true the cache is bypassed but a last-updated check
-   * avoids redundant fetches if the server data hasn't changed.
+   * Always fetches fresh from the API; the first-page result is mirrored to
+   * `state.ondoCampaignActivity` so selectors can read the latest snapshot.
+   * Subsequent pages (cursor provided) are fetched directly without going
+   * through the cache. When `forceFresh` is true a last-updated check avoids
+   * redundant fetches if the server data hasn't changed.
    * @param params - Campaign ID, subscription ID, pagination cursor, and optional forceFresh flag.
    * @returns Paginated activity entries.
    */
@@ -4406,4 +4513,189 @@ export class RewardsController extends BaseController<
       seasonId || 'all seasons',
     );
   }
+
+  /**
+   * Get the perps trading campaign leaderboard.
+   * This is a public endpoint - no authentication required.
+   * Results are cached for 5 minutes.
+   * @param campaignId - The campaign ID to get leaderboard for.
+   * @returns The leaderboard entries and metadata.
+   */
+  async getPerpsTradingCampaignLeaderboard(
+    campaignId: string,
+  ): Promise<PerpsTradingCampaignLeaderboardDto> {
+    if (!this.isRewardsFeatureEnabled()) {
+      return { campaignId, computedAt: '', entries: [], totalParticipants: 0 };
+    }
+
+    const result = await wrapWithCache<PerpsTradingCampaignLeaderboardDto>({
+      key: campaignId,
+      ttl: PERPS_TRADING_CAMPAIGN_LEADERBOARD_CACHE_THRESHOLD_MS,
+      readCache: (k) => {
+        const cached = this.state.perpsTradingCampaignLeaderboard[k];
+        if (!cached) return undefined;
+        return {
+          payload: {
+            campaignId: cached.campaignId,
+            computedAt: cached.computedAt,
+            entries: cached.entries,
+            totalParticipants: cached.totalParticipants,
+          },
+          lastFetched: cached.lastFetched,
+        };
+      },
+      fetchFresh: async () => {
+        Logger.log(
+          'RewardsController: Fetching fresh perps trading campaign leaderboard via API call',
+        );
+        return (await this.messenger.call(
+          'RewardsDataService:getPerpsTradingCampaignLeaderboard',
+          campaignId,
+        )) as PerpsTradingCampaignLeaderboardDto;
+      },
+      writeCache: (k, payload) => {
+        this.update((state) => {
+          state.perpsTradingCampaignLeaderboard[k] = {
+            campaignId: payload.campaignId,
+            computedAt: payload.computedAt,
+            entries: payload.entries,
+            totalParticipants: payload.totalParticipants,
+            lastFetched: Date.now(),
+          };
+        });
+      },
+    });
+    return result;
+  }
+
+  /**
+   * Get the current user's position on the perps trading campaign leaderboard.
+   * This is an authenticated endpoint.
+   * Always fetches fresh from the API so the user's rank stays in sync with
+   * their latest trades; the result is mirrored to
+   * `state.perpsTradingCampaignLeaderboardPositions` so selectors can read the
+   * latest snapshot.
+   * @param campaignId - The campaign ID to get position for.
+   * @param subscriptionId - The subscription ID for authentication.
+   * @returns The user's leaderboard position, or null if not found.
+   */
+  async getPerpsTradingCampaignLeaderboardPosition(
+    campaignId: string,
+    subscriptionId: string,
+  ): Promise<PerpsTradingCampaignLeaderboardPositionDto | null> {
+    if (!this.isRewardsFeatureEnabled()) {
+      return null;
+    }
+
+    const key = `${subscriptionId}:${campaignId}`;
+    const result =
+      await wrapWithCache<PerpsTradingCampaignLeaderboardPositionDto | null>({
+        key,
+        ttl: PERPS_TRADING_CAMPAIGN_LEADERBOARD_POSITION_CACHE_THRESHOLD_MS,
+        readCache: (k) => {
+          const cached = this.state.perpsTradingCampaignLeaderboardPositions[k];
+          if (!cached) return undefined;
+          if ('notFound' in cached) {
+            return { payload: null, lastFetched: cached.lastFetched };
+          }
+          return {
+            payload: {
+              rank: cached.rank,
+              pnl: cached.pnl,
+              notionalVolume: cached.notionalVolume,
+              marginDeployed: cached.marginDeployed,
+              qualified: cached.qualified,
+              neighbors: cached.neighbors,
+              computedAt: cached.computedAt,
+            },
+            lastFetched: cached.lastFetched,
+          };
+        },
+        fetchFresh: async () =>
+          this.#withAuthRetry(async () => {
+            Logger.log(
+              'RewardsController: Fetching fresh perps trading campaign leaderboard position via API call',
+            );
+            return (await this.messenger.call(
+              'RewardsDataService:getPerpsTradingCampaignLeaderboardPosition',
+              campaignId,
+              subscriptionId,
+            )) as PerpsTradingCampaignLeaderboardPositionDto | null;
+          }, subscriptionId),
+        writeCache: (k, payload) => {
+          if (payload === null) {
+            this.update((state) => {
+              state.perpsTradingCampaignLeaderboardPositions[k] = {
+                notFound: true,
+                lastFetched: Date.now(),
+              };
+            });
+          } else {
+            this.update((state) => {
+              state.perpsTradingCampaignLeaderboardPositions[k] = {
+                rank: payload.rank,
+                pnl: payload.pnl,
+                notionalVolume: payload.notionalVolume,
+                marginDeployed: payload.marginDeployed,
+                qualified: payload.qualified,
+                neighbors: payload.neighbors,
+                computedAt: payload.computedAt,
+                lastFetched: Date.now(),
+              };
+            });
+          }
+        },
+      });
+    return result;
+  }
+
+  /**
+   * Get the perps trading campaign aggregate volume (public stats).
+   * This is a public endpoint - no authentication required.
+   * Results are cached for 1 minute.
+   * @param campaignId - The campaign ID to get volume for.
+   * @returns Current aggregate notional volume for the campaign.
+   */
+  async getPerpsTradingCampaignVolume(
+    campaignId: string,
+  ): Promise<PerpsTradingCampaignVolumeDto> {
+    if (!this.isRewardsFeatureEnabled()) {
+      return {
+        totalUsdVolume: '0',
+      };
+    }
+
+    const result = await wrapWithCache<PerpsTradingCampaignVolumeDto>({
+      key: campaignId,
+      ttl: PERPS_TRADING_CAMPAIGN_VOLUME_CACHE_THRESHOLD_MS,
+      readCache: (k) => {
+        const cached = this.state.perpsTradingCampaignVolume[k];
+        if (!cached) return undefined;
+        return {
+          payload: {
+            totalUsdVolume: cached.totalUsdVolume,
+          },
+          lastFetched: cached.lastFetched,
+        };
+      },
+      fetchFresh: async () => {
+        Logger.log(
+          'RewardsController: Fetching fresh perps trading campaign volume via API call',
+        );
+        return (await this.messenger.call(
+          'RewardsDataService:getPerpsTradingCampaignVolume',
+          campaignId,
+        )) as PerpsTradingCampaignVolumeDto;
+      },
+      writeCache: (k, payload) => {
+        this.update((state) => {
+          state.perpsTradingCampaignVolume[k] = {
+            totalUsdVolume: payload.totalUsdVolume,
+            lastFetched: Date.now(),
+          };
+        });
+      },
+    });
+    return result;
+  }
 }
diff --git a/app/core/Engine/controllers/rewards-controller/defaultState.ts b/app/core/Engine/controllers/rewards-controller/defaultState.ts
index 185b62f551c..16d1033d0ab 100644
--- a/app/core/Engine/controllers/rewards-controller/defaultState.ts
+++ b/app/core/Engine/controllers/rewards-controller/defaultState.ts
@@ -22,6 +22,9 @@ export const getRewardsControllerDefaultState = (): RewardsControllerState => ({
   ondoCampaignPortfolio: {},
   ondoCampaignActivity: {},
   ondoCampaignDeposits: {},
+  perpsTradingCampaignLeaderboard: {},
+  perpsTradingCampaignLeaderboardPositions: {},
+  perpsTradingCampaignVolume: {},
   pointsEstimateHistory: [],
   rewardsEnvUrl: null,
 });
diff --git a/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.test.ts b/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.test.ts
index 0893163f302..03f5e90af95 100644
--- a/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.test.ts
+++ b/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.test.ts
@@ -5087,4 +5087,194 @@ describe('RewardsDataService', () => {
       ).rejects.toThrow('Get Ondo GM participant outcome failed: 500');
     });
   });
+
+  describe('getPerpsTradingCampaignParticipantOutcome', () => {
+    const mockCampaignId = 'perps-outcome-campaign-1';
+    const mockSubscriptionId = 'sub-perps-outcome-1';
+    const mockToken = 'test-bearer-token';
+    const mockOutcome = {
+      subscriptionId: mockSubscriptionId,
+      outcomeStatus: 'finalized' as const,
+      winnerVerificationCode: null,
+      rank: 3,
+    };
+
+    beforeEach(() => {
+      mockGetSubscriptionToken.mockResolvedValue({
+        success: true,
+        token: mockToken,
+      });
+    });
+
+    it('calls the authenticated perps outcome endpoint and returns data', async () => {
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: jest.fn().mockResolvedValue(mockOutcome),
+      } as unknown as Response);
+
+      const result = await service.getPerpsTradingCampaignParticipantOutcome(
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+
+      expect(mockFetch).toHaveBeenCalledWith(
+        `https://uat.rewards.test/perps-trading/${mockCampaignId}/outcome/me`,
+        expect.objectContaining({
+          method: 'GET',
+          headers: expect.objectContaining({
+            'rewards-access-token': mockToken,
+          }),
+        }),
+      );
+      expect(result).toEqual(mockOutcome);
+    });
+
+    it('throws when response is not ok', async () => {
+      mockFetch.mockResolvedValue({ ok: false, status: 401 } as Response);
+
+      await expect(
+        service.getPerpsTradingCampaignParticipantOutcome(
+          mockCampaignId,
+          mockSubscriptionId,
+        ),
+      ).rejects.toThrow('Get Perps Trading participant outcome failed: 401');
+    });
+  });
+
+  describe('getPerpsTradingCampaignLeaderboard', () => {
+    const mockCampaignId = 'perps-campaign-api-1';
+    const mockLeaderboard = {
+      campaignId: mockCampaignId,
+      computedAt: '2025-08-15T12:00:00.000Z',
+      entries: [],
+      totalParticipants: 0,
+    };
+
+    beforeEach(() => {
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: jest.fn().mockResolvedValue(mockLeaderboard),
+      } as unknown as Response);
+    });
+
+    it('calls the public perps leaderboard endpoint with GET and returns data', async () => {
+      const result =
+        await service.getPerpsTradingCampaignLeaderboard(mockCampaignId);
+
+      expect(mockFetch).toHaveBeenCalledWith(
+        `https://uat.rewards.test/perps-trading/${mockCampaignId}/leaderboard`,
+        expect.objectContaining({ method: 'GET' }),
+      );
+      expect(result).toEqual(mockLeaderboard);
+    });
+
+    it('throws when response is not ok', async () => {
+      mockFetch.mockResolvedValue({ ok: false, status: 502 } as Response);
+
+      await expect(
+        service.getPerpsTradingCampaignLeaderboard(mockCampaignId),
+      ).rejects.toThrow('Get perps trading campaign leaderboard failed: 502');
+    });
+  });
+
+  describe('getPerpsTradingCampaignLeaderboardPosition', () => {
+    const mockCampaignId = 'perps-campaign-api-2';
+    const mockSubscriptionId = 'sub-perps-1';
+    const mockToken = 'test-bearer-token';
+    const mockPosition = {
+      rank: 4,
+      pnl: 12.5,
+      notionalVolume: 8000,
+      marginDeployed: 1200,
+      qualified: true,
+      neighbors: [],
+      computedAt: '2025-08-15T12:00:00.000Z',
+    };
+
+    beforeEach(() => {
+      mockGetSubscriptionToken.mockResolvedValue({
+        success: true,
+        token: mockToken,
+      });
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: jest.fn().mockResolvedValue(mockPosition),
+      } as unknown as Response);
+    });
+
+    it('calls the authenticated me endpoint and returns the position', async () => {
+      const result = await service.getPerpsTradingCampaignLeaderboardPosition(
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+
+      expect(mockFetch).toHaveBeenCalledWith(
+        `https://uat.rewards.test/perps-trading/${mockCampaignId}/leaderboard/me`,
+        expect.objectContaining({
+          method: 'GET',
+          headers: expect.objectContaining({
+            'rewards-access-token': mockToken,
+          }),
+        }),
+      );
+      expect(result).toEqual(mockPosition);
+    });
+
+    it('returns null on 404', async () => {
+      mockFetch.mockResolvedValue({ ok: false, status: 404 } as Response);
+
+      const result = await service.getPerpsTradingCampaignLeaderboardPosition(
+        mockCampaignId,
+        mockSubscriptionId,
+      );
+
+      expect(result).toBeNull();
+    });
+
+    it('throws on non-404 error responses', async () => {
+      mockFetch.mockResolvedValue({ ok: false, status: 503 } as Response);
+
+      await expect(
+        service.getPerpsTradingCampaignLeaderboardPosition(
+          mockCampaignId,
+          mockSubscriptionId,
+        ),
+      ).rejects.toThrow(
+        'Get perps trading campaign leaderboard position failed: 503',
+      );
+    });
+  });
+
+  describe('getPerpsTradingCampaignVolume', () => {
+    const mockCampaignId = 'perps-campaign-api-3';
+    const mockVolume = {
+      totalUsdVolume: '2500000',
+    };
+
+    beforeEach(() => {
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: jest.fn().mockResolvedValue(mockVolume),
+      } as unknown as Response);
+    });
+
+    it('calls the public volume stats endpoint with GET and returns data', async () => {
+      const result =
+        await service.getPerpsTradingCampaignVolume(mockCampaignId);
+
+      expect(mockFetch).toHaveBeenCalledWith(
+        `https://uat.rewards.test/perps-trading/${mockCampaignId}/stats/total-volume`,
+        expect.objectContaining({ method: 'GET' }),
+      );
+      expect(result).toEqual(mockVolume);
+    });
+
+    it('throws when response is not ok', async () => {
+      mockFetch.mockResolvedValue({ ok: false, status: 500 } as Response);
+
+      await expect(
+        service.getPerpsTradingCampaignVolume(mockCampaignId),
+      ).rejects.toThrow('Get perps trading campaign volume failed: 500');
+    });
+  });
 });
diff --git a/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.ts b/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.ts
index dec6ea02b0d..28b22224532 100644
--- a/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.ts
+++ b/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.ts
@@ -35,6 +35,10 @@ import type {
   PaginatedOndoGmActivityDto,
   OndoGmCampaignDepositsDto,
   OndoGmCampaignParticipantOutcomeDto,
+  PerpsTradingCampaignLeaderboardDto,
+  PerpsTradingCampaignLeaderboardPositionDto,
+  PerpsTradingCampaignVolumeDto,
+  PerpsTradingCampaignParticipantOutcomeDto,
 } from '../types';
 import { getSubscriptionToken } from '../utils/multi-subscription-token-vault';
 import Logger from '../../../../../util/Logger';
@@ -263,6 +267,25 @@ export interface RewardsDataServiceGetOndoCampaignParticipantOutcomeAction {
   handler: RewardsDataService['getOndoCampaignParticipantOutcome'];
 }
 
+export interface RewardsDataServiceGetPerpsTradingCampaignLeaderboardAction {
+  type: `${typeof SERVICE_NAME}:getPerpsTradingCampaignLeaderboard`;
+  handler: RewardsDataService['getPerpsTradingCampaignLeaderboard'];
+}
+
+export interface RewardsDataServiceGetPerpsTradingCampaignLeaderboardPositionAction {
+  type: `${typeof SERVICE_NAME}:getPerpsTradingCampaignLeaderboardPosition`;
+  handler: RewardsDataService['getPerpsTradingCampaignLeaderboardPosition'];
+}
+
+export interface RewardsDataServiceGetPerpsTradingCampaignVolumeAction {
+  type: `${typeof SERVICE_NAME}:getPerpsTradingCampaignVolume`;
+  handler: RewardsDataService['getPerpsTradingCampaignVolume'];
+}
+export interface RewardsDataServiceGetPerpsTradingCampaignParticipantOutcomeAction {
+  type: `${typeof SERVICE_NAME}:getPerpsTradingCampaignParticipantOutcome`;
+  handler: RewardsDataService['getPerpsTradingCampaignParticipantOutcome'];
+}
+
 export interface RewardsDataServiceGetRewardsEnvUrlAction {
   type: `${typeof SERVICE_NAME}:getRewardsEnvUrl`;
   handler: RewardsDataService['getRewardsEnvUrl'];
@@ -334,7 +357,11 @@ export type RewardsDataServiceActions =
   | RewardsDataServiceGetOndoCampaignActivityAction
   | RewardsDataServiceGetOndoCampaignActivityLastUpdatedAction
   | RewardsDataServiceGetOndoCampaignDepositsAction
-  | RewardsDataServiceGetOndoCampaignParticipantOutcomeAction;
+  | RewardsDataServiceGetOndoCampaignParticipantOutcomeAction
+  | RewardsDataServiceGetPerpsTradingCampaignLeaderboardAction
+  | RewardsDataServiceGetPerpsTradingCampaignLeaderboardPositionAction
+  | RewardsDataServiceGetPerpsTradingCampaignVolumeAction
+  | RewardsDataServiceGetPerpsTradingCampaignParticipantOutcomeAction;
 
 export type RewardsDataServiceMessenger = Messenger<
   typeof SERVICE_NAME,
@@ -509,6 +536,22 @@ export class RewardsDataService {
       `${SERVICE_NAME}:getOndoCampaignParticipantOutcome`,
       this.getOndoCampaignParticipantOutcome.bind(this),
     );
+    this.#messenger.registerActionHandler(
+      `${SERVICE_NAME}:getPerpsTradingCampaignLeaderboard`,
+      this.getPerpsTradingCampaignLeaderboard.bind(this),
+    );
+    this.#messenger.registerActionHandler(
+      `${SERVICE_NAME}:getPerpsTradingCampaignLeaderboardPosition`,
+      this.getPerpsTradingCampaignLeaderboardPosition.bind(this),
+    );
+    this.#messenger.registerActionHandler(
+      `${SERVICE_NAME}:getPerpsTradingCampaignVolume`,
+      this.getPerpsTradingCampaignVolume.bind(this),
+    );
+    this.#messenger.registerActionHandler(
+      `${SERVICE_NAME}:getPerpsTradingCampaignParticipantOutcome`,
+      this.getPerpsTradingCampaignParticipantOutcome.bind(this),
+    );
     this.#messenger.registerActionHandler(
       `${SERVICE_NAME}:getRewardsEnvUrl`,
       this.getRewardsEnvUrl.bind(this),
@@ -1720,4 +1763,96 @@ export class RewardsDataService {
 
     return (await response.json()) as OndoGmCampaignParticipantOutcomeDto;
   }
+
+  /**
+   * Get the Perps Trading Campaign leaderboard (top 20 entries, no tiers).
+   * Public endpoint — no authentication required.
+   * @param campaignId - The campaign ID.
+   */
+  async getPerpsTradingCampaignLeaderboard(
+    campaignId: string,
+  ): Promise<PerpsTradingCampaignLeaderboardDto> {
+    const response = await this.makeRequest(
+      `/perps-trading/${campaignId}/leaderboard`,
+      { method: 'GET' },
+    );
+
+    if (!response.ok) {
+      throw new Error(
+        `Get perps trading campaign leaderboard failed: ${response.status}`,
+      );
+    }
+
+    return (await response.json()) as PerpsTradingCampaignLeaderboardDto;
+  }
+
+  /**
+   * Get the current user's position on the Perps Trading Campaign leaderboard.
+   * Authenticated endpoint.
+   * @param campaignId - The campaign ID.
+   * @param subscriptionId - The subscription ID for authentication.
+   * @returns The user's position, or null if not found (404).
+   */
+  async getPerpsTradingCampaignLeaderboardPosition(
+    campaignId: string,
+    subscriptionId: string,
+  ): Promise<PerpsTradingCampaignLeaderboardPositionDto | null> {
+    const response = await this.makeRequest(
+      `/perps-trading/${campaignId}/leaderboard/me`,
+      { method: 'GET' },
+      subscriptionId,
+    );
+
+    if (response.status === 404) {
+      return null;
+    }
+
+    if (!response.ok) {
+      throw new Error(
+        `Get perps trading campaign leaderboard position failed: ${response.status}`,
+      );
+    }
+
+    return (await response.json()) as PerpsTradingCampaignLeaderboardPositionDto;
+  }
+
+  /**
+   * Get the Perps Trading Campaign volume stats.
+   * Public endpoint — no authentication required.
+   * @param campaignId - The campaign ID.
+   */
+  async getPerpsTradingCampaignVolume(
+    campaignId: string,
+  ): Promise<PerpsTradingCampaignVolumeDto> {
+    const response = await this.makeRequest(
+      `/perps-trading/${campaignId}/stats/total-volume`,
+      { method: 'GET' },
+    );
+
+    if (!response.ok) {
+      throw new Error(
+        `Get perps trading campaign volume failed: ${response.status}`,
+      );
+    }
+
+    return (await response.json()) as PerpsTradingCampaignVolumeDto;
+  }
+
+  async getPerpsTradingCampaignParticipantOutcome(
+    campaignId: string,
+    subscriptionId: string,
+  ): Promise<PerpsTradingCampaignParticipantOutcomeDto> {
+    const response = await this.makeRequest(
+      `/perps-trading/${campaignId}/outcome/me`,
+      { method: 'GET' },
+      subscriptionId,
+    );
+    if (!response.ok) {
+      throw new Error(
+        `Get Perps Trading participant outcome failed: ${response.status}`,
+      );
+    }
+
+    return (await response.json()) as PerpsTradingCampaignParticipantOutcomeDto;
+  }
 }
diff --git a/app/core/Engine/controllers/rewards-controller/types.ts b/app/core/Engine/controllers/rewards-controller/types.ts
index 0f47cb275fe..be6feb66841 100644
--- a/app/core/Engine/controllers/rewards-controller/types.ts
+++ b/app/core/Engine/controllers/rewards-controller/types.ts
@@ -93,6 +93,7 @@ export interface ApplyBonusCodeDto {
  */
 export enum CampaignType {
   ONDO_HOLDING = 'ONDO_HOLDING',
+  PERPS_TRADING = 'PERPS_TRADING',
   SEASON_1 = 'SEASON_1',
 }
 
@@ -566,16 +567,33 @@ export type OndoGmCampaignDepositsDto = {
   totalUsdDeposited: string;
 };
 
-export type OndoGmCampaignParticipantOutcomeStatus = 'pending' | 'finalized';
+export type CampaignParticipantOutcomeStatus = 'pending' | 'finalized';
 
-export interface OndoGmCampaignParticipantOutcomeDto {
+export interface BaseCampaignParticipantOutcomeDto {
   subscriptionId: string;
-  outcomeStatus: OndoGmCampaignParticipantOutcomeStatus;
+  outcomeStatus: CampaignParticipantOutcomeStatus;
   winnerVerificationCode?: string | null;
+}
+
+/** @deprecated Use CampaignParticipantOutcomeStatus */
+export type OndoGmCampaignParticipantOutcomeStatus =
+  CampaignParticipantOutcomeStatus;
+
+export interface OndoGmCampaignParticipantOutcomeDto
+  extends BaseCampaignParticipantOutcomeDto {
   tierRank?: number;
   tier?: string;
 }
 
+/** @deprecated Use CampaignParticipantOutcomeStatus */
+export type PerpsTradingCampaignParticipantOutcomeStatus =
+  CampaignParticipantOutcomeStatus;
+
+export interface PerpsTradingCampaignParticipantOutcomeDto
+  extends BaseCampaignParticipantOutcomeDto {
+  rank?: number | null;
+}
+
 /**
  * Cached portfolio payload (explicit shape for Json / StateConstraint compatibility).
  */
@@ -697,6 +715,108 @@ export type OndoGmCampaignDepositsState = {
   lastFetched: number;
 };
 
+// ─── Perps Trading Campaign ────────────────────────────────────────────────
+
+/**
+ * A single entry in the Perps Trading Campaign leaderboard (no tiers).
+ */
+export interface PerpsTradingCampaignLeaderboardEntry {
+  rank: number;
+  referralCode: string;
+  /** Signed USD PnL for the campaign window */
+  pnl: number;
+  /** true when notional volume ≥ $25k AND margin deployed ≥ $1k */
+  qualified: boolean;
+}
+
+/**
+ * Response DTO for GET /perps-trading/:campaignId/leaderboard (public, no auth).
+ */
+export interface PerpsTradingCampaignLeaderboardDto {
+  campaignId: string;
+  /** ISO timestamp — display as "last updated" (refreshes ~every 15 min) */
+  computedAt: string;
+  entries: PerpsTradingCampaignLeaderboardEntry[];
+  totalParticipants: number;
+}
+
+/**
+ * Response DTO for GET /perps-trading/:campaignId/leaderboard/me (authenticated).
+ */
+export interface PerpsTradingCampaignLeaderboardPositionDto {
+  rank: number;
+  /** Signed USD PnL */
+  pnl: number;
+  /** Cumulative notional volume traded during the competition window (USD) */
+  notionalVolume: number;
+  /** Cumulative initial margin deployed during the competition window (USD) */
+  marginDeployed: number;
+  qualified: boolean;
+  neighbors: PerpsTradingCampaignLeaderboardEntry[];
+  computedAt: string;
+}
+
+/**
+ * Response DTO for GET /perps-trading/:campaignId/stats/volume (public).
+ */
+export interface PerpsTradingCampaignVolumeDto {
+  /** Current aggregate notional volume across all participants (USD string) */
+  totalUsdVolume: string;
+}
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type PerpsTradingCampaignLeaderboardState = {
+  campaignId: string;
+  computedAt: string;
+  entries: {
+    rank: number;
+    referralCode: string;
+    pnl: number;
+    qualified: boolean;
+  }[];
+  totalParticipants: number;
+  lastFetched: number;
+};
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type PerpsTradingCampaignLeaderboardPositionFoundState = {
+  rank: number;
+  pnl: number;
+  notionalVolume: number;
+  marginDeployed: number;
+  qualified: boolean;
+  neighbors: {
+    rank: number;
+    referralCode: string;
+    pnl: number;
+    qualified: boolean;
+  }[];
+  computedAt: string;
+  lastFetched: number;
+};
+
+/** Sentinel stored when the API returns null (user not on leaderboard), so the TTL is respected. */
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type PerpsTradingCampaignLeaderboardPositionNotFoundState = {
+  notFound: true;
+  lastFetched: number;
+};
+
+export type PerpsTradingCampaignLeaderboardPositionState =
+  | PerpsTradingCampaignLeaderboardPositionFoundState
+  | PerpsTradingCampaignLeaderboardPositionNotFoundState;
+
+/**
+ * Cached campaign volume (explicit shape for Json / StateConstraint compatibility).
+ */
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type PerpsTradingCampaignVolumeState = {
+  totalUsdVolume: string;
+  lastFetched: number;
+};
+
+// ─── End Perps Trading Campaign ────────────────────────────────────────────
+
 /**
  * State for cached leaderboard data in the controller
  */
@@ -1846,6 +1966,18 @@ export type RewardsControllerState = {
   };
   /** Ondo campaign deposits keyed by campaignId (public endpoint). */
   ondoCampaignDeposits: { [campaignId: string]: OndoGmCampaignDepositsState };
+  /** Perps Trading Campaign leaderboard keyed by campaignId (public endpoint). */
+  perpsTradingCampaignLeaderboard: {
+    [campaignId: string]: PerpsTradingCampaignLeaderboardState;
+  };
+  /** Perps Trading Campaign leaderboard position keyed by compositeId (subscriptionId:campaignId). */
+  perpsTradingCampaignLeaderboardPositions: {
+    [compositeId: string]: PerpsTradingCampaignLeaderboardPositionState;
+  };
+  /** Perps Trading Campaign volume keyed by campaignId (public endpoint). */
+  perpsTradingCampaignVolume: {
+    [campaignId: string]: PerpsTradingCampaignVolumeState;
+  };
   /**
    * History of points estimates for Customer Support diagnostics.
    * Stores the last N successful estimates to verify user-reported discrepancies.
diff --git a/app/core/Engine/controllers/transaction-controller/metrics_properties/base.test.ts b/app/core/Engine/controllers/transaction-controller/metrics_properties/base.test.ts
index acad8bf98c3..1df3ef755da 100644
--- a/app/core/Engine/controllers/transaction-controller/metrics_properties/base.test.ts
+++ b/app/core/Engine/controllers/transaction-controller/metrics_properties/base.test.ts
@@ -104,6 +104,8 @@ describe('getTransactionTypeValue', () => {
     ['predict_deposit', TransactionType.predictDeposit],
     ['predict_withdraw', TransactionType.predictWithdraw],
     ['perps_withdraw', TransactionType.perpsWithdraw],
+    ['money_account_deposit', TransactionType.moneyAccountDeposit],
+    ['money_account_withdraw', TransactionType.moneyAccountWithdraw],
     ['musd_conversion', TransactionType.musdConversion],
     ['musd_claim', TransactionType.musdClaim],
   ])('returns %s if nested transaction type is %s', (expected, nestedType) => {
diff --git a/app/core/Engine/controllers/transaction-controller/metrics_properties/base.ts b/app/core/Engine/controllers/transaction-controller/metrics_properties/base.ts
index dd1abdae43b..f3892d459c0 100644
--- a/app/core/Engine/controllers/transaction-controller/metrics_properties/base.ts
+++ b/app/core/Engine/controllers/transaction-controller/metrics_properties/base.ts
@@ -74,6 +74,18 @@ export function getTransactionTypeValue(
     return 'predict_claim';
   }
 
+  if (
+    hasTransactionType(transactionMeta, [TransactionType.moneyAccountDeposit])
+  ) {
+    return 'money_account_deposit';
+  }
+
+  if (
+    hasTransactionType(transactionMeta, [TransactionType.moneyAccountWithdraw])
+  ) {
+    return 'money_account_withdraw';
+  }
+
   if (hasTransactionType(transactionMeta, [TransactionType.musdConversion])) {
     return 'musd_conversion';
   }
diff --git a/app/core/Engine/controllers/transaction-controller/metrics_properties/gas.test.ts b/app/core/Engine/controllers/transaction-controller/metrics_properties/gas.test.ts
index 9b3f47537c8..eccb5ec8f98 100644
--- a/app/core/Engine/controllers/transaction-controller/metrics_properties/gas.test.ts
+++ b/app/core/Engine/controllers/transaction-controller/metrics_properties/gas.test.ts
@@ -14,10 +14,12 @@ const mockGetNativeTokenAddress = getNativeTokenAddress as jest.MockedFunction<
   typeof getNativeTokenAddress
 >;
 
+const MOCK_CHECKSUMMED_ADDRESS = '0x44934055428d2eF7E3F97D98187f2459007fa49F';
+
 const createMockState = (
   balance: string = '0x100000000000000000',
   chainId: string = '0x1',
-  address: string = '0xuser',
+  address: string = MOCK_CHECKSUMMED_ADDRESS,
 ): RootState =>
   ({
     engine: {
@@ -25,7 +27,7 @@ const createMockState = (
         AccountTrackerController: {
           accountsByChainId: {
             [chainId]: {
-              [address.toLowerCase()]: { balance },
+              [address]: { balance },
             },
           },
         },
@@ -40,7 +42,11 @@ const createMockRequest = (
   eventType: TRANSACTION_EVENTS.TRANSACTION_FINALIZED,
   transactionMeta: {
     chainId: '0x1',
-    txParams: { from: '0xuser', gas: '0x5208', gasPrice: '0x1' },
+    txParams: {
+      from: MOCK_CHECKSUMMED_ADDRESS,
+      gas: '0x5208',
+      gasPrice: '0x1',
+    },
     ...overrides,
   } as TransactionMeta,
   allTransactions: [],
@@ -139,7 +145,7 @@ describe('getGasMetricsProperties', () => {
     const request = createMockRequest(
       {
         txParams: {
-          from: '0xuser',
+          from: MOCK_CHECKSUMMED_ADDRESS,
           gas: '0x5208',
           gasPrice: '0x100000000000000000',
         },
@@ -156,7 +162,11 @@ describe('getGasMetricsProperties', () => {
     const state = createMockState('0x100000000000000000');
     const request = createMockRequest(
       {
-        txParams: { from: '0xuser', gas: '0x1', gasPrice: '0x1' },
+        txParams: {
+          from: MOCK_CHECKSUMMED_ADDRESS,
+          gas: '0x1',
+          gasPrice: '0x1',
+        },
       },
       state,
     );
diff --git a/app/core/Engine/controllers/transaction-controller/metrics_properties/gas.ts b/app/core/Engine/controllers/transaction-controller/metrics_properties/gas.ts
index a03cce2f579..1fecc3c869c 100644
--- a/app/core/Engine/controllers/transaction-controller/metrics_properties/gas.ts
+++ b/app/core/Engine/controllers/transaction-controller/metrics_properties/gas.ts
@@ -11,6 +11,8 @@ import type {
   TransactionMetricsBuilderRequest,
 } from '../types';
 import type { RootState } from '../../../../../reducers';
+import { selectAccountsByChainId } from '../../../../../selectors/accountTrackerController';
+import { safeToChecksumAddress } from '../../../../../util/address';
 
 export function getGasMetricsProperties({
   transactionMeta,
@@ -88,10 +90,13 @@ function getNativeBalance(
   chainId: string,
   address: string,
 ): BigNumber {
-  const accountsByChainId =
-    state.engine?.backgroundState?.AccountTrackerController?.accountsByChainId;
+  const accountsByChainId = selectAccountsByChainId(state);
 
-  const account = accountsByChainId?.[chainId]?.[address?.toLowerCase()];
+  const checksummedAddress = safeToChecksumAddress(address);
+  const account =
+    checksummedAddress !== undefined
+      ? accountsByChainId?.[chainId]?.[checksummedAddress]
+      : undefined;
 
   return new BigNumber((account?.balance as Hex) ?? '0x0');
 }
diff --git a/app/core/Engine/controllers/transaction-controller/metrics_properties/metamask-pay.test.ts b/app/core/Engine/controllers/transaction-controller/metrics_properties/metamask-pay.test.ts
index df0f7c4c620..d849fea411d 100644
--- a/app/core/Engine/controllers/transaction-controller/metrics_properties/metamask-pay.test.ts
+++ b/app/core/Engine/controllers/transaction-controller/metrics_properties/metamask-pay.test.ts
@@ -83,6 +83,75 @@ describe('Metamask Pay Metrics', () => {
     });
   });
 
+  it.each([
+    TransactionType.moneyAccountDeposit,
+    TransactionType.moneyAccountWithdraw,
+  ])('returns nothing if %s without controller state', (type) => {
+    request.transactionMeta.type = type;
+
+    const result = getMetaMaskPayProperties(request);
+
+    expect(result).toStrictEqual({
+      properties: {},
+      sensitiveProperties: {},
+    });
+  });
+
+  it.each([
+    [TransactionType.moneyAccountDeposit, 'money_account_deposit'],
+    [TransactionType.moneyAccountWithdraw, 'money_account_withdraw'],
+  ])(
+    'derives mm_pay_use_case=%s for %s parent',
+    (parentType, expectedUseCase) => {
+      getStateMock.mockReturnValue({
+        engine: {
+          backgroundState: {
+            TokensController: { allTokens: {} },
+            TransactionPayController: {
+              transactionData: {
+                'parent-1': {
+                  paymentToken: { symbol: 'USDC', chainId: '0x1' },
+                  quotes: [{ strategy: TransactionPayStrategy.Relay }],
+                  tokens: [{ skipIfBalance: false, amountUsd: '50' }],
+                  totals: {
+                    targetAmount: { usd: '49.5', fiat: '49.5' },
+                    fees: {
+                      metaMask: { usd: '0', fiat: '0' },
+                      provider: { usd: '0.2', fiat: '0.2' },
+                      sourceNetwork: { estimate: { usd: '0.1', fiat: '0.1' } },
+                      targetNetwork: { usd: '0', fiat: '0' },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      } as never);
+
+      request.allTransactions = [
+        {
+          id: 'parent-1',
+          type: parentType,
+          metamaskPay: { chainId: '0x1', tokenAddress: '0xA0b8' },
+          requiredTransactionIds: ['child-1'],
+        } as unknown as TransactionMeta,
+      ];
+
+      const result = getMetaMaskPayProperties(request);
+
+      expect(result).toStrictEqual({
+        properties: expect.objectContaining({
+          mm_pay: true,
+          mm_pay_use_case: expectedUseCase,
+          mm_pay_token_selected: 'USDC',
+          mm_pay_chain_selected: '0x1',
+        }),
+        sensitiveProperties: {},
+      });
+    },
+  );
+
   it('derives parent mm_pay_* properties for child transaction from controller state', () => {
     getStateMock.mockReturnValue({
       engine: {
diff --git a/app/core/Engine/controllers/transaction-controller/metrics_properties/metamask-pay.ts b/app/core/Engine/controllers/transaction-controller/metrics_properties/metamask-pay.ts
index 72fe5cebe67..11e090c0531 100644
--- a/app/core/Engine/controllers/transaction-controller/metrics_properties/metamask-pay.ts
+++ b/app/core/Engine/controllers/transaction-controller/metrics_properties/metamask-pay.ts
@@ -20,6 +20,8 @@ import { BigNumber } from 'bignumber.js';
 const FOUR_BYTE_SAFE_PROXY_CREATE = '0xa1884d2c';
 
 const PAY_TYPES = [
+  TransactionType.moneyAccountDeposit,
+  TransactionType.moneyAccountWithdraw,
   TransactionType.perpsDeposit,
   TransactionType.perpsWithdraw,
   TransactionType.predictDeposit,
@@ -31,6 +33,8 @@ const USE_CASE_MAP: [TransactionType[], string][] = [
   [[TransactionType.predictDeposit], 'predict_deposit'],
   [[TransactionType.perpsDeposit], 'perps_deposit'],
   [[TransactionType.perpsWithdraw], 'perps_withdraw'],
+  [[TransactionType.moneyAccountDeposit], 'money_account_deposit'],
+  [[TransactionType.moneyAccountWithdraw], 'money_account_withdraw'],
 ];
 
 export const getMetaMaskPayProperties: TransactionMetricsBuilder = ({
diff --git a/app/core/Engine/controllers/transaction-controller/metrics_properties/swap-transaction-ab-tests.test.ts b/app/core/Engine/controllers/transaction-controller/metrics_properties/swap-transaction-ab-tests.test.ts
index f4526a23efa..ad5180be115 100644
--- a/app/core/Engine/controllers/transaction-controller/metrics_properties/swap-transaction-ab-tests.test.ts
+++ b/app/core/Engine/controllers/transaction-controller/metrics_properties/swap-transaction-ab-tests.test.ts
@@ -108,4 +108,34 @@ describe('getSwapTransactionActiveAbTestProperties', () => {
       sensitiveProperties: {},
     });
   });
+
+  it.each([
+    TransactionType.moneyAccountDeposit,
+    TransactionType.moneyAccountWithdraw,
+  ])('returns active_ab_tests for %s Transaction Added', (type) => {
+    const abTests = [
+      { key: 'homeTMCU470AbtestTrendingSections', value: 'trendingSections' },
+    ];
+    registerTransactionAbTestAttributionForIds([TX_ID], abTests);
+    const request = createMockRequest({
+      transactionMeta: {
+        id: TX_ID,
+        type,
+      } as never,
+    });
+
+    expect(getSwapTransactionActiveAbTestProperties(request)).toEqual({
+      properties: {
+        active_ab_tests: [
+          {
+            key: 'homeTMCU470AbtestTrendingSections',
+            value: 'trendingSections',
+            key_value_pair:
+              'homeTMCU470AbtestTrendingSections=trendingSections',
+          },
+        ],
+      },
+      sensitiveProperties: {},
+    });
+  });
 });
diff --git a/app/core/Engine/controllers/transaction-controller/metrics_properties/swap-transaction-ab-tests.ts b/app/core/Engine/controllers/transaction-controller/metrics_properties/swap-transaction-ab-tests.ts
index 1cd60d3b5c2..420d1732f35 100644
--- a/app/core/Engine/controllers/transaction-controller/metrics_properties/swap-transaction-ab-tests.ts
+++ b/app/core/Engine/controllers/transaction-controller/metrics_properties/swap-transaction-ab-tests.ts
@@ -18,6 +18,8 @@ const TRANSACTION_TYPES_FOR_ACTIVE_AB_TESTS: ReadonlySet<TransactionType> =
     TransactionType.swapApproval,
     TransactionType.swapAndSend,
     TransactionType.bridgeApproval,
+    TransactionType.moneyAccountDeposit,
+    TransactionType.moneyAccountWithdraw,
     TransactionType.perpsAcrossDeposit,
     TransactionType.perpsDeposit,
     TransactionType.perpsDepositAndOrder,
diff --git a/app/core/Engine/messengers/accounts-controller-messenger/index.ts b/app/core/Engine/messengers/accounts-controller-messenger/index.ts
index c212982b87b..25dabc7df88 100644
--- a/app/core/Engine/messengers/accounts-controller-messenger/index.ts
+++ b/app/core/Engine/messengers/accounts-controller-messenger/index.ts
@@ -1,5 +1,4 @@
 import { AccountsControllerMessenger } from '@metamask/accounts-controller';
-import { SnapControllerStateChangeEvent } from '../../controllers/snaps';
 import { RootExtendedMessenger, RootMessenger } from '../../types';
 import {
   SnapKeyringAccountAssetListUpdatedEvent,
@@ -41,7 +40,6 @@ export function getAccountsControllerMessenger(
     ],
     events: [
       'KeyringController:stateChange',
-      SnapControllerStateChangeEvent,
       SnapKeyringAccountAssetListUpdatedEvent,
       SnapKeyringAccountBalancesUpdatedEvent,
       SnapKeyringAccountTransactionsUpdatedEvent,
diff --git a/app/core/Engine/messengers/accounts-controller-messenger/types.ts b/app/core/Engine/messengers/accounts-controller-messenger/types.ts
index dced77fb080..366af8593ed 100644
--- a/app/core/Engine/messengers/accounts-controller-messenger/types.ts
+++ b/app/core/Engine/messengers/accounts-controller-messenger/types.ts
@@ -5,7 +5,6 @@ import {
   KeyringControllerGetKeyringsByTypeAction,
   KeyringControllerStateChangeEvent,
 } from '@metamask/keyring-controller';
-import { SnapControllerStateChangeEvent } from '@metamask/snaps-controllers';
 
 /**
  * The actions that the AccountsControllerMessenger can use.
@@ -19,6 +18,5 @@ export type AccountsControllerMessengerActions =
  * The events that the AccountsControllerMessenger can handle.
  */
 export type AccountsControllerMessengerEvents =
-  | SnapControllerStateChangeEvent
   | KeyringControllerAccountRemovedEvent
   | KeyringControllerStateChangeEvent;
diff --git a/app/core/Engine/messengers/chomp-api-service-messenger.test.ts b/app/core/Engine/messengers/chomp-api-service-messenger.test.ts
new file mode 100644
index 00000000000..bf61a8b5557
--- /dev/null
+++ b/app/core/Engine/messengers/chomp-api-service-messenger.test.ts
@@ -0,0 +1,45 @@
+import {
+  Messenger,
+  type MessengerActions,
+  type MessengerEvents,
+  MOCK_ANY_NAMESPACE,
+  type MockAnyNamespace,
+} from '@metamask/messenger';
+import { ChompApiServiceMessenger } from '@metamask/chomp-api-service';
+import { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
+import {
+  getChompApiServiceMessenger,
+  getChompApiServiceInitMessenger,
+} from './chomp-api-service-messenger';
+
+type RootMessenger = Messenger<
+  MockAnyNamespace,
+  | MessengerActions<ChompApiServiceMessenger>
+  | RemoteFeatureFlagControllerGetStateAction,
+  MessengerEvents<ChompApiServiceMessenger>
+>;
+
+function getRootMessenger(): RootMessenger {
+  return new Messenger({
+    namespace: MOCK_ANY_NAMESPACE,
+  });
+}
+
+describe('getChompApiServiceMessenger', () => {
+  it('returns a restricted messenger', () => {
+    const rootMessenger: RootMessenger = getRootMessenger();
+    const chompApiServiceMessenger = getChompApiServiceMessenger(rootMessenger);
+
+    expect(chompApiServiceMessenger).toBeInstanceOf(Messenger);
+  });
+});
+
+describe('getChompApiServiceInitMessenger', () => {
+  it('returns a restricted init messenger', () => {
+    const rootMessenger: RootMessenger = getRootMessenger();
+    const chompApiServiceInitMessenger =
+      getChompApiServiceInitMessenger(rootMessenger);
+
+    expect(chompApiServiceInitMessenger).toBeInstanceOf(Messenger);
+  });
+});
diff --git a/app/core/Engine/messengers/chomp-api-service-messenger.ts b/app/core/Engine/messengers/chomp-api-service-messenger.ts
new file mode 100644
index 00000000000..65f8238e182
--- /dev/null
+++ b/app/core/Engine/messengers/chomp-api-service-messenger.ts
@@ -0,0 +1,66 @@
+import {
+  Messenger,
+  type MessengerActions,
+  type MessengerEvents,
+} from '@metamask/messenger';
+import type { ChompApiServiceMessenger } from '@metamask/chomp-api-service';
+import type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
+import type { RootMessenger } from '../types';
+
+/**
+ * Get the messenger for the CHOMP API service. This is scoped to the
+ * actions and events that the CHOMP API service is allowed to handle.
+ *
+ * @param rootMessenger - The root messenger.
+ * @returns The ChompApiServiceMessenger.
+ */
+export function getChompApiServiceMessenger(
+  rootMessenger: RootMessenger,
+): ChompApiServiceMessenger {
+  const messenger = new Messenger<
+    'ChompApiService',
+    MessengerActions<ChompApiServiceMessenger>,
+    MessengerEvents<ChompApiServiceMessenger>,
+    RootMessenger
+  >({
+    namespace: 'ChompApiService',
+    parent: rootMessenger,
+  });
+  rootMessenger.delegate({
+    actions: ['AuthenticationController:getBearerToken'],
+    events: [],
+    messenger,
+  });
+  return messenger;
+}
+
+type AllowedInitializationActions = RemoteFeatureFlagControllerGetStateAction;
+
+export type ChompApiServiceInitMessenger = ReturnType<
+  typeof getChompApiServiceInitMessenger
+>;
+
+/**
+ * Get a messenger restricted to the actions and events that the
+ * CHOMP API service initialization is allowed to handle.
+ *
+ * @param rootMessenger - The root messenger.
+ * @returns The restricted init messenger.
+ */
+export function getChompApiServiceInitMessenger(rootMessenger: RootMessenger) {
+  const messenger = new Messenger<
+    'ChompApiServiceInitialization',
+    AllowedInitializationActions,
+    never,
+    RootMessenger
+  >({
+    namespace: 'ChompApiServiceInitialization',
+    parent: rootMessenger,
+  });
+  rootMessenger.delegate({
+    actions: ['RemoteFeatureFlagController:getState'],
+    events: [],
+    messenger,
+  });
+  return messenger;
+}
diff --git a/app/core/Engine/messengers/index.ts b/app/core/Engine/messengers/index.ts
index 1a3bc7ee755..eb6d972f328 100644
--- a/app/core/Engine/messengers/index.ts
+++ b/app/core/Engine/messengers/index.ts
@@ -112,7 +112,10 @@ import {
 } from './identity/user-storage-controller-messenger';
 import { getAuthenticationControllerMessenger } from './identity/authentication-controller-messenger';
 import { getEarnControllerMessenger } from './earn-controller-messenger';
-import { getMoneyAccountControllerMessenger } from './money-account-controller-messenger';
+import {
+  getMoneyAccountControllerInitMessenger,
+  getMoneyAccountControllerMessenger,
+} from './money-account-controller-messenger';
 import { getMoneyAccountBalanceServiceMessenger } from './money-account-balance-service-messenger';
 import { getGeolocationApiServiceMessenger } from './geolocation-api-service-messenger';
 import { getGeolocationControllerMessenger } from './geolocation-controller-messenger';
@@ -158,6 +161,14 @@ import { getCardControllerMessenger } from './card-controller-messenger';
 import { getClientControllerMessenger } from './client-controller-messenger';
 import { getComplianceServiceMessenger } from './compliance/compliance-service-messenger';
 import { getComplianceControllerMessenger } from './compliance/compliance-controller-messenger';
+import {
+  getChompApiServiceMessenger,
+  getChompApiServiceInitMessenger,
+} from './chomp-api-service-messenger';
+import {
+  getMoneyAccountUpgradeControllerMessenger,
+  getMoneyAccountUpgradeControllerInitMessenger,
+} from './money-account-upgrade-controller-messenger';
 
 /**
  * The messenger factories for the messenger clients that have been modularized.
@@ -340,7 +351,7 @@ export const MESSENGER_FACTORIES = {
   },
   MoneyAccountController: {
     getMessenger: getMoneyAccountControllerMessenger,
-    getInitMessenger: noop,
+    getInitMessenger: getMoneyAccountControllerInitMessenger,
   },
   MultichainTransactionsController: {
     getMessenger: getMultichainTransactionsControllerMessenger,
@@ -505,4 +516,12 @@ export const MESSENGER_FACTORIES = {
     getMessenger: getComplianceControllerMessenger,
     getInitMessenger: noop,
   },
+  ChompApiService: {
+    getMessenger: getChompApiServiceMessenger,
+    getInitMessenger: getChompApiServiceInitMessenger,
+  },
+  MoneyAccountUpgradeController: {
+    getMessenger: getMoneyAccountUpgradeControllerMessenger,
+    getInitMessenger: getMoneyAccountUpgradeControllerInitMessenger,
+  },
 } as const;
diff --git a/app/core/Engine/messengers/money-account-controller-messenger.ts b/app/core/Engine/messengers/money-account-controller-messenger.ts
index 114fc6d5352..9d662772697 100644
--- a/app/core/Engine/messengers/money-account-controller-messenger.ts
+++ b/app/core/Engine/messengers/money-account-controller-messenger.ts
@@ -4,6 +4,12 @@ import {
   MessengerEvents,
 } from '@metamask/messenger';
 import { MoneyAccountControllerMessenger } from '@metamask/money-account-controller';
+import {
+  RemoteFeatureFlagControllerGetStateAction,
+  RemoteFeatureFlagControllerState,
+} from '@metamask/remote-feature-flag-controller';
+import { KeyringControllerGetStateAction } from '@metamask/keyring-controller';
+import { ControllerStateChangeEvent } from '@metamask/base-controller';
 import { RootMessenger } from '../types';
 
 /**
@@ -35,3 +41,48 @@ export function getMoneyAccountControllerMessenger(
 
   return messenger;
 }
+
+type AllowedInitializationActions =
+  | RemoteFeatureFlagControllerGetStateAction
+  | KeyringControllerGetStateAction;
+
+type AllowedInitializationEvents = ControllerStateChangeEvent<
+  'RemoteFeatureFlagController',
+  RemoteFeatureFlagControllerState
+>;
+
+export type MoneyAccountControllerInitMessenger = ReturnType<
+  typeof getMoneyAccountControllerInitMessenger
+>;
+
+/**
+ * Get the messenger for the money account controller initialization. This is
+ * scoped to the actions and events needed during initialization.
+ *
+ * @param rootMessenger - The root messenger.
+ * @returns The MoneyAccountControllerInitMessenger.
+ */
+export function getMoneyAccountControllerInitMessenger(
+  rootMessenger: RootMessenger,
+) {
+  const messenger = new Messenger<
+    'MoneyAccountControllerInit',
+    AllowedInitializationActions,
+    AllowedInitializationEvents,
+    RootMessenger
+  >({
+    namespace: 'MoneyAccountControllerInit',
+    parent: rootMessenger,
+  });
+
+  rootMessenger.delegate({
+    actions: [
+      'RemoteFeatureFlagController:getState',
+      'KeyringController:getState',
+    ],
+    events: ['RemoteFeatureFlagController:stateChange'],
+    messenger,
+  });
+
+  return messenger;
+}
diff --git a/app/core/Engine/messengers/money-account-upgrade-controller-messenger.test.ts b/app/core/Engine/messengers/money-account-upgrade-controller-messenger.test.ts
new file mode 100644
index 00000000000..3cd6f913e8a
--- /dev/null
+++ b/app/core/Engine/messengers/money-account-upgrade-controller-messenger.test.ts
@@ -0,0 +1,52 @@
+import {
+  Messenger,
+  type MessengerActions,
+  type MessengerEvents,
+  MOCK_ANY_NAMESPACE,
+  type MockAnyNamespace,
+} from '@metamask/messenger';
+import { MoneyAccountUpgradeControllerMessenger } from '@metamask/money-account-upgrade-controller';
+import {
+  KeyringControllerGetStateAction,
+  KeyringControllerUnlockEvent,
+} from '@metamask/keyring-controller';
+import {
+  getMoneyAccountUpgradeControllerMessenger,
+  getMoneyAccountUpgradeControllerInitMessenger,
+} from './money-account-upgrade-controller-messenger';
+
+type RootMessenger = Messenger<
+  MockAnyNamespace,
+  | MessengerActions<MoneyAccountUpgradeControllerMessenger>
+  | KeyringControllerGetStateAction,
+  | MessengerEvents<MoneyAccountUpgradeControllerMessenger>
+  | KeyringControllerUnlockEvent
+>;
+
+function getRootMessenger(): RootMessenger {
+  return new Messenger({
+    namespace: MOCK_ANY_NAMESPACE,
+  });
+}
+
+describe('getMoneyAccountUpgradeControllerMessenger', () => {
+  it('returns a restricted messenger', () => {
+    const rootMessenger: RootMessenger = getRootMessenger();
+    const moneyAccountUpgradeControllerMessenger =
+      getMoneyAccountUpgradeControllerMessenger(rootMessenger);
+
+    expect(moneyAccountUpgradeControllerMessenger).toBeInstanceOf(Messenger);
+  });
+});
+
+describe('getMoneyAccountUpgradeControllerInitMessenger', () => {
+  it('returns a restricted init messenger', () => {
+    const rootMessenger: RootMessenger = getRootMessenger();
+    const moneyAccountUpgradeControllerInitMessenger =
+      getMoneyAccountUpgradeControllerInitMessenger(rootMessenger);
+
+    expect(moneyAccountUpgradeControllerInitMessenger).toBeInstanceOf(
+      Messenger,
+    );
+  });
+});
diff --git a/app/core/Engine/messengers/money-account-upgrade-controller-messenger.ts b/app/core/Engine/messengers/money-account-upgrade-controller-messenger.ts
new file mode 100644
index 00000000000..1d8aeeb06e9
--- /dev/null
+++ b/app/core/Engine/messengers/money-account-upgrade-controller-messenger.ts
@@ -0,0 +1,81 @@
+import {
+  Messenger,
+  type MessengerActions,
+  type MessengerEvents,
+} from '@metamask/messenger';
+import type { MoneyAccountUpgradeControllerMessenger } from '@metamask/money-account-upgrade-controller';
+import type {
+  KeyringControllerGetStateAction,
+  KeyringControllerUnlockEvent,
+} from '@metamask/keyring-controller';
+import type { RootMessenger } from '../types';
+
+/**
+ * Get a messenger restricted to the actions and events that the
+ * money account upgrade controller is allowed to handle.
+ *
+ * @param rootMessenger - The root messenger to restrict.
+ * @returns The restricted controller messenger.
+ */
+export function getMoneyAccountUpgradeControllerMessenger(
+  rootMessenger: RootMessenger,
+): MoneyAccountUpgradeControllerMessenger {
+  const messenger = new Messenger<
+    'MoneyAccountUpgradeController',
+    MessengerActions<MoneyAccountUpgradeControllerMessenger>,
+    MessengerEvents<MoneyAccountUpgradeControllerMessenger>,
+    RootMessenger
+  >({
+    namespace: 'MoneyAccountUpgradeController',
+    parent: rootMessenger,
+  });
+  rootMessenger.delegate({
+    actions: [
+      'ChompApiService:associateAddress',
+      'ChompApiService:createUpgrade',
+      'ChompApiService:getServiceDetails',
+      'KeyringController:signEip7702Authorization',
+      'KeyringController:signPersonalMessage',
+      'NetworkController:findNetworkClientIdByChainId',
+      'NetworkController:getNetworkClientById',
+    ],
+    events: [],
+    messenger,
+  });
+  return messenger;
+}
+
+type InitActions = KeyringControllerGetStateAction;
+
+type InitEvents = KeyringControllerUnlockEvent;
+
+export type MoneyAccountUpgradeControllerInitMessenger = ReturnType<
+  typeof getMoneyAccountUpgradeControllerInitMessenger
+>;
+
+/**
+ * Get a messenger restricted to the actions and events that the
+ * money account upgrade controller initialization is allowed to handle.
+ *
+ * @param rootMessenger - The root messenger.
+ * @returns The restricted init messenger.
+ */
+export function getMoneyAccountUpgradeControllerInitMessenger(
+  rootMessenger: RootMessenger,
+) {
+  const messenger = new Messenger<
+    'MoneyAccountUpgradeControllerInitialization',
+    InitActions,
+    InitEvents,
+    RootMessenger
+  >({
+    namespace: 'MoneyAccountUpgradeControllerInitialization',
+    parent: rootMessenger,
+  });
+  rootMessenger.delegate({
+    actions: ['KeyringController:getState'],
+    events: ['KeyringController:unlock'],
+    messenger,
+  });
+  return messenger;
+}
diff --git a/app/core/Engine/messengers/rewards-controller-messenger/index.ts b/app/core/Engine/messengers/rewards-controller-messenger/index.ts
index a6c6e538c66..d6e48449142 100644
--- a/app/core/Engine/messengers/rewards-controller-messenger/index.ts
+++ b/app/core/Engine/messengers/rewards-controller-messenger/index.ts
@@ -2,6 +2,8 @@ import {
   Messenger,
   MessengerActions,
   MessengerEvents,
+  type ActionConstraint,
+  type EventConstraint,
 } from '@metamask/messenger';
 
 import {
@@ -66,6 +68,10 @@ import {
   RewardsDataServiceGetOndoCampaignActivityLastUpdatedAction,
   RewardsDataServiceGetOndoCampaignDepositsAction,
   RewardsDataServiceGetOndoCampaignParticipantOutcomeAction,
+  RewardsDataServiceGetPerpsTradingCampaignLeaderboardAction,
+  RewardsDataServiceGetPerpsTradingCampaignLeaderboardPositionAction,
+  RewardsDataServiceGetPerpsTradingCampaignVolumeAction,
+  RewardsDataServiceGetPerpsTradingCampaignParticipantOutcomeAction,
 } from '../../controllers/rewards-controller/services/rewards-data-service';
 import { RootMessenger } from '../../types';
 
@@ -118,7 +124,11 @@ type AllowedActions =
   | RewardsDataServiceGetOndoCampaignActivityAction
   | RewardsDataServiceGetOndoCampaignActivityLastUpdatedAction
   | RewardsDataServiceGetOndoCampaignDepositsAction
-  | RewardsDataServiceGetOndoCampaignParticipantOutcomeAction;
+  | RewardsDataServiceGetOndoCampaignParticipantOutcomeAction
+  | RewardsDataServiceGetPerpsTradingCampaignLeaderboardAction
+  | RewardsDataServiceGetPerpsTradingCampaignLeaderboardPositionAction
+  | RewardsDataServiceGetPerpsTradingCampaignVolumeAction
+  | RewardsDataServiceGetPerpsTradingCampaignParticipantOutcomeAction;
 
 // Don't reexport as per guidelines
 type AllowedEvents =
@@ -144,8 +154,21 @@ export function getRewardsControllerMessenger(
     parent: rootMessenger,
   });
 
+  // Widen `messenger` to a generic `Messenger<...>` for the delegate call only.
+  // `delegate`'s constraint is `DelegatedActions extends (MessengerActions<Delegatee> & Action)['type'][]`,
+  // which performs an intersection between the delegatee's action union and the
+  // root messenger's action union. With ~46 actions on each side, this hits
+  // TypeScript's union-type-complexity ceiling (TS2590). Erasing the delegatee's
+  // specific action union to the open `ActionConstraint` short-circuits the
+  // intersection without affecting the runtime behavior — `delegate` only
+  // inspects the action/event name strings at runtime.
   rootMessenger.delegate({
-    messenger,
+    messenger: messenger as Messenger<
+      typeof name,
+      ActionConstraint,
+      EventConstraint,
+      RootMessenger
+    >,
     actions: [
       'AccountsController:getSelectedMultichainAccount',
       'AccountTreeController:getAccountsFromSelectedAccountGroup',
@@ -193,12 +216,16 @@ export function getRewardsControllerMessenger(
       'RewardsDataService:getOndoCampaignActivityLastUpdated',
       'RewardsDataService:getOndoCampaignDeposits',
       'RewardsDataService:getOndoCampaignParticipantOutcome',
+      'RewardsDataService:getPerpsTradingCampaignLeaderboard',
+      'RewardsDataService:getPerpsTradingCampaignLeaderboardPosition',
+      'RewardsDataService:getPerpsTradingCampaignVolume',
+      'RewardsDataService:getPerpsTradingCampaignParticipantOutcome',
     ],
     events: [
       'AccountTreeController:selectedAccountGroupChange',
       'KeyringController:unlock',
     ],
-  });
+  } as Parameters<RootMessenger['delegate']>[0]);
 
   return messenger;
 }
diff --git a/app/core/Engine/types.ts b/app/core/Engine/types.ts
index a8edcf1d905..58d74743a1c 100644
--- a/app/core/Engine/types.ts
+++ b/app/core/Engine/types.ts
@@ -458,6 +458,17 @@ import {
   ComplianceServiceActions,
   ComplianceServiceEvents,
 } from '@metamask/compliance-controller';
+import {
+  ChompApiService,
+  ChompApiServiceActions,
+  type ChompApiServiceEvents,
+} from '@metamask/chomp-api-service';
+import {
+  MoneyAccountUpgradeController,
+  MoneyAccountUpgradeControllerActions,
+  MoneyAccountUpgradeControllerEvents,
+  MoneyAccountUpgradeControllerState,
+} from '@metamask/money-account-upgrade-controller';
 import { captureException } from '@sentry/react-native';
 
 /**
@@ -471,6 +482,7 @@ type RequiredControllers = Omit<
   | 'SnapKeyringBuilder'
   | 'StorageService'
   | 'ComplianceService'
+  | 'ChompApiService'
 >;
 
 /**
@@ -484,6 +496,7 @@ type OptionalControllers = Pick<
   | 'SnapKeyringBuilder'
   | 'StorageService'
   | 'ComplianceService'
+  | 'ChompApiService'
 >;
 
 type PermissionsByRpcMethod = ReturnType<typeof getPermissionSpecifications>;
@@ -590,7 +603,9 @@ type GlobalActions =
   | AuthenticatedUserStorageActions
   | ComplianceControllerActions
   | ComplianceServiceActions
-  | TransakServiceActions;
+  | TransakServiceActions
+  | ChompApiServiceActions
+  | MoneyAccountUpgradeControllerActions;
 
 type GlobalEvents =
   ///: BEGIN:ONLY_INCLUDE_IF(sample-feature)
@@ -675,7 +690,9 @@ type GlobalEvents =
   | AuthenticatedUserStorageEvents
   | ComplianceControllerEvents
   | ComplianceServiceEvents
-  | TransakServiceEvents;
+  | TransakServiceEvents
+  | ChompApiServiceEvents
+  | MoneyAccountUpgradeControllerEvents;
 
 /**
  * Type definition for the messenger used in the Engine.
@@ -805,6 +822,8 @@ export type MessengerClients = {
   ComplianceService: ComplianceService;
   ComplianceController: ComplianceController;
   TransakService: TransakService;
+  ChompApiService: ChompApiService;
+  MoneyAccountUpgradeController: MoneyAccountUpgradeController;
 };
 
 /**
@@ -889,6 +908,7 @@ export type EngineState = {
   AiDigestController: AiDigestControllerState;
   SocialController: SocialControllerState;
   ComplianceController: ComplianceControllerState;
+  MoneyAccountUpgradeController: MoneyAccountUpgradeControllerState;
 };
 
 /** Messenger client names */
@@ -1006,7 +1026,9 @@ export type MessengerClientsToInitialize =
   | 'SocialController'
   | 'AuthenticatedUserStorageService'
   | 'ComplianceService'
-  | 'ComplianceController';
+  | 'ComplianceController'
+  | 'ChompApiService'
+  | 'MoneyAccountUpgradeController';
 
 /**
  * Callback that returns a controller messenger for a specific controller.
diff --git a/app/core/HardwareWallet/HardwareWalletProvider.tsx b/app/core/HardwareWallet/HardwareWalletProvider.tsx
index 7af5f7add2f..d5ebe72d2c7 100644
--- a/app/core/HardwareWallet/HardwareWalletProvider.tsx
+++ b/app/core/HardwareWallet/HardwareWalletProvider.tsx
@@ -88,6 +88,7 @@ export const HardwareWalletProvider: React.FC<HardwareWalletProviderProps> = ({
 
   const awaitingConfirmationRejectRef = useRef<(() => void) | null>(null);
   const operationTypeRef = useRef<'transaction' | 'message' | null>(null);
+  const qrScanRetryHandlerRef = useRef<(() => void) | null>(null);
 
   const [analyticsFlow, setAnalyticsFlow] = useState(
     HardwareWalletAnalyticsFlow.Connection,
@@ -136,6 +137,10 @@ export const HardwareWalletProvider: React.FC<HardwareWalletProviderProps> = ({
     [handleError],
   );
 
+  const setQrScanRetryHandler = useCallback((handler: (() => void) | null) => {
+    qrScanRetryHandlerRef.current = handler;
+  }, []);
+
   const showAwaitingConfirmation = useCallback(
     (operationType: 'transaction' | 'message', onReject?: () => void) => {
       DevLogger.log(
@@ -187,6 +192,26 @@ export const HardwareWalletProvider: React.FC<HardwareWalletProviderProps> = ({
     }
     await retryEnsureDeviceReady();
   }, [handleCloseFlow, retryEnsureDeviceReady]);
+
+  const handleRetryQrScan = useCallback(() => {
+    if (operationTypeRef.current !== null) {
+      updateConnectionState({
+        status: ConnectionStatus.AwaitingConfirmation,
+        deviceId: deviceId ?? 'unknown',
+        operationType: operationTypeRef.current,
+      });
+      return;
+    }
+
+    const retryQrScan = qrScanRetryHandlerRef.current;
+    updateConnectionState({ status: ConnectionStatus.Disconnected });
+    if (!retryQrScan) {
+      return;
+    }
+
+    retryQrScan();
+  }, [deviceId, updateConnectionState]);
+
   const handleAwaitingConfirmationCancel = useCallback(() => {
     DevLogger.log('[HardwareWallet] handleAwaitingConfirmationCancel');
     const onReject = awaitingConfirmationRejectRef.current;
@@ -248,6 +273,7 @@ export const HardwareWalletProvider: React.FC<HardwareWalletProviderProps> = ({
       setTargetWalletType: setters.setTargetWalletType,
       setPendingOperationAddress,
       showHardwareWalletError,
+      setQrScanRetryHandler,
       showAwaitingConfirmation,
       hideAwaitingConfirmation,
       qr: qrSigningValue,
@@ -261,6 +287,7 @@ export const HardwareWalletProvider: React.FC<HardwareWalletProviderProps> = ({
       setters.setTargetWalletType,
       setPendingOperationAddress,
       showHardwareWalletError,
+      setQrScanRetryHandler,
       showAwaitingConfirmation,
       hideAwaitingConfirmation,
       qrSigningValue,
@@ -282,6 +309,7 @@ export const HardwareWalletProvider: React.FC<HardwareWalletProviderProps> = ({
         onAwaitingConfirmationCancel={handleAwaitingConfirmationCancel}
         onConnectionSuccess={handleBottomSheetConnectionSuccess}
         onCTAClicked={trackCTAClicked}
+        onRetryQrScan={handleRetryQrScan}
       />
     </HardwareWalletContext.Provider>
   );
diff --git a/app/core/HardwareWallet/adapters/LedgerBluetoothAdapter.test.ts b/app/core/HardwareWallet/adapters/LedgerBluetoothAdapter.test.ts
index ce6e37f45a6..a1bec5422d4 100644
--- a/app/core/HardwareWallet/adapters/LedgerBluetoothAdapter.test.ts
+++ b/app/core/HardwareWallet/adapters/LedgerBluetoothAdapter.test.ts
@@ -271,6 +271,27 @@ describe('LedgerBluetoothAdapter', () => {
   });
 
   describe('disconnect', () => {
+    it('forces disconnectDevice when BLE disconnect already cleared transport but deviceId remains', async () => {
+      await adapter.connect('device-123');
+      mockedTransportBLE.disconnectDevice.mockClear();
+
+      const disconnectHandler = mockTransportInstance.on.mock.calls.find(
+        (call: [string, () => void]) => call[0] === 'disconnect',
+      )?.[1];
+      expect(disconnectHandler).toBeDefined();
+      disconnectHandler?.();
+
+      expect(adapter.isConnected()).toBe(false);
+      expect(adapter.getConnectedDeviceId()).toBe('device-123');
+
+      await adapter.disconnect();
+
+      expect(mockedTransportBLE.disconnectDevice).toHaveBeenCalledWith(
+        'device-123',
+      );
+      expect(adapter.getConnectedDeviceId()).toBeNull();
+    });
+
     it('closes transport and resets state', async () => {
       await adapter.connect('device-123');
       await adapter.disconnect();
@@ -625,6 +646,21 @@ describe('LedgerBluetoothAdapter', () => {
       },
     );
 
+    it('retries when address verification fails with message-based transient GATT error', async () => {
+      jest.mocked(connectLedgerHardware).mockResolvedValue('Ethereum');
+      const gattError = new Error('GATT server disconnected');
+      gattError.name = 'Error';
+      mockGetAddress
+        .mockRejectedValueOnce(gattError)
+        .mockResolvedValueOnce({ address: '0x1234' });
+
+      const result = await adapter.ensureDeviceReady('device-123');
+
+      expect(result).toBe(true);
+      expect(mockGetAddress).toHaveBeenCalledTimes(2);
+      expect(connectLedgerHardware).toHaveBeenCalledTimes(2);
+    });
+
     it('emits DeviceLocked when getAddress fails with Locked device message', async () => {
       jest.mocked(connectLedgerHardware).mockResolvedValue('Ethereum');
       mockGetAddress.mockRejectedValueOnce(
@@ -687,6 +723,160 @@ describe('LedgerBluetoothAdapter', () => {
 
       jest.useRealTimers();
     });
+
+    it('retries when error message contains "disconnected" even with generic Error name', async () => {
+      const genericBleError = new Error('Device disconnected during operation');
+      genericBleError.name = 'Error';
+      jest
+        .mocked(connectLedgerHardware)
+        .mockRejectedValueOnce(genericBleError)
+        .mockResolvedValueOnce('Ethereum');
+      mockGetAddress.mockResolvedValue({ address: '0x1234' });
+
+      const result = await adapter.ensureDeviceReady('device-123');
+
+      expect(result).toBe(true);
+      expect(connectLedgerHardware).toHaveBeenCalledTimes(2);
+    });
+
+    it('retries when error message contains "bluetooth connection" even with generic Error name', async () => {
+      const genericBleError = new Error('Bluetooth connection failed');
+      genericBleError.name = 'Error';
+      jest
+        .mocked(connectLedgerHardware)
+        .mockRejectedValueOnce(genericBleError)
+        .mockResolvedValueOnce('Ethereum');
+      mockGetAddress.mockResolvedValue({ address: '0x1234' });
+
+      const result = await adapter.ensureDeviceReady('device-123');
+
+      expect(result).toBe(true);
+      expect(connectLedgerHardware).toHaveBeenCalledTimes(2);
+    });
+
+    it('retries when error message contains "bluetooth transfer" even with generic Error name', async () => {
+      const genericBleError = new Error('Bluetooth transfer interrupted');
+      genericBleError.name = 'Error';
+      jest
+        .mocked(connectLedgerHardware)
+        .mockRejectedValueOnce(genericBleError)
+        .mockResolvedValueOnce('Ethereum');
+      mockGetAddress.mockResolvedValue({ address: '0x1234' });
+
+      const result = await adapter.ensureDeviceReady('device-123');
+
+      expect(result).toBe(true);
+      expect(connectLedgerHardware).toHaveBeenCalledTimes(2);
+    });
+
+    it('retries when error message contains "connection lost" even with generic Error name', async () => {
+      const genericBleError = new Error('The connection lost unexpectedly');
+      genericBleError.name = 'Error';
+      jest
+        .mocked(connectLedgerHardware)
+        .mockRejectedValueOnce(genericBleError)
+        .mockResolvedValueOnce('Ethereum');
+      mockGetAddress.mockResolvedValue({ address: '0x1234' });
+
+      const result = await adapter.ensureDeviceReady('device-123');
+
+      expect(result).toBe(true);
+      expect(connectLedgerHardware).toHaveBeenCalledTimes(2);
+    });
+
+    it('retries when error message contains "gatt" even with generic Error name', async () => {
+      const genericBleError = new Error('GATT operation failed');
+      genericBleError.name = 'Error';
+      jest
+        .mocked(connectLedgerHardware)
+        .mockRejectedValueOnce(genericBleError)
+        .mockResolvedValueOnce('Ethereum');
+      mockGetAddress.mockResolvedValue({ address: '0x1234' });
+
+      const result = await adapter.ensureDeviceReady('device-123');
+
+      expect(result).toBe(true);
+      expect(connectLedgerHardware).toHaveBeenCalledTimes(2);
+    });
+
+    it('retries when error message contains "ble error" even with generic Error name', async () => {
+      const genericBleError = new Error('Native BLE error on channel');
+      genericBleError.name = 'Error';
+      jest
+        .mocked(connectLedgerHardware)
+        .mockRejectedValueOnce(genericBleError)
+        .mockResolvedValueOnce('Ethereum');
+      mockGetAddress.mockResolvedValue({ address: '0x1234' });
+
+      const result = await adapter.ensureDeviceReady('device-123');
+
+      expect(result).toBe(true);
+      expect(connectLedgerHardware).toHaveBeenCalledTimes(2);
+    });
+
+    it.each([
+      'Bluetooth is off',
+      'Bluetooth not supported',
+      'Not authorized to use Bluetooth',
+      'Bluetooth permission denied',
+      'Bluetooth scan failed',
+    ])(
+      'does not retry for non-transient bluetooth error: "%s"',
+      async (errorMessage) => {
+        const nonTransientError = new Error(errorMessage);
+        nonTransientError.name = 'Error';
+        jest.mocked(connectLedgerHardware).mockRejectedValue(nonTransientError);
+
+        await expect(adapter.ensureDeviceReady('device-123')).rejects.toThrow();
+        expect(connectLedgerHardware).toHaveBeenCalledTimes(1);
+      },
+    );
+
+    it('forces BLE cleanup when transport is null but deviceId exists during retry', async () => {
+      const disconnectError = new Error('Disconnected');
+      disconnectError.name = 'DisconnectedDevice';
+      jest
+        .mocked(connectLedgerHardware)
+        .mockRejectedValueOnce(disconnectError)
+        .mockResolvedValueOnce('Ethereum');
+      mockGetAddress.mockResolvedValue({ address: '0x1234' });
+
+      await adapter.ensureDeviceReady('device-123');
+
+      expect(mockedTransportBLE.disconnectDevice).toHaveBeenCalled();
+    });
+
+    it('closes transport when openEthereumAppOnLedger fails', async () => {
+      jest.mocked(connectLedgerHardware).mockResolvedValue('BOLOS');
+      const { openEthereumAppOnLedger } = jest.requireMock(
+        '../../Ledger/Ledger',
+      ) as { openEthereumAppOnLedger: jest.Mock };
+      openEthereumAppOnLedger.mockRejectedValueOnce(
+        new Error('User cancelled'),
+      );
+
+      await adapter.ensureDeviceReady('device-123');
+
+      expect(mockedTransportBLE.disconnectDevice).toHaveBeenCalledWith(
+        'device-123',
+      );
+    });
+
+    it('closes transport when closeRunningAppOnLedger fails', async () => {
+      jest.mocked(connectLedgerHardware).mockResolvedValue('Bitcoin');
+      const { closeRunningAppOnLedger } = jest.requireMock(
+        '../../Ledger/Ledger',
+      ) as { closeRunningAppOnLedger: jest.Mock };
+      closeRunningAppOnLedger.mockRejectedValueOnce(
+        new Error('User cancelled'),
+      );
+
+      await adapter.ensureDeviceReady('device-123');
+
+      expect(mockedTransportBLE.disconnectDevice).toHaveBeenCalledWith(
+        'device-123',
+      );
+    });
   });
 
   describe('reset', () => {
diff --git a/app/core/HardwareWallet/adapters/LedgerBluetoothAdapter.ts b/app/core/HardwareWallet/adapters/LedgerBluetoothAdapter.ts
index 6f1b6a43e0a..f4acb061cbd 100644
--- a/app/core/HardwareWallet/adapters/LedgerBluetoothAdapter.ts
+++ b/app/core/HardwareWallet/adapters/LedgerBluetoothAdapter.ts
@@ -531,6 +531,7 @@ export class LedgerBluetoothAdapter implements HardwareWalletAdapter {
           '[LedgerBluetoothAdapter] Failed to send open app command:',
           openError,
         );
+        await this.#closeTransport();
       }
     } else {
       try {
@@ -547,6 +548,7 @@ export class LedgerBluetoothAdapter implements HardwareWalletAdapter {
           '[LedgerBluetoothAdapter] Failed to close app:',
           closeError,
         );
+        await this.#closeTransport();
       }
     }
   }
@@ -585,9 +587,10 @@ export class LedgerBluetoothAdapter implements HardwareWalletAdapter {
   async #closeTransport(): Promise<void> {
     const transport = this.#transport;
     const deviceId = this.#deviceId;
-    if (transport) {
-      this.#transport = null;
-      try {
+    this.#transport = null;
+
+    try {
+      if (transport) {
         if (deviceId) {
           // TransportBLE.close() queues a delayed disconnect (5s timeout).
           // Force an immediate BLE disconnection so in-flight signing is
@@ -596,9 +599,14 @@ export class LedgerBluetoothAdapter implements HardwareWalletAdapter {
         } else {
           await transport.close();
         }
-      } catch {
-        // Ignore close errors — device may already be disconnected
+      } else if (deviceId) {
+        // Transport already cleared (e.g. by #handleDisconnect) but device
+        // ID still set — force BLE cleanup so the OS stack doesn't keep a
+        // stale connection that blocks the next TransportBLE.open() call.
+        await TransportBLE.disconnectDevice(deviceId);
       }
+    } catch {
+      // Ignore close errors — device may already be disconnected
     }
   }
 
@@ -687,16 +695,30 @@ export class LedgerBluetoothAdapter implements HardwareWalletAdapter {
   /**
    * Check if error is a transient BLE error that can be retried
    * (disconnects during app switch, pairing failures during reconnect, etc.)
+   *
+   * Checks error name first, then falls back to message-based detection
+   * for BLE errors that use generic Error names after a device power-cycle.
    */
   #isTransientBleError(error: unknown): boolean {
     if (!(error instanceof Error)) return false;
+
     const transientBleErrorNames: readonly string[] = [
       ...DISCONNECT_ERROR_NAMES,
       'PairingFailed',
       'PeerRemovedPairing',
       'BleError',
     ];
-    return transientBleErrorNames.includes(error.name);
+    if (transientBleErrorNames.includes(error.name)) return true;
+
+    const message = error.message?.toLowerCase() ?? '';
+    return (
+      message.includes('disconnected') ||
+      message.includes('connection lost') ||
+      message.includes('gatt') ||
+      message.includes('ble error') ||
+      message.includes('bluetooth connection') ||
+      message.includes('bluetooth transfer')
+    );
   }
 
   /**
diff --git a/app/core/HardwareWallet/adapters/QRWalletAdapter.test.ts b/app/core/HardwareWallet/adapters/QRWalletAdapter.test.ts
index 39a73c4f63f..b02fe029338 100644
--- a/app/core/HardwareWallet/adapters/QRWalletAdapter.test.ts
+++ b/app/core/HardwareWallet/adapters/QRWalletAdapter.test.ts
@@ -128,13 +128,11 @@ describe('QRWalletAdapter', () => {
       ).rejects.toThrow('Adapter has been destroyed');
     });
 
-    it('returns true and emits AppOpened (QR wallets are always ready)', async () => {
+    it('returns true when camera permission is granted (QR wallets are always ready)', async () => {
       const result = await adapter.ensureDeviceReady('qr-account-address');
 
       expect(result).toBe(true);
-      expect(onDeviceEvent).toHaveBeenCalledWith({
-        event: DeviceEvent.AppOpened,
-      });
+      expect(onDeviceEvent).not.toHaveBeenCalled();
     });
 
     it('stores device ID', async () => {
@@ -150,6 +148,7 @@ describe('QRWalletAdapter', () => {
       const result = await adapter.ensureDeviceReady('qr-account-address');
 
       expect(result).toBe(false);
+      expect(mockRequestCameraPermission).not.toHaveBeenCalled();
       expect(adapter.getConnectedDeviceId()).toBeNull();
       expect(adapter.isConnected()).toBe(false);
       expect(onDeviceEvent).toHaveBeenCalledWith({
diff --git a/app/core/HardwareWallet/adapters/QRWalletAdapter.ts b/app/core/HardwareWallet/adapters/QRWalletAdapter.ts
index 17ea1f0f864..e76f18e6b81 100644
--- a/app/core/HardwareWallet/adapters/QRWalletAdapter.ts
+++ b/app/core/HardwareWallet/adapters/QRWalletAdapter.ts
@@ -114,12 +114,6 @@ export class QRWalletAdapter implements HardwareWalletAdapter {
 
     DevLogger.log('[QRWalletAdapter] Device is ready');
 
-    // For QR wallets, we consider the "app" to always be open
-    // since there's no app concept like on Ledger
-    this.#emitEvent({
-      event: DeviceEvent.AppOpened,
-    });
-
     return true;
   }
 
@@ -271,12 +265,8 @@ export class QRWalletAdapter implements HardwareWalletAdapter {
         if (newStatus === 'granted') {
           return true;
         }
-
-        this.#emitCameraPermissionDenied();
-        return false;
       }
 
-      // status === 'denied' - emit error event
       this.#emitCameraPermissionDenied();
       return false;
     } catch (error) {
diff --git a/app/core/HardwareWallet/analytics/helpers.test.ts b/app/core/HardwareWallet/analytics/helpers.test.ts
index 6f17db5f33c..2f83faf78f5 100644
--- a/app/core/HardwareWallet/analytics/helpers.test.ts
+++ b/app/core/HardwareWallet/analytics/helpers.test.ts
@@ -16,7 +16,10 @@ import {
   getAnalyticsDeviceType,
   getErrorDetails,
   getAnalyticsFlowFromApproval,
+  getQrHardwareScanErrorAnalyticsProperties,
 } from './helpers';
+import { createQRHardwareScanError, QRHardwareScanErrorType } from '../errors';
+import { QrScanRequestType } from '@metamask/eth-qr-keyring';
 
 describe('analytics helpers', () => {
   describe('getAnalyticsErrorType', () => {
@@ -362,4 +365,105 @@ describe('analytics helpers', () => {
       );
     });
   });
+
+  describe('getQrHardwareScanErrorAnalyticsProperties', () => {
+    it('returns empty object for non-ErrorState', () => {
+      const state: HardwareWalletConnectionState = {
+        status: ConnectionStatus.Disconnected,
+      };
+
+      expect(getQrHardwareScanErrorAnalyticsProperties(state)).toEqual({});
+    });
+
+    it('returns empty object for ErrorState with non-QR error', () => {
+      const error = new HardwareWalletError('Test', {
+        code: ErrorCode.Unknown,
+        severity: Severity.Err,
+        category: Category.Connection,
+        userMessage: 'Test',
+      });
+
+      const state: HardwareWalletConnectionState = {
+        status: ConnectionStatus.ErrorState,
+        error,
+      };
+
+      expect(getQrHardwareScanErrorAnalyticsProperties(state)).toEqual({});
+    });
+
+    it('returns QR scan properties for non-UR QR scanned error', () => {
+      const qrError = createQRHardwareScanError({
+        errorType: QRHardwareScanErrorType.NonURQrScanned,
+        purpose: QrScanRequestType.SIGN,
+        isUrFormat: false,
+      });
+
+      const state: HardwareWalletConnectionState = {
+        status: ConnectionStatus.ErrorState,
+        error: qrError,
+      };
+
+      const result = getQrHardwareScanErrorAnalyticsProperties(state);
+      expect(result).toEqual({
+        error_category: 'non_ur_qr_scanned',
+        is_ur_format: false,
+      });
+    });
+
+    it('returns received_ur_type for wrong UR type error', () => {
+      const qrError = createQRHardwareScanError({
+        errorType: QRHardwareScanErrorType.WrongURType,
+        purpose: QrScanRequestType.SIGN,
+        receivedUrType: 'crypto-account',
+        isUrFormat: true,
+      });
+
+      const state: HardwareWalletConnectionState = {
+        status: ConnectionStatus.ErrorState,
+        error: qrError,
+      };
+
+      const result = getQrHardwareScanErrorAnalyticsProperties(state);
+      expect(result).toEqual({
+        error_category: 'wrong_ur_type',
+        is_ur_format: true,
+        received_ur_type: 'crypto-account',
+      });
+    });
+
+    it('returns empty string for received_ur_type when not provided', () => {
+      const qrError = createQRHardwareScanError({
+        errorType: QRHardwareScanErrorType.WrongURType,
+        purpose: QrScanRequestType.PAIR,
+        isUrFormat: true,
+      });
+
+      const state: HardwareWalletConnectionState = {
+        status: ConnectionStatus.ErrorState,
+        error: qrError,
+      };
+
+      const result = getQrHardwareScanErrorAnalyticsProperties(state);
+      expect(result.received_ur_type).toBe('');
+    });
+
+    it('returns QR scan properties for UR decode error', () => {
+      const qrError = createQRHardwareScanError({
+        errorType: QRHardwareScanErrorType.URDecodeError,
+        purpose: QrScanRequestType.SIGN,
+        isUrFormat: true,
+      });
+
+      const state: HardwareWalletConnectionState = {
+        status: ConnectionStatus.ErrorState,
+        error: qrError,
+      };
+
+      const result = getQrHardwareScanErrorAnalyticsProperties(state);
+      expect(result).toEqual({
+        error_category: 'ur_decode_error',
+        is_ur_format: true,
+      });
+    });
+  });
 });
diff --git a/app/core/HardwareWallet/analytics/helpers.ts b/app/core/HardwareWallet/analytics/helpers.ts
index 45cec023278..7d3bb9fe884 100644
--- a/app/core/HardwareWallet/analytics/helpers.ts
+++ b/app/core/HardwareWallet/analytics/helpers.ts
@@ -4,6 +4,7 @@ import {
   HardwareWalletConnectionState,
   ConnectionStatus,
 } from '@metamask/hw-wallet-sdk';
+import { isQRHardwareScanError, QRHardwareScanErrorType } from '../errors';
 import { ApprovalType } from '@metamask/controller-utils';
 import { TransactionType } from '@metamask/transaction-controller';
 
@@ -186,3 +187,31 @@ export function getErrorDetails(
   }
   return { error_code: '', error_message: '' };
 }
+
+/**
+ * Segment/MetaMetrics properties for QR hardware camera scan failures
+ * (`Hardware Wallet Connection Failed` / recovery UI), when the connection
+ * {@link ConnectionStatus.ErrorState} error is a {@link isQRHardwareScanError}.
+ */
+export function getQrHardwareScanErrorAnalyticsProperties(
+  connectionState: HardwareWalletConnectionState,
+): Record<string, string | boolean> {
+  if (connectionState.status !== ConnectionStatus.ErrorState) {
+    return {};
+  }
+  const { error } = connectionState;
+  if (!isQRHardwareScanError(error)) {
+    return {};
+  }
+  const metadata = error.metadata;
+  const payload: Record<string, string | boolean> = {
+    error_category: metadata.qrHardwareScanErrorType,
+    is_ur_format: metadata.isUrFormat,
+  };
+  if (
+    metadata.qrHardwareScanErrorType === QRHardwareScanErrorType.WrongURType
+  ) {
+    payload.received_ur_type = metadata.receivedUrType ?? '';
+  }
+  return payload;
+}
diff --git a/app/core/HardwareWallet/analytics/index.ts b/app/core/HardwareWallet/analytics/index.ts
index 3c51279adcc..e394183956a 100644
--- a/app/core/HardwareWallet/analytics/index.ts
+++ b/app/core/HardwareWallet/analytics/index.ts
@@ -6,6 +6,7 @@ export {
   getErrorTypeFromConnectionState,
   getAnalyticsDeviceType,
   getErrorDetails,
+  getQrHardwareScanErrorAnalyticsProperties,
 } from './helpers';
 
 export { useHardwareWalletAnalytics } from './useHardwareWalletAnalytics';
diff --git a/app/core/HardwareWallet/analytics/useHardwareWalletAnalytics.test.ts b/app/core/HardwareWallet/analytics/useHardwareWalletAnalytics.test.ts
index 4e4bd3ff5c8..0dd62771d96 100644
--- a/app/core/HardwareWallet/analytics/useHardwareWalletAnalytics.test.ts
+++ b/app/core/HardwareWallet/analytics/useHardwareWalletAnalytics.test.ts
@@ -14,6 +14,8 @@ import {
   HardwareWalletAnalyticsFlow,
 } from './helpers';
 import { MetaMetricsEvents } from '../../Analytics';
+import { createQRHardwareScanError, QRHardwareScanErrorType } from '../errors';
+import { QrScanRequestType } from '@metamask/eth-qr-keyring';
 
 const mockTrackEvent = jest.fn();
 const mockBuild = jest.fn().mockReturnValue({ name: 'built-event' });
@@ -86,6 +88,67 @@ describe('useHardwareWalletAnalytics', () => {
       expect(mockTrackEvent).toHaveBeenCalled();
     });
 
+    it('includes QR scan analytics when error is a QR hardware scan failure', () => {
+      const { rerender } = renderHook(
+        (props) => useHardwareWalletAnalytics(props),
+        { initialProps: defaultOptions },
+      );
+
+      const qrError = createQRHardwareScanError({
+        errorType: QRHardwareScanErrorType.NonURQrScanned,
+        purpose: QrScanRequestType.PAIR,
+        isUrFormat: false,
+      });
+
+      rerender({
+        ...defaultOptions,
+        walletType: HardwareWalletType.Qr,
+        connectionState: {
+          status: ConnectionStatus.ErrorState,
+          error: qrError,
+        },
+      });
+
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({
+          error_type: HardwareWalletAnalyticsErrorType.GenericError,
+          error_category: 'non_ur_qr_scanned',
+          is_ur_format: false,
+        }),
+      );
+    });
+
+    it('includes received_ur_type for wrong UR type QR scan errors', () => {
+      const { rerender } = renderHook(
+        (props) => useHardwareWalletAnalytics(props),
+        { initialProps: defaultOptions },
+      );
+
+      const qrError = createQRHardwareScanError({
+        errorType: QRHardwareScanErrorType.WrongURType,
+        purpose: QrScanRequestType.SIGN,
+        receivedUrType: 'eth-signature',
+        isUrFormat: true,
+      });
+
+      rerender({
+        ...defaultOptions,
+        walletType: HardwareWalletType.Qr,
+        connectionState: {
+          status: ConnectionStatus.ErrorState,
+          error: qrError,
+        },
+      });
+
+      expect(mockAddProperties).toHaveBeenCalledWith(
+        expect.objectContaining({
+          error_category: 'wrong_ur_type',
+          is_ur_format: true,
+          received_ur_type: 'eth-signature',
+        }),
+      );
+    });
+
     it('fires when transitioning to AwaitingApp', () => {
       const { rerender } = renderHook(
         (props) => useHardwareWalletAnalytics(props),
diff --git a/app/core/HardwareWallet/analytics/useHardwareWalletAnalytics.ts b/app/core/HardwareWallet/analytics/useHardwareWalletAnalytics.ts
index 803658f0998..b0a6ff0ddf1 100644
--- a/app/core/HardwareWallet/analytics/useHardwareWalletAnalytics.ts
+++ b/app/core/HardwareWallet/analytics/useHardwareWalletAnalytics.ts
@@ -12,6 +12,7 @@ import {
   getErrorTypeFromConnectionState,
   getAnalyticsDeviceType,
   getErrorDetails,
+  getQrHardwareScanErrorAnalyticsProperties,
   type ErrorDetails,
 } from './helpers';
 
@@ -59,6 +60,7 @@ export function useHardwareWalletAnalytics({
     error_code: '',
     error_message: '',
   });
+  const lastQrScanAnalyticsRef = useRef<Record<string, string | boolean>>({});
   const prevStatusRef = useRef<ConnectionStatus>(ConnectionStatus.Disconnected);
 
   const resetAnalyticsState = useCallback(() => {
@@ -66,6 +68,7 @@ export function useHardwareWalletAnalytics({
     lastErrorTypeRef.current = null;
     lastErrorTypeViewCountRef.current = 0;
     lastErrorDetailsRef.current = { error_code: '', error_message: '' };
+    lastQrScanAnalyticsRef.current = {};
   }, []);
 
   useEffect(() => {
@@ -90,6 +93,9 @@ export function useHardwareWalletAnalytics({
       viewCountsRef.current.set(errorType, newCount);
 
       const errorDetails = getErrorDetails(connectionState);
+      const qrScanAnalytics =
+        getQrHardwareScanErrorAnalyticsProperties(connectionState);
+      lastQrScanAnalyticsRef.current = qrScanAnalytics;
 
       lastErrorTypeRef.current = errorType;
       lastErrorTypeViewCountRef.current = newCount;
@@ -107,6 +113,7 @@ export function useHardwareWalletAnalytics({
             error_type_view_count: newCount,
             error_code: errorDetails.error_code,
             error_message: errorDetails.error_message,
+            ...qrScanAnalytics,
           })
           .build(),
       );
@@ -128,6 +135,7 @@ export function useHardwareWalletAnalytics({
               error_type_view_count: lastErrorTypeViewCountRef.current,
               error_code: lastErrorDetailsRef.current.error_code,
               error_message: lastErrorDetailsRef.current.error_message,
+              ...lastQrScanAnalyticsRef.current,
             }),
           })
           .build(),
@@ -150,6 +158,8 @@ export function useHardwareWalletAnalytics({
     if (!errorType) return;
 
     const errorDetails = getErrorDetails(connectionState);
+    const qrScanAnalytics =
+      getQrHardwareScanErrorAnalyticsProperties(connectionState);
 
     trackEvent(
       createEventBuilder(MetaMetricsEvents.HARDWARE_WALLET_RECOVERY_CTA_CLICKED)
@@ -161,6 +171,7 @@ export function useHardwareWalletAnalytics({
           error_type_view_count: viewCountsRef.current.get(errorType) ?? 1,
           error_code: errorDetails.error_code,
           error_message: errorDetails.error_message,
+          ...qrScanAnalytics,
         })
         .build(),
     );
diff --git a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/HardwareWalletBottomSheet.test.tsx b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/HardwareWalletBottomSheet.test.tsx
index 43acce80ba5..21b22431fe9 100644
--- a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/HardwareWalletBottomSheet.test.tsx
+++ b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/HardwareWalletBottomSheet.test.tsx
@@ -17,6 +17,7 @@ const mockDeviceSelection = {
 };
 const mockActions = {
   retryEnsureDeviceReady: jest.fn(),
+  onRetryQrScan: jest.fn(),
   selectDevice: jest.fn(),
   rescan: jest.fn(),
   connect: jest.fn(),
@@ -55,34 +56,44 @@ jest.mock('./contents', () => ({
   },
 }));
 
-// Track BottomSheet onClose callback
-let lastBottomSheetOnClose: (() => void) | undefined;
+// Track BottomSheet onClose callback (`mock*` prefix: required for use inside jest.mock factory)
+const mockLastBottomSheetOnCloseRef = {
+  current: undefined as (() => void) | undefined,
+};
 
 // Mock bottom sheet
 jest.mock(
   '../../../../component-library/components/BottomSheets/BottomSheet',
   () => {
+    const React = jest.requireActual('react');
     const { View } = jest.requireActual('react-native');
     return {
       __esModule: true,
-      default: ({
-        children,
-        testID,
-        onClose,
-      }: {
-        children: React.ReactNode;
-        testID?: string;
-        onClose?: () => void;
-      }) => {
-        lastBottomSheetOnClose = onClose;
-        return <View testID={testID}>{children}</View>;
-      },
+      default: React.forwardRef(
+        (
+          {
+            children,
+            testID,
+            onClose,
+          }: {
+            children: React.ReactNode;
+            testID?: string;
+            onClose?: () => void;
+          },
+          _ref: React.Ref<unknown>,
+        ) => {
+          // Test double: capture BottomSheet onClose for assertions (not production UI).
+          // eslint-disable-next-line react-compiler/react-compiler -- intentional mock side effect
+          mockLastBottomSheetOnCloseRef.current = onClose;
+          return <View testID={testID}>{children}</View>;
+        },
+      ),
     };
   },
 );
 
 import React from 'react';
-import { render } from '@testing-library/react-native';
+import { act, render } from '@testing-library/react-native';
 import {
   HardwareWalletError,
   ErrorCode,
@@ -91,12 +102,17 @@ import {
   ConnectionStatus,
   HardwareWalletType,
 } from '@metamask/hw-wallet-sdk';
+import { QrScanRequestType } from '@metamask/eth-qr-keyring';
 
 import {
   HardwareWalletBottomSheet,
   HardwareWalletBottomSheetProps,
   HARDWARE_WALLET_BOTTOM_SHEET_TEST_ID,
 } from './HardwareWalletBottomSheet';
+import {
+  createQRHardwareScanError,
+  QRHardwareScanErrorType,
+} from '../../errors';
 
 /**
  * Build default props using the mutable mock objects.
@@ -303,10 +319,10 @@ describe('HardwareWalletBottomSheet', () => {
 
     it('renders when scanning with selected device', () => {
       mockConnectionState.status = ConnectionStatus.Scanning;
-      const device = { id: 'device-1', name: 'Nano X' };
+      const mockDevice = { id: 'device-1', name: 'Nano X' };
       Object.assign(mockDeviceSelection, {
-        devices: [device],
-        selectedDevice: device,
+        devices: [mockDevice],
+        selectedDevice: mockDevice,
         isScanning: false,
       });
       const { getByTestId } = render(
@@ -321,7 +337,7 @@ describe('HardwareWalletBottomSheet', () => {
 
   describe('handleClose behavior', () => {
     beforeEach(() => {
-      lastBottomSheetOnClose = undefined;
+      mockLastBottomSheetOnCloseRef.current = undefined;
     });
 
     it('calls onClose when sheet closes during scanning', () => {
@@ -331,8 +347,8 @@ describe('HardwareWalletBottomSheet', () => {
         <HardwareWalletBottomSheet {...createDefaultProps({ onClose })} />,
       );
 
-      expect(lastBottomSheetOnClose).toBeDefined();
-      lastBottomSheetOnClose?.();
+      expect(mockLastBottomSheetOnCloseRef.current).toBeDefined();
+      mockLastBottomSheetOnCloseRef.current?.();
 
       expect(onClose).toHaveBeenCalled();
     });
@@ -344,8 +360,8 @@ describe('HardwareWalletBottomSheet', () => {
         <HardwareWalletBottomSheet {...createDefaultProps({ onClose })} />,
       );
 
-      expect(lastBottomSheetOnClose).toBeDefined();
-      lastBottomSheetOnClose?.();
+      expect(mockLastBottomSheetOnCloseRef.current).toBeDefined();
+      mockLastBottomSheetOnCloseRef.current?.();
 
       expect(onClose).toHaveBeenCalled();
     });
@@ -360,8 +376,8 @@ describe('HardwareWalletBottomSheet', () => {
         <HardwareWalletBottomSheet {...createDefaultProps({ onClose })} />,
       );
 
-      expect(lastBottomSheetOnClose).toBeDefined();
-      lastBottomSheetOnClose?.();
+      expect(mockLastBottomSheetOnCloseRef.current).toBeDefined();
+      mockLastBottomSheetOnCloseRef.current?.();
 
       expect(onClose).toHaveBeenCalled();
     });
@@ -382,8 +398,8 @@ describe('HardwareWalletBottomSheet', () => {
         <HardwareWalletBottomSheet {...createDefaultProps({ onClose })} />,
       );
 
-      expect(lastBottomSheetOnClose).toBeDefined();
-      lastBottomSheetOnClose?.();
+      expect(mockLastBottomSheetOnCloseRef.current).toBeDefined();
+      mockLastBottomSheetOnCloseRef.current?.();
 
       expect(onClose).toHaveBeenCalled();
     });
@@ -398,8 +414,8 @@ describe('HardwareWalletBottomSheet', () => {
         <HardwareWalletBottomSheet {...createDefaultProps({ onClose })} />,
       );
 
-      expect(lastBottomSheetOnClose).toBeDefined();
-      lastBottomSheetOnClose?.();
+      expect(mockLastBottomSheetOnCloseRef.current).toBeDefined();
+      mockLastBottomSheetOnCloseRef.current?.();
 
       expect(onClose).toHaveBeenCalled();
     });
@@ -417,8 +433,8 @@ describe('HardwareWalletBottomSheet', () => {
         />,
       );
 
-      expect(lastBottomSheetOnClose).toBeDefined();
-      lastBottomSheetOnClose?.();
+      expect(mockLastBottomSheetOnCloseRef.current).toBeDefined();
+      mockLastBottomSheetOnCloseRef.current?.();
 
       expect(onAwaitingConfirmationCancel).toHaveBeenCalled();
       expect(onClose).toHaveBeenCalled();
@@ -436,9 +452,9 @@ describe('HardwareWalletBottomSheet', () => {
 
     it('calls selectDevice when device is selected', () => {
       mockConnectionState.status = ConnectionStatus.Scanning;
-      const device = { id: 'device-1', name: 'Nano X' };
+      const mockDevice = { id: 'device-1', name: 'Nano X' };
       Object.assign(mockDeviceSelection, {
-        devices: [device],
+        devices: [mockDevice],
         selectedDevice: null,
         isScanning: false,
       });
@@ -448,9 +464,9 @@ describe('HardwareWalletBottomSheet', () => {
         d: unknown,
       ) => void;
       expect(onSelectDevice).toBeDefined();
-      onSelectDevice(device);
+      onSelectDevice(mockDevice);
 
-      expect(mockActions.selectDevice).toHaveBeenCalledWith(device);
+      expect(mockActions.selectDevice).toHaveBeenCalledWith(mockDevice);
     });
 
     it('calls rescan when rescan is triggered', () => {
@@ -480,10 +496,10 @@ describe('HardwareWalletBottomSheet', () => {
 
     it('calls connect when device selection is confirmed', async () => {
       mockConnectionState.status = ConnectionStatus.Scanning;
-      const device = { id: 'device-1', name: 'Nano X' };
+      const mockDevice = { id: 'device-1', name: 'Nano X' };
       Object.assign(mockDeviceSelection, {
-        devices: [device],
-        selectedDevice: device,
+        devices: [mockDevice],
+        selectedDevice: mockDevice,
         isScanning: false,
       });
       mockActions.connect.mockResolvedValue(undefined);
@@ -596,4 +612,196 @@ describe('HardwareWalletBottomSheet', () => {
       expect(mockActions.retryEnsureDeviceReady).toHaveBeenCalled();
     });
   });
+
+  describe('QR scan error recovery', () => {
+    it('calls onRetryQrScan instead of retryEnsureDeviceReady for QR scan errors', async () => {
+      Object.assign(mockConnectionState, {
+        status: ConnectionStatus.ErrorState,
+        error: createQRHardwareScanError({
+          errorType: QRHardwareScanErrorType.NonURQrScanned,
+          purpose: QrScanRequestType.SIGN,
+          isUrFormat: false,
+        }),
+      });
+
+      render(
+        <HardwareWalletBottomSheet
+          {...createDefaultProps({ walletType: HardwareWalletType.Qr })}
+        />,
+      );
+
+      await act(async () => {
+        await (
+          lastErrorContentProps.onContinue as (() => Promise<void>) | undefined
+        )?.();
+      });
+
+      expect(mockActions.onRetryQrScan).toHaveBeenCalled();
+      expect(mockActions.retryEnsureDeviceReady).not.toHaveBeenCalled();
+    });
+
+    it('does not auto-open the QR scanner after retrying a pairing QR scan error', async () => {
+      Object.assign(mockConnectionState, {
+        status: ConnectionStatus.ErrorState,
+        error: createQRHardwareScanError({
+          errorType: QRHardwareScanErrorType.NonURQrScanned,
+          purpose: QrScanRequestType.PAIR,
+          isUrFormat: false,
+        }),
+      });
+
+      const { rerender } = render(
+        <HardwareWalletBottomSheet
+          {...createDefaultProps({ walletType: HardwareWalletType.Qr })}
+        />,
+      );
+
+      await act(async () => {
+        await (
+          lastErrorContentProps.onContinue as (() => Promise<void>) | undefined
+        )?.();
+      });
+
+      expect(mockActions.onRetryQrScan).toHaveBeenCalled();
+      expect(mockActions.retryEnsureDeviceReady).not.toHaveBeenCalled();
+
+      Object.assign(mockConnectionState, {
+        status: ConnectionStatus.Disconnected,
+      });
+
+      rerender(
+        <HardwareWalletBottomSheet
+          {...createDefaultProps({ walletType: HardwareWalletType.Qr })}
+        />,
+      );
+
+      Object.assign(mockConnectionState, {
+        status: ConnectionStatus.AwaitingConfirmation,
+        deviceId: 'device-123',
+        operationType: 'transaction',
+      });
+
+      rerender(
+        <HardwareWalletBottomSheet
+          {...createDefaultProps({ walletType: HardwareWalletType.Qr })}
+        />,
+      );
+
+      expect(lastAwaitingConfirmationProps.openQrScannerOnMount).toBe(false);
+    });
+
+    it('clears QR scanner auto-open state before retrying non-QR scan errors', async () => {
+      Object.assign(mockConnectionState, {
+        status: ConnectionStatus.ErrorState,
+        error: createQRHardwareScanError({
+          errorType: QRHardwareScanErrorType.WrongURType,
+          purpose: QrScanRequestType.SIGN,
+          receivedUrType: 'crypto-account',
+          isUrFormat: true,
+        }),
+      });
+
+      const { rerender } = render(
+        <HardwareWalletBottomSheet
+          {...createDefaultProps({ walletType: HardwareWalletType.Qr })}
+        />,
+      );
+
+      await act(async () => {
+        await (
+          lastErrorContentProps.onContinue as (() => Promise<void>) | undefined
+        )?.();
+      });
+
+      Object.assign(mockConnectionState, {
+        status: ConnectionStatus.ErrorState,
+        error: new HardwareWalletError('Test error', {
+          code: ErrorCode.Unknown,
+          severity: Severity.Err,
+          category: Category.Unknown,
+          userMessage: 'Test error',
+        }),
+      });
+
+      rerender(
+        <HardwareWalletBottomSheet
+          {...createDefaultProps({ walletType: HardwareWalletType.Qr })}
+        />,
+      );
+
+      await act(async () => {
+        await (
+          lastErrorContentProps.onContinue as (() => Promise<void>) | undefined
+        )?.();
+      });
+
+      Object.assign(mockConnectionState, {
+        status: ConnectionStatus.AwaitingConfirmation,
+        deviceId: 'device-123',
+        operationType: 'transaction',
+      });
+
+      rerender(
+        <HardwareWalletBottomSheet
+          {...createDefaultProps({ walletType: HardwareWalletType.Qr })}
+        />,
+      );
+
+      expect(lastAwaitingConfirmationProps.openQrScannerOnMount).toBe(false);
+    });
+
+    it('auto-opens the QR scanner after retrying a QR scan error', async () => {
+      Object.assign(mockConnectionState, {
+        status: ConnectionStatus.ErrorState,
+        error: createQRHardwareScanError({
+          errorType: QRHardwareScanErrorType.WrongURType,
+          purpose: QrScanRequestType.SIGN,
+          receivedUrType: 'crypto-account',
+          isUrFormat: true,
+        }),
+      });
+
+      const { rerender } = render(
+        <HardwareWalletBottomSheet
+          {...createDefaultProps({ walletType: HardwareWalletType.Qr })}
+        />,
+      );
+
+      await act(async () => {
+        await (
+          lastErrorContentProps.onContinue as (() => Promise<void>) | undefined
+        )?.();
+      });
+
+      Object.assign(mockConnectionState, {
+        status: ConnectionStatus.AwaitingConfirmation,
+        deviceId: 'device-123',
+        operationType: 'transaction',
+      });
+
+      rerender(
+        <HardwareWalletBottomSheet
+          {...createDefaultProps({ walletType: HardwareWalletType.Qr })}
+        />,
+      );
+
+      expect(lastAwaitingConfirmationProps.openQrScannerOnMount).toBe(true);
+
+      act(() => {
+        (
+          lastAwaitingConfirmationProps.onQrScannerOpened as
+            | (() => void)
+            | undefined
+        )?.();
+      });
+
+      rerender(
+        <HardwareWalletBottomSheet
+          {...createDefaultProps({ walletType: HardwareWalletType.Qr })}
+        />,
+      );
+
+      expect(lastAwaitingConfirmationProps.openQrScannerOnMount).toBe(false);
+    });
+  });
 });
diff --git a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/HardwareWalletBottomSheet.tsx b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/HardwareWalletBottomSheet.tsx
index 7c3eac4651b..09cc9dda61c 100644
--- a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/HardwareWalletBottomSheet.tsx
+++ b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/HardwareWalletBottomSheet.tsx
@@ -12,6 +12,8 @@ import {
   HardwareWalletConnectionState,
   ConnectionStatus,
 } from '@metamask/hw-wallet-sdk';
+import { QrScanRequestType } from '@metamask/eth-qr-keyring';
+import { isQRHardwareScanError } from '../../errors';
 
 import {
   ConnectingContent,
@@ -54,6 +56,8 @@ export interface HardwareWalletBottomSheetProps {
   onAwaitingConfirmationCancel?: () => void;
   /** Callback fired when the user taps the CTA on an error/recovery screen. */
   onCTAClicked?: () => void;
+  /** Callback when the user retries a QR scan error from the bottom sheet. */
+  onRetryQrScan?: () => void;
 }
 
 /**
@@ -82,11 +86,13 @@ export const HardwareWalletBottomSheet: React.FC<
   onConnectionSuccess,
   onAwaitingConfirmationCancel,
   onCTAClicked,
+  onRetryQrScan,
 }) => {
   const { colors } = useTheme();
   const styles = useMemo(() => createStyles(colors), [colors]);
 
   const bottomSheetRef = useRef<BottomSheetRef>(null);
+  const [openQrScannerOnMount, setOpenQrScannerOnMount] = React.useState(false);
 
   const { devices, selectedDevice, isScanning } = deviceSelection;
 
@@ -128,8 +134,27 @@ export const HardwareWalletBottomSheet: React.FC<
 
   const handleErrorContinue = useCallback(async () => {
     onCTAClicked?.();
+    if (
+      walletType === HardwareWalletType.Qr &&
+      connectionState.status === ConnectionStatus.ErrorState &&
+      isQRHardwareScanError(connectionState.error)
+    ) {
+      const qrErrorMetadata = connectionState.error.metadata;
+      setOpenQrScannerOnMount(
+        qrErrorMetadata.qrScanPurpose === QrScanRequestType.SIGN,
+      );
+      onRetryQrScan?.();
+      return;
+    }
+    setOpenQrScannerOnMount(false);
     await retryEnsureDeviceReady();
-  }, [retryEnsureDeviceReady, onCTAClicked]);
+  }, [
+    connectionState,
+    onCTAClicked,
+    onRetryQrScan,
+    retryEnsureDeviceReady,
+    walletType,
+  ]);
 
   const handleErrorDismiss = useCallback(() => {
     onCTAClicked?.();
@@ -165,6 +190,10 @@ export const HardwareWalletBottomSheet: React.FC<
     onClose();
   }, [onClose]);
 
+  const handleQrScannerOpened = useCallback(() => {
+    setOpenQrScannerOnMount(false);
+  }, []);
+
   const renderContent = () => {
     if (!walletType) return null;
     switch (connectionState.status) {
@@ -210,6 +239,8 @@ export const HardwareWalletBottomSheet: React.FC<
             deviceType={walletType}
             operationType={connectionState.operationType}
             onCancel={handleAwaitingConfirmationCancel}
+            openQrScannerOnMount={openQrScannerOnMount}
+            onQrScannerOpened={handleQrScannerOpened}
           />
         );
 
diff --git a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/AwaitingConfirmationContent.test.tsx b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/AwaitingConfirmationContent.test.tsx
index 2a71c07fac7..814081b1666 100644
--- a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/AwaitingConfirmationContent.test.tsx
+++ b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/AwaitingConfirmationContent.test.tsx
@@ -59,15 +59,29 @@ jest.mock('../../../../../components/UI/QRHardware/AnimatedQRScanner', () => ({
   __esModule: true,
   default: ({
     hideModal,
+    onQRHardwareScanError,
+    onModalHideComplete,
     onScanError,
     onScanSuccess,
     visible,
   }: {
     hideModal: () => void;
+    onModalHideComplete?: () => void;
+    onQRHardwareScanError?: (error: Error) => void;
     onScanError: (error: string) => void;
     onScanSuccess: (ur: { cbor: string; type: string }) => void;
     visible: boolean;
   }) => {
+    const ActualReact = jest.requireActual('react');
+    const prevVisibleRef = ActualReact.useRef(visible);
+
+    ActualReact.useEffect(() => {
+      if (prevVisibleRef.current && !visible) {
+        onModalHideComplete?.();
+      }
+      prevVisibleRef.current = visible;
+    }, [visible, onModalHideComplete]);
+
     if (!visible) return null;
     return (
       <MockView testID="animated-qr-scanner-mock">
@@ -81,6 +95,13 @@ jest.mock('../../../../../components/UI/QRHardware/AnimatedQRScanner', () => ({
           title="onScanError"
           onPress={() => onScanError('scan failed')}
         />
+        <MockButton
+          testID="scanner-qr-hardware-error-btn"
+          title="onQRHardwareScanError"
+          onPress={() =>
+            onQRHardwareScanError?.(new Error('qr hardware scan failed'))
+          }
+        />
         <MockButton
           testID="scanner-success-btn"
           title="onScanSuccess"
@@ -164,11 +185,13 @@ describe('AwaitingConfirmationContent', () => {
   const renderComponent = (
     props = {},
     qrSigningOverrides?: Partial<HardwareWalletContextValue['qr']>,
+    contextOverrides?: Partial<HardwareWalletContextValue>,
   ) =>
     renderWithProvider(
       <HardwareWalletContext.Provider
         value={{
           ...defaultHardwareWalletContext,
+          ...contextOverrides,
           qr: {
             ...defaultHardwareWalletContext.qr,
             ...qrSigningOverrides,
@@ -300,6 +323,21 @@ describe('AwaitingConfirmationContent', () => {
       expect(getByTestId('animated-qr-scanner-mock')).toBeOnTheScreen();
     });
 
+    it('opens scanner on mount after QR scan error retry', () => {
+      const onQrScannerOpened = jest.fn();
+      const { getByTestId } = renderComponent(
+        {
+          deviceType: HardwareWalletType.Qr,
+          openQrScannerOnMount: true,
+          onQrScannerOpened,
+        },
+        qrSigningOverrides,
+      );
+
+      expect(getByTestId('animated-qr-scanner-mock')).toBeOnTheScreen();
+      expect(onQrScannerOpened).toHaveBeenCalledTimes(1);
+    });
+
     it('renders spinner in QR flow when not signing QR object', () => {
       const { getByTestId, queryByTestId } = renderComponent(
         { deviceType: HardwareWalletType.Qr },
@@ -405,6 +443,22 @@ describe('AwaitingConfirmationContent', () => {
       expect(getByText('scan failed')).toBeOnTheScreen();
     });
 
+    it('routes QR hardware scan errors to hardware wallet error state', () => {
+      const showHardwareWalletError = jest.fn();
+      const { getByTestId } = renderComponent(
+        { deviceType: HardwareWalletType.Qr },
+        qrSigningOverrides,
+        { showHardwareWalletError },
+      );
+
+      openScanner(getByTestId);
+      fireEvent.press(getByTestId('scanner-qr-hardware-error-btn'));
+
+      expect(showHardwareWalletError).toHaveBeenCalledWith(
+        expect.objectContaining({ message: 'qr hardware scan failed' }),
+      );
+    });
+
     it('dismisses error message when alert is pressed', () => {
       const { stringify } = jest.requireMock('uuid');
       stringify.mockReturnValueOnce('different-request-id');
diff --git a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/AwaitingConfirmationContent.tsx b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/AwaitingConfirmationContent.tsx
index 5e57f6d0148..8cb44cea0dc 100644
--- a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/AwaitingConfirmationContent.tsx
+++ b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/AwaitingConfirmationContent.tsx
@@ -27,6 +27,7 @@ import { HardwareWalletType } from '@metamask/hw-wallet-sdk';
 import { getHardwareWalletTypeName } from '../../../helpers';
 import { ContentLayout } from './ContentLayout';
 import { useHardwareWallet } from '../../../contexts';
+import { useQrScanErrorForwarding } from '../../../hooks/useQrScanErrorForwarding';
 import Engine from '../../../../Engine';
 import AnimatedQRCode from '../../../../../components/UI/QRHardware/AnimatedQRCode';
 import AnimatedQRScannerModal from '../../../../../components/UI/QRHardware/AnimatedQRScanner';
@@ -73,11 +74,21 @@ export interface AwaitingConfirmationContentProps {
   operationType?: string;
   /** Optional callback when user wants to cancel/reject */
   onCancel?: () => void;
+  /** Open the QR scanner as soon as this content mounts after QR error retry. */
+  openQrScannerOnMount?: boolean;
+  /** Callback fired after the mount-triggered QR scanner has opened. */
+  onQrScannerOpened?: () => void;
 }
 
 export const AwaitingConfirmationContent: React.FC<
   AwaitingConfirmationContentProps
-> = ({ deviceType, operationType, onCancel }) => {
+> = ({
+  deviceType,
+  operationType,
+  onCancel,
+  openQrScannerOnMount,
+  onQrScannerOpened,
+}) => {
   const { colors } = useTheme();
   const { createEventBuilder, trackEvent } = useAnalytics();
   const { qr } = useHardwareWallet();
@@ -94,6 +105,15 @@ export const AwaitingConfirmationContent: React.FC<
   const [shouldPause, setShouldPause] = useState(false);
   const [errorMessage, setErrorMessage] = useState<string | undefined>();
 
+  useEffect(() => {
+    if (!openQrScannerOnMount || !isQrFlow || !isSigningQRObject) {
+      return;
+    }
+
+    setScannerVisible(true);
+    onQrScannerOpened?.();
+  }, [isQrFlow, isSigningQRObject, onQrScannerOpened, openQrScannerOnMount]);
+
   useEffect(() => {
     if (!isSigningQRObject) {
       setScannerVisible(false);
@@ -149,6 +169,12 @@ export const AwaitingConfirmationContent: React.FC<
     setErrorMessage(error);
   }, []);
 
+  const hideScanner = useCallback(() => {
+    setScannerVisible(false);
+  }, []);
+  const { onQRHardwareScanError, handleScannerModalHide } =
+    useQrScanErrorForwarding({ hideScanner });
+
   const onQrCancel = useCallback(async () => {
     setScannerVisible(false);
     try {
@@ -286,6 +312,8 @@ export const AwaitingConfirmationContent: React.FC<
           purpose={QrScanRequestType.SIGN}
           onScanSuccess={onScanSuccess}
           onScanError={onScanError}
+          onQRHardwareScanError={onQRHardwareScanError}
+          onModalHideComplete={handleScannerModalHide}
           hideModal={() => setScannerVisible(false)}
         />
       </>
diff --git a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/ErrorContent.test.tsx b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/ErrorContent.test.tsx
index 5aea536575c..b08c6d76317 100644
--- a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/ErrorContent.test.tsx
+++ b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/ErrorContent.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { render, fireEvent, waitFor } from '@testing-library/react-native';
+import { Linking } from 'react-native';
 import {
   HardwareWalletError,
   HardwareWalletType,
@@ -15,7 +16,14 @@ import {
   ERROR_CONTENT_TITLE_TEST_ID,
   ERROR_CONTENT_MESSAGE_TEST_ID,
   ERROR_CONTENT_CONTINUE_BUTTON_TEST_ID,
+  ERROR_CONTENT_LEARN_MORE_BUTTON_TEST_ID,
 } from './ErrorContent';
+import {
+  createQRHardwareScanError,
+  QRHardwareScanErrorType,
+  isQRHardwareScanError as actualIsQRHardwareScanError,
+} from '../../../errors';
+import { QrScanRequestType } from '@metamask/eth-qr-keyring';
 
 // Mock dependencies
 jest.mock('../../../../../util/theme', () => ({
@@ -33,16 +41,26 @@ jest.mock('../../../../../../locales/i18n', () => ({
   strings: (key: string) => key,
 }));
 
-jest.mock('../../../errors', () => ({
-  getIconForErrorCode: jest.fn().mockReturnValue('Danger'),
-  getIconColorForErrorCode: jest.fn().mockReturnValue('Error'),
-  getTitleForErrorCode: jest.fn().mockReturnValue('Error Title'),
-  getRecoveryActionForErrorCode: jest.fn().mockReturnValue('retry'),
-  RecoveryAction: {
-    RETRY: 'retry',
-    ACKNOWLEDGE: 'acknowledge',
-  },
-}));
+jest.mock('../../../errors', () => {
+  const actual = jest.requireActual('../../../errors/qrScan');
+  const actualQr = jest.requireActual('../../../errors/qrHardwareScanError');
+  return {
+    ...actual,
+    ...actualQr,
+    getIconForErrorCode: jest.fn().mockReturnValue('Danger'),
+    getIconColorForErrorCode: jest.fn().mockReturnValue('Error'),
+    getTitleForErrorCode: jest.fn().mockReturnValue('Error Title'),
+    getRecoveryActionForErrorCode: jest.fn().mockReturnValue('retry'),
+    getQRHardwareScanErrorTitle: jest
+      .fn()
+      .mockReturnValue('QR Scan Error Title'),
+    RecoveryAction: {
+      RETRY: 'retry',
+      ACKNOWLEDGE: 'acknowledge',
+      OPEN_SETTINGS: 'open_settings',
+    },
+  };
+});
 
 // Mock component library
 jest.mock('../../../../../component-library/components/Texts/Text', () => {
@@ -61,17 +79,17 @@ jest.mock('../../../../../component-library/components/Texts/Text', () => {
   };
 });
 
-jest.mock('../../../../../component-library/components/Buttons/Button', () => {
+jest.mock('@metamask/design-system-react-native', () => {
   const { TouchableOpacity, Text, View } = jest.requireActual('react-native');
   return {
     __esModule: true,
-    default: ({
-      label,
+    Button: ({
+      children,
       onPress,
       testID,
       isDisabled,
     }: {
-      label: React.ReactNode;
+      children: React.ReactNode;
       onPress?: () => void;
       testID?: string;
       isDisabled?: boolean;
@@ -79,18 +97,17 @@ jest.mock('../../../../../component-library/components/Buttons/Button', () => {
       <TouchableOpacity
         testID={testID}
         onPress={isDisabled ? undefined : onPress}
-        isDisabled={isDisabled}
+        disabled={isDisabled}
       >
-        {typeof label === 'string' ? (
-          <Text>{label}</Text>
+        {typeof children === 'string' ? (
+          <Text>{children}</Text>
         ) : (
-          <View>{label}</View>
+          <View>{children}</View>
         )}
       </TouchableOpacity>
     ),
-    ButtonVariants: { Primary: 'Primary', Secondary: 'Secondary' },
-    ButtonSize: { Lg: 'Lg' },
-    ButtonWidthTypes: { Full: 'Full' },
+    ButtonVariant: { Primary: 'primary', Secondary: 'secondary' },
+    ButtonSize: { Lg: 'lg' },
   };
 });
 
@@ -127,6 +144,10 @@ describe('ErrorContent', () => {
       userMessage: userMessage ?? message,
     });
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('renders with test ID', () => {
     const error = createError('Test error');
     const { getByTestId } = render(
@@ -271,4 +292,144 @@ describe('ErrorContent', () => {
       expect(onContinue).toHaveBeenCalledTimes(1);
     });
   });
+
+  it('renders QR scan error title without the generic icon', () => {
+    const error = createQRHardwareScanError({
+      errorType: QRHardwareScanErrorType.NonURQrScanned,
+      purpose: QrScanRequestType.SIGN,
+      isUrFormat: false,
+    });
+
+    const { queryByTestId, getByTestId } = render(
+      <ErrorContent error={error} deviceType={HardwareWalletType.Qr} />,
+    );
+
+    expect(queryByTestId(ERROR_CONTENT_ICON_TEST_ID)).toBeNull();
+    expect(getByTestId(ERROR_CONTENT_TITLE_TEST_ID)).toBeOnTheScreen();
+  });
+
+  it('renders learn more button for QR scan errors', () => {
+    const error = createQRHardwareScanError({
+      errorType: QRHardwareScanErrorType.WrongURType,
+      purpose: QrScanRequestType.SIGN,
+      receivedUrType: 'crypto-account',
+      isUrFormat: true,
+    });
+
+    const { getByTestId } = render(
+      <ErrorContent error={error} deviceType={HardwareWalletType.Qr} />,
+    );
+
+    expect(
+      getByTestId(ERROR_CONTENT_LEARN_MORE_BUTTON_TEST_ID),
+    ).toBeOnTheScreen();
+    expect(
+      getByTestId(ERROR_CONTENT_CONTINUE_BUTTON_TEST_ID),
+    ).toBeOnTheScreen();
+  });
+
+  it('opens support article when learn more is pressed for QR scan errors', async () => {
+    const openUrlSpy = jest.spyOn(Linking, 'openURL');
+    openUrlSpy.mockResolvedValueOnce(undefined);
+    const error = createQRHardwareScanError({
+      errorType: QRHardwareScanErrorType.URDecodeError,
+      purpose: QrScanRequestType.SIGN,
+      isUrFormat: true,
+    });
+
+    const { getByTestId } = render(
+      <ErrorContent error={error} deviceType={HardwareWalletType.Qr} />,
+    );
+
+    fireEvent.press(getByTestId(ERROR_CONTENT_LEARN_MORE_BUTTON_TEST_ID));
+
+    await waitFor(() => {
+      expect(openUrlSpy).toHaveBeenCalledWith(
+        'https://support.metamask.io/more-web3/wallets/hardware-wallet-hub/#qr-codean-gapped-wallets',
+      );
+    });
+
+    openUrlSpy.mockRestore();
+  });
+
+  it('calls onContinue when try again is pressed for QR scan errors', async () => {
+    const onContinue = jest.fn().mockResolvedValue(undefined);
+    const error = createQRHardwareScanError({
+      errorType: QRHardwareScanErrorType.NonURQrScanned,
+      purpose: QrScanRequestType.SIGN,
+      isUrFormat: false,
+    });
+
+    const { getByTestId } = render(
+      <ErrorContent
+        error={error}
+        onContinue={onContinue}
+        deviceType={HardwareWalletType.Qr}
+      />,
+    );
+
+    fireEvent.press(getByTestId(ERROR_CONTENT_CONTINUE_BUTTON_TEST_ID));
+
+    await waitFor(() => {
+      expect(onContinue).toHaveBeenCalled();
+    });
+  });
+
+  it('calls onDismiss when continue pressed for ACKNOWLEDGE recovery action', async () => {
+    const onDismiss = jest.fn();
+    const { getRecoveryActionForErrorCode } =
+      jest.requireMock('../../../errors');
+    getRecoveryActionForErrorCode.mockReturnValue('acknowledge');
+    const error = createError('Test error');
+
+    const { getByTestId } = render(
+      <ErrorContent
+        error={error}
+        onDismiss={onDismiss}
+        deviceType={HardwareWalletType.Ledger}
+      />,
+    );
+
+    fireEvent.press(getByTestId(ERROR_CONTENT_CONTINUE_BUTTON_TEST_ID));
+
+    await waitFor(() => {
+      expect(onDismiss).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  it('opens device settings when continue pressed for OPEN_SETTINGS recovery action', async () => {
+    const openSettingsSpy = jest.spyOn(Linking, 'openSettings');
+    openSettingsSpy.mockResolvedValueOnce(undefined);
+    const { getRecoveryActionForErrorCode } =
+      jest.requireMock('../../../errors');
+    getRecoveryActionForErrorCode.mockReturnValue('open_settings');
+    const error = createError('Test error');
+
+    const { getByTestId } = render(
+      <ErrorContent error={error} deviceType={HardwareWalletType.Ledger} />,
+    );
+
+    fireEvent.press(getByTestId(ERROR_CONTENT_CONTINUE_BUTTON_TEST_ID));
+
+    await waitFor(() => {
+      expect(openSettingsSpy).toHaveBeenCalledTimes(1);
+    });
+
+    openSettingsSpy.mockRestore();
+  });
+
+  it('renders view settings label for OPEN_SETTINGS recovery action', () => {
+    const { getRecoveryActionForErrorCode } =
+      jest.requireMock('../../../errors');
+    getRecoveryActionForErrorCode.mockReturnValue('open_settings');
+    const error = createError('Test error');
+
+    const { getByTestId } = render(
+      <ErrorContent error={error} deviceType={HardwareWalletType.Ledger} />,
+    );
+
+    expect(
+      getByTestId(ERROR_CONTENT_CONTINUE_BUTTON_TEST_ID),
+    ).toBeOnTheScreen();
+  });
 });
diff --git a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/ErrorContent.tsx b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/ErrorContent.tsx
index c43cbf0106f..b980ed39273 100644
--- a/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/ErrorContent.tsx
+++ b/app/core/HardwareWallet/components/HardwareWalletBottomSheet/contents/ErrorContent.tsx
@@ -1,15 +1,15 @@
 import React, { useMemo, useCallback, useState } from 'react';
-import { StyleSheet } from 'react-native';
+import { Linking, StyleSheet } from 'react-native';
 import {
   HardwareWalletError,
   HardwareWalletType,
 } from '@metamask/hw-wallet-sdk';
 
-import Button, {
-  ButtonVariants,
+import {
+  Button,
+  ButtonVariant,
   ButtonSize,
-  ButtonWidthTypes,
-} from '../../../../../component-library/components/Buttons/Button';
+} from '@metamask/design-system-react-native';
 import Icon, {
   IconSize,
 } from '../../../../../component-library/components/Icons/Icon';
@@ -26,6 +26,8 @@ import {
   getIconColorForErrorCode,
   getTitleForErrorCode,
   getRecoveryActionForErrorCode,
+  getQRHardwareScanErrorTitle,
+  isQRHardwareScanError,
   RecoveryAction,
 } from '../../../errors';
 import { ContentLayout } from './ContentLayout';
@@ -36,6 +38,11 @@ export const ERROR_CONTENT_TITLE_TEST_ID = 'error-content-title';
 export const ERROR_CONTENT_MESSAGE_TEST_ID = 'error-content-message';
 export const ERROR_CONTENT_CONTINUE_BUTTON_TEST_ID =
   'error-content-continue-button';
+export const ERROR_CONTENT_LEARN_MORE_BUTTON_TEST_ID =
+  'error-content-learn-more-button';
+
+const QR_HARDWARE_LEARN_MORE_URL =
+  'https://support.metamask.io/more-web3/wallets/hardware-wallet-hub/#qr-codean-gapped-wallets';
 
 const styles = StyleSheet.create({
   message: {
@@ -76,22 +83,52 @@ export const ErrorContent: React.FC<ErrorContentProps> = ({
     return getRecoveryActionForErrorCode(error.code);
   }, [error]);
 
+  const isQrScanError = useMemo(
+    () => Boolean(error && isQRHardwareScanError(error)),
+    [error],
+  );
+
   const showLoading =
-    recoveryAction === RecoveryAction.RETRY && (isLoading || isRetrying);
+    !isQrScanError &&
+    recoveryAction === RecoveryAction.RETRY &&
+    (isLoading || isRetrying);
 
   const errorTitle = useMemo(() => {
     if (!error) return strings('hardware_wallet.error.something_went_wrong');
+    if (isQRHardwareScanError(error)) {
+      return getQRHardwareScanErrorTitle(error);
+    }
     return getTitleForErrorCode(error.code, deviceType);
   }, [error, deviceType]);
 
   const errorMessage = useMemo(() => error?.userMessage ?? null, [error]);
 
+  const buttonLabel = useMemo(() => {
+    if (isQrScanError) {
+      return strings('hardware_wallet.common.try_again');
+    }
+    if (recoveryAction === RecoveryAction.OPEN_SETTINGS) {
+      return strings('hardware_wallet.error.view_settings');
+    }
+    return strings('hardware_wallet.common.continue');
+  }, [isQrScanError, recoveryAction]);
+
   const handleContinue = useCallback(async () => {
+    if (isQrScanError) {
+      await onContinue?.();
+      return;
+    }
+
     if (recoveryAction === RecoveryAction.ACKNOWLEDGE) {
       onDismiss?.();
       return;
     }
 
+    if (recoveryAction === RecoveryAction.OPEN_SETTINGS) {
+      await Linking.openSettings();
+      return;
+    }
+
     if (showLoading) return;
 
     setIsRetrying(true);
@@ -100,7 +137,11 @@ export const ErrorContent: React.FC<ErrorContentProps> = ({
     } finally {
       setIsRetrying(false);
     }
-  }, [onContinue, onDismiss, recoveryAction, showLoading]);
+  }, [isQrScanError, onContinue, onDismiss, recoveryAction, showLoading]);
+
+  const handleLearnMore = useCallback(async () => {
+    await Linking.openURL(QR_HARDWARE_LEARN_MORE_URL);
+  }, []);
 
   if (!error) {
     return null;
@@ -111,12 +152,14 @@ export const ErrorContent: React.FC<ErrorContentProps> = ({
       testID={ERROR_CONTENT_TEST_ID}
       titleTestID={ERROR_CONTENT_TITLE_TEST_ID}
       icon={
-        <Icon
-          testID={ERROR_CONTENT_ICON_TEST_ID}
-          name={getIconForErrorCode(error.code)}
-          size={IconSize.Xl}
-          color={getIconColorForErrorCode(error.code)}
-        />
+        isQrScanError ? undefined : (
+          <Icon
+            testID={ERROR_CONTENT_ICON_TEST_ID}
+            name={getIconForErrorCode(error.code)}
+            size={IconSize.Xl}
+            color={getIconColorForErrorCode(error.code)}
+          />
+        )
       }
       title={errorTitle}
       body={
@@ -132,16 +175,30 @@ export const ErrorContent: React.FC<ErrorContentProps> = ({
         ) : undefined
       }
       footer={
-        <Button
-          testID={ERROR_CONTENT_CONTINUE_BUTTON_TEST_ID}
-          variant={ButtonVariants.Primary}
-          size={ButtonSize.Lg}
-          width={ButtonWidthTypes.Full}
-          label={strings('hardware_wallet.common.continue')}
-          onPress={handleContinue}
-          isDisabled={showLoading}
-          loading={showLoading}
-        />
+        <>
+          {isQrScanError ? (
+            <Button
+              testID={ERROR_CONTENT_LEARN_MORE_BUTTON_TEST_ID}
+              variant={ButtonVariant.Secondary}
+              size={ButtonSize.Lg}
+              isFullWidth
+              onPress={handleLearnMore}
+            >
+              {strings('hardware_wallet.common.learn_more')}
+            </Button>
+          ) : null}
+          <Button
+            testID={ERROR_CONTENT_CONTINUE_BUTTON_TEST_ID}
+            variant={ButtonVariant.Primary}
+            size={ButtonSize.Lg}
+            isFullWidth
+            onPress={handleContinue}
+            isDisabled={showLoading}
+            isLoading={showLoading}
+          >
+            {buttonLabel}
+          </Button>
+        </>
       }
     />
   );
diff --git a/app/core/HardwareWallet/contexts/HardwareWalletContext.tsx b/app/core/HardwareWallet/contexts/HardwareWalletContext.tsx
index d9cc439eb03..cb87acd6e5d 100644
--- a/app/core/HardwareWallet/contexts/HardwareWalletContext.tsx
+++ b/app/core/HardwareWallet/contexts/HardwareWalletContext.tsx
@@ -41,6 +41,8 @@ export interface HardwareWalletContextValue {
   setPendingOperationAddress: (address: string | null) => void;
   /** Show a hardware wallet error in the bottom sheet. Use after ensureDeviceReady succeeds. */
   showHardwareWalletError: (error: unknown) => void;
+  /** Register a retry handler for QR scan errors outside the provider-managed flows. */
+  setQrScanRetryHandler?: (handler: (() => void) | null) => void;
   /** Show "awaiting confirmation" bottom sheet. */
   showAwaitingConfirmation: (
     operationType: 'transaction' | 'message',
diff --git a/app/core/HardwareWallet/contexts/QRSigningContext.test.tsx b/app/core/HardwareWallet/contexts/QRSigningContext.test.tsx
deleted file mode 100644
index e8d33c18599..00000000000
--- a/app/core/HardwareWallet/contexts/QRSigningContext.test.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { render } from '@testing-library/react-native';
-
-import { useQRSigning } from './QRSigningContext';
-
-describe('QRSigningContext', () => {
-  describe('useQRSigning', () => {
-    it('throws when used outside HardwareWalletProvider', () => {
-      const TestConsumer: React.FC = () => {
-        useQRSigning();
-        return null;
-      };
-
-      expect(() => render(<TestConsumer />)).toThrow(
-        'useQRSigning must be used within a HardwareWalletProvider',
-      );
-    });
-  });
-});
diff --git a/app/core/HardwareWallet/contexts/QRSigningContext.tsx b/app/core/HardwareWallet/contexts/QRSigningContext.tsx
deleted file mode 100644
index 5c210c07afa..00000000000
--- a/app/core/HardwareWallet/contexts/QRSigningContext.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { createContext, useContext } from 'react';
-import { QrScanRequest } from '@metamask/eth-qr-keyring';
-
-export interface QRSigningContextValue {
-  /** The pending QR scan request from the keyring, if any. */
-  pendingScanRequest?: QrScanRequest;
-  /** Whether the pending request is a SIGN-type QR object. */
-  isSigningQRObject: boolean;
-  /** Mark the current QR scan request as completed (suppresses cancel-on-navigate). */
-  setRequestCompleted: () => void;
-  /** Whether the request has been completed. */
-  isRequestCompleted: boolean;
-  /** Reject the pending QR scan request if one exists. */
-  cancelQRScanRequestIfPresent: () => Promise<void>;
-}
-
-const QRSigningContext = createContext<QRSigningContextValue | undefined>(
-  undefined,
-);
-
-QRSigningContext.displayName = 'QRSigningContext';
-
-export const useQRSigning = (): QRSigningContextValue => {
-  const context = useContext(QRSigningContext);
-  if (context === undefined) {
-    throw new Error(
-      'useQRSigning must be used within a HardwareWalletProvider',
-    );
-  }
-  return context;
-};
-
-export default QRSigningContext;
diff --git a/app/core/HardwareWallet/errors/index.ts b/app/core/HardwareWallet/errors/index.ts
index 39b9048642a..18c7f613db2 100644
--- a/app/core/HardwareWallet/errors/index.ts
+++ b/app/core/HardwareWallet/errors/index.ts
@@ -11,3 +11,16 @@ export {
 } from './helpers';
 
 export { parseErrorByType } from './parser';
+
+export {
+  createQRHardwareScanError,
+  getQRHardwareScanErrorTitle,
+  isQRHardwareScanError,
+  QRHardwareScanError,
+  QRHardwareScanErrorType,
+} from './qrScan';
+
+export type {
+  QRHardwareScanErrorMetadata,
+  QRHardwareScanErrorOptions,
+} from './qrScan';
diff --git a/app/core/HardwareWallet/errors/mappings.test.ts b/app/core/HardwareWallet/errors/mappings.test.ts
index 42c30e0ea3e..b7338200dd7 100644
--- a/app/core/HardwareWallet/errors/mappings.test.ts
+++ b/app/core/HardwareWallet/errors/mappings.test.ts
@@ -38,6 +38,7 @@ describe('MOBILE_ERROR_EXTENSIONS', () => {
       ErrorCode.BluetoothDisabled,
       ErrorCode.BluetoothScanFailed,
       ErrorCode.BluetoothConnectionFailed,
+      ErrorCode.PermissionCameraDenied,
       ErrorCode.MobileNotSupported,
       ErrorCode.Unknown,
     ];
@@ -212,6 +213,13 @@ describe('MOBILE_ERROR_EXTENSIONS', () => {
       expect(title).toBe('hardware_wallet.error.connection_closed');
     });
 
+    it('returns localized title for PermissionCameraDenied', () => {
+      const ext = MOBILE_ERROR_EXTENSIONS[ErrorCode.PermissionCameraDenied];
+      const title = ext?.getLocalizedTitle();
+
+      expect(title).toBe('hardware_wallet.error.camera_permission_denied');
+    });
+
     it('returns localized title for MobileNotSupported', () => {
       const ext = MOBILE_ERROR_EXTENSIONS[ErrorCode.MobileNotSupported];
       const title = ext?.getLocalizedTitle();
@@ -353,6 +361,13 @@ describe('MOBILE_ERROR_EXTENSIONS', () => {
       );
     });
 
+    it('returns localized message for PermissionCameraDenied', () => {
+      const ext = MOBILE_ERROR_EXTENSIONS[ErrorCode.PermissionCameraDenied];
+      const message = ext?.getLocalizedMessage();
+
+      expect(message).toBe('hardware_wallet.errors.camera_permission_denied');
+    });
+
     it('returns localized message for MobileNotSupported', () => {
       const ext = MOBILE_ERROR_EXTENSIONS[ErrorCode.MobileNotSupported];
       const message = ext?.getLocalizedMessage();
@@ -491,4 +506,24 @@ describe('ERROR_NAME_MAPPINGS', () => {
       ErrorCode.BluetoothConnectionFailed,
     );
   });
+
+  it('maps QRScanError to DeviceNotFound', () => {
+    expect(ERROR_NAME_MAPPINGS.QRScanError).toBe(ErrorCode.DeviceNotFound);
+  });
+
+  it('maps QRTimeoutError to ConnectionTimeout', () => {
+    expect(ERROR_NAME_MAPPINGS.QRTimeoutError).toBe(
+      ErrorCode.ConnectionTimeout,
+    );
+  });
+
+  it('maps QRCodeInvalid to DeviceNotReady', () => {
+    expect(ERROR_NAME_MAPPINGS.QRCodeInvalid).toBe(ErrorCode.DeviceNotReady);
+  });
+
+  it('maps CameraPermissionDenied to PermissionCameraDenied', () => {
+    expect(ERROR_NAME_MAPPINGS.CameraPermissionDenied).toBe(
+      ErrorCode.PermissionCameraDenied,
+    );
+  });
 });
diff --git a/app/core/HardwareWallet/errors/mappings.ts b/app/core/HardwareWallet/errors/mappings.ts
index 84be2da4395..0c2364f9608 100644
--- a/app/core/HardwareWallet/errors/mappings.ts
+++ b/app/core/HardwareWallet/errors/mappings.ts
@@ -214,6 +214,15 @@ export const MOBILE_ERROR_EXTENSIONS: Partial<
     getLocalizedMessage: () =>
       strings('hardware_wallet.errors.bluetooth_connection_failed'),
   },
+  [ErrorCode.PermissionCameraDenied]: {
+    recoveryAction: RecoveryAction.OPEN_SETTINGS,
+    icon: IconName.Camera,
+    iconColor: IconColor.Default,
+    getLocalizedTitle: () =>
+      strings('hardware_wallet.error.camera_permission_denied'),
+    getLocalizedMessage: () =>
+      strings('hardware_wallet.errors.camera_permission_denied'),
+  },
 
   // Mobile-specific
   [ErrorCode.MobileNotSupported]: {
diff --git a/app/core/HardwareWallet/errors/parser.test.ts b/app/core/HardwareWallet/errors/parser.test.ts
index 0bfcc022804..85c3b36a94c 100644
--- a/app/core/HardwareWallet/errors/parser.test.ts
+++ b/app/core/HardwareWallet/errors/parser.test.ts
@@ -497,6 +497,26 @@ describe('parseErrorByType', () => {
     });
   });
 
+  describe('when error is a non-Error object with known Ledger shape', () => {
+    it('parses object with disconnect error name', () => {
+      const result = parseErrorByType(
+        { name: 'DisconnectedDevice' },
+        walletType,
+      );
+
+      expect(result.code).toBe(ErrorCode.DeviceDisconnected);
+    });
+
+    it('parses object with TransportStatusError name and statusCode', () => {
+      const result = parseErrorByType(
+        { name: 'TransportStatusError', statusCode: 0x6985 },
+        walletType,
+      );
+
+      expect(result.code).toBe(ErrorCode.UserRejected);
+    });
+  });
+
   describe('wallet type is included in error', () => {
     it('includes Ledger wallet type in metadata', () => {
       const result = parseErrorByType(
diff --git a/app/core/HardwareWallet/errors/parser.ts b/app/core/HardwareWallet/errors/parser.ts
index e1da473b181..c9b3762cc4e 100644
--- a/app/core/HardwareWallet/errors/parser.ts
+++ b/app/core/HardwareWallet/errors/parser.ts
@@ -162,9 +162,18 @@ function parseLedgerStatusCode(
  * Ledger packages throws errors with specific names like 'DisconnectedDevice'
  */
 function parseErrorByName(
-  error: Error,
+  error: unknown,
   walletType?: HardwareWalletType | null,
 ): HardwareWalletError | null {
+  if (
+    error === null ||
+    typeof error !== 'object' ||
+    !('name' in error) ||
+    typeof error.name !== 'string'
+  ) {
+    return null;
+  }
+
   const name = error.name;
 
   // TransportStatusError requires special handling - extract and parse the status code
@@ -172,7 +181,11 @@ function parseErrorByName(
   if (name === 'TransportStatusError') {
     const statusCode = extractStatusCode(error);
     if (statusCode !== null) {
-      return parseLedgerStatusCode(statusCode, walletType, error);
+      return parseLedgerStatusCode(
+        statusCode,
+        walletType,
+        isErrorLike(error) ? error : undefined,
+      );
     }
     // If no status code found, fall through to unknown error
     return null;
@@ -184,7 +197,10 @@ function parseErrorByName(
       ERROR_NAME_MAPPINGS[name],
       walletType,
       undefined,
-      { cause: error, metadata: { errorName: name } },
+      {
+        cause: isErrorLike(error) ? error : undefined,
+        metadata: { errorName: name },
+      },
     );
   }
 
@@ -308,12 +324,12 @@ export function parseErrorByType(
     return parseLedgerCommunicationError(code, walletType);
   }
 
-  if (isErrorLike(error)) {
-    const parsedByName = parseErrorByName(error, walletType);
-    if (parsedByName) {
-      return parsedByName;
-    }
+  const parsedByName = parseErrorByName(error, walletType);
+  if (parsedByName) {
+    return parsedByName;
+  }
 
+  if (isErrorLike(error)) {
     const parsedByMessage = parseErrorByMessage(error, walletType);
     if (parsedByMessage) {
       return parsedByMessage;
diff --git a/app/core/HardwareWallet/errors/qrHardwareScanError.ts b/app/core/HardwareWallet/errors/qrHardwareScanError.ts
new file mode 100644
index 00000000000..f75bd126989
--- /dev/null
+++ b/app/core/HardwareWallet/errors/qrHardwareScanError.ts
@@ -0,0 +1,28 @@
+import {
+  HardwareWalletError,
+  type HardwareWalletErrorOptions,
+} from '@metamask/hw-wallet-sdk';
+
+import type {
+  QRHardwareScanErrorMetadata,
+  QRHardwareScanErrorOptions,
+} from './qrScan.types';
+
+/**
+ * Hardware wallet error for animated QR scan flows (pairing and signing).
+ * Prefer over `HardwareWalletError` when constructing errors with QR scan metadata.
+ */
+export class QRHardwareScanError extends HardwareWalletError {
+  readonly metadata: QRHardwareScanErrorMetadata;
+
+  constructor(message: string, options: QRHardwareScanErrorOptions) {
+    super(message, options as HardwareWalletErrorOptions);
+    this.metadata = options.metadata;
+  }
+}
+
+export function isQRHardwareScanError(
+  error: unknown,
+): error is QRHardwareScanError {
+  return error instanceof QRHardwareScanError;
+}
diff --git a/app/core/HardwareWallet/errors/qrScan.test.ts b/app/core/HardwareWallet/errors/qrScan.test.ts
new file mode 100644
index 00000000000..6fab7ae8f8d
--- /dev/null
+++ b/app/core/HardwareWallet/errors/qrScan.test.ts
@@ -0,0 +1,219 @@
+import { QrScanRequestType } from '@metamask/eth-qr-keyring';
+import {
+  Category,
+  ErrorCode,
+  HardwareWalletError,
+  HardwareWalletType,
+  Severity,
+} from '@metamask/hw-wallet-sdk';
+
+import { RecoveryAction } from './types';
+import {
+  createQRHardwareScanError,
+  getQRHardwareScanErrorTitle,
+  QRHardwareScanError,
+  QRHardwareScanErrorType,
+} from './qrScan';
+
+jest.mock('../../../../locales/i18n', () => ({
+  strings: jest.fn((key: string) => key),
+}));
+
+const createScanError = (
+  overrides: Partial<Parameters<typeof createQRHardwareScanError>[0]> = {},
+) =>
+  createQRHardwareScanError({
+    errorType: QRHardwareScanErrorType.NonURQrScanned,
+    purpose: QrScanRequestType.PAIR,
+    isUrFormat: false,
+    ...overrides,
+  });
+
+describe('QRHardwareScanError', () => {
+  it('stores metadata from options on the instance', () => {
+    const error = createScanError({
+      errorType: QRHardwareScanErrorType.NonURQrScanned,
+      receivedUrType: 'some-type',
+    });
+
+    expect(error).toBeInstanceOf(QRHardwareScanError);
+    expect(error).toBeInstanceOf(HardwareWalletError);
+    expect(error.metadata.qrHardwareScanErrorType).toBe(
+      QRHardwareScanErrorType.NonURQrScanned,
+    );
+    expect(error.metadata.walletType).toBe(HardwareWalletType.Qr);
+    expect(error.metadata.isUrFormat).toBe(false);
+    expect(error.metadata.receivedUrType).toBe('some-type');
+  });
+
+  it('preserves the message passed to the constructor', () => {
+    const error = createScanError({
+      technicalMessage: 'custom technical message',
+    });
+
+    expect(error.message).toBe('custom technical message');
+  });
+
+  it('stores userMessage from i18n strings', () => {
+    const error = createScanError({
+      errorType: QRHardwareScanErrorType.URDecodeError,
+      isUrFormat: true,
+    });
+
+    expect(error.userMessage).toBe(
+      'hardware_wallet.qr_scan_errors.ur_decode_error.body',
+    );
+  });
+
+  it('stores severity, code, and category', () => {
+    const error = createScanError();
+
+    expect(error.code).toBe(ErrorCode.Unknown);
+    expect(error.severity).toBe(Severity.Warning);
+    expect(error.category).toBe(Category.Unknown);
+  });
+
+  it('stores recovery action in metadata', () => {
+    const error = createScanError();
+
+    expect(error.metadata.recoveryAction).toBe(RecoveryAction.RETRY);
+  });
+
+  it('stores qrScanPurpose in metadata', () => {
+    const error = createScanError({
+      purpose: QrScanRequestType.SIGN,
+    });
+
+    expect(error.metadata.qrScanPurpose).toBe(QrScanRequestType.SIGN);
+  });
+});
+
+describe('createQRHardwareScanError', () => {
+  it('creates retryable hardware wallet errors with QR scan metadata', () => {
+    const error = createScanError({
+      receivedUrType: 'crypto-psbt',
+    });
+
+    expect(error).toBeInstanceOf(QRHardwareScanError);
+    expect(error).toBeInstanceOf(HardwareWalletError);
+    expect(error.code).toBe(ErrorCode.Unknown);
+    expect(error.severity).toBe(Severity.Warning);
+    expect(error.category).toBe(Category.Unknown);
+    expect(error.userMessage).toBe(
+      'hardware_wallet.qr_scan_errors.non_ur_qr_scanned.pair.body',
+    );
+    expect(error.metadata).toStrictEqual({
+      walletType: HardwareWalletType.Qr,
+      recoveryAction: RecoveryAction.RETRY,
+      qrHardwareScanErrorType: QRHardwareScanErrorType.NonURQrScanned,
+      qrScanPurpose: QrScanRequestType.PAIR,
+      receivedUrType: 'crypto-psbt',
+      isUrFormat: false,
+    });
+  });
+
+  it('uses signing copy for non-UR QR codes during signing', () => {
+    const error = createScanError({
+      purpose: QrScanRequestType.SIGN,
+    });
+
+    expect(error.message).toBe('Scanned QR code is not in UR format');
+    expect(error.userMessage).toBe(
+      'hardware_wallet.qr_scan_errors.non_ur_qr_scanned.sign.body',
+    );
+  });
+
+  it('uses pairing copy and default technical message for wrong UR type in pairing flow', () => {
+    const error = createScanError({
+      errorType: QRHardwareScanErrorType.WrongURType,
+      purpose: QrScanRequestType.PAIR,
+      receivedUrType: 'eth-sign-request',
+      isUrFormat: true,
+    });
+
+    expect(error.message).toBe(
+      'Received UR type is not valid for pairing flow',
+    );
+    expect(error.userMessage).toBe(
+      'hardware_wallet.qr_scan_errors.wrong_ur_type.pair.body',
+    );
+  });
+
+  it('uses signing copy and default technical message for wrong UR type in signing flow', () => {
+    const error = createScanError({
+      errorType: QRHardwareScanErrorType.WrongURType,
+      purpose: QrScanRequestType.SIGN,
+      receivedUrType: 'crypto-hdkey',
+      isUrFormat: true,
+    });
+
+    expect(error.message).toBe(
+      'Received UR type is not valid for signing flow',
+    );
+    expect(error.userMessage).toBe(
+      'hardware_wallet.qr_scan_errors.wrong_ur_type.sign.body',
+    );
+  });
+
+  it('uses decode error copy for UR decode failures', () => {
+    const error = createScanError({
+      errorType: QRHardwareScanErrorType.URDecodeError,
+      technicalMessage: 'Decoder rejected fragment',
+      isUrFormat: true,
+    });
+
+    expect(error.message).toBe('Decoder rejected fragment');
+    expect(error.userMessage).toBe(
+      'hardware_wallet.qr_scan_errors.ur_decode_error.body',
+    );
+  });
+
+  it('uses decode error copy and default technical message for scan exceptions', () => {
+    const error = createScanError({
+      errorType: QRHardwareScanErrorType.ScanException,
+      isUrFormat: true,
+    });
+
+    expect(error.message).toBe('Unexpected QR scanning exception');
+    expect(error.userMessage).toBe(
+      'hardware_wallet.qr_scan_errors.ur_decode_error.body',
+    );
+  });
+});
+
+describe('getQRHardwareScanErrorTitle', () => {
+  it('returns pairing title for non-UR QR scan errors', () => {
+    const error = createScanError();
+
+    const title = getQRHardwareScanErrorTitle(error);
+
+    expect(title).toBe(
+      'hardware_wallet.qr_scan_errors.non_ur_qr_scanned.pair.title',
+    );
+  });
+
+  it('returns signing title for wrong UR type errors', () => {
+    const error = createScanError({
+      errorType: QRHardwareScanErrorType.WrongURType,
+      purpose: QrScanRequestType.SIGN,
+      isUrFormat: true,
+    });
+
+    const title = getQRHardwareScanErrorTitle(error);
+
+    expect(title).toBe(
+      'hardware_wallet.qr_scan_errors.wrong_ur_type.sign.title',
+    );
+  });
+
+  it('returns decode error title for scan exception errors', () => {
+    const error = createScanError({
+      errorType: QRHardwareScanErrorType.ScanException,
+      isUrFormat: true,
+    });
+
+    const title = getQRHardwareScanErrorTitle(error);
+
+    expect(title).toBe('hardware_wallet.qr_scan_errors.ur_decode_error.title');
+  });
+});
diff --git a/app/core/HardwareWallet/errors/qrScan.ts b/app/core/HardwareWallet/errors/qrScan.ts
new file mode 100644
index 00000000000..cf3aad64786
--- /dev/null
+++ b/app/core/HardwareWallet/errors/qrScan.ts
@@ -0,0 +1,119 @@
+import { QrScanRequestType } from '@metamask/eth-qr-keyring';
+import { strings } from '../../../../locales/i18n';
+import {
+  Category,
+  ErrorCode,
+  HardwareWalletType,
+  Severity,
+} from '@metamask/hw-wallet-sdk';
+
+import { QRHardwareScanError } from './qrHardwareScanError';
+import {
+  QRHardwareScanErrorType,
+  type QRHardwareScanErrorMetadata,
+  type QRHardwareScanErrorOptions,
+} from './qrScan.types';
+import { RecoveryAction } from './types';
+
+export {
+  QRHardwareScanErrorType,
+  type QRHardwareScanErrorMetadata,
+  type QRHardwareScanErrorOptions,
+};
+
+export {
+  QRHardwareScanError,
+  isQRHardwareScanError,
+} from './qrHardwareScanError';
+
+interface CreateQRHardwareScanErrorParams {
+  errorType: QRHardwareScanErrorType;
+  purpose: QrScanRequestType;
+  technicalMessage?: string;
+  receivedUrType?: string;
+  isUrFormat: boolean;
+}
+
+const getPurposeKey = (purpose: QrScanRequestType) =>
+  purpose === QrScanRequestType.PAIR ? 'pair' : 'sign';
+
+const getErrorCopyKeyPrefix = (
+  errorType: QRHardwareScanErrorType,
+  purpose: QrScanRequestType,
+) => {
+  switch (errorType) {
+    case QRHardwareScanErrorType.NonURQrScanned:
+      return `hardware_wallet.qr_scan_errors.non_ur_qr_scanned.${getPurposeKey(
+        purpose,
+      )}`;
+    case QRHardwareScanErrorType.WrongURType:
+      return `hardware_wallet.qr_scan_errors.wrong_ur_type.${getPurposeKey(
+        purpose,
+      )}`;
+    case QRHardwareScanErrorType.URDecodeError:
+    case QRHardwareScanErrorType.ScanException:
+      return 'hardware_wallet.qr_scan_errors.ur_decode_error';
+    default:
+      return 'hardware_wallet.qr_scan_errors.ur_decode_error';
+  }
+};
+
+const getDefaultTechnicalMessage = ({
+  errorType,
+  purpose,
+}: Pick<CreateQRHardwareScanErrorParams, 'errorType' | 'purpose'>) => {
+  switch (errorType) {
+    case QRHardwareScanErrorType.NonURQrScanned:
+      return 'Scanned QR code is not in UR format';
+    case QRHardwareScanErrorType.WrongURType:
+      return purpose === QrScanRequestType.PAIR
+        ? 'Received UR type is not valid for pairing flow'
+        : 'Received UR type is not valid for signing flow';
+    case QRHardwareScanErrorType.URDecodeError:
+      return 'Failed to decode UR QR code';
+    case QRHardwareScanErrorType.ScanException:
+      return 'Unexpected QR scanning exception';
+    default:
+      return 'Unexpected QR scanning exception';
+  }
+};
+
+export function createQRHardwareScanError({
+  errorType,
+  purpose,
+  technicalMessage,
+  receivedUrType,
+  isUrFormat,
+}: CreateQRHardwareScanErrorParams): QRHardwareScanError {
+  const copyKeyPrefix = getErrorCopyKeyPrefix(errorType, purpose);
+  const metadata = {
+    walletType: HardwareWalletType.Qr,
+    recoveryAction: RecoveryAction.RETRY,
+    qrHardwareScanErrorType: errorType,
+    qrScanPurpose: purpose,
+    receivedUrType,
+    isUrFormat,
+  } satisfies QRHardwareScanErrorMetadata;
+
+  return new QRHardwareScanError(
+    technicalMessage ?? getDefaultTechnicalMessage({ errorType, purpose }),
+    {
+      code: ErrorCode.Unknown,
+      severity: Severity.Warning,
+      category: Category.Unknown,
+      userMessage: strings(`${copyKeyPrefix}.body`),
+      metadata,
+    },
+  );
+}
+
+export function getQRHardwareScanErrorTitle(
+  error: QRHardwareScanError,
+): string {
+  const copyKeyPrefix = getErrorCopyKeyPrefix(
+    error.metadata.qrHardwareScanErrorType,
+    error.metadata.qrScanPurpose,
+  );
+
+  return strings(`${copyKeyPrefix}.title`);
+}
diff --git a/app/core/HardwareWallet/errors/qrScan.types.ts b/app/core/HardwareWallet/errors/qrScan.types.ts
new file mode 100644
index 00000000000..28a6bfe643b
--- /dev/null
+++ b/app/core/HardwareWallet/errors/qrScan.types.ts
@@ -0,0 +1,29 @@
+import { QrScanRequestType } from '@metamask/eth-qr-keyring';
+import {
+  type HardwareWalletErrorOptions,
+  HardwareWalletType,
+} from '@metamask/hw-wallet-sdk';
+import { RecoveryAction } from './types';
+
+export enum QRHardwareScanErrorType {
+  NonURQrScanned = 'non_ur_qr_scanned',
+  WrongURType = 'wrong_ur_type',
+  URDecodeError = 'ur_decode_error',
+  ScanException = 'scan_exception',
+}
+
+export interface QRHardwareScanErrorMetadata extends Record<string, unknown> {
+  walletType: HardwareWalletType.Qr;
+  recoveryAction: RecoveryAction.RETRY;
+  qrHardwareScanErrorType: QRHardwareScanErrorType;
+  qrScanPurpose: QrScanRequestType;
+  receivedUrType?: string;
+  isUrFormat: boolean;
+}
+
+export type QRHardwareScanErrorOptions = Omit<
+  HardwareWalletErrorOptions,
+  'metadata'
+> & {
+  metadata: QRHardwareScanErrorMetadata;
+};
diff --git a/app/core/HardwareWallet/errors/types.ts b/app/core/HardwareWallet/errors/types.ts
index 1a5fd6786e5..3535b515d00 100644
--- a/app/core/HardwareWallet/errors/types.ts
+++ b/app/core/HardwareWallet/errors/types.ts
@@ -6,4 +6,6 @@ export enum RecoveryAction {
   ACKNOWLEDGE = 'acknowledge',
   /** Retry the failed operation */
   RETRY = 'retry',
+  /** Open device Settings to resolve a permission issue */
+  OPEN_SETTINGS = 'open_settings',
 }
diff --git a/app/core/HardwareWallet/hooks/index.ts b/app/core/HardwareWallet/hooks/index.ts
index 87e74356a88..523c9c029b1 100644
--- a/app/core/HardwareWallet/hooks/index.ts
+++ b/app/core/HardwareWallet/hooks/index.ts
@@ -9,3 +9,4 @@ export { useTransportMonitoring } from './useTransportMonitoring';
 export { useDeviceDiscovery } from './useDeviceDiscovery';
 export { useDeviceConnectionFlow } from './useDeviceConnectionFlow';
 export { useQRSigningState } from './useQRSigningState';
+export { useQrScanErrorForwarding } from './useQrScanErrorForwarding';
diff --git a/app/core/HardwareWallet/hooks/useDeviceConnectionFlow.test.ts b/app/core/HardwareWallet/hooks/useDeviceConnectionFlow.test.ts
index 90730896758..6d74a5a89a6 100644
--- a/app/core/HardwareWallet/hooks/useDeviceConnectionFlow.test.ts
+++ b/app/core/HardwareWallet/hooks/useDeviceConnectionFlow.test.ts
@@ -463,6 +463,42 @@ describe('useDeviceConnectionFlow', () => {
         await readyPromise;
       });
     });
+
+    it('does not pre-check transport when entering scan mode without deviceId', async () => {
+      const mockAdapter = {
+        walletType: HardwareWalletType.Ledger,
+        requiresDeviceDiscovery: true,
+        resetFlowState: jest.fn(),
+        isTransportAvailable: jest.fn().mockResolvedValue(true),
+        startDeviceDiscovery: jest.fn(),
+        stopDeviceDiscovery: jest.fn(),
+        connect: jest.fn().mockResolvedValue(undefined),
+        disconnect: jest.fn(),
+        getConnectedDeviceId: jest.fn().mockReturnValue(null),
+      };
+      const checkTransportEnabledOrShowError = jest.fn();
+      const options = createDefaultOptions({
+        createAdapterWithCallbacks: jest.fn().mockReturnValue(mockAdapter),
+        checkTransportEnabledOrShowError,
+      });
+
+      const { result } = renderHook(() => useDeviceConnectionFlow(options));
+
+      const { readyPromise } = await capturePendingReadiness(
+        () => result.current.ensureDeviceReady(),
+        { flushMicrotaskInAct: false },
+      );
+
+      expect(checkTransportEnabledOrShowError).not.toHaveBeenCalled();
+      expect(options.updateConnectionState).toHaveBeenCalledWith({
+        status: ConnectionStatus.Scanning,
+      });
+
+      await act(async () => {
+        result.current.closeFlow();
+        await readyPromise;
+      });
+    });
   });
 
   describe('tryEnsureReady via ensureDeviceReady', () => {
diff --git a/app/core/HardwareWallet/hooks/useDeviceConnectionFlow.ts b/app/core/HardwareWallet/hooks/useDeviceConnectionFlow.ts
index 463994feea3..81c145795c6 100644
--- a/app/core/HardwareWallet/hooks/useDeviceConnectionFlow.ts
+++ b/app/core/HardwareWallet/hooks/useDeviceConnectionFlow.ts
@@ -245,10 +245,15 @@ export const useDeviceConnectionFlow = ({
         adapter.resetFlowState();
       }
 
-      const transportUnavailable =
-        await checkTransportEnabledOrShowError(adapter);
-      if (transportUnavailable) {
-        return createBlockingPromise();
+      // Avoid pre-gating scan mode on transport state. BLE state can be
+      // briefly unknown/stale on startup and wrongly show "Bluetooth required"
+      // before discovery starts.
+      if (targetDeviceId) {
+        const transportUnavailable =
+          await checkTransportEnabledOrShowError(adapter);
+        if (transportUnavailable) {
+          return createBlockingPromise();
+        }
       }
 
       return createBlockingPromise(() => {
diff --git a/app/core/HardwareWallet/hooks/useIsConfirmationFromQrAccount.test.ts b/app/core/HardwareWallet/hooks/useIsConfirmationFromQrAccount.test.ts
new file mode 100644
index 00000000000..dd7486ad95d
--- /dev/null
+++ b/app/core/HardwareWallet/hooks/useIsConfirmationFromQrAccount.test.ts
@@ -0,0 +1,119 @@
+import { renderHookWithProvider } from '../../../util/test/renderWithProvider';
+import {
+  personalSignatureConfirmationState,
+  stakingDepositConfirmationState,
+} from '../../../util/test/confirm-data-helpers';
+import { useIsConfirmationFromQrAccount } from './useIsConfirmationFromQrAccount';
+
+jest.mock('../../../core/Engine', () => ({
+  context: {
+    KeyringController: {
+      state: {
+        keyrings: [
+          {
+            type: 'HD Key Tree',
+            accounts: ['0x935e73edb9ff52e23bac7f7e043a1ecd06d05477'],
+          },
+        ],
+      },
+    },
+  },
+}));
+
+const resetMockKeyrings = () => {
+  jest.requireMock(
+    '../../../core/Engine',
+  ).context.KeyringController.state.keyrings = [
+    {
+      type: 'HD Key Tree',
+      accounts: ['0x935e73edb9ff52e23bac7f7e043a1ecd06d05477'],
+    },
+  ];
+};
+
+describe('useIsConfirmationFromQrAccount', () => {
+  beforeEach(() => {
+    resetMockKeyrings();
+  });
+
+  it('returns false when from address belongs to a non-QR keyring', () => {
+    const { result } = renderHookWithProvider(
+      () => useIsConfirmationFromQrAccount(),
+      { state: personalSignatureConfirmationState },
+    );
+
+    expect(result.current).toBe(false);
+  });
+
+  it('returns true when from address belongs to a QR keyring', () => {
+    jest.requireMock(
+      '../../../core/Engine',
+    ).context.KeyringController.state.keyrings = [
+      {
+        type: 'QR Hardware Wallet Device',
+        accounts: ['0x935e73edb9ff52e23bac7f7e043a1ecd06d05477'],
+      },
+    ];
+
+    const { result } = renderHookWithProvider(
+      () => useIsConfirmationFromQrAccount(),
+      { state: personalSignatureConfirmationState },
+    );
+
+    expect(result.current).toBe(true);
+  });
+
+  it('returns false when there is no from address', () => {
+    const stateWithNoFrom = {
+      ...stakingDepositConfirmationState,
+      engine: {
+        backgroundState: {
+          ...stakingDepositConfirmationState.engine.backgroundState,
+          ApprovalController: {
+            pendingApprovals: {
+              'test-id': {
+                id: 'test-id',
+                origin: 'metamask',
+                type: 'transaction',
+                time: 1,
+                requestData: {},
+                requestState: null,
+                expectsResult: false,
+              },
+            },
+            pendingApprovalCount: 1,
+            approvalFlows: [],
+          },
+          TransactionController: {
+            transactions: [],
+          },
+        },
+      },
+    };
+
+    const { result } = renderHookWithProvider(
+      () => useIsConfirmationFromQrAccount(),
+      { state: stateWithNoFrom },
+    );
+
+    expect(result.current).toBe(false);
+  });
+
+  it('returns false when from address belongs to a Ledger keyring', () => {
+    jest.requireMock(
+      '../../../core/Engine',
+    ).context.KeyringController.state.keyrings = [
+      {
+        type: 'Ledger Hardware',
+        accounts: ['0x935e73edb9ff52e23bac7f7e043a1ecd06d05477'],
+      },
+    ];
+
+    const { result } = renderHookWithProvider(
+      () => useIsConfirmationFromQrAccount(),
+      { state: personalSignatureConfirmationState },
+    );
+
+    expect(result.current).toBe(false);
+  });
+});
diff --git a/app/core/HardwareWallet/hooks/useIsConfirmationFromQrAccount.ts b/app/core/HardwareWallet/hooks/useIsConfirmationFromQrAccount.ts
new file mode 100644
index 00000000000..58144cb9dfa
--- /dev/null
+++ b/app/core/HardwareWallet/hooks/useIsConfirmationFromQrAccount.ts
@@ -0,0 +1,19 @@
+import { useMemo } from 'react';
+
+import { isHardwareAccount } from '../../../util/address';
+import ExtendedKeyringTypes from '../../../constants/keyringTypes';
+import useApprovalRequest from '../../../components/Views/confirmations/hooks/useApprovalRequest';
+import { useTransactionMetadataRequest } from '../../../components/Views/confirmations/hooks/transactions/useTransactionMetadataRequest';
+
+export function useIsConfirmationFromQrAccount(): boolean {
+  const { approvalRequest } = useApprovalRequest();
+  const transactionMetadata = useTransactionMetadataRequest();
+
+  return useMemo(() => {
+    const fromAddress =
+      (approvalRequest?.requestData?.from as string) ||
+      (transactionMetadata?.txParams?.from as string);
+    if (!fromAddress) return false;
+    return !!isHardwareAccount(fromAddress, [ExtendedKeyringTypes.qr]);
+  }, [approvalRequest?.requestData?.from, transactionMetadata?.txParams?.from]);
+}
diff --git a/app/core/HardwareWallet/hooks/useQrConfirm.test.ts b/app/core/HardwareWallet/hooks/useQrConfirm.test.ts
new file mode 100644
index 00000000000..b4ce84ee63c
--- /dev/null
+++ b/app/core/HardwareWallet/hooks/useQrConfirm.test.ts
@@ -0,0 +1,253 @@
+import { renderHook, act } from '@testing-library/react-native';
+
+const mockEnsureDeviceReady = jest.fn();
+const mockSetTargetWalletType = jest.fn();
+const mockShowAwaitingConfirmation = jest.fn();
+const mockHideAwaitingConfirmation = jest.fn();
+const mockShowHardwareWalletError = jest.fn();
+const mockIsUserCancellation = jest.fn().mockReturnValue(false);
+const mockSetScannerVisible = jest.fn();
+const mockSetSigningConfirmed = jest.fn();
+const mockExecuteHardwareWalletOperation = jest.fn();
+
+jest.mock('..', () => ({
+  useHardwareWallet: () => ({
+    ensureDeviceReady: mockEnsureDeviceReady,
+    setTargetWalletType: mockSetTargetWalletType,
+    showAwaitingConfirmation: mockShowAwaitingConfirmation,
+    hideAwaitingConfirmation: mockHideAwaitingConfirmation,
+    showHardwareWalletError: mockShowHardwareWalletError,
+  }),
+  isUserCancellation: (...args: unknown[]) => mockIsUserCancellation(...args),
+  executeHardwareWalletOperation: (...args: unknown[]) =>
+    mockExecuteHardwareWalletOperation(...args),
+}));
+
+const mockApprovalRequest = { requestData: { from: '0xTestAddress' } };
+const mockTransactionMetadata = { txParams: { from: '0xTestAddress' } };
+
+jest.mock(
+  '../../../components/Views/confirmations/hooks/useApprovalRequest',
+  () => ({
+    __esModule: true,
+    default: () => ({ approvalRequest: mockApprovalRequest }),
+  }),
+);
+
+jest.mock(
+  '../../../components/Views/confirmations/hooks/transactions/useTransactionMetadataRequest',
+  () => ({
+    useTransactionMetadataRequest: () => mockTransactionMetadata,
+  }),
+);
+
+const mockIsSigningQRObject = { current: false };
+
+jest.mock(
+  '../../../components/Views/confirmations/context/qr-hardware-context',
+  () => ({
+    useQRHardwareContext: () => ({
+      isSigningQRObject: mockIsSigningQRObject.current,
+      setScannerVisible: mockSetScannerVisible,
+      setSigningConfirmed: mockSetSigningConfirmed,
+    }),
+  }),
+);
+
+import { useQrConfirm } from './useQrConfirm';
+
+describe('useQrConfirm', () => {
+  const onReject = jest.fn();
+  const onTransactionConfirm = jest.fn().mockResolvedValue(undefined);
+  const executeApproval = jest.fn().mockResolvedValue(undefined);
+
+  const defaultOptions = {
+    onReject,
+    onTransactionConfirm,
+    executeApproval,
+    isTransactionReq: false,
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockIsSigningQRObject.current = false;
+    mockExecuteHardwareWalletOperation.mockResolvedValue(true);
+  });
+
+  it('re-shows awaiting confirmation when QR signing is already in progress', async () => {
+    mockIsSigningQRObject.current = true;
+
+    const { result } = renderHook(() => useQrConfirm(defaultOptions));
+
+    await act(async () => {
+      await result.current.onConfirm();
+    });
+
+    expect(mockShowAwaitingConfirmation).toHaveBeenCalledWith(
+      'message',
+      expect.any(Function),
+    );
+    expect(mockSetSigningConfirmed).not.toHaveBeenCalled();
+    expect(mockSetScannerVisible).not.toHaveBeenCalled();
+    expect(mockExecuteHardwareWalletOperation).not.toHaveBeenCalled();
+  });
+
+  it('calls rejectOnce when no fromAddress is available', async () => {
+    const originalRequestData = mockApprovalRequest.requestData;
+    const originalTxParams = mockTransactionMetadata.txParams;
+    mockApprovalRequest.requestData =
+      {} as typeof mockApprovalRequest.requestData;
+    mockTransactionMetadata.txParams =
+      {} as typeof mockTransactionMetadata.txParams;
+
+    const { result } = renderHook(() => useQrConfirm(defaultOptions));
+
+    await act(async () => {
+      await result.current.onConfirm();
+    });
+
+    expect(onReject).toHaveBeenCalledTimes(1);
+    expect(mockExecuteHardwareWalletOperation).not.toHaveBeenCalled();
+
+    mockApprovalRequest.requestData = originalRequestData;
+    mockTransactionMetadata.txParams = originalTxParams;
+  });
+
+  it('calls executeHardwareWalletOperation for message signing', async () => {
+    const { result } = renderHook(() => useQrConfirm(defaultOptions));
+
+    await act(async () => {
+      await result.current.onConfirm();
+    });
+
+    expect(mockExecuteHardwareWalletOperation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        address: '0xTestAddress',
+        operationType: 'message',
+      }),
+    );
+  });
+
+  it('calls executeHardwareWalletOperation for transaction with transaction type', async () => {
+    const { result } = renderHook(() =>
+      useQrConfirm({ ...defaultOptions, isTransactionReq: true }),
+    );
+
+    await act(async () => {
+      await result.current.onConfirm();
+    });
+
+    expect(mockExecuteHardwareWalletOperation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        address: '0xTestAddress',
+        operationType: 'transaction',
+      }),
+    );
+  });
+
+  it('calls onTransactionConfirm inside execute for transaction requests', async () => {
+    mockExecuteHardwareWalletOperation.mockImplementation(
+      async ({ execute }) => {
+        await execute();
+      },
+    );
+
+    const { result } = renderHook(() =>
+      useQrConfirm({ ...defaultOptions, isTransactionReq: true }),
+    );
+
+    await act(async () => {
+      await result.current.onConfirm();
+    });
+
+    expect(onTransactionConfirm).toHaveBeenCalledWith({
+      onError: expect.any(Function),
+    });
+    expect(executeApproval).not.toHaveBeenCalled();
+  });
+
+  it('calls executeApproval inside execute for message requests', async () => {
+    mockExecuteHardwareWalletOperation.mockImplementation(
+      async ({ execute }) => {
+        await execute();
+      },
+    );
+
+    const { result } = renderHook(() => useQrConfirm(defaultOptions));
+
+    await act(async () => {
+      await result.current.onConfirm();
+    });
+
+    expect(executeApproval).toHaveBeenCalledTimes(1);
+    expect(onTransactionConfirm).not.toHaveBeenCalled();
+  });
+
+  it('shows error and rejects on non-user-cancellation error', async () => {
+    const signingError = new Error('signing failed');
+    mockExecuteHardwareWalletOperation.mockRejectedValueOnce(signingError);
+
+    const { result } = renderHook(() => useQrConfirm(defaultOptions));
+
+    await act(async () => {
+      await result.current.onConfirm();
+    });
+
+    expect(mockShowHardwareWalletError).toHaveBeenCalledWith(signingError);
+    expect(onReject).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not show error on user cancellation', async () => {
+    const userCancelError = new Error('User rejected');
+    mockExecuteHardwareWalletOperation.mockRejectedValueOnce(userCancelError);
+    mockIsUserCancellation.mockReturnValueOnce(true);
+
+    const { result } = renderHook(() => useQrConfirm(defaultOptions));
+
+    await act(async () => {
+      await result.current.onConfirm();
+    });
+
+    expect(mockShowHardwareWalletError).not.toHaveBeenCalled();
+    expect(onReject).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not show error when already rejected', async () => {
+    const error = new Error('fail');
+    mockExecuteHardwareWalletOperation.mockImplementation(
+      async ({ onRejected }) => {
+        await onRejected();
+        throw error;
+      },
+    );
+
+    const { result } = renderHook(() => useQrConfirm(defaultOptions));
+
+    await act(async () => {
+      await result.current.onConfirm();
+    });
+
+    expect(onReject).toHaveBeenCalledTimes(1);
+  });
+
+  it('uses from address from transaction metadata when approval request has no from', async () => {
+    const originalRequestData = mockApprovalRequest.requestData;
+    mockApprovalRequest.requestData =
+      {} as typeof mockApprovalRequest.requestData;
+    mockTransactionMetadata.txParams = { from: '0xTxMetaAddress' };
+
+    const { result } = renderHook(() => useQrConfirm(defaultOptions));
+
+    await act(async () => {
+      await result.current.onConfirm();
+    });
+
+    expect(mockExecuteHardwareWalletOperation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        address: '0xTxMetaAddress',
+      }),
+    );
+
+    mockApprovalRequest.requestData = originalRequestData;
+  });
+});
diff --git a/app/core/HardwareWallet/hooks/useQrConfirm.ts b/app/core/HardwareWallet/hooks/useQrConfirm.ts
new file mode 100644
index 00000000000..4eb44cf558e
--- /dev/null
+++ b/app/core/HardwareWallet/hooks/useQrConfirm.ts
@@ -0,0 +1,125 @@
+import { useCallback, useRef } from 'react';
+
+import {
+  useHardwareWallet,
+  executeHardwareWalletOperation,
+  isUserCancellation,
+} from '..';
+import { useQRHardwareContext } from '../../../components/Views/confirmations/context/qr-hardware-context';
+import useApprovalRequest from '../../../components/Views/confirmations/hooks/useApprovalRequest';
+import { useTransactionMetadataRequest } from '../../../components/Views/confirmations/hooks/transactions/useTransactionMetadataRequest';
+
+interface UseQrConfirmOptions {
+  onReject: () => void;
+  onTransactionConfirm: (opts?: {
+    onError?: (err: unknown) => void;
+  }) => Promise<void>;
+  executeApproval: () => Promise<void>;
+  isTransactionReq: boolean;
+}
+
+/**
+ * Coordinates QR hardware wallet confirmation for transactions and message approvals.
+ *
+ * Ensures the QR account is ready, shows the awaiting-confirmation UI, opens the
+ * scanner when a QR signing payload is already active, and forwards terminal
+ * errors through the hardware wallet error flow.
+ *
+ * @returns An `onConfirm` callback for the confirmation submit action.
+ */
+export function useQrConfirm({
+  onReject,
+  onTransactionConfirm,
+  executeApproval,
+  isTransactionReq,
+}: UseQrConfirmOptions) {
+  const {
+    ensureDeviceReady,
+    showAwaitingConfirmation,
+    hideAwaitingConfirmation,
+    showHardwareWalletError,
+  } = useHardwareWallet();
+
+  const { isSigningQRObject } = useQRHardwareContext();
+
+  const { approvalRequest } = useApprovalRequest();
+  const transactionMetadata = useTransactionMetadataRequest();
+
+  const hasRejectedRef = useRef(false);
+
+  const executeQrConfirmation = useCallback(async () => {
+    if (isTransactionReq) {
+      await onTransactionConfirm({
+        onError: (err) => {
+          throw err;
+        },
+      });
+      return;
+    }
+
+    await executeApproval();
+  }, [executeApproval, isTransactionReq, onTransactionConfirm]);
+
+  const onConfirm = useCallback(async () => {
+    hasRejectedRef.current = false;
+
+    const rejectOnce = () => {
+      if (hasRejectedRef.current) return;
+      hasRejectedRef.current = true;
+      onReject();
+    };
+
+    const fromAddress =
+      (approvalRequest?.requestData?.from as string) ||
+      (transactionMetadata?.txParams?.from as string);
+
+    if (!fromAddress) {
+      rejectOnce();
+      return;
+    }
+
+    // If QR signing is already in progress, re-show the awaiting-confirmation
+    // bottom sheet (which displays the QR code and its own scanner) rather than
+    // opening the QRInfo scanner that skips the QR-code display step.
+    if (isSigningQRObject) {
+      showAwaitingConfirmation(
+        isTransactionReq ? 'transaction' : 'message',
+        () => {
+          rejectOnce();
+        },
+      );
+      return;
+    }
+
+    try {
+      await executeHardwareWalletOperation({
+        address: fromAddress,
+        operationType: isTransactionReq ? 'transaction' : 'message',
+        ensureDeviceReady,
+        showAwaitingConfirmation,
+        hideAwaitingConfirmation,
+        showHardwareWalletError,
+        execute: executeQrConfirmation,
+        onRejected: rejectOnce,
+      });
+    } catch (err) {
+      if (!hasRejectedRef.current && !isUserCancellation(err)) {
+        showHardwareWalletError(err);
+      }
+      rejectOnce();
+    }
+  }, [
+    approvalRequest?.requestData?.from,
+    transactionMetadata?.txParams?.from,
+    isSigningQRObject,
+    isTransactionReq,
+    executeQrConfirmation,
+    onReject,
+    ensureDeviceReady,
+    showAwaitingConfirmation,
+    hideAwaitingConfirmation,
+    showHardwareWalletError,
+  ]);
+
+  return { onConfirm };
+}
diff --git a/app/core/HardwareWallet/hooks/useQrScanErrorForwarding.test.ts b/app/core/HardwareWallet/hooks/useQrScanErrorForwarding.test.ts
new file mode 100644
index 00000000000..00ac89451ef
--- /dev/null
+++ b/app/core/HardwareWallet/hooks/useQrScanErrorForwarding.test.ts
@@ -0,0 +1,70 @@
+import { act, renderHook } from '@testing-library/react-native';
+import type { HardwareWalletError } from '@metamask/hw-wallet-sdk';
+
+const mockShowHardwareWalletError = jest.fn();
+
+jest.mock('../contexts', () => ({
+  useHardwareWallet: () => ({
+    showHardwareWalletError: mockShowHardwareWalletError,
+  }),
+}));
+
+import { useQrScanErrorForwarding } from './useQrScanErrorForwarding';
+
+describe('useQrScanErrorForwarding', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('closes the scanner and forwards QR scan errors after the modal hides', () => {
+    const hideScanner = jest.fn();
+    const scanError = new Error(
+      'Scanned QR code is not in UR format',
+    ) as HardwareWalletError;
+    const { result } = renderHook(() =>
+      useQrScanErrorForwarding({ hideScanner }),
+    );
+
+    act(() => {
+      result.current.onQRHardwareScanError(scanError);
+    });
+
+    expect(hideScanner).toHaveBeenCalledTimes(1);
+    expect(mockShowHardwareWalletError).not.toHaveBeenCalled();
+
+    act(() => {
+      result.current.handleScannerModalHide();
+    });
+
+    expect(mockShowHardwareWalletError).toHaveBeenCalledWith(scanError);
+  });
+
+  it('does not forward an error when the modal hides without a pending QR scan error', () => {
+    const hideScanner = jest.fn();
+    const { result } = renderHook(() =>
+      useQrScanErrorForwarding({ hideScanner }),
+    );
+
+    act(() => {
+      result.current.handleScannerModalHide();
+    });
+
+    expect(mockShowHardwareWalletError).not.toHaveBeenCalled();
+  });
+
+  it('clears the pending QR scan error after forwarding it', () => {
+    const hideScanner = jest.fn();
+    const scanError = new Error('QR scan failed') as HardwareWalletError;
+    const { result } = renderHook(() =>
+      useQrScanErrorForwarding({ hideScanner }),
+    );
+
+    act(() => {
+      result.current.onQRHardwareScanError(scanError);
+      result.current.handleScannerModalHide();
+      result.current.handleScannerModalHide();
+    });
+
+    expect(mockShowHardwareWalletError).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/app/core/HardwareWallet/hooks/useQrScanErrorForwarding.ts b/app/core/HardwareWallet/hooks/useQrScanErrorForwarding.ts
new file mode 100644
index 00000000000..223f41955c4
--- /dev/null
+++ b/app/core/HardwareWallet/hooks/useQrScanErrorForwarding.ts
@@ -0,0 +1,38 @@
+import { useCallback, useRef } from 'react';
+import type { HardwareWalletError } from '@metamask/hw-wallet-sdk';
+
+import { useHardwareWallet } from '../contexts';
+
+interface UseQrScanErrorForwardingOptions {
+  hideScanner: () => void;
+}
+
+export function useQrScanErrorForwarding({
+  hideScanner,
+}: UseQrScanErrorForwardingOptions) {
+  const { showHardwareWalletError } = useHardwareWallet();
+  const pendingQrScanErrorRef = useRef<HardwareWalletError | null>(null);
+
+  const onQRHardwareScanError = useCallback(
+    (error: HardwareWalletError) => {
+      pendingQrScanErrorRef.current = error;
+      hideScanner();
+    },
+    [hideScanner],
+  );
+
+  const handleScannerModalHide = useCallback(() => {
+    const pendingError = pendingQrScanErrorRef.current;
+    if (!pendingError) {
+      return;
+    }
+
+    pendingQrScanErrorRef.current = null;
+    showHardwareWalletError(pendingError);
+  }, [showHardwareWalletError]);
+
+  return {
+    onQRHardwareScanError,
+    handleScannerModalHide,
+  };
+}
diff --git a/app/core/HardwareWallet/transactionReplacementParams.test.ts b/app/core/HardwareWallet/transactionReplacementParams.test.ts
new file mode 100644
index 00000000000..868c01c4170
--- /dev/null
+++ b/app/core/HardwareWallet/transactionReplacementParams.test.ts
@@ -0,0 +1,57 @@
+import {
+  getReplacementGasFeeParams,
+  type ReplacementTxParams,
+} from './transactionReplacementParams';
+import { LedgerReplacementTxTypes } from '../../components/UI/LedgerModals/LedgerTransactionModal';
+
+describe('getReplacementGasFeeParams', () => {
+  it('returns only gasPrice from legacy replacement params', () => {
+    const replacementParams = {
+      type: LedgerReplacementTxTypes.SPEED_UP,
+      legacyGasFee: {
+        gasPrice: '0xabc',
+        unexpected: 'ignore-me',
+      },
+    };
+
+    const result = getReplacementGasFeeParams(replacementParams);
+
+    expect(result).toStrictEqual({
+      gasPrice: '0xabc',
+    });
+  });
+
+  it('returns eip1559 gas values when legacy gas is incomplete', () => {
+    const replacementParams = {
+      type: LedgerReplacementTxTypes.CANCEL,
+      legacyGasFee: {
+        unexpected: 'ignore-me',
+      },
+      eip1559GasFee: {
+        maxFeePerGas: '0xdef',
+        maxPriorityFeePerGas: '0x123',
+        unexpected: 'ignore-me',
+      },
+    } as unknown as ReplacementTxParams;
+
+    const result = getReplacementGasFeeParams(replacementParams);
+
+    expect(result).toStrictEqual({
+      maxFeePerGas: '0xdef',
+      maxPriorityFeePerGas: '0x123',
+    });
+  });
+
+  it('returns undefined when replacement gas fields are incomplete', () => {
+    const replacementParams = {
+      type: LedgerReplacementTxTypes.CANCEL,
+      eip1559GasFee: {
+        maxFeePerGas: '0xdef',
+      },
+    };
+
+    const result = getReplacementGasFeeParams(replacementParams);
+
+    expect(result).toBeUndefined();
+  });
+});
diff --git a/app/core/HardwareWallet/transactionReplacementParams.ts b/app/core/HardwareWallet/transactionReplacementParams.ts
new file mode 100644
index 00000000000..c923587db35
--- /dev/null
+++ b/app/core/HardwareWallet/transactionReplacementParams.ts
@@ -0,0 +1,41 @@
+import type {
+  FeeMarketEIP1559Values,
+  GasPriceValue,
+} from '@metamask/transaction-controller';
+
+export interface ReplacementTxParams {
+  type: string;
+  eip1559GasFee?: {
+    maxFeePerGas?: string;
+    maxPriorityFeePerGas?: string;
+  };
+  legacyGasFee?: {
+    gasPrice?: string;
+  };
+}
+
+/**
+ * Normalizes replacement gas params down to the controller-supported fields.
+ */
+export function getReplacementGasFeeParams(
+  replacementParams?: ReplacementTxParams,
+): GasPriceValue | FeeMarketEIP1559Values | undefined {
+  if (replacementParams?.legacyGasFee?.gasPrice) {
+    return {
+      gasPrice: replacementParams.legacyGasFee.gasPrice,
+    };
+  }
+
+  if (
+    replacementParams?.eip1559GasFee?.maxFeePerGas &&
+    replacementParams?.eip1559GasFee?.maxPriorityFeePerGas
+  ) {
+    return {
+      maxFeePerGas: replacementParams.eip1559GasFee.maxFeePerGas,
+      maxPriorityFeePerGas:
+        replacementParams.eip1559GasFee.maxPriorityFeePerGas,
+    };
+  }
+
+  return undefined;
+}
diff --git a/app/core/Ledger/Ledger.test.ts b/app/core/Ledger/Ledger.test.ts
index db53ecb662e..2ce34b21a60 100644
--- a/app/core/Ledger/Ledger.test.ts
+++ b/app/core/Ledger/Ledger.test.ts
@@ -15,6 +15,10 @@ import {
 } from './Ledger';
 import Engine from '../../core/Engine';
 import { SignTypedDataVersion } from '@metamask/keyring-controller';
+import {
+  LedgerKeyring,
+  LedgerMobileBridge,
+} from '@metamask/eth-ledger-bridge-keyring';
 import type BleTransport from '@ledgerhq/react-native-hw-transport-ble';
 import PAGINATION_OPERATIONS from '../../constants/pagination';
 import {
@@ -51,30 +55,21 @@ const MockRemoveAccountsFromPermissions = jest.mocked(
   removeAccountsFromPermissions,
 );
 
-interface mockKeyringType {
-  addAccounts: jest.Mock;
-  getAccounts: jest.Mock;
-  bridge: {
-    getAppNameAndVersion: jest.Mock;
-    updateTransportMethod: jest.Mock;
-    openEthApp: jest.Mock;
-    closeApps: jest.Mock;
-  };
-  deserialize: jest.Mock;
-  forgetDevice: jest.Mock;
-  getDeviceId: jest.Mock;
-  getFirstPage: jest.Mock;
-  getNextPage: jest.Mock;
-  getPreviousPage: jest.Mock;
-  setDeviceId: jest.Mock;
-  setHdPath: jest.Mock;
-  hdPath: string;
-  setAccountToUnlock: jest.Mock;
-}
+// Bridge stub used by the real LedgerKeyring instance below. We don't run
+// the real bridge methods — production code reads them off `keyring.bridge`
+// (e.g. `getAppNameAndVersion`, `openEthApp`), so they need to be jest mocks.
+const mockBridge = {
+  getAppNameAndVersion: jest.fn(),
+  updateTransportMethod: jest.fn(),
+  openEthApp: jest.fn(),
+  closeApps: jest.fn(),
+};
+
+const ledgerKeyring = new LedgerKeyring({
+  bridge: mockBridge as unknown as LedgerMobileBridge,
+});
 
 describe('Ledger core', () => {
-  let ledgerKeyring: mockKeyringType;
-
   beforeEach(() => {
     jest.resetAllMocks();
 
@@ -83,73 +78,74 @@ describe('Ledger core', () => {
 
     const mockKeyringController = MockEngine.context.KeyringController;
 
-    ledgerKeyring = {
-      addAccounts: jest
-        .fn()
-        .mockResolvedValue(['0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB2']),
-      bridge: {
-        getAppNameAndVersion: jest
-          .fn()
-          .mockResolvedValue({ appName: 'appName' }),
-        updateTransportMethod: jest.fn(),
-        openEthApp: jest.fn(),
-        closeApps: jest.fn(),
+    // Re-establish bridge mock implementations after `jest.resetAllMocks`
+    // wipes them.
+    mockBridge.getAppNameAndVersion.mockResolvedValue({
+      appName: 'appName',
+    });
+
+    // Re-establish LedgerKeyring spies each test. `testSetup.js` runs
+    // `jest.restoreAllMocks()` in afterEach, which restores spied methods to
+    // their real implementations, so spies must be recreated here.
+    jest
+      .spyOn(ledgerKeyring, 'addAccounts')
+      .mockResolvedValue(['0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB2']);
+    jest.spyOn(ledgerKeyring, 'deserialize').mockImplementation();
+    jest.spyOn(ledgerKeyring, 'forgetDevice').mockImplementation();
+    jest.spyOn(ledgerKeyring, 'getDeviceId').mockReturnValue('deviceId');
+    jest.spyOn(ledgerKeyring, 'getFirstPage').mockResolvedValue([
+      {
+        address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB2',
+        index: 0,
+        balance: 0,
       },
-      deserialize: jest.fn(),
-      forgetDevice: jest.fn(),
-      getDeviceId: jest.fn().mockReturnValue('deviceId'),
-      getFirstPage: jest.fn().mockResolvedValue([
-        {
-          balance: '0',
-          address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB2',
-          index: 0,
-        },
-        {
-          balance: '1',
-          address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB3',
-          index: 1,
-        },
-      ]),
-      getNextPage: jest.fn().mockResolvedValue([
-        {
-          balance: '4',
-          address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB4',
-          index: 4,
-        },
-        {
-          balance: '5',
-          address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB5',
-          index: 5,
-        },
-      ]),
-      getPreviousPage: jest.fn().mockResolvedValue([
-        {
-          balance: '2',
-          address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB6',
-          index: 2,
-        },
-        {
-          balance: '3',
-          address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB7',
-          index: 3,
-        },
-      ]),
-      setDeviceId: jest.fn(),
-      setHdPath: jest.fn(),
-      hdPath: LEDGER_LIVE_PATH,
-      setAccountToUnlock: jest.fn(),
-      getAccounts: jest
-        .fn()
-        .mockResolvedValue([
-          '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB2',
-          '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB3',
-        ]),
-    };
+      {
+        address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB3',
+        index: 1,
+        balance: 0,
+      },
+    ]);
+    jest.spyOn(ledgerKeyring, 'getNextPage').mockResolvedValue([
+      {
+        address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB4',
+        index: 4,
+        balance: 0,
+      },
+      {
+        address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB5',
+        index: 5,
+        balance: 0,
+      },
+    ]);
+    jest.spyOn(ledgerKeyring, 'getPreviousPage').mockResolvedValue([
+      {
+        address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB6',
+        index: 2,
+        balance: 0,
+      },
+      {
+        address: '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB7',
+        index: 3,
+        balance: 0,
+      },
+    ]);
+    jest.spyOn(ledgerKeyring, 'setDeviceId').mockImplementation();
+    jest.spyOn(ledgerKeyring, 'setHdPath').mockImplementation();
+    ledgerKeyring.hdPath = LEDGER_LIVE_PATH;
+    jest.spyOn(ledgerKeyring, 'setAccountToUnlock').mockImplementation();
+    jest
+      .spyOn(ledgerKeyring, 'getAccounts')
+      .mockResolvedValue([
+        '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB2',
+        '0x49b6FFd1BD9d1c64EEf400a64a1e4bBC33E2CAB3',
+      ]);
 
     mockKeyringController.withKeyring.mockImplementation(
       (_selector, operation) =>
-        // @ts-expect-error The Ledger keyring is not compatible with our keyring type yet
-        operation({ keyring: ledgerKeyring, metadata: { id: '1234' } }),
+        operation({
+          keyring: ledgerKeyring,
+          metadata: { id: '1234', name: '' },
+        }),
     );
     mockKeyringController.signTypedMessage.mockResolvedValue('signature');
   });
@@ -158,12 +154,12 @@ describe('Ledger core', () => {
     const mockTransport = 'foo' as unknown as BleTransport;
     it('calls keyring.setTransport', async () => {
       await connectLedgerHardware(mockTransport, 'bar');
-      expect(ledgerKeyring.bridge.updateTransportMethod).toHaveBeenCalled();
+      expect(mockBridge.updateTransportMethod).toHaveBeenCalled();
     });
 
     it('calls keyring.getAppAndVersion', async () => {
       await connectLedgerHardware(mockTransport, 'bar');
-      expect(ledgerKeyring.bridge.getAppNameAndVersion).toHaveBeenCalled();
+      expect(mockBridge.getAppNameAndVersion).toHaveBeenCalled();
     });
 
     it('returns app name correctly', async () => {
@@ -179,16 +175,13 @@ describe('Ledger core', () => {
 
     it('releases the keyring lock before requesting app metadata from the device', async () => {
       const events: string[] = [];
-      ledgerKeyring.bridge.getAppNameAndVersion.mockImplementationOnce(
-        async () => {
-          events.push('getAppNameAndVersion');
-          return { appName: 'Ethereum' };
-        },
-      );
+      mockBridge.getAppNameAndVersion.mockImplementationOnce(async () => {
+        events.push('getAppNameAndVersion');
+        return { appName: 'Ethereum' };
+      });
       MockEngine.context.KeyringController.withKeyring.mockImplementationOnce(
         async (_selector, operation) => {
           const result = await operation({
-            // @ts-expect-error The Ledger keyring is not compatible with our keyring type yet
             keyring: ledgerKeyring,
             metadata: { id: '1234', name: 'Ledger Hardware' },
           });
@@ -201,18 +194,16 @@ describe('Ledger core', () => {
         'Ethereum',
       );
 
-      expect(ledgerKeyring.bridge.updateTransportMethod).toHaveBeenCalled();
-      expect(ledgerKeyring.bridge.getAppNameAndVersion).toHaveBeenCalled();
+      expect(mockBridge.updateTransportMethod).toHaveBeenCalled();
+      expect(mockBridge.getAppNameAndVersion).toHaveBeenCalled();
       expect(events).toEqual(['withKeyring settled', 'getAppNameAndVersion']);
     });
 
     it('skips app metadata request when aborted before the BLE exchange starts', async () => {
       const abortController = new AbortController();
-      ledgerKeyring.bridge.updateTransportMethod.mockImplementationOnce(
-        async () => {
-          abortController.abort();
-        },
-      );
+      mockBridge.updateTransportMethod.mockImplementationOnce(async () => {
+        abortController.abort();
+      });
 
       const resultPromise = connectLedgerHardware(
         mockTransport,
@@ -225,25 +216,61 @@ describe('Ledger core', () => {
         name: 'LedgerOperationAbortedError',
       });
 
-      expect(ledgerKeyring.bridge.getAppNameAndVersion).not.toHaveBeenCalled();
+      expect(mockBridge.getAppNameAndVersion).not.toHaveBeenCalled();
+    });
+
+    it('throws before acquiring the keyring lock when the abort signal is already aborted', async () => {
+      const abortController = new AbortController();
+      abortController.abort();
+
+      const error = await connectLedgerHardware(
+        mockTransport,
+        'bar',
+        abortController.signal,
+      ).catch((caughtError) => caughtError);
+
+      expect(error).toMatchObject({
+        name: 'LedgerOperationAbortedError',
+      });
+
+      expect(
+        MockEngine.context.KeyringController.withKeyring,
+      ).not.toHaveBeenCalled();
+      expect(mockBridge.updateTransportMethod).not.toHaveBeenCalled();
+      expect(mockBridge.getAppNameAndVersion).not.toHaveBeenCalled();
+    });
+
+    it('throws when the resolved keyring is not a LedgerKeyring instance', async () => {
+      MockEngine.context.KeyringController.withKeyring.mockImplementationOnce(
+        async (_selector, operation) =>
+          operation({
+            // The withKeyring helper guards against the keyring controller
+            // resolving a non-Ledger keyring (e.g. due to a controller bug).
+            keyring: {} as unknown as LedgerKeyring,
+            metadata: { id: '1234', name: '' },
+          }),
+      );
+
+      await expect(connectLedgerHardware(mockTransport, 'bar')).rejects.toThrow(
+        'Expected LedgerKeyring',
+      );
     });
   });
 
   describe('openEthereumAppOnLedger', () => {
     it('calls keyring.openEthApp', async () => {
       await openEthereumAppOnLedger();
-      expect(ledgerKeyring.bridge.openEthApp).toHaveBeenCalled();
+      expect(mockBridge.openEthApp).toHaveBeenCalled();
     });
 
     it('releases the keyring lock before opening the Ethereum app on the device', async () => {
       const events: string[] = [];
-      ledgerKeyring.bridge.openEthApp.mockImplementationOnce(async () => {
+      mockBridge.openEthApp.mockImplementationOnce(async () => {
         events.push('openEthApp');
       });
       MockEngine.context.KeyringController.withKeyring.mockImplementationOnce(
         async (_selector, operation) => {
           const result = await operation({
-            // @ts-expect-error The Ledger keyring is not compatible with our keyring type yet
             keyring: ledgerKeyring,
             metadata: { id: '1234', name: 'Ledger Hardware' },
           });
@@ -261,18 +288,17 @@ describe('Ledger core', () => {
   describe('closeRunningAppOnLedger', () => {
     it('calls keyring.quitApp', async () => {
       await closeRunningAppOnLedger();
-      expect(ledgerKeyring.bridge.closeApps).toHaveBeenCalled();
+      expect(mockBridge.closeApps).toHaveBeenCalled();
     });
 
     it('releases the keyring lock before closing the current app on the device', async () => {
       const events: string[] = [];
-      ledgerKeyring.bridge.closeApps.mockImplementationOnce(async () => {
+      mockBridge.closeApps.mockImplementationOnce(async () => {
         events.push('closeApps');
       });
       MockEngine.context.KeyringController.withKeyring.mockImplementationOnce(
         async (_selector, operation) => {
           const result = await operation({
-            // @ts-expect-error The Ledger keyring is not compatible with our keyring type yet
             keyring: ledgerKeyring,
             metadata: { id: '1234', name: 'Ledger Hardware' },
           });
@@ -454,7 +480,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x6d00;
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.getFirstPage)
+        .mockRejectedValueOnce(transportError);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -466,7 +494,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x6e00;
-      ledgerKeyring.getNextPage.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.getNextPage)
+        .mockRejectedValueOnce(transportError);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_NEXT_PAGE),
@@ -478,7 +508,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x650f;
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.getFirstPage)
+        .mockRejectedValueOnce(transportError);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -487,7 +519,7 @@ describe('Ledger core', () => {
 
     it('throws ETH app not open error when error message contains 0x650f', async () => {
       const error = new Error('Ledger device: UNKNOWN_ERROR (0x650f)');
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(error);
+      jest.mocked(ledgerKeyring.getFirstPage).mockRejectedValueOnce(error);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -495,9 +527,9 @@ describe('Ledger core', () => {
     });
 
     it('throws unspecified error for other errors', async () => {
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(
-        new Error('Some other error'),
-      );
+      jest
+        .mocked(ledgerKeyring.getFirstPage)
+        .mockRejectedValueOnce(new Error('Some other error'));
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -509,7 +541,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x6e01;
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.getFirstPage)
+        .mockRejectedValueOnce(transportError);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -521,7 +555,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x6511;
-      ledgerKeyring.getPreviousPage.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.getPreviousPage)
+        .mockRejectedValueOnce(transportError);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_PREVIOUS_PAGE),
@@ -533,7 +569,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x6700;
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.getFirstPage)
+        .mockRejectedValueOnce(transportError);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -542,7 +580,7 @@ describe('Ledger core', () => {
 
     it('throws ETH app not open error when error message contains 0x6511', async () => {
       const error = new Error('Ledger device: APP_NOT_OPEN (0x6511)');
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(error);
+      jest.mocked(ledgerKeyring.getFirstPage).mockRejectedValueOnce(error);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -551,7 +589,7 @@ describe('Ledger core', () => {
 
     it('throws ETH app not open error when error message contains 0x6d00', async () => {
       const error = new Error('TransportError: CLA_NOT_SUPPORTED (0x6d00)');
-      ledgerKeyring.getNextPage.mockRejectedValueOnce(error);
+      jest.mocked(ledgerKeyring.getNextPage).mockRejectedValueOnce(error);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_NEXT_PAGE),
@@ -560,7 +598,7 @@ describe('Ledger core', () => {
 
     it('throws ETH app not open error when error message contains 0x6e00', async () => {
       const error = new Error('TransportError: INS_NOT_SUPPORTED (0x6e00)');
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(error);
+      jest.mocked(ledgerKeyring.getFirstPage).mockRejectedValueOnce(error);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -569,7 +607,7 @@ describe('Ledger core', () => {
 
     it('throws ETH app not open error when error message contains 0x6e01', async () => {
       const error = new Error('Ledger: INS_NOT_SUPPORTED variant (0x6e01)');
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(error);
+      jest.mocked(ledgerKeyring.getFirstPage).mockRejectedValueOnce(error);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -578,7 +616,7 @@ describe('Ledger core', () => {
 
     it('throws ETH app not open error when error message contains 0x6700', async () => {
       const error = new Error('Ledger: INCORRECT_LENGTH (0x6700)');
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(error);
+      jest.mocked(ledgerKeyring.getFirstPage).mockRejectedValueOnce(error);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -587,7 +625,7 @@ describe('Ledger core', () => {
 
     it('throws ETH app not open error for unknown_error pattern with 0x650f', async () => {
       const error = new Error('ledger device: unknown_error (0x650f)');
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(error);
+      jest.mocked(ledgerKeyring.getFirstPage).mockRejectedValueOnce(error);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -596,7 +634,7 @@ describe('Ledger core', () => {
 
     it('throws ETH app not open error for unknown_error pattern with 0x6511', async () => {
       const error = new Error('ledger device: unknown_error (0x6511)');
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(error);
+      jest.mocked(ledgerKeyring.getFirstPage).mockRejectedValueOnce(error);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -608,7 +646,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x1234; // Non-matching code
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.getFirstPage)
+        .mockRejectedValueOnce(transportError);
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
@@ -616,12 +656,38 @@ describe('Ledger core', () => {
     });
 
     it('does not throw ETH app not open error for non-Error objects', async () => {
-      ledgerKeyring.getFirstPage.mockRejectedValueOnce('string error');
+      jest
+        .mocked(ledgerKeyring.getFirstPage)
+        .mockRejectedValueOnce('string error');
 
       await expect(
         getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
       ).rejects.toThrow('Unspecified error when connect Ledger Hardware,');
     });
+
+    it('throws disconnect error for DisconnectedDevice', async () => {
+      const disconnectError = new Error('Disconnected during operation');
+      disconnectError.name = 'DisconnectedDevice';
+      jest
+        .mocked(ledgerKeyring.getFirstPage)
+        .mockRejectedValueOnce(disconnectError);
+
+      await expect(
+        getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_FIRST_PAGE),
+      ).rejects.toThrow('Your device got disconnected');
+    });
+
+    it('throws disconnect error for DisconnectedDeviceDuringOperation', async () => {
+      const disconnectError = new Error('Lost connection');
+      disconnectError.name = 'DisconnectedDeviceDuringOperation';
+      jest
+        .mocked(ledgerKeyring.getNextPage)
+        .mockRejectedValueOnce(disconnectError);
+
+      await expect(
+        getLedgerAccountsByOperation(PAGINATION_OPERATIONS.GET_NEXT_PAGE),
+      ).rejects.toThrow('Your device got disconnected');
+    });
   });
 
   describe('ledgerSignTypedMessage', () => {
@@ -821,7 +887,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x6d00;
-      ledgerKeyring.addAccounts.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.addAccounts)
+        .mockRejectedValueOnce(transportError);
 
       await expect(unlockLedgerWalletAccount(1)).rejects.toThrow(
         'Please open the Ethereum app on your Ledger device.',
@@ -833,7 +901,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x6e00;
-      ledgerKeyring.addAccounts.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.addAccounts)
+        .mockRejectedValueOnce(transportError);
 
       await expect(unlockLedgerWalletAccount(1)).rejects.toThrow(
         'Please open the Ethereum app on your Ledger device.',
@@ -845,7 +915,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x6e01;
-      ledgerKeyring.addAccounts.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.addAccounts)
+        .mockRejectedValueOnce(transportError);
 
       await expect(unlockLedgerWalletAccount(1)).rejects.toThrow(
         'Please open the Ethereum app on your Ledger device.',
@@ -857,7 +929,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x6511;
-      ledgerKeyring.addAccounts.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.addAccounts)
+        .mockRejectedValueOnce(transportError);
 
       await expect(unlockLedgerWalletAccount(1)).rejects.toThrow(
         'Please open the Ethereum app on your Ledger device.',
@@ -869,7 +943,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x6700;
-      ledgerKeyring.addAccounts.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.addAccounts)
+        .mockRejectedValueOnce(transportError);
 
       await expect(unlockLedgerWalletAccount(1)).rejects.toThrow(
         'Please open the Ethereum app on your Ledger device.',
@@ -881,7 +957,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x650f;
-      ledgerKeyring.addAccounts.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.addAccounts)
+        .mockRejectedValueOnce(transportError);
 
       await expect(unlockLedgerWalletAccount(1)).rejects.toThrow(
         'Please open the Ethereum app on your Ledger device.',
@@ -890,7 +968,7 @@ describe('Ledger core', () => {
 
     it('throws ETH app not open error when error message contains 0x650f', async () => {
       const error = new Error('Ledger device: UNKNOWN_ERROR (0x650f)');
-      ledgerKeyring.addAccounts.mockRejectedValueOnce(error);
+      jest.mocked(ledgerKeyring.addAccounts).mockRejectedValueOnce(error);
 
       await expect(unlockLedgerWalletAccount(1)).rejects.toThrow(
         'Please open the Ethereum app on your Ledger device.',
@@ -899,7 +977,7 @@ describe('Ledger core', () => {
 
     it('throws ETH app not open error when error message contains 0x6511', async () => {
       const error = new Error('Ledger device: APP_NOT_OPEN (0x6511)');
-      ledgerKeyring.addAccounts.mockRejectedValueOnce(error);
+      jest.mocked(ledgerKeyring.addAccounts).mockRejectedValueOnce(error);
 
       await expect(unlockLedgerWalletAccount(1)).rejects.toThrow(
         'Please open the Ethereum app on your Ledger device.',
@@ -908,7 +986,7 @@ describe('Ledger core', () => {
 
     it('throws original error for non-ETH app not open errors', async () => {
       const error = new Error('Some other error');
-      ledgerKeyring.addAccounts.mockRejectedValueOnce(error);
+      jest.mocked(ledgerKeyring.addAccounts).mockRejectedValueOnce(error);
 
       await expect(unlockLedgerWalletAccount(1)).rejects.toThrow(
         'Some other error',
@@ -920,7 +998,9 @@ describe('Ledger core', () => {
       transportError.name = 'TransportStatusError';
       // @ts-expect-error statusCode is a custom property on TransportStatusError
       transportError.statusCode = 0x1234; // Non-matching code
-      ledgerKeyring.addAccounts.mockRejectedValueOnce(transportError);
+      jest
+        .mocked(ledgerKeyring.addAccounts)
+        .mockRejectedValueOnce(transportError);
 
       await expect(unlockLedgerWalletAccount(1)).rejects.toThrow(
         'TransportStatusError',
diff --git a/app/core/Ledger/Ledger.ts b/app/core/Ledger/Ledger.ts
index 8e1ab7521ed..c3db6a1209f 100644
--- a/app/core/Ledger/Ledger.ts
+++ b/app/core/Ledger/Ledger.ts
@@ -18,7 +18,7 @@ import PAGINATION_OPERATIONS from '../../constants/pagination';
 import { strings } from '../../../locales/i18n';
 import { keyringTypeToName } from '@metamask/accounts-controller';
 import { removeAccountsFromPermissions } from '../Permissions';
-import { isEthAppNotOpenError } from './ledgerErrors';
+import { isEthAppNotOpenError, isDisconnectError } from './ledgerErrors';
 
 const throwIfLedgerOperationAborted = (abortSignal?: AbortSignal) => {
   if (!abortSignal?.aborted) {
@@ -50,7 +50,12 @@ export const withLedgerKeyring = async <CallbackResult = void>(
   const keyringController = Engine.context.KeyringController;
   return await keyringController.withKeyring(
     { type: ExtendedKeyringTypes.ledger },
-    operation,
+    ({ keyring, metadata }) => {
+      if (!(keyring instanceof LedgerKeyring)) {
+        throw new Error('Expected LedgerKeyring');
+      }
+      return operation({ keyring, metadata });
+    },
     // TODO: Refactor this to stop creating the keyring on-demand
     // Instead create it only in response to an explicit user action, and do
     // not allow Ledger interactions until after that has been done.
@@ -209,6 +214,19 @@ export const getLedgerAccountsByOperation = async (
     if (isEthAppNotOpenError(e)) {
       throw new Error(strings('ledger.eth_app_not_open_message'));
     }
+    const errorMessage =
+      e instanceof Error
+        ? e.message
+        : e && typeof e === 'object' && 'message' in e
+          ? String(e.message)
+          : '';
+
+    if (
+      isDisconnectError(e) ||
+      /disconnected|disconnect|connection lost/i.test(errorMessage)
+    ) {
+      throw new Error(strings('ledger.ledger_disconnected'));
+    }
     throw new Error(strings('ledger.unspecified_error_during_connect'));
   }
 };
diff --git a/app/core/Multichain/test/utils.test.ts b/app/core/Multichain/test/utils.test.ts
index 55c845500c0..391dc8953e8 100644
--- a/app/core/Multichain/test/utils.test.ts
+++ b/app/core/Multichain/test/utils.test.ts
@@ -119,8 +119,6 @@ const mockBTCAccount: InternalAccount = {
     },
     snap: {
       id: 'npm:"@metamask/bitcoin-wallet-snap',
-      name: 'Bitcoin Wallet Snap',
-      enabled: true,
     },
   },
   options: {},
@@ -142,8 +140,6 @@ const mockSolAccount: InternalAccount = {
     },
     snap: {
       id: 'npm:"@metamask/solana-wallet-snap',
-      name: 'Solana Wallet Snap',
-      enabled: true,
     },
   },
   scopes: [SolScope.Mainnet, SolScope.Testnet, SolScope.Devnet],
diff --git a/app/core/NavigationService/types.ts b/app/core/NavigationService/types.ts
index b7e17dcdcde..4d2dd84e46a 100644
--- a/app/core/NavigationService/types.ts
+++ b/app/core/NavigationService/types.ts
@@ -222,7 +222,7 @@ export interface NestedNavigationParams {
   [key: string]: unknown;
 }
 
-import { SectionId } from '../../components/Views/TrendingView/sections.config';
+import type { SearchFeedId } from '../../components/Views/TrendingView/search/useExploreSearch';
 
 type TraderPositionViewParams =
   | {
@@ -348,10 +348,10 @@ export interface RootStackParamList extends ParamListBase {
   WhatsHappeningDetailView:
     | { items: WhatsHappeningItem[]; initialIndex: number }
     | undefined;
-  SitesFullView: undefined;
+  SitesFullView: { mode?: 'favorites' } | undefined;
   ExploreSearch: undefined;
   ExploreSectionResultsFullView: {
-    sectionId: SectionId;
+    feedId: SearchFeedId;
     title: string;
     searchQuery: string;
     data: unknown[];
diff --git a/app/core/OAuthService/OAuthLoginHandlers/config.ts b/app/core/OAuthService/OAuthLoginHandlers/config.ts
index 60e96839a6b..3be9292964e 100644
--- a/app/core/OAuthService/OAuthLoginHandlers/config.ts
+++ b/app/core/OAuthService/OAuthLoginHandlers/config.ts
@@ -1,4 +1,10 @@
 interface OAUTH_CONFIG_TYPE {
+  IOS_GOOGLE_CLIENT_ID: string;
+  IOS_GOOGLE_REDIRECT_URI: string;
+  ANDROID_GOOGLE_CLIENT_ID: string;
+  ANDROID_GOOGLE_SERVER_CLIENT_ID: string;
+  ANDROID_APPLE_CLIENT_ID: string;
+
   AUTH_SERVER_URL: string;
   WEB3AUTH_NETWORK: string;
 
@@ -22,6 +28,16 @@ enum BUILD_TYPE {
 
 export const OAUTH_CONFIG: Record<BUILD_TYPE, OAUTH_CONFIG_TYPE> = {
   development: {
+    IOS_GOOGLE_CLIENT_ID:
+      '615965109465-h6tp2h3crls6hbggispcgovbvk4vabu3.apps.googleusercontent.com',
+    IOS_GOOGLE_REDIRECT_URI:
+      'com.googleusercontent.apps.615965109465-h6tp2h3crls6hbggispcgovbvk4vabu3:/oauth2redirect/google',
+    ANDROID_GOOGLE_CLIENT_ID:
+      '615965109465-laapla9g0klg2p7rp5mn66fcl6jc4fes.apps.googleusercontent.com',
+    ANDROID_GOOGLE_SERVER_CLIENT_ID:
+      '615965109465-i8oeh9kuvl1n6lk1ffkobpvth27bmi41.apps.googleusercontent.com',
+    ANDROID_APPLE_CLIENT_ID: 'io.metamask.appleloginclient.dev',
+
     GOOGLE_GROUPED_AUTH_CONNECTION_ID: 'mm-seedless-onboarding',
     APPLE_GROUPED_AUTH_CONNECTION_ID: 'mm-seedless-onboarding',
     AUTH_SERVER_URL: 'https://api-develop-torus-byoa.web3auth.io',
@@ -33,6 +49,16 @@ export const OAUTH_CONFIG: Record<BUILD_TYPE, OAUTH_CONFIG_TYPE> = {
     IOS_APPLE_AUTH_CONNECTION_ID: 'byoa-server',
   },
   main_prod: {
+    IOS_GOOGLE_CLIENT_ID:
+      '795351133007-47aohp9j9n7r8fef5n6ejeauhu4kfc9e.apps.googleusercontent.com',
+    IOS_GOOGLE_REDIRECT_URI:
+      'com.googleusercontent.apps.795351133007-47aohp9j9n7r8fef5n6ejeauhu4kfc9e:/oauth2redirect/google',
+    ANDROID_GOOGLE_CLIENT_ID:
+      '795351133007-jcaor637tblrlpuj29shdej3co8bu8kv.apps.googleusercontent.com',
+    ANDROID_GOOGLE_SERVER_CLIENT_ID:
+      '795351133007-6d0s31utj13knv440fgjo2ur93241gb6.apps.googleusercontent.com',
+    ANDROID_APPLE_CLIENT_ID: 'io.metamask.appleloginclient.prod',
+
     GOOGLE_GROUPED_AUTH_CONNECTION_ID: 'mm-google-main',
     APPLE_GROUPED_AUTH_CONNECTION_ID: 'mm-apple-main',
     AUTH_SERVER_URL: 'https://auth-service.api.cx.metamask.io',
@@ -44,6 +70,16 @@ export const OAUTH_CONFIG: Record<BUILD_TYPE, OAUTH_CONFIG_TYPE> = {
     IOS_APPLE_AUTH_CONNECTION_ID: 'mm-apple-main-common',
   },
   main_uat: {
+    IOS_GOOGLE_CLIENT_ID:
+      '387141446914-5ja3p4dfanfkm8uq238fm1b8t1rkscv4.apps.googleusercontent.com',
+    IOS_GOOGLE_REDIRECT_URI:
+      'com.googleusercontent.apps.387141446914-5ja3p4dfanfkm8uq238fm1b8t1rkscv4:/oauth2redirect/google',
+    ANDROID_GOOGLE_CLIENT_ID:
+      '387141446914-7rl5s9s1uv82fgb03f93eqc0n8jq7t6k.apps.googleusercontent.com',
+    ANDROID_GOOGLE_SERVER_CLIENT_ID:
+      '387141446914-olajr83p1bbvabh1u8tfglt1k4u6jlcb.apps.googleusercontent.com',
+    ANDROID_APPLE_CLIENT_ID: 'io.metamask.appleloginclient.uat',
+
     GOOGLE_GROUPED_AUTH_CONNECTION_ID: 'mm-google-uat',
     APPLE_GROUPED_AUTH_CONNECTION_ID: 'mm-apple-uat',
     AUTH_SERVER_URL: 'https://auth-service.uat-api.cx.metamask.io',
@@ -55,6 +91,16 @@ export const OAUTH_CONFIG: Record<BUILD_TYPE, OAUTH_CONFIG_TYPE> = {
     IOS_APPLE_AUTH_CONNECTION_ID: 'mm-apple-uat-common',
   },
   main_dev: {
+    IOS_GOOGLE_CLIENT_ID:
+      '615965109465-h6tp2h3crls6hbggispcgovbvk4vabu3.apps.googleusercontent.com',
+    IOS_GOOGLE_REDIRECT_URI:
+      'com.googleusercontent.apps.615965109465-h6tp2h3crls6hbggispcgovbvk4vabu3:/oauth2redirect/google',
+    ANDROID_GOOGLE_CLIENT_ID:
+      '615965109465-laapla9g0klg2p7rp5mn66fcl6jc4fes.apps.googleusercontent.com',
+    ANDROID_GOOGLE_SERVER_CLIENT_ID:
+      '615965109465-i8oeh9kuvl1n6lk1ffkobpvth27bmi41.apps.googleusercontent.com',
+    ANDROID_APPLE_CLIENT_ID: 'io.metamask.appleloginclient.dev',
+
     GOOGLE_GROUPED_AUTH_CONNECTION_ID: 'mm-google-dev',
     APPLE_GROUPED_AUTH_CONNECTION_ID: 'mm-apple-dev',
     AUTH_SERVER_URL: 'https://auth-service.dev-api.cx.metamask.io',
@@ -66,6 +112,16 @@ export const OAUTH_CONFIG: Record<BUILD_TYPE, OAUTH_CONFIG_TYPE> = {
     IOS_APPLE_AUTH_CONNECTION_ID: 'mm-apple-dev-common',
   },
   flask_prod: {
+    IOS_GOOGLE_CLIENT_ID:
+      '795351133007-gvuagr9t7tfkak3sp2cmng4pdhchlfpd.apps.googleusercontent.com',
+    IOS_GOOGLE_REDIRECT_URI:
+      'com.googleusercontent.apps.795351133007-gvuagr9t7tfkak3sp2cmng4pdhchlfpd:/oauth2redirect/google',
+    ANDROID_GOOGLE_CLIENT_ID:
+      '795351133007-0po6dfbepae7klaso18qv61f86u4a2ef.apps.googleusercontent.com',
+    ANDROID_GOOGLE_SERVER_CLIENT_ID:
+      '795351133007-gh67d3hot6ib24htu9d7sh01bg90lpdu.apps.googleusercontent.com',
+    ANDROID_APPLE_CLIENT_ID: 'io.metamask.appleloginclient.flask.prod',
+
     GOOGLE_GROUPED_AUTH_CONNECTION_ID: 'mm-google-flask-main',
     APPLE_GROUPED_AUTH_CONNECTION_ID: 'mm-apple-flask-main',
     AUTH_SERVER_URL: 'https://auth-service.api.cx.metamask.io',
@@ -77,6 +133,16 @@ export const OAUTH_CONFIG: Record<BUILD_TYPE, OAUTH_CONFIG_TYPE> = {
     IOS_APPLE_AUTH_CONNECTION_ID: 'mm-apple-flask-main-common',
   },
   flask_uat: {
+    IOS_GOOGLE_CLIENT_ID:
+      '387141446914-1tdlsrare1jtjd2tgal9bi1ilb4qro5d.apps.googleusercontent.com',
+    IOS_GOOGLE_REDIRECT_URI:
+      'com.googleusercontent.apps.387141446914-1tdlsrare1jtjd2tgal9bi1ilb4qro5d:/oauth2redirect/google',
+    ANDROID_GOOGLE_CLIENT_ID:
+      '387141446914-ki5586faf9qmlghop8g07f4a10scdevi.apps.googleusercontent.com',
+    ANDROID_GOOGLE_SERVER_CLIENT_ID:
+      '387141446914-f03k9ivc2jrmi1s53lne88mh529372kj.apps.googleusercontent.com',
+    ANDROID_APPLE_CLIENT_ID: 'io.metamask.appleloginclient.flask.uat',
+
     GOOGLE_GROUPED_AUTH_CONNECTION_ID: 'mm-google-flask-uat',
     APPLE_GROUPED_AUTH_CONNECTION_ID: 'mm-apple-flask-uat',
     AUTH_SERVER_URL: 'https://auth-service.api.cx.metamask.io',
@@ -88,6 +154,16 @@ export const OAUTH_CONFIG: Record<BUILD_TYPE, OAUTH_CONFIG_TYPE> = {
     IOS_APPLE_AUTH_CONNECTION_ID: 'mm-apple-flask-uat-common',
   },
   flask_dev: {
+    IOS_GOOGLE_CLIENT_ID:
+      '615965109465-89b2lmqgm5ka8j8t403qhooouv57id9b.apps.googleusercontent.com',
+    IOS_GOOGLE_REDIRECT_URI:
+      'com.googleusercontent.apps.615965109465-89b2lmqgm5ka8j8t403qhooouv57id9b:/oauth2redirect/google',
+    ANDROID_GOOGLE_CLIENT_ID:
+      '615965109465-9nn2i74feqs3v9ps4lb61ha0v34eo382.apps.googleusercontent.com',
+    ANDROID_GOOGLE_SERVER_CLIENT_ID:
+      '615965109465-ab20kuqbls6fj5s50fvmvbnket8nv1sh.apps.googleusercontent.com',
+    ANDROID_APPLE_CLIENT_ID: 'io.metamask.appleloginclient.flask.dev',
+
     GOOGLE_GROUPED_AUTH_CONNECTION_ID: 'mm-google-flask-dev',
     APPLE_GROUPED_AUTH_CONNECTION_ID: 'mm-apple-flask-dev',
     AUTH_SERVER_URL: 'https://auth-service.dev-api.cx.metamask.io',
diff --git a/app/core/OAuthService/OAuthLoginHandlers/constants.test.ts b/app/core/OAuthService/OAuthLoginHandlers/constants.test.ts
index d677f9edc64..481dfc8188b 100644
--- a/app/core/OAuthService/OAuthLoginHandlers/constants.test.ts
+++ b/app/core/OAuthService/OAuthLoginHandlers/constants.test.ts
@@ -47,6 +47,8 @@ jest.mock(
 );
 
 const mockAppRedirectUri = 'metamask://oauth-redirect';
+const CURRENT_OAUTH_CONFIG = OAUTH_CONFIG.main_prod;
+
 describe('OAuth Constants', () => {
   describe('AppRedirectUri', () => {
     it('should generate correct redirect URI', () => {
@@ -55,8 +57,6 @@ describe('OAuth Constants', () => {
   });
 
   describe('Environment-based constants', () => {
-    const CURRENT_OAUTH_CONFIG = OAUTH_CONFIG.main_prod;
-
     it('should have web3AuthNetwork from jest config', () => {
       expect(web3AuthNetwork).toBe('sapphire_mainnet');
     });
@@ -65,9 +65,13 @@ describe('OAuth Constants', () => {
       expect(AuthServerUrl).toBe(CURRENT_OAUTH_CONFIG.AUTH_SERVER_URL);
     });
 
-    it('should have Android configuration from jest config', () => {
-      expect(GoogleWebGID).toBe('androidGoogleWebClientId');
-      expect(AppleWebClientId).toBe('AppleClientId');
+    it('should have Android configuration from config', () => {
+      expect(GoogleWebGID).toBe(
+        CURRENT_OAUTH_CONFIG.ANDROID_GOOGLE_SERVER_CLIENT_ID,
+      );
+      expect(AppleWebClientId).toBe(
+        CURRENT_OAUTH_CONFIG.ANDROID_APPLE_CLIENT_ID,
+      );
     });
 
     it('should generate correct Apple server redirect URI', () => {
@@ -142,8 +146,8 @@ describe('getIosGoogleConfig', () => {
     const config = getIosGoogleConfig();
 
     expect(config).toEqual({
-      clientId: 'iosGoogleClientId',
-      redirectUri: 'iosGoogleRedirectUri',
+      clientId: CURRENT_OAUTH_CONFIG.IOS_GOOGLE_CLIENT_ID,
+      redirectUri: CURRENT_OAUTH_CONFIG.IOS_GOOGLE_REDIRECT_URI,
     });
   });
 
@@ -155,8 +159,8 @@ describe('getIosGoogleConfig', () => {
     const config = getIosGoogleConfig();
 
     expect(config).toEqual({
-      clientId: 'iosGoogleClientId',
-      redirectUri: 'iosGoogleRedirectUri',
+      clientId: CURRENT_OAUTH_CONFIG.IOS_GOOGLE_CLIENT_ID,
+      redirectUri: CURRENT_OAUTH_CONFIG.IOS_GOOGLE_REDIRECT_URI,
     });
   });
 
@@ -166,7 +170,9 @@ describe('getIosGoogleConfig', () => {
 
     const config = getIosGoogleConfig();
 
-    expect(config.clientId).toBe('androidGoogleWebClientId');
+    expect(config.clientId).toBe(
+      CURRENT_OAUTH_CONFIG.ANDROID_GOOGLE_SERVER_CLIENT_ID,
+    );
     expect(config.redirectUri).toContain('link.metamask.io');
   });
 
@@ -188,7 +194,9 @@ describe('getIosGoogleConfig', () => {
 
     const config = getIosGoogleConfig();
 
-    expect(config.clientId).toBe('androidGoogleWebClientId');
+    expect(config.clientId).toBe(
+      CURRENT_OAUTH_CONFIG.ANDROID_GOOGLE_SERVER_CLIENT_ID,
+    );
     expect(config.redirectUri).toContain('link.metamask.io');
   });
 
@@ -200,8 +208,8 @@ describe('getIosGoogleConfig', () => {
     const config = getIosGoogleConfig();
 
     expect(config).toEqual({
-      clientId: 'iosGoogleClientId',
-      redirectUri: 'iosGoogleRedirectUri',
+      clientId: CURRENT_OAUTH_CONFIG.IOS_GOOGLE_CLIENT_ID,
+      redirectUri: CURRENT_OAUTH_CONFIG.IOS_GOOGLE_REDIRECT_URI,
     });
   });
 });
diff --git a/app/core/OAuthService/OAuthLoginHandlers/constants.ts b/app/core/OAuthService/OAuthLoginHandlers/constants.ts
index 6e34dbdd129..1f1d4fc5ae3 100644
--- a/app/core/OAuthService/OAuthLoginHandlers/constants.ts
+++ b/app/core/OAuthService/OAuthLoginHandlers/constants.ts
@@ -64,10 +64,12 @@ export const E2E_QA_MOCK_OAUTH_TOKEN_URL =
 export const AUTH_SERVER_MARKETING_OPT_IN_PATH =
   '/api/v1/oauth/marketing_opt_in_status';
 
-export const IosGID = process.env.IOS_GOOGLE_CLIENT_ID;
-export const IosGoogleRedirectUri = process.env.IOS_GOOGLE_REDIRECT_URI;
-export const GoogleWebGID = process.env.ANDROID_GOOGLE_SERVER_CLIENT_ID;
-export const AppleWebClientId = process.env.ANDROID_APPLE_CLIENT_ID;
+export const IosGID = CURRENT_OAUTH_CONFIG.IOS_GOOGLE_CLIENT_ID;
+export const IosGoogleRedirectUri =
+  CURRENT_OAUTH_CONFIG.IOS_GOOGLE_REDIRECT_URI;
+export const GoogleWebGID =
+  CURRENT_OAUTH_CONFIG.ANDROID_GOOGLE_SERVER_CLIENT_ID;
+export const AppleWebClientId = CURRENT_OAUTH_CONFIG.ANDROID_APPLE_CLIENT_ID;
 
 // Use universal link for OAuth redirect
 export const GoogleRedirectUri = `${PROTOCOLS.HTTPS}://${AppConstants.MM_IO_UNIVERSAL_LINK_HOST}/${ACTIONS.OAUTH_REDIRECT}`;
diff --git a/app/core/QrKeyring/QrKeyring.test.ts b/app/core/QrKeyring/QrKeyring.test.ts
new file mode 100644
index 00000000000..64c0bc2f1ad
--- /dev/null
+++ b/app/core/QrKeyring/QrKeyring.test.ts
@@ -0,0 +1,77 @@
+import { QrKeyring, QrKeyringBridge } from '@metamask/eth-qr-keyring';
+import { withQrKeyring, forgetQrDevice } from './QrKeyring';
+import Engine from '../Engine';
+
+jest.mock('../Engine', () => ({
+  context: {
+    KeyringController: {
+      withKeyring: jest.fn(),
+    },
+  },
+}));
+
+const MockEngine = jest.mocked(Engine);
+
+const mockQrKeyringBridge: QrKeyringBridge = {
+  requestScan: jest.fn(),
+};
+
+const qrKeyring = new QrKeyring({ bridge: mockQrKeyringBridge });
+
+describe('QrKeyring core', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    MockEngine.context.KeyringController.withKeyring.mockImplementation(
+      (_selector, operation) =>
+        operation({ keyring: qrKeyring, metadata: { id: '1234', name: '' } }),
+    );
+  });
+
+  describe('withQrKeyring', () => {
+    it('passes the QrKeyring to the operation and returns its result', async () => {
+      const operation = jest.fn().mockResolvedValue('done');
+
+      const result = await withQrKeyring(operation);
+
+      expect(operation).toHaveBeenCalledWith(
+        expect.objectContaining({ keyring: qrKeyring }),
+      );
+      expect(result).toBe('done');
+    });
+
+    it('throws when the resolved keyring is not a QrKeyring instance', async () => {
+      MockEngine.context.KeyringController.withKeyring.mockImplementationOnce(
+        async (_selector, operation) =>
+          operation({
+            // The withKeyring helper guards against the keyring controller
+            // resolving a non-QR keyring.
+            keyring: {} as unknown as QrKeyring,
+            metadata: { id: '1234', name: '' },
+          }),
+      );
+
+      await expect(withQrKeyring(async () => 'unreachable')).rejects.toThrow(
+        'Expected QrKeyring',
+      );
+    });
+  });
+
+  describe('forgetQrDevice', () => {
+    it('calls keyring.forgetDevice', async () => {
+      const forgetDeviceSpy = jest
+        .spyOn(qrKeyring, 'forgetDevice')
+        .mockResolvedValue(
+          undefined as unknown as ReturnType<
+            QrKeyring['forgetDevice']
+          > extends Promise<infer R>
+            ? R
+            : never,
+        );
+
+      await forgetQrDevice();
+
+      expect(forgetDeviceSpy).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/app/core/QrKeyring/QrKeyring.ts b/app/core/QrKeyring/QrKeyring.ts
index 3cd0cbadeed..c3d9c051269 100644
--- a/app/core/QrKeyring/QrKeyring.ts
+++ b/app/core/QrKeyring/QrKeyring.ts
@@ -23,7 +23,12 @@ export const withQrKeyring = async <CallbackResult = void>(
 ): Promise<CallbackResult> =>
   await Engine.context.KeyringController.withKeyring(
     { type: ExtendedKeyringTypes.qr },
-    operation,
+    ({ keyring, metadata }) => {
+      if (!(keyring instanceof QrKeyring)) {
+        throw new Error('Expected QrKeyring');
+      }
+      return operation({ keyring, metadata });
+    },
     // TODO: Refactor this to stop creating the keyring on-demand
     // Instead create it only in response to an explicit user action, and do
     // not allow interactions with Qr Keyring until after that has been done.
diff --git a/app/core/SDKConnectV2/services/connection-registry.test.ts b/app/core/SDKConnectV2/services/connection-registry.test.ts
index 2c84e241e07..88970d5813a 100644
--- a/app/core/SDKConnectV2/services/connection-registry.test.ts
+++ b/app/core/SDKConnectV2/services/connection-registry.test.ts
@@ -442,6 +442,8 @@ describe('ConnectionRegistry', () => {
           transport_type: TransportType.MWP,
           sdk_version: '2.0.0',
           sdk_platform: 'JavaScript',
+          dapp_name: 'Test DApp',
+          dapp_url: 'https://test.dapp',
         }),
       );
     });
@@ -583,6 +585,10 @@ describe('ConnectionRegistry', () => {
         expect.objectContaining({
           remote_session_id: mockConnectionRequest.sessionRequest.id,
           transport_type: TransportType.MWP,
+          sdk_version: '2.0.0',
+          sdk_platform: 'JavaScript',
+          dapp_name: 'Test DApp',
+          dapp_url: 'https://test.dapp',
           failure_reason: 'Connection failed',
         }),
       );
diff --git a/app/core/SDKConnectV2/services/connection-registry.ts b/app/core/SDKConnectV2/services/connection-registry.ts
index b16b1983287..1e1ce47c8aa 100644
--- a/app/core/SDKConnectV2/services/connection-registry.ts
+++ b/app/core/SDKConnectV2/services/connection-registry.ts
@@ -258,6 +258,8 @@ export class ConnectionRegistry {
         transport_type: TransportType.MWP,
         sdk_version: connReq.metadata.sdk.version,
         sdk_platform: connReq.metadata.sdk.platform,
+        dapp_name: connReq.metadata.dapp.name,
+        dapp_url: connReq.metadata.dapp.url,
       });
 
       // Defense-in-depth: block connections whose self-reported dapp metadata
@@ -305,6 +307,8 @@ export class ConnectionRegistry {
         transport_type: TransportType.MWP,
         sdk_version: connReq?.metadata?.sdk?.version,
         sdk_platform: connReq?.metadata?.sdk?.platform,
+        dapp_name: connReq?.metadata?.dapp?.name,
+        dapp_url: connReq?.metadata?.dapp?.url,
         failure_reason: error instanceof Error ? error.message : String(error),
       });
 
diff --git a/app/core/SnapKeyring/SnapKeyring.test.ts b/app/core/SnapKeyring/SnapKeyring.test.ts
index 2c558631217..59faabd5b02 100644
--- a/app/core/SnapKeyring/SnapKeyring.test.ts
+++ b/app/core/SnapKeyring/SnapKeyring.test.ts
@@ -52,9 +52,7 @@ const mockInternalAccount: InternalAccount = {
   scopes: [EthScope.Eoa],
   metadata: {
     snap: {
-      enabled: true,
       id: mockSnapId,
-      name: mockSnapName,
     },
     name: accountNameSuggestion,
     keyring: {
diff --git a/app/core/apiClient.test.ts b/app/core/apiClient.test.ts
new file mode 100644
index 00000000000..423c37a1ff8
--- /dev/null
+++ b/app/core/apiClient.test.ts
@@ -0,0 +1,56 @@
+import { createApiPlatformClient } from '@metamask/core-backend';
+import Engine from './Engine';
+import './apiClient';
+
+jest.mock('@metamask/core-backend', () => ({
+  createApiPlatformClient: jest.fn(() => ({ accounts: {} })),
+}));
+
+jest.mock('./Engine', () => ({
+  __esModule: true,
+  default: {
+    context: {
+      AuthenticationController: {
+        getBearerToken: jest.fn(),
+      },
+    },
+  },
+}));
+
+const createApiPlatformClientMock = jest.mocked(createApiPlatformClient);
+const getBearerTokenMock = jest.mocked(
+  Engine.context.AuthenticationController.getBearerToken,
+);
+
+const [firstCallArgs] = createApiPlatformClientMock.mock.calls;
+const getBearerToken = firstCallArgs[0].getBearerToken as () => Promise<
+  string | undefined
+>;
+
+describe('apiClient', () => {
+  beforeEach(() => {
+    getBearerTokenMock.mockReset();
+  });
+
+  it('creates the API platform client with the mobile product identifier', () => {
+    expect(createApiPlatformClientMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        clientProduct: 'metamask-mobile',
+        getBearerToken: expect.any(Function),
+      }),
+    );
+  });
+
+  it('returns the bearer token from AuthenticationController', async () => {
+    getBearerTokenMock.mockResolvedValueOnce('bearer-token-mock');
+
+    await expect(getBearerToken()).resolves.toBe('bearer-token-mock');
+    expect(getBearerTokenMock).toHaveBeenCalled();
+  });
+
+  it('returns undefined when AuthenticationController throws', async () => {
+    getBearerTokenMock.mockRejectedValueOnce(new Error('boom'));
+
+    await expect(getBearerToken()).resolves.toBeUndefined();
+  });
+});
diff --git a/app/core/apiClient.ts b/app/core/apiClient.ts
new file mode 100644
index 00000000000..e09744bd826
--- /dev/null
+++ b/app/core/apiClient.ts
@@ -0,0 +1,13 @@
+import { createApiPlatformClient } from '@metamask/core-backend';
+import Engine from './Engine';
+
+export const apiClient = createApiPlatformClient({
+  clientProduct: 'metamask-mobile',
+  getBearerToken: async () => {
+    try {
+      return await Engine.context.AuthenticationController.getBearerToken();
+    } catch {
+      return undefined;
+    }
+  },
+});
diff --git a/app/core/redux/slices/bridge/index.ts b/app/core/redux/slices/bridge/index.ts
index 59de90b9e67..c579ce4b946 100644
--- a/app/core/redux/slices/bridge/index.ts
+++ b/app/core/redux/slices/bridge/index.ts
@@ -32,6 +32,12 @@ import {
 import { analytics } from '../../../../util/analytics/analytics';
 import { selectRemoteFeatureFlags } from '../../../../selectors/featureFlagController';
 import { getTokenExchangeRate } from '../../../../components/UI/Bridge/utils/exchange-rates';
+import {
+  getMultichainAssetsRatesControllerConversionRates,
+  getTokenRatesControllerMarketData,
+  getCurrencyRateControllerCurrencyRates,
+  getCurrencyRateControllerCurrentCurrency,
+} from '../../../../selectors/assets/assets-migration';
 import { selectCanSignTransactions } from '../../../../selectors/accountsController';
 import { selectBasicFunctionalityEnabled } from '../../../../selectors/settings';
 import { hasMinimumRequiredVersion } from './utils/hasMinimumRequiredVersion';
@@ -469,9 +475,17 @@ const selectControllerFields = (state: RootState) => ({
   gasFeeEstimatesByChainId:
     state.engine.backgroundState.GasFeeController.gasFeeEstimatesByChainId ??
     {},
-  ...state.engine.backgroundState.MultichainAssetsRatesController,
-  ...state.engine.backgroundState.TokenRatesController,
-  ...state.engine.backgroundState.CurrencyRateController,
+  ...{
+    conversionRates: getMultichainAssetsRatesControllerConversionRates(state),
+    historicalPrices: {},
+  },
+  ...{
+    marketData: getTokenRatesControllerMarketData(state),
+  },
+  ...{
+    currencyRates: getCurrencyRateControllerCurrencyRates(state),
+    currentCurrency: getCurrencyRateControllerCurrentCurrency(state),
+  },
   participateInMetaMetrics: analytics.isEnabled(),
   remoteFeatureFlags: {
     bridgeConfig: selectRemoteFeatureFlags(state).bridgeConfig,
diff --git a/app/images/eth-tree.png b/app/images/eth-tree.png
new file mode 100644
index 00000000000..5d01e63bfd7
Binary files /dev/null and b/app/images/eth-tree.png differ
diff --git a/app/images/money-account-coins.png b/app/images/money-account-coins.png
new file mode 100644
index 00000000000..f5eaa8f917b
Binary files /dev/null and b/app/images/money-account-coins.png differ
diff --git a/app/images/purple-orange-ribbon.png b/app/images/purple-orange-ribbon.png
new file mode 100644
index 00000000000..8966d008272
Binary files /dev/null and b/app/images/purple-orange-ribbon.png differ
diff --git a/app/images/rewards/notification.svg b/app/images/rewards/notification.svg
new file mode 100644
index 00000000000..2d829816edd
--- /dev/null
+++ b/app/images/rewards/notification.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.33332 10H8.66666V8.66666H9.99999V7.33333H8.66666V6H7.33332V7.33333H5.99999V8.66666H7.33332V10ZM2.66666 12.6667V11.3333H3.99999V6.66666C3.99999 5.74444 4.27777 4.925 4.83332 4.20833C5.38888 3.49166 6.1111 3.02222 6.99999 2.79999V2.33333C6.99999 2.05555 7.09721 1.81944 7.29166 1.62499C7.4861 1.43055 7.72221 1.33333 7.99999 1.33333C8.27777 1.33333 8.51388 1.43055 8.70832 1.62499C8.90277 1.81944 8.99999 2.05555 8.99999 2.33333V2.79999C9.88888 3.02222 10.6111 3.49166 11.1667 4.20833C11.7222 4.925 12 5.74444 12 6.66666V11.3333H13.3333V12.6667H2.66666ZM7.99999 14.6667C7.63332 14.6667 7.31943 14.5361 7.05832 14.275C6.79721 14.0139 6.66666 13.7 6.66666 13.3333H9.33332C9.33332 13.7 9.20277 14.0139 8.94166 14.275C8.68055 14.5361 8.36666 14.6667 7.99999 14.6667ZM5.33332 11.3333H10.6667V6.66666C10.6667 5.93333 10.4055 5.30555 9.88332 4.78333C9.3611 4.26111 8.73332 3.99999 7.99999 3.99999C7.26666 3.99999 6.63888 4.26111 6.11666 4.78333C5.59443 5.30555 5.33332 5.93333 5.33332 6.66666V11.3333Z" fill="currentColor"/>
+</svg>
diff --git a/app/multichain-accounts/AccountTreeInitService/index.test.ts b/app/multichain-accounts/AccountTreeInitService/index.test.ts
index 4fc2d9cec02..102b3025853 100644
--- a/app/multichain-accounts/AccountTreeInitService/index.test.ts
+++ b/app/multichain-accounts/AccountTreeInitService/index.test.ts
@@ -117,10 +117,5 @@ describe('AccountTreeInitService', () => {
       await service.clearState();
       expect(mockAccountTreeClearState).toHaveBeenCalled();
     });
-
-    it('calls MoneyAccountController.clearState', async () => {
-      await service.clearState();
-      expect(mockMoneyAccountClearState).toHaveBeenCalled();
-    });
   });
 });
diff --git a/app/multichain-accounts/AccountTreeInitService/index.ts b/app/multichain-accounts/AccountTreeInitService/index.ts
index ca342a33dd5..89ae6650294 100644
--- a/app/multichain-accounts/AccountTreeInitService/index.ts
+++ b/app/multichain-accounts/AccountTreeInitService/index.ts
@@ -29,18 +29,9 @@ export class AccountTreeInitService {
   };
 
   clearState = async (): Promise<void> => {
-    const {
-      AccountTreeController,
-      MoneyAccountController,
-      RemoteFeatureFlagController,
-    } = Engine.context;
-    const { remoteFeatureFlags } = RemoteFeatureFlagController.state;
+    const { AccountTreeController } = Engine.context;
 
     AccountTreeController.clearState();
-
-    if (isMoneyAccountEnabled(remoteFeatureFlags)) {
-      MoneyAccountController.clearState();
-    }
   };
 }
 
diff --git a/app/reducers/rewards/index.test.ts b/app/reducers/rewards/index.test.ts
index df65f9c7b5f..fc5b0514d26 100644
--- a/app/reducers/rewards/index.test.ts
+++ b/app/reducers/rewards/index.test.ts
@@ -41,6 +41,13 @@ import rewardsReducer, {
   setOndoCampaignDeposits,
   setOndoCampaignDepositsLoading,
   setOndoCampaignDepositsError,
+  setPerpsTradingCampaignLeaderboard,
+  setPerpsTradingCampaignLeaderboardLoading,
+  setPerpsTradingCampaignLeaderboardError,
+  setPerpsTradingCampaignLeaderboardPosition,
+  setPerpsTradingCampaignVolume,
+  setPerpsTradingCampaignVolumeLoading,
+  setPerpsTradingCampaignVolumeError,
   bulkLinkStarted,
   bulkLinkAccountResult,
   bulkLinkCompleted,
@@ -66,6 +73,8 @@ import {
   CampaignLeaderboardPositionDto,
   OndoGmPortfolioDto,
   OndoGmActivityEntryDto,
+  PerpsTradingCampaignLeaderboardDto,
+  PerpsTradingCampaignLeaderboardPositionDto,
 } from '../../core/Engine/controllers/rewards-controller/types';
 import { AccountGroupId } from '@metamask/account-api';
 import { brandColor } from '@metamask/design-tokens';
@@ -2078,6 +2087,13 @@ describe('rewardsReducer', () => {
         versionGuardMinimumMobileVersion: null,
         versionGuardLoading: false,
         versionGuardError: false,
+        perpsTradingCampaignLeaderboard: null,
+        perpsTradingCampaignLeaderboardLoading: false,
+        perpsTradingCampaignLeaderboardError: false,
+        perpsTradingCampaignLeaderboardPositions: {},
+        perpsTradingCampaignVolume: null,
+        perpsTradingCampaignVolumeLoading: false,
+        perpsTradingCampaignVolumeError: false,
         pendingDeeplink: null,
         dismissedCampaignOutcomeToasts: {},
       };
@@ -2200,6 +2216,13 @@ describe('rewardsReducer', () => {
         versionGuardMinimumMobileVersion: null,
         versionGuardLoading: false,
         versionGuardError: false,
+        perpsTradingCampaignLeaderboard: null,
+        perpsTradingCampaignLeaderboardLoading: false,
+        perpsTradingCampaignLeaderboardError: false,
+        perpsTradingCampaignLeaderboardPositions: {},
+        perpsTradingCampaignVolume: null,
+        perpsTradingCampaignVolumeLoading: false,
+        perpsTradingCampaignVolumeError: false,
         pendingDeeplink: null,
         dismissedCampaignOutcomeToasts: {},
       };
@@ -5623,6 +5646,187 @@ describe('setOndoCampaignActivity', () => {
   });
 });
 
+const mockPerpsLeaderboard: PerpsTradingCampaignLeaderboardDto = {
+  campaignId: 'perps-c-1',
+  computedAt: '2025-08-15T12:00:00.000Z',
+  entries: [],
+  totalParticipants: 42,
+};
+
+const mockPerpsPosition: PerpsTradingCampaignLeaderboardPositionDto = {
+  rank: 2,
+  pnl: 100,
+  notionalVolume: 5000,
+  marginDeployed: 1000,
+  qualified: true,
+  neighbors: [],
+  computedAt: '2025-08-15T12:00:00.000Z',
+};
+
+describe('setPerpsTradingCampaignLeaderboard', () => {
+  it('sets leaderboard data and clears error', () => {
+    const stateWithError: RewardsState = {
+      ...initialState,
+      perpsTradingCampaignLeaderboardError: true,
+    };
+
+    const state = rewardsReducer(
+      stateWithError,
+      setPerpsTradingCampaignLeaderboard(mockPerpsLeaderboard),
+    );
+
+    expect(state.perpsTradingCampaignLeaderboard).toEqual(mockPerpsLeaderboard);
+    expect(state.perpsTradingCampaignLeaderboardError).toBe(false);
+  });
+
+  it('sets leaderboard to null', () => {
+    const stateWithData: RewardsState = {
+      ...initialState,
+      perpsTradingCampaignLeaderboard: mockPerpsLeaderboard,
+    };
+
+    const state = rewardsReducer(
+      stateWithData,
+      setPerpsTradingCampaignLeaderboard(null),
+    );
+
+    expect(state.perpsTradingCampaignLeaderboard).toBeNull();
+  });
+});
+
+describe('setPerpsTradingCampaignLeaderboardLoading', () => {
+  it('sets loading to true when no leaderboard is cached', () => {
+    const state = rewardsReducer(
+      initialState,
+      setPerpsTradingCampaignLeaderboardLoading(true),
+    );
+
+    expect(state.perpsTradingCampaignLeaderboardLoading).toBe(true);
+  });
+
+  it('does not set loading to true when leaderboard is already present', () => {
+    const stateWithLeaderboard: RewardsState = {
+      ...initialState,
+      perpsTradingCampaignLeaderboard: mockPerpsLeaderboard,
+      perpsTradingCampaignLeaderboardLoading: false,
+    };
+
+    const state = rewardsReducer(
+      stateWithLeaderboard,
+      setPerpsTradingCampaignLeaderboardLoading(true),
+    );
+
+    expect(state.perpsTradingCampaignLeaderboardLoading).toBe(false);
+  });
+
+  it('clears loading to false', () => {
+    const stateWithLoading: RewardsState = {
+      ...initialState,
+      perpsTradingCampaignLeaderboardLoading: true,
+    };
+
+    const state = rewardsReducer(
+      stateWithLoading,
+      setPerpsTradingCampaignLeaderboardLoading(false),
+    );
+
+    expect(state.perpsTradingCampaignLeaderboardLoading).toBe(false);
+  });
+});
+
+describe('setPerpsTradingCampaignLeaderboardError', () => {
+  it('sets and clears the error flag', () => {
+    const withError = rewardsReducer(
+      initialState,
+      setPerpsTradingCampaignLeaderboardError(true),
+    );
+    expect(withError.perpsTradingCampaignLeaderboardError).toBe(true);
+
+    const cleared = rewardsReducer(
+      withError,
+      setPerpsTradingCampaignLeaderboardError(false),
+    );
+    expect(cleared.perpsTradingCampaignLeaderboardError).toBe(false);
+  });
+});
+
+describe('setPerpsTradingCampaignLeaderboardPosition', () => {
+  it('stores a position for subscription + campaign and removes on null', () => {
+    let state = rewardsReducer(
+      initialState,
+      setPerpsTradingCampaignLeaderboardPosition({
+        subscriptionId: 'sub-p',
+        campaignId: 'camp-p',
+        position: mockPerpsPosition,
+      }),
+    );
+
+    expect(
+      state.perpsTradingCampaignLeaderboardPositions['sub-p:camp-p'],
+    ).toEqual(mockPerpsPosition);
+
+    state = rewardsReducer(
+      state,
+      setPerpsTradingCampaignLeaderboardPosition({
+        subscriptionId: 'sub-p',
+        campaignId: 'camp-p',
+        position: null,
+      }),
+    );
+
+    expect(
+      state.perpsTradingCampaignLeaderboardPositions['sub-p:camp-p'],
+    ).toBeUndefined();
+  });
+});
+
+describe('perps trading campaign volume', () => {
+  const mockVolume: RewardsState['perpsTradingCampaignVolume'] = {
+    totalUsdVolume: '1000000',
+  };
+
+  it('setPerpsTradingCampaignVolume sets data and clears error', () => {
+    const stateWithError: RewardsState = {
+      ...initialState,
+      perpsTradingCampaignVolumeError: true,
+    };
+
+    const state = rewardsReducer(
+      stateWithError,
+      setPerpsTradingCampaignVolume(mockVolume),
+    );
+
+    expect(state.perpsTradingCampaignVolume).toEqual(mockVolume);
+    expect(state.perpsTradingCampaignVolumeError).toBe(false);
+  });
+
+  it('setPerpsTradingCampaignVolumeLoading(true) is skipped when volume is cached', () => {
+    const stateWithVolume: RewardsState = {
+      ...initialState,
+      perpsTradingCampaignVolume: mockVolume,
+      perpsTradingCampaignVolumeLoading: false,
+    };
+
+    const state = rewardsReducer(
+      stateWithVolume,
+      setPerpsTradingCampaignVolumeLoading(true),
+    );
+
+    expect(state.perpsTradingCampaignVolumeLoading).toBe(false);
+  });
+
+  it('setPerpsTradingCampaignVolumeError toggles the flag', () => {
+    const on = rewardsReducer(
+      initialState,
+      setPerpsTradingCampaignVolumeError(true),
+    );
+    expect(on.perpsTradingCampaignVolumeError).toBe(true);
+
+    const off = rewardsReducer(on, setPerpsTradingCampaignVolumeError(false));
+    expect(off.perpsTradingCampaignVolumeError).toBe(false);
+  });
+});
+
 describe('ondoCampaignDeposits', () => {
   it('setOndoCampaignDeposits sets data and clears error', () => {
     const deposits = { totalUsdDeposited: '1250000.000000' };
@@ -5700,35 +5904,33 @@ describe('ondoCampaignDeposits', () => {
   });
 
   describe('dismissCampaignOutcomeToast', () => {
-    it('records winner_verify variant as dismissed', () => {
+    it('records winner variant as dismissed', () => {
       const state = rewardsReducer(
         initialState,
         dismissCampaignOutcomeToast({
-          campaignId: 'campaign-1',
-          subscriptionId: 'sub-1',
-          variant: 'winner_verify',
+          campaignId: 'perps-c-1',
+          subscriptionId: 'sub-9',
+          variant: 'winner',
         }),
       );
 
       expect(
-        state.dismissedCampaignOutcomeToasts['campaign-1:sub-1:winner_verify'],
+        state.dismissedCampaignOutcomeToasts['perps-c-1:sub-9:winner'],
       ).toBe(true);
     });
 
-    it('records participant_no_winner variant as dismissed', () => {
+    it('records non_winner variant as dismissed', () => {
       const state = rewardsReducer(
         initialState,
         dismissCampaignOutcomeToast({
-          campaignId: 'campaign-2',
-          subscriptionId: 'sub-2',
-          variant: 'participant_no_winner',
+          campaignId: 'ondo-c-1',
+          subscriptionId: 'sub-8',
+          variant: 'non_winner',
         }),
       );
 
       expect(
-        state.dismissedCampaignOutcomeToasts[
-          'campaign-2:sub-2:participant_no_winner'
-        ],
+        state.dismissedCampaignOutcomeToasts['ondo-c-1:sub-8:non_winner'],
       ).toBe(true);
     });
 
@@ -5738,7 +5940,7 @@ describe('ondoCampaignDeposits', () => {
         dismissCampaignOutcomeToast({
           campaignId: 'c1',
           subscriptionId: 's1',
-          variant: 'winner_verify',
+          variant: 'winner',
         }),
       );
       state = rewardsReducer(
@@ -5746,16 +5948,14 @@ describe('ondoCampaignDeposits', () => {
         dismissCampaignOutcomeToast({
           campaignId: 'c2',
           subscriptionId: 's2',
-          variant: 'participant_no_winner',
+          variant: 'non_winner',
         }),
       );
 
-      expect(state.dismissedCampaignOutcomeToasts['c1:s1:winner_verify']).toBe(
+      expect(state.dismissedCampaignOutcomeToasts['c1:s1:winner']).toBe(true);
+      expect(state.dismissedCampaignOutcomeToasts['c2:s2:non_winner']).toBe(
         true,
       );
-      expect(
-        state.dismissedCampaignOutcomeToasts['c2:s2:participant_no_winner'],
-      ).toBe(true);
     });
 
     it('starts with empty dismissedCampaignOutcomeToasts in initial state', () => {
@@ -5768,7 +5968,7 @@ describe('ondoCampaignDeposits', () => {
       const persisted: RewardsState = {
         ...initialState,
         dismissedCampaignOutcomeToasts: {
-          'campaign-1:sub-1:winner_verify': true,
+          'campaign-1:sub-1:winner': true,
         },
       };
 
@@ -5778,7 +5978,7 @@ describe('ondoCampaignDeposits', () => {
       });
 
       expect(state.dismissedCampaignOutcomeToasts).toEqual({
-        'campaign-1:sub-1:winner_verify': true,
+        'campaign-1:sub-1:winner': true,
       });
     });
 
@@ -5801,7 +6001,7 @@ describe('ondoCampaignDeposits', () => {
         ...initialState,
         candidateSubscriptionId: 'old-sub',
         dismissedCampaignOutcomeToasts: {
-          'campaign-1:old-sub:winner_verify': true,
+          'campaign-1:old-sub:winner': true,
         },
       };
 
@@ -5811,7 +6011,7 @@ describe('ondoCampaignDeposits', () => {
       );
 
       expect(state.dismissedCampaignOutcomeToasts).toEqual({
-        'campaign-1:old-sub:winner_verify': true,
+        'campaign-1:old-sub:winner': true,
       });
     });
   });
diff --git a/app/reducers/rewards/index.ts b/app/reducers/rewards/index.ts
index 316f7559b18..af29b06ca57 100644
--- a/app/reducers/rewards/index.ts
+++ b/app/reducers/rewards/index.ts
@@ -17,6 +17,9 @@ import {
   OndoGmPortfolioDto,
   OndoGmActivityEntryDto,
   OndoGmCampaignDepositsDto,
+  PerpsTradingCampaignLeaderboardDto,
+  PerpsTradingCampaignLeaderboardPositionDto,
+  PerpsTradingCampaignVolumeDto,
 } from '../../core/Engine/controllers/rewards-controller/types';
 import { OnboardingStep } from './types';
 import { AccountGroupId } from '@metamask/account-api';
@@ -165,6 +168,22 @@ export interface RewardsState {
   ondoCampaignDepositsLoading: boolean;
   ondoCampaignDepositsError: boolean;
 
+  // Perps Trading Campaign leaderboard
+  perpsTradingCampaignLeaderboard: PerpsTradingCampaignLeaderboardDto | null;
+  perpsTradingCampaignLeaderboardLoading: boolean;
+  perpsTradingCampaignLeaderboardError: boolean;
+
+  // Perps Trading Campaign leaderboard position (user's own position)
+  perpsTradingCampaignLeaderboardPositions: Record<
+    string,
+    PerpsTradingCampaignLeaderboardPositionDto
+  >;
+
+  // Perps Trading Campaign volume (public stats; UI derives prize-pool display from notional volume)
+  perpsTradingCampaignVolume: PerpsTradingCampaignVolumeDto | null;
+  perpsTradingCampaignVolumeLoading: boolean;
+  perpsTradingCampaignVolumeError: boolean;
+
   // Pending deeplink navigation intent, stored in Redux so it survives the
   // UnmountOnBlur remount of RewardsHome when navigating from outside the tab.
   pendingDeeplink: PendingDeeplink | null;
@@ -179,7 +198,7 @@ export interface RewardsState {
  */
 export interface PendingDeeplink {
   page?: 'campaigns' | 'musd' | 'benefits';
-  campaign?: 'ondo' | 'season1';
+  campaign?: 'ondo' | 'season1' | 'perps-comp';
 }
 
 export const initialState: RewardsState = {
@@ -278,6 +297,15 @@ export const initialState: RewardsState = {
   ondoCampaignDepositsLoading: false,
   ondoCampaignDepositsError: false,
 
+  // Perps Trading Campaign initial state
+  perpsTradingCampaignLeaderboard: null,
+  perpsTradingCampaignLeaderboardLoading: false,
+  perpsTradingCampaignLeaderboardError: false,
+  perpsTradingCampaignLeaderboardPositions: {},
+  perpsTradingCampaignVolume: null,
+  perpsTradingCampaignVolumeLoading: false,
+  perpsTradingCampaignVolumeError: false,
+
   pendingDeeplink: null,
 
   dismissedCampaignOutcomeToasts: {},
@@ -700,6 +728,72 @@ const rewardsSlice = createSlice({
       state.ondoCampaignDepositsError = action.payload;
     },
 
+    // Perps Trading Campaign leaderboard reducers
+    setPerpsTradingCampaignLeaderboard: (
+      state,
+      action: PayloadAction<PerpsTradingCampaignLeaderboardDto | null>,
+    ) => {
+      state.perpsTradingCampaignLeaderboard = action.payload;
+      state.perpsTradingCampaignLeaderboardError = false;
+    },
+    setPerpsTradingCampaignLeaderboardLoading: (
+      state,
+      action: PayloadAction<boolean>,
+    ) => {
+      if (action.payload && state.perpsTradingCampaignLeaderboard) {
+        return;
+      }
+      state.perpsTradingCampaignLeaderboardLoading = action.payload;
+    },
+    setPerpsTradingCampaignLeaderboardError: (
+      state,
+      action: PayloadAction<boolean>,
+    ) => {
+      state.perpsTradingCampaignLeaderboardError = action.payload;
+    },
+
+    // Perps Trading Campaign leaderboard position reducers
+    setPerpsTradingCampaignLeaderboardPosition: (
+      state,
+      action: PayloadAction<{
+        subscriptionId: string;
+        campaignId: string;
+        position: PerpsTradingCampaignLeaderboardPositionDto | null;
+      }>,
+    ) => {
+      const key = `${action.payload.subscriptionId}:${action.payload.campaignId}`;
+      if (action.payload.position) {
+        state.perpsTradingCampaignLeaderboardPositions[key] =
+          action.payload.position;
+      } else {
+        delete state.perpsTradingCampaignLeaderboardPositions[key];
+      }
+    },
+
+    // Perps Trading Campaign volume reducers
+    setPerpsTradingCampaignVolume: (
+      state,
+      action: PayloadAction<RewardsState['perpsTradingCampaignVolume']>,
+    ) => {
+      state.perpsTradingCampaignVolume = action.payload;
+      state.perpsTradingCampaignVolumeError = false;
+    },
+    setPerpsTradingCampaignVolumeLoading: (
+      state,
+      action: PayloadAction<boolean>,
+    ) => {
+      if (action.payload && state.perpsTradingCampaignVolume) {
+        return;
+      }
+      state.perpsTradingCampaignVolumeLoading = action.payload;
+    },
+    setPerpsTradingCampaignVolumeError: (
+      state,
+      action: PayloadAction<boolean>,
+    ) => {
+      state.perpsTradingCampaignVolumeError = action.payload;
+    },
+
     // Bulk link reducers
     bulkLinkStarted: (
       state,
@@ -772,7 +866,7 @@ const rewardsSlice = createSlice({
       action: PayloadAction<{
         campaignId: string;
         subscriptionId: string;
-        variant: 'winner_verify' | 'participant_no_winner';
+        variant: 'winner' | 'non_winner';
       }>,
     ) => {
       const key = `${action.payload.campaignId}:${action.payload.subscriptionId}:${action.payload.variant}`;
@@ -910,6 +1004,14 @@ export const {
   setOndoCampaignDeposits,
   setOndoCampaignDepositsLoading,
   setOndoCampaignDepositsError,
+  // Perps Trading Campaign actions
+  setPerpsTradingCampaignLeaderboard,
+  setPerpsTradingCampaignLeaderboardLoading,
+  setPerpsTradingCampaignLeaderboardError,
+  setPerpsTradingCampaignLeaderboardPosition,
+  setPerpsTradingCampaignVolume,
+  setPerpsTradingCampaignVolumeLoading,
+  setPerpsTradingCampaignVolumeError,
   // Bulk link actions
   bulkLinkStarted,
   bulkLinkAccountResult,
diff --git a/app/reducers/rewards/selectors.test.ts b/app/reducers/rewards/selectors.test.ts
index 162b1d09d7a..3cb37ace0b3 100644
--- a/app/reducers/rewards/selectors.test.ts
+++ b/app/reducers/rewards/selectors.test.ts
@@ -52,6 +52,7 @@ import {
   selectCampaignsError,
   selectCampaignParticipantStatuses,
   selectCampaignParticipantStatus,
+  selectCampaignParticipantOptedIn,
   selectCampaignParticipantCount,
   selectIsRewardsVersionBlocked,
   selectVersionGuardMinimumMobileVersion,
@@ -3379,6 +3380,39 @@ describe('Rewards selectors', () => {
     });
   });
 
+  describe('selectCampaignParticipantOptedIn', () => {
+    it('returns true when participant status is opted in', () => {
+      const state = createMockRootState({
+        campaignParticipantStatuses: {
+          'sub-1:campaign-1': { optedIn: true, participantCount: 42 },
+        },
+      });
+      expect(
+        selectCampaignParticipantOptedIn('sub-1', 'campaign-1')(state),
+      ).toBe(true);
+    });
+
+    it('returns false when participant status is not opted in', () => {
+      const state = createMockRootState({
+        campaignParticipantStatuses: {
+          'sub-1:campaign-1': { optedIn: false, participantCount: 0 },
+        },
+      });
+      expect(
+        selectCampaignParticipantOptedIn('sub-1', 'campaign-1')(state),
+      ).toBe(false);
+    });
+
+    it('returns false when status is missing', () => {
+      const state = createMockRootState({
+        campaignParticipantStatuses: {},
+      });
+      expect(
+        selectCampaignParticipantOptedIn('sub-1', 'campaign-1')(state),
+      ).toBe(false);
+    });
+  });
+
   describe('selectCampaignParticipantCount', () => {
     it('returns null when subscriptionId is undefined', () => {
       const state = createMockRootState({
@@ -3933,8 +3967,8 @@ describe('Rewards selectors', () => {
 
     it('returns the dismissed toasts map', () => {
       const dismissed = {
-        'campaign-1:sub-1:winner_verify': true,
-        'campaign-2:sub-1:participant_no_winner': true,
+        'campaign-1:sub-1:winner': true,
+        'campaign-2:sub-1:non_winner': true,
       };
       const state = createMockRootState({
         dismissedCampaignOutcomeToasts: dismissed,
@@ -3945,11 +3979,11 @@ describe('Rewards selectors', () => {
     it('returns true for a dismissed toast key', () => {
       const state = createMockRootState({
         dismissedCampaignOutcomeToasts: {
-          'campaign-1:sub-1:winner_verify': true,
+          'campaign-1:sub-1:winner': true,
         },
       });
       const result = selectDismissedCampaignOutcomeToasts(state);
-      expect(result['campaign-1:sub-1:winner_verify']).toBe(true);
+      expect(result['campaign-1:sub-1:winner']).toBe(true);
     });
 
     it('returns undefined for a key that has not been dismissed', () => {
@@ -3957,7 +3991,7 @@ describe('Rewards selectors', () => {
         dismissedCampaignOutcomeToasts: {},
       });
       const result = selectDismissedCampaignOutcomeToasts(state);
-      expect(result['campaign-1:sub-1:winner_verify']).toBeUndefined();
+      expect(result['campaign-1:sub-1:winner']).toBeUndefined();
     });
   });
 });
diff --git a/app/reducers/rewards/selectors.ts b/app/reducers/rewards/selectors.ts
index 50e50a142cd..fce1475bf10 100644
--- a/app/reducers/rewards/selectors.ts
+++ b/app/reducers/rewards/selectors.ts
@@ -201,6 +201,15 @@ export const selectCampaignParticipantStatus =
     return state.rewards.campaignParticipantStatuses?.[key] ?? null;
   };
 
+export const selectCampaignParticipantOptedIn =
+  (
+    subscriptionId: string | undefined | null,
+    campaignId: string | undefined | null,
+  ) =>
+  (state: RootState): boolean =>
+    selectCampaignParticipantStatus(subscriptionId, campaignId)(state)
+      ?.optedIn === true;
+
 export const selectCampaignParticipantCount =
   (subscriptionId: string | undefined, campaignId: string | undefined) =>
   (state: RootState) => {
@@ -326,3 +335,34 @@ export const selectDismissedCampaignOutcomeToasts = (
 ): RootState['rewards']['dismissedCampaignOutcomeToasts'] =>
   state.rewards.dismissedCampaignOutcomeToasts ??
   initialState.dismissedCampaignOutcomeToasts;
+
+// Perps Trading Campaign leaderboard selectors
+export const selectPerpsTradingCampaignLeaderboard = (state: RootState) =>
+  state.rewards.perpsTradingCampaignLeaderboard;
+
+export const selectPerpsTradingCampaignLeaderboardLoading = (
+  state: RootState,
+) => state.rewards.perpsTradingCampaignLeaderboardLoading;
+
+export const selectPerpsTradingCampaignLeaderboardError = (state: RootState) =>
+  state.rewards.perpsTradingCampaignLeaderboardError;
+
+// Perps Trading Campaign leaderboard position selectors
+export const selectPerpsTradingCampaignLeaderboardPositionById =
+  (subscriptionId: string | undefined, campaignId: string | undefined) =>
+  (state: RootState) =>
+    subscriptionId && campaignId
+      ? (state.rewards.perpsTradingCampaignLeaderboardPositions[
+          `${subscriptionId}:${campaignId}`
+        ] ?? null)
+      : null;
+
+// Perps Trading Campaign prize pool selectors
+export const selectPerpsTradingCampaignVolume = (state: RootState) =>
+  state.rewards.perpsTradingCampaignVolume;
+
+export const selectPerpsTradingCampaignVolumeLoading = (state: RootState) =>
+  state.rewards.perpsTradingCampaignVolumeLoading;
+
+export const selectPerpsTradingCampaignVolumeError = (state: RootState) =>
+  state.rewards.perpsTradingCampaignVolumeError;
diff --git a/app/selectors/accountTrackerController.ts b/app/selectors/accountTrackerController.ts
index 107b7c1970f..a76dd6e897b 100644
--- a/app/selectors/accountTrackerController.ts
+++ b/app/selectors/accountTrackerController.ts
@@ -1,24 +1,16 @@
 import { createSelector } from 'reselect';
-import { AccountTrackerControllerState } from '@metamask/assets-controllers';
 import { RootState } from '../reducers';
 import { createDeepEqualSelector } from './util';
 import { selectEvmChainId } from './networkController';
 import { selectSelectedInternalAccountFormattedAddress } from './accountsController';
 import { Hex } from '@metamask/utils';
+import { getAccountTrackerControllerAccountsByChainId } from './assets/assets-migration';
 
-const selectAccountTrackerControllerState = (state: RootState) =>
-  state.engine.backgroundState.AccountTrackerController;
-
-export const selectAccountsByChainId = createDeepEqualSelector(
-  selectAccountTrackerControllerState,
-  (accountTrackerControllerState: AccountTrackerControllerState) =>
-    accountTrackerControllerState?.accountsByChainId ?? {},
-);
+export { getAccountTrackerControllerAccountsByChainId as selectAccountsByChainId };
 
 export const selectAccounts = createDeepEqualSelector(
-  selectAccountsByChainId,
+  getAccountTrackerControllerAccountsByChainId,
   selectEvmChainId,
-  selectSelectedInternalAccountFormattedAddress,
   (accountsByChainId, chainId) => accountsByChainId?.[chainId] || {},
 );
 
@@ -28,7 +20,7 @@ export const selectAccountsLength = createSelector(
 );
 
 export const selectAccountBalanceByChainId = createDeepEqualSelector(
-  selectAccountsByChainId,
+  getAccountTrackerControllerAccountsByChainId,
   selectEvmChainId,
   selectSelectedInternalAccountFormattedAddress,
   (_state: RootState, chainId?: Hex) => chainId,
diff --git a/app/selectors/accountsController.test.ts b/app/selectors/accountsController.test.ts
index 0bad4ba9df6..66a4644cb39 100644
--- a/app/selectors/accountsController.test.ts
+++ b/app/selectors/accountsController.test.ts
@@ -27,6 +27,7 @@ import {
   selectInternalEvmAccounts,
   selectInternalAccountsByScope,
   selectInternalAccountByAddresses,
+  selectEvmAddress,
 } from './accountsController';
 import {
   MOCK_ACCOUNTS_CONTROLLER_STATE,
@@ -767,6 +768,24 @@ describe('selectInternalEvmAccounts', () => {
   });
 });
 
+describe('selectEvmAddress', () => {
+  it('returns selected EVM account address', () => {
+    const state = getStateWithAccount(internalAccount1);
+
+    const result = selectEvmAddress(state);
+
+    expect(result).toBe(internalAccount1.address);
+  });
+
+  it('returns undefined when selected account is not EVM', () => {
+    const state = getStateWithAccount(internalSolanaAccount1);
+
+    const result = selectEvmAddress(state);
+
+    expect(result).toBeUndefined();
+  });
+});
+
 describe('selectInternalAccountsByScope', () => {
   it('returns all EVM accounts when wildcard eip155:0 is requested', () => {
     const scaSepolia: InternalAccount = createMockInternalAccount(
diff --git a/app/selectors/accountsController.ts b/app/selectors/accountsController.ts
index 4acaef6c85c..0a4d8d8e706 100644
--- a/app/selectors/accountsController.ts
+++ b/app/selectors/accountsController.ts
@@ -222,6 +222,12 @@ export const selectSelectedInternalAccountAddress = createSelector(
   },
 );
 
+export const selectEvmAddress = createSelector(
+  selectSelectedInternalAccount,
+  (account) =>
+    account && isEvmAccountType(account.type) ? account.address : undefined,
+);
+
 /**
  * A memoized selector that returns whether the selected internal account can sign transactions
  */
diff --git a/app/selectors/assets/assets-list.ts b/app/selectors/assets/assets-list.ts
index eb27e85b66c..89bfe67144e 100644
--- a/app/selectors/assets/assets-list.ts
+++ b/app/selectors/assets/assets-list.ts
@@ -43,6 +43,20 @@ import { selectAllTokens } from '../tokensController';
 import { selectSelectedInternalAccountAddress } from '../accountsController';
 import { selectSelectedInternalAccountByScope } from '../multichainAccounts/accounts';
 import { getLocaleLanguageCode } from '../../components/hooks/useFormatters';
+import {
+  getMultichainAssetsRatesControllerConversionRates,
+  getTokenRatesControllerMarketData,
+  getCurrencyRateControllerCurrencyRates,
+  getCurrencyRateControllerCurrentCurrency,
+  getTokensControllerAllTokens,
+  getTokensControllerAllIgnoredTokens,
+  getAccountTrackerControllerAccountsByChainId,
+  getTokenBalancesControllerTokenBalances,
+  getMultiChainBalancesControllerBalances,
+  getMultiChainAssetsControllerAccountsAssets,
+  getMultiChainAssetsControllerAllIgnoredAssets,
+  getMultiChainAssetsControllerAssetsMetadata,
+} from './assets-migration';
 
 /**
  * Structured map of Tron special assets for efficient access.
@@ -92,58 +106,35 @@ const EMPTY_TRON_SPECIAL_ASSETS_MAP: TronSpecialAssetsMap = Object.freeze({
 });
 
 const getStateForAssetSelector = (state: RootState) => {
-  const {
-    AccountTreeController,
-    AccountsController,
-    TokensController,
-    TokenBalancesController,
-    TokenRatesController,
-    ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-    MultichainAssetsController,
-    MultichainBalancesController,
-    MultichainAssetsRatesController,
-    ///: END:ONLY_INCLUDE_IF
-    CurrencyRateController,
-    NetworkController,
-    AccountTrackerController,
-  } = state.engine.backgroundState;
-
-  let multichainState = {
-    accountsAssets: {},
-    assetsMetadata: {},
-    allIgnoredAssets: {},
-    balances: {},
-    conversionRates: {},
-  };
-
-  ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-  multichainState = {
-    ...MultichainAssetsController,
-    ...MultichainBalancesController,
-    ...MultichainAssetsRatesController,
-  };
-  ///: END:ONLY_INCLUDE_IF
+  const { AccountTreeController, AccountsController, NetworkController } =
+    state.engine.backgroundState;
 
   return {
     ...AccountTreeController,
     ...AccountsController,
-    ...TokensController,
-    ...TokenBalancesController,
-    ...TokenRatesController,
-    ...multichainState,
-    ...CurrencyRateController,
+    allTokens: getTokensControllerAllTokens(state),
+    allIgnoredTokens: getTokensControllerAllIgnoredTokens(state),
+    tokenBalances: getTokenBalancesControllerTokenBalances(state),
+    marketData: getTokenRatesControllerMarketData(state),
+    assetsMetadata: getMultiChainAssetsControllerAssetsMetadata(state),
+    accountsAssets: getMultiChainAssetsControllerAccountsAssets(state),
+    allIgnoredAssets: getMultiChainAssetsControllerAllIgnoredAssets(state),
+    balances: getMultiChainBalancesControllerBalances(state),
+    conversionRates: getMultichainAssetsRatesControllerConversionRates(state),
+    currencyRates: getCurrencyRateControllerCurrencyRates(state),
+    currentCurrency: getCurrencyRateControllerCurrentCurrency(state),
     ...NetworkController,
-    ...(AccountTrackerController as {
-      accountsByChainId: Record<
+    accountsByChainId: getAccountTrackerControllerAccountsByChainId(
+      state,
+    ) as Record<
+      Hex,
+      Record<
         Hex,
-        Record<
-          Hex,
-          {
-            balance: Hex | null;
-          }
-        >
-      >;
-    }),
+        {
+          balance: Hex | null;
+        }
+      >
+    >,
   };
 };
 
diff --git a/app/selectors/assets/assets-migration.test.ts b/app/selectors/assets/assets-migration.test.ts
new file mode 100644
index 00000000000..43cbadaff6e
--- /dev/null
+++ b/app/selectors/assets/assets-migration.test.ts
@@ -0,0 +1,2355 @@
+import { getNativeAssetForChainId } from '@metamask/bridge-controller';
+import { toChecksumHexAddress } from '@metamask/controller-utils';
+import type { CaipAssetType, Hex } from '@metamask/utils';
+import {
+  ASSETS_UNIFY_STATE_FLAG,
+  ASSETS_UNIFY_STATE_FEATURE_VERSION_1,
+} from '../featureFlagController/assetsUnifyState';
+import {
+  getAccountTrackerControllerAccountsByChainId,
+  getTokensControllerAllTokens,
+  getTokensControllerAllIgnoredTokens,
+  getTokenBalancesControllerTokenBalances,
+  getMultiChainAssetsControllerAccountsAssets,
+  getMultiChainAssetsControllerAssetsMetadata,
+  getMultiChainAssetsControllerAllIgnoredAssets,
+  getMultiChainBalancesControllerBalances,
+  getCurrencyRateControllerCurrentCurrency,
+  getCurrencyRateControllerCurrencyRates,
+  getTokenRatesControllerMarketData,
+  getMultichainAssetsRatesControllerConversionRates,
+} from './assets-migration';
+
+const mockAccountId = 'mock-account-id-1';
+const mockAccountId2 = 'mock-account-id-2';
+
+const mockAccountAddressLowercase: Hex =
+  '0xd8da6bf26964af9d7eed9e03e53415d37aa96045';
+const mockAccountAddressChecksummed = toChecksumHexAddress(
+  mockAccountAddressLowercase,
+) as Hex;
+
+const nativeEthAssetId = 'eip155:1/slip44:60';
+const erc20AssetAddressLowercase: Hex =
+  '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
+const erc20AssetAddressChecksummed = toChecksumHexAddress(
+  erc20AssetAddressLowercase,
+) as Hex;
+const erc20AssetId = `eip155:1/erc20:${erc20AssetAddressLowercase}`;
+const solanaTokenAssetId =
+  'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
+
+const nativePolygonAssetId = 'eip155:137/slip44:966';
+const mockAccountId3 = 'mock-account-id-3';
+const mockAccountAddressLowercase2: Hex =
+  '0x1234567890abcdef1234567890abcdef12345678';
+
+const enabledFeatureFlagControllerState = {
+  RemoteFeatureFlagController: {
+    remoteFeatureFlags: {
+      [ASSETS_UNIFY_STATE_FLAG]: {
+        enabled: true,
+        featureVersion: ASSETS_UNIFY_STATE_FEATURE_VERSION_1,
+      },
+    },
+  },
+};
+
+function makeMockPrice(overrides: Partial<Record<string, unknown>> = {}) {
+  return {
+    assetPriceType: 'fungible',
+    id: 'mock-price',
+    price: 1,
+    lastUpdated: 1700000000000,
+    marketCap: 0,
+    allTimeHigh: 0,
+    allTimeLow: 0,
+    totalVolume: 0,
+    high1d: 0,
+    low1d: 0,
+    circulatingSupply: 0,
+    dilutedMarketCap: 0,
+    marketCapPercentChange1d: 0,
+    priceChange1d: 0,
+    pricePercentChange1h: 0,
+    pricePercentChange1d: 0,
+    pricePercentChange7d: 0,
+    pricePercentChange14d: 0,
+    pricePercentChange30d: 0,
+    pricePercentChange200d: 0,
+    pricePercentChange1y: 0,
+    ...overrides,
+  };
+}
+
+describe('getAccountTrackerControllerAccountsByChainId', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns accountsByChainId from state unchanged', () => {
+      const legacyAccountsByChainId = {
+        '0x1': {
+          [mockAccountAddressChecksummed]: {
+            balance: '0xde0b6b3a7640000' as const,
+          },
+        },
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            AccountTrackerController: {
+              accountsByChainId: legacyAccountsByChainId,
+            },
+          },
+        },
+      };
+      const result = getAccountTrackerControllerAccountsByChainId(state);
+
+      expect(result).toBe(legacyAccountsByChainId);
+      expect(result).toStrictEqual(legacyAccountsByChainId);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives accountsByChainId from new state structure', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            AccountTrackerController: { accountsByChainId: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: { type: 'native', decimals: 18 },
+                [erc20AssetId]: { type: 'erc20', decimals: 6 },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [nativeEthAssetId]: { amount: '1.23456789' },
+                  [erc20AssetId]: { amount: '1' },
+                },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getAccountTrackerControllerAccountsByChainId(state);
+
+      expect(result).toStrictEqual({
+        '0x1': {
+          [mockAccountAddressChecksummed]: {
+            balance: '0x112210f4768db400', // 1234567890000000000
+          },
+        },
+      });
+    });
+  });
+
+  describe('edge cases when enabled', () => {
+    it('handles multiple chains for the same EVM account', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            AccountTrackerController: { accountsByChainId: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: { type: 'native', decimals: 18 },
+                [nativePolygonAssetId]: { type: 'native', decimals: 18 },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [nativeEthAssetId]: { amount: '1' },
+                  [nativePolygonAssetId]: { amount: '2' },
+                },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getAccountTrackerControllerAccountsByChainId(state);
+
+      expect(result['0x1']).toBeDefined();
+      expect(result['0x89']).toBeDefined();
+      expect(Object.keys(result)).toHaveLength(2);
+    });
+
+    it('handles balance with 0 decimals', () => {
+      const zeroDecNativeId = 'eip155:42/slip44:60';
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            AccountTrackerController: { accountsByChainId: {} },
+            AssetsController: {
+              assetsInfo: {
+                [zeroDecNativeId]: { type: 'native', decimals: 0 },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [zeroDecNativeId]: { amount: '42' },
+                },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getAccountTrackerControllerAccountsByChainId(state);
+
+      expect(result['0x2a'][mockAccountAddressChecksummed].balance).toBe(
+        '0x2a',
+      );
+    });
+
+    it('skips balance entries without metadata in assetsInfo', () => {
+      const unknownAssetId =
+        'eip155:1/erc20:0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef';
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            AccountTrackerController: { accountsByChainId: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: { type: 'native', decimals: 18 },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [nativeEthAssetId]: { amount: '1' },
+                  [unknownAssetId]: { amount: '500' },
+                },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getAccountTrackerControllerAccountsByChainId(state);
+
+      expect(Object.keys(result)).toStrictEqual(['0x1']);
+    });
+
+    it('skips non-native assets (ERC-20) from accountsByChainId', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            AccountTrackerController: { accountsByChainId: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: { type: 'native', decimals: 18 },
+                [erc20AssetId]: { type: 'erc20', decimals: 6 },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [nativeEthAssetId]: { amount: '5' },
+                  [erc20AssetId]: { amount: '1000' },
+                },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getAccountTrackerControllerAccountsByChainId(state);
+
+      expect(Object.keys(result['0x1'])).toStrictEqual([
+        mockAccountAddressChecksummed,
+      ]);
+    });
+
+    it('truncates fractional digits exceeding decimals in parseBalanceWithDecimals', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            AccountTrackerController: { accountsByChainId: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: { type: 'native', decimals: 2 },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [nativeEthAssetId]: { amount: '1.23456' },
+                },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getAccountTrackerControllerAccountsByChainId(state);
+
+      // 1.23456 with 2 decimals → truncated to 1.23 → 123
+      expect(result['0x1'][mockAccountAddressChecksummed].balance).toBe('0x7b');
+    });
+  });
+});
+
+describe('getTokensControllerAllTokens', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns allTokens from state unchanged', () => {
+      const legacyAllTokens = {
+        '0x1': {
+          [mockAccountAddressLowercase]: [
+            {
+              address: erc20AssetAddressLowercase,
+              symbol: 'USDC',
+              decimals: 6,
+              name: 'USD Coin',
+            },
+          ],
+        },
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            TokensController: {
+              allTokens: legacyAllTokens,
+              allIgnoredTokens: {},
+            },
+          },
+        },
+      };
+      const result = getTokensControllerAllTokens(state);
+
+      expect(result).toBe(legacyAllTokens);
+      expect(result).toStrictEqual(legacyAllTokens);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives allTokens from new state structure', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokensController: { allTokens: {}, allIgnoredTokens: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: { type: 'native', decimals: 18 },
+                [erc20AssetId]: {
+                  type: 'erc20',
+                  decimals: 6,
+                  symbol: 'USDC',
+                  name: 'USD Coin',
+                },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [nativeEthAssetId]: { amount: '1' },
+                  [erc20AssetId]: { amount: '1000000' },
+                },
+              },
+              customAssets: {},
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokensControllerAllTokens(state);
+
+      expect(result).toStrictEqual({
+        '0x1': {
+          [mockAccountAddressLowercase]: [
+            {
+              address: erc20AssetAddressChecksummed,
+              symbol: 'USDC',
+              decimals: 6,
+              name: 'USD Coin',
+              image: undefined,
+            },
+          ],
+        },
+      });
+    });
+  });
+
+  describe('edge cases when enabled', () => {
+    it('includes tokens from customAssets not present in assetsBalance', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokensController: { allTokens: {}, allIgnoredTokens: {} },
+            AssetsController: {
+              assetsInfo: {
+                [erc20AssetId]: {
+                  type: 'erc20',
+                  decimals: 6,
+                  symbol: 'USDC',
+                  name: 'USD Coin',
+                  image: 'https://example.com/usdc.png',
+                },
+              },
+              assetsBalance: {},
+              customAssets: {
+                [mockAccountId]: [erc20AssetId as CaipAssetType],
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokensControllerAllTokens(state);
+
+      expect(result['0x1'][mockAccountAddressLowercase]).toStrictEqual([
+        {
+          address: erc20AssetAddressChecksummed,
+          symbol: 'USDC',
+          decimals: 6,
+          name: 'USD Coin',
+          image: 'https://example.com/usdc.png',
+        },
+      ]);
+    });
+
+    it('deduplicates tokens present in both assetsBalance and customAssets', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokensController: { allTokens: {}, allIgnoredTokens: {} },
+            AssetsController: {
+              assetsInfo: {
+                [erc20AssetId]: {
+                  type: 'erc20',
+                  decimals: 6,
+                  symbol: 'USDC',
+                  name: 'USD Coin',
+                },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [erc20AssetId]: { amount: '1' },
+                },
+              },
+              customAssets: {
+                [mockAccountId]: [erc20AssetId as CaipAssetType],
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokensControllerAllTokens(state);
+
+      expect(result['0x1'][mockAccountAddressLowercase]).toHaveLength(1);
+    });
+
+    it('skips assets with no metadata in assetsInfo', () => {
+      const unknownAssetId =
+        'eip155:1/erc20:0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef' as CaipAssetType;
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokensController: { allTokens: {}, allIgnoredTokens: {} },
+            AssetsController: {
+              assetsInfo: {},
+              assetsBalance: {
+                [mockAccountId]: {
+                  [unknownAssetId]: { amount: '1' },
+                },
+              },
+              customAssets: {},
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokensControllerAllTokens(state);
+
+      expect(result).toStrictEqual({});
+    });
+
+    it('skips native assets from allTokens (only ERC-20s)', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokensController: { allTokens: {}, allIgnoredTokens: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: {
+                  type: 'native',
+                  decimals: 18,
+                  symbol: 'ETH',
+                  name: 'Ether',
+                },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [nativeEthAssetId]: { amount: '1' },
+                },
+              },
+              customAssets: {},
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokensControllerAllTokens(state);
+
+      expect(result).toStrictEqual({});
+    });
+  });
+});
+
+describe('getTokensControllerAllIgnoredTokens', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns allIgnoredTokens from state unchanged', () => {
+      const legacyAllIgnoredTokens = {
+        '0x1': {
+          [mockAccountAddressLowercase]: [erc20AssetAddressLowercase],
+        },
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            TokensController: {
+              allIgnoredTokens: legacyAllIgnoredTokens,
+              allTokens: {},
+            },
+          },
+        },
+      };
+      const result = getTokensControllerAllIgnoredTokens(state);
+
+      expect(result).toBe(legacyAllIgnoredTokens);
+      expect(result).toStrictEqual(legacyAllIgnoredTokens);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives allIgnoredTokens from new state structure', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokensController: { allIgnoredTokens: {}, allTokens: {} },
+            AssetsController: {
+              assetPreferences: {
+                [erc20AssetId]: { hidden: true },
+                [solanaTokenAssetId]: { hidden: true },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokensControllerAllIgnoredTokens(state);
+
+      expect(result).toStrictEqual({
+        '0x1': {
+          [mockAccountAddressLowercase]: [erc20AssetAddressLowercase],
+        },
+      });
+    });
+  });
+
+  describe('edge cases when enabled', () => {
+    it('skips preferences with hidden set to false', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokensController: { allIgnoredTokens: {}, allTokens: {} },
+            AssetsController: {
+              assetPreferences: {
+                [erc20AssetId]: { hidden: false },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokensControllerAllIgnoredTokens(state);
+
+      expect(result).toStrictEqual({});
+    });
+
+    it('applies hidden tokens to all EVM accounts', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokensController: { allIgnoredTokens: {}, allTokens: {} },
+            AssetsController: {
+              assetPreferences: {
+                [erc20AssetId]: { hidden: true },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                  [mockAccountId3]: {
+                    id: mockAccountId3,
+                    address: mockAccountAddressLowercase2,
+                    type: 'eip155:eoa',
+                  },
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokensControllerAllIgnoredTokens(state);
+
+      expect(result['0x1'][mockAccountAddressLowercase]).toStrictEqual([
+        erc20AssetAddressLowercase,
+      ]);
+      expect(result['0x1'][mockAccountAddressLowercase2]).toStrictEqual([
+        erc20AssetAddressLowercase,
+      ]);
+    });
+  });
+});
+
+describe('getTokenBalancesControllerTokenBalances', () => {
+  const baseInternalAccounts = {
+    accounts: {
+      [mockAccountId]: {
+        id: mockAccountId,
+        address: mockAccountAddressLowercase,
+        type: 'eip155:eoa',
+      },
+      [mockAccountId2]: {
+        id: mockAccountId2,
+        type: 'solana:data-account',
+      },
+    },
+  };
+
+  describe('when assets unify state feature is disabled', () => {
+    it('returns tokenBalances from state unchanged', () => {
+      const legacyTokenBalances = {
+        [mockAccountAddressLowercase]: {
+          '0x1': {
+            [erc20AssetAddressChecksummed]: '0xf4240' as const,
+          },
+        },
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            TokenBalancesController: {
+              tokenBalances: legacyTokenBalances,
+            },
+          },
+        },
+      };
+      const result = getTokenBalancesControllerTokenBalances(state);
+
+      expect(result).toBe(legacyTokenBalances);
+      expect(result).toStrictEqual(legacyTokenBalances);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives tokenBalances from new state structure', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenBalancesController: { tokenBalances: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: { type: 'native', decimals: 18 },
+                [erc20AssetId]: { type: 'erc20', decimals: 6 },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [nativeEthAssetId]: { amount: '1.23456789' },
+                  [erc20AssetId]: { amount: '1' },
+                },
+              },
+              customAssets: {},
+            },
+            AccountsController: { internalAccounts: baseInternalAccounts },
+          },
+        },
+      };
+      const result = getTokenBalancesControllerTokenBalances(state);
+
+      const nativeAddress = getNativeAssetForChainId('0x1').address;
+      expect(result).toStrictEqual({
+        [mockAccountAddressLowercase]: {
+          '0x1': {
+            [nativeAddress]: '0x112210f4768db400', // 1.23456789 ETH (18 decimals)
+            [erc20AssetAddressChecksummed]: '0xf4240', // 1 USDC (6 decimals)
+          },
+        },
+      });
+    });
+
+    it('adds zero-balance placeholder for custom EVM token not yet in assetsBalance', () => {
+      const customTokenAddress: Hex =
+        '0x4d5f47fa6a74757f35c14fd3a6ef8e3c9bc514e8';
+      const customTokenAssetId = `eip155:1/erc20:${customTokenAddress}`;
+      const customTokenAddressChecksummed = toChecksumHexAddress(
+        customTokenAddress,
+      ) as Hex;
+
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenBalancesController: { tokenBalances: {} },
+            AssetsController: {
+              assetsInfo: {
+                [customTokenAssetId]: {
+                  type: 'erc20',
+                  decimals: 18,
+                  symbol: 'aEthWETH',
+                  name: 'Aave Ethereum WETH',
+                },
+              },
+              assetsBalance: {},
+              customAssets: {
+                [mockAccountId]: [customTokenAssetId],
+              },
+            },
+            AccountsController: { internalAccounts: baseInternalAccounts },
+          },
+        },
+      };
+      const result = getTokenBalancesControllerTokenBalances(state);
+
+      expect(result).toStrictEqual({
+        [mockAccountAddressLowercase]: {
+          '0x1': {
+            [customTokenAddressChecksummed]: '0x0',
+          },
+        },
+      });
+    });
+
+    it('does not overwrite real balance with zero placeholder', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenBalancesController: { tokenBalances: {} },
+            AssetsController: {
+              assetsInfo: {
+                [erc20AssetId]: { type: 'erc20', decimals: 6 },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [erc20AssetId]: { amount: '1' },
+                },
+              },
+              customAssets: {
+                [mockAccountId]: [erc20AssetId],
+              },
+            },
+            AccountsController: { internalAccounts: baseInternalAccounts },
+          },
+        },
+      };
+      const result = getTokenBalancesControllerTokenBalances(state);
+
+      expect(result[mockAccountAddressLowercase]['0x1']).toStrictEqual({
+        [erc20AssetAddressChecksummed]: '0xf4240', // real balance, not 0x0
+      });
+    });
+
+    it('skips custom non-EVM tokens', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenBalancesController: { tokenBalances: {} },
+            AssetsController: {
+              assetsInfo: {
+                [solanaTokenAssetId]: {
+                  type: 'token',
+                  decimals: 6,
+                  symbol: 'USDC',
+                },
+              },
+              assetsBalance: {},
+              customAssets: {
+                [mockAccountId2]: [solanaTokenAssetId],
+              },
+            },
+            AccountsController: { internalAccounts: baseInternalAccounts },
+          },
+        },
+      };
+      const result = getTokenBalancesControllerTokenBalances(state);
+
+      expect(result).toStrictEqual({});
+    });
+  });
+
+  describe('edge cases when enabled', () => {
+    it('skips balance entries without metadata in assetsInfo', () => {
+      const unknownAssetId =
+        'eip155:1/erc20:0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef';
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenBalancesController: { tokenBalances: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: { type: 'native', decimals: 18 },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [nativeEthAssetId]: { amount: '1' },
+                  [unknownAssetId]: { amount: '999' },
+                },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokenBalancesControllerTokenBalances(state);
+
+      const nativeAddress = getNativeAssetForChainId('0x1').address;
+      expect(
+        Object.keys(result[mockAccountAddressLowercase]['0x1']),
+      ).toStrictEqual([nativeAddress]);
+    });
+
+    it('handles multiple EVM accounts', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenBalancesController: { tokenBalances: {} },
+            AssetsController: {
+              assetsInfo: {
+                [erc20AssetId]: { type: 'erc20', decimals: 6 },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [erc20AssetId]: { amount: '10' },
+                },
+                [mockAccountId3]: {
+                  [erc20AssetId]: { amount: '20' },
+                },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                  [mockAccountId3]: {
+                    id: mockAccountId3,
+                    address: mockAccountAddressLowercase2,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokenBalancesControllerTokenBalances(state);
+
+      expect(result[mockAccountAddressLowercase]).toBeDefined();
+      expect(result[mockAccountAddressLowercase2]).toBeDefined();
+      expect(
+        result[mockAccountAddressLowercase]['0x1'][
+          erc20AssetAddressChecksummed
+        ],
+      ).toBe('0x989680'); // 10 * 10^6
+      expect(
+        result[mockAccountAddressLowercase2]['0x1'][
+          erc20AssetAddressChecksummed
+        ],
+      ).toBe('0x1312d00'); // 20 * 10^6
+    });
+  });
+});
+
+describe('getMultiChainAssetsControllerAccountsAssets', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns accountsAssets from state unchanged', () => {
+      const legacyAccountsAssets = {
+        [mockAccountId2]: [solanaTokenAssetId] as CaipAssetType[],
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            MultichainAssetsController: {
+              accountsAssets: legacyAccountsAssets,
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAccountsAssets(state);
+
+      expect(result).toBe(legacyAccountsAssets);
+      expect(result).toStrictEqual(legacyAccountsAssets);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives accountsAssets from new state structure for non-EVM accounts only', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsController: { accountsAssets: {} },
+            AssetsController: {
+              assetsBalance: {
+                [mockAccountId]: {
+                  [nativeEthAssetId]: { amount: '1' },
+                  [erc20AssetId]: { amount: '1' },
+                },
+                [mockAccountId2]: {
+                  [solanaTokenAssetId]: { amount: '100' },
+                },
+              },
+              customAssets: {},
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAccountsAssets(state);
+
+      expect(result).toStrictEqual({
+        [mockAccountId2]: [solanaTokenAssetId],
+      });
+    });
+  });
+
+  describe('edge cases when enabled', () => {
+    it('merges and deduplicates assetsBalance and customAssets', () => {
+      const extraSolAssetId =
+        'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:So11111111111111111111111111111111111111112' as CaipAssetType;
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsController: { accountsAssets: {} },
+            AssetsController: {
+              assetsBalance: {
+                [mockAccountId2]: {
+                  [solanaTokenAssetId]: { amount: '100' },
+                },
+              },
+              customAssets: {
+                [mockAccountId2]: [
+                  solanaTokenAssetId as CaipAssetType,
+                  extraSolAssetId,
+                ],
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAccountsAssets(state);
+
+      expect(result[mockAccountId2]).toHaveLength(2);
+      expect(result[mockAccountId2]).toContain(solanaTokenAssetId);
+      expect(result[mockAccountId2]).toContain(extraSolAssetId);
+    });
+
+    it('filters out EIP155 assets for non-EVM accounts', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsController: { accountsAssets: {} },
+            AssetsController: {
+              assetsBalance: {
+                [mockAccountId2]: {
+                  [nativeEthAssetId]: { amount: '1' },
+                  [solanaTokenAssetId]: { amount: '100' },
+                },
+              },
+              customAssets: {},
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAccountsAssets(state);
+
+      expect(result[mockAccountId2]).toStrictEqual([solanaTokenAssetId]);
+    });
+
+    it('returns empty array when non-EVM account has only EIP155 assets', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsController: { accountsAssets: {} },
+            AssetsController: {
+              assetsBalance: {
+                [mockAccountId2]: {
+                  [nativeEthAssetId]: { amount: '1' },
+                },
+              },
+              customAssets: {},
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAccountsAssets(state);
+
+      expect(result[mockAccountId2]).toStrictEqual([]);
+    });
+  });
+});
+
+describe('getMultiChainAssetsControllerAssetsMetadata', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns assetsMetadata from state unchanged', () => {
+      const legacyAssetsMetadata = {
+        [solanaTokenAssetId]: {
+          fungible: true as const,
+          iconUrl: 'https://example.com/sol.png',
+          units: [{ decimals: 6, symbol: 'USDC', name: 'USD Coin' }],
+          symbol: 'USDC',
+          name: 'USD Coin',
+        },
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            MultichainAssetsController: {
+              assetsMetadata: legacyAssetsMetadata,
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAssetsMetadata(state);
+
+      expect(result).toBe(legacyAssetsMetadata);
+      expect(result).toStrictEqual(legacyAssetsMetadata);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives assetsMetadata from assetsInfo for non-EIP155 assets only', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsController: { assetsMetadata: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: { type: 'native', decimals: 18 },
+                [erc20AssetId]: {
+                  type: 'erc20',
+                  decimals: 6,
+                  symbol: 'USDC',
+                  name: 'USD Coin',
+                },
+                [solanaTokenAssetId]: {
+                  type: 'token',
+                  decimals: 6,
+                  symbol: 'USDC',
+                  name: 'USD Coin',
+                  image: 'https://example.com/sol-usdc.png',
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAssetsMetadata(state);
+
+      expect(result).toStrictEqual({
+        [solanaTokenAssetId]: {
+          fungible: true,
+          iconUrl: 'https://example.com/sol-usdc.png',
+          units: [
+            {
+              decimals: 6,
+              symbol: 'USDC',
+              name: 'USD Coin',
+            },
+          ],
+          symbol: 'USDC',
+          name: 'USD Coin',
+        },
+      });
+    });
+  });
+
+  describe('edge cases when enabled', () => {
+    it('defaults iconUrl to empty string when image is undefined', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsController: { assetsMetadata: {} },
+            AssetsController: {
+              assetsInfo: {
+                [solanaTokenAssetId]: {
+                  type: 'token',
+                  decimals: 9,
+                  symbol: 'SOL',
+                  name: 'Solana',
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAssetsMetadata(state);
+
+      expect(result[solanaTokenAssetId as CaipAssetType].iconUrl).toBe('');
+    });
+
+    it('excludes EIP155 assets from multichain metadata', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsController: { assetsMetadata: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: {
+                  type: 'native',
+                  decimals: 18,
+                  symbol: 'ETH',
+                  name: 'Ether',
+                },
+                [erc20AssetId]: {
+                  type: 'erc20',
+                  decimals: 6,
+                  symbol: 'USDC',
+                  name: 'USD Coin',
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAssetsMetadata(state);
+
+      expect(result).toStrictEqual({});
+    });
+  });
+});
+
+describe('getMultiChainAssetsControllerAllIgnoredAssets', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns allIgnoredAssets from state unchanged', () => {
+      const legacyAllIgnoredAssets = {
+        [mockAccountId2]: [solanaTokenAssetId] as CaipAssetType[],
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            MultichainAssetsController: {
+              allIgnoredAssets: legacyAllIgnoredAssets,
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAllIgnoredAssets(state);
+
+      expect(result).toBe(legacyAllIgnoredAssets);
+      expect(result).toStrictEqual(legacyAllIgnoredAssets);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives allIgnoredAssets from assetPreferences for non-EVM accounts only', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsController: { allIgnoredAssets: {} },
+            AssetsController: {
+              assetPreferences: {
+                [erc20AssetId]: { hidden: true },
+                [solanaTokenAssetId]: { hidden: true },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAllIgnoredAssets(state);
+
+      expect(result).toStrictEqual({
+        [mockAccountId2]: [solanaTokenAssetId],
+      });
+    });
+  });
+
+  describe('edge cases when enabled', () => {
+    it('skips preferences with hidden set to false', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsController: { allIgnoredAssets: {} },
+            AssetsController: {
+              assetPreferences: {
+                [solanaTokenAssetId]: { hidden: false },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAllIgnoredAssets(state);
+
+      expect(result[mockAccountId2]).toStrictEqual([]);
+    });
+
+    it('skips EIP155 assets from ignored assets list', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsController: { allIgnoredAssets: {} },
+            AssetsController: {
+              assetPreferences: {
+                [erc20AssetId]: { hidden: true },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAllIgnoredAssets(state);
+
+      expect(result[mockAccountId2]).toStrictEqual([]);
+    });
+
+    it('skips EVM accounts entirely', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsController: { allIgnoredAssets: {} },
+            AssetsController: {
+              assetPreferences: {
+                [solanaTokenAssetId]: { hidden: true },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainAssetsControllerAllIgnoredAssets(state);
+
+      expect(result).toStrictEqual({});
+    });
+  });
+});
+
+describe('getMultiChainBalancesControllerBalances', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns balances from state unchanged', () => {
+      const legacyBalances = {
+        [mockAccountId2]: {
+          [solanaTokenAssetId]: { amount: '100', unit: 'USDC' },
+        },
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            MultichainBalancesController: { balances: legacyBalances },
+          },
+        },
+      };
+      const result = getMultiChainBalancesControllerBalances(state);
+
+      expect(result).toBe(legacyBalances);
+      expect(result).toStrictEqual(legacyBalances);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives balances from new state structure for non-EVM accounts only', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainBalancesController: { balances: {} },
+            AssetsController: {
+              assetsInfo: {
+                [nativeEthAssetId]: { type: 'native', decimals: 18 },
+                [erc20AssetId]: { type: 'erc20', decimals: 6, symbol: 'USDC' },
+                [solanaTokenAssetId]: {
+                  type: 'token',
+                  decimals: 6,
+                  symbol: 'USDC',
+                },
+              },
+              assetsBalance: {
+                [mockAccountId]: {
+                  [nativeEthAssetId]: { amount: '1' },
+                  [erc20AssetId]: { amount: '1' },
+                },
+                [mockAccountId2]: {
+                  [solanaTokenAssetId]: { amount: '250.5' },
+                },
+              },
+            },
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockAccountId]: {
+                    id: mockAccountId,
+                    address: mockAccountAddressLowercase,
+                    type: 'eip155:eoa',
+                  },
+                  [mockAccountId2]: {
+                    id: mockAccountId2,
+                    type: 'solana:data-account',
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultiChainBalancesControllerBalances(state);
+
+      expect(result).toStrictEqual({
+        [mockAccountId2]: {
+          [solanaTokenAssetId]: { amount: '250.5', unit: 'USDC' },
+        },
+      });
+    });
+  });
+});
+
+describe('getCurrencyRateControllerCurrentCurrency', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns currentCurrency from state unchanged', () => {
+      const legacyCurrentCurrency = 'eur';
+      const state = {
+        engine: {
+          backgroundState: {
+            CurrencyRateController: { currentCurrency: legacyCurrentCurrency },
+          },
+        },
+      };
+      const result = getCurrencyRateControllerCurrentCurrency(state);
+
+      expect(result).toBe(legacyCurrentCurrency);
+    });
+  });
+
+  describe('when assets unify state feature is enabled', () => {
+    it('returns selectedCurrency from new state', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            CurrencyRateController: { currentCurrency: 'eur' },
+            AssetsController: { selectedCurrency: 'usd' },
+          },
+        },
+      };
+      const result = getCurrencyRateControllerCurrentCurrency(state);
+
+      expect(result).toBe('usd');
+    });
+  });
+});
+
+describe('getCurrencyRateControllerCurrencyRates', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns currencyRates from state unchanged', () => {
+      const legacyCurrencyRates = {
+        ETH: {
+          conversionDate: 1000,
+          conversionRate: 2000,
+          usdConversionRate: 2000,
+        },
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            CurrencyRateController: { currencyRates: legacyCurrencyRates },
+          },
+        },
+      };
+      const result = getCurrencyRateControllerCurrencyRates(state);
+
+      expect(result).toBe(legacyCurrencyRates);
+      expect(result).toStrictEqual(legacyCurrencyRates);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives currencyRates from assetsInfo and assetsPrice for native EVM assets', () => {
+      const lastUpdated = 1700000000000; // ms
+      const mockNonFungibleAssetId = 'eip155:137/slip44:987654321';
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            CurrencyRateController: {
+              currentCurrency: 'eur',
+              currencyRates: {},
+            },
+            AssetsController: {
+              selectedCurrency: 'eur',
+              assetsInfo: {
+                [nativeEthAssetId]: {
+                  type: 'native',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+                [erc20AssetId]: {
+                  type: 'erc20',
+                  symbol: 'USDC',
+                  decimals: 6,
+                },
+                [mockNonFungibleAssetId]: {
+                  type: 'something',
+                  symbol: 'SMT',
+                },
+              },
+              assetsPrice: {
+                [nativeEthAssetId]: {
+                  assetPriceType: 'fungible',
+                  id: 'eth-price',
+                  price: 2500,
+                  usdPrice: 3000,
+                  lastUpdated,
+                  marketCap: 300000000000,
+                  allTimeHigh: 4000,
+                  allTimeLow: 500,
+                  totalVolume: 1000000,
+                  high1d: 2600,
+                  low1d: 2400,
+                  circulatingSupply: 120000000,
+                  dilutedMarketCap: 300000000000,
+                  marketCapPercentChange1d: 2,
+                  priceChange1d: 50,
+                  pricePercentChange1h: 0.5,
+                  pricePercentChange1d: 2,
+                  pricePercentChange7d: 5,
+                  pricePercentChange14d: 8,
+                  pricePercentChange30d: 10,
+                  pricePercentChange200d: 20,
+                  pricePercentChange1y: 30,
+                },
+                [mockNonFungibleAssetId]: {
+                  assetPriceType: 'something',
+                  id: 'smt-price',
+                  price: 0.5,
+                  lastUpdated,
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getCurrencyRateControllerCurrencyRates(state);
+
+      expect(result).toStrictEqual({
+        ETH: {
+          conversionDate: lastUpdated / 1000,
+          conversionRate: 2500,
+          usdConversionRate: 3000,
+        },
+      });
+    });
+  });
+});
+
+describe('getTokenRatesControllerMarketData', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns marketData from state unchanged', () => {
+      const legacyMarketData = {
+        '0x1': {
+          [erc20AssetAddressChecksummed]: {
+            tokenAddress: erc20AssetAddressChecksummed,
+            currency: 'ETH',
+            price: 1,
+            marketCap: 0,
+            allTimeHigh: 0,
+            allTimeLow: 0,
+            totalVolume: 0,
+            high1d: 0,
+            low1d: 0,
+            circulatingSupply: 0,
+            dilutedMarketCap: 0,
+            marketCapPercentChange1d: 0,
+            priceChange1d: 0,
+            pricePercentChange1h: 0,
+            pricePercentChange1d: 0,
+            pricePercentChange7d: 0,
+            pricePercentChange14d: 0,
+            pricePercentChange30d: 0,
+            pricePercentChange200d: 0,
+            pricePercentChange1y: 0,
+          },
+        },
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            TokenRatesController: { marketData: legacyMarketData },
+          },
+        },
+      };
+      const result = getTokenRatesControllerMarketData(state);
+
+      expect(result).toBe(legacyMarketData);
+      expect(result).toStrictEqual(legacyMarketData);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives marketData from assetsPrice with prices converted to native currency', () => {
+      const lastUpdated = 1700000000000;
+      const ethPriceInUsd = 2000;
+      const usdcPriceInUsd = 1;
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenRatesController: { marketData: {} },
+            CurrencyRateController: {
+              currentCurrency: 'usd',
+              currencyRates: {},
+            },
+            AssetsController: {
+              selectedCurrency: 'usd',
+              assetsInfo: {
+                [nativeEthAssetId]: {
+                  type: 'native',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+                [erc20AssetId]: {
+                  type: 'erc20',
+                  symbol: 'USDC',
+                  decimals: 6,
+                },
+              },
+              assetsPrice: {
+                [nativeEthAssetId]: {
+                  assetPriceType: 'fungible',
+                  id: 'eth-price',
+                  price: ethPriceInUsd,
+                  usdPrice: ethPriceInUsd,
+                  lastUpdated,
+                  marketCap: 300e9,
+                  allTimeHigh: 4000,
+                  allTimeLow: 500,
+                  totalVolume: 1e9,
+                  high1d: 2100,
+                  low1d: 1900,
+                  circulatingSupply: 120e6,
+                  dilutedMarketCap: 300e9,
+                  marketCapPercentChange1d: 2,
+                  priceChange1d: 50,
+                  pricePercentChange1h: 0.5,
+                  pricePercentChange1d: 2,
+                  pricePercentChange7d: 5,
+                  pricePercentChange14d: 8,
+                  pricePercentChange30d: 10,
+                  pricePercentChange200d: 20,
+                  pricePercentChange1y: 30,
+                },
+                [erc20AssetId]: {
+                  assetPriceType: 'fungible',
+                  id: 'usdc-price',
+                  price: usdcPriceInUsd,
+                  usdPrice: usdcPriceInUsd,
+                  lastUpdated,
+                  marketCap: 30e9,
+                  allTimeHigh: 1.1,
+                  allTimeLow: 0.9,
+                  totalVolume: 100e9,
+                  high1d: 1.01,
+                  low1d: 0.99,
+                  circulatingSupply: 30e9,
+                  dilutedMarketCap: 30e9,
+                  marketCapPercentChange1d: 0,
+                  priceChange1d: 0,
+                  pricePercentChange1h: 0,
+                  pricePercentChange1d: 0,
+                  pricePercentChange7d: 0,
+                  pricePercentChange14d: 0,
+                  pricePercentChange30d: 0,
+                  pricePercentChange200d: 0,
+                  pricePercentChange1y: 0,
+                },
+              },
+            },
+            NetworkController: {
+              networkConfigurationsByChainId: {
+                '0x1': { nativeCurrency: 'ETH' },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokenRatesControllerMarketData(state);
+
+      // ETH native rate is 2000 USD; USDC price 1 USD -> 1/2000 ETH
+      const marketData = result['0x1'][erc20AssetAddressChecksummed];
+      expect(marketData.price).toBe(usdcPriceInUsd / ethPriceInUsd);
+      expect(marketData.currency).toBe('ETH');
+      expect(marketData.tokenAddress).toBe(erc20AssetAddressChecksummed);
+    });
+  });
+
+  describe('edge cases when enabled', () => {
+    it('skips non-EIP155 assets from marketData', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenRatesController: { marketData: {} },
+            CurrencyRateController: {
+              currentCurrency: 'usd',
+              currencyRates: {},
+            },
+            AssetsController: {
+              selectedCurrency: 'usd',
+              assetsInfo: {
+                [nativeEthAssetId]: {
+                  type: 'native',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+                [solanaTokenAssetId]: {
+                  type: 'token',
+                  symbol: 'USDC',
+                  decimals: 6,
+                },
+              },
+              assetsPrice: {
+                [nativeEthAssetId]: makeMockPrice({ id: 'eth', price: 2000 }),
+                [solanaTokenAssetId]: makeMockPrice({
+                  id: 'sol-usdc',
+                  price: 1,
+                }),
+              },
+            },
+            NetworkController: {
+              networkConfigurationsByChainId: {
+                '0x1': { nativeCurrency: 'ETH' },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokenRatesControllerMarketData(state);
+
+      expect(result['0x1']).toBeDefined();
+      expect(Object.keys(result).every((key) => key.startsWith('0x'))).toBe(
+        true,
+      );
+    });
+
+    it('skips assets without metadata in assetsInfo', () => {
+      const unknownAssetId =
+        'eip155:1/erc20:0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef';
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenRatesController: { marketData: {} },
+            CurrencyRateController: {
+              currentCurrency: 'usd',
+              currencyRates: {},
+            },
+            AssetsController: {
+              selectedCurrency: 'usd',
+              assetsInfo: {
+                [nativeEthAssetId]: {
+                  type: 'native',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+              },
+              assetsPrice: {
+                [nativeEthAssetId]: makeMockPrice({
+                  id: 'eth',
+                  price: 2000,
+                }),
+                [unknownAssetId]: makeMockPrice({
+                  id: 'unknown',
+                  price: 42,
+                }),
+              },
+            },
+            NetworkController: {
+              networkConfigurationsByChainId: {
+                '0x1': { nativeCurrency: 'ETH' },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokenRatesControllerMarketData(state);
+
+      expect(Object.keys(result['0x1'])).toHaveLength(1);
+    });
+
+    it('skips assets when native currency conversion rate is unavailable', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenRatesController: { marketData: {} },
+            CurrencyRateController: {
+              currentCurrency: 'usd',
+              currencyRates: {},
+            },
+            AssetsController: {
+              selectedCurrency: 'usd',
+              assetsInfo: {
+                [erc20AssetId]: {
+                  type: 'erc20',
+                  symbol: 'USDC',
+                  decimals: 6,
+                },
+              },
+              assetsPrice: {
+                [erc20AssetId]: makeMockPrice({ id: 'usdc', price: 1 }),
+              },
+            },
+            NetworkController: {
+              networkConfigurationsByChainId: {
+                '0x1': { nativeCurrency: 'ETH' },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokenRatesControllerMarketData(state);
+
+      expect(result).toStrictEqual({});
+    });
+
+    it('places native slip44 asset at getNativeTokenAddress', () => {
+      const nativeTokenAddress = '0x0000000000000000000000000000000000000000';
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenRatesController: { marketData: {} },
+            CurrencyRateController: {
+              currentCurrency: 'usd',
+              currencyRates: {},
+            },
+            AssetsController: {
+              selectedCurrency: 'usd',
+              assetsInfo: {
+                [nativeEthAssetId]: {
+                  type: 'native',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+              },
+              assetsPrice: {
+                [nativeEthAssetId]: makeMockPrice({ id: 'eth', price: 2000 }),
+              },
+            },
+            NetworkController: {
+              networkConfigurationsByChainId: {
+                '0x1': { nativeCurrency: 'ETH' },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokenRatesControllerMarketData(state);
+
+      expect(result['0x1'][nativeTokenAddress]).toBeDefined();
+      expect(result['0x1'][nativeTokenAddress].tokenAddress).toBe(
+        nativeTokenAddress,
+      );
+      expect(result['0x1'][nativeTokenAddress].price).toBe(1);
+    });
+
+    it('converts all price fields to native currency denomination', () => {
+      const ethPrice = 2500;
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenRatesController: { marketData: {} },
+            CurrencyRateController: {
+              currentCurrency: 'usd',
+              currencyRates: {},
+            },
+            AssetsController: {
+              selectedCurrency: 'usd',
+              assetsInfo: {
+                [nativeEthAssetId]: {
+                  type: 'native',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+                [erc20AssetId]: {
+                  type: 'erc20',
+                  symbol: 'USDC',
+                  decimals: 6,
+                },
+              },
+              assetsPrice: {
+                [nativeEthAssetId]: makeMockPrice({
+                  id: 'eth',
+                  price: ethPrice,
+                }),
+                [erc20AssetId]: makeMockPrice({
+                  id: 'usdc',
+                  price: 1,
+                  marketCap: 30e9,
+                  allTimeHigh: 1.1,
+                  allTimeLow: 0.9,
+                  totalVolume: 100e9,
+                  high1d: 1.01,
+                  low1d: 0.99,
+                  dilutedMarketCap: 30e9,
+                  circulatingSupply: 30e9,
+                }),
+              },
+            },
+            NetworkController: {
+              networkConfigurationsByChainId: {
+                '0x1': { nativeCurrency: 'ETH' },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokenRatesControllerMarketData(state);
+      const md = result['0x1'][erc20AssetAddressChecksummed];
+
+      expect(md.price).toBe(1 / ethPrice);
+      expect(md.marketCap).toBe(30e9 / ethPrice);
+      expect(md.allTimeHigh).toBe(1.1 / ethPrice);
+      expect(md.allTimeLow).toBe(0.9 / ethPrice);
+      expect(md.totalVolume).toBe(100e9 / ethPrice);
+      expect(md.high1d).toBe(1.01 / ethPrice);
+      expect(md.low1d).toBe(0.99 / ethPrice);
+      expect(md.dilutedMarketCap).toBe(30e9 / ethPrice);
+      // circulatingSupply is NOT converted
+      expect(md.circulatingSupply).toBe(30e9);
+    });
+
+    it('does not use slip44 fallback for ERC-20 assets missing from assetsInfo', () => {
+      const ethPrice = 2000;
+      const nativeTokenAddress = '0x0000000000000000000000000000000000000000';
+      const orphanErc20AssetId =
+        'eip155:1/erc20:0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef';
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            TokenRatesController: { marketData: {} },
+            CurrencyRateController: {
+              currentCurrency: 'usd',
+              currencyRates: {},
+            },
+            AssetsController: {
+              selectedCurrency: 'usd',
+              assetsInfo: {
+                [nativeEthAssetId]: {
+                  type: 'native',
+                  symbol: 'ETH',
+                  decimals: 18,
+                },
+              },
+              assetsPrice: {
+                [nativeEthAssetId]: makeMockPrice({
+                  id: 'eth',
+                  price: ethPrice,
+                }),
+                [orphanErc20AssetId]: makeMockPrice({
+                  id: 'orphan',
+                  price: 999,
+                }),
+              },
+            },
+            NetworkController: {
+              networkConfigurationsByChainId: {
+                '0x1': { nativeCurrency: 'ETH' },
+              },
+            },
+          },
+        },
+      };
+      const result = getTokenRatesControllerMarketData(state);
+
+      // The native entry should still be the native price, not overwritten
+      expect(result['0x1'][nativeTokenAddress].price).toBe(1);
+      // The orphan ERC-20 should be skipped entirely (no metadata)
+      const checksumOrphan = toChecksumHexAddress(
+        '0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef',
+      ) as Hex;
+      expect(result['0x1'][checksumOrphan]).toBeUndefined();
+    });
+  });
+});
+
+describe('getMultichainAssetsRatesControllerConversionRates', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns conversionRates from state unchanged', () => {
+      const legacyConversionRates = {
+        [solanaTokenAssetId]: {
+          rate: '1',
+          conversionTime: 1700000000000,
+          expirationTime: undefined,
+          marketData: {
+            fungible: true as const,
+            allTimeHigh: '1.1',
+            allTimeLow: '0.9',
+            circulatingSupply: '1000000',
+            marketCap: '1000000',
+            totalVolume: '500000',
+            pricePercentChange: {
+              PT1H: 0,
+              P1D: 0,
+              P7D: 0,
+              P14D: 0,
+              P30D: 0,
+              P200D: 0,
+              P1Y: 0,
+            },
+          },
+        },
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            MultichainAssetsRatesController: {
+              conversionRates: legacyConversionRates,
+            },
+          },
+        },
+      };
+      const result = getMultichainAssetsRatesControllerConversionRates(state);
+
+      expect(result).toBe(legacyConversionRates);
+      expect(result).toStrictEqual(legacyConversionRates);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives conversionRates from assetsPrice for non-EVM assets only', () => {
+      const lastUpdated = 1700000000000;
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsRatesController: { conversionRates: {} },
+            AssetsController: {
+              assetsPrice: {
+                [nativeEthAssetId]: {
+                  assetPriceType: 'fungible',
+                  id: 'eth-price',
+                  price: 2000,
+                  usdPrice: 2000,
+                  lastUpdated,
+                  marketCap: 300e9,
+                  allTimeHigh: 4000,
+                  allTimeLow: 500,
+                  totalVolume: 1e9,
+                  high1d: 2100,
+                  low1d: 1900,
+                  circulatingSupply: 120e6,
+                  dilutedMarketCap: 300e9,
+                  marketCapPercentChange1d: 2,
+                  priceChange1d: 50,
+                  pricePercentChange1h: 0.5,
+                  pricePercentChange1d: 2,
+                  pricePercentChange7d: 5,
+                  pricePercentChange14d: 8,
+                  pricePercentChange30d: 10,
+                  pricePercentChange200d: 20,
+                  pricePercentChange1y: 30,
+                },
+                [solanaTokenAssetId]: {
+                  assetPriceType: 'fungible',
+                  id: 'sol-usdc-price',
+                  price: 1.02,
+                  usdPrice: 1.02,
+                  lastUpdated,
+                  marketCap: 30e9,
+                  allTimeHigh: 1.1,
+                  allTimeLow: 0.95,
+                  totalVolume: 100e9,
+                  high1d: 1.03,
+                  low1d: 1.01,
+                  circulatingSupply: 30e9,
+                  dilutedMarketCap: 30e9,
+                  marketCapPercentChange1d: 0.5,
+                  priceChange1d: 0.01,
+                  pricePercentChange1h: 0.1,
+                  pricePercentChange1d: 0.5,
+                  pricePercentChange7d: 1,
+                  pricePercentChange14d: 1.5,
+                  pricePercentChange30d: 2,
+                  pricePercentChange200d: 3,
+                  pricePercentChange1y: 5,
+                },
+              },
+            },
+          },
+        },
+      };
+      const result = getMultichainAssetsRatesControllerConversionRates(state);
+
+      expect(result[nativeEthAssetId]).toBeUndefined();
+      expect(result[solanaTokenAssetId]).toStrictEqual({
+        rate: '1.02',
+        conversionTime: lastUpdated,
+        expirationTime: undefined,
+        marketData: {
+          fungible: true,
+          allTimeHigh: '1.1',
+          allTimeLow: '0.95',
+          circulatingSupply: '30000000000',
+          marketCap: '30000000000',
+          totalVolume: '100000000000',
+          pricePercentChange: {
+            PT1H: 0.1,
+            P1D: 0.5,
+            P7D: 1,
+            P14D: 1.5,
+            P30D: 2,
+            P200D: 3,
+            P1Y: 5,
+          },
+        },
+      });
+    });
+  });
+
+  describe('edge cases when enabled', () => {
+    it('returns empty result when only EVM assets exist in assetsPrice', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsRatesController: { conversionRates: {} },
+            AssetsController: {
+              assetsPrice: {
+                [nativeEthAssetId]: makeMockPrice({ id: 'eth', price: 2000 }),
+                [erc20AssetId]: makeMockPrice({ id: 'usdc', price: 1 }),
+              },
+            },
+          },
+        },
+      };
+      const result = getMultichainAssetsRatesControllerConversionRates(state);
+
+      expect(result).toStrictEqual({});
+    });
+
+    it('converts all market data fields to strings', () => {
+      const lastUpdated = 1700000000000;
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsRatesController: { conversionRates: {} },
+            AssetsController: {
+              assetsPrice: {
+                [solanaTokenAssetId]: makeMockPrice({
+                  id: 'sol-usdc',
+                  price: 1.5,
+                  lastUpdated,
+                  allTimeHigh: 2.0,
+                  allTimeLow: 0.8,
+                  circulatingSupply: 1e9,
+                  marketCap: 1.5e9,
+                  totalVolume: 5e8,
+                }),
+              },
+            },
+          },
+        },
+      };
+      const result = getMultichainAssetsRatesControllerConversionRates(state);
+
+      const entry = result[solanaTokenAssetId];
+      expect(entry.rate).toBe('1.5');
+      expect(entry.conversionTime).toBe(lastUpdated);
+      expect(entry.expirationTime).toBeUndefined();
+      expect(entry.marketData?.allTimeHigh).toBe('2');
+      expect(entry.marketData?.allTimeLow).toBe('0.8');
+      expect(entry.marketData?.circulatingSupply).toBe('1000000000');
+      expect(entry.marketData?.marketCap).toBe('1500000000');
+      expect(entry.marketData?.totalVolume).toBe('500000000');
+    });
+
+    it('handles empty assetsPrice', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            ...enabledFeatureFlagControllerState,
+            MultichainAssetsRatesController: { conversionRates: {} },
+            AssetsController: {
+              assetsPrice: {},
+            },
+          },
+        },
+      };
+      const result = getMultichainAssetsRatesControllerConversionRates(state);
+
+      expect(result).toStrictEqual({});
+    });
+  });
+});
diff --git a/app/selectors/assets/assets-migration.ts b/app/selectors/assets/assets-migration.ts
new file mode 100644
index 00000000000..22a040c125f
--- /dev/null
+++ b/app/selectors/assets/assets-migration.ts
@@ -0,0 +1,834 @@
+import { createDeepEqualSelector } from '../util';
+import { selectIsAssetsUnifyStateEnabled } from '../featureFlagController/assetsUnifyState';
+import {
+  type AccountTrackerControllerState,
+  type CurrencyRateState,
+  type MarketDataDetails,
+  type MultichainAssetsControllerState,
+  type MultichainAssetsRatesControllerState,
+  type MultichainBalancesControllerState,
+  type Token,
+  type TokenBalancesControllerState,
+  type TokenRatesControllerState,
+  type TokensControllerState,
+  getNativeTokenAddress,
+} from '@metamask/assets-controllers';
+import { isEvmAccountType } from '@metamask/keyring-api';
+import { toChecksumHexAddress } from '@metamask/controller-utils';
+import {
+  bigIntToHex,
+  CaipAssetType,
+  Hex,
+  KnownCaipNamespace,
+  parseCaipAssetType,
+} from '@metamask/utils';
+import { decimalToPrefixedHex } from '../../util/conversions';
+import {
+  AssetsControllerState,
+  FungibleAssetPrice,
+} from '@metamask/assets-controller';
+import { AccountsControllerState } from '@metamask/accounts-controller';
+import { NetworkState } from '@metamask/network-controller';
+
+// ChainId (hex) -> AccountAddress (hex checksummed) -> Balance (hex)
+export const getAccountTrackerControllerAccountsByChainId =
+  createDeepEqualSelector(
+    [
+      selectIsAssetsUnifyStateEnabled,
+      (state) =>
+        state.engine?.backgroundState?.AccountTrackerController
+          ?.accountsByChainId ?? {},
+      (state) =>
+        state.engine?.backgroundState?.AssetsController?.assetsBalance ?? {},
+      (state) =>
+        state.engine?.backgroundState?.AssetsController?.assetsInfo ?? {},
+      (state) =>
+        state.engine?.backgroundState?.AccountsController?.internalAccounts
+          ?.accounts ?? {},
+    ],
+    (
+      isAssetsUnifyStateEnabled: boolean,
+      accountsByChainId: AccountTrackerControllerState['accountsByChainId'],
+      assetsBalance: AssetsControllerState['assetsBalance'],
+      assetsInfo: AssetsControllerState['assetsInfo'],
+      internalAccountsById: AccountsControllerState['internalAccounts']['accounts'],
+    ): AccountTrackerControllerState['accountsByChainId'] => {
+      if (!isAssetsUnifyStateEnabled) {
+        return accountsByChainId;
+      }
+
+      const result: AccountTrackerControllerState['accountsByChainId'] = {};
+
+      for (const [accountId, accountBalances] of Object.entries(
+        assetsBalance,
+      )) {
+        const internalAccount = internalAccountsById[accountId];
+        if (!internalAccount || !isEvmAccountType(internalAccount.type)) {
+          continue;
+        }
+
+        const checksummedAddress = toChecksumHexAddress(
+          internalAccount.address,
+        );
+
+        for (const [assetId, balanceData] of Object.entries(accountBalances)) {
+          const metadata = assetsInfo[assetId];
+          if (metadata?.type !== 'native') {
+            continue;
+          }
+
+          const { chain: parsedChain } = parseCaipAssetType(
+            assetId as CaipAssetType,
+          );
+
+          // No need to check if the chain is EVM, we already filtered out non-EVM accounts
+          const hexChainId = decimalToPrefixedHex(parsedChain.reference);
+          const amount = balanceData?.amount ?? '0';
+
+          result[hexChainId] ??= {};
+          result[hexChainId][checksummedAddress] = {
+            // TODO: Use raw value from state when available
+            balance: parseBalanceWithDecimals(amount, metadata.decimals),
+            // TODO: Add staked balance when available
+          };
+        }
+      }
+
+      return result;
+    },
+  );
+
+// ChainId (hex) -> AccountAddress (hex lowercase) -> Array of Tokens
+export const getTokensControllerAllTokens = createDeepEqualSelector(
+  [
+    selectIsAssetsUnifyStateEnabled,
+    (state) => state.engine?.backgroundState?.TokensController?.allTokens ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.assetsInfo ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.assetsBalance ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.customAssets ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AccountsController?.internalAccounts
+        ?.accounts ?? {},
+  ],
+  (
+    isAssetsUnifyStateEnabled: boolean,
+    allTokens: TokensControllerState['allTokens'],
+    assetsInfo: AssetsControllerState['assetsInfo'],
+    assetsBalance: AssetsControllerState['assetsBalance'],
+    customAssets: AssetsControllerState['customAssets'],
+    internalAccountsById: AccountsControllerState['internalAccounts']['accounts'],
+  ): TokensControllerState['allTokens'] => {
+    if (!isAssetsUnifyStateEnabled) {
+      return allTokens;
+    }
+
+    const result: TokensControllerState['allTokens'] = {};
+
+    // Merge assetsBalance and customAssets: accountId -> assetId[]
+    const allAssets = Object.fromEntries(
+      [
+        ...new Set([
+          ...Object.keys(assetsBalance),
+          ...Object.keys(customAssets),
+        ]),
+      ].map((accountId) => {
+        const fromBalance = Object.keys(assetsBalance[accountId] ?? {});
+        const fromCustom = customAssets[accountId] ?? [];
+        return [
+          accountId,
+          [...new Set([...fromBalance, ...fromCustom])] as CaipAssetType[],
+        ];
+      }),
+    );
+
+    for (const [accountId, assetIds] of Object.entries(allAssets)) {
+      const internalAccount = internalAccountsById[accountId];
+      if (!internalAccount || !isEvmAccountType(internalAccount.type)) {
+        continue;
+      }
+
+      for (const assetId of assetIds) {
+        const metadata = assetsInfo[assetId];
+        if (!metadata || metadata.type === 'native') {
+          continue;
+        }
+
+        const assetType = parseCaipAssetType(assetId);
+
+        // No need to check if the chain is EVM, we already filtered out non-EVM accounts
+        const hexChainId = decimalToPrefixedHex(
+          assetType.chain.reference,
+        ) as Hex;
+        const assetAddress = toChecksumHexAddress(assetType.assetReference);
+
+        const token: Token = {
+          address: assetAddress,
+          symbol: metadata.symbol,
+          decimals: metadata.decimals,
+          name: metadata.name,
+          image: metadata.image,
+        };
+
+        result[hexChainId] ??= {};
+        result[hexChainId][internalAccount.address] ??= [];
+        result[hexChainId][internalAccount.address].push(token);
+      }
+    }
+
+    return result;
+  },
+);
+
+// ChainId (hex) -> AccountAddress (hex lowercase) -> Array of TokenAddress (hex lowercase)
+export const getTokensControllerAllIgnoredTokens = createDeepEqualSelector(
+  [
+    selectIsAssetsUnifyStateEnabled,
+    (state) =>
+      state.engine?.backgroundState?.TokensController?.allIgnoredTokens ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.assetPreferences ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AccountsController?.internalAccounts
+        ?.accounts ?? {},
+  ],
+  (
+    isAssetsUnifyStateEnabled: boolean,
+    allIgnoredTokens: TokensControllerState['allIgnoredTokens'],
+    assetPreferences: AssetsControllerState['assetPreferences'],
+    internalAccountsById: AccountsControllerState['internalAccounts']['accounts'],
+  ): TokensControllerState['allIgnoredTokens'] => {
+    if (!isAssetsUnifyStateEnabled) {
+      return allIgnoredTokens;
+    }
+
+    const result: TokensControllerState['allIgnoredTokens'] = {};
+
+    for (const [assetId, { hidden }] of Object.entries(assetPreferences)) {
+      if (!hidden) {
+        continue;
+      }
+
+      const assetType = parseCaipAssetType(assetId as CaipAssetType);
+      if (assetType.chain.namespace !== KnownCaipNamespace.Eip155) {
+        continue;
+      }
+
+      const hexChainId = decimalToPrefixedHex(assetType.chain.reference) as Hex;
+
+      // The asset is hidden for all EVM accounts
+      for (const internalAccount of Object.values(internalAccountsById)) {
+        if (!isEvmAccountType(internalAccount.type)) {
+          continue;
+        }
+
+        result[hexChainId] ??= {};
+        result[hexChainId][internalAccount.address] ??= [];
+        result[hexChainId][internalAccount.address].push(
+          assetType.assetReference,
+        );
+      }
+    }
+
+    return result;
+  },
+);
+
+// AcountAddress (hex lowercase) -> ChainId (hex) -> TokenAddress (hex checksummed) -> Balance (hex)
+export const getTokenBalancesControllerTokenBalances = createDeepEqualSelector(
+  [
+    selectIsAssetsUnifyStateEnabled,
+    (state) =>
+      state.engine?.backgroundState?.TokenBalancesController?.tokenBalances ??
+      {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.assetsInfo ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.assetsBalance ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.customAssets ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AccountsController?.internalAccounts
+        ?.accounts ?? {},
+  ],
+  (
+    isAssetsUnifyStateEnabled: boolean,
+    tokenBalances: TokenBalancesControllerState['tokenBalances'],
+    assetsInfo: AssetsControllerState['assetsInfo'],
+    assetsBalance: AssetsControllerState['assetsBalance'],
+    customAssets: AssetsControllerState['customAssets'],
+    internalAccountsById: AccountsControllerState['internalAccounts']['accounts'],
+  ): TokenBalancesControllerState['tokenBalances'] => {
+    if (!isAssetsUnifyStateEnabled) {
+      return tokenBalances;
+    }
+
+    const result: TokenBalancesControllerState['tokenBalances'] = {};
+    for (const [accountId, chainIdBalances] of Object.entries(assetsBalance)) {
+      const internalAccount = internalAccountsById[accountId];
+      if (!internalAccount || !isEvmAccountType(internalAccount.type)) {
+        continue;
+      }
+
+      const accountAddress = internalAccount.address as Hex;
+      result[accountAddress] ??= {};
+
+      for (const [assetId, assetBalance] of Object.entries(chainIdBalances)) {
+        const metadata = assetsInfo[assetId];
+        if (!metadata) {
+          continue;
+        }
+
+        const assetType = parseCaipAssetType(assetId as CaipAssetType);
+
+        const hexChainId = decimalToPrefixedHex(
+          assetType.chain.reference,
+        ) as Hex;
+        const assetAddress = toChecksumHexAddress(
+          metadata.type === 'native'
+            ? getNativeTokenAddress(hexChainId)
+            : assetType.assetReference,
+        ) as Hex;
+
+        result[accountAddress][hexChainId] ??= {};
+        result[accountAddress][hexChainId][assetAddress] =
+          // TODO: Use raw value from state when available
+          parseBalanceWithDecimals(assetBalance.amount, metadata.decimals);
+      }
+    }
+
+    // Custom EVM tokens may have metadata (assetsInfo) but no balance
+    // in assetsBalance yet (the async fetch hasn't completed).  Add a
+    // zero-balance placeholder so selectAllEvmAssets doesn't filter them out.
+    for (const [accountId, assetIds] of Object.entries(customAssets)) {
+      const internalAccount = internalAccountsById[accountId];
+      if (!internalAccount || !isEvmAccountType(internalAccount.type)) {
+        continue;
+      }
+
+      const accountAddress = internalAccount.address as Hex;
+      result[accountAddress] ??= {};
+      const accountBalances = assetsBalance[accountId] ?? {};
+
+      for (const assetId of assetIds) {
+        if (accountBalances[assetId]) {
+          continue;
+        }
+
+        const metadata = assetsInfo[assetId];
+        if (!metadata || metadata.type === 'native') {
+          continue;
+        }
+
+        const assetType = parseCaipAssetType(assetId);
+
+        if (assetType.chain.namespace !== KnownCaipNamespace.Eip155) {
+          continue;
+        }
+
+        const hexChainId = decimalToPrefixedHex(
+          assetType.chain.reference,
+        ) as Hex;
+        const assetAddress = toChecksumHexAddress(
+          assetType.assetReference,
+        ) as Hex;
+
+        if (!result[accountAddress]?.[hexChainId]?.[assetAddress]) {
+          result[accountAddress][hexChainId] ??= {};
+          result[accountAddress][hexChainId][assetAddress] =
+            parseBalanceWithDecimals('0', metadata.decimals);
+        }
+      }
+    }
+
+    return result;
+  },
+);
+
+// AccountId -> Array of AssetIds
+export const getMultiChainAssetsControllerAccountsAssets =
+  createDeepEqualSelector(
+    [
+      selectIsAssetsUnifyStateEnabled,
+      (state) =>
+        state.engine?.backgroundState?.MultichainAssetsController
+          ?.accountsAssets ?? {},
+      (state) =>
+        state.engine?.backgroundState?.AssetsController?.assetsBalance ?? {},
+      (state) =>
+        state.engine?.backgroundState?.AssetsController?.customAssets ?? {},
+      (state) =>
+        state.engine?.backgroundState?.AccountsController?.internalAccounts
+          ?.accounts ?? {},
+    ],
+    (
+      isAssetsUnifyStateEnabled: boolean,
+      accountsAssets: MultichainAssetsControllerState['accountsAssets'],
+      assetsBalance: AssetsControllerState['assetsBalance'],
+      customAssets: AssetsControllerState['customAssets'],
+      internalAccountsById: AccountsControllerState['internalAccounts']['accounts'],
+    ): MultichainAssetsControllerState['accountsAssets'] => {
+      if (!isAssetsUnifyStateEnabled) {
+        return accountsAssets;
+      }
+
+      const result: MultichainAssetsControllerState['accountsAssets'] = {};
+
+      // Merge assetsBalance and customAssets: accountId -> assetId[]
+      const allAssets = Object.fromEntries(
+        [
+          ...new Set([
+            ...Object.keys(assetsBalance),
+            ...Object.keys(customAssets),
+          ]),
+        ].map((accountId) => {
+          const fromBalance = Object.keys(assetsBalance[accountId] ?? {});
+          const fromCustom = customAssets[accountId] ?? [];
+          return [
+            accountId,
+            [...new Set([...fromBalance, ...fromCustom])] as CaipAssetType[],
+          ];
+        }),
+      );
+
+      for (const [accountId, assetIds] of Object.entries(allAssets)) {
+        const internalAccount = internalAccountsById[accountId];
+        if (!internalAccount || isEvmAccountType(internalAccount.type)) {
+          continue;
+        }
+
+        result[accountId] = [];
+
+        for (const assetId of assetIds) {
+          const assetType = parseCaipAssetType(assetId);
+          if (assetType.chain.namespace === KnownCaipNamespace.Eip155) {
+            continue;
+          }
+
+          result[accountId].push(assetId);
+        }
+      }
+
+      return result;
+    },
+  );
+
+// TODO There are issues with the new image url not matching the one in assetsMetadata iconUrl
+// AssetId -> AssetMetadata
+export const getMultiChainAssetsControllerAssetsMetadata =
+  createDeepEqualSelector(
+    [
+      selectIsAssetsUnifyStateEnabled,
+      (state) =>
+        state.engine?.backgroundState?.MultichainAssetsController
+          ?.assetsMetadata ?? {},
+      (state) =>
+        state.engine?.backgroundState?.AssetsController?.assetsInfo ?? {},
+    ],
+    (
+      isAssetsUnifyStateEnabled: boolean,
+      assetsMetadata: MultichainAssetsControllerState['assetsMetadata'],
+      assetsInfo: AssetsControllerState['assetsInfo'],
+    ): MultichainAssetsControllerState['assetsMetadata'] => {
+      if (!isAssetsUnifyStateEnabled) {
+        return assetsMetadata;
+      }
+
+      const result: MultichainAssetsControllerState['assetsMetadata'] = {};
+
+      for (const [assetId, metadata] of Object.entries(assetsInfo)) {
+        const assetType = parseCaipAssetType(assetId as CaipAssetType);
+        if (assetType.chain.namespace === KnownCaipNamespace.Eip155) {
+          continue;
+        }
+
+        result[assetId as CaipAssetType] = {
+          fungible: true,
+          iconUrl: metadata.image ?? '',
+          units: [
+            {
+              decimals: metadata.decimals,
+              symbol: metadata.symbol,
+              name: metadata.name,
+            },
+          ],
+          symbol: metadata.symbol,
+          name: metadata.name,
+        };
+      }
+
+      return result;
+    },
+  );
+
+// AccountId -> Array of AssetIds
+export const getMultiChainAssetsControllerAllIgnoredAssets =
+  createDeepEqualSelector(
+    [
+      selectIsAssetsUnifyStateEnabled,
+      (state) =>
+        state.engine?.backgroundState?.MultichainAssetsController
+          ?.allIgnoredAssets ?? {},
+      (state) =>
+        state.engine?.backgroundState?.AssetsController?.assetPreferences ?? {},
+      (state) =>
+        state.engine?.backgroundState?.AccountsController?.internalAccounts
+          ?.accounts ?? {},
+    ],
+    (
+      isAssetsUnifyStateEnabled: boolean,
+      allIgnoredAssets: MultichainAssetsControllerState['allIgnoredAssets'],
+      assetPreferences: AssetsControllerState['assetPreferences'],
+      internalAccountsById: AccountsControllerState['internalAccounts']['accounts'],
+    ): MultichainAssetsControllerState['allIgnoredAssets'] => {
+      if (!isAssetsUnifyStateEnabled) {
+        return allIgnoredAssets;
+      }
+
+      const result: MultichainAssetsControllerState['allIgnoredAssets'] = {};
+
+      for (const accountId of Object.keys(internalAccountsById)) {
+        const internalAccount = internalAccountsById[accountId];
+        if (!internalAccount || isEvmAccountType(internalAccount.type)) {
+          continue;
+        }
+
+        result[accountId] = [];
+
+        for (const [assetId, { hidden }] of Object.entries(assetPreferences)) {
+          if (!hidden) {
+            continue;
+          }
+
+          const assetType = parseCaipAssetType(assetId as CaipAssetType);
+          if (assetType.chain.namespace === KnownCaipNamespace.Eip155) {
+            continue;
+          }
+
+          result[accountId].push(assetId as CaipAssetType);
+        }
+      }
+
+      return result;
+    },
+  );
+
+// AccountId -> AssetId -> Balance (amount + unit)
+export const getMultiChainBalancesControllerBalances = createDeepEqualSelector(
+  [
+    selectIsAssetsUnifyStateEnabled,
+    (state) =>
+      state.engine?.backgroundState?.MultichainBalancesController?.balances ??
+      {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.assetsBalance ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.assetsInfo ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AccountsController?.internalAccounts
+        ?.accounts ?? {},
+  ],
+  (
+    isAssetsUnifyStateEnabled: boolean,
+    balances: MultichainBalancesControllerState['balances'],
+    assetsBalance: AssetsControllerState['assetsBalance'],
+    assetsInfo: AssetsControllerState['assetsInfo'],
+    internalAccountsById: AccountsControllerState['internalAccounts']['accounts'],
+  ): MultichainBalancesControllerState['balances'] => {
+    if (!isAssetsUnifyStateEnabled) {
+      return balances;
+    }
+
+    const result: MultichainBalancesControllerState['balances'] = {};
+
+    for (const [accountId, chainIdBalances] of Object.entries(assetsBalance)) {
+      const internalAccount = internalAccountsById[accountId];
+      if (!internalAccount || isEvmAccountType(internalAccount.type)) {
+        continue;
+      }
+
+      result[accountId] = {};
+
+      for (const [assetId, balance] of Object.entries(chainIdBalances)) {
+        const assetType = parseCaipAssetType(assetId as CaipAssetType);
+        const metadata = assetsInfo[assetId];
+
+        if (
+          !metadata ||
+          assetType.chain.namespace === KnownCaipNamespace.Eip155
+        ) {
+          continue;
+        }
+
+        result[accountId][assetId] = {
+          amount: balance.amount,
+          unit: metadata.symbol,
+        };
+      }
+    }
+
+    return result;
+  },
+);
+
+export const getCurrencyRateControllerCurrentCurrency = createDeepEqualSelector(
+  [
+    selectIsAssetsUnifyStateEnabled,
+    (state) =>
+      state.engine?.backgroundState?.CurrencyRateController?.currentCurrency,
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.selectedCurrency,
+  ],
+  (
+    isAssetsUnifyStateEnabled: boolean,
+    currentCurrency: CurrencyRateState['currentCurrency'],
+    selectedCurrency: AssetsControllerState['selectedCurrency'],
+  ): CurrencyRateState['currentCurrency'] => {
+    if (!isAssetsUnifyStateEnabled) {
+      return currentCurrency;
+    }
+
+    return selectedCurrency;
+  },
+);
+
+// Native Symbol -> Rates (conversionRate, usdConversionRate, conversionDate)
+export const getCurrencyRateControllerCurrencyRates = createDeepEqualSelector(
+  [
+    selectIsAssetsUnifyStateEnabled,
+    (state) =>
+      state.engine?.backgroundState?.CurrencyRateController?.currencyRates ??
+      {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.assetsInfo ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.assetsPrice ?? {},
+  ],
+  (
+    isAssetsUnifyStateEnabled: boolean,
+    currencyRates: CurrencyRateState['currencyRates'],
+    assetsInfo: AssetsControllerState['assetsInfo'],
+    assetsPrice: AssetsControllerState['assetsPrice'],
+  ): CurrencyRateState['currencyRates'] => {
+    if (!isAssetsUnifyStateEnabled) {
+      return currencyRates;
+    }
+
+    const result: CurrencyRateState['currencyRates'] = {};
+
+    // Sorting just to ensure that we process mainnet (eip155:1) first
+    for (const [assetId, metadata] of Object.entries(assetsInfo).sort((a, b) =>
+      a[0].localeCompare(b[0]),
+    )) {
+      // Skip if we already have an entry for this symbol
+      if (result[metadata.symbol]) {
+        continue;
+      }
+
+      const assetType = parseCaipAssetType(assetId as CaipAssetType);
+
+      // Skip if not a native asset or not evm
+      if (
+        metadata.type !== 'native' ||
+        assetType.chain.namespace !== KnownCaipNamespace.Eip155
+      ) {
+        continue;
+      }
+
+      const price = assetsPrice[assetId];
+
+      if (price?.assetPriceType !== 'fungible') {
+        continue;
+      }
+
+      result[metadata.symbol] = {
+        conversionDate: price.lastUpdated / 1000,
+        conversionRate: price.price,
+        usdConversionRate: price.usdPrice,
+      };
+    }
+
+    return result;
+  },
+);
+
+// ChainId (hex) -> TokenAddress (hex checksummed) -> MarketData
+export const getTokenRatesControllerMarketData = createDeepEqualSelector(
+  [
+    selectIsAssetsUnifyStateEnabled,
+    (state) =>
+      state.engine?.backgroundState?.TokenRatesController?.marketData ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.assetsPrice ?? {},
+    (state) =>
+      state.engine?.backgroundState?.AssetsController?.assetsInfo ?? {},
+    getCurrencyRateControllerCurrencyRates,
+    (state) =>
+      state.engine?.backgroundState?.NetworkController
+        ?.networkConfigurationsByChainId ?? {},
+  ],
+  (
+    isAssetsUnifyStateEnabled: boolean,
+    marketData: TokenRatesControllerState['marketData'],
+    assetsPrice: AssetsControllerState['assetsPrice'],
+    assetsInfo: AssetsControllerState['assetsInfo'],
+    currencyRates: CurrencyRateState['currencyRates'],
+    networkConfigurationsByChainId: NetworkState['networkConfigurationsByChainId'],
+  ): TokenRatesControllerState['marketData'] => {
+    if (!isAssetsUnifyStateEnabled) {
+      return marketData;
+    }
+
+    const result: TokenRatesControllerState['marketData'] = {};
+
+    for (const [assetId, price] of Object.entries(assetsPrice) as [
+      CaipAssetType,
+      FungibleAssetPrice, // TODO: A type discriminator to AssetPrice is needed to be added to avoid this cast, but it is safe for now
+    ][]) {
+      const assetType = parseCaipAssetType(assetId);
+
+      if (assetType.chain.namespace !== KnownCaipNamespace.Eip155) {
+        continue;
+      }
+
+      const metadata = assetsInfo[assetId];
+      if (!metadata) {
+        continue;
+      }
+
+      const hexChainId = decimalToPrefixedHex(assetType.chain.reference) as Hex;
+      const nativeAssetSymbol =
+        networkConfigurationsByChainId[hexChainId]?.nativeCurrency ?? 'NATIVE';
+
+      const assetAddress = toChecksumHexAddress(
+        metadata.type === 'native'
+          ? getNativeTokenAddress(hexChainId)
+          : assetType.assetReference,
+      ) as Hex;
+
+      const nativeCurrencyRate =
+        currencyRates[nativeAssetSymbol]?.conversionRate;
+      if (!nativeCurrencyRate) {
+        continue;
+      }
+
+      const convertToNativeCurrency = (amount: number | undefined) =>
+        amount === undefined ? undefined : amount / nativeCurrencyRate;
+
+      result[hexChainId] ??= {};
+      result[hexChainId][assetAddress] = {
+        id: price.id,
+        price: convertToNativeCurrency(price.price),
+        marketCap: convertToNativeCurrency(price.marketCap),
+        allTimeHigh: convertToNativeCurrency(price.allTimeHigh),
+        allTimeLow: convertToNativeCurrency(price.allTimeLow),
+        totalVolume: convertToNativeCurrency(price.totalVolume),
+        high1d: convertToNativeCurrency(price.high1d),
+        low1d: convertToNativeCurrency(price.low1d),
+        circulatingSupply: price.circulatingSupply,
+        dilutedMarketCap: convertToNativeCurrency(price.dilutedMarketCap),
+        marketCapPercentChange1d: price.marketCapPercentChange1d,
+        priceChange1d: price.priceChange1d,
+        pricePercentChange1h: price.pricePercentChange1h,
+        pricePercentChange1d: price.pricePercentChange1d,
+        pricePercentChange7d: price.pricePercentChange7d,
+        pricePercentChange14d: price.pricePercentChange14d,
+        pricePercentChange30d: price.pricePercentChange30d,
+        pricePercentChange200d: price.pricePercentChange200d,
+        pricePercentChange1y: price.pricePercentChange1y,
+        chainId: hexChainId,
+        tokenAddress: assetAddress,
+        assetId,
+        currency: nativeAssetSymbol,
+      } as MarketDataDetails;
+    }
+
+    return result;
+  },
+);
+
+export const getMultichainAssetsRatesControllerConversionRates =
+  createDeepEqualSelector(
+    [
+      selectIsAssetsUnifyStateEnabled,
+      (state) =>
+        state.engine?.backgroundState?.MultichainAssetsRatesController
+          ?.conversionRates ?? {},
+      (state) =>
+        state.engine?.backgroundState?.AssetsController?.assetsPrice ?? {},
+    ],
+    (
+      isAssetsUnifyStateEnabled: boolean,
+      conversionRates: MultichainAssetsRatesControllerState['conversionRates'],
+      assetsPrice: AssetsControllerState['assetsPrice'],
+    ): MultichainAssetsRatesControllerState['conversionRates'] => {
+      if (!isAssetsUnifyStateEnabled) {
+        return conversionRates;
+      }
+
+      const result: MultichainAssetsRatesControllerState['conversionRates'] =
+        {};
+
+      for (const [assetId, assetPrice] of Object.entries(assetsPrice) as [
+        CaipAssetType,
+        FungibleAssetPrice, // TODO: A type discriminator to AssetPrice is needed to be added to avoid this cast, but it is safe for now
+      ][]) {
+        const assetType = parseCaipAssetType(assetId);
+        if (assetType.chain.namespace === KnownCaipNamespace.Eip155) {
+          continue;
+        }
+
+        result[assetId] = {
+          rate: `${assetPrice.price}`,
+          conversionTime: assetPrice.lastUpdated,
+          expirationTime: undefined,
+          marketData: {
+            fungible: true,
+            allTimeHigh: `${assetPrice.allTimeHigh}`,
+            allTimeLow: `${assetPrice.allTimeLow}`,
+            circulatingSupply: `${assetPrice.circulatingSupply}`,
+            marketCap: `${assetPrice.marketCap}`,
+            totalVolume: `${assetPrice.totalVolume}`,
+            pricePercentChange: {
+              PT1H: assetPrice.pricePercentChange1h as number,
+              P1D: assetPrice.pricePercentChange1d as number,
+              P7D: assetPrice.pricePercentChange7d as number,
+              P14D: assetPrice.pricePercentChange14d as number,
+              P30D: assetPrice.pricePercentChange30d as number,
+              P200D: assetPrice.pricePercentChange200d as number,
+              P1Y: assetPrice.pricePercentChange1y as number,
+            },
+          },
+        };
+      }
+
+      return result;
+    },
+  );
+
+function parseBalanceWithDecimals(
+  balanceString: string,
+  decimals: number,
+): Hex {
+  const [integerPart, fractionalPart = ''] = balanceString.split('.');
+
+  if (decimals === 0) {
+    return bigIntToHex(BigInt(integerPart));
+  }
+
+  if (fractionalPart.length >= decimals) {
+    return bigIntToHex(
+      BigInt(`${integerPart}${fractionalPart.slice(0, decimals)}`),
+    );
+  }
+
+  return bigIntToHex(
+    BigInt(
+      `${integerPart}${fractionalPart}${'0'.repeat(
+        decimals - fractionalPart.length,
+      )}`,
+    ),
+  );
+}
diff --git a/app/selectors/bridge.test.ts b/app/selectors/bridge.test.ts
index 6a2a2b958e4..2115dc87976 100644
--- a/app/selectors/bridge.test.ts
+++ b/app/selectors/bridge.test.ts
@@ -209,6 +209,46 @@ describe('bridge selectors', () => {
       expect(result).toEqual({ gasIncluded: false, gasIncluded7702: false });
     });
 
+    it('returns gasIncluded true with 7702 false for Solana source token regardless of STX and 7702 flags', () => {
+      const solanaToken = {
+        ...mockToken,
+        chainId:
+          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' as `${string}:${string}`,
+      };
+      const mockState = {
+        bridge: {
+          ...initialState,
+          sourceToken: solanaToken,
+          isGasIncludedSTXSendBundleSupported: false,
+          isGasIncluded7702Supported: false,
+        },
+      } as unknown as RootState;
+
+      const result = selectGasIncludedQuoteParams(mockState);
+
+      expect(result).toEqual({ gasIncluded: true, gasIncluded7702: false });
+    });
+
+    it('returns gasIncluded true with 7702 false for Solana when STX send bundle is supported', () => {
+      const solanaToken = {
+        ...mockToken,
+        chainId:
+          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' as `${string}:${string}`,
+      };
+      const mockState = {
+        bridge: {
+          ...initialState,
+          sourceToken: solanaToken,
+          isGasIncludedSTXSendBundleSupported: true,
+          isGasIncluded7702Supported: true,
+        },
+      } as unknown as RootState;
+
+      const result = selectGasIncludedQuoteParams(mockState);
+
+      expect(result).toEqual({ gasIncluded: true, gasIncluded7702: false });
+    });
+
     it('STX send bundle takes priority over bridge flag', () => {
       jest
         .mocked(getGaslessBridgeWith7702EnabledForChain)
diff --git a/app/selectors/bridge.ts b/app/selectors/bridge.ts
index d219963a061..493cf8617a1 100644
--- a/app/selectors/bridge.ts
+++ b/app/selectors/bridge.ts
@@ -3,6 +3,7 @@ import {
   formatChainIdToCaip,
   isNonEvmChainId,
   formatChainIdToHex,
+  isSolanaChainId,
 } from '@metamask/bridge-controller';
 import { selectSelectedInternalAccountByScope } from './multichainAccounts/accounts';
 import { RootState } from '../reducers';
@@ -79,17 +80,24 @@ export const selectIsGasIncluded7702BridgeEnabled = (
  */
 export const selectGasIncludedQuoteParams = createSelector(
   [
+    selectSourceToken,
     selectIsSwap,
     selectIsGasIncludedSTXSendBundleSupported,
     selectIsGasIncluded7702Supported,
     selectIsGasIncluded7702BridgeEnabled,
   ],
   (
+    sourceToken,
     isSwap,
     gasIncludedSTXSendBundleSupport,
     gasIncluded7702Support,
     gasIncluded7702BridgeEnabled,
   ) => {
+    // Enable gas-included swaps for solana
+    if (sourceToken?.chainId && isSolanaChainId(sourceToken.chainId)) {
+      return { gasIncluded: true, gasIncluded7702: false };
+    }
+
     if (gasIncludedSTXSendBundleSupport) {
       return { gasIncluded: true, gasIncluded7702: false };
     }
diff --git a/app/selectors/bridgeController/index.ts b/app/selectors/bridgeController/index.ts
index 1666dde1fb8..e72ced8f346 100644
--- a/app/selectors/bridgeController/index.ts
+++ b/app/selectors/bridgeController/index.ts
@@ -6,6 +6,12 @@ import {
 } from '@metamask/bridge-controller';
 import { selectRemoteFeatureFlags } from '../featureFlagController';
 import { analytics } from '../../util/analytics/analytics';
+import {
+  getCurrencyRateControllerCurrencyRates,
+  getCurrencyRateControllerCurrentCurrency,
+  getMultichainAssetsRatesControllerConversionRates,
+  getTokenRatesControllerMarketData,
+} from '../assets/assets-migration';
 
 export const selectBridgeControllerState = (state: RootState) =>
   state.engine.backgroundState.BridgeController;
@@ -22,9 +28,17 @@ export const selectBridgeAppState = (state: RootState) => ({
   gasFeeEstimatesByChainId:
     state.engine.backgroundState.GasFeeController.gasFeeEstimatesByChainId ??
     {},
-  ...state.engine.backgroundState.MultichainAssetsRatesController,
-  ...state.engine.backgroundState.TokenRatesController,
-  ...state.engine.backgroundState.CurrencyRateController,
+  ...{
+    conversionRates: getMultichainAssetsRatesControllerConversionRates(state),
+    historicalPrices: {},
+  },
+  ...{
+    marketData: getTokenRatesControllerMarketData(state),
+  },
+  ...{
+    currencyRates: getCurrencyRateControllerCurrencyRates(state),
+    currentCurrency: getCurrencyRateControllerCurrentCurrency(state),
+  },
   participateInMetaMetrics: analytics.isEnabled(),
   remoteFeatureFlags: {
     bridgeConfig: selectRemoteFeatureFlags(state).bridgeConfig,
diff --git a/app/selectors/currencyRateController.test.ts b/app/selectors/currencyRateController.test.ts
index 8a6bf2fd2d1..1ae39cc6c65 100644
--- a/app/selectors/currencyRateController.test.ts
+++ b/app/selectors/currencyRateController.test.ts
@@ -1,7 +1,5 @@
 import {
   selectConversionRate,
-  selectCurrentCurrency,
-  selectCurrencyRates,
   selectConversionRateByChainId,
   selectCurrencyRateForChainId,
   selectUSDConversionRateByChainId,
@@ -20,8 +18,16 @@ jest.mock('../../app/util/networks', () => ({
 describe('CurrencyRateController Selectors', () => {
   const mockCurrencyRateState = {
     currencyRates: {
-      ETH: { conversionRate: 3000, usdConversionRate: 3000 },
-      BTC: { conversionRate: 60000, usdConversionRate: 60000 },
+      ETH: {
+        conversionRate: 3000,
+        usdConversionRate: 3000,
+        conversionDate: Date.now(),
+      },
+      BTC: {
+        conversionRate: 60000,
+        usdConversionRate: 60000,
+        conversionDate: Date.now(),
+      },
     },
     currentCurrency: 'USD',
   };
@@ -38,7 +44,7 @@ describe('CurrencyRateController Selectors', () => {
       (isTestNet as jest.Mock).mockReturnValue(true);
 
       const result = selectConversionRate.resultFunc(
-        mockCurrencyRateState as unknown as CurrencyRateState,
+        mockCurrencyRateState.currencyRates,
         mockChainId as `0x${string}`,
         mockTicker,
         false,
@@ -50,7 +56,7 @@ describe('CurrencyRateController Selectors', () => {
       (isTestNet as jest.Mock).mockReturnValue(false);
 
       const result = selectConversionRate.resultFunc(
-        mockCurrencyRateState as unknown as CurrencyRateState,
+        mockCurrencyRateState.currencyRates,
         mockChainId as `0x${string}`,
         mockTicker,
         true,
@@ -62,7 +68,7 @@ describe('CurrencyRateController Selectors', () => {
       (isTestNet as jest.Mock).mockReturnValue(false);
 
       const result = selectConversionRate.resultFunc(
-        mockCurrencyRateState as unknown as CurrencyRateState,
+        mockCurrencyRateState.currencyRates,
         mockChainId as `0x${string}`,
         '',
         true,
@@ -108,38 +114,6 @@ describe('CurrencyRateController Selectors', () => {
     });
   });
 
-  describe('selectCurrentCurrency', () => {
-    it('returns the current currency from the state', () => {
-      const result = selectCurrentCurrency.resultFunc(
-        mockCurrencyRateState as unknown as CurrencyRateState,
-      );
-      expect(result).toBe('USD');
-    });
-
-    it('returns undefined if current currency is not set', () => {
-      const result = selectCurrentCurrency.resultFunc(
-        {} as unknown as CurrencyRateState,
-      );
-      expect(result).toBeUndefined();
-    });
-  });
-
-  describe('selectCurrencyRates', () => {
-    it('returns all conversion rates from the state', () => {
-      const result = selectCurrencyRates.resultFunc(
-        mockCurrencyRateState as unknown as CurrencyRateState,
-      );
-      expect(result).toStrictEqual(mockCurrencyRateState.currencyRates);
-    });
-
-    it('returns undefined if conversion rates are not set', () => {
-      const result = selectCurrencyRates.resultFunc(
-        {} as unknown as CurrencyRateState,
-      );
-      expect(result).toBeUndefined();
-    });
-  });
-
   describe('selectCurrencyRateForChainId', () => {
     beforeEach(() => {
       jest.clearAllMocks();
diff --git a/app/selectors/currencyRateController.ts b/app/selectors/currencyRateController.ts
index e325eff6dee..63319cf3a4a 100644
--- a/app/selectors/currencyRateController.ts
+++ b/app/selectors/currencyRateController.ts
@@ -8,19 +8,19 @@ import {
   selectNetworkConfigurationByChainId,
 } from './networkController';
 import { isTestNet } from '../../app/util/networks';
-import { createDeepEqualSelector } from './util';
 import { Hex } from '@metamask/utils';
-
-const selectCurrencyRateControllerState = (state: RootState) =>
-  state?.engine?.backgroundState?.CurrencyRateController;
+import {
+  getCurrencyRateControllerCurrentCurrency,
+  getCurrencyRateControllerCurrencyRates,
+} from './assets/assets-migration';
 
 export const selectConversionRate = createSelector(
-  selectCurrencyRateControllerState,
+  getCurrencyRateControllerCurrencyRates,
   selectEvmChainId,
   selectEvmTicker,
   (state: RootState) => state.settings.showFiatOnTestnets,
   (
-    currencyRateControllerState: CurrencyRateState,
+    currencyRates: CurrencyRateState['currencyRates'],
     chainId: string,
     ticker: string,
     showFiatOnTestnets,
@@ -28,21 +28,15 @@ export const selectConversionRate = createSelector(
     if (chainId && isTestNet(chainId) && !showFiatOnTestnets) {
       return undefined;
     }
-    return ticker
-      ? currencyRateControllerState?.currencyRates?.[ticker]?.conversionRate
-      : undefined;
+    return ticker ? currencyRates?.[ticker]?.conversionRate : undefined;
   },
 );
 
-export const selectCurrencyRates = createDeepEqualSelector(
-  selectCurrencyRateControllerState,
-  (currencyRateControllerState: CurrencyRateState) =>
-    currencyRateControllerState?.currencyRates,
-);
+export { getCurrencyRateControllerCurrencyRates as selectCurrencyRates };
 
 export const selectCurrencyRateForChainId = createSelector(
   [
-    selectCurrencyRates,
+    getCurrencyRateControllerCurrencyRates,
     (_state: RootState, chainId: Hex) => chainId,
     (state: RootState, chainId: Hex) =>
       selectNetworkConfigurationByChainId(state, chainId),
@@ -57,30 +51,19 @@ export const selectCurrencyRateForChainId = createSelector(
   },
 );
 
-export const selectCurrentCurrency = createDeepEqualSelector(
-  selectCurrencyRateControllerState,
-  (currencyRateControllerState: CurrencyRateState) =>
-    currencyRateControllerState?.currentCurrency,
-);
+export { getCurrencyRateControllerCurrentCurrency as selectCurrentCurrency };
 
 export const selectConversionRateBySymbol = createSelector(
-  selectCurrencyRateControllerState,
+  getCurrencyRateControllerCurrencyRates,
   (_: RootState, symbol: string) => symbol,
-  (currencyRateControllerState: CurrencyRateState, symbol: string) =>
-    symbol
-      ? currencyRateControllerState?.currencyRates?.[symbol]?.conversionRate ||
-        0
-      : 0,
+  (currencyRates: CurrencyRateState['currencyRates'], symbol: string) =>
+    symbol ? currencyRates?.[symbol]?.conversionRate || 0 : 0,
 );
 
-export const selectConversionRateFoAllChains = createSelector(
-  selectCurrencyRateControllerState,
-  (currencyRateControllerState: CurrencyRateState) =>
-    currencyRateControllerState?.currencyRates,
-);
+export { getCurrencyRateControllerCurrencyRates as selectConversionRateFoAllChains };
 
 export const selectConversionRateByChainId = createSelector(
-  selectConversionRateFoAllChains,
+  getCurrencyRateControllerCurrencyRates,
   (_state: RootState, chainId: string) => chainId,
   (state: RootState) => state.settings.showFiatOnTestnets,
   selectNativeCurrencyByChainId,
@@ -102,15 +85,15 @@ export const selectConversionRateByChainId = createSelector(
 );
 
 export const selectUsdConversionRate = createSelector(
-  selectCurrencyRates,
-  selectCurrentCurrency,
+  getCurrencyRateControllerCurrencyRates,
+  getCurrencyRateControllerCurrentCurrency,
   (currencyRates, currentCurrency) =>
     currencyRates?.[currentCurrency]?.usdConversionRate,
 );
 
 export const selectUSDConversionRateByChainId = createSelector(
   [
-    selectCurrencyRates,
+    getCurrencyRateControllerCurrencyRates,
     (_state: RootState, chainId: string) => chainId,
     (state: RootState, chainId: string) =>
       selectNetworkConfigurationByChainId(state, chainId),
diff --git a/app/selectors/featureFlagController/assetsUnifyState/index.test.ts b/app/selectors/featureFlagController/assetsUnifyState/index.test.ts
index 8e91fcb0811..0be0f30abed 100644
--- a/app/selectors/featureFlagController/assetsUnifyState/index.test.ts
+++ b/app/selectors/featureFlagController/assetsUnifyState/index.test.ts
@@ -5,26 +5,9 @@ import {
   ASSETS_UNIFY_STATE_FLAG,
   ASSETS_UNIFY_STATE_FEATURE_VERSION_1,
 } from '.';
-import mockedEngine from '../../../core/__mocks__/MockedEngine';
 import { mockedEmptyFlagsState, mockedUndefinedFlagsState } from '../mocks';
-import packageJson from '../../../../package.json';
 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 assetsUnifyState flag
 function mockStateWith(assetsUnifyState: AssetsUnifyStateFeatureFlag) {
   return {
@@ -42,11 +25,10 @@ function mockStateWith(assetsUnifyState: AssetsUnifyStateFeatureFlag) {
 }
 
 describe('isAssetsUnifyStateFeatureEnabled', () => {
-  it('returns true when enabled with matching version and minimum version met', () => {
+  it('returns true when enabled', () => {
     const flag: AssetsUnifyStateFeatureFlag = {
       enabled: true,
       featureVersion: ASSETS_UNIFY_STATE_FEATURE_VERSION_1,
-      minimumVersion: '1.0.0',
     };
 
     expect(isAssetsUnifyStateFeatureEnabled(flag)).toBe(true);
@@ -56,7 +38,6 @@ describe('isAssetsUnifyStateFeatureEnabled', () => {
     const flag: AssetsUnifyStateFeatureFlag = {
       enabled: false,
       featureVersion: null,
-      minimumVersion: null,
     };
 
     expect(isAssetsUnifyStateFeatureEnabled(flag)).toBe(false);
@@ -66,27 +47,6 @@ describe('isAssetsUnifyStateFeatureEnabled', () => {
     const flag: AssetsUnifyStateFeatureFlag = {
       enabled: true,
       featureVersion: '99',
-      minimumVersion: '1.0.0',
-    };
-
-    expect(isAssetsUnifyStateFeatureEnabled(flag)).toBe(false);
-  });
-
-  it('returns false when minimumVersion is null', () => {
-    const flag: AssetsUnifyStateFeatureFlag = {
-      enabled: true,
-      featureVersion: ASSETS_UNIFY_STATE_FEATURE_VERSION_1,
-      minimumVersion: null,
-    };
-
-    expect(isAssetsUnifyStateFeatureEnabled(flag)).toBe(false);
-  });
-
-  it('returns false when app version is below minimum version', () => {
-    const flag: AssetsUnifyStateFeatureFlag = {
-      enabled: true,
-      featureVersion: ASSETS_UNIFY_STATE_FEATURE_VERSION_1,
-      minimumVersion: '999.999.999',
     };
 
     expect(isAssetsUnifyStateFeatureEnabled(flag)).toBe(false);
@@ -98,11 +58,10 @@ describe('isAssetsUnifyStateFeatureEnabled', () => {
 });
 
 describe('selectIsAssetsUnifyStateEnabled', () => {
-  it('returns true when assetsUnifyState flag is enabled and version meets minimum', () => {
+  it('returns true when assetsUnifyState flag is enabled', () => {
     const mockedState = mockStateWith({
       enabled: true,
       featureVersion: ASSETS_UNIFY_STATE_FEATURE_VERSION_1,
-      minimumVersion: '1.0.0',
     });
 
     expect(selectIsAssetsUnifyStateEnabled(mockedState)).toBe(true);
@@ -111,8 +70,7 @@ describe('selectIsAssetsUnifyStateEnabled', () => {
   it('returns false when assetsUnifyState flag is disabled', () => {
     const mockedState = mockStateWith({
       enabled: false,
-      featureVersion: null,
-      minimumVersion: null,
+      featureVersion: ASSETS_UNIFY_STATE_FEATURE_VERSION_1,
     });
 
     expect(selectIsAssetsUnifyStateEnabled(mockedState)).toBe(false);
@@ -128,32 +86,10 @@ describe('selectIsAssetsUnifyStateEnabled', () => {
     expect(selectIsAssetsUnifyStateEnabled(mockedEmptyFlagsState)).toBe(false);
   });
 
-  it('returns false when app version is below minimum version', () => {
-    const mockedState = mockStateWith({
-      enabled: true,
-      featureVersion: ASSETS_UNIFY_STATE_FEATURE_VERSION_1,
-      minimumVersion: '999.999.999',
-    });
-
-    expect(selectIsAssetsUnifyStateEnabled(mockedState)).toBe(false);
-  });
-
-  it('returns true when app version equals minimum version', () => {
-    const currentVersion = packageJson.version;
-    const mockedState = mockStateWith({
-      enabled: true,
-      featureVersion: ASSETS_UNIFY_STATE_FEATURE_VERSION_1,
-      minimumVersion: currentVersion,
-    });
-
-    expect(selectIsAssetsUnifyStateEnabled(mockedState)).toBe(true);
-  });
-
   it('returns false when featureVersion does not match', () => {
     const mockedState = mockStateWith({
       enabled: true,
       featureVersion: '99',
-      minimumVersion: '1.0.0',
     });
 
     expect(selectIsAssetsUnifyStateEnabled(mockedState)).toBe(false);
diff --git a/app/selectors/featureFlagController/assetsUnifyState/index.ts b/app/selectors/featureFlagController/assetsUnifyState/index.ts
index af7290474d4..d84c6802d57 100644
--- a/app/selectors/featureFlagController/assetsUnifyState/index.ts
+++ b/app/selectors/featureFlagController/assetsUnifyState/index.ts
@@ -1,9 +1,5 @@
-import compareVersions from 'compare-versions';
 import { createSelector } from 'reselect';
 import { selectRemoteFeatureFlags } from '..';
-import packageJson from '../../../../package.json';
-
-const APP_VERSION = packageJson.version;
 
 /**
  * Assets unify state feature flag
@@ -11,7 +7,6 @@ const APP_VERSION = packageJson.version;
 export interface AssetsUnifyStateFeatureFlag {
   enabled: boolean;
   featureVersion: string | null;
-  minimumVersion: string | null;
 }
 
 export const ASSETS_UNIFY_STATE_FLAG = 'assetsUnifyState';
@@ -28,34 +23,16 @@ export const isAssetsUnifyStateFeatureEnabled = (
   flagValue: unknown,
   featureVersionToCheck: string = ASSETS_UNIFY_STATE_FEATURE_VERSION_1,
 ): boolean => {
-  if (!flagValue || !APP_VERSION) {
-    return false;
-  }
-
-  if (typeof flagValue !== 'object' || flagValue === null) {
+  if (!flagValue || typeof flagValue !== 'object') {
     return false;
   }
 
-  const flag = flagValue as AssetsUnifyStateFeatureFlag;
-  const { enabled, featureVersion, minimumVersion } = flag;
+  const parsedFlagValue = flagValue as AssetsUnifyStateFeatureFlag;
 
-  if (!enabled) {
-    return false;
-  }
-
-  if (featureVersion !== featureVersionToCheck) {
-    return false;
-  }
-
-  if (!minimumVersion) {
-    return false;
-  }
-
-  try {
-    return compareVersions.compare(minimumVersion, APP_VERSION, '<=');
-  } catch {
-    return false;
-  }
+  return (
+    Boolean(parsedFlagValue?.enabled) &&
+    parsedFlagValue?.featureVersion === featureVersionToCheck
+  );
 };
 
 /**
diff --git a/app/selectors/featureFlagController/chompApi/index.test.ts b/app/selectors/featureFlagController/chompApi/index.test.ts
new file mode 100644
index 00000000000..38c9cde4fb8
--- /dev/null
+++ b/app/selectors/featureFlagController/chompApi/index.test.ts
@@ -0,0 +1,30 @@
+import { StructError } from '@metamask/superstruct';
+import { parseChompApiConfig } from './index';
+
+describe('parseChompApiConfig', () => {
+  it('returns undefined for undefined', () => {
+    expect(parseChompApiConfig(undefined)).toBeUndefined();
+  });
+
+  it('returns undefined for null', () => {
+    expect(parseChompApiConfig(null)).toBeUndefined();
+  });
+
+  it('parses a valid config', () => {
+    expect(
+      parseChompApiConfig({ baseUrl: 'https://example.com' }),
+    ).toStrictEqual({ baseUrl: 'https://example.com' });
+  });
+
+  it('throws when baseUrl is missing', () => {
+    expect(() => parseChompApiConfig({})).toThrow(StructError);
+  });
+
+  it('throws when baseUrl is not a string', () => {
+    expect(() => parseChompApiConfig({ baseUrl: 42 })).toThrow(StructError);
+  });
+
+  it('throws when the value is not an object', () => {
+    expect(() => parseChompApiConfig('not-an-object')).toThrow(StructError);
+  });
+});
diff --git a/app/selectors/featureFlagController/chompApi/index.ts b/app/selectors/featureFlagController/chompApi/index.ts
new file mode 100644
index 00000000000..1b6c317f711
--- /dev/null
+++ b/app/selectors/featureFlagController/chompApi/index.ts
@@ -0,0 +1,25 @@
+import { object, string, type Infer, create } from '@metamask/superstruct';
+
+export const ChompApiConfigStruct = object({
+  baseUrl: string(),
+});
+
+export type ChompApiConfig = Infer<typeof ChompApiConfigStruct>;
+
+/**
+ * Parse an unknown value into a ChompApiConfig.
+ *
+ * Returns `undefined` if the value is nullish (flag not hydrated / not set),
+ * throws if the value is present but doesn't match the schema.
+ *
+ * @param value - The raw feature flag value.
+ * @returns The parsed config, or `undefined` if not set.
+ */
+export function parseChompApiConfig(
+  value: unknown,
+): ChompApiConfig | undefined {
+  if (value === undefined || value === null) {
+    return undefined;
+  }
+  return create(value, ChompApiConfigStruct);
+}
diff --git a/app/selectors/featureFlagController/explorePageV2/index.test.ts b/app/selectors/featureFlagController/explorePageV2/index.test.ts
new file mode 100644
index 00000000000..8547b962eb7
--- /dev/null
+++ b/app/selectors/featureFlagController/explorePageV2/index.test.ts
@@ -0,0 +1,114 @@
+import { selectExplorePageV2EnabledFlag } from '.';
+import mockedEngine from '../../../core/__mocks__/MockedEngine';
+import { mockedEmptyFlagsState, mockedUndefinedFlagsState } from '../mocks';
+
+jest.mock('../../../core/Engine', () => ({
+  init: () => mockedEngine.init(),
+}));
+
+const originalEnv = process.env;
+beforeEach(() => {
+  jest.resetModules();
+  process.env = { ...originalEnv };
+});
+
+afterEach(() => {
+  process.env = originalEnv;
+  jest.clearAllMocks();
+});
+
+const mockedStateWithExplorePageV2Enabled = {
+  engine: {
+    backgroundState: {
+      RemoteFeatureFlagController: {
+        remoteFeatureFlags: {
+          explorePageV2Enabled: true,
+        },
+        cacheTimestamp: 0,
+      },
+    },
+  },
+};
+
+const mockedStateWithExplorePageV2Disabled = {
+  engine: {
+    backgroundState: {
+      RemoteFeatureFlagController: {
+        remoteFeatureFlags: {
+          explorePageV2Enabled: false,
+        },
+        cacheTimestamp: 0,
+      },
+    },
+  },
+};
+
+const mockedStateWithoutExplorePageV2Flag = {
+  engine: {
+    backgroundState: {
+      RemoteFeatureFlagController: {
+        remoteFeatureFlags: {
+          someOtherFlag: true,
+        },
+        cacheTimestamp: 0,
+      },
+    },
+  },
+};
+
+describe('Explore Page V2 feature flag selector', () => {
+  it('returns true when explorePageV2Enabled feature flag is enabled', () => {
+    const result = selectExplorePageV2EnabledFlag(
+      mockedStateWithExplorePageV2Enabled,
+    );
+
+    expect(result).toBe(true);
+  });
+
+  it('returns false when explorePageV2Enabled feature flag is explicitly disabled', () => {
+    const result = selectExplorePageV2EnabledFlag(
+      mockedStateWithExplorePageV2Disabled,
+    );
+
+    expect(result).toBe(false);
+  });
+
+  it('returns default false when explorePageV2Enabled feature flag property is missing', () => {
+    const result = selectExplorePageV2EnabledFlag(
+      mockedStateWithoutExplorePageV2Flag,
+    );
+
+    expect(result).toBe(false);
+  });
+
+  it('returns default false when feature flag state is empty', () => {
+    const result = selectExplorePageV2EnabledFlag(mockedEmptyFlagsState);
+
+    expect(result).toBe(false);
+  });
+
+  it('returns default false when RemoteFeatureFlagController state is undefined', () => {
+    const result = selectExplorePageV2EnabledFlag(mockedUndefinedFlagsState);
+
+    expect(result).toBe(false);
+  });
+
+  it('handles null values correctly', () => {
+    const stateWithNullFlag = {
+      engine: {
+        backgroundState: {
+          RemoteFeatureFlagController: {
+            remoteFeatureFlags: {
+              explorePageV2Enabled: null,
+            },
+            cacheTimestamp: 0,
+          },
+        },
+      },
+    };
+
+    const result = selectExplorePageV2EnabledFlag(stateWithNullFlag);
+
+    expect(result).toBeNull();
+  });
+});
diff --git a/app/selectors/featureFlagController/explorePageV2/index.ts b/app/selectors/featureFlagController/explorePageV2/index.ts
new file mode 100644
index 00000000000..54a055bcce7
--- /dev/null
+++ b/app/selectors/featureFlagController/explorePageV2/index.ts
@@ -0,0 +1,19 @@
+import { createSelector } from 'reselect';
+import { selectRemoteFeatureFlags } from '..';
+import { hasProperty } from '@metamask/utils';
+
+const DEFAULT_EXPLORE_PAGE_V2_ENABLED = false;
+
+/** Remote client-config key; LaunchDarkly alias should match for ops. */
+export const FEATURE_FLAG_NAME = 'explorePageV2Enabled';
+
+/**
+ * When true, the Explore tab uses Explore Page V2; when false, V1.
+ */
+export const selectExplorePageV2EnabledFlag = createSelector(
+  selectRemoteFeatureFlags,
+  (remoteFeatureFlags) =>
+    hasProperty(remoteFeatureFlags, FEATURE_FLAG_NAME)
+      ? (remoteFeatureFlags[FEATURE_FLAG_NAME] as boolean)
+      : DEFAULT_EXPLORE_PAGE_V2_ENABLED,
+);
diff --git a/app/selectors/featureFlagController/exploreSectionsOrder/index.test.ts b/app/selectors/featureFlagController/exploreSectionsOrder/index.test.ts
deleted file mode 100644
index fc2d3c81f85..00000000000
--- a/app/selectors/featureFlagController/exploreSectionsOrder/index.test.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import { selectExploreSectionsOrder } from '.';
-
-describe('selectExploreSectionsOrder', () => {
-  const validConfig = {
-    home: ['predictions', 'tokens', 'perps', 'stocks', 'sites'],
-    quickActions: ['tokens', 'perps', 'stocks', 'predictions', 'sites'],
-    search: ['tokens', 'perps', 'stocks', 'predictions', 'sites'],
-  };
-
-  it('returns the config when all three arrays contain valid section IDs', () => {
-    const result = selectExploreSectionsOrder.resultFunc({
-      exploreSectionsOrder: validConfig,
-    });
-
-    expect(result).toEqual(validConfig);
-  });
-
-  it('returns a reordered config', () => {
-    const reordered = {
-      home: ['sites', 'stocks', 'tokens', 'perps', 'predictions'],
-      quickActions: ['predictions', 'sites', 'tokens', 'stocks', 'perps'],
-      search: ['perps', 'predictions', 'sites', 'tokens', 'stocks'],
-    };
-    const result = selectExploreSectionsOrder.resultFunc({
-      exploreSectionsOrder: reordered,
-    });
-
-    expect(result).toEqual(reordered);
-  });
-
-  it('accepts partial section lists (not all IDs required)', () => {
-    const partial = {
-      home: ['tokens', 'sites'],
-      quickActions: ['predictions'],
-      search: ['perps', 'tokens'],
-    };
-    const result = selectExploreSectionsOrder.resultFunc({
-      exploreSectionsOrder: partial,
-    });
-
-    expect(result).toEqual(partial);
-  });
-
-  it('returns null when the flag is absent', () => {
-    const result = selectExploreSectionsOrder.resultFunc({});
-
-    expect(result).toBeNull();
-  });
-
-  it('returns null when the flag is null', () => {
-    const result = selectExploreSectionsOrder.resultFunc({
-      exploreSectionsOrder: null,
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it('returns null when the flag is a primitive', () => {
-    const result = selectExploreSectionsOrder.resultFunc({
-      exploreSectionsOrder: true,
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it('returns null when home contains an invalid section ID', () => {
-    const result = selectExploreSectionsOrder.resultFunc({
-      exploreSectionsOrder: {
-        ...validConfig,
-        home: ['tokens', 'invalidSection'],
-      },
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it('returns null when quickActions is empty', () => {
-    const result = selectExploreSectionsOrder.resultFunc({
-      exploreSectionsOrder: { ...validConfig, quickActions: [] },
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it('returns null when search is missing', () => {
-    const result = selectExploreSectionsOrder.resultFunc({
-      exploreSectionsOrder: {
-        home: validConfig.home,
-        quickActions: validConfig.quickActions,
-      },
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it('returns null when a field is not an array', () => {
-    const result = selectExploreSectionsOrder.resultFunc({
-      exploreSectionsOrder: { ...validConfig, search: 'tokens' },
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it('returns null when an array contains duplicate IDs', () => {
-    const result = selectExploreSectionsOrder.resultFunc({
-      exploreSectionsOrder: {
-        ...validConfig,
-        home: ['tokens', 'tokens', 'sites'],
-      },
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it('unwraps a progressive rollout wrapper shape', () => {
-    const result = selectExploreSectionsOrder.resultFunc({
-      exploreSectionsOrder: {
-        name: 'exploreSectionsOrder',
-        value: validConfig,
-      },
-    });
-
-    expect(result).toEqual(validConfig);
-  });
-});
diff --git a/app/selectors/featureFlagController/exploreSectionsOrder/index.ts b/app/selectors/featureFlagController/exploreSectionsOrder/index.ts
deleted file mode 100644
index 42ef1c5aa5a..00000000000
--- a/app/selectors/featureFlagController/exploreSectionsOrder/index.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { createSelector } from 'reselect';
-import { selectRemoteFeatureFlags } from '..';
-import type { SectionId } from '../../../components/Views/TrendingView/sections.config';
-
-const VALID_SECTION_IDS: ReadonlySet<string> = new Set<SectionId>([
-  'predictions',
-  'tokens',
-  'perps',
-  'stocks',
-  'sites',
-]);
-
-export interface ExploreSectionsOrderConfig {
-  home: SectionId[];
-  quickActions: SectionId[];
-  search: SectionId[];
-}
-
-const isValidSectionIdArray = (arr: unknown): arr is SectionId[] =>
-  Array.isArray(arr) &&
-  arr.length > 0 &&
-  new Set(arr).size === arr.length &&
-  arr.every((id) => typeof id === 'string' && VALID_SECTION_IDS.has(id));
-
-/**
- * Unwraps a flag value that may be wrapped in a progressive rollout shape
- * `{ name?: string, value: ... }`.
- */
-const unwrapFlagValue = (flag: unknown): unknown => {
-  if (
-    typeof flag === 'object' &&
-    flag !== null &&
-    'value' in flag &&
-    !('home' in flag)
-  ) {
-    return (flag as { value: unknown }).value;
-  }
-  return flag;
-};
-
-/**
- * Reads the `exploreSectionsOrder` remote feature flag.
- *
- * Expected LaunchDarkly JSON shape:
- * ```json
- * {
- *   "home": ["predictions", "tokens", "perps", "stocks", "sites"],
- *   "quickActions": ["tokens", "perps", "stocks", "predictions", "sites"],
- *   "search": ["tokens", "perps", "stocks", "predictions", "sites"]
- * }
- * ```
- *
- * Returns `null` when the flag is absent or invalid, letting callers
- * fall back to hardcoded defaults.
- */
-export const selectExploreSectionsOrder = createSelector(
-  selectRemoteFeatureFlags,
-  (remoteFeatureFlags): ExploreSectionsOrderConfig | null => {
-    const raw = remoteFeatureFlags?.exploreSectionsOrder;
-    if (!raw) return null;
-
-    const flag = unwrapFlagValue(raw);
-    if (!flag || typeof flag !== 'object') return null;
-
-    const { home, quickActions, search } = flag as Record<string, unknown>;
-
-    if (
-      !isValidSectionIdArray(home) ||
-      !isValidSectionIdArray(quickActions) ||
-      !isValidSectionIdArray(search)
-    ) {
-      return null;
-    }
-
-    return { home, quickActions, search };
-  },
-);
diff --git a/app/selectors/multichain/multichain.test.ts b/app/selectors/multichain/multichain.test.ts
index 44c53fc9e17..e7c9d4eddbe 100644
--- a/app/selectors/multichain/multichain.test.ts
+++ b/app/selectors/multichain/multichain.test.ts
@@ -686,10 +686,6 @@ describe('MultichainNonEvm Selectors', () => {
         // eslint-disable-next-line prefer-const
         let mockSelectedGroupAccounts: InternalAccount[] | undefined;
 
-        jest.doMock('../multichain', () => ({
-          selectAccountTokensAcrossChains: () => mockEvmTokensByChain,
-        }));
-
         jest.doMock('./evm', () => ({
           selectAccountTokensAcrossChainsForAddress: () => mockEvmTokensByChain,
         }));
@@ -733,10 +729,6 @@ describe('MultichainNonEvm Selectors', () => {
         // eslint-disable-next-line prefer-const
         let mockSelectedGroupAccounts: InternalAccount[] | undefined;
 
-        jest.doMock('../multichain', () => ({
-          selectAccountTokensAcrossChains: () => mockEvmTokensByChain,
-        }));
-
         jest.doMock('./evm', () => ({
           selectAccountTokensAcrossChainsForAddress: () => mockEvmTokensByChain,
         }));
diff --git a/app/selectors/multichain/multichain.ts b/app/selectors/multichain/multichain.ts
index 4d2c1328294..0835f9012db 100644
--- a/app/selectors/multichain/multichain.ts
+++ b/app/selectors/multichain/multichain.ts
@@ -50,6 +50,13 @@ import { selectSelectedInternalAccountByScope } from '../multichainAccounts/acco
 import { EVM_SCOPE } from '../../components/UI/Earn/constants/networks';
 import { MULTICHAIN_ACCOUNT_TYPE_TO_MAINNET } from '../../core/Multichain/constants';
 import { isTronSpecialAsset } from '../../core/Multichain/utils';
+import {
+  getMultiChainAssetsControllerAccountsAssets,
+  getMultiChainAssetsControllerAllIgnoredAssets,
+  getMultiChainAssetsControllerAssetsMetadata,
+  getMultiChainBalancesControllerBalances,
+  getMultichainAssetsRatesControllerConversionRates,
+} from '../assets/assets-migration';
 
 export const selectMultichainDefaultToken = createDeepEqualSelector(
   selectIsEvmNetworkSelected,
@@ -82,19 +89,7 @@ export const selectMultichainIsMainnet = createDeepEqualSelector(
   },
 );
 
-/**
- *
- * @param state - Root redux state
- * @returns - MultichainBalancesController state
- */
-const selectMultichainBalancesControllerState = (state: RootState) =>
-  state.engine.backgroundState.MultichainBalancesController;
-
-export const selectMultichainBalances = createDeepEqualSelector(
-  selectMultichainBalancesControllerState,
-  (multichainBalancesControllerState) =>
-    multichainBalancesControllerState.balances,
-);
+export { getMultiChainBalancesControllerBalances as selectMultichainBalances };
 
 export const selectMultichainShouldShowFiat = createDeepEqualSelector(
   selectMultichainIsMainnet,
@@ -125,7 +120,7 @@ const getNonEvmCachedBalance = (
 
 export const selectNonEvmCachedBalance = createDeepEqualSelector(
   selectSelectedInternalAccount,
-  selectMultichainBalances,
+  getMultiChainBalancesControllerBalances,
   selectSelectedNonEvmNetworkChainId,
   (selectedInternalAccount, multichainBalances, nonEvmChainId) => {
     if (!selectedInternalAccount) {
@@ -157,54 +152,40 @@ export const selectMultichainSelectedAccountCachedBalance =
  */
 const selectMultichainTransactionsControllerState = (state: RootState) =>
   state.engine.backgroundState.MultichainTransactionsController;
-
 export const selectMultichainTransactions = createDeepEqualSelector(
   selectMultichainTransactionsControllerState,
   (multichainTransactionsControllerState) =>
     multichainTransactionsControllerState.nonEvmTransactions,
 );
 
-const selectMultichainAssetsControllerState = (state: RootState) =>
-  state.engine.backgroundState.MultichainAssetsController;
+export { getMultiChainAssetsControllerAccountsAssets as selectMultichainAssets };
 
-export const selectMultichainAssets = createDeepEqualSelector(
-  selectMultichainAssetsControllerState,
-  (multichainAssetsControllerState) =>
-    multichainAssetsControllerState.accountsAssets,
-);
+export { getMultiChainAssetsControllerAssetsMetadata as selectMultichainAssetsMetadata };
 
-export const selectMultichainAssetsMetadata = createDeepEqualSelector(
-  selectMultichainAssetsControllerState,
-  (multichainAssetsControllerState) =>
-    multichainAssetsControllerState.assetsMetadata,
-);
-
-export const selectMultichainAssetsAllIgnoredAssets = createDeepEqualSelector(
-  selectMultichainAssetsControllerState,
-  (multichainAssetsControllerState) =>
-    multichainAssetsControllerState.allIgnoredAssets ?? {},
-);
+export { getMultiChainAssetsControllerAllIgnoredAssets as selectMultichainAssetsAllIgnoredAssets };
 
-function selectMultichainAssetsRatesState(state: RootState) {
-  return state.engine.backgroundState.MultichainAssetsRatesController
-    .conversionRates;
-}
+export { getMultichainAssetsRatesControllerConversionRates as selectMultichainAssetsRatesState };
 
 export const selectMultichainAssetsRates = createDeepEqualSelector(
-  selectMultichainAssetsRatesState,
+  getMultichainAssetsRatesControllerConversionRates,
   (conversionRates) => conversionRates,
   { devModeChecks: { identityFunctionCheck: 'never' } },
 );
 
+/**
+ * @deprecated
+ * This selector accesses deprecated AssetsController state directly.
+ * It is only used in the useTokenHistoricalPrices hook.
+ */
 export function selectMultichainHistoricalPrices(state: RootState) {
   return state.engine.backgroundState.MultichainAssetsRatesController
     .historicalPrices;
 }
 
 export const selectMultichainTokenListForAccountId = createDeepEqualSelector(
-  selectMultichainBalances,
-  selectMultichainAssets,
-  selectMultichainAssetsMetadata,
+  getMultiChainBalancesControllerBalances,
+  getMultiChainAssetsControllerAccountsAssets,
+  getMultiChainAssetsControllerAssetsMetadata,
   selectMultichainAssetsRates,
   selectSelectedNonEvmNetworkChainId,
   (_: RootState, accountId: string | undefined) => accountId,
@@ -275,9 +256,9 @@ export const selectMultichainTokenListForAccountId = createDeepEqualSelector(
 
 export const selectMultichainTokenListForAccountsAnyChain =
   createDeepEqualSelector(
-    selectMultichainBalances,
-    selectMultichainAssets,
-    selectMultichainAssetsMetadata,
+    getMultiChainBalancesControllerBalances,
+    getMultiChainAssetsControllerAccountsAssets,
+    getMultiChainAssetsControllerAssetsMetadata,
     selectMultichainAssetsRates,
     (_: RootState, accounts: InternalAccount[] | undefined) => accounts,
     (multichainBalances, assets, assetsMetadata, assetsRates, accounts) => {
@@ -493,8 +474,8 @@ export const getMultichainNetworkAggregatedBalance = (
 export const selectSelectedAccountMultichainNetworkAggregatedBalance =
   createDeepEqualSelector(
     selectSelectedInternalAccount,
-    selectMultichainBalances,
-    selectMultichainAssets,
+    getMultiChainBalancesControllerBalances,
+    getMultiChainAssetsControllerAccountsAssets,
     selectMultichainAssetsRates,
     (
       selectedAccount,
@@ -526,8 +507,8 @@ interface MultichainNetworkAggregatedBalanceForAllAccounts {
 export const selectMultichainNetworkAggregatedBalanceForAllAccounts =
   createDeepEqualSelector(
     selectInternalAccounts,
-    selectMultichainBalances,
-    selectMultichainAssets,
+    getMultiChainBalancesControllerBalances,
+    getMultiChainAssetsControllerAccountsAssets,
     selectMultichainAssetsRates,
     (
       internalAccounts,
@@ -673,8 +654,8 @@ export const makeSelectNonEvmAssetById = () =>
   createSelector(
     [
       selectIsEvmNetworkSelected,
-      selectMultichainBalances,
-      selectMultichainAssetsMetadata,
+      getMultiChainBalancesControllerBalances,
+      getMultiChainAssetsControllerAssetsMetadata,
       selectMultichainAssetsRates,
       (_: RootState, params: { accountId?: string; assetId: string }) =>
         params.accountId,
@@ -740,7 +721,7 @@ export const makeSelectNonEvmAssetById = () =>
 
 export const selectAccountsWithNativeBalanceByChainId = createDeepEqualSelector(
   selectInternalAccounts,
-  selectMultichainBalances,
+  getMultiChainBalancesControllerBalances,
   (_: RootState, params: { chainId: string }) => params.chainId,
   (
     internalAccounts,
diff --git a/app/selectors/multichainAccounts/accountTreeController.ts b/app/selectors/multichainAccounts/accountTreeController.ts
index d3a8d09f5cb..68e85307c4f 100644
--- a/app/selectors/multichainAccounts/accountTreeController.ts
+++ b/app/selectors/multichainAccounts/accountTreeController.ts
@@ -11,6 +11,7 @@ import {
   parseAccountGroupId,
 } from '@metamask/account-api';
 import { AccountId } from '@metamask/accounts-controller';
+import { isEvmAccountType } from '@metamask/keyring-api';
 import {
   AccountWalletObject,
   AccountGroupObject,
@@ -419,6 +420,18 @@ export const selectSelectedAccountGroupInternalAccounts = createSelector(
   },
 );
 
+/**
+ * Selector to get the EVM internal account (if any) from the currently selected account group.
+ *
+ * @param state - The Redux root state
+ * @returns The EVM internal account if any, null otherwise.
+ */
+export const selectSelectedAccountGroupEvmInternalAccount = createSelector(
+  selectSelectedAccountGroupInternalAccounts,
+  (accounts): InternalAccount | null =>
+    accounts.find((account) => isEvmAccountType(account.type)) ?? null,
+);
+
 /**
  * Returns an array with the formatted addresses of the internal accounts
  * of the selected account group.
diff --git a/app/selectors/networkEnablementController/index.test.ts b/app/selectors/networkEnablementController/index.test.ts
index dfa60610c88..3a967d8bec0 100644
--- a/app/selectors/networkEnablementController/index.test.ts
+++ b/app/selectors/networkEnablementController/index.test.ts
@@ -2,6 +2,7 @@ import {
   selectNetworkEnablementControllerState,
   selectEnabledNetworksByNamespace,
   selectEVMEnabledNetworks,
+  selectEvmEnabledCaipNetworks,
   selectNonEVMEnabledNetworks,
 } from './index';
 import { RootState } from '../../reducers';
@@ -243,6 +244,14 @@ describe('NetworkEnablementController Selectors', () => {
     });
   });
 
+  describe('selectEvmEnabledCaipNetworks', () => {
+    it('returns only enabled EVM networks as CAIP chain IDs', () => {
+      const result = selectEvmEnabledCaipNetworks(mockState);
+
+      expect(result).toEqual(['eip155:1', 'eip155:8453']);
+    });
+  });
+
   describe('selectNonEVMEnabledNetworks', () => {
     it('returns enabled non-EVM networks across namespaces', () => {
       // Arrange / Act
diff --git a/app/selectors/networkEnablementController/index.ts b/app/selectors/networkEnablementController/index.ts
index 90f6b7db339..70acd8c1096 100644
--- a/app/selectors/networkEnablementController/index.ts
+++ b/app/selectors/networkEnablementController/index.ts
@@ -22,6 +22,15 @@ export const selectEVMEnabledNetworks = createDeepEqualSelector(
     ) as Hex[],
 );
 
+export const selectEvmEnabledCaipNetworks = createDeepEqualSelector(
+  selectEVMEnabledNetworks,
+  (chainIds) =>
+    (chainIds ?? []).map(
+      (chainId) =>
+        `${KnownCaipNamespace.Eip155}:${Number.parseInt(chainId, 16)}`,
+    ),
+);
+
 export const selectNonEVMEnabledNetworks = createDeepEqualSelector(
   selectEnabledNetworksByNamespace,
   (
diff --git a/app/selectors/rewards/index.ts b/app/selectors/rewards/index.ts
index 9bb90d64a5a..c91b88dc338 100644
--- a/app/selectors/rewards/index.ts
+++ b/app/selectors/rewards/index.ts
@@ -50,17 +50,6 @@ export const selectRewardsSubscriptionId = createSelector(
   },
 );
 
-export const selectCampaignParticipantOptedIn =
-  (subscriptionId: string | null, campaignId: string | undefined) =>
-  (state: RootState): boolean => {
-    if (!subscriptionId || !campaignId) return false;
-    return (
-      state.engine.backgroundState.RewardsController.campaignParticipantStatus[
-        `${subscriptionId}:${campaignId}`
-      ]?.optedIn === true
-    );
-  };
-
 export const selectRewardsActiveAccountAddress = createSelector(
   selectRewardsControllerState,
   (rewardsControllerState): string | null => {
diff --git a/app/selectors/tokenBalancesController.test.ts b/app/selectors/tokenBalancesController.test.ts
index 65231604646..bde85d10564 100644
--- a/app/selectors/tokenBalancesController.test.ts
+++ b/app/selectors/tokenBalancesController.test.ts
@@ -61,7 +61,7 @@ describe('TokenBalancesController Selectors', () => {
       const chainId: Hex = '0x1';
 
       const result = selectContractBalances.resultFunc(
-        mockTokenBalancesControllerState,
+        mockTokenBalancesControllerState.tokenBalances,
         selectedAccount,
         chainId,
       );
@@ -77,7 +77,7 @@ describe('TokenBalancesController Selectors', () => {
       const chainId: Hex = '0x1';
 
       const result = selectContractBalances.resultFunc(
-        mockTokenBalancesControllerState,
+        mockTokenBalancesControllerState.tokenBalances,
         selectedAccount,
         chainId,
       );
@@ -90,7 +90,7 @@ describe('TokenBalancesController Selectors', () => {
       const chainId: Hex = '0xUnknownChain';
 
       const result = selectContractBalances.resultFunc(
-        mockTokenBalancesControllerState,
+        mockTokenBalancesControllerState.tokenBalances,
         selectedAccount,
         chainId,
       );
@@ -103,7 +103,7 @@ describe('TokenBalancesController Selectors', () => {
       const chainId: Hex = '0x1';
 
       const result = selectContractBalances.resultFunc(
-        mockTokenBalancesControllerState,
+        mockTokenBalancesControllerState.tokenBalances,
         selectedAccount as `0x${string}`,
         chainId,
       );
@@ -131,7 +131,7 @@ describe('TokenBalancesController Selectors', () => {
       } as unknown as RootState;
 
       const result = selectAllTokenBalances(stateWithoutTokenBalances);
-      expect(result).toEqual(undefined);
+      expect(result).toEqual({});
     });
   });
 
diff --git a/app/selectors/tokenBalancesController.ts b/app/selectors/tokenBalancesController.ts
index 060ce7118a2..cef75df144d 100644
--- a/app/selectors/tokenBalancesController.ts
+++ b/app/selectors/tokenBalancesController.ts
@@ -8,18 +8,12 @@ import { selectEvmChainId } from './networkController';
 import { createDeepEqualSelector } from './util';
 import { selectShowFiatInTestnets } from './settings';
 import { isTestNet } from '../util/networks';
+import { getTokenBalancesControllerTokenBalances } from './assets/assets-migration';
 
-const selectTokenBalancesControllerState = (state: RootState) =>
-  state.engine.backgroundState.TokenBalancesController;
-
-export const selectTokensBalances = createSelector(
-  selectTokenBalancesControllerState,
-  (tokenBalancesControllerState: TokenBalancesControllerState) =>
-    tokenBalancesControllerState.tokenBalances,
-);
+export { getTokenBalancesControllerTokenBalances as selectTokensBalances };
 
 export const selectHasAnyBalance = createSelector(
-  [selectTokensBalances],
+  [getTokenBalancesControllerTokenBalances],
   (balances) => {
     // We will loop through this nested structure to see if we find any balance.
     for (const level2 of Object.values(balances)) {
@@ -41,8 +35,7 @@ export const selectSingleTokenBalance = createSelector(
       chainId: Hex,
       tokenAddress: Hex,
     ) => {
-      const tokenBalances =
-        selectTokenBalancesControllerState(state).tokenBalances;
+      const tokenBalances = getTokenBalancesControllerTokenBalances(state);
       const balance =
         tokenBalances?.[accountAddress]?.[chainId]?.[tokenAddress];
       return balance;
@@ -62,40 +55,32 @@ export const selectSingleTokenBalance = createSelector(
 );
 
 export const selectContractBalances = createSelector(
-  selectTokenBalancesControllerState,
+  getTokenBalancesControllerTokenBalances,
   selectSelectedInternalAccountAddress,
   selectEvmChainId,
   (
-    tokenBalancesControllerState: TokenBalancesControllerState,
+    tokenBalances: TokenBalancesControllerState['tokenBalances'],
     selectedInternalAccountAddress: string | undefined,
     chainId: string,
   ) =>
-    tokenBalancesControllerState.tokenBalances?.[
-      selectedInternalAccountAddress as Hex
-    ]?.[chainId as Hex] ?? {},
+    tokenBalances?.[selectedInternalAccountAddress as Hex]?.[chainId as Hex] ??
+    {},
 );
 
 export const selectContractBalancesPerChainId = createSelector(
-  selectTokenBalancesControllerState,
+  getTokenBalancesControllerTokenBalances,
   selectSelectedInternalAccountAddress,
   (
-    tokenBalancesControllerState: TokenBalancesControllerState,
+    tokenBalances: TokenBalancesControllerState['tokenBalances'],
     selectedInternalAccountAddress: string | undefined,
-  ) =>
-    tokenBalancesControllerState.tokenBalances?.[
-      selectedInternalAccountAddress as Hex
-    ] ?? {},
+  ) => tokenBalances?.[selectedInternalAccountAddress as Hex] ?? {},
 );
 
-export const selectAllTokenBalances = createDeepEqualSelector(
-  selectTokenBalancesControllerState,
-  (tokenBalancesControllerState: TokenBalancesControllerState) =>
-    tokenBalancesControllerState.tokenBalances,
-);
+export { getTokenBalancesControllerTokenBalances as selectAllTokenBalances };
 
 export const selectAddressHasTokenBalances = createDeepEqualSelector(
   [
-    selectAllTokenBalances,
+    getTokenBalancesControllerTokenBalances,
     selectSelectedInternalAccountAddress,
     selectShowFiatInTestnets,
   ],
diff --git a/app/selectors/tokenRatesController.ts b/app/selectors/tokenRatesController.ts
index 65b8b125ec3..dedfdfd3c93 100644
--- a/app/selectors/tokenRatesController.ts
+++ b/app/selectors/tokenRatesController.ts
@@ -5,6 +5,7 @@ import { RootState } from '../reducers';
 import { selectEvmChainId } from './networkController';
 import { Hex } from '@metamask/utils';
 import { createDeepEqualSelector } from './util';
+import { getTokenRatesControllerMarketData } from './assets/assets-migration';
 
 /**
  * utility similar to lodash.mapValues.
@@ -21,35 +22,28 @@ const mapValues = <K extends string, T, U>(
     Object.entries(obj ?? {}).map(([key, value]) => [key, fn(value as T)]),
   ) as Record<K, U>;
 
-const selectTokenRatesControllerState = (state: RootState) =>
-  state.engine.backgroundState.TokenRatesController;
-
 export const selectContractExchangeRates = createSelector(
   selectEvmChainId,
-  selectTokenRatesControllerState,
-  (chainId: Hex, tokenRatesControllerState: TokenRatesControllerState) =>
-    tokenRatesControllerState.marketData[chainId],
+  getTokenRatesControllerMarketData,
+  (chainId: Hex, marketData: TokenRatesControllerState['marketData']) =>
+    marketData[chainId],
 );
 
 export const selectContractExchangeRatesByChainId = createSelector(
-  selectTokenRatesControllerState,
+  getTokenRatesControllerMarketData,
   (_state: RootState, chainId: Hex) => chainId,
-  (tokenRatesControllerState: TokenRatesControllerState, chainId: Hex) =>
-    tokenRatesControllerState.marketData[chainId],
+  (marketData: TokenRatesControllerState['marketData'], chainId: Hex) =>
+    marketData[chainId],
 );
 
-export const selectTokenMarketData = createSelector(
-  selectTokenRatesControllerState,
-  (tokenRatesControllerState: TokenRatesControllerState) =>
-    tokenRatesControllerState.marketData,
-);
+export { getTokenRatesControllerMarketData as selectTokenMarketData };
 
 export function selectPricePercentChange1d(
   state: RootState,
   chainId: Hex,
   tokenAddress: Hex,
 ) {
-  const marketData = selectTokenMarketData(state);
+  const marketData = getTokenRatesControllerMarketData(state);
   const pricePercentage1d: number | undefined =
     marketData?.[chainId]?.[tokenAddress]?.pricePercentChange1d;
   return pricePercentage1d;
@@ -58,7 +52,7 @@ export function selectPricePercentChange1d(
 export const selectSingleTokenPriceMarketData = createSelector(
   [
     (state: RootState, chainId: Hex, tokenAddress: Hex) => {
-      const marketData = selectTokenMarketData(state);
+      const marketData = getTokenRatesControllerMarketData(state);
       const price = marketData?.[chainId]?.[tokenAddress]?.price;
       return price;
     },
@@ -73,7 +67,7 @@ export const selectSingleTokenPriceMarketData = createSelector(
 );
 
 export const selectTokenMarketPriceData = createDeepEqualSelector(
-  [selectTokenMarketData],
+  [getTokenRatesControllerMarketData],
   (marketData) => {
     const marketPriceData = mapValues(marketData, (tokenData) =>
       mapValues(tokenData, (tokenInfo) => ({ price: tokenInfo?.price })),
@@ -84,6 +78,9 @@ export const selectTokenMarketPriceData = createDeepEqualSelector(
 );
 
 export const selectTokenMarketDataByChainId = createSelector(
-  [selectTokenMarketData, (_state: RootState, chainId: Hex) => chainId],
+  [
+    getTokenRatesControllerMarketData,
+    (_state: RootState, chainId: Hex) => chainId,
+  ],
   (marketData, chainId) => marketData?.[chainId] || {},
 );
diff --git a/app/selectors/tokensController.test.ts b/app/selectors/tokensController.test.ts
index 0eee0680df8..1c453f6bb86 100644
--- a/app/selectors/tokensController.test.ts
+++ b/app/selectors/tokensController.test.ts
@@ -10,6 +10,7 @@ import {
   selectAllDetectedTokensForSelectedAddress,
   selectAllDetectedTokensFlat,
   selectTokensByChainIdAndAddress,
+  selectTokensByChainIdAndWalletAddress,
   getChainIdsToPoll,
   selectSingleTokenByAddressAndChainId,
 } from './tokensController';
@@ -337,6 +338,34 @@ describe('TokensController Selectors', () => {
     });
   });
 
+  describe('selectTokensByChainIdAndWalletAddress', () => {
+    it('returns tokens for the given chain and explicit wallet address', () => {
+      expect(
+        selectTokensByChainIdAndWalletAddress(
+          mockRootState,
+          '0x1',
+          '0xAddress2',
+        ),
+      ).toStrictEqual({ '0xToken2': mockToken2 });
+    });
+
+    it('returns empty object when wallet address has no tokens on that chain', () => {
+      expect(
+        selectTokensByChainIdAndWalletAddress(
+          mockRootState,
+          '0x2',
+          '0xAddress1',
+        ),
+      ).toStrictEqual({});
+    });
+
+    it('returns empty object when wallet address is undefined', () => {
+      expect(
+        selectTokensByChainIdAndWalletAddress(mockRootState, '0x1', undefined),
+      ).toStrictEqual({});
+    });
+  });
+
   describe('getChainIdsToPoll', () => {
     const mockNetworkConfigurations = {
       '0x1': { chainId: '0x1' } as unknown as NetworkConfiguration,
diff --git a/app/selectors/tokensController.ts b/app/selectors/tokensController.ts
index e86eb003585..25d2b2d88fa 100644
--- a/app/selectors/tokensController.ts
+++ b/app/selectors/tokensController.ts
@@ -12,32 +12,39 @@ import {
 } from './networkController';
 import { PopularList } from '../util/networks/customNetworks';
 import { ChainId } from '@metamask/controller-utils';
+import {
+  getTokensControllerAllIgnoredTokens,
+  getTokensControllerAllTokens,
+} from './assets/assets-migration';
 
+/**
+ * @deprecated
+ * This selector accesses deprecated AssetsController state directly.
+ */
 const selectTokensControllerState = (state: RootState) =>
   state?.engine?.backgroundState?.TokensController;
 
 export const selectTokens = createDeepEqualSelector(
-  selectTokensControllerState,
+  getTokensControllerAllTokens,
   selectEvmChainId,
   selectSelectedInternalAccountAddress,
   (
-    tokensControllerState: TokensControllerState,
+    allTokens: TokensControllerState['allTokens'],
     chainId: Hex,
     selectedAddress: string | undefined,
-  ) =>
-    tokensControllerState?.allTokens[chainId]?.[selectedAddress as Hex] || [],
+  ) => allTokens[chainId]?.[selectedAddress as Hex] || [],
 );
 
 export const selectTokensByChainIdAndAddress = createDeepEqualSelector(
-  selectTokensControllerState,
+  getTokensControllerAllTokens,
   selectSelectedInternalAccountAddress,
   (_state, chainId: Hex) => chainId,
   (
-    tokensControllerState: TokensControllerState,
+    allTokens: TokensControllerState['allTokens'],
     selectedAddress: string | undefined,
     chainId: Hex,
   ) =>
-    tokensControllerState?.allTokens[chainId]?.[selectedAddress as Hex]?.reduce(
+    allTokens[chainId]?.[selectedAddress as Hex]?.reduce(
       (tokensMap: { [address: string]: Token }, token: Token) => ({
         ...tokensMap,
         [token.address]: token,
@@ -46,6 +53,34 @@ export const selectTokensByChainIdAndAddress = createDeepEqualSelector(
     ) ?? {},
 );
 
+/**
+ * Like {@link selectTokensByChainIdAndAddress} but uses an explicit account
+ * address (e.g. the EVM address for the account group) instead of the globally
+ * selected account. Needed when the UI shows EVM activity while a non-EVM
+ * account is still selected.
+ */
+export const selectTokensByChainIdAndWalletAddress = createDeepEqualSelector(
+  getTokensControllerAllTokens,
+  (_state: RootState, chainId: Hex, _walletAddress: Hex | string | undefined) =>
+    chainId,
+  (_state: RootState, _chainId: Hex, walletAddress: Hex | string | undefined) =>
+    walletAddress,
+  (
+    allTokens: TokensControllerState['allTokens'],
+    chainId: Hex,
+    walletAddress: Hex | string | undefined,
+  ) =>
+    !walletAddress
+      ? {}
+      : (allTokens[chainId]?.[walletAddress as Hex]?.reduce(
+          (tokensMap: { [address: string]: Token }, token: Token) => ({
+            ...tokensMap,
+            [token.address]: token,
+          }),
+          {},
+        ) ?? {}),
+);
+
 export const selectTokensByAddress = createSelector(
   selectTokens,
   (tokens: Token[]) =>
@@ -61,19 +96,20 @@ export const selectTokensLength = createSelector(
 );
 
 export const selectIgnoreTokens = createSelector(
-  selectTokensControllerState,
+  getTokensControllerAllIgnoredTokens,
   selectEvmChainId,
   selectSelectedInternalAccountAddress,
   (
-    tokensControllerState: TokensControllerState,
+    allIgnoredTokens: TokensControllerState['allIgnoredTokens'],
     chainId: Hex,
     selectedAddress: string | undefined,
-  ) =>
-    tokensControllerState?.allIgnoredTokens?.[chainId]?.[
-      selectedAddress as Hex
-    ],
+  ) => allIgnoredTokens?.[chainId]?.[selectedAddress as Hex],
 );
 
+/**
+ * @deprecated
+ * This selector accesses deprecated AssetsController state directly.
+ */
 export const selectDetectedTokens = createSelector(
   selectTokensControllerState,
   selectEvmChainId,
@@ -88,11 +124,7 @@ export const selectDetectedTokens = createSelector(
     ],
 );
 
-export const selectAllTokens = createDeepEqualSelector(
-  selectTokensControllerState,
-  (tokensControllerState: TokensControllerState) =>
-    tokensControllerState?.allTokens,
-);
+export { getTokensControllerAllTokens as selectAllTokens };
 
 export const getChainIdsToPoll = createDeepEqualSelector(
   selectEvmNetworkConfigurationsByChainId,
@@ -112,7 +144,7 @@ export const getChainIdsToPoll = createDeepEqualSelector(
 );
 
 export const selectAllTokensFlat = createSelector(
-  selectAllTokens,
+  getTokensControllerAllTokens,
   (tokensByAccountByChain: {
     [account: string]: { [chainId: string]: Token[] };
   }): Token[] => {
@@ -128,6 +160,10 @@ export const selectAllTokensFlat = createSelector(
   },
 );
 
+/**
+ * @deprecated
+ * This selector accesses deprecated AssetsController state directly.
+ */
 export const selectAllDetectedTokensForSelectedAddress = createSelector(
   selectTokensControllerState,
   selectSelectedInternalAccountAddress,
@@ -180,7 +216,7 @@ export const selectAllDetectedTokensFlat = createSelector(
 
 // Full selector implementation with selected address filtering
 export const selectTransformedTokens = createSelector(
-  selectAllTokens,
+  getTokensControllerAllTokens,
   selectSelectedInternalAccountAddress,
   selectEvmChainId,
   selectIsAllNetworks,
@@ -215,7 +251,7 @@ export const selectTransformedTokens = createSelector(
 );
 
 export const selectSingleTokenByAddressAndChainId = createSelector(
-  selectAllTokens,
+  getTokensControllerAllTokens,
   (_state: RootState, tokenAddress: Hex) => tokenAddress,
   (_state: RootState, _tokenAddress: Hex, chainId: Hex) => chainId,
   (allTokens, tokenAddress, chainId) => {
diff --git a/app/selectors/transactionController.test.ts b/app/selectors/transactionController.test.ts
index 2725e20d6d2..05342181226 100644
--- a/app/selectors/transactionController.test.ts
+++ b/app/selectors/transactionController.test.ts
@@ -4,9 +4,17 @@ import { TransactionType } from '@metamask/transaction-controller';
 import {
   selectTransactions,
   selectLastWithdrawTokenByType,
+  selectLocalTransactions,
   selectNonReplacedTransactions,
+  selectRelatedChainIdsByTransactionId,
+  selectRequiredTransactionIds,
+  selectRequiredTransactionHashes,
+  selectRequiredTransactions,
   selectSwapsTransactions,
+  selectTransactionBatchMetadataById,
   selectTransactionMetadataById,
+  selectTransactionsByBatchId,
+  selectTransactionsByIds,
   selectSortedTransactions,
   selectSortedEVMTransactionsForSelectedAccountGroup,
 } from './transactionController';
@@ -20,6 +28,17 @@ jest.mock('./smartTransactionsController', () => ({
   }) => state.pendingSmartTransactionsForGroup || [],
 }));
 
+jest.mock('./multichainAccounts/accountTreeController', () => ({
+  selectSelectedAccountGroupEvmInternalAccount: (state: {
+    groupEvmAccount?: { address: string } | null;
+  }) => state.groupEvmAccount ?? null,
+}));
+
+jest.mock('./accountsController', () => ({
+  selectEvmAddress: (state: { fallbackEvmAddress?: string }) =>
+    state.fallbackEvmAddress,
+}));
+
 describe('TransactionController Selectors', () => {
   describe('selectTransactions', () => {
     it('returns transactions from TransactionController state', () => {
@@ -96,6 +115,236 @@ describe('TransactionController Selectors', () => {
     });
   });
 
+  describe('selectRequiredTransactionHashes', () => {
+    it('returns hashes for required child transactions', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            TransactionController: {
+              transactions: [
+                {
+                  id: 'parent',
+                  requiredTransactionIds: ['child'],
+                },
+                {
+                  id: 'child',
+                  hash: '0xABC',
+                },
+              ],
+            },
+          },
+        },
+      } as unknown as RootState;
+
+      expect(selectRequiredTransactionHashes(state)).toStrictEqual(
+        new Set(['0xabc']),
+      );
+    });
+  });
+
+  describe('selectRequiredTransactionIds', () => {
+    it('returns required child transaction ids', () => {
+      const state = {
+        engine: {
+          backgroundState: {
+            TransactionController: {
+              transactions: [
+                {
+                  id: 'parent',
+                  requiredTransactionIds: ['child-1', 'child-2'],
+                },
+                {
+                  id: 'child-1',
+                },
+              ],
+            },
+          },
+        },
+      } as unknown as RootState;
+
+      expect(selectRequiredTransactionIds(state)).toStrictEqual(
+        new Set(['child-1', 'child-2']),
+      );
+    });
+  });
+
+  describe('selectRequiredTransactions', () => {
+    it('returns transactions referenced by required ids', () => {
+      const child = {
+        id: 'child',
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            TransactionController: {
+              transactions: [
+                {
+                  id: 'parent',
+                  requiredTransactionIds: ['child'],
+                },
+                child,
+              ],
+            },
+          },
+        },
+      } as unknown as RootState;
+
+      expect(selectRequiredTransactions(state)).toStrictEqual([child]);
+    });
+  });
+
+  describe('selectRelatedChainIdsByTransactionId', () => {
+    const buildState = (transactions: unknown[]) =>
+      ({
+        engine: {
+          backgroundState: {
+            TransactionController: { transactions },
+          },
+        },
+      }) as unknown as RootState;
+
+    it('returns the transaction own chain id, lower-cased', () => {
+      const state = buildState([{ id: 'lone', chainId: '0xA4B1' }]);
+
+      expect(selectRelatedChainIdsByTransactionId(state).get('lone')).toEqual([
+        '0xa4b1',
+      ]);
+    });
+
+    it('includes metamaskPay.chainId for gasless MetaMask Pay parents', () => {
+      const state = buildState([
+        {
+          id: 'pay-parent',
+          chainId: '0xA4B1',
+          metamaskPay: { chainId: '0x1' },
+        },
+      ]);
+
+      expect(
+        selectRelatedChainIdsByTransactionId(state).get('pay-parent')?.sort(),
+      ).toEqual(['0x1', '0xa4b1']);
+    });
+
+    it('includes chain ids of required (child) transactions', () => {
+      const state = buildState([
+        {
+          id: 'parent',
+          chainId: '0xA4B1',
+          requiredTransactionIds: ['child-1', 'child-2'],
+        },
+        { id: 'child-1', chainId: '0x1' },
+        { id: 'child-2', chainId: '0xA' },
+      ]);
+
+      expect(
+        selectRelatedChainIdsByTransactionId(state).get('parent')?.sort(),
+      ).toEqual(['0x1', '0xa', '0xa4b1']);
+    });
+
+    it('dedupes overlapping chain ids', () => {
+      const state = buildState([
+        {
+          id: 'parent',
+          chainId: '0x1',
+          metamaskPay: { chainId: '0x1' },
+          requiredTransactionIds: ['child'],
+        },
+        { id: 'child', chainId: '0x1' },
+      ]);
+
+      expect(selectRelatedChainIdsByTransactionId(state).get('parent')).toEqual(
+        ['0x1'],
+      );
+    });
+
+    it('ignores required ids that point to missing children', () => {
+      const state = buildState([
+        { id: 'parent', chainId: '0x1', requiredTransactionIds: ['ghost'] },
+      ]);
+
+      expect(selectRelatedChainIdsByTransactionId(state).get('parent')).toEqual(
+        ['0x1'],
+      );
+    });
+  });
+
+  describe('selectLocalTransactions', () => {
+    const evmAddress = '0x0000000000000000000000000000000000000001';
+
+    const buildLocalTxState = ({
+      groupEvmAccount = { address: evmAddress },
+      transactions,
+    }: {
+      groupEvmAccount?: { address: string } | null;
+      transactions?: unknown[];
+    } = {}) =>
+      ({
+        engine: {
+          backgroundState: {
+            TransactionController: {
+              transactions: transactions ?? [
+                {
+                  id: 'child',
+                  hash: '0xCHILD',
+                  chainId: '0x1',
+                  time: 200,
+                  txParams: { from: evmAddress, nonce: '0x1' },
+                },
+                {
+                  id: 'parent',
+                  chainId: '0x1',
+                  requiredTransactionIds: ['child'],
+                  time: 100,
+                  type: TransactionType.predictDeposit,
+                  txParams: { from: evmAddress, nonce: '0x1' },
+                },
+              ],
+            },
+          },
+        },
+        groupEvmAccount,
+        pendingSmartTransactionsForGroup: [],
+      }) as unknown as RootState;
+
+    it('filters required child transactions before nonce dedupe', () => {
+      expect(selectLocalTransactions(buildLocalTxState())).toStrictEqual([
+        expect.objectContaining({ id: 'parent' }),
+      ]);
+    });
+
+    it('returns no transactions when the selected group has no EVM account', () => {
+      expect(
+        selectLocalTransactions(buildLocalTxState({ groupEvmAccount: null })),
+      ).toStrictEqual([]);
+    });
+
+    it('excludes incoming transactions populated by the TransactionController incoming-transactions feature', () => {
+      const state = buildLocalTxState({
+        transactions: [
+          {
+            id: 'outgoing',
+            hash: '0xOUTGOING',
+            chainId: '0x1',
+            time: 200,
+            txParams: { from: evmAddress, nonce: '0x1' },
+          },
+          {
+            id: 'incoming-duplicate',
+            hash: '0xOUTGOING',
+            chainId: '0x1',
+            time: 100,
+            isTransfer: true,
+            txParams: { from: evmAddress },
+          },
+        ],
+      });
+
+      expect(selectLocalTransactions(state)).toStrictEqual([
+        expect.objectContaining({ id: 'outgoing' }),
+      ]);
+    });
+  });
+
   describe('selectTransactionMetadataById', () => {
     it('returns the transaction matching the given id', () => {
       const transactions = [
@@ -138,6 +387,78 @@ describe('TransactionController Selectors', () => {
     });
   });
 
+  describe('selectTransactionBatchMetadataById', () => {
+    it('returns the transaction batch matching the given id', () => {
+      const batch = {
+        id: 'batch-id',
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            TransactionController: {
+              transactions: [],
+              transactionBatches: [batch],
+            },
+          },
+        },
+      } as unknown as RootState;
+
+      expect(selectTransactionBatchMetadataById(state, 'batch-id')).toBe(batch);
+    });
+  });
+
+  describe('selectTransactionsByIds', () => {
+    it('returns matching transactions in requested id order', () => {
+      const first = {
+        id: 'first',
+      };
+      const second = {
+        id: 'second',
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            TransactionController: {
+              transactions: [first, second],
+            },
+          },
+        },
+      } as unknown as RootState;
+
+      expect(
+        selectTransactionsByIds(state, ['second', 'missing', 'first']),
+      ).toStrictEqual([second, first]);
+    });
+  });
+
+  describe('selectTransactionsByBatchId', () => {
+    it('returns transactions matching the batch id', () => {
+      const matchingTransaction = {
+        id: 'matching',
+        batchId: 'batch-id',
+      };
+      const state = {
+        engine: {
+          backgroundState: {
+            TransactionController: {
+              transactions: [
+                matchingTransaction,
+                {
+                  id: 'other',
+                  batchId: 'other-batch-id',
+                },
+              ],
+            },
+          },
+        },
+      } as unknown as RootState;
+
+      expect(selectTransactionsByBatchId(state, 'batch-id')).toStrictEqual([
+        matchingTransaction,
+      ]);
+    });
+  });
+
   describe('selectSortedTransactions', () => {
     it('merges non-replaced transactions and pending smart transactions and sorts them descending by time', () => {
       // Transactions with one replaced transaction and two non-replaced ones
diff --git a/app/selectors/transactionController.ts b/app/selectors/transactionController.ts
index 0c34e5e5c65..2c40968dac8 100644
--- a/app/selectors/transactionController.ts
+++ b/app/selectors/transactionController.ts
@@ -5,17 +5,57 @@ import {
   selectPendingSmartTransactionsBySender,
   selectPendingSmartTransactionsForSelectedAccountGroup,
 } from './smartTransactionsController';
+import { selectEvmAddress } from './accountsController';
+import { selectSelectedAccountGroupEvmInternalAccount } from './multichainAccounts/accountTreeController';
 import {
   TransactionMeta,
   TransactionType,
 } from '@metamask/transaction-controller';
 import { Hex } from '@metamask/utils';
+import { SmartTransaction } from '@metamask/smart-transactions-controller';
+import { areAddressesEqual } from '../util/address';
 
 interface MetaMaskPayToken {
   address: Hex;
   chainId: Hex;
 }
 
+type LocalTransaction = TransactionMeta | SmartTransaction;
+
+// Extracted from UnifiedTransactionsView
+function dedupeTransactions(transactions: LocalTransaction[]) {
+  const seenTransactions = new Set<string>();
+
+  return transactions.filter((transaction) => {
+    const { chainId, txParams, id, isTransfer } =
+      transaction as TransactionMeta;
+    const { from, nonce } = txParams || {};
+    const hash = 'hash' in transaction ? transaction.hash : undefined;
+    const isBridgeTransaction = transaction.type === TransactionType.bridge;
+    const hasNonce = nonce !== undefined && nonce !== null;
+
+    if (!from || isTransfer !== undefined) {
+      return false;
+    }
+
+    const dedupeKeyPrefix = `${chainId}-${String(from).toLowerCase()}`;
+    const dedupeKey =
+      isBridgeTransaction && hash
+        ? `${dedupeKeyPrefix}-bridge-${hash.toLowerCase()}`
+        : hasNonce
+          ? `${dedupeKeyPrefix}-${nonce}`
+          : `${dedupeKeyPrefix}-${id}`;
+
+    // Keep only the first local transaction for each dedupe key
+    if (seenTransactions.has(dedupeKey)) {
+      return false;
+    }
+
+    seenTransactions.add(dedupeKey);
+    return true;
+  });
+}
+
 function getNestedTransactionTypes(
   transaction: TransactionMeta,
 ): TransactionType[] {
@@ -55,6 +95,57 @@ const selectTransactionBatchesStrict = createSelector(
   (transactionControllerState) => transactionControllerState.transactionBatches,
 );
 
+export const selectRequiredTransactionIds = createSelector(
+  selectTransactionsStrict,
+  (transactions) =>
+    new Set(transactions.flatMap((tx) => tx.requiredTransactionIds ?? [])),
+);
+
+export const selectRequiredTransactions = createSelector(
+  [selectTransactionsStrict, selectRequiredTransactionIds],
+  (transactions, requiredTransactionIds) =>
+    transactions.filter((tx) => requiredTransactionIds.has(tx.id)),
+);
+
+export const selectRequiredTransactionHashes = createSelector(
+  selectRequiredTransactions,
+  (transactions) =>
+    new Set(
+      transactions
+        .map((tx) => tx.hash?.toLowerCase())
+        .filter((hash): hash is string => Boolean(hash)),
+    ),
+);
+
+export const selectRelatedChainIdsByTransactionId = createSelector(
+  selectTransactionsStrict,
+  (transactions) => {
+    const transactionsById = new Map<string, TransactionMeta>(
+      transactions.map((tx) => [tx.id, tx]),
+    );
+
+    return new Map<string, string[]>(
+      transactions
+        .map((tx) => {
+          const childChainIds = (tx.requiredTransactionIds ?? []).map(
+            (childId) => transactionsById.get(childId)?.chainId,
+          );
+
+          const chainIds = [
+            tx.chainId,
+            tx.metamaskPay?.chainId,
+            ...childChainIds,
+          ]
+            .filter((chainId): chainId is Hex => Boolean(chainId))
+            .map((chainId) => chainId.toLowerCase());
+
+          return [tx.id, [...new Set(chainIds)]] satisfies [string, string[]];
+        })
+        .filter(([, chainIds]) => chainIds.length > 0),
+    );
+  },
+);
+
 export const selectTransactions = createDeepEqualSelector(
   selectTransactionsStrict,
   (transactions) => transactions,
@@ -125,6 +216,53 @@ export const selectSortedEVMTransactionsForSelectedAccountGroup =
       ),
   );
 
+export const selectLocalTransactions = createDeepEqualSelector(
+  [
+    selectNonReplacedTransactions,
+    selectPendingSmartTransactionsForSelectedAccountGroup,
+    selectSelectedAccountGroupEvmInternalAccount,
+    selectEvmAddress,
+    selectRequiredTransactionIds,
+  ],
+  (
+    nonReplacedTransactions,
+    pendingSmartTransactions,
+    groupEvmAccount,
+    fallbackEvmAddress,
+    requiredTransactionIds,
+  ) => {
+    const activeEvmAddress = groupEvmAccount?.address ?? fallbackEvmAddress;
+
+    const transactions = nonReplacedTransactions.filter((transaction) => {
+      if (requiredTransactionIds.has(transaction.id)) {
+        return false;
+      }
+
+      const fromAddress = transaction.txParams?.from;
+      if (!fromAddress || !activeEvmAddress) {
+        return false;
+      }
+
+      return areAddressesEqual(fromAddress, activeEvmAddress);
+    });
+
+    const pendingSmartTransactionsForActiveAddress =
+      pendingSmartTransactions.filter((transaction) => {
+        const fromAddress = transaction.txParams?.from;
+        if (!fromAddress || !activeEvmAddress) {
+          return false;
+        }
+
+        return areAddressesEqual(fromAddress, activeEvmAddress);
+      });
+
+    return dedupeTransactions([
+      ...transactions,
+      ...pendingSmartTransactionsForActiveAddress,
+    ]).sort((a, b) => (b?.time ?? 0) - (a?.time ?? 0));
+  },
+);
+
 export const selectSwapsTransactions = createSelector(
   selectTransactionControllerState,
   (transactionControllerState) =>
diff --git a/app/store/migrations/133.test.ts b/app/store/migrations/133.test.ts
new file mode 100644
index 00000000000..59a6f0b4cd3
--- /dev/null
+++ b/app/store/migrations/133.test.ts
@@ -0,0 +1,332 @@
+import { cloneDeep } from 'lodash';
+
+import migrate from './133';
+import { ensureValidState } from './util';
+
+jest.mock('./util', () => ({
+  ensureValidState: jest.fn(),
+}));
+
+interface PerpsShape {
+  engine: {
+    backgroundState: {
+      PerpsController: {
+        accountState: Record<string, unknown>;
+      };
+    };
+  };
+}
+
+const getAccountState = (state: unknown): Record<string, unknown> =>
+  (state as PerpsShape).engine.backgroundState.PerpsController.accountState;
+
+const getSubAccountBreakdown = (
+  state: unknown,
+): Record<string, Record<string, unknown>> =>
+  getAccountState(state).subAccountBreakdown as Record<
+    string,
+    Record<string, unknown>
+  >;
+
+describe('migration 133', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.mocked(ensureValidState).mockReturnValue(true);
+  });
+
+  it('does not modify the state when ensureValidState returns false', () => {
+    const state = { some: 'state' };
+    jest.mocked(ensureValidState).mockReturnValueOnce(false);
+
+    const result = migrate(state);
+
+    expect(result).toBe(state);
+  });
+
+  it('returns state unchanged when PerpsController is absent', () => {
+    const state = { engine: { backgroundState: {} } };
+    const before = cloneDeep(state);
+
+    const result = migrate(state);
+
+    expect(result).toBe(state);
+    expect(result).toEqual(before);
+  });
+
+  it('returns state unchanged when PerpsController.accountState is absent', () => {
+    const state = {
+      engine: {
+        backgroundState: {
+          PerpsController: { activeProvider: 'hyperliquid' },
+        },
+      },
+    };
+    const before = cloneDeep(state);
+
+    const result = migrate(state);
+
+    expect(result).toBe(state);
+    expect(result).toEqual(before);
+  });
+
+  it('maps legacy availableToTradeBalance → spendableBalance and availableBalance → withdrawableBalance (asymmetric)', () => {
+    const state = {
+      engine: {
+        backgroundState: {
+          PerpsController: {
+            accountState: {
+              availableBalance: '10',
+              availableToTradeBalance: '100',
+              totalBalance: '100',
+              marginUsed: '0',
+              unrealizedPnl: '0',
+              returnOnEquity: '0',
+            },
+          },
+        },
+      },
+    } as unknown as Record<string, unknown>;
+
+    migrate(state);
+
+    const acc = getAccountState(state);
+    expect(acc.spendableBalance).toBe('100');
+    expect(acc.withdrawableBalance).toBe('10');
+    expect(acc.totalBalance).toBe('100');
+    expect('availableBalance' in acc).toBe(false);
+    expect('availableToTradeBalance' in acc).toBe(false);
+  });
+
+  it('falls back to availableBalance for spendableBalance when availableToTradeBalance is absent', () => {
+    const state = {
+      engine: {
+        backgroundState: {
+          PerpsController: {
+            accountState: {
+              availableBalance: '25',
+              totalBalance: '25',
+              marginUsed: '0',
+              unrealizedPnl: '0',
+              returnOnEquity: '0',
+            },
+          },
+        },
+      },
+    } as unknown as Record<string, unknown>;
+
+    migrate(state);
+
+    const acc = getAccountState(state);
+    expect(acc.spendableBalance).toBe('25');
+    expect(acc.withdrawableBalance).toBe('25');
+    expect('availableBalance' in acc).toBe(false);
+  });
+
+  it('maps tradeable-only legacy state to spendableBalance and keeps withdrawableBalance at "0"', () => {
+    const state = {
+      engine: {
+        backgroundState: {
+          PerpsController: {
+            accountState: {
+              availableToTradeBalance: '42',
+              totalBalance: '42',
+              marginUsed: '0',
+              unrealizedPnl: '0',
+              returnOnEquity: '0',
+            },
+          },
+        },
+      },
+    } as unknown as Record<string, unknown>;
+
+    migrate(state);
+
+    const acc = getAccountState(state);
+    expect(acc.spendableBalance).toBe('42');
+    expect(acc.withdrawableBalance).toBe('0');
+    expect('availableToTradeBalance' in acc).toBe(false);
+  });
+
+  it('coerces numeric legacy values (defensive — pre-refactor dev branches could have written numbers)', () => {
+    const state = {
+      engine: {
+        backgroundState: {
+          PerpsController: {
+            accountState: {
+              availableBalance: 10,
+              availableToTradeBalance: 100,
+              totalBalance: '100',
+              marginUsed: '0',
+              unrealizedPnl: '0',
+              returnOnEquity: '0',
+              subAccountBreakdown: {
+                '': { availableBalance: 7, totalBalance: '7' },
+              },
+            },
+          },
+        },
+      },
+    } as unknown as Record<string, unknown>;
+
+    migrate(state);
+
+    const acc = getAccountState(state);
+    expect(acc.spendableBalance).toBe('100');
+    expect(acc.withdrawableBalance).toBe('10');
+    expect('availableBalance' in acc).toBe(false);
+    const breakdown = getSubAccountBreakdown(state);
+    expect(breakdown['']).toEqual({
+      spendableBalance: '7',
+      withdrawableBalance: '7',
+      totalBalance: '7',
+    });
+  });
+
+  it('defaults both new fields to "0" when legacy fields are null or missing — no NaN downstream', () => {
+    const state = {
+      engine: {
+        backgroundState: {
+          PerpsController: {
+            accountState: {
+              availableBalance: null,
+              totalBalance: '0',
+              marginUsed: '0',
+              unrealizedPnl: '0',
+              returnOnEquity: '0',
+            },
+          },
+        },
+      },
+    } as unknown as Record<string, unknown>;
+
+    migrate(state);
+
+    const acc = getAccountState(state);
+    expect(acc.spendableBalance).toBe('0');
+    expect(acc.withdrawableBalance).toBe('0');
+    expect('availableBalance' in acc).toBe(false);
+  });
+
+  it('is idempotent — running twice produces the same shape', () => {
+    const state = {
+      engine: {
+        backgroundState: {
+          PerpsController: {
+            accountState: {
+              availableBalance: '10',
+              availableToTradeBalance: '100',
+              totalBalance: '100',
+              marginUsed: '0',
+              unrealizedPnl: '0',
+              returnOnEquity: '0',
+            },
+          },
+        },
+      },
+    } as unknown as Record<string, unknown>;
+
+    migrate(state);
+    const firstPass = cloneDeep(getAccountState(state));
+    migrate(state);
+
+    expect(getAccountState(state)).toEqual(firstPass);
+  });
+
+  it('does not overwrite an already-migrated spendableBalance', () => {
+    const state = {
+      engine: {
+        backgroundState: {
+          PerpsController: {
+            accountState: {
+              spendableBalance: '50',
+              withdrawableBalance: '50',
+              totalBalance: '50',
+              marginUsed: '0',
+              unrealizedPnl: '0',
+              returnOnEquity: '0',
+            },
+          },
+        },
+      },
+    } as unknown as Record<string, unknown>;
+
+    migrate(state);
+
+    const acc = getAccountState(state);
+    expect(acc.spendableBalance).toBe('50');
+    expect(acc.withdrawableBalance).toBe('50');
+  });
+
+  it('migrates subAccountBreakdown entries symmetrically from legacy availableBalance', () => {
+    const state = {
+      engine: {
+        backgroundState: {
+          PerpsController: {
+            accountState: {
+              availableBalance: '10',
+              availableToTradeBalance: '100',
+              totalBalance: '100',
+              marginUsed: '0',
+              unrealizedPnl: '0',
+              returnOnEquity: '0',
+              subAccountBreakdown: {
+                '': { availableBalance: '7', totalBalance: '7' },
+                xyz: { availableBalance: '3', totalBalance: '3' },
+              },
+            },
+          },
+        },
+      },
+    } as unknown as Record<string, unknown>;
+
+    migrate(state);
+
+    const breakdown = getSubAccountBreakdown(state);
+    expect(breakdown['']).toEqual({
+      spendableBalance: '7',
+      withdrawableBalance: '7',
+      totalBalance: '7',
+    });
+    expect(breakdown.xyz).toEqual({
+      spendableBalance: '3',
+      withdrawableBalance: '3',
+      totalBalance: '3',
+    });
+  });
+
+  it('defaults subAccountBreakdown entries to "0" when legacy field is missing or non-string', () => {
+    const state = {
+      engine: {
+        backgroundState: {
+          PerpsController: {
+            accountState: {
+              availableBalance: '10',
+              totalBalance: '10',
+              marginUsed: '0',
+              unrealizedPnl: '0',
+              returnOnEquity: '0',
+              subAccountBreakdown: {
+                '': { availableBalance: null, totalBalance: '5' },
+                xyz: { totalBalance: '0' },
+              },
+            },
+          },
+        },
+      },
+    } as unknown as Record<string, unknown>;
+
+    migrate(state);
+
+    const breakdown = getSubAccountBreakdown(state);
+    expect(breakdown['']).toEqual({
+      spendableBalance: '0',
+      withdrawableBalance: '0',
+      totalBalance: '5',
+    });
+    expect(breakdown.xyz).toEqual({
+      spendableBalance: '0',
+      withdrawableBalance: '0',
+      totalBalance: '0',
+    });
+  });
+});
diff --git a/app/store/migrations/133.ts b/app/store/migrations/133.ts
new file mode 100644
index 00000000000..b8727b90aee
--- /dev/null
+++ b/app/store/migrations/133.ts
@@ -0,0 +1,138 @@
+import { hasProperty, isObject } from '@metamask/utils';
+import { ensureValidState } from './util';
+
+/**
+ * Migration 133:
+ *
+ * TAT-3047 reshapes PerpsController.accountState balance fields. The
+ * `availableBalance` + optional `availableToTradeBalance` pair is replaced
+ * by `spendableBalance` + `withdrawableBalance`.
+ *
+ * `accountState` is persisted. Without this migration, existing installs
+ * rehydrate an accountState whose legacy keys no longer match what
+ * consumers read, leaving balance UIs at 0/-- until a fresh fetch lands,
+ * which blocks order-entry and withdraw on cold start, offline use, or
+ * slow startup.
+ *
+ * Mapping preserves pre-refactor semantics per legacy field.
+ *
+ * `spendableBalance` takes `availableToTradeBalance` ?? `availableBalance`.
+ * Pre-refactor the TAT-3016 hotfix folded spot USDC into
+ * `availableToTradeBalance` for the order-entry path, so that is the
+ * correct pre-refactor "max collateral for a new position" value.
+ *
+ * `withdrawableBalance` takes `availableBalance` only. Pre-refactor
+ * `availableBalance` was perps-clearinghouse withdrawable only — the
+ * correct cap for Standard-mode withdraw validation.
+ *
+ * The asymmetric mapping avoids inflating `withdrawableBalance` on cold
+ * start for migrated Standard-mode users (where `availableToTradeBalance`
+ * would include folded spot that HL won't actually let out). A fresh WS
+ * fetch within ~1-2s of launch replaces the migrated values with live
+ * post-refactor adapter output.
+ *
+ * The `subAccountBreakdown` entries (HIP-3) migrate from the legacy
+ * `{ availableBalance, totalBalance }` shape to
+ * `{ spendableBalance, withdrawableBalance, totalBalance }`. Sub-account
+ * legacy `availableBalance` was the per-DEX perps-only value (no spot
+ * fold), so both new sub fields take that value.
+ */
+const migration = (state: unknown): unknown => {
+  const migrationVersion = 133;
+
+  if (!ensureValidState(state, migrationVersion)) {
+    return state;
+  }
+
+  if (
+    !hasProperty(state.engine.backgroundState, 'PerpsController') ||
+    !isObject(state.engine.backgroundState.PerpsController)
+  ) {
+    return state;
+  }
+
+  const { PerpsController } = state.engine.backgroundState;
+
+  if (
+    !hasProperty(PerpsController, 'accountState') ||
+    !isObject(PerpsController.accountState)
+  ) {
+    return state;
+  }
+
+  const accountState = PerpsController.accountState as Record<string, unknown>;
+
+  const coerceLegacyBalance = (value: unknown): string | undefined => {
+    if (typeof value === 'string') return value;
+    if (typeof value === 'number' && Number.isFinite(value)) {
+      return value.toString();
+    }
+    return undefined;
+  };
+
+  const legacyAvailable = coerceLegacyBalance(accountState.availableBalance);
+  const legacyTradeable = coerceLegacyBalance(
+    accountState.availableToTradeBalance,
+  );
+
+  const hasNewSpendable = hasProperty(accountState, 'spendableBalance');
+  const hasNewWithdrawable = hasProperty(accountState, 'withdrawableBalance');
+  const hasLegacyKey =
+    hasProperty(accountState, 'availableBalance') ||
+    hasProperty(accountState, 'availableToTradeBalance');
+
+  if (hasLegacyKey || !hasNewSpendable || !hasNewWithdrawable) {
+    const spendableResolved = legacyTradeable ?? legacyAvailable ?? '0';
+    const withdrawableResolved = legacyAvailable ?? '0';
+    if (!hasNewSpendable) {
+      accountState.spendableBalance = spendableResolved;
+    }
+    if (!hasNewWithdrawable) {
+      accountState.withdrawableBalance = withdrawableResolved;
+    }
+    // Always strip the legacy keys — including `null`/non-string shapes we
+    // couldn't interpret — so downstream code never reads a stale field.
+    delete accountState.availableBalance;
+    delete accountState.availableToTradeBalance;
+  }
+
+  if (
+    hasProperty(accountState, 'subAccountBreakdown') &&
+    isObject(accountState.subAccountBreakdown)
+  ) {
+    const breakdown = accountState.subAccountBreakdown as Record<
+      string,
+      unknown
+    >;
+    for (const key of Object.keys(breakdown)) {
+      const entry = breakdown[key];
+      if (!isObject(entry)) {
+        continue;
+      }
+      const entryRecord = entry as Record<string, unknown>;
+      const legacySubAvailable = coerceLegacyBalance(
+        entryRecord.availableBalance,
+      );
+      const hasSubLegacyKey = hasProperty(entryRecord, 'availableBalance');
+      const hasSubNewSpendable = hasProperty(entryRecord, 'spendableBalance');
+      const hasSubNewWithdrawable = hasProperty(
+        entryRecord,
+        'withdrawableBalance',
+      );
+      if (hasSubLegacyKey || !hasSubNewSpendable || !hasSubNewWithdrawable) {
+        const resolved = legacySubAvailable ?? '0';
+        if (!hasSubNewSpendable) {
+          entryRecord.spendableBalance = resolved;
+        }
+        if (!hasSubNewWithdrawable) {
+          entryRecord.withdrawableBalance = resolved;
+        }
+        delete entryRecord.availableBalance;
+      }
+    }
+  }
+
+  return state;
+};
+
+export default migration;
diff --git a/app/store/migrations/134.test.ts b/app/store/migrations/134.test.ts
new file mode 100644
index 00000000000..e485c9ca363
--- /dev/null
+++ b/app/store/migrations/134.test.ts
@@ -0,0 +1,168 @@
+import { captureException } from '@sentry/react-native';
+import migrate, { migrationVersion } from './134';
+import { ensureValidState } from './util';
+
+jest.mock('@sentry/react-native', () => ({
+  captureException: jest.fn(),
+}));
+
+jest.mock('./util', () => ({
+  ensureValidState: jest.fn(),
+}));
+
+const mockedEnsureValidState = jest.mocked(ensureValidState);
+const mockedCaptureException = jest.mocked(captureException);
+
+const SEI_MAINNET_CHAIN_ID = '0x531';
+
+interface SeiNetworkConfiguration {
+  blockExplorerUrls: string[];
+  chainId: string;
+  defaultBlockExplorerUrlIndex?: number;
+  defaultRpcEndpointIndex: number;
+  name: string;
+  nativeCurrency: string;
+  rpcEndpoints: {
+    networkClientId: string;
+    url: string;
+    type: string;
+    failoverUrls?: string[];
+  }[];
+}
+
+interface TestState {
+  engine: {
+    backgroundState: {
+      NetworkController?: {
+        networkConfigurationsByChainId?: Record<
+          string,
+          SeiNetworkConfiguration
+        >;
+        selectedNetworkClientId?: string;
+        [key: string]: unknown;
+      };
+      [key: string]: unknown;
+    };
+  };
+  [key: string]: unknown;
+}
+
+function buildSeiConfig(blockExplorerUrls: string[]): SeiNetworkConfiguration {
+  return {
+    blockExplorerUrls,
+    chainId: SEI_MAINNET_CHAIN_ID,
+    defaultBlockExplorerUrlIndex: 0,
+    defaultRpcEndpointIndex: 0,
+    name: 'Sei',
+    nativeCurrency: 'SEI',
+    rpcEndpoints: [
+      {
+        networkClientId: 'sei-mainnet',
+        url: 'https://sei-mainnet.infura.io/v3/fake',
+        type: 'custom',
+      },
+    ],
+  };
+}
+
+function buildState(seiConfig?: SeiNetworkConfiguration): TestState {
+  return {
+    engine: {
+      backgroundState: {
+        NetworkController: {
+          networkConfigurationsByChainId: seiConfig
+            ? { [SEI_MAINNET_CHAIN_ID]: seiConfig }
+            : {},
+          selectedNetworkClientId: 'mainnet',
+        },
+      },
+    },
+  };
+}
+
+describe(`Migration ${migrationVersion}: Replace Seitrace with Seiscan for Sei Mainnet`, () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockedEnsureValidState.mockReturnValue(true);
+  });
+
+  it('reports the expected migration version', () => {
+    expect(migrationVersion).toBe(134);
+  });
+
+  it('rewrites Seitrace block explorer URL to Seiscan for Sei Mainnet', () => {
+    const state = buildState(buildSeiConfig(['https://seitrace.com']));
+
+    const result = migrate(state) as TestState;
+
+    const seiConfig =
+      result.engine.backgroundState.NetworkController
+        ?.networkConfigurationsByChainId?.[SEI_MAINNET_CHAIN_ID];
+    expect(seiConfig?.blockExplorerUrls).toStrictEqual(['https://seiscan.io/']);
+    expect(mockedCaptureException).not.toHaveBeenCalled();
+  });
+
+  it('leaves state unchanged when Sei Mainnet is not configured', () => {
+    const state: TestState = {
+      engine: {
+        backgroundState: {
+          NetworkController: {
+            networkConfigurationsByChainId: {
+              '0x1': buildSeiConfig(['https://etherscan.io']),
+            },
+            selectedNetworkClientId: 'mainnet',
+          },
+        },
+      },
+    };
+    const snapshotBefore = JSON.stringify(state);
+
+    const result = migrate(state);
+
+    expect(JSON.stringify(result)).toBe(snapshotBefore);
+    expect(mockedCaptureException).not.toHaveBeenCalled();
+  });
+
+  it('silently skips when NetworkController is missing (upgrade-from-old-version)', () => {
+    const state = {
+      engine: {
+        backgroundState: {
+          SomeOtherController: { foo: 'bar' },
+        },
+      },
+    };
+    const snapshotBefore = JSON.stringify(state);
+
+    const result = migrate(state);
+
+    expect(JSON.stringify(result)).toBe(snapshotBefore);
+    expect(mockedCaptureException).not.toHaveBeenCalled();
+  });
+
+  it('does not touch user-customized block explorer URLs', () => {
+    const state = buildState(buildSeiConfig(['https://seistream.app']));
+
+    const result = migrate(state) as TestState;
+
+    const seiConfig =
+      result.engine.backgroundState.NetworkController
+        ?.networkConfigurationsByChainId?.[SEI_MAINNET_CHAIN_ID];
+    expect(seiConfig?.blockExplorerUrls).toStrictEqual([
+      'https://seistream.app',
+    ]);
+    expect(mockedCaptureException).not.toHaveBeenCalled();
+  });
+
+  it('does not rewrite a URL whose host only starts with seitrace.com', () => {
+    const lookalike = 'https://seitrace.com.attacker.example/path';
+    const state = buildState(buildSeiConfig([lookalike]));
+
+    const result = migrate(state) as TestState;
+
+    const seiConfig =
+      result.engine.backgroundState.NetworkController
+        ?.networkConfigurationsByChainId?.[SEI_MAINNET_CHAIN_ID];
+    expect(seiConfig?.blockExplorerUrls).toStrictEqual([lookalike]);
+    expect(mockedCaptureException).not.toHaveBeenCalled();
+  });
+});
diff --git a/app/store/migrations/134.ts b/app/store/migrations/134.ts
new file mode 100644
index 00000000000..c332a0e1b1b
--- /dev/null
+++ b/app/store/migrations/134.ts
@@ -0,0 +1,176 @@
+import { captureException } from '@sentry/react-native';
+import {
+  getErrorMessage,
+  hasProperty,
+  Hex,
+  isHexString,
+  isObject,
+} from '@metamask/utils';
+
+import { ensureValidState } from './util';
+
+/**
+ * Migration 134: replace the deprecated Seitrace block explorer URL
+ * (`seitrace.com`, being decommissioned) with its replacement Seiscan
+ * (`seiscan.io`) for Sei Mainnet on existing user installs.
+ *
+ * Users without Sei Mainnet configured: no-op (silent).
+ * Users who customized the explorer URL away from Seitrace: no-op
+ * (only entries that still point at `seitrace.com` are rewritten).
+ * Users missing `NetworkController` entirely: no-op (silent) — expected
+ * during upgrade-from-old-version.
+ */
+export const migrationVersion = 134;
+
+const SEI_MAINNET_CHAIN_ID: Hex = '0x531'; // 1329
+const OLD_HOSTNAME = 'seitrace.com';
+const NEW_HOSTNAME = 'seiscan.io';
+
+interface RpcEndpoint {
+  failoverUrls?: string[];
+  name?: string;
+  networkClientId: string;
+  url: string;
+  type: string;
+}
+
+interface NetworkConfiguration {
+  blockExplorerUrls: string[];
+  chainId: Hex;
+  defaultBlockExplorerUrlIndex?: number;
+  defaultRpcEndpointIndex: number;
+  name: string;
+  nativeCurrency: string;
+  rpcEndpoints: RpcEndpoint[];
+}
+
+const migration = (state: unknown): unknown => {
+  if (!ensureValidState(state, migrationVersion)) {
+    return state;
+  }
+
+  try {
+    const networkControllerState = validateNetworkController(state);
+    if (networkControllerState === undefined) {
+      return state;
+    }
+
+    const { networkConfigurationsByChainId } = networkControllerState;
+    if (!hasProperty(networkConfigurationsByChainId, SEI_MAINNET_CHAIN_ID)) {
+      return state;
+    }
+
+    const seiConfig = networkConfigurationsByChainId[SEI_MAINNET_CHAIN_ID];
+    if (!isValidNetworkConfiguration(seiConfig)) {
+      return state;
+    }
+
+    const rewritten = seiConfig.blockExplorerUrls.map((url) => {
+      try {
+        const parsed = new URL(url);
+        if (parsed.hostname === OLD_HOSTNAME) {
+          parsed.hostname = NEW_HOSTNAME;
+          return parsed.toString();
+        }
+      } catch {
+        // not a valid URL, leave as-is
+      }
+      return url;
+    });
+    const didChange = rewritten.some(
+      (url, index) => url !== seiConfig.blockExplorerUrls[index],
+    );
+
+    if (didChange) {
+      seiConfig.blockExplorerUrls = rewritten;
+    }
+  } catch (error) {
+    captureException(
+      new Error(
+        `Migration ${migrationVersion}: Failed to rewrite Sei Mainnet block explorer URL: ${getErrorMessage(
+          error,
+        )}`,
+      ),
+    );
+  }
+
+  return state;
+};
+
+export default migration;
+
+// Sentry logging is intentionally omitted — expected-missing states
+// (NetworkController absent, Sei not configured) are not errors.
+function validateNetworkController(state: {
+  engine: { backgroundState: Record<string, unknown> };
+}):
+  | {
+      networkConfigurationsByChainId: Record<Hex, unknown>;
+      selectedNetworkClientId: string;
+    }
+  | undefined {
+  if (!hasProperty(state.engine.backgroundState, 'NetworkController')) {
+    // Expected during upgrade-from-old-version — don't log.
+    return undefined;
+  }
+
+  const networkControllerState = state.engine.backgroundState.NetworkController;
+
+  if (!isValidNetworkControllerState(networkControllerState)) {
+    return undefined;
+  }
+
+  return networkControllerState;
+}
+
+function isValidNetworkControllerState(value: unknown): value is {
+  networkConfigurationsByChainId: Record<Hex, unknown>;
+  selectedNetworkClientId: string;
+} {
+  if (!isObject(value)) {
+    return false;
+  }
+
+  if (
+    !hasProperty(value, 'networkConfigurationsByChainId') ||
+    !isValidNetworkConfigurationsByChainId(value.networkConfigurationsByChainId)
+  ) {
+    return false;
+  }
+
+  if (
+    !hasProperty(value, 'selectedNetworkClientId') ||
+    typeof value.selectedNetworkClientId !== 'string'
+  ) {
+    return false;
+  }
+
+  return true;
+}
+
+function isValidNetworkConfigurationsByChainId(
+  value: unknown,
+): value is Record<Hex, unknown> {
+  return (
+    isObject(value) &&
+    Object.entries(value).every(
+      ([chainId]) => typeof chainId === 'string' && isHexString(chainId),
+    )
+  );
+}
+
+// Minimal validator — only chainId + blockExplorerUrls need to be sound
+// for this migration.
+function isValidNetworkConfiguration(
+  object: unknown,
+): object is NetworkConfiguration {
+  return (
+    isObject(object) &&
+    hasProperty(object, 'chainId') &&
+    typeof object.chainId === 'string' &&
+    isHexString(object.chainId) &&
+    hasProperty(object, 'blockExplorerUrls') &&
+    Array.isArray(object.blockExplorerUrls) &&
+    object.blockExplorerUrls.every((url) => typeof url === 'string')
+  );
+}
diff --git a/app/store/migrations/index.ts b/app/store/migrations/index.ts
index 729e37eaecc..947dbb5bdec 100644
--- a/app/store/migrations/index.ts
+++ b/app/store/migrations/index.ts
@@ -133,6 +133,8 @@ import migration129 from './129';
 import migration130 from './130';
 import migration131 from './131';
 import migration132 from './132';
+import migration133 from './133';
+import migration134 from './134';
 
 // Add migrations above this line
 import { ControllerStorage } from '../persistConfig';
@@ -285,6 +287,8 @@ export const migrationList: MigrationsList = {
   130: migration130,
   131: migration131,
   132: migration132,
+  133: migration133,
+  134: migration134,
 };
 
 // Enable both synchronous and asynchronous migrations
diff --git a/app/util/activity/index.ts b/app/util/activity/index.ts
index d154c6d5bef..9912e6371cb 100644
--- a/app/util/activity/index.ts
+++ b/app/util/activity/index.ts
@@ -11,6 +11,7 @@ import { BridgeHistoryItem } from '@metamask/bridge-status-controller';
 import { AddressBookControllerState } from '@metamask/address-book-controller';
 
 export const PAY_TYPES = [
+  TransactionType.moneyAccountDeposit,
   TransactionType.perpsDeposit,
   TransactionType.predictDeposit,
 ];
diff --git a/app/util/address/index.test.ts b/app/util/address/index.test.ts
index 19a8ac65cdc..acd6a60fabd 100644
--- a/app/util/address/index.test.ts
+++ b/app/util/address/index.test.ts
@@ -627,8 +627,6 @@ describe('isHDOrFirstPartySnapAccount', () => {
           ...MOCK_SOLANA_ACCOUNT.metadata,
           snap: {
             id: 'third-party-snap',
-            name: 'Third Party Snap',
-            enabled: true,
           },
         },
         options: {},
diff --git a/app/util/bridge/hooks/useBridgeTxHistoryData.ts b/app/util/bridge/hooks/useBridgeTxHistoryData.ts
index ca514c7de25..ac0fec55e98 100644
--- a/app/util/bridge/hooks/useBridgeTxHistoryData.ts
+++ b/app/util/bridge/hooks/useBridgeTxHistoryData.ts
@@ -6,6 +6,7 @@ import {
 import { selectBridgeHistoryForAccount } from '../../../selectors/bridgeStatusController';
 import { Transaction } from '@metamask/keyring-api';
 import { BridgeHistoryItem } from '@metamask/bridge-status-controller';
+import { equalsIgnoreCase } from '../../string';
 
 export const FINAL_NON_CONFIRMED_STATUSES = [
   TransactionStatus.failed,
@@ -46,16 +47,23 @@ export function useBridgeTxHistoryData({
     // If not found, try to find by originalTransactionId for intent transactions
     if (!bridgeHistoryItem && srcTxMetaId) {
       const matchingEntry = Object.entries(bridgeHistory).find(
-        ([_, historyItem]) =>
-          (historyItem as unknown as { originalTransactionId: string })
+        ([, historyItem]) =>
+          (historyItem as { originalTransactionId?: string })
             .originalTransactionId === srcTxMetaId,
       );
       bridgeHistoryItem = matchingEntry ? matchingEntry[1] : undefined;
     }
+
+    // Fallback for API-normalized transactions whose id differs from txMetaId
+    if (!bridgeHistoryItem && evmTxMeta.hash) {
+      bridgeHistoryItem = Object.values(bridgeHistory).find((item) =>
+        equalsIgnoreCase(item.status.srcChain.txHash, evmTxMeta.hash),
+      );
+    }
   } else if (multiChainTx) {
     const srcTxHash = multiChainTx?.id;
-    bridgeHistoryItem = Object.values(bridgeHistory).find(
-      (item) => item.status.srcChain.txHash === srcTxHash,
+    bridgeHistoryItem = Object.values(bridgeHistory).find((item) =>
+      equalsIgnoreCase(item.status.srcChain.txHash, srcTxHash),
     );
   }
 
diff --git a/app/util/bridge/hooks/useBridgeTxHistoryData/useBridgeTxHistoryData.test.ts b/app/util/bridge/hooks/useBridgeTxHistoryData/useBridgeTxHistoryData.test.ts
index 18b18f29020..628d0fc4d15 100644
--- a/app/util/bridge/hooks/useBridgeTxHistoryData/useBridgeTxHistoryData.test.ts
+++ b/app/util/bridge/hooks/useBridgeTxHistoryData/useBridgeTxHistoryData.test.ts
@@ -105,6 +105,35 @@ describe('useBridgeTxHistoryData', () => {
     });
   });
 
+  it('should find bridge history item by EVM transaction hash', async () => {
+    const tx: TransactionMeta = {
+      id: 'api-normalized-transaction-id',
+      hash: mockTxHash,
+      status: TransactionStatus.confirmed,
+      chainId: mockChainId,
+      networkClientId: 'mainnet',
+      time: Date.now(),
+      txParams: {
+        to: '0x123',
+        from: '0x456',
+        value: '0x0',
+        data: '0x',
+      },
+    };
+
+    const { result } = renderHookWithProvider(
+      () => useBridgeTxHistoryData({ evmTxMeta: tx }),
+      {
+        state: initialState,
+      },
+    );
+
+    await waitFor(() => {
+      expect(result.current.bridgeTxHistoryItem?.txMetaId).toBe(mockTxId);
+      expect(result.current.isBridgeComplete).toBe(true);
+    });
+  });
+
   it('should find bridge history item by multi-chain transaction hash', async () => {
     const multiChainTx: Transaction = {
       id: mockTxHash,
diff --git a/app/util/bridge/hooks/useValidateBridgeTx.ts b/app/util/bridge/hooks/useValidateBridgeTx.ts
index f49850d0beb..732beb1d4af 100644
--- a/app/util/bridge/hooks/useValidateBridgeTx.ts
+++ b/app/util/bridge/hooks/useValidateBridgeTx.ts
@@ -4,45 +4,49 @@ import { SolMethod } from '@metamask/keyring-api';
 import { selectSelectedInternalAccount } from '../../../selectors/accountsController';
 import { base58 } from 'ethers/lib/utils';
 import AppConstants from '../../../core/AppConstants';
+import { useCallback } from 'react';
 
 export default function useValidateBridgeTx() {
   const selectedAccount = useSelector(selectSelectedInternalAccount);
 
-  const validateBridgeTx = async ({
-    quoteResponse,
-    signal,
-  }: {
-    quoteResponse: QuoteResponse & QuoteMetadata;
-    signal?: AbortSignal;
-  }) => {
-    const response = await fetch(
-      `${AppConstants.SECURITY_ALERTS_API.URL}/solana/message/scan`,
-      {
-        signal,
-        headers: {
-          'Content-Type': 'application/json',
-          accept: 'application/json',
-        },
-        method: 'POST',
-        body: JSON.stringify({
-          method: SolMethod.SignAndSendTransaction,
-          encoding: 'base64',
-          account_address: selectedAccount?.address
-            ? Buffer.from(base58.decode(selectedAccount.address)).toString(
-                'base64',
-              )
-            : undefined,
-          chain: 'mainnet',
-          transactions: [quoteResponse.trade],
-          options: ['simulation', 'validation'],
-          metadata: {
-            url: null,
+  const validateBridgeTx = useCallback(
+    async ({
+      quoteResponse,
+      signal,
+    }: {
+      quoteResponse: QuoteResponse & QuoteMetadata;
+      signal?: AbortSignal;
+    }) => {
+      const response = await fetch(
+        `${AppConstants.SECURITY_ALERTS_API.URL}/solana/message/scan`,
+        {
+          signal,
+          headers: {
+            'Content-Type': 'application/json',
+            accept: 'application/json',
           },
-        }),
-      },
-    );
-    return response.json();
-  };
+          method: 'POST',
+          body: JSON.stringify({
+            method: SolMethod.SignAndSendTransaction,
+            encoding: 'base64',
+            account_address: selectedAccount?.address
+              ? Buffer.from(base58.decode(selectedAccount.address)).toString(
+                  'base64',
+                )
+              : undefined,
+            chain: 'mainnet',
+            transactions: [quoteResponse.trade],
+            options: ['simulation', 'validation'],
+            metadata: {
+              url: null,
+            },
+          }),
+        },
+      );
+      return response.json();
+    },
+    [selectedAccount?.address],
+  );
 
   return { validateBridgeTx };
 }
diff --git a/app/util/networks/customNetworks.tsx b/app/util/networks/customNetworks.tsx
index a53aaf86221..7c2aaa208d2 100644
--- a/app/util/networks/customNetworks.tsx
+++ b/app/util/networks/customNetworks.tsx
@@ -159,7 +159,7 @@ export const PopularList = [
     ticker: 'SEI',
     warning: true,
     rpcPrefs: {
-      blockExplorerUrl: 'https://seitrace.com/',
+      blockExplorerUrl: 'https://seiscan.io/',
       imageUrl: 'SEI',
       imageSource: require('../../images/sei.png'),
     },
diff --git a/app/util/networks/index.js b/app/util/networks/index.js
index 586021da600..e7e8dfcaa21 100644
--- a/app/util/networks/index.js
+++ b/app/util/networks/index.js
@@ -802,9 +802,6 @@ export const getBlockExplorerTxUrl = (
 export const getIsNetworkOnboarded = (chainId, networkOnboardedState) =>
   networkOnboardedState[chainId];
 
-export const isPermissionsSettingsV1Enabled =
-  process.env.MM_PERMISSIONS_SETTINGS_V1_ENABLED === 'true';
-
 // The whitelisted network names for the given chain IDs to prevent showing warnings on Network Settings.
 export const WHILELIST_NETWORK_NAME = {
   [ChainId.mainnet]: 'Mainnet',
diff --git a/app/util/number/index.js b/app/util/number/index.js
index 3216ba5d489..b265436ad15 100644
--- a/app/util/number/index.js
+++ b/app/util/number/index.js
@@ -418,18 +418,6 @@ export function renderFromWei(value, decimalsToShow = 5) {
   return renderWei;
 }
 
-/**
- * @deprecated no longer used
- * Converts token BN value to hex string number to be sent
- *
- * @param {Object} value - BN instance to convert
- * @param {number} decimals - Decimals to be considered on the conversion
- * @returns {string} - String of the hex token value
- */
-export function calcTokenValueToSend(value, decimals) {
-  return value ? (value * Math.pow(10, decimals)).toString(16) : 0;
-}
-
 /**
  * @deprecated Use isBigInt instead from utils/number/bigint
  * Checks if a value is a BN instance
diff --git a/app/util/number/index.test.ts b/app/util/number/index.test.ts
index abd4c56fe4b..84ea95e47b6 100644
--- a/app/util/number/index.test.ts
+++ b/app/util/number/index.test.ts
@@ -6,7 +6,6 @@ import {
   balanceToFiat,
   balanceToFiatNumber,
   BNToHex,
-  calcTokenValueToSend,
   calculateEthFeeForMultiLayer,
   dotAndCommaDecimalFormatter,
   fastSplit,
@@ -514,16 +513,6 @@ describe('Number utils :: localizeLargeNumber', () => {
   });
 });
 
-describe('Number utils :: calcTokenValueToSend', () => {
-  it('calcTokenValueToSend', () => {
-    expect(calcTokenValueToSend(new BN4(1337), 0)).toEqual('539');
-    expect(calcTokenValueToSend(new BN4(1337), 9)).toEqual('1374b68fa00');
-    expect(calcTokenValueToSend(new BN4(1337), 18)).toEqual(
-      '487a9a304539440000',
-    );
-  });
-});
-
 describe('Number utils :: hexToBN', () => {
   it('hexToBN', () => {
     expect(hexToBN('0x539').toNumber()).toBe(1337);
diff --git a/app/util/sentry/tags/index.ts b/app/util/sentry/tags/index.ts
index 4c9a52d41c8..717ecd30276 100644
--- a/app/util/sentry/tags/index.ts
+++ b/app/util/sentry/tags/index.ts
@@ -5,6 +5,7 @@ import { selectAllTokensFlat } from '../../../selectors/tokensController';
 import { getNotificationsList } from '../../../selectors/notifications';
 import { selectTransactions } from '../../../selectors/transactionController';
 import { selectPendingApprovals } from '../../../selectors/approvalController';
+import { getTokensControllerAllTokens } from '../../../selectors/assets/assets-migration';
 
 export function getTraceTags(state: RootState) {
   const tags: Record<string, number | string | boolean> = {};
@@ -51,7 +52,8 @@ export function getTraceTags(state: RootState) {
   }
 
   try {
-    if (state?.engine?.backgroundState?.TokensController?.allTokens) {
+    const allTokens = getTokensControllerAllTokens(state);
+    if (allTokens && Object.keys(allTokens).length > 0) {
       tags['wallet.token_count'] = selectAllTokensFlat(state)?.length;
     }
   } catch (_) {
diff --git a/app/util/social/socialServiceTelemetry.test.ts b/app/util/social/socialServiceTelemetry.test.ts
new file mode 100644
index 00000000000..6baffe893c8
--- /dev/null
+++ b/app/util/social/socialServiceTelemetry.test.ts
@@ -0,0 +1,283 @@
+import { addBreadcrumb } from '@sentry/react-native';
+import {
+  extractHttpStatus,
+  categoriseSocialError,
+  buildSocialErrorExtras,
+  addSocialBreadcrumb,
+  type SocialEndpoint,
+} from './socialServiceTelemetry';
+
+jest.mock('@sentry/react-native', () => ({
+  addBreadcrumb: jest.fn(),
+}));
+
+const mockAddBreadcrumb = addBreadcrumb as jest.Mock;
+
+// ---------------------------------------------------------------------------
+// Helpers to create errors matching the shapes SocialService throws
+// ---------------------------------------------------------------------------
+
+function makeHttpError(
+  status: number,
+  message: string,
+): Error & { httpStatus: number } {
+  const err = new Error(message) as Error & { httpStatus: number };
+  err.httpStatus = status;
+  return err;
+}
+
+// ---------------------------------------------------------------------------
+// extractHttpStatus
+// ---------------------------------------------------------------------------
+
+describe('extractHttpStatus', () => {
+  it('returns the status from an HttpError instance', () => {
+    expect(extractHttpStatus(makeHttpError(401, 'Unauthorized'))).toBe(401);
+  });
+
+  it('returns the status from a plain object with httpStatus', () => {
+    expect(extractHttpStatus({ httpStatus: 503 })).toBe(503);
+  });
+
+  it('returns undefined for a plain Error without httpStatus', () => {
+    expect(extractHttpStatus(new Error('plain error'))).toBeUndefined();
+  });
+
+  it('returns undefined for null', () => {
+    expect(extractHttpStatus(null)).toBeUndefined();
+  });
+
+  it('returns undefined for a string', () => {
+    expect(extractHttpStatus('some error string')).toBeUndefined();
+  });
+});
+
+// ---------------------------------------------------------------------------
+// categoriseSocialError
+// ---------------------------------------------------------------------------
+
+describe('categoriseSocialError', () => {
+  it('returns http_error when the error has httpStatus', () => {
+    expect(categoriseSocialError(makeHttpError(401, 'Unauthorized'))).toBe(
+      'http_error',
+    );
+  });
+
+  it('returns schema_error for "invalid response" messages', () => {
+    expect(
+      categoriseSocialError(
+        new Error('SocialService: Leaderboard returned invalid response'),
+      ),
+    ).toBe('schema_error');
+  });
+
+  it('returns auth_failure for auth/JWT/bearer/unauthorized messages', () => {
+    expect(
+      categoriseSocialError(new Error('getBearerToken: auth token expired')),
+    ).toBe('auth_failure');
+    expect(categoriseSocialError(new Error('JWT verification failed'))).toBe(
+      'auth_failure',
+    );
+    expect(categoriseSocialError(new Error('unauthorized access'))).toBe(
+      'auth_failure',
+    );
+    expect(categoriseSocialError(new Error('Bearer token missing'))).toBe(
+      'auth_failure',
+    );
+  });
+
+  it('does not classify crypto-token errors as auth_failure', () => {
+    // Crypto wallet errors frequently reference tokens but are not auth issues.
+    expect(
+      categoriseSocialError(new Error('unknown token contract 0xabc')),
+    ).toBe('unknown');
+    expect(categoriseSocialError(new Error('tokenAddress invalid'))).toBe(
+      'unknown',
+    );
+    expect(
+      categoriseSocialError(new Error('tokenSymbol could not be resolved')),
+    ).toBe('unknown');
+  });
+
+  it('returns network_error for network/timeout/aborted messages', () => {
+    expect(categoriseSocialError(new Error('Network request failed'))).toBe(
+      'network_error',
+    );
+    expect(categoriseSocialError(new Error('Request timed out'))).toBe(
+      'network_error',
+    );
+    expect(categoriseSocialError(new Error('The operation was aborted'))).toBe(
+      'network_error',
+    );
+    expect(
+      categoriseSocialError(new Error('connect ETIMEDOUT 1.2.3.4:443')),
+    ).toBe('network_error');
+  });
+
+  it('returns unknown for unrecognised errors', () => {
+    expect(categoriseSocialError(new Error('Something went wrong'))).toBe(
+      'unknown',
+    );
+  });
+
+  it('returns unknown for null / undefined', () => {
+    expect(categoriseSocialError(null)).toBe('unknown');
+    expect(categoriseSocialError(undefined)).toBe('unknown');
+  });
+
+  it('http_error takes precedence over message matching', () => {
+    // An HttpError message also contains "unauthorized" but httpStatus wins
+    const err = makeHttpError(401, 'unauthorized');
+    expect(categoriseSocialError(err)).toBe('http_error');
+  });
+});
+
+// ---------------------------------------------------------------------------
+// buildSocialErrorExtras
+// ---------------------------------------------------------------------------
+
+describe('buildSocialErrorExtras', () => {
+  it('preserves legacyMessage verbatim under the message field', () => {
+    const legacy = 'useTopTraders: leaderboard fetch failed';
+    const result = buildSocialErrorExtras({
+      legacyMessage: legacy,
+      endpoint: 'leaderboard',
+      error: new Error('something'),
+    });
+    expect(result.message).toBe(legacy);
+  });
+
+  it('includes endpoint, errorCategory, errorMessage', () => {
+    const error = new Error(
+      'SocialService: Leaderboard returned invalid response',
+    );
+    const result = buildSocialErrorExtras({
+      legacyMessage: 'msg',
+      endpoint: 'leaderboard',
+      error,
+    });
+    expect(result.endpoint).toBe('leaderboard');
+    expect(result.errorCategory).toBe('schema_error');
+    expect(result.errorMessage).toBe(error.message);
+  });
+
+  it('includes httpStatus when the error is an HttpError', () => {
+    const result = buildSocialErrorExtras({
+      legacyMessage: 'msg',
+      endpoint: 'following',
+      error: makeHttpError(403, 'Forbidden'),
+    });
+    expect(result.httpStatus).toBe(403);
+    expect(result.errorCategory).toBe('http_error');
+  });
+
+  it('omits httpStatus when not an HttpError', () => {
+    const result = buildSocialErrorExtras({
+      legacyMessage: 'msg',
+      endpoint: 'leaderboard',
+      error: new Error('plain'),
+    });
+    expect(result.httpStatus).toBeUndefined();
+  });
+
+  it('includes durationMs and queryParams when provided', () => {
+    const result = buildSocialErrorExtras({
+      legacyMessage: 'msg',
+      endpoint: 'open_positions',
+      error: new Error('plain'),
+      durationMs: 250,
+      queryParams: { limit: 10 },
+    });
+    expect(result.durationMs).toBe(250);
+    expect(result.queryParams).toEqual({ limit: 10 });
+  });
+
+  it('does NOT leak an addressOrId field even if accidentally passed', () => {
+    const result = buildSocialErrorExtras({
+      legacyMessage: 'msg',
+      endpoint: 'open_positions',
+      error: new Error('plain'),
+      // Simulate a caller accidentally passing address-like data via queryParams
+      queryParams: { limit: 5 },
+    });
+    const serialised = JSON.stringify(result);
+    expect(serialised).not.toMatch(/0x[0-9a-fA-F]{40}/);
+    expect(Object.keys(result)).not.toContain('addressOrId');
+    expect(Object.keys(result)).not.toContain('address');
+    expect(Object.keys(result)).not.toContain('profileId');
+  });
+});
+
+// ---------------------------------------------------------------------------
+// addSocialBreadcrumb
+// ---------------------------------------------------------------------------
+
+describe('addSocialBreadcrumb', () => {
+  beforeEach(() => {
+    mockAddBreadcrumb.mockClear();
+  });
+
+  it('emits a breadcrumb with category social_service and level error', () => {
+    addSocialBreadcrumb({ endpoint: 'leaderboard' });
+    expect(mockAddBreadcrumb).toHaveBeenCalledTimes(1);
+    const call = mockAddBreadcrumb.mock.calls[0][0];
+    expect(call.category).toBe('social_service');
+    expect(call.level).toBe('error');
+  });
+
+  it('formats the failure message with just the endpoint when no extras are given', () => {
+    addSocialBreadcrumb({ endpoint: 'leaderboard' });
+    const { message } = mockAddBreadcrumb.mock.calls[0][0];
+    expect(message).toBe('social_service.leaderboard.failure');
+  });
+
+  it('appends status and category when provided', () => {
+    addSocialBreadcrumb({
+      endpoint: 'following',
+      httpStatus: 401,
+      errorCategory: 'http_error',
+    });
+    const { message } = mockAddBreadcrumb.mock.calls[0][0];
+    expect(message).toBe(
+      'social_service.following.failure status=401 category=http_error',
+    );
+  });
+
+  it('includes structured data payload alongside message string', () => {
+    addSocialBreadcrumb({
+      endpoint: 'open_positions',
+      httpStatus: 503,
+      errorCategory: 'http_error',
+      queryParams: { limit: 5 },
+    });
+    const { data } = mockAddBreadcrumb.mock.calls[0][0];
+    expect(data.endpoint).toBe('open_positions');
+    expect(data.httpStatus).toBe(503);
+    expect(data.errorCategory).toBe('http_error');
+    expect(data.queryParams).toEqual({ limit: 5 });
+  });
+
+  it('omits optional fields from the data payload when not provided', () => {
+    addSocialBreadcrumb({ endpoint: 'leaderboard' });
+    const { data } = mockAddBreadcrumb.mock.calls[0][0];
+    expect(data.httpStatus).toBeUndefined();
+    expect(data.errorCategory).toBeUndefined();
+    expect(data.queryParams).toBeUndefined();
+  });
+
+  it('uses a consistent endpoint key across all supported endpoints', () => {
+    const endpoints: SocialEndpoint[] = [
+      'leaderboard',
+      'following',
+      'open_positions',
+      'closed_positions',
+      'position_by_id',
+    ];
+    endpoints.forEach((endpoint) => {
+      mockAddBreadcrumb.mockClear();
+      addSocialBreadcrumb({ endpoint });
+      const { message } = mockAddBreadcrumb.mock.calls[0][0];
+      expect(message).toBe(`social_service.${endpoint}.failure`);
+    });
+  });
+});
diff --git a/app/util/social/socialServiceTelemetry.ts b/app/util/social/socialServiceTelemetry.ts
new file mode 100644
index 00000000000..90dc13315c1
--- /dev/null
+++ b/app/util/social/socialServiceTelemetry.ts
@@ -0,0 +1,199 @@
+import { addBreadcrumb } from '@sentry/react-native';
+
+/**
+ * The set of SocialService API endpoints we instrument.
+ * Matches the `queryKey` prefixes used in the three hooks.
+ */
+export type SocialEndpoint =
+  | 'leaderboard'
+  | 'following'
+  | 'open_positions'
+  | 'closed_positions'
+  | 'position_by_id';
+
+/**
+ * Coarse-grained error category derived from the thrown error shape.
+ * Lets Sentry Discover filter errors without reading full messages.
+ *
+ * Categories map to distinct throw sites in SocialService:
+ * - http_error   → SocialService.#throwIfNotOk (non-2xx HTTP response)
+ * - schema_error → superstruct `is()` check on response body
+ * - auth_failure → AuthenticationController:getBearerToken rejection
+ * - network_error → fetch() itself rejected (no response received)
+ * - unknown       → anything else
+ */
+export type SocialErrorCategory =
+  | 'http_error'
+  | 'schema_error'
+  | 'auth_failure'
+  | 'network_error'
+  | 'unknown';
+
+/**
+ * The shape returned by buildSocialErrorExtras, intended to replace
+ * the string second argument to Logger.error while preserving it.
+ */
+export interface SocialErrorExtras {
+  /** Original log message — preserved verbatim for backward-compatible Sentry searches. */
+  message: string;
+  endpoint: SocialEndpoint;
+  errorCategory: SocialErrorCategory;
+  httpStatus?: number;
+  durationMs?: number;
+  queryParams?: Record<string, string | number | boolean>;
+  errorMessage?: string;
+}
+
+/**
+ * Extract the HTTP status from an error, if present.
+ * HttpError from @metamask/controller-utils exposes `.httpStatus`.
+ */
+export function extractHttpStatus(error: unknown): number | undefined {
+  if (
+    error !== null &&
+    typeof error === 'object' &&
+    'httpStatus' in error &&
+    typeof (error as Record<string, unknown>).httpStatus === 'number'
+  ) {
+    return (error as Record<string, unknown>).httpStatus as number;
+  }
+  return undefined;
+}
+
+/**
+ * Categorise a thrown error into a coarse bucket so it can be
+ * filtered in Sentry Discover without full-text searches.
+ */
+export function categoriseSocialError(error: unknown): SocialErrorCategory {
+  if (extractHttpStatus(error) !== undefined) {
+    return 'http_error';
+  }
+
+  const message = error instanceof Error ? error.message : String(error ?? '');
+
+  if (/invalid response/i.test(message)) {
+    return 'schema_error';
+  }
+
+  // Match auth-specific terms only. The bare word "token" is intentionally
+  // excluded because crypto wallet errors frequently mention tokens
+  // (e.g. "unknown token contract", "tokenAddress invalid") and would
+  // otherwise be misclassified as auth failures, polluting Sentry filters.
+  if (/auth|jwt|unauthor|bearer/i.test(message)) {
+    return 'auth_failure';
+  }
+
+  if (/network|timed?\s*out|timeout|aborted|connect/i.test(message)) {
+    return 'network_error';
+  }
+
+  return 'unknown';
+}
+
+/**
+ * Build the enriched extras object for an existing Logger.error call.
+ *
+ * The `legacyMessage` string is preserved verbatim under `message` so
+ * any existing Sentry searches on that string keep working. Structured
+ * fields are added alongside without replacing the existing event.
+ *
+ * Usage — replace the string second arg while keeping the call intact:
+ * ```ts
+ * // Before
+ * Logger.error(err, 'useTopTraders: leaderboard fetch failed');
+ *
+ * // After
+ * Logger.error(
+ *   err,
+ *   buildSocialErrorExtras({
+ *     legacyMessage: 'useTopTraders: leaderboard fetch failed',
+ *     endpoint: 'leaderboard',
+ *     error: err,
+ *   }),
+ * );
+ * ```
+ */
+export function buildSocialErrorExtras({
+  legacyMessage,
+  endpoint,
+  error,
+  queryParams,
+  durationMs,
+}: {
+  legacyMessage: string;
+  endpoint: SocialEndpoint;
+  error: unknown;
+  queryParams?: Record<string, string | number | boolean>;
+  durationMs?: number;
+}): SocialErrorExtras {
+  const errorCategory = categoriseSocialError(error);
+  const httpStatus = extractHttpStatus(error);
+  const errorMessage =
+    error instanceof Error ? error.message : String(error ?? '');
+
+  const extras: SocialErrorExtras = {
+    message: legacyMessage,
+    endpoint,
+    errorCategory,
+    errorMessage,
+  };
+
+  if (httpStatus !== undefined) {
+    extras.httpStatus = httpStatus;
+  }
+  if (durationMs !== undefined) {
+    extras.durationMs = durationMs;
+  }
+  if (queryParams !== undefined) {
+    extras.queryParams = queryParams;
+  }
+
+  return extras;
+}
+
+/**
+ * Add a Sentry breadcrumb when a SocialService fetch fails.
+ *
+ * The `message` string encodes discriminating fields inline so they are
+ * searchable in Sentry Discover via `breadcrumbs.message:"..."`:
+ *
+ * social_service.leaderboard.failure status=401 category=http_error
+ *
+ * Sentry Discover query examples:
+ * breadcrumbs.category:social_service
+ * breadcrumbs.message:"social_service.leaderboard"
+ * breadcrumbs.message:"status=401"
+ * breadcrumbs.message:"category=auth_failure"
+ */
+export function addSocialBreadcrumb({
+  endpoint,
+  errorCategory,
+  httpStatus,
+  queryParams,
+}: {
+  endpoint: SocialEndpoint;
+  errorCategory?: SocialErrorCategory;
+  httpStatus?: number;
+  queryParams?: Record<string, string | number | boolean>;
+}): void {
+  const parts: string[] = [`social_service.${endpoint}.failure`];
+
+  if (httpStatus !== undefined) {
+    parts.push(`status=${httpStatus}`);
+  }
+  if (errorCategory !== undefined) {
+    parts.push(`category=${errorCategory}`);
+  }
+
+  addBreadcrumb({
+    category: 'social_service',
+    level: 'error',
+    message: parts.join(' '),
+    data: {
+      endpoint,
+      ...(httpStatus !== undefined && { httpStatus }),
+      ...(errorCategory !== undefined && { errorCategory }),
+      ...(queryParams !== undefined && { queryParams }),
+    },
+  });
+}
diff --git a/app/util/string/index.test.ts b/app/util/string/index.test.ts
index 99f46d7b33c..42ca951e3d3 100644
--- a/app/util/string/index.test.ts
+++ b/app/util/string/index.test.ts
@@ -1,4 +1,5 @@
 import {
+  equalsIgnoreCase,
   escapeSpecialUnicode,
   isArrayType,
   isSolidityType,
@@ -23,6 +24,29 @@ describe('string utils', () => {
     });
   });
 
+  describe('equalsIgnoreCase', () => {
+    it('returns true for identical strings', () => {
+      expect(equalsIgnoreCase('hello', 'hello')).toBe(true);
+    });
+
+    it('returns true for strings differing only in case', () => {
+      expect(equalsIgnoreCase('Hello', 'hELLo')).toBe(true);
+      expect(equalsIgnoreCase('0xABC123', '0xabc123')).toBe(true);
+    });
+
+    it('returns false for different strings', () => {
+      expect(equalsIgnoreCase('hello', 'world')).toBe(false);
+    });
+
+    it('returns false when either value is nullish or empty', () => {
+      expect(equalsIgnoreCase(undefined, 'hello')).toBe(false);
+      expect(equalsIgnoreCase('hello', undefined)).toBe(false);
+      expect(equalsIgnoreCase(null, null)).toBe(false);
+      expect(equalsIgnoreCase('', 'hello')).toBe(false);
+      expect(equalsIgnoreCase('', '')).toBe(false);
+    });
+  });
+
   describe('isArrayType', () => {
     [
       ['uint256[]', true],
diff --git a/app/util/string/index.ts b/app/util/string/index.ts
index f797c181676..360411ce0e9 100644
--- a/app/util/string/index.ts
+++ b/app/util/string/index.ts
@@ -27,6 +27,16 @@ export const stripMultipleNewlines = (
   return str.replace(/\n+/g, '\n');
 };
 
+export const equalsIgnoreCase = (
+  a: string | undefined | null,
+  b: string | undefined | null,
+) => {
+  if (!a || !b) {
+    return false;
+  }
+  return a.toLowerCase() === b.toLowerCase();
+};
+
 const solidityTypes = () => {
   const types = [
     'bool',
diff --git a/app/util/tempo/tempo-tx-utils.test.ts b/app/util/tempo/tempo-tx-utils.test.ts
index 8971584737b..20e67a6f2e5 100644
--- a/app/util/tempo/tempo-tx-utils.test.ts
+++ b/app/util/tempo/tempo-tx-utils.test.ts
@@ -200,8 +200,8 @@ describe('tempo-tx-utils', () => {
     it('return true for Tempo Mainnet', () => {
       expect(isTempoChain('0x1079')).toBe(true);
     });
-    it('return true for Tempo Moderato Testnet', () => {
-      expect(isTempoChain('0xa5bf')).toBe(true);
+    it('return false for Tempo Moderato Testnet', () => {
+      expect(isTempoChain('0xa5bf')).toBe(false);
     });
     it('return false for Polygon Mainnet', () => {
       expect(isTempoChain('0x89')).toBe(false);
@@ -215,11 +215,8 @@ describe('tempo-tx-utils', () => {
         gasFeeToken: '0x20c0000000000000000000000000000000000000',
       });
     });
-    it('return params for Tempo Moderato Testnet', () => {
-      expect(getTempoExtraOptionsForChain('0xa5bf')).toEqual({
-        excludeNativeTokenForFee: true,
-        gasFeeToken: '0x20c0000000000000000000000000000000000000',
-      });
+    it('return an empty object for Tempo Moderato Testnet', () => {
+      expect(getTempoExtraOptionsForChain('0xa5bf')).toEqual({});
     });
     it('return an empty object for Polygon Mainnet', () => {
       expect(getTempoExtraOptionsForChain('0x89')).toEqual({});
diff --git a/app/util/tempo/tempo-tx-utils.ts b/app/util/tempo/tempo-tx-utils.ts
index 45f925a28f6..bd141c9577f 100644
--- a/app/util/tempo/tempo-tx-utils.ts
+++ b/app/util/tempo/tempo-tx-utils.ts
@@ -27,12 +27,6 @@ const TEMPO_CONFIG: TempoConfig = {
         symbol: 'pathUSD',
       },
     },
-    '0xa5bf': {
-      defaultFeeToken: {
-        address: '0x20c0000000000000000000000000000000000000',
-        symbol: 'pathUSD',
-      },
-    },
   },
 } as const;
 
diff --git a/app/util/test/accountsControllerTestUtils.ts b/app/util/test/accountsControllerTestUtils.ts
index b98ed7090f6..20b684a9eeb 100644
--- a/app/util/test/accountsControllerTestUtils.ts
+++ b/app/util/test/accountsControllerTestUtils.ts
@@ -184,8 +184,6 @@ export function createMockSnapInternalAccount(
       },
       snap: {
         id: 'npm:@metamask/snap-simple-keyring-snap',
-        name: 'MetaMask Simple Snap Keyring',
-        enabled: true,
       },
     },
     options: {
@@ -251,8 +249,6 @@ export const MOCK_SOLANA_ACCOUNT: InternalAccount = {
     },
     snap: {
       id: 'npm:"@metamask/solana-wallet-snap',
-      name: 'Solana Wallet Snap',
-      enabled: true,
     },
   },
   scopes: [SolScope.Mainnet, SolScope.Testnet, SolScope.Devnet],
@@ -428,8 +424,6 @@ export const MOCK_ACCOUNTS_CONTROLLER_STATE_WITH_KEYRING_TYPES: AccountsControll
             ...mockSnapAccount2InternalAccount.metadata,
             snap: {
               id: 'metamask-simple-snap-keyring',
-              name: 'MetaMask Simple Snap Keyring',
-              enabled: true,
             },
           },
         },
@@ -511,8 +505,6 @@ export function createMockAccountsControllerStateWithSnap(
     },
     snap: {
       id: snapName,
-      name: snapName,
-      enabled: true,
     },
   };
 
diff --git a/app/util/test/confirm-data-helpers.ts b/app/util/test/confirm-data-helpers.ts
index 5569f7376fe..98b5254ef35 100644
--- a/app/util/test/confirm-data-helpers.ts
+++ b/app/util/test/confirm-data-helpers.ts
@@ -110,6 +110,7 @@ export const siweSignSignatureRequest = {
   ...personalSignSignatureRequest,
   messageParams: {
     ...personalSignSignatureRequest.messageParams,
+    from: '0x8eeee1781fd885ff5ddef7789486676961873d12',
     data: '0x6d6574616d61736b2e6769746875622e696f2077616e747320796f7520746f207369676e20696e207769746820796f757220457468657265756d206163636f756e743a0a3078386565656531373831666438383566663564646566373738393438363637363936313837336431320a0a492061636365707420746865204d6574614d61736b205465726d73206f6620536572766963653a2068747470733a2f2f636f6d6d756e6974792e6d6574616d61736b2e696f2f746f730a0a5552493a2068747470733a2f2f6d6574616d61736b2e6769746875622e696f0a56657273696f6e3a20310a436861696e2049443a20310a4e6f6e63653a2033323839313735370a4973737565642041743a20323032312d30392d33305431363a32353a32342e3030305a',
     siwe: {
       isSIWEMessage: true,
diff --git a/app/util/test/initial-background-state.json b/app/util/test/initial-background-state.json
index 2a23440052f..63fee41681d 100644
--- a/app/util/test/initial-background-state.json
+++ b/app/util/test/initial-background-state.json
@@ -421,7 +421,26 @@
   "AssetsController": {
     "assetPreferences": {},
     "assetsBalance": {},
-    "assetsInfo": {},
+    "assetsInfo": {
+      "eip155:1/erc20:0xaca92e438df0b2401ff60da7e4337b687a2435da": {
+        "decimals": 6,
+        "name": "MetaMask USD",
+        "symbol": "mUSD",
+        "type": "erc20"
+      },
+      "eip155:143/erc20:0xaca92e438df0b2401ff60da7e4337b687a2435da": {
+        "decimals": 6,
+        "name": "MetaMask USD",
+        "symbol": "mUSD",
+        "type": "erc20"
+      },
+      "eip155:59144/erc20:0xaca92e438df0b2401ff60da7e4337b687a2435da": {
+        "decimals": 6,
+        "name": "MetaMask USD",
+        "symbol": "mUSD",
+        "type": "erc20"
+      }
+    },
     "assetsPrice": {},
     "customAssets": {},
     "selectedCurrency": "usd"
@@ -729,6 +748,9 @@
     "ondoCampaignActivity": {},
     "ondoCampaignDeposits": {},
     "ondoCampaignLeaderboard": {},
+    "perpsTradingCampaignLeaderboard": {},
+    "perpsTradingCampaignLeaderboardPositions": {},
+    "perpsTradingCampaignVolume": {},
     "campaignParticipantStatus": {},
     "unlockedRewards": {},
     "seasonStatuses": {},
@@ -813,5 +835,6 @@
   },
   "MoneyAccountController": {
     "moneyAccounts": {}
-  }
+  },
+  "MoneyAccountUpgradeController": {}
 }
diff --git a/app/util/test/testSetup.js b/app/util/test/testSetup.js
index d600bd77442..86bb38c24ae 100644
--- a/app/util/test/testSetup.js
+++ b/app/util/test/testSetup.js
@@ -850,6 +850,75 @@ jest.mock('../../component-library/components/BottomSheets/BottomSheet', () => {
   };
 });
 
+// Mock @metamask/design-system-react-native BottomSheet to render children immediately
+// and run open/close callbacks synchronously (bypasses reanimated animations).
+// Matches the component-library BottomSheet mock above; components that migrated
+// to the design-system sheet otherwise trigger act() warnings from Animated updates.
+jest.mock('@metamask/design-system-react-native', () => {
+  const React = require('react');
+  const PropTypes = require('prop-types');
+  const { View } = require('react-native');
+  const actual = jest.requireActual('@metamask/design-system-react-native');
+
+  const BottomSheet = React.forwardRef(
+    (
+      {
+        children,
+        onClose,
+        onOpen,
+        goBack,
+        style,
+        twClassName: _twClassName,
+        testID,
+        accessibilityLabel,
+      },
+      ref,
+    ) => {
+      React.useImperativeHandle(ref, () => ({
+        onOpenBottomSheet: (callback) => {
+          onOpen?.();
+          callback?.();
+        },
+        onCloseBottomSheet: (callback) => {
+          const hasCallback = Boolean(callback);
+          onClose?.(hasCallback);
+          goBack?.();
+          callback?.();
+        },
+      }));
+      return React.createElement(
+        View,
+        {
+          testID: testID || 'design-system-bottom-sheet-mock',
+          style,
+          accessibilityLabel,
+        },
+        children,
+      );
+    },
+  );
+  BottomSheet.displayName = 'BottomSheet';
+  BottomSheet.propTypes = {
+    children: PropTypes.node,
+    onClose: PropTypes.func,
+    onOpen: PropTypes.func,
+    goBack: PropTypes.func,
+    style: PropTypes.oneOfType([
+      PropTypes.object,
+      PropTypes.array,
+      PropTypes.number,
+    ]),
+    twClassName: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
+    testID: PropTypes.string,
+    accessibilityLabel: PropTypes.string,
+  };
+
+  return {
+    ...actual,
+    BottomSheet,
+  };
+});
+
 // Mock react-native-modal to render children immediately (bypasses animation)
 jest.mock('react-native-modal', () => {
   const React = require('react');
diff --git a/app/util/transaction-controller/index.test.ts b/app/util/transaction-controller/index.test.ts
index 5266d023b23..64827debf4f 100644
--- a/app/util/transaction-controller/index.test.ts
+++ b/app/util/transaction-controller/index.test.ts
@@ -4,6 +4,7 @@ import {
   type TransactionMeta,
   TransactionEnvelopeType,
   IsAtomicBatchSupportedRequest,
+  getAccountAddressRelationship,
 } from '@metamask/transaction-controller';
 import { cloneDeep, omit } from 'lodash';
 //eslint-disable-next-line import-x/no-namespace
@@ -27,9 +28,19 @@ const {
   estimateGasFee,
   getPreviousGasFromController,
   getChainIdFromNetworkClientId,
+  checkFirstTimeInteraction,
   ...proxyMethods
 } = TransactionControllerUtils;
 
+jest.mock('@metamask/transaction-controller', () => ({
+  ...jest.requireActual('@metamask/transaction-controller'),
+  getAccountAddressRelationship: jest.fn(),
+}));
+
+const mockGetAccountAddressRelationship = jest.mocked(
+  getAccountAddressRelationship,
+);
+
 jest.mock('../../store', () => ({
   store: {
     getState: jest.fn(() => ({
@@ -90,7 +101,7 @@ const TRANSACTION_OPTIONS_MOCK = {
   origin: 'origin',
 };
 
-const TEMPO_VALID_CHAIN_ID = '0xa5bf' as Hex;
+const TEMPO_VALID_CHAIN_ID = '0x1079' as Hex;
 const BATCHID_MOCK = '0xmockBatchId' as Hex;
 const FROM_FIELD_MOCK = '0x1';
 
@@ -868,4 +879,37 @@ describe('Transaction Controller Util', () => {
       expect(result).toBe(mockResult);
     });
   });
+
+  describe('checkFirstTimeInteraction', () => {
+    const request = { from: '0xabc', to: '0xdef', chainId: 1 };
+
+    it('returns true when count is 0 (first time)', async () => {
+      mockGetAccountAddressRelationship.mockResolvedValueOnce({ count: 0 });
+      const result = await checkFirstTimeInteraction(request);
+      expect(result).toBe(true);
+      expect(mockGetAccountAddressRelationship).toHaveBeenCalledWith(request);
+    });
+
+    it('returns false when count is greater than 0', async () => {
+      mockGetAccountAddressRelationship.mockResolvedValueOnce({ count: 5 });
+      const result = await checkFirstTimeInteraction(request);
+      expect(result).toBe(false);
+    });
+
+    it('returns undefined when count is undefined', async () => {
+      mockGetAccountAddressRelationship.mockResolvedValueOnce({
+        count: undefined,
+      });
+      const result = await checkFirstTimeInteraction(request);
+      expect(result).toBeUndefined();
+    });
+
+    it('returns undefined when API call throws', async () => {
+      mockGetAccountAddressRelationship.mockRejectedValueOnce(
+        new Error('network error'),
+      );
+      const result = await checkFirstTimeInteraction(request);
+      expect(result).toBeUndefined();
+    });
+  });
 });
diff --git a/app/util/transaction-controller/index.ts b/app/util/transaction-controller/index.ts
index 50a7b31f042..247c46bed62 100644
--- a/app/util/transaction-controller/index.ts
+++ b/app/util/transaction-controller/index.ts
@@ -6,6 +6,7 @@ import {
   TransactionController as BaseTransactionController,
   IsAtomicBatchSupportedRequest,
   IsAtomicBatchSupportedResult,
+  getAccountAddressRelationship,
   Result,
 } from '@metamask/transaction-controller';
 import { NetworkClientId } from '@metamask/network-controller';
@@ -330,6 +331,23 @@ export async function isAtomicBatchSupported(
   return TransactionController?.isAtomicBatchSupported(request);
 }
 
+/**
+ * Returns whether the sender has no prior on-chain interaction with `to` on `chainId`,
+ * or `undefined` when the relationship cannot be determined (API error or unknown count).
+ */
+export async function checkFirstTimeInteraction(request: {
+  from: string;
+  to: string;
+  chainId: number;
+}): Promise<boolean | undefined> {
+  try {
+    const result = await getAccountAddressRelationship(request);
+    return result.count === undefined ? undefined : result.count === 0;
+  } catch {
+    return undefined;
+  }
+}
+
 function sanitizeTransactionParamsGasValues(
   transactionId: string,
   requestedTransactionParamsToUpdate: Partial<TransactionParams>,
diff --git a/bitrise.yml b/bitrise.yml
index 08baf2497d5..a68720019e0 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -3493,9 +3493,6 @@ app:
     - opts:
         is_expand: false
       MM_NETWORK_UI_REDESIGN_ENABLED: false
-    - opts:
-        is_expand: false
-      MM_PERMISSIONS_SETTINGS_V1_ENABLED: false
     - opts:
         is_expand: false
       MM_SECURITY_ALERTS_API_ENABLED: true
@@ -3555,16 +3552,16 @@ app:
       PROJECT_LOCATION_IOS: ios
     - opts:
         is_expand: false
-      VERSION_NAME: 7.76.0
+      VERSION_NAME: 7.77.0
     - opts:
         is_expand: false
-      VERSION_NUMBER: 4866
+      VERSION_NUMBER: 5017
     - opts:
         is_expand: false
-      FLASK_VERSION_NAME: 7.76.0
+      FLASK_VERSION_NAME: 7.77.0
     - opts:
         is_expand: false
-      FLASK_VERSION_NUMBER: 4866
+      FLASK_VERSION_NUMBER: 5017
     - opts:
         is_expand: false
       ANDROID_APK_LINK: ''
@@ -3600,9 +3597,9 @@ trigger_map:
   # Disable auto RC generation
   # - push_branch: release/*
   #   pipeline: pr_rc_rwy_pipeline
-  - push_branch: main
-    pipeline: expo_dev_pipeline
-  - tag: 'qa-*'
-    pipeline: create_qa_builds_pipeline
-  - tag: 'v*.*.*'
-    pipeline: create_qa_builds_pipeline
+  # - push_branch: main
+  #   pipeline: expo_dev_pipeline
+  # - tag: 'qa-*'
+  #   pipeline: create_qa_builds_pipeline
+  # - tag: 'v*.*.*'
+  #   pipeline: create_qa_builds_pipeline
diff --git a/builds.yml b/builds.yml
index 9110ab6af72..bc9e53a3686 100644
--- a/builds.yml
+++ b/builds.yml
@@ -9,6 +9,7 @@
 #   - env: sets environment variables directly (servers, build config, etc.)
 #   - secrets: maps env var names to GitHub Secret names
 #   - signing: (optional) AWS role + secret for code signing (omit for dev/simulator builds)
+#   - script_name: (optional) yarn script base name override (defaults to the build key name)
 #   - code_fencing: features to include via code fencing
 #
 # GitHub Environment determines actual secret values - builds.yml just maps the names.
@@ -39,7 +40,6 @@ _public_envs: &public_envs # Servers (production)
   IS_TEST: 'false'
   SEEDLESS_ONBOARDING_ENABLED: 'true'
   MM_NOTIFICATIONS_UI_ENABLED: 'true'
-  MM_PERMISSIONS_SETTINGS_V1_ENABLED: 'false'
   MM_PERPS_BLOCKED_REGIONS: 'US,CA-ON,GB,BE'
   MM_PERPS_HIP3_ALLOWLIST_MARKETS: ''
   MM_PERPS_HIP3_BLOCKLIST_MARKETS: ''
@@ -214,6 +214,23 @@ builds:
     secrets: *secrets
     code_fencing: *code_fencing_main
 
+  # Release candidate with pre-imported wallet (system tests / performance tests)
+  # Same as main-rc but bakes in ADDITIONAL_SRP_1 + PREDEFINED_PASSWORD so the app
+  # starts with an imported wallet, skipping onboarding. Used by run-system-tests.yml.
+  main-rc-with-srp:
+    script_name: main-rc
+    github_environment: build-rc
+    signing: *signing_rc
+    env:
+      <<: *public_envs
+      METAMASK_ENVIRONMENT: 'rc'
+      METAMASK_BUILD_TYPE: 'main'
+    secrets:
+      <<: *secrets
+      ADDITIONAL_SRP_1: 'IN_BUILD_SRP'
+      PREDEFINED_PASSWORD: 'E2E_PASSWORD'
+    code_fencing: *code_fencing_main
+
   # Test builds (QA)
   main-test:
     github_environment: build-uat
@@ -285,8 +302,35 @@ builds:
     secrets: *secrets
     code_fencing: *code_fencing_experimental
 
-  # Local development / Expo development build (simulator .app + optional device IPA when IS_DEVICE_BUILD)
+  # Dev release build (Ex. For sideloading via Build Mobile App workflow)
   main-dev:
+    github_environment: build-dev
+    signing: *signing_dev
+    env:
+      <<: *public_envs
+      METAMASK_ENVIRONMENT: 'dev'
+      METAMASK_BUILD_TYPE: 'main'
+      MM_PORTFOLIO_URL: 'https://portfolio.dev-api.cx.metamask.io'
+      MM_PREDICT_BUILDER_CODE: '0xd48300a99deac0f23265dad1f59d32920be33b75919201a88ed80f457f97b924'
+      REWARDS_API_URL: 'https://rewards.uat-api.cx.metamask.io'
+      BAANX_API_URL: 'https://dev.api.baanx.com'
+      DIGEST_API_URL: 'https://digest.dev-api.cx.metamask.io/api/v1'
+      SOCIAL_API_URL: 'https://social.dev-api.cx.metamask.io'
+      BRIDGE_USE_DEV_APIS: 'true'
+      RAMPS_ENVIRONMENT: 'staging'
+      RAMP_INTERNAL_BUILD: 'true'
+      RAMP_DEV_BUILD: 'true'
+      IS_TEST: 'false'
+      MM_ENABLE_SETTINGS_PAGE_DEV_OPTIONS: 'true'
+      # TODO: Decouple configuration, profile, and build type
+      PROFILE: 'development'
+      DEV_OAUTH_CONFIG: 'true'
+    secrets: *secrets
+    code_fencing: *code_fencing_main
+
+  # Expo dev build (Debug, simulator + device — triggered on push to main)
+  main-dev-expo:
+    script_name: main-dev
     github_environment: build-dev
     signing: *signing_dev
     env:
@@ -308,6 +352,8 @@ builds:
       IS_SIM_BUILD: 'true'
       IS_DEVICE_BUILD: 'true'
       CONFIGURATION: 'Debug'
+      # TODO: Decouple configuration, profile, and build type
+      PROFILE: 'development'
       DEV_OAUTH_CONFIG: 'true'
     secrets: *secrets
     code_fencing: *code_fencing_main
@@ -399,69 +445,3 @@ builds:
       DEV_OAUTH_CONFIG: 'true'
     secrets: *secrets
     code_fencing: *code_fencing_flask
-
-  # ─────────────────────────────────────────────────────────────────────────────
-  # QA Builds (legacy - for internal testing)
-  # ─────────────────────────────────────────────────────────────────────────────
-
-  # QA production build
-  qa-prod:
-    github_environment: build-uat
-    signing: *signing_uat
-    env:
-      <<: *public_envs
-      METAMASK_ENVIRONMENT: 'production'
-      METAMASK_BUILD_TYPE: 'qa'
-    secrets:
-      <<: *secrets
-      # QA uses QA Segment project
-      SEGMENT_WRITE_KEY: SEGMENT_WRITE_KEY_QA
-      SEGMENT_PROXY_URL: SEGMENT_PROXY_URL_QA
-      SEGMENT_DELETE_API_SOURCE_ID: SEGMENT_DELETE_API_SOURCE_ID_QA
-      SEGMENT_REGULATIONS_ENDPOINT: SEGMENT_REGULATIONS_ENDPOINT_QA
-      # QA uses UAT OAuth credentials
-      IOS_GOOGLE_CLIENT_ID: MAIN_IOS_GOOGLE_CLIENT_ID_UAT
-      IOS_GOOGLE_REDIRECT_URI: MAIN_IOS_GOOGLE_REDIRECT_URI_UAT
-      ANDROID_GOOGLE_CLIENT_ID: MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT
-      ANDROID_APPLE_CLIENT_ID: MAIN_ANDROID_APPLE_CLIENT_ID_UAT
-      ANDROID_GOOGLE_SERVER_CLIENT_ID: MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT
-      MM_CARD_BAANX_API_CLIENT_KEY: MM_CARD_BAANX_API_CLIENT_KEY_UAT
-    code_fencing: *code_fencing_main
-
-  # QA dev build / Expo development build (Runway .app for simulator)
-  qa-dev:
-    github_environment: build-uat
-    env:
-      <<: *public_envs
-      METAMASK_ENVIRONMENT: 'dev'
-      METAMASK_BUILD_TYPE: 'qa'
-      MM_PORTFOLIO_URL: 'https://portfolio.dev-api.cx.metamask.io'
-      MM_PREDICT_BUILDER_CODE: '0xd48300a99deac0f23265dad1f59d32920be33b75919201a88ed80f457f97b924'
-      REWARDS_API_URL: 'https://rewards.uat-api.cx.metamask.io'
-      BAANX_API_URL: 'https://dev.api.baanx.com'
-      DIGEST_API_URL: 'https://digest.dev-api.cx.metamask.io/api/v1'
-      SOCIAL_API_URL: 'https://social.dev-api.cx.metamask.io'
-      BRIDGE_USE_DEV_APIS: 'true'
-      RAMPS_ENVIRONMENT: 'staging'
-      RAMP_INTERNAL_BUILD: 'true'
-      RAMP_DEV_BUILD: 'true'
-      IS_TEST: 'false'
-      MM_ENABLE_SETTINGS_PAGE_DEV_OPTIONS: 'true'
-      IS_SIM_BUILD: 'true'
-      CONFIGURATION: 'Debug'
-      DEV_OAUTH_CONFIG: 'true'
-    secrets:
-      <<: *secrets
-      # QA uses QA Segment project
-      SEGMENT_WRITE_KEY: SEGMENT_WRITE_KEY_QA
-      SEGMENT_PROXY_URL: SEGMENT_PROXY_URL_QA
-      SEGMENT_DELETE_API_SOURCE_ID: SEGMENT_DELETE_API_SOURCE_ID_QA
-      SEGMENT_REGULATIONS_ENDPOINT: SEGMENT_REGULATIONS_ENDPOINT_QA
-      # QA uses UAT OAuth credentials
-      IOS_GOOGLE_CLIENT_ID: MAIN_IOS_GOOGLE_CLIENT_ID_UAT
-      IOS_GOOGLE_REDIRECT_URI: MAIN_IOS_GOOGLE_REDIRECT_URI_UAT
-      ANDROID_GOOGLE_CLIENT_ID: MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT
-      ANDROID_APPLE_CLIENT_ID: MAIN_ANDROID_APPLE_CLIENT_ID_UAT
-      ANDROID_GOOGLE_SERVER_CLIENT_ID: MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT
-      MM_CARD_BAANX_API_CLIENT_KEY: MM_CARD_BAANX_API_CLIENT_KEY_UAT
-    code_fencing: *code_fencing_main
diff --git a/docs/bigint-migration-guide.md b/docs/bigint-migration-guide.md
index 13faa3ca518..6028547edf9 100644
--- a/docs/bigint-migration-guide.md
+++ b/docs/bigint-migration-guide.md
@@ -45,6 +45,179 @@ import { hexToBN, BNToHex, fromWei, toWei, ... } from '../util/number/index';
 import { hexToBigInt, bigIntToHex, fromWei, toWei, ... } from '../util/number/bigint';
 ```
 
+## util/number import burndown (by team)
+
+ESLint still allows a fixed set of files to import the deprecated BN.js module `app/util/number/index.js`. That allowlist lives in `.eslintrc.js` as `utilNumberImportBurndownFiles`. After migrating a file to `app/util/number/bigint`, remove its path from that array so new legacy imports cannot creep back in.
+
+Imports that resolve to the same file count too: for example `from '../util/number'`, `from '../util/number/index'`, and (from under `app/util/`) `from '../number'` all resolve to `index.js` and are subject to the same fence unless the file is on the allowlist.
+
+The table below maps each burndown path to the GitHub team(s) from [`.github/CODEOWNERS`](../.github/CODEOWNERS) using the same rule as GitHub: the **last** pattern in the file that matches the path wins. Shared `app/util/confirmation/`, `app/util/custom-gas/`, `app/util/networks/`, and `app/util/transactions/` have explicit owner lines so burndown PRs route like adjacent product code. If your area is not covered, add or tighten a `CODEOWNERS` entry in a follow-up PR.
+
+### @MetaMask/card
+
+- `app/components/UI/Card/hooks/useAssetBalances.tsx`
+- `app/components/UI/Card/hooks/useCardDelegation.test.ts`
+- `app/components/UI/Card/hooks/useCardDelegation.ts`
+- `app/components/UI/Card/hooks/useNeedsGasFaucet.ts`
+- `app/components/UI/Card/sdk/CardSDK.ts`
+
+### @MetaMask/confirmations
+
+- `app/components/Views/confirmations/components/gas/max-base-fee-input/max-base-fee-input.tsx`
+- `app/components/Views/confirmations/components/gas/priority-fee-input/priority-fee-input.tsx`
+- `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/hooks/gas/useCancelSpeedupGas/useCancelSpeedupGas.ts`
+- `app/components/Views/confirmations/hooks/send/useBalance.ts`
+- `app/components/Views/confirmations/hooks/send/useCurrencyConversions.ts`
+- `app/components/Views/confirmations/hooks/send/usePercentageAmount.ts`
+- `app/components/Views/confirmations/hooks/useTokenAmount.ts`
+- `app/components/Views/confirmations/legacy/components/CustomNonceModal/index.js`
+- `app/components/Views/confirmations/legacy/components/WatchAssetRequest/index.js`
+- `app/components/Views/confirmations/utils/send.ts`
+- `app/core/Engine/controllers/gas-fee-controller/gas-fee-controller-init.test.ts`
+- `app/util/confirm-tx.js`
+- `app/util/conversions.js`
+- `app/util/confirmation/gas.ts`
+- `app/util/confirmation/transactions.ts`
+- `app/util/custom-gas/index.js`
+
+### @MetaMask/confirmations and @MetaMask/earn (co-owned)
+
+- `app/components/Views/confirmations/external/staking/hooks/useStakingDetails.ts`
+
+### @MetaMask/design-system-engineers
+
+- `app/component-library/components-temp/CustomSpendCap/CustomInput/CustomInput.tsx`
+- `app/component-library/components-temp/CustomSpendCap/CustomSpendCap.tsx`
+- `app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.tsx`
+- `app/component-library/components-temp/Price/AggregatedPercentage/utils.ts`
+
+### @MetaMask/earn
+
+Includes Stake UI and Money paths owned via `**/Earn/**`, `**/earn/**`, `**/Money/**`, `**/money/**`, and `app/components/UI/Stake` in `CODEOWNERS`.
+
+- `app/components/UI/Earn/Views/EarnInputView/EarnInputView.test.tsx`
+- `app/components/UI/Earn/Views/EarnLendingDepositConfirmationView/components/Erc20TokenHero/index.tsx`
+- `app/components/UI/Earn/Views/EarnLendingDepositConfirmationView/index.tsx`
+- `app/components/UI/Earn/Views/EarnLendingWithdrawalConfirmationView/index.tsx`
+- `app/components/UI/Earn/Views/EarnWithdrawInputView/EarnWithdrawInputView.tsx`
+- `app/components/UI/Earn/components/EarnLendingBalance/index.tsx`
+- `app/components/UI/Earn/components/Earnings/EarningsHistory/EarningsHistory.utils.ts`
+- `app/components/UI/Earn/components/InputDisplay/InputDisplay.test.tsx`
+- `app/components/UI/Earn/hooks/useEarnGasFee.ts`
+- `app/components/UI/Earn/hooks/useEarnInput.ts`
+- `app/components/UI/Earn/hooks/useEarnings.ts`
+- `app/components/UI/Earn/hooks/useInput.ts`
+- `app/components/UI/Earn/hooks/useMultichainInputHandlers.ts`
+- `app/components/UI/Earn/hooks/useMusdBalance.ts`
+- `app/components/UI/Earn/hooks/useMusdCtaVisibility.ts`
+- `app/components/UI/Earn/utils/number.ts`
+- `app/components/UI/Earn/utils/token/index.ts`
+- `app/components/UI/Earn/utils/tron.ts`
+- `app/components/UI/Money/constants/activityStyles.ts`
+- `app/components/UI/Money/hooks/useMoneyAccountBalance.ts`
+- `app/components/UI/Money/utils/moneyActivityFiat.ts`
+- `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/Views/confirmations/hooks/earn/useCustomAmount.tsx`
+- `app/selectors/earnController/earn/index.ts`
+
+### @MetaMask/metamask-assets
+
+- `app/components/UI/AssetOverview/Price/Price.advanced.tsx`
+- `app/components/UI/AssetOverview/Price/Price.legacy.tsx`
+- `app/components/UI/AssetOverview/utils/marketDetails.ts`
+- `app/components/UI/CollectibleOverview/index.js`
+- `app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.test.ts`
+- `app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.ts`
+- `app/components/Views/AssetDetails/index.tsx`
+- `app/components/Views/DetectedTokens/components/Token.tsx`
+- `app/selectors/assets/assets-list.ts`
+
+### @MetaMask/mobile-core-ux
+
+- `app/components/UI/TransactionElement/utils-gas.js`
+- `app/components/UI/TransactionElement/utils.js`
+- `app/components/Views/UnifiedTransactionsView/useUnifiedTxActions.test.ts`
+- `app/util/networks/index.js`
+
+### @MetaMask/mobile-platform
+
+- `app/core/Engine/Engine.ts`
+
+### @MetaMask/money-movement
+
+- `app/components/UI/Ramp/Aggregator/Views/BuildQuote/BuildQuote.test.tsx`
+- `app/components/UI/Ramp/Aggregator/Views/BuildQuote/BuildQuote.tsx`
+- `app/components/UI/Ramp/Aggregator/Views/OrdersList/OrdersList.tsx`
+- `app/components/UI/Ramp/Aggregator/Views/SendTransaction/SendTransaction.tsx`
+- `app/components/UI/Ramp/Aggregator/components/OrderDetails.tsx`
+- `app/components/UI/Ramp/Aggregator/components/OrderListItem/OrderListItem.tsx`
+- `app/components/UI/Ramp/Aggregator/components/Quote/Quote.tsx`
+- `app/components/UI/Ramp/Aggregator/hooks/useBalance.test.ts`
+- `app/components/UI/Ramp/Aggregator/hooks/useBalance.ts`
+- `app/components/UI/Ramp/Aggregator/hooks/useERC20GasLimitEstimation.ts`
+- `app/components/UI/Ramp/Aggregator/hooks/useHandleSuccessfulOrder.ts`
+- `app/components/UI/Ramp/Aggregator/hooks/useIntentAmount.ts`
+- `app/components/UI/Ramp/Aggregator/utils/index.ts`
+- `app/components/UI/Ramp/Deposit/utils/index.ts`
+- `app/components/UI/Ramp/utils/getOrderAmount.ts`
+- `app/components/UI/Ramp/utils/v2OrderToast.ts`
+
+### @MetaMask/notifications
+
+- `app/components/UI/Notification/TransactionNotification/index.js`
+
+### @MetaMask/social-ai
+
+- `app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuyBottomSheet/useQuickBuyBottomSheet.ts`
+- `app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuyBottomSheet/useQuickBuyQuotes.ts`
+- `app/components/Views/SocialLeaderboard/utils/formatters.ts`
+
+### @MetaMask/swaps-engineers
+
+- `app/components/UI/Bridge/components/QuoteSelectorView/QuoteRow.tsx`
+- `app/components/UI/Bridge/components/QuoteSelectorView/index.tsx`
+- `app/components/UI/Bridge/hooks/useBridgeQuoteData/index.ts`
+- `app/components/UI/Bridge/hooks/useFormattedBalanceWithThreshold/index.ts`
+- `app/components/UI/Bridge/hooks/useHasSufficientGas/index.ts`
+- `app/components/UI/Bridge/hooks/useInsufficientBalance/index.ts`
+- `app/components/UI/Bridge/hooks/useTokenBalanceInUsd/index.ts`
+- `app/components/UI/Bridge/hooks/useTokensWithBalance/index.ts`
+- `app/components/UI/Bridge/utils/exchange-rates.ts`
+- `app/components/UI/Bridge/utils/formatNetworkFee.test.ts`
+- `app/components/UI/Bridge/utils/formatNetworkFee.ts`
+- `app/components/UI/Bridge/utils/transaction-history.ts`
+
+### @MetaMask/transactions and @MetaMask/confirmations (co-owned)
+
+- `app/util/transactions/index.js`
+- `app/util/transactions/index.test.ts`
+
+### No matching `CODEOWNERS` rule yet
+
+These burndown paths did not match any owner line in `.github/CODEOWNERS` at the time this section was added. Coordinate migration with the relevant feature DRI or extend `CODEOWNERS` so reviews route correctly.
+
+- `app/components/UI/AccountInfoCard/index.js`
+- `app/components/UI/HardwareWallet/AccountDetails/index.tsx`
+- `app/components/UI/MultichainBridgeTransactionListItem/MultichainBridgeTransactionListItem.tsx`
+- `app/components/UI/UrlAutocomplete/Result.tsx`
+- `app/components/Views/GasEducationCarousel/index.js`
+- `app/components/Views/NetworksManagement/NetworkDetailsView/hooks/useNetworkValidation.ts`
+- `app/components/hooks/useAddressBalance/useAddressBalance.ts`
+- `app/components/hooks/useGetFormattedTokensPerChain.tsx`
+- `app/components/hooks/useGetTotalFiatBalanceCrossChains.tsx`
+- `app/core/GasPolling/GasPolling.ts`
+- `app/core/NotificationManager.js`
+- `app/selectors/multichain/evm.ts`
+
 ## Function mapping (A → Z)
 
 | Legacy (`index.js`)                 | BigInt (`bigint.ts`)                | Notes                                                                                                                  |
diff --git a/docs/perps/perps-account-abstraction-and-balance-contract.md b/docs/perps/perps-account-abstraction-and-balance-contract.md
new file mode 100644
index 00000000000..6914d2c174d
--- /dev/null
+++ b/docs/perps/perps-account-abstraction-and-balance-contract.md
@@ -0,0 +1,389 @@
+# Perps — Account Abstraction & Balance Contract
+
+This is the reference doc for the perps `AccountState` balance contract and how mobile handles HyperLiquid's account-abstraction modes (Unified, Standard, Portfolio, DEX-abstraction). Anyone touching balance display, order-entry validation, withdraw flow, or HL-mode-aware logic should start here.
+
+The current shape — three purpose-built balance fields plus a mode-aware spot-fold gate — was introduced in [TAT-3047 / PR #29303](https://github.com/MetaMask/metamask-mobile/pull/29303), which replaced the earlier overloaded `availableBalance` + optional `availableToTradeBalance` pair (TAT-3016 hotfix) and added end-to-end correctness across the abstraction modes HL exposes.
+
+## What's in this doc
+
+1. **The contract** — three fields and what they mean per provider (`AccountState.spendableBalance` / `withdrawableBalance` / `totalBalance`).
+2. **HL abstraction modes** — Unified vs Standard vs Portfolio vs DEX-abstraction, mapped to HL web checkboxes and the SDK `userSetAbstraction` enum, with the per-mode balance semantics.
+3. **The mode-aware spot-fold gate** — how the provider + subscription service detect and react to HL-side mode changes.
+4. **Validation matrix** — the four fixture accounts and recipes that prove the contract holds end-to-end on mainnet.
+5. **Known trade-offs** — explicit "not covered" + the cold-start behaviour for Standard-mode users.
+
+## Why this matters for any future change
+
+- **UI never branches on provider or HL abstraction mode.** Consumers read `spendableBalance` for "can the user open a trade with this much" and `withdrawableBalance` for "can the user pull this much off the venue". The provider populates each field with the right number for the mode it's in. If a future provider needs different semantics, add the translation in the adapter — not in a hook or component.
+- **`addSpotBalanceToAccountState` is provider-agnostic** and takes an explicit `{ foldIntoCollateral }` flag. The HL provider computes the flag from `userAbstraction`; MYX always passes `true`.
+- **`hyperLiquidModeFoldsSpot(mode)` is the single source of truth** for "does this HL mode let spot USDC act as perps collateral". Add new HL mode strings here when HL ships them.
+
+Last validated: 2026-04-24, mainnet (recipe run on 4 fixture accounts including a live Unified ↔ Standard mode flip).
+
+## The three-field contract
+
+`AccountState` (in `app/controllers/perps/types/index.ts`) carries three balance fields, each answering one question:
+
+| Field                 | Question                                                      | Used by                                                          |
+| --------------------- | ------------------------------------------------------------- | ---------------------------------------------------------------- |
+| `totalBalance`        | What is the user's total wealth at this venue, including PnL? | Balance header, portfolio aggregation, deposit progress watchers |
+| `spendableBalance`    | How much can immediately collateralize a new position?        | Order-form max, pay-token gate, insufficient-balance alerts      |
+| `withdrawableBalance` | How much can leave this venue to the user's external wallet?  | Withdraw-form max, withdraw validation                           |
+
+Invariant (documented, not enforced): `withdrawableBalance ≤ spendableBalance ≤ totalBalance`.
+
+### Per-provider mapping
+
+| Provider               | `totalBalance`                                         | `spendableBalance`            | `withdrawableBalance`         |
+| ---------------------- | ------------------------------------------------------ | ----------------------------- | ----------------------------- |
+| HL Unified / Portfolio | `accountValue + spot.total − spot.hold`                | `withdrawable + freeSpotUSDC` | `withdrawable + freeSpotUSDC` |
+| HL Standard            | `accountValue + spot.total − spot.hold` (display only) | `withdrawable` (perps-only)   | `withdrawable` (perps-only)   |
+| MYX                    | `walletBalance + marginUsed + unrealizedPnl`           | `walletBalance`               | `walletBalance`               |
+
+On HL Unified/Portfolio, `spendable === withdrawable`: HL's backend treats spot USDC as perps collateral and `withdraw3` draws from the unified ledger server-side. On HL Standard, spot USDC is a separate ledger that HL won't auto-draw from, so spendable/withdrawable stay perps-only and only `totalBalance` reflects the combined wealth (display).
+
+## HL abstraction modes — glossary
+
+HL has four account-abstraction modes. The two user-facing ones that matter for this PR are **Unified** (default on app.hyperliquid.xyz) and **Standard**. They are composed on HL web via two checkboxes under Account Settings:
+
+| HL web checkbox A: "Disable HIP-3 Dex Abstraction" | HL web checkbox B: "Disable Unified Account Mode" | Resulting mode                                   | SDK `userSetAbstraction` value | Balance semantics                                                                                                                                           |
+| -------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------ | ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ☐ unchecked                                        | ☐ unchecked                                       | DEX abstraction (deprecated, to be discontinued) | `dexAbstraction`               | USDC defaults to perps, other collateral defaults to spot; HIP-3 cross margin is non-intuitive.                                                             |
+| ✓ **checked**                                      | ☐ unchecked                                       | **Unified** (default)                            | `unifiedAccount`               | Single USDC balance unified across spot + all USDC-quoted perp DEXes. Spot USDC IS perps collateral.                                                        |
+| ☐ unchecked                                        | ✓ checked                                         | DEX abstraction variant                          | —                              | Not exercised by this recipe.                                                                                                                               |
+| ✓ **checked**                                      | ✓ **checked**                                     | **Standard**                                     | `disabled`                     | Separate perps and spot balances. Separate per-DEX balances. Spot USDC is NOT auto-collateral for perps; moving it requires an explicit `usdClassTransfer`. |
+
+When this recipe's `phase2c-flip-standard` step calls `exchangeClient.userSetAbstraction({ abstraction: 'disabled' })` on dev2, it is equivalent to **checking both** boxes in the HL web UI (i.e. producing Standard). `phase2c-restore-unified` calls `userSetAbstraction({ abstraction: 'unifiedAccount' })` which leaves HIP-3 disabled but re-enables Unified (the default state — checkbox A checked, checkbox B unchecked).
+
+Portfolio margin (pre-alpha, `portfolioMargin`) is a separate toggle not covered here.
+
+## Accounts and topologies covered
+
+Four fixture accounts, each in a distinct state. Two abstraction modes (Unified + Standard) are exercised live by flipping `dev2` mid-recipe.
+
+| Fixture       | Address         | Modes run live                   | Perps clearinghouse                               | Spot USDC                     | Open positions       | Topology                                                    |
+| ------------- | --------------- | -------------------------------- | ------------------------------------------------- | ----------------------------- | -------------------- | ----------------------------------------------------------- |
+| **Trading**   | `0x316BDE…01fA` | Unified                          | `withdrawable=$0`, `accountValue≈$3.35`           | `total≈$104.40`, `hold≈$6.87` | Yes (on HIP-3 `xyz`) | Unified, spot-funded, open HIP-3 position ⇒ `spot.hold > 0` |
+| **dev1**      | `0x8Dc623…9003` | Unified                          | `withdrawable=$0`, `accountValue=$0`              | `total≈$29.67`, `hold=$0`     | None                 | Unified, spot-only, clean                                   |
+| **dev2**      | `0x5993d2…0916` | **Unified → Standard → Unified** | `withdrawable≈$10`, `accountValue≈$10` (pre-flip) | dust (`≈$0.0004`, `hold=$0`)  | None                 | Perps-funded clean fixture flipped to Standard and back     |
+| **Account 6** | `0xB9b9E1…42c2` | Unified                          | `withdrawable=$0`, `accountValue=$0`              | `total=$0`, `hold=$0`         | None                 | Zero across all ledgers                                     |
+
+Note on dev2 ledger drift: `userSetAbstraction` flipping a Unified account to Standard and back can redistribute the USDC between the perps and spot sides at the HL backend (observed: $10 moved perps→spot during the flip cycle). This is HL-side behaviour, not a recipe artefact. The account's total USDC is preserved end-to-end; only the side it reports on changes.
+
+## Why this set covers the refactor surface
+
+| Risk the refactor could introduce                             | Scenario that catches it                                                                                                        |
+| ------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
+| Fields not populated (UI reads `undefined`)                   | All four scenarios — `hl-balance-contract-check` asserts shape                                                                  |
+| Spot fold applied incorrectly on Unified                      | Trading (spot-funded) — `hl-balance-math-check` asserts `spendable = Σ(breakdown.spendable) + freeSpot`                         |
+| `spot.hold` not subtracted from total when a position is open | Trading has `spot.hold = $6.87` from an HIP-3 margin hold — math check flags if `totalBalance` includes the double-counted hold |
+| Clean spot-only case produces wrong shape                     | dev1 — simpler topology, catches regressions that only appear without HIP-3 noise                                               |
+| Perps-funded clean case produces wrong shape                  | dev2 Unified baseline — covers the "perps-heavy, spot-light" topology the other fixtures don't                                  |
+| Contract not mode-agnostic                                    | dev2 flipped Unified → Standard → Unified — contract + math asserted in both modes                                              |
+| Mode flip corrupts persisted state shape                      | dev2 post-flip-back — contract re-asserted to confirm shape survives the round trip                                             |
+| Legacy keys leak back in                                      | All four — contract flow asserts `availableBalance` and `availableToTradeBalance` are absent                                    |
+| `spendable` diverges from `withdrawable` on HL                | All four — math flow asserts `spendable === withdrawable`                                                                       |
+
+### Not covered
+
+- **Portfolio margin mode** (pre-alpha): no fixture available; behaviour expected to match Unified for borrowable-asset accounts.
+- **DEX-abstraction mode** (deprecated by HL): out of scope.
+- **Open positions on Standard mode**: would require opening a position after the flip. Not exercised — contract shape is mode-agnostic per our refactor, and the position-open path is covered separately in Trading (Unified with HIP-3 position).
+- **Cold-start inflation window for Standard-mode users**: the mode cache starts empty, and `hyperLiquidModeFoldsSpot(null)` intentionally returns `true` (Unified default — see JSDoc on the helper). For Standard-mode users on a fresh app launch, the _first_ spot WS tick can surface a spot-folded `spendableBalance` / `withdrawableBalance` until `userAbstraction` REST completes (typically sub-second). `getAccountState` (REST-driven) fetches `userAbstraction` in parallel via `Promise.allSettled` and applies the gated fold when fulfilled, so the REST path is unaffected. Explicit trade-off: under-reporting Unified on transient endpoint failure was judged a worse trust break than a brief over-report on the minority Standard population. HL rejects bad submits cleanly; no data-loss risk. Sentry logging now surfaces sustained `userAbstraction` failures so ops can track the rate.
+
+### Standard-mode correctness — fixed
+
+Earlier revisions of this PR had an unconditional spot-fold in `addSpotBalanceToAccountState`, which inflated `spendableBalance` and `withdrawableBalance` on HL Standard-mode accounts (where spot is a separate ledger, not perps collateral). That would have let the UI approve withdraw/order submissions that HL's backend would reject.
+
+The PR now includes a mode-aware fold gate:
+
+- `accountUtils.addSpotBalanceToAccountState` takes an `{ foldIntoCollateral: boolean }` option. Provider-agnostic — doesn't know about HL modes.
+- `hyperliquid-types.ts` owns the HL-specific `HyperLiquidAbstractionMode` type (re-export of HL SDK's `UserAbstractionResponse`) and a `hyperLiquidModeFoldsSpot(mode)` helper that returns `true` for `unifiedAccount` / `portfolioMargin` / `default` and `false` for `disabled` (Standard) / `dexAbstraction`.
+- `HyperLiquidProvider.getAccountState` fetches `userAbstraction` in parallel with clearinghouse + spot state, then passes `{ foldIntoCollateral: hyperLiquidModeFoldsSpot(mode) }` to the util.
+- `HyperLiquidSubscriptionService` caches `userAbstraction` alongside `spotClearinghouseState` (refreshed together, cleared together on cleanup) and applies the same gate on every fold site.
+
+Migration 133 uses an **asymmetric mapping** so upgraded Standard-mode users see correct cold-start values without waiting for the first live fetch: `withdrawableBalance` migrates from the legacy perps-only `availableBalance` (not from the spot-folded `availableToTradeBalance`).
+
+Phase 2c of the recipe proves the fix with live numbers on dev2 flipped to Standard mode:
+
+- `spot.free = $10.01`
+- `standardSemanticExpected.spendable = 0` (perps-only)
+- `adapterActual.spendable = 0`
+- `observedInflation = 0` — no inflation, gate works.
+
+## Reusable composable flows
+
+Under `scripts/perps/agentic/teams/perps/flows/`. Each takes `address` + `phaseLabel` and is reusable in any future recipe.
+
+### `hl-balance-contract-check.json`
+
+Asserts `PerpsController.accountState` carries the new three-field contract:
+
+- `spendableBalance: string` present
+- `withdrawableBalance: string` present
+- `totalBalance: string` present
+- `availableBalance` absent (legacy)
+- `availableToTradeBalance` absent (legacy)
+
+### `hl-balance-math-check.json`
+
+Asserts the spot-fold math by deriving expected values from the controller's own `subAccountBreakdown` (pre-fold per-DEX perps) plus live HL REST `spotClearinghouseState`:
+
+- Expected `spendable = Σ(breakdown[*].spendableBalance) + max(0, spot.total − spot.hold)`
+- Expected `withdrawable = Σ(breakdown[*].withdrawableBalance) + max(0, spot.total − spot.hold)`
+- Expected `total = Σ(breakdown[*].totalBalance) + spot.total − spot.hold`
+- Asserts `spendable === withdrawable` (HL invariant)
+- Tolerates `epsilon = 0.01` for rounding
+
+This formulation naturally covers single-DEX accounts and HIP-3 multi-DEX accounts — the per-DEX sum is the controller's own truth; the spot REST is independent. Works in both Unified and Standard modes because `freeSpot` comes from raw HL REST.
+
+Standard-mode regression guard is inlined in the recipe (`pathA-fold-correctness` node) rather than a separate flow — `hl-balance-math-check{foldIntoCollateral=false}` already proves the gate works; the inline `eval_async` quantifies `observedInflation = adapterActual.spendable − Σ(breakdown.spendable)` so a reviewer can read the delta in the trace.
+
+### `hl-provision-fixture.json` (pre-existing, reused)
+
+Already in the repo. Used to flip abstraction mode via `userSetAbstraction`. Required for the dev2 Standard-mode scenario.
+
+## Top-level recipe
+
+The validation recipe lives in the repo at `scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json`. It is a **single-account state machine** parameterised by EVM address. The runner's `--input address=0x...` flag picks the fixture; the recipe's preflight probe classifies the account into one of two execution paths based on whether positions / orders are open (HL rejects `userSetAbstraction` while either exists).
+
+```
+setup    → toggle_testnet enabled=false → wait isTestnet===false   (force mainnet before graph runs)
+entry → gate-check-route → go-home (if inside Perps) → select-account ({{address}}) → wait-account → preflight-probe
+preflight-probe (HL REST: clearinghouseState + openOrders + spotClearinghouseState + userAbstraction)
+  └─ classifies pathA = positions===0 && pendingOrders===0
+shared (mode-agnostic — runs on both paths)
+  ├─ call hl-balance-contract-check
+  ├─ call hl-balance-math-check
+  ├─ nav PerpsMarketListView   → assert PerpsMarketBalanceActions shows spendableBalance
+  ├─ screenshot shared-market-list.png
+  ├─ nav PerpsWithdraw         → assert perps-withdraw-available-balance-text shows withdrawableBalance (not $0)
+  ├─ screenshot shared-withdraw-folded.png
+  ├─ type_keypad 1     → assert continue-button disabled=false
+  └─ type_keypad 99999 → assert contract (over-amount > withdrawable)
+path-switch
+  ├─ pathA → pathA-flip-standard            (Unified → Standard)
+  └─ default → pathB-shift-spot             (positions present — perps↔spot transfers only)
+pathA (clean account, full mode-flip matrix)
+  ├─ call hl-provision-fixture abstraction=disabled       (Unified → Standard)
+  ├─ wait userAbstraction REST = 'disabled'               (HL-side propagation bite)
+  ├─ call hl-balance-contract-check                        (shape in Standard mode)
+  ├─ call hl-balance-math-check foldIntoCollateral=false   (math gated for Standard semantics)
+  ├─ eval_async pathA-fold-correctness                     (inline regression guard: assert observedInflation ≤ ε)
+  ├─ call hl-provision-fixture abstraction=unifiedAccount  (restore)
+  ├─ wait userAbstraction REST = 'unifiedAccount'
+  └─ call hl-balance-contract-check                        (shape survives round trip)
+pathB (positions present — perps↔spot transfer only, no mode flip)
+  ├─ call hl-provision-fixture transferDirection=to-spot   (shift free perps → spot)
+  ├─ call hl-balance-contract-check                        (shape unchanged)
+  ├─ call hl-balance-math-check                            (math under non-trivial spot.hold)
+  └─ call hl-provision-fixture transferDirection=to-perp   (restore — positions untouched)
+teardown
+  └─ navigate WalletView
+```
+
+Setup prerequisites (Metro, simulator, wallet fixture, CDP bridge): see `scripts/perps/agentic/README.md`. The recipe forces `isTestnet=false` in its setup block (HyperLiquid mainnet — real fixtures and `userAbstraction`) and expects the fixture wallet (default Trading) to hold ≥ a few USDC.
+
+Run against a live app (Trading by default):
+
+```bash
+bash scripts/perps/agentic/validate-recipe.sh \
+  scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json
+```
+
+Pick a different fixture (e.g. dev2 for guaranteed Path A):
+
+```bash
+bash scripts/perps/agentic/validate-recipe.sh \
+  scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json \
+  --input address=0x5993d2153F080470BFE765aE81F4fA5fA2080916
+```
+
+Dry-run graph walk only (no CDP):
+
+```bash
+bash scripts/perps/agentic/validate-recipe.sh \
+  scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json --dry-run
+```
+
+Schema validation (syntax + graph reachability):
+
+```bash
+node scripts/perps/agentic/validate-flow-schema.js \
+  scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json \
+  scripts/perps/agentic/teams/perps/flows/hl-balance-contract-check.json \
+  scripts/perps/agentic/teams/perps/flows/hl-balance-math-check.json
+```
+
+## Manual reproduction
+
+Anyone with HL web access + a fixture wallet can validate the contract by hand. The state machine below mirrors the recipe 1:1; each row maps to an HL-web action and an expected mobile-app readout. Run on a clean account (no open positions/orders) to walk all five states; on an account with positions you can only do steps 1, 1b (perps→spot transfer), and 1c (transfer back).
+
+Default fixture: **Trading** (`0x316BDE…01fA`). Substitute any address you can sign for; the recipe's `--input address=...` flag does the same.
+
+| #      | HL web action                                                                                         | Resulting state                            | Mobile app readout                                                                                           | What it proves                                                            |
+| ------ | ----------------------------------------------------------------------------------------------------- | ------------------------------------------ | ------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------- |
+| **0**  | open `app.hyperliquid.xyz/portfolio`, log in with the fixture wallet, ensure no open positions/orders | baseline                                   | (no app action)                                                                                              | precondition for mode flips                                               |
+| **1**  | none (start in Unified, all funds on perps)                                                           | **Unified, perps-only**                    | PerpsMarketListView header `$X` (= perps balance); PerpsWithdrawView "Available Perps balance" `$X`          | three-field shape populated, sane Unified case                            |
+| **1b** | click _Transfer_ (Perp → Spot) for the full perps balance                                             | **Unified, spot-only**                     | PerpsMarketListView still `$X` (fold); PerpsWithdrawView still `$X` (TAT-3047 fix — was `$0` before this PR) | spot fold on Unified; primary TAT-3047 user-visible fix                   |
+| **2**  | Account Settings → check **Disable Unified Account Mode**, confirm signature                          | **Standard, spot-only**                    | PerpsMarketListView shows `$0` and the Add Funds CTA; PerpsWithdrawView "Available" reads `$0.00`            | mode-aware fold gate working — spot is no longer perps collateral         |
+| **2b** | click _Transfer_ (Spot → Perp) for half the spot balance                                              | **Standard, mixed (perps + spot)**         | PerpsMarketListView `$X/2`; total displayed wealth still `$X`                                                | math invariant: `total = perps + spot − hold` independent of mode         |
+| **2c** | click _Transfer_ (Spot → Perp) for the remaining spot                                                 | **Standard, perps-only**                   | PerpsMarketListView `$X`; PerpsWithdrawView `$X`                                                             | Standard cap matches perps clearinghouse exactly                          |
+| **3**  | Account Settings → uncheck **Disable Unified Account Mode**, confirm signature                        | **Unified, perps-only** (back to baseline) | Same as state 1                                                                                              | mode round trip preserves contract; HL redistributes the ledger as needed |
+
+Notes:
+
+- **HL web "Transfer between Perp and Spot"** is on the Portfolio screen. The mobile app does not expose this transfer — `usdClassTransfer` lives in the SDK and is only invoked by the agentic provisioning flow, not by user-facing UI.
+- **Mode-flip restriction**: the _Disable Unified Account Mode_ checkbox is greyed out while any position, order, or TWAP is open on the account. Close everything before attempting the flip.
+- **HL ledger drift on flip**: flipping from Unified to Standard can move USDC between the perps and spot sides at the HL backend (HL redistribution). Flipping back does not always restore the original split — it merely re-enables the unified view. The recipe documents this in the Path A trace.
+- **Recovery if a flip leaves you in Standard unintentionally**: re-open Account Settings, uncheck the box, sign. The mobile app picks up the new mode within ~60 s via the spot WebSocket → `userAbstraction` REST refresh path documented in the [Mode-aware spot-fold gate](#standard-mode-correctness--fixed) section.
+
+## Live run evidence
+
+Most recent run: `.agent/recipe-runs/2026-04-24_08-49-49_recipe/` (local — gitignored).
+
+### Summary
+
+```
+Results: 36/36 passed
+Recipe: PASS
+Teardown: PASS (Trading reselected, navigated to WalletView)
+```
+
+### Captured values — Phase 1 (Trading, Unified spot-funded + HIP-3)
+
+| Field                                                  | Source     | Value     |
+| ------------------------------------------------------ | ---------- | --------- |
+| `accountState.spendableBalance`                        | controller | `$97.53`  |
+| `accountState.withdrawableBalance`                     | controller | `$97.53`  |
+| `accountState.totalBalance`                            | controller | `$104.40` |
+| `clearinghouseState.withdrawable` (main)               | HL REST    | `$0.00`   |
+| `clearinghouseState.marginSummary.accountValue` (main) | HL REST    | `$3.35`   |
+| `spotClearinghouseState.balances[USDC].total`          | HL REST    | `$104.40` |
+| `spotClearinghouseState.balances[USDC].hold`           | HL REST    | `$6.87`   |
+| `subAccountBreakdown.main.totalBalance`                | controller | `$3.36`   |
+| `subAccountBreakdown.xyz.totalBalance` (HIP-3)         | controller | `$3.52`   |
+
+Math check passes: `Σ(breakdown[*].total) + spot.total − spot.hold ≈ totalBalance` within `ε = 0.01`.
+
+### Captured values — Phase 2 (dev1, Unified spot-only)
+
+| Field                 | Value    |
+| --------------------- | -------- |
+| `spendableBalance`    | `$29.67` |
+| `withdrawableBalance` | `$29.67` |
+| `totalBalance`        | `$29.67` |
+| `spot.USDC.total`     | `$29.67` |
+| `spot.USDC.hold`      | `$0.00`  |
+
+### Captured values — Phase 2b (dev2, Unified perps-funded, baseline)
+
+| Field                 | Value            |
+| --------------------- | ---------------- |
+| `spendableBalance`    | `$10.01`         |
+| `withdrawableBalance` | `$10.01`         |
+| `totalBalance`        | `$10.01`         |
+| `perps.withdrawable`  | `$10.01`         |
+| `spot.USDC.total`     | dust (`$0.0004`) |
+
+### Phase 2c (dev2, Unified → Standard → Unified)
+
+Equivalent to the user toggling HL web's "Disable Unified Account Mode" checkbox on, waiting, and toggling it off. Executed via `hl-provision-fixture` which calls `exchangeClient.userSetAbstraction({ abstraction: 'disabled' })` for the move to Standard and `{ abstraction: 'unifiedAccount' }` for the restore. HL accepts both operations for a clean account (no open positions / orders / TWAPs). After each flip the recipe waits for `PerpsController.getAccountState()` to refresh before asserting.
+
+**Observed side effect of the flip**: HL moves the $10 USDC from the perps side to the spot side as part of the Unified → Standard transition. This leaves dev2 post-flip with `perps.withdrawable = $0, spot.USDC = $10.01` — a meaningful split that exposes the Standard-mode fold limitation.
+
+Captured live values in Standard mode after the mode-aware fold gate landed:
+
+```json
+{
+  "phase": "dev2-standard-mode-correctness",
+  "spot": { "total": 10.0120682, "hold": 0, "free": 10.0120682 },
+  "standardSemanticExpected": { "spendable": 0, "withdrawable": 0 },
+  "adapterActual": { "spendable": 0, "withdrawable": 0 },
+  "observedInflation": { "spendable": 0, "withdrawable": 0 },
+  "standardModeCorrect": true
+}
+```
+
+Interpretation:
+
+- **Contract-shape check**: passed in Standard mode — fields populated, no legacy keys, shape is mode-agnostic. ✓
+- **Adapter internal-consistency check** (`hl-balance-math-check` with `foldIntoCollateral=false`): passed — adapter output matches the expected perps-only formula when Standard semantics apply. ✓
+- **Standard-mode correctness check** (inline `pathA-fold-correctness` eval): `adapterActual.spendable = 0` even though `spot.free = $10.01`, proving the `hyperLiquidModeFoldsSpot` gate is wired end-to-end through both the subscription service and the provider. ✓
+- **Post-restore contract check**: passed — shape survived the Unified → Standard → Unified round trip. ✓
+
+### Captured values — Phase 3 (Account 6, zero)
+
+| Field               | Value                                                                               |
+| ------------------- | ----------------------------------------------------------------------------------- |
+| All balance fields  | `$0`                                                                                |
+| Empty-state surface | `perps-market-add-funds-button` mounted; `perps-market-balance-value` reads `$0.00` |
+
+## UI-level assertions — Phase 1
+
+Observed on live app:
+
+| Screen                | testID                                  | Rendered text                                                     |
+| --------------------- | --------------------------------------- | ----------------------------------------------------------------- |
+| `PerpsMarketListView` | `perps-market-available-balance-text`   | `$97.53` (matches `spendableBalance`)                             |
+| `PerpsWithdrawView`   | `perps-withdraw-available-balance-text` | `Available Perps balance: $97.53` (matches `withdrawableBalance`) |
+
+Continue button state after keypad input (Phase 1):
+
+| Typed amount              | `continue-button.disabled` | Expected | Result                                                |
+| ------------------------- | -------------------------- | -------- | ----------------------------------------------------- |
+| `$1` (≤ withdrawable)     | `false`                    | enabled  | ✓                                                     |
+| `$99999` (> withdrawable) | (see note)                 | disabled | contract-level pass; UI reactivity tracked separately |
+
+Note: during AC6 the UI disabled state did not flip after typing `$99999`. The recipe asserts the contract-level condition (`99999 > withdrawableBalance`) which is what the refactor is responsible for. UI reactivity on large-keypad-input is a pre-existing quirk tracked as a follow-up.
+
+## Real withdrawal
+
+The recipe intentionally does NOT submit `withdraw3` — that call costs \$1 in HL fees. A manual probe was run separately:
+
+```
+[1] BEFORE: { perps_withdrawable: "0.0", spot_usdc_total: "105.417..." }
+[2] CALLING withdraw3({amount: "1.01"})
+    response: {"status":"ok","response":{"type":"default"}}
+[3] SUCCESS — HL accepted withdraw3 on Unified spot-funded account.
+[4] AFTER: { spot_usdc_total: "104.407..." }
+    spot.usdc.total delta: -1.01
+```
+
+Confirmed: on a Unified-mode account with `perps.withdrawable = 0` and spot USDC funded, `withdraw3` succeeds and pulls directly from spot via HL's unified abstraction. No client-side sweep needed — which is exactly why this PR does not carry one.
+
+## Migration path
+
+Migration `133.ts` is not covered by the recipe (recipe runs against live state, not redux-persist rehydration). Covered instead by:
+
+- **Unit-level**: `app/store/migrations/133.ts` maps legacy `availableBalance` / `availableToTradeBalance` into the new fields. Migration follows the repo's `ensureValidState` pattern and handles both the top-level `accountState` and `subAccountBreakdown` entries.
+- **Disk cache**: `PERPS_DISK_CACHE_USER_DATA` storage key bumped to `_V2`. Upgraded installs see an empty new-key cache on first run, fall through to skeleton, then backfill from the WS tick. Old-key blob sits orphaned until any reset/logout flow clears it.
+
+Manual validation of the migration path requires a build-upgrade harness (install prior-version → populate state → install new build → observe rehydration). Out of scope for this recipe.
+
+## Thoroughness checklist
+
+- [x] Four distinct account topologies covered: Unified spot-funded + HIP-3 / Unified spot-only clean / Unified perps-funded clean / zero
+- [x] Two abstraction modes exercised live (Unified + Standard) via in-flight flip on dev2
+- [x] Mode round trip exercised (Unified → Standard → Unified) and shape re-asserted after restore
+- [x] Standard-mode fold-limitation quantified with live numbers (`observedInflation ≈ freeSpot`)
+- [x] Controller field shape asserted on every account (no `undefined`, no legacy keys)
+- [x] Math check independent of HIP-3 knowledge (uses controller breakdown as perps truth, HL REST as spot truth)
+- [x] UI assertions on both `PerpsMarketListView` and `PerpsWithdrawView`
+- [x] Keypad input → validation hook behavior asserted for valid and over-amount cases
+- [x] Empty-state UI asserted via Add Funds affordance
+- [x] Teardown restores fixture account to Trading
+- [x] Schema-validated (composable flows + recipe)
+- [x] Run repeatable and free (no withdraw3, no fund movement outside the HL-internal ledger redistribution on mode flip)
+- [x] Real `withdraw3` behavior verified separately via one-shot script (cost: \$1)
+- [x] Flows are reusable via `call` — any future perps PR touching balance fields can compose them
+
+## Files
+
+| Path                                                                     | Purpose                                                   | Tracked |
+| ------------------------------------------------------------------------ | --------------------------------------------------------- | ------- |
+| `scripts/perps/agentic/teams/perps/flows/hl-balance-contract-check.json` | Composable shape check                                    | ✓ git   |
+| `scripts/perps/agentic/teams/perps/flows/hl-balance-math-check.json`     | Composable math check                                     | ✓ git   |
+| `scripts/perps/agentic/teams/perps/flows/hl-provision-fixture.json`      | Pre-existing fixture-provisioning flow (abstraction flip) | ✓ git   |
+| `scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json`     | Top-level single-account state-machine recipe             | ✓ git   |
+| `docs/perps/perps-account-abstraction-and-balance-contract.md`           | This document                                             | ✓ git   |
diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj
index 7ced34480ad..bfd809cb093 100644
--- a/ios/MetaMask.xcodeproj/project.pbxproj
+++ b/ios/MetaMask.xcodeproj/project.pbxproj
@@ -1269,7 +1269,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4866;
+				CURRENT_PROJECT_VERSION = 5017;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1307,7 +1307,7 @@
 					"${inherited}",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.76.0;
+				MARKETING_VERSION = 7.77.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1338,7 +1338,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4866;
+				CURRENT_PROJECT_VERSION = 5017;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1373,7 +1373,7 @@
 					"${inherited}",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.76.0;
+				MARKETING_VERSION = 7.77.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1404,7 +1404,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4866;
+				CURRENT_PROJECT_VERSION = 5017;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1442,7 +1442,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.76.0;
+				MARKETING_VERSION = 7.77.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1471,7 +1471,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4866;
+				CURRENT_PROJECT_VERSION = 5017;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1506,7 +1506,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.76.0;
+				MARKETING_VERSION = 7.77.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1634,7 +1634,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4866;
+				CURRENT_PROJECT_VERSION = 5017;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1672,7 +1672,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.76.0;
+				MARKETING_VERSION = 7.77.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -1704,7 +1704,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4866;
+				CURRENT_PROJECT_VERSION = 5017;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1739,7 +1739,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.76.0;
+				MARKETING_VERSION = 7.77.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",
diff --git a/jest.config.view.js b/jest.config.view.js
index 761a146c3ff..02dc996d16e 100644
--- a/jest.config.view.js
+++ b/jest.config.view.js
@@ -1,6 +1,25 @@
 /* eslint-disable import-x/no-commonjs */
 const baseConfig = require('./jest.config.js');
 
+// View tests are integration-level and exercise the real production code path
+// for the feature under test. Some app-level feature gates are guarded by
+// build-time env vars that babel inlines at compile time
+// (`babel-plugin-transform-inline-environment-variables` in babel.config.js),
+// so `process.env.X` reads in app code are substituted with whatever value the
+// var has when babel runs — runtime mutation from `mocks.ts` or
+// `setupFilesAfterEnv` is too late. Setting `IS_TEST=true` here, at
+// config-load time before babel compiles any test file, opts view tests into
+// the same `isE2E` shortcut smoke tests already use; this avoids mocking the
+// guarded config module (forbidden in CV).
+//
+// TODO: remove this once `app/util/notifications/constants/config.ts:
+// isNotificationsFeatureEnabled` (and any future similar gate) is refactored
+// to drop its `process.env.MM_NOTIFICATIONS_UI_ENABLED` dependency in favour
+// of a single state-driven (`RemoteFeatureFlagController`) check — at which
+// point view tests can seed the flag through Redux state like every other
+// feature already does.
+process.env.IS_TEST = 'true';
+
 module.exports = {
   ...baseConfig,
   setupFilesAfterEnv: ['<rootDir>/app/util/test/testSetupView.js'],
diff --git a/locales/languages/de.json b/locales/languages/de.json
index 2e8737535e1..fa3869cd035 100644
--- a/locales/languages/de.json
+++ b/locales/languages/de.json
@@ -479,7 +479,7 @@
     "biometric_authentication_cancelled_title": "Biometrische Einrichtung fehlgeschlagen",
     "biometric_authentication_cancelled_description": "Bitte richten Sie die biometrische Authentifizierung in den Einstellungen erneut ein.",
     "biometric_authentication_cancelled_button": "Bestätigen",
-    "biometric_changed": "Biometric Changed",
+    "biometric_changed": "Biometrische Daten geändert",
     "biometric_changed_alert_desc": "Ihre Biometrie wurde geändert. Aktivieren Sie bitte die biometrischen Daten in den Einstellungen erneut.",
     "biometric_changed_alert_confirm": "Bestätigen"
   },
@@ -634,7 +634,8 @@
     "trade": "Trade",
     "settings": "Einstellungen",
     "rewards": "Belohnungen",
-    "trending": "Entdecken"
+    "trending": "Entdecken",
+    "money": "Money"
   },
   "drawer": {
     "send_button": "Senden",
@@ -708,7 +709,11 @@
     "smart_contract_address": "Smart-Contract-Adresse",
     "smart_contract_address_warning": "Die Empfängeradresse unterstützt womöglich keine direkten Token-Übertragungen, was zu Geldverlusten führen kann. Fahren Sie nur fort, wenn Sie sicher sind, dass dieser Contract Ihre Übertragung empfangen kann.",
     "i_understand": "Ich verstehe",
-    "cancel": "Stornieren"
+    "cancel": "Stornieren",
+    "new_address_title": "Neue Adresse",
+    "new_address_message": "Sie senden zum ersten Mal an diese Adresse. Vergewissern Sie sich, dass diese Adresse korrekt ist, bevor Sie fortfahren:",
+    "alert_navigation_previous": "Vorherige Benachrichtigung",
+    "alert_navigation_next": "Nächste Benachrichtigung"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "Top-Trader",
       "allow_push_notifications": "Push-Benachrichtigungen erlauben",
       "trades_over_label": "Lassen Sie sich von Trades benachrichtigen über:",
       "traders_you_follow": "Trader, denen Sie folgen",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "Die von Ihnen gefolgten Trader können nicht geladen werden."
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "Mitteilungen von {{traderName}}",
       "allow_push_notifications": "Push-Benachrichtigungen erlauben",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "Erhalten Sie Mitteilungen über die Handelsaktivitäten von {{traderName}}.",
+      "manage_traders": "Verwalten Sie Trader, denen Sie folgen",
       "save": "Speichern"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "Erhalten Sie Echtzeit-Benachrichtigungen über Trades der Trader, denen Sie folgen.",
       "allow_push_notifications": "Push-Benachrichtigungen erlauben",
       "trades_over_label": "Lassen Sie sich von Trades benachrichtigen über:",
       "save": "Speichern",
@@ -1059,7 +1064,12 @@
       "closed": "Geschlossen",
       "no_positions": "Noch keine Positionen",
       "error_loading_profile": "Profil konnte nicht geladen werden",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "Auf X (Twitter) ansehen",
+      "sort": {
+        "value": "Wert",
+        "pnl_percent": "GuV %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "Marktkapitalisierung",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} verkauft",
       "no_trades": "Keine Trades für dieses Intervall",
       "closed_position": "Geschlossene Position",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "Position nicht verfügbar",
+      "fallback_subtitle": "Wir konnten diese Position derzeit nicht laden.",
+      "fallback_back_to_profile": "Zurück zum Profil",
+      "fallback_back_to_leaderboard": "Zurück zur Bestenliste"
     },
     "quick_buy": {
       "title": "{{symbol}} kaufen",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "MetaMask Predictions",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "Prognosemärkte",
     "market_list": "Marktliste",
     "loading": "Wird geladen ...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "Zahlungsmethode ändern",
+      "add_funds": "Gelder hinzufügen",
+      "add": "Hinzufügen",
+      "predict_balance": "Saldo prognostizieren"
+    },
     "order": {
       "available": "Verfügbar",
       "cashed_out": "Ausgezahlt",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "Da sich der Markt rasant entwickelt, konnten wir nicht zu {{price}} kaufen. Erneut zum besten verfügbaren Preis versuchen?",
       "market_busy_body_sell": "Da sich der Markt rasant entwickelt, konnten wir nicht zu {{price}} verkaufen. Erneut zum besten verfügbaren Preis versuchen?",
       "order_failed_title": "Order fehlgeschlagen",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "Ihre Order konnte nicht ausgefüllt werden. Möchten Sie es erneut versuchen?",
+      "price_changed_title": "Preis geändert",
+      "price_changed_body": "Kauf zu {{price}} war nicht möglich. Zum Marktpreis versuchen?",
       "retry": "Erneut versuchen",
       "try_again": "Erneut versuchen",
       "view": "Ansehen",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "Auszahlung abgeschlossen",
       "withdraw_completed_subtitle": "{{amount}} USDC wurden Ihre Wallet hinzugefügt",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}} wurde Ihrer Wallet hinzugefügt",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "Verstanden",
       "error_title": "Hoppla! Etwas ist schiefgelaufen ...",
       "error_description": "Fortfahren mit Auszahlung fehlgeschlagen",
       "try_again": "Erneut versuchen"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "{{tokenSymbol}} ist erforderlich, um fortzufahren",
     "fund_your_wallet": "Zahlen Sie Mittel auf Ihre Wallet ein",
     "get_ready_for_web3": "Bereiten Sie Ihre Wallet für die Nutzung von web3 vor",
+    "home_onboarding_steps": {
+      "header": "Schritte",
+      "get_started_title": "Erste Schritte auf MetaMask",
+      "fund_title": "Zahlen Sie Mittel auf Ihre Wallet ein",
+      "fund_subtitle": "Niemand mag eine leere Wallet. Fügen Sie auf einfache Weise Geld hinzu, um mit dem Trading zu beginnen.",
+      "fund_primary": "Gelder hinzufügen",
+      "trade_title": "Machen Sie Ihren ersten Trade",
+      "trade_subtitle": "Handeln Sie angesagte Token über mehrere Netzwerke hinweg, um Ihr Portfolio zu erweitern.",
+      "trade_primary": "Trade",
+      "notifications_title": "Benachrichtigungen einschalten",
+      "notifications_subtitle": "Bleiben Sie über Marktveränderungen auf dem Laufenden, um die besten Entscheidungen für Ihr Portfolio zu treffen.",
+      "notifications_primary": "Einschalten",
+      "skip": "Überspringen",
+      "progress_a11y": "Schritt {{current}} von {{total}}",
+      "balance_loading_a11y": "Wallet-Saldo laden"
+    },
     "add_funds": "Gelder hinzufügen",
     "next": "Weiter",
     "buy_asset": "{{asset}} kaufen",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "Ungültige Zahl. Geben Sie eine Zahl zwischen 1 und %{maxSafeChainId} ein",
     "hide_zero_balance_tokens_title": "Tokens ohne Guthaben verbergen",
     "hide_zero_balance_tokens_desc": "Vermeiden Sie, dass Token ohne Guthaben in Ihrer Token-Liste angezeigt werden.",
+    "haptic_feedback_title": "Haptisches Feedback",
+    "haptic_feedback_desc": "Spüren Sie subtile Vibrationen bei Bestätigungen, Fehlern und Interaktionen. Deaktivieren Sie diese, um haptische Reize zu reduzieren.",
     "token_detection_title": "Tokens automatisch erkennen",
     "token_detection_description": "Wir verwenden APIs von Drittanbietern, um neue Token zu erkennen und anzuzeigen, die in Ihr Wallet gesendet werden. Schalten Sie dies ab, wenn Sie keine Daten von diesen Diensten beziehen möchten.",
     "theme_button_text": "Theme ändern",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "Am zuverlässigsten",
         "quote_unknown_provider": "Unbekannter Anbieter",
         "start_headless_buy": "Headless Buy starten",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "Ersetzen und Headless-Kauf starten",
         "start_headless_buy_disabled_hint": "Geben Sie einen gültigen Betrag zur Aktivierung ein",
         "start_headless_buy_pending": "Headless-Sitzung aktiv – BuildQuote öffnen",
         "cancel_headless_buy": "Headless-Sitzung abbrechen",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "Aktive Sitzung: {{sessionId}} – das Starten eines weiteren Angebots bricht diese ab.",
         "event_log_title": "Ereignisprotokoll",
         "event_log_empty": "Noch keine Ereignisse – starten Sie eine Headless-Sitzung und beobachten Sie diesen Bereich.",
         "event_log_started": "Sitzung {{sessionId}} gestartet ( Asset={{assetId}}, Betrag={{amount}}, Zahlung={{paymentMethodId}}{{providerSuffix}})",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "Vom Verbraucher abgebrochene Sitzung {{sessionId}}"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "Headless-Kauf",
+        "loading": "Kauffluss wird vorbereitet …",
+        "no_session": "Headless-Sitzung ist nicht mehr aktiv.",
+        "cancel": "Stornieren"
       }
     },
     "request_feature": "Eine Funktion anfragen",
@@ -3553,7 +3622,7 @@
     "security_alerts": "Sicherheitsbenachrichtigungen",
     "security_alerts_desc": "Diese Funktion warnt Sie vor böswilligen Aktivitäten, indem sie Ihre Transaktions- und Signaturanfragen lokal überprüft. Führen Sie immer Ihre eigene Prüfung durch, bevor Sie eine Anfrage genehmigen. Es gibt keine Garantie dafür, dass diese Funktion alle bösartigen Aktivitäten erkennt. Mit der Aktivierung dieser Funktion erklären Sie sich mit den Nutzungsbedingungen des Anbieters einverstanden.",
     "smart_account_dapp_requests_heading": "Anfragen für Smart-Konten von Dapps",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "Ermöglichen Sie es DApps, Smart-Konto-Funktionen für Standardkonten anzufordern. MetaMask wird dabei ausschließlich auf unserem auditierten Smart-Konto upgraden.",
     "smart_transactions_opt_in_heading": "Smart Transactions",
     "smart_transactions_opt_in_desc_supported_networks": "Schalten Sie Smart Transactions für zuverlässigere und sicherere Transaktionen auf unterstützten Netzwerken ein.",
     "smart_transactions_learn_more": "Mehr erfahren",
@@ -3572,6 +3641,39 @@
         "title": "Karte",
         "reset_onboarding_description": "Setzen Sie den Onboarding-Status der Karte zurück, um den Onboarding-Prozess von vorn zu beginnen.",
         "reset_onboarding_button": "Onboarding-Status zurücksetzen"
+      },
+      "haptics": {
+        "title": "Haptik",
+        "description": "Betrachten Sie haptischen Feedbacks auf einem physischen Gerät vorher. Dies umgeht die In-App-Einstellung für reduzierte Haptik sowie den Remote-Kill-Switch, sodass Sie jedes Muster evaluieren können. Simulatoren geben haptisches Feedback häufig nicht wieder.",
+        "catalog_impacts_heading": "Wirkungsmomente katalogisieren",
+        "notifications_heading": "Mitteilungsmuster",
+        "selection_heading": "Auswahl",
+        "notification_success_button": "Mitteilung – Erfolg",
+        "notification_error_button": "Mitteilung – Fehler",
+        "notification_warning_button": "Mitteilung – Warnung",
+        "selection_button": "Auswahl",
+        "raw_impacts_heading": "Raue Expo – Auswirkungsstil",
+        "raw_impacts_desc": "Direkte Expo-Haptik-Einflussstile zum Vergleich mit den oben abgebildeten Katalogmomenten.",
+        "impacts": {
+          "quick_amount_selection": "Auswirkung – Schnelle Betragsauswahl",
+          "slider_tick": "Auswirkung – Schiebereglermarkierung",
+          "edge_gesture_engage": "Auswirkung – Edge-Geste einstellen",
+          "page_navigation": "Auswirkung – Seitennavigation",
+          "slider_grip": "Treffmoment — Schiebereglergriff",
+          "tab_change": "Auswirkung – Tab-Wechsel",
+          "primary_cta": "Auswirkung – Primärer CTA",
+          "pull_to_refresh_engage": "Auswirkung — Zum Aktualisieren ziehen (einstellen)",
+          "pull_to_refresh": "Impact — Pull to refresh (loslassen)",
+          "chart_crosshair": "Auswirkung – Diagrammfadenkreuz",
+          "follow_toggle": "Auswirkung – Umschalter folgen"
+        },
+        "raw_styles": {
+          "light": "Raue Auswirkung – Licht",
+          "medium": "Raue Auswirkung – Mittel",
+          "heavy": "Raue Auswirkung – Schwer",
+          "rigid": "Raue Auswirkung – Starr",
+          "soft": "Raue Auswirkung – Soft"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "Prognosen",
     "add_collectible_button": "Hinzufügen",
     "info": "Info",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "Swappen",
     "convert": "Konvertieren",
     "bridge": "Bridge",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "Problemlösung",
     "deposit_description": "Kostengünstige Bank- oder Kartenüberweisung",
     "buy_description": "Ideal für den Kauf eines speziellen Tokens",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "Krypto für Bargeld verkaufen",
     "swap_description": "Tausch zwischen Token",
     "bridge_description": "Tokens zwischen Netzwerken übertragen",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "Kostenlos",
     "tx_details_not_available": "Nicht verfügbar",
     "smart_contract_interaction": "Smart Contract-Interaktion",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "Auf Geldkonto einzahlen",
+    "money_account_withdraw": "Von Geldkonto transferieren",
     "swaps_transaction": "Swaps-Transaktion",
     "bridge_transaction": "Bridge",
     "approve": "Genehmigen",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "ERHALTEN SIE {{percentage}} % AUF\nSTABILECOINS",
-        "description": "Konvertieren Sie Ihre Stablecoins in mUSD und verdienen Sie einen Bonus von bis zu {{percentage}} % auf jährlicher Basis, den Sie täglich einfordern können.",
+        "description": "Wandeln Sie Ihre Stablecoins in mUSD um und erhalten Sie einen annualisierten Bonus von {{percentage}} %.",
         "terms_apply": "Es gelten die Nutzungsbedingungen.",
         "primary_button": "Erste Schritte",
-        "secondary_button": "Nicht jetzt"
+        "secondary_button": "Nicht jetzt",
+        "checklist": {
+          "dollar_backed": "US-Dollar gekoppelt",
+          "no_lockups": "Ohne Sperrfristen",
+          "daily_bonus": "Täglich Bonus",
+          "metamask_stablecoins": "MetaMask-Stablecoins",
+          "no_metamask_fee": "Keine MetaMask-Gebühr"
+        }
       },
       "buy_musd": "mUSD kaufen",
       "get_musd": "mUSD erhalten",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Geld",
+    "your_balance": "Ihr Kontostand",
     "apy_label": "APY von {{percentage}} %",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "Info zum effektiven Jahreszins (APY)",
     "onboarding": {
       "step_progress": "Schritt {{current}} von {{total}}",
       "title": "Geld aufladen",
-      "description": "Kaufen Sie mUSD und fangen Sie gleich an, APY zu verdienen.",
+      "description": "Laden Sie Ihr Konto auf und beginnen Sie, Effektivvertrag zu verdienen.",
       "add": "Hinzufügen",
       "step2_title": "Sichern Sie sich Ihre MetaMask Card",
       "step2_description": "Geben Sie Ihr Geldguthaben aus, während es Gewinne erwirtschaftet, überall dort, wo Mastercard akzeptiert wird.",
@@ -6497,22 +6611,32 @@
       "card": "Karte"
     },
     "earnings": {
-      "title": "Einnahmen",
-      "lifetime": "Lebenslange Einnahmen",
-      "projected": "Erwartete Einnahmen"
+      "title": "Geschätzte Einnahmen",
+      "estimated_monthly": "Monatlich",
+      "estimated_yearly": "Jährlich",
+      "info_label": "Einnahmeinformationen"
     },
     "how_it_works": {
       "title": "Wie es funktioniert",
-      "description_prefix": "Halten Sie mUSD auf Ihrem Geldkonto und verdienen Sie automatisch",
-      "description_suffix": ". Er ist durch den Dollar gedeckt, stets liquide und kann jederzeit ausgegeben, gehandelt oder versendet werden."
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "Hinzufügen"
     },
+    "balance_card": {
+      "label": "Money-Saldo",
+      "add": "Hinzufügen",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "Verdienen Sie an Ihrem Krypto",
-      "description": "See how your money can grow over time by converting your crypto to mUSD.",
+      "description": "Beobachten Sie, wie Ihr Geld mit der Zeit wächst, indem Sie Ihre Kryptowährung in mUSD konvertieren.",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "Konvertieren",
+      "convert_cta": "Convert your crypto",
       "no_fee": "Keine MetaMask-Gebühr",
       "view_all": "Alle anzeigen",
       "view_potential_earnings": "Mögliche Einnahmen anzeigen"
@@ -6522,37 +6646,75 @@
       "subtitle": "Geben Sie Ihr Geld überall aus.",
       "virtual_card": "Virtuelle Karte",
       "metal_card": "Metallkarte",
-      "cashback": "{{percentage}} % Cashback",
+      "cashback": "{{percentage}} % mUSD zurück",
       "get_now": "Jetzt sichern",
       "link_title": "MetaMask Card verknüpfen",
-      "link_subtitle": "Geben Sie Ihr Guthaben aus und verdienen Sie dabei.",
-      "link_bullet_cashback": "Bis zu 3 % Cashback",
-      "link_bullet_apy": "Bis zu {{apy}} % APY",
-      "link_card": "Karte verknüpfen"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "Karte verknüpfen",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "Was Sie erhalten",
-      "benefit_auto_earn": "Automatisch verdienen ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "Halten Sie Ihr Geld sicher in mUSD, einem 1:1 durch den Dollar gedeckten Stablecoin",
       "benefit_liquidity": "Erhalten Sie volle Liquidität ohne Sperrfristen, sodass Sie jederzeit handeln oder auszahlen können",
       "benefit_spend_prefix": "Geben Sie bei über 150 Mio. Händlern mit MetaMask Card aus und verdienen Sie dabei ",
-      "benefit_spend_cashback": "1–3 % Cashback",
-      "benefit_transfer": "Überweisen Sie Geld an jede Ihrer Wallets über MetaMask",
-      "benefit_global": "Senden und empfangen Sie Geld weltweit",
+      "benefit_spend_cashback": "1 bis 3 % mUSD zurück",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "Mehr erfahren"
     },
     "footer": {
-      "add_money": "Geld aufladen"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "Geld aufladen",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "Krypto umwandeln",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "Gelder einzahlen",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "Von externer Wallet erhalten",
       "coming_soon": "Demnächst verfügbar"
     },
+    "more_sheet": {
+      "title": "Mehr",
+      "how_it_works": "Wie es funktioniert",
+      "what_you_get": "Was Sie erhalten",
+      "contact_support": "Support kontaktieren"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "Zwischen Konten",
+      "perps_account": "Perps-Konto",
+      "predictions_account": "Predictions-Konto",
+      "send_external": "An externe Adresse senden",
+      "withdraw_to_bank": "An Bank auszahlen"
+    },
+    "apy_tooltip": {
+      "title": "Effektivertrag",
+      "paragraph_1": "Ihr Geldkonto verdient automatisch bis zu {{percentage}} %.",
+      "paragraph_2": "Der angezeigte Satz stellt einen geschätzten Effektivvertrag dar, der auf den aktuellen Marktbedingungen basiert. Der Effektivvertrag ist variabel und kann sich aufgrund verschiedener Faktoren ändern. Der Satz wird von externen DeFi-Plattformen generiert, die Gelder in Blockchain-Protokollen anlegen.",
+      "paragraph_3": "Wenn Sie Ihre MetaMask-Karte verknüpfen, werden Einkäufe von diesem Saldo abgebucht."
+    },
+    "earnings_tooltip": {
+      "title": "Geschätzte Einnahmen",
+      "body": "Eine Schätzung, wie viel Sie über einen bestimmten Zeitraum basierend auf Ihrem aktuellen Saldo und dem heutigen Effektivvertrag verdienen könnten. Bei diesen Schätzungen handelt es sich nicht um garantierte Erträge; sie bleiben vorbehaltlich etwaiger Änderungen."
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "Aktivität",
       "view_all": "Alle anzeigen",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "Money",
       "section_title": "Wie es funktioniert",
-      "description_1": "Ihr Geldkonto erwirtschaftet automatisch 4 % APY (variabel). Die Gelder fließen in einen kuratierten DeFi-Tresor mit Renditen auf geprüften Kreditmärkten – keine Einsätze, keine Ansprüche, keine Sperrfristen.",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "Ihr Geldguthaben ist Ihr Ausgabensaldo. Verknüpfen Sie Ihre MetaMask Card, um bei mehr als 150 Millionen Händlern weltweit zu bezahlen. Ihr Geld verdient so lange, bis Sie es nutzen.",
-      "faq_title": "FAQ",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "Demnächst verfügbar.",
-      "faq_q1": "Was ist das Geldkonto?",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "Was ist mUSD?",
       "faq_q3": "Woher kommt die Rendite?",
       "faq_q4": "Ist mein Geld gesperrt? Kann ich es jederzeit auszahlen lassen?",
@@ -6608,8 +6770,7 @@
       "faq_q7": "Ändert sich der APY-Satz?",
       "faq_q8": "Ist dies ein Sparkonto oder ein Ausgabenkonto?",
       "faq_q9": "Wer kontrolliert mein Geld?",
-      "faq_q10": "Welchen Cashback erhalte ich mit der MetaMask Card?",
-      "sounds_good": "Klingt gut"
+      "faq_q10": "Wie viel mUSD erhalte ich mit der MetaMask-Karte zurück?"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "Stornieren",
     "confirm": "Bestätigen",
+    "pay_with_bottom_sheet": {
+      "title": "Bezahlen mit",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "Indem Sie fortfahren, bestätigen Sie unsere ",
       "terms_of_use": "Nutzungsbedingungen",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "Auszahlen",
       "predict_deposit": "Prognosegelder hinzufügen",
       "predict_withdraw": "Auszahlen",
-      "money_account_deposit": "Gelder hinzufügen",
-      "money_account_withdraw": "Geldmittel auszahlen"
+      "money_account_add_money": "Geld aufladen",
+      "money_account_transfer_money": "Geld überweisen"
     },
     "sub_title": {
       "permit": "Diese Website möchte die Genehmigung, Ihre Tokens auszugeben.",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "Wir swappen Ihre Token gegen USDC auf HyperCore, dem von Perps verwendeten Netzwerk. Swap-Anbieter können eine Gebühr erheben, MetaMask jedoch nicht."
       },
       "predict_deposit": {
-        "transaction_fee": "Wir swappen Ihre Token gegen USDC.e auf Polygon, dem von Predictions verwendeten Netzwerk. Swap-Anbieter erheben möglicherweise eine Gebühr, MetaMask jedoch nicht."
+        "transaction_fee": "Wir swappen Ihre Token gegen pUSD auf Polygon, dem von Predictions verwendeten Netzwerk. Swap-Anbieter erheben möglicherweise eine Gebühr, MetaMask jedoch nicht."
       },
       "perps_withdraw": {
         "transaction_fee": "MetaMask swappt den Token für Sie in den gewünschten Token um. Beim Swap in mUSD fallen keine MetaMask-Gebühren an."
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "Die Gebühren für die mUSD-Konvertierung beinhalten Netzwerkkosten und können Anbietergebühren beinhalten. Bei der Konvertierung in mUSD fällt keine MetaMask-Gebühr an."
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "Gebühren"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "Krypto kaufen",
       "buy_predict": "Fügen Sie Ihrer Wallet Gelder hinzu, um Prognosen zu nutzen.",
-      "buy_perps": "Fügen Sie Ihrer Wallet Gelder hinzu, um Perps zu nutzen."
+      "buy_perps": "Fügen Sie Ihrer Wallet Gelder hinzu, um Perps zu nutzen.",
+      "projected_five_year_balance": "Prognostizierter 5-Jahres-Saldo:"
     },
     "unlimited": "Unbegrenzt",
     "all": "Alle",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "Fortfahren",
     "deposit_edit_amount_done": "Gelder hinzufügen",
     "deposit_edit_amount_predict_withdraw": "Auszahlen",
-    "deposit_edit_amount_musd_conversion": "Zu mUSD konvertieren"
+    "deposit_edit_amount_musd_conversion": "Zu mUSD konvertieren",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "Ergebnisse haben sich geändert",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "Swap",
     "terms_and_conditions": "Geschäftsbedingungen",
     "select_token": "Token auswählen",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "Keine Tokens gefunden",
     "no_tokens_found_description": "Wir konnten keine Tokens mit diesem Namen finden. Versuchen Sie eine andere Suche.",
     "select_network": "Netzwerk wählen",
@@ -7115,6 +7303,7 @@
     "receive_at": "Empfangen bei",
     "recipient": "Empfänger",
     "select_recipient": "Empfänger auswählen",
+    "select_account": "Konto auswählen",
     "external_account": "Externes Konto",
     "error_banner_description": "Diese Handelsroute ist derzeit nicht verfügbar. Versuchen Sie, den Betrag, das Netzwerk oder das Token zu ändern, und wir finden die beste Option.",
     "stock_token_error_banner_description": "Diese Handelsroute ist momentan nicht verfügbar. Versuchen Sie, den Betrag, das Netzwerk oder den Token zu ändern. Wir finden dann die beste Option für Sie.\n\nBitte beachten Sie: Beim Handel mit Ondo-tokenisierten Aktien können geografische Beschränkungen gelten, z. B. für die USA, die EU, Großbritannien und Brasilien.",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "Hohe Preisauswirkungen",
     "price_impact_error_title": "Sehr hohe Preisauswirkungen",
     "price_impact_error_description": "Sie verlieren bei diesem Swap etwa {{priceImpact}} den Marktpreis Ihres Tokens. Versuchen Sie einen kleineren Handel oder eine liquidere Route, um Ihren Kurs zu verbessern.",
+    "insufficient_native_reserve_cta": "Maximal zulässigen verwenden",
+    "insufficient_native_reserve_message": "Dieses Netzwerk erfordert, dass mindestens {{minimumReserve}} {{ticker}} auf Ihrem Konto verbleiben. Sie können maximal {{maxSwappable}} {{ticker}} verwenden.",
+    "insufficient_native_reserve_title": "Mindest-{{ticker}}-Reservesaldo erforderlich",
     "token_warning_suspicious_banner": "{{token}} ist ein verdächtiges Token.",
     "token_warning_malicious_banner": "{{token}} ist ein bösartiges Token. Gehen Sie bei der Interaktion mit diesem Token vorsichtig vor.",
     "token_warning_modal_suspicious_title": "Verdächtiges Token",
@@ -7542,17 +7734,17 @@
         "price": "Kostenlos",
         "feature_1": "Virtuelle Karte für Apple Pay und Google Pay",
         "feature_2": "Bezahlen Sie mit Kryptowährung (USDC, USDT, WETH und mehr)",
-        "feature_3": "1 % USDC-Cashback auf jeden Einkauf"
+        "feature_3": "1 % mUSD auf jeden Einkauf zurück"
       },
       "metal_card": {
         "name": "Metallkarte",
         "price": "199 $/Jahr",
         "everything_in_virtual": "Alles in virtuell, plus:",
         "feature_1": "Erstklassige gravierte Metallkarte",
-        "feature_2": "3 % Cashback auf die ersten 10.000 $/Jahr",
+        "feature_2": "3 % mUSD auf die ersten 10.000 $/Jahr zurück",
         "feature_3": "Keine Auslandstransaktionsgebühren"
       },
-      "earn_up_to_badge": "Verdienen Sie jährlich bis zu 300 $ an Cashback",
+      "earn_up_to_badge": "Jährlich bis zu 300 $ in mUSD zurückerhalten",
       "upgrade_to_metal_label": "Oder upgraden Sie auf Metall für das 3-fache an Belohnungen"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "IHRE KARTE\nWURDE BESTELLT",
       "subtitle": "Sie sollte in 4 bis 6 Wochen eintreffen.",
-      "description": "Richten Sie Ihre virtuelle Karte ein und fügen Sie sie Ihrer digitalen Wallet hinzu, um Cashback zu erhalten.",
+      "description": "Richten Sie Ihre virtuelle Karte ein und fügen Sie sie Ihrer digitalen Wallet hinzu, um mUSD zurückzuerhalten.",
       "set_up_card_button": "Karte einrichten",
       "back_to_card_button": "Zurück zur Karte"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "Ausgeben\nund verdienen",
-      "description": "Die MetaMask-Karte ist der schnelle und\neinfache Weg, Ihre Kryptowährung auszugeben und\nbis zu 3 % Cashback zu erhalten.",
+      "description": "Die MetaMask-Karte ist der schnelle und\neinfache Weg, Ihre Kryptowährung auszugeben und\nbis zu 3 % mUSD zurückzuerhalten.",
       "apply_now_button": "Jetzt einrichten",
       "login_button": "Anmelden",
       "not_now_button": "Nicht jetzt",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "Karte aktivieren",
       "enable_assets_button_label": "Assets aktivieren",
       "spending_limit_warning": "Sie haben Ihr Ausgabenlimit fast erreicht. Aktualisieren Sie Ihr Konto, um Ablehnungen zu vermeiden.",
+      "spending_limit_available": "verfügbar",
       "logout": "Abmelden",
       "contact_support": "Support kontaktieren",
       "logout_confirmation_title": "Von Karte abmelden?",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "Geschäftsbedingungen",
         "order_metal_card": "Metallkarte",
         "order_metal_card_description": "Bestellen Sie jetzt Ihre physische Metallkarte",
-        "cashback": "Cashback",
-        "cashback_description": "Verdienen Sie 1 % Rabatt auf alle Ausgaben",
-        "cashback_description_metal": "Verdienen Sie 3 % Rabatt auf alle Ausgaben",
+        "cashback": "mUSD zurück",
+        "cashback_description": "Erhalten Sie 1 % mUSD zurück auf alle Ausgaben",
+        "cashback_description_metal": "Erhalten Sie 3 % mUSD zurück auf alle Ausgaben",
         "freeze_card": "Karte sperren",
         "unfreeze_card": "Karte entsperren",
         "freeze_card_description": "Alle Ausgaben mit Ihrer Karte pausieren",
@@ -7917,8 +8110,8 @@
       "token_label": "Token"
     },
     "cashback_screen": {
-      "title": "Cashback",
-      "available_cashback": "Verfügbares Cashback",
+      "title": "mUSD zurück",
+      "available_cashback": "Verfügbare mUSD",
       "network_fee": "Netzwerkgebühr",
       "expected_to_receive": "Erwartet zu empfangen",
       "withdraw": "Auszahlen",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "Auszahlung wurde eingeleitet",
       "withdrawal_success": "Auszahlung erfolgreich abgeschlossen",
       "withdrawal_failed": "Auszahlung fehlgeschlagen. Bitte versuchen Sie es erneut.",
-      "no_cashback": "Kein Cashback verfügbar",
-      "loading_error": "Cashback konnte nicht geladen werden. Bitte versuchen Sie es erneut."
+      "no_cashback": "Kein mUSD zurück verfügbar",
+      "loading_error": "Das Laden von mUSD zurück ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
+      "funding_required": {
+        "title": "Linea-Finanzierung einrichten",
+        "description": "Sie benötigen mindestens eine zugelassene Finanzierungsquelle auf Linea, bevor Sie mUSD zurücktauschen können.",
+        "confirm_button_label": "Finanzierung einrichten"
+      }
     },
     "change_asset": {
       "title": "Token und Netzwerk ändern",
@@ -8032,7 +8230,8 @@
     "title": "Zahlungsmethode auswählen",
     "title_receive": "Token empfangen auswählen",
     "no_gas": "Kein nativer Saldo für Gas",
-    "not_supported": "Nicht unterstützt"
+    "not_supported": "Nicht unterstützt",
+    "crypto": "Krypto"
   },
   "connection_removed_modal": {
     "title": "Verbindungen entfernt",
@@ -8048,6 +8247,15 @@
       "title": "Anmeldung fehlgeschlagen",
       "description": "Überprüfen Sie Ihre Verbindung und versuchen Sie es erneut."
     },
+    "notifications_nudge": {
+      "title": "Nicht verpassen",
+      "description": "Aktivieren Sie Mitteilungen, um über Kampagnen informiert zu bleiben.",
+      "turn_on_button": "Einschalten",
+      "loading": "Benachrichtigungen aktivieren ...",
+      "loading_description": "Das könnte einen Moment dauern.",
+      "enable_error": "Mitteilungen konnten nicht aktiviert werden",
+      "success": "Mitteilungen aktiviert"
+    },
     "version_guard": {
       "title": "Aktualisierung erforderlich",
       "description": "Für die Nutzung von Belohnungen ist eine neuere Version von MetaMask erforderlich. Bitte aktualisieren Sie, um fortzufahren.",
@@ -8126,6 +8334,17 @@
       "retry_button": "Erneut versuchen"
     },
     "main_title": "Belohnungen",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "Empfehlungen",
     "referral_stats_earned_from_referrals": "Durch Empfehlungen verdient",
     "referral_stats_referrals": "Empfehlungen",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "Aktive Boosts",
     "season_1": "Saison 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "mUSD-Bonus-Rechner",
-      "description": "Finden Sie heraus, wie viel Sie durch die Konvertierung Ihrer Stablecoins in mUSD verdienen können.",
-      "amount_label": "Konvertierter Betrag",
-      "estimated_bonus": "Geschätzter jährlicher Bonus: bis zu 3 %",
-      "initial_amount": "Anfangsbetrag",
-      "daily_bonus": "Täglich einforderbarer Bonus",
-      "annualized_bonus": "Jährlicher Bonus",
-      "disclaimer": "Dies ist nur eine Schätzung. Der Bonus kann sich noch ändern.",
-      "disclaimer_brief": "Der Bonus ist ein Schätzwert und kann sich ändern.",
+      "page_title": "mUSD-Rechner",
+      "hero_hold": "mUSD halten.",
+      "hero_earn": "Verdienen",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/Jahr",
+      "earnings_per_month_suffix": "/Mo.",
+      "earnings_per_day_suffix": "/Tag – täglich einfoderbar",
+      "slider_amount_label": "Betrag",
+      "disclaimer_calculator": "Schätzung basierend auf einem Bonus von 3 %. Der Satz kann sich ändern. Jederzeit einfoderbar.",
       "buy_button": "mUSD kaufen",
       "swap_button": "Swap zu mUSD"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "Endet am {{date}}",
       "ended_date": "Beendet am {{date}}",
       "pill_up_next": "Demnächst verfügbar",
+      "up_next": "Als Nächstes",
+      "notify_me": "Mich benachrichtigen",
       "pill_active": "Live",
       "pill_complete": "Abgeschlossen",
       "enter": "Eingeben",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "In Ihrer Region nicht verfügbar",
       "geo_locked_toast_description": "Diese Kampagne ist in Ihrem Land nicht verfügbar. Schauen Sie später für neue Kampagnen wieder vorbei.",
       "geo_locked_cta": "Berechtigung prüfen",
-      "geo_loading": "Region wird überprüft ..."
+      "geo_loading": "Region wird überprüft ...",
+      "remind_me_success_toast": "Wir geben Ihnen Bescheid, sobald diese Kampagne startet.",
+      "remind_me_save_error": "Ihre Erinnerung konnte nicht gespeichert werden. Bitte versuchen Sie es erneut."
     },
     "campaign_mechanics": {
       "title": "Mechaniken"
@@ -8479,10 +8701,10 @@
       "qualified_description": "Erhöhen Sie Ihre Nettozuflüsse, um eine höhere Stufe zu erreichen und die Chance auf größere Auszahlungen zu haben.",
       "not_eligible_title": "Nicht berechtigt",
       "not_eligible_description": "Zu spät eröffnete Trades, die nicht mehr die {{days}}-Tage-Haltebedingung erfüllen, werden nicht auf Ihren Rang bzw. Ihre Stufe angerechnet.",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "Gesamteilnehmer",
+      "completed_label_total_tvl": "Geamter gesperrter Gesamtwert",
+      "completed_label_top_return": "Top-Rendite",
+      "completed_label_winners": "Gewinner"
     },
     "ondo_campaign_activity": {
       "title": "Alle Aktivitäten",
@@ -8508,6 +8730,48 @@
       "cancel": "Stornieren",
       "confirm": "Ich verstehe"
     },
+    "perps_trading_campaign": {
+      "title": "Perps-Handelswettbewerb",
+      "stats_title": "Statistiken",
+      "performance_title": "Performance",
+      "label_rank": "Rang",
+      "label_your_rank": "Ihr Rang",
+      "label_pnl": "GuV",
+      "label_volume": "Volumen",
+      "label_notional_volume": "Nominalvolumen",
+      "pending": "Ausstehend",
+      "qualified": "Qualifiziert",
+      "open_position_cta": "Offene Position",
+      "leaderboard_title": "Rangliste",
+      "leaderboard_total_participants": "{{count}} Teilnehmer",
+      "last_updated": "Zuletzt aktualisiert: {{time}}",
+      "leaderboard_error_loading": "Laden der Rangliste fehlgeschlagen",
+      "leaderboard_error_loading_description": "Beim Laden der Rangliste ist etwas schiefgelaufen. Bitte versuchen Sie es erneut.",
+      "leaderboard_not_yet_computed": "Bestenliste wurde noch nicht berechnet. Schauen Sie bald wieder vorbei.",
+      "leaderboard_powered_by_prefix": "Unterstützt durch ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "Preispool",
+      "prize_pool_current_label": "Aktuell",
+      "prize_pool_next_label": "Weiter",
+      "prize_pool_volume_subtext": "{{current}} von {{target}} volume",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}}+ Volumen – alle Meilensteine ​​erreicht",
+      "prize_pool_max_badge": "Max.",
+      "prize_pool_error_title": "Laden des Preispools fehlgeschlagen",
+      "prize_pool_error_description": "Beim Laden des Preispools ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.",
+      "prize_pool_retry_button": "Erneut versuchen",
+      "stats_notional_volume_threshold": "{{amount}} $ erforderlich",
+      "stats_qualified_title": "Sie sind qualifiziert",
+      "stats_qualified_description": "Handeln Sie weiter, um Ihren GuV zu verbessern und in der Bestenliste aufzusteigen, bevor der Wettbewerb endet.",
+      "stats_qualify_for_rank_title": "Für diesen Rang qualifizieren",
+      "stats_qualify_for_rank_description": "Handeln Sie {{notionalRemaining}} mehr an Nominalvolumen, um berechtigt zu sein.",
+      "stats_error_title": "Statistiken konnten nicht geladen werden",
+      "stats_error_description": "Wir hatten ein Problem beim Laden Ihrer Statistik. Bitte versuchen Sie es erneut.",
+      "stats_retry": "Erneut versuchen",
+      "completed_label_total_participants": "Gesamteilnehmer",
+      "completed_label_total_volume": "Gesamtvolumen",
+      "completed_label_top_pnl": "Top-GuV",
+      "completed_label_winners": "Gewinner"
+    },
     "campaigns_preview": {
       "title": "Kampagnen",
       "coming_soon": "Demnächst verfügbar",
@@ -8532,29 +8796,29 @@
       "retry_button": "Erneut versuchen",
       "refreshing": "Aktualisierung ..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "Sie haben gewonnen",
       "rank_label": "{{place}} Ort",
-      "email_instructions": "Senden Sie eine E-Mail an ondocampaign@consensys.net mit Ihrem Code, um Ihren Preis zu erhalten.",
+      "email_instructions": "Senden Sie eine E-Mail an {{email}} mit Ihrem Code, um Ihren Preis einzufordern.",
       "open_mail": "E-Mail öffnen",
       "skip_for_now": "Vorläufig überspringen",
-      "mail_subject": "Ondo-Kampagnenpreis einfordern",
+      "mail_subject": "{{campaignName}}-Preiseinforderung",
       "mail_body": "Mein Gewinncode: {{code}}",
       "winning_code": "Gewinncode",
       "close_a11y": "Schließen"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "Sie haben gewonnen",
-        "description": "Fordern Sie Ihren Preis noch heute ein.",
-        "a11y": "Gewinnerdetails öffnen"
+        "title": "Sie haben gewonnen!",
+        "description": "Verifizieren Sie Ihren Gewinncode und fordern Sie Ihren Preis noch heute ein.",
+        "a11y": "Details anzeigen"
       },
       "participant_pending": {
         "title": "Kampagne ist beendet.",
         "description": "Wir ermitteln gerade die Ergebnisse. Schauen Sie bald wieder vorbei."
       },
       "participant_finalized": {
-        "title": "Kampagnenergebnisse sind verfügbar",
+        "title": "Kampagnenergebnisse sind verfügbar.",
         "description": "Sie haben dieses Mal nicht gewonnen. Überprüfen Sie die Rangliste, um Ihre Platzierung einzusehen."
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "Ihre Belohnung ist unterwegs – wir werden uns in Kürze bei Ihnen melden."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "Sie haben gewonnen 💰",
-        "description": "Fordern Sie Ihren Preis aus der {{campaignName}} ein",
+        "description": "Fordern Sie Ihren Preis von {{campaignName}} noch heute ein.",
         "cta": "Details anzeigen"
       },
-      "participant_no_winner": {
-        "title": "Die Ergebnisse sind verfügbar. 🏅",
-        "description": "Sehen Sie Ihre Platzierung in der {{campaignName}} ein",
+      "non_winner": {
+        "title": "Die Ergebnisse sind verfügbar 🏅",
+        "description": "Sehen Sie Ihre Platzierung in der {{campaignName}} ein.",
         "cta": "Ansehen"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "Gewinne eingefordert",
       "predict_deposit": "Finanziertes Prognosekonto",
       "predict_withdraw": "Auszahlung",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "Auf Geldkonto einzahlen",
+      "money_account_withdraw": "Von Geldkonto transferieren",
       "default": "Transaktionsdetails"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "Entdecken",
-    "trending_tokens": "Trending",
+    "crypto_movers": "Krypto-Beweger",
+    "perps_movers": "Perps-Beweger",
+    "trending_tokens": "Angesagt",
+    "crypto": "Krypto",
     "stocks": "Aktien",
     "price_change": "Preisänderung",
     "all_networks": "Alle Netzwerke",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 Stunde",
     "5_minutes": "5 Minuten",
     "networks": "Netzwerke",
+    "ecosystems": "Ökosystem",
+    "ecosystems_subtitle": "Entdecken Sie DApps, Token und NFTs kettenübergreifend im MetaMask Portfolio.",
+    "all_sports": "Beliebte Sporarten",
+    "basketball": "Basketball",
+    "football": "Football",
+    "soccer": "Fußball",
+    "tennis": "Tennis",
+    "f1": "F1",
+    "golf": "Golf",
+    "all_sports_no_markets": "Noch keine geöffnete Märkte in dieser Kategorie. Schauen Sie bald wieder vorbei oder wählen Sie oben eine andere Sportart aus.",
+    "load_more": "Mehr laden",
     "sort_by": "Sortieren nach",
     "volume": "Volumen",
     "market_cap": "Marktkapitalisierung",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "Tokens, Websites, URLs suchen",
     "cancel": "Stornieren",
     "perps": "Perps",
+    "rwa_perps_section": "Perps",
+    "macro_stocks_commodity_perps": "Perps",
+    "macro_pill_stocks": "Aktien",
+    "macro_pill_commodities": "Rohstoffe",
+    "rwa_pill_commodities": "Rohstoffe",
+    "rwa_pill_stocks": "Aktien",
+    "rwa_pill_forex": "Devisen",
+    "crypto_perps_section": "Perps",
     "predictions": "Prognosen",
     "no_results": "Keine Ergebnisse gefunden",
+    "popular": "Beliebt",
     "sites": "Websites",
     "popular_sites": "Beliebte Websites",
     "search_sites": "Websites durchsuchen",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "Keine Tokens gefunden",
       "description": "Wir konnten dieses Token nicht finden."
+    },
+    "tabs": {
+      "now": "Jetzt",
+      "macro": "Makro",
+      "rwas": "RWAs",
+      "crypto": "Krypto",
+      "sports": "Sport",
+      "dapps": "Websites"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "Stornieren",
-      "continue": "Fortfahren"
+      "continue": "Fortfahren",
+      "learn_more": "Mehr erfahren",
+      "try_again": "Erneut versuchen"
     },
     "connecting": {
       "title": "Ihr {{device}} wird verbunden ...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "Bitte schalten Sie Bluetooth ein, um eine Verbindung mit Ihrem Gerät herzustellen",
       "bluetooth_scan_failed": "Scannen nach Geräten fehlgeschlagen. Bitte versuchen Sie es erneut",
       "bluetooth_connection_failed": "Die Verbindung zu Ihrem Gerät ist fehlgeschlagen. Bitte versuchen Sie es erneut",
+      "camera_permission_denied": "Kameraberechtigung ist erforderlich, um QR-Codes zu scannen. Bitte aktivieren Sie diese in Ihren Geräteeinstellungen.",
       "not_supported": "Dieser Vorgang wird nicht unterstützt",
       "unknown_error": "Stellen Sie sicher, dass Ihr {{device}} mit der geheimen Wiederherstellungsphrase oder Passphrase für dieses Konto eingerichtet ist"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "Standortberechtigung erforderlich",
       "nearby_devices_permission_denied": "Berechtigung für Geräte in der Nähe ist erforderlich",
       "scan_failed": "Scanvorgang fehlgeschlagen",
+      "camera_permission_denied": "Kameraberechtigung erforderlich",
       "something_went_wrong": "Hoppla! Etwas ist schiefgelaufen ..."
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "Wallet-Synchronisierungs-QR-Code scannen",
+          "body": "Kehren Sie zu Ihrer Hardware-Wallet zurück, suchen Sie die Option zum Teilen oder Exportieren Ihrer Konten, wählen Sie MetaMask aus und scannen Sie anschließend den QR-Code."
+        },
+        "sign": {
+          "title": "Signatur-QR-Code scannen",
+          "body": "Kehren Sie zu Ihrer Hardware-Wallet zurück, bestätigen Sie die Transaktion und scannen Sie anschließend den angezeigten QR-Code."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "Falscher QR-Code",
+          "body": "Kehren Sie zu Ihrer Hardware-Wallet zurück, wählen Sie MetaMask als Wallet-Typ aus und generieren sowie scannen Sie anschließend einen neuen QR-Code."
+        },
+        "sign": {
+          "title": "Falscher QR-Code",
+          "body": "Kehren Sie zu Ihrer Hardware-Wallet zurück, bestätigen Sie die Transaktion und scannen Sie anschließend den angezeigten QR-Code."
+        }
+      },
+      "ur_decode_error": {
+        "title": "QR-Code konnte nicht gelesen werden",
+        "body": "Stellen Sie sicher, dass der QR-Code vollständig sichtbar sowie gut beleuchtet ist und versuchen Sie es erneut. Falls das Problem weiterhin besteht, müssen Sie möglicherweise die Firmware Ihrer Hardware-Wallet aktualisieren."
+      }
+    },
     "device_selection": {
       "title": "{{device}} auswählen",
       "scanning": "Scannen nach Geräten ...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Money",
-      "cash_empty_description": "Sie haben noch keine mUSD. Konvertieren Sie Stablecoins in mUSD im Bereich „Geld“ auf der Startseite.",
-      "cash_empty_description_network_filter": "Kein mUSD in diesem Netzwerk. Wechseln Sie das Netzwerk, um Ihre mUSD einzusehen.",
+      "money": "Money",
+      "money_empty_description": "Sie haben noch keine mUSD. Konvertieren Sie Stablecoins in mUSD im Bereich „Geld“ auf der Startseite.",
+      "money_empty_description_network_filter": "Kein mUSD in diesem Netzwerk. Wechseln Sie das Netzwerk, um Ihre mUSD einzusehen.",
+      "money_empty_state": {
+        "get_started": "Erste Schritte",
+        "earn_apy": "{{percentage}} % Effektivertrag verdienen"
+      },
+      "money_filled_state": {
+        "add": "Hinzufügen",
+        "apy": "APY von {{percentage}} %"
+      },
       "tokens": "Token",
+      "perps": "Perps",
+      "related_assets": "Zugehörige Assets",
       "perpetuals": "Perpetuals",
       "predictions": "Prognosen",
       "whats_happening": "Was ist passiert?",
+      "whats_happening_ai": "KI",
+      "whats_happening_impact": {
+        "bullish": "Haussierend",
+        "bearish": "Baissierend",
+        "neutral": "Neutral"
+      },
       "top_traders": "Top-Trader",
       "whats_happening_categories": {
         "geopolitical": "Geopolitisch",
@@ -8819,7 +9160,7 @@
       },
       "defi": "DeFi",
       "nfts": "NFTs",
-      "trending_tokens": "Trending",
+      "trending_tokens": "Angesagt",
       "trending_perpetuals": "Trendige Perpetuals",
       "trending_predictions": "Trendige Prognosen",
       "import_nfts": "NFTs importieren",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "{{section}} kann nicht geladen werden",
       "retry": "Erneut versuchen"
     }
+  },
+  "sites": {
+    "popular": "Beliebt"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/el.json b/locales/languages/el.json
index a555c70867c..38b8a7fd284 100644
--- a/locales/languages/el.json
+++ b/locales/languages/el.json
@@ -634,7 +634,8 @@
     "trade": "Συναλλαγές",
     "settings": "Ρυθμίσεις",
     "rewards": "Επιβραβεύσεις",
-    "trending": "Εξερεύνηση"
+    "trending": "Εξερεύνηση",
+    "money": "Οικονομικά"
   },
   "drawer": {
     "send_button": "Αποστολή",
@@ -708,7 +709,11 @@
     "smart_contract_address": "Διεύθυνση έξυπνου συμβολαίου",
     "smart_contract_address_warning": "Η διεύθυνση παραλήπτη ενδέχεται να μην υποστηρίζει άμεσες μεταφορές tokens, γεγονός που μπορεί να οδηγήσει σε απώλεια κεφαλαίων. Συνεχίστε μόνο εάν είστε βέβαιοι ότι το συγκεκριμένο συμβόλαιο μπορεί να λάβει τη μεταφορά.",
     "i_understand": "Κατανοώ",
-    "cancel": "Άκυρο"
+    "cancel": "Άκυρο",
+    "new_address_title": "Νέα διεύθυνση",
+    "new_address_message": "Στέλνετε σε αυτή τη διεύθυνση για πρώτη φορά. Βεβαιωθείτε ότι είναι σωστή πριν συνεχίσετε:",
+    "alert_navigation_previous": "Προηγούμενη ειδοποίηση",
+    "alert_navigation_next": "Επόμενη ειδοποίηση"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "Κορυφαίοι traders",
       "allow_push_notifications": "Να επιτρέπονται οι ειδοποιήσεις push",
       "trades_over_label": "Λάβετε ειδοποίηση για συναλλαγές άνω των:",
       "traders_you_follow": "Traders που ακολουθείτε",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "Δεν είναι δυνατή η φόρτωση των traders που ακολουθείτε."
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "Ειδοποιήσεις από {{traderName}}",
       "allow_push_notifications": "Να επιτρέπονται οι ειδοποιήσεις push",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "Λάβετε ειδοποιήσεις για τη δραστηριότητα συναλλαγών του/της {{traderName}}",
+      "manage_traders": "Διαχείριση των traders που ακολουθείτε",
       "save": "Αποθήκευση"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "Λάβετε ειδοποιήσεις σε πραγματικό χρόνο για συναλλαγές από τους traders που ακολουθείτε",
       "allow_push_notifications": "Να επιτρέπονται οι ειδοποιήσεις push",
       "trades_over_label": "Λάβετε ειδοποίηση για συναλλαγές άνω των:",
       "save": "Αποθήκευση",
@@ -1059,7 +1064,12 @@
       "closed": "Έκλεισε",
       "no_positions": "Δεν υπάρχουν θέσεις ακόμα",
       "error_loading_profile": "Δεν ήταν δυνατή η φόρτωση του προφίλ",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "Προβολή στο X (Twitter)",
+      "sort": {
+        "value": "Αξία",
+        "pnl_percent": "Κ&Ζ %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "Κεφαλαιοποίηση αγοράς",
@@ -1070,10 +1080,10 @@
       "sold": "Ο/Η {{name}} πούλησε",
       "no_trades": "Δεν υπάρχουν συναλλαγές για αυτό το χρονικό διάστημα",
       "closed_position": "Κλειστή θέση",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "Η θέση δεν είναι διαθέσιμη",
+      "fallback_subtitle": "Δεν μπορέσαμε να φορτώσουμε αυτή τη θέση προς το παρόν.",
+      "fallback_back_to_profile": "Πίσω στο προφίλ",
+      "fallback_back_to_leaderboard": "Πίσω στον πίνακα κατάταξης"
     },
     "quick_buy": {
       "title": "Αγορά {{symbol}}",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "Προβλέψεις στο MetaMask",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "Αγορές προβλέψεων",
     "market_list": "Λίστα αγορών",
     "loading": "Φόρτωση...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "Αλλαγή τρόπου πληρωμής",
+      "add_funds": "Προσθήκη κεφαλαίων",
+      "add": "Προσθήκη",
+      "predict_balance": "Προβλεπόμενο υπόλοιπο"
+    },
     "order": {
       "available": "Διαθέσιμο",
       "cashed_out": "Εξαργυρώθηκε",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "Η αγορά κινείται γρήγορα, οπότε δεν μπορέσαμε να αγοράσουμε στην τιμή {{price}}. Θέλετε να δοκιμάσετε ξανά στην καλύτερη διαθέσιμη τιμή;",
       "market_busy_body_sell": "Η αγορά κινείται γρήγορα, οπότε δεν μπορέσαμε να πουλήσουμε στην τιμή {{price}}. Θέλετε να δοκιμάσετε ξανά στην καλύτερη διαθέσιμη τιμή;",
       "order_failed_title": "Η εντολή απέτυχε",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "Η εντολή σας δεν μπόρεσε να εκτελεστεί. Θέλετε να προσπαθήσετε πάλι;",
+      "price_changed_title": "Η τιμή άλλαξε",
+      "price_changed_body": "Δεν ήταν δυνατή η αγορά στα {{price}}. Θέλετε να προσπαθήσετε στην τιμή αγοράς;",
       "retry": "Επανάληψη",
       "try_again": "Προσπαθήστε ξανά",
       "view": "Προβολή",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "Η ανάληψη ολοκληρώθηκε",
       "withdraw_completed_subtitle": "{{amount}} USDC μεταφέρθηκαν στο πορτοφόλι σας",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}} μεταφέρθηκαν στο πορτοφόλι σας",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "Κατανοητό",
       "error_title": "Κάτι πήγε στραβά",
       "error_description": "Δεν ήταν δυνατή η συνέχιση της ανάληψης",
       "try_again": "Προσπαθήστε ξανά"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "Απαιτείται τo {{tokenSymbol}} για να συνεχίσετε",
     "fund_your_wallet": "Χρηματοδοτήστε το πορτοφόλι σας",
     "get_ready_for_web3": "Ετοιμάστε το πορτοφόλι σας για χρήση στο web3",
+    "home_onboarding_steps": {
+      "header": "Βήματα",
+      "get_started_title": "Ξεκινήστε στο MetaMask",
+      "fund_title": "Χρηματοδοτήστε το πορτοφόλι σας",
+      "fund_subtitle": "Σε κανέναν δεν αρέσει ένα άδειο πορτοφόλι. Προσθέστε εύκολα χρήματα για να ξεκινήσετε τις συναλλαγές.",
+      "fund_primary": "Προσθήκη κεφαλαίων",
+      "trade_title": "Κάντε την πρώτη σας συναλλαγή",
+      "trade_subtitle": "Κάντε συναλλαγές με δημοφιλή tokens σε πολλαπλά δίκτυα για να αναπτύξετε το χαρτοφυλάκιό σας.",
+      "trade_primary": "Συναλλαγές",
+      "notifications_title": "Ενεργοποίηση των ειδοποιήσεων",
+      "notifications_subtitle": "Μείνετε ενημερωμένοι για τις αλλαγές της αγοράς, ώστε να κάνετε τις καλύτερες κινήσεις για το χαρτοφυλάκιό σας.",
+      "notifications_primary": "Ενεργοποίηση",
+      "skip": "Παράλειψη",
+      "progress_a11y": "Βήμα {{current}} από {{total}}",
+      "balance_loading_a11y": "Φόρτωση υπολοίπου πορτοφολιού"
+    },
     "add_funds": "Προσθήκη κεφαλαίων",
     "next": "Επόμενο",
     "buy_asset": "Αγοράστε {{asset}}",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "Μη έγκυρος αριθμός. Εισαγάγετε έναν αριθμό μεταξύ 1 και %{maxSafeChainId}",
     "hide_zero_balance_tokens_title": "Απόκρυψη tokens χωρίς διαθέσιμο υπόλοιπο",
     "hide_zero_balance_tokens_desc": "Αποτρέπει την εμφάνιση των tokens χωρίς υπόλοιπο στην λίστα των tokens σας.",
+    "haptic_feedback_title": "Απτική ανάδραση",
+    "haptic_feedback_desc": "Διακριτικές δονήσεις για επιβεβαιώσεις, σφάλματα και αλληλεπιδράσεις. Απενεργοποιήστε το για μείωση των απτικών ερεθισμάτων.",
     "token_detection_title": "Αυτόματη ανίχνευση tokens",
     "token_detection_description": "Χρησιμοποιούμε API τρίτων για τον εντοπισμό και την εμφάνιση νέων tokens που αποστέλλονται στο πορτοφόλι σας. Απενεργοποιήστε το εάν δεν θέλετε η εφαρμογή να αντλεί δεδομένα από αυτές τις υπηρεσίες.",
     "theme_button_text": "Αλλαγή θέματος",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "Πιο αξιόπιστο",
         "quote_unknown_provider": "Άγνωστος πάροχος",
         "start_headless_buy": "Ξεκινήστε αγορά χωρίς διεπαφή",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "Αντικατάσταση & έναρξη αγοράς χωρίς επιβεβαίωση",
         "start_headless_buy_disabled_hint": "Εισάγετε ένα έγκυρο ποσό για ενεργοποίηση",
         "start_headless_buy_pending": "Η λειτουργία χωρίς διεπαφή είναι ενεργή — ανοίξτε το BuildQuote",
         "cancel_headless_buy": "Ακύρωση συνεδρίας χωρίς διεπαφή",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "Ενεργή συνεδρία: {{sessionId}} — η εκκίνηση νέας προσφοράς θα την ακυρώσει.",
         "event_log_title": "Καταγραφή συμβάντων",
         "event_log_empty": "Δεν υπάρχουν ακόμη συμβάντα — ξεκινήστε μια συνεδρία χωρίς διεπαφή και μείνετε συντονισμένοι.",
         "event_log_started": "Ξεκίνησε η συνεδρία {{sessionId}} (ψηφιακό περιουσιακό στοιχείο={{assetId}}, ποσό={{amount}}, πληρωμή={{paymentMethodId}}{{providerSuffix}})",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "Ακύρωση συνεδρίας από τον χρήστη {{sessionId}}"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "Αγορά χωρίς επιβεβαίωση",
+        "loading": "Προετοιμασία της διαδικασίας αγοράς…",
+        "no_session": "Η συνεδρία χωρίς επιβεβαίωση δεν είναι πλέον ενεργή.",
+        "cancel": "Ακύρωση"
       }
     },
     "request_feature": "Ζητήστε μια λειτουργία",
@@ -3553,7 +3622,7 @@
     "security_alerts": "Ειδοποιήσεις ασφαλείας",
     "security_alerts_desc": "Αυτή η λειτουργία σας ειδοποιεί για κακόβουλη δραστηριότητα, ελέγχοντας τοπικά τα αιτήματα συναλλαγών και υπογραφών σας. Κάνετε πάντα τη δική σας ενδελεχή έρευνα πριν εγκρίνετε οποιαδήποτε αιτήματα. Δεν υπάρχει καμία εγγύηση ότι αυτή η λειτουργία θα ανιχνεύσει όλες τις κακόβουλες δραστηριότητες. Ενεργοποιώντας αυτή τη λειτουργία, συμφωνείτε με τους όρους χρήσης του παρόχου.",
     "smart_account_dapp_requests_heading": "Αιτήματα έξυπνου λογαριασμού από αποκεντρωμένες εφαρμογές (dapps)",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "Επιτρέψτε στις αποκεντρωμένες εφαρμογές να ζητούν λειτουργίες έξυπνων λογαριασμών για βασικούς λογαριασμούς. Το MetaMask θα αναβαθμίζει μόνο σε πιστοποιημένο έξυπνο λογαριασμό.",
     "smart_transactions_opt_in_heading": "Έξυπνες Συναλλαγές",
     "smart_transactions_opt_in_desc_supported_networks": "Ενεργοποιήστε τις Έξυπνες Συναλλαγές για πιο αξιόπιστες και ασφαλείς συναλλαγές σε υποστηριζόμενα δίκτυα.",
     "smart_transactions_learn_more": "Μάθετε περισσότερα",
@@ -3572,6 +3641,39 @@
         "title": "Κάρτα",
         "reset_onboarding_description": "Επαναφορά της διαδικασίας ενεργοποίησης της Κάρτας για να ξεκινήσει η διαδικασία από την αρχή.",
         "reset_onboarding_button": "Επαναφορά της διαδικασίας ενεργοποίησης"
+      },
+      "haptics": {
+        "title": "Απτική ανάδραση",
+        "description": "Προεπισκόπηση της απτικής ανάδρασης σε φυσική συσκευή. Αυτό παρακάμπτει τις μειωμένες απτικές ρυθμίσεις της εφαρμογής και τον απομακρυσμένο διακόπτη απενεργοποίησης, ώστε να μπορείτε να αξιολογήσετε κάθε μοτίβο. Οι προσομοιωτές συχνά δεν αναπαράγουν την απτική ανάδραση.",
+        "catalog_impacts_heading": "Καταγραφή ενεργειών απόκρισης",
+        "notifications_heading": "Μοτίβα ειδοποιήσεων",
+        "selection_heading": "Επιλογή",
+        "notification_success_button": "Ειδοποίηση — Επιτυχία",
+        "notification_error_button": "Ειδοποίηση — Σφάλμα",
+        "notification_warning_button": "Ειδοποίηση — Προειδοποίηση",
+        "selection_button": "Επιλογή",
+        "raw_impacts_heading": "Ακατέργαστα στυλ απόκρισης σε έκθεση",
+        "raw_impacts_desc": "Άμεσα στυλ απτικής ανάδρασης της έκθεσης για σύγκριση με τις αντιστοιχισμένες ενέργειες της λίστας παραπάνω.",
+        "impacts": {
+          "quick_amount_selection": "Απόκριση— Γρήγορη επιλογή ποσού",
+          "slider_tick": "Απόκριση — Σήμανση ολίσθησης (slider tick)",
+          "edge_gesture_engage": "Απόκριση — Ενεργοποίηση χειρονομιών από την άκρη της οθόνης",
+          "page_navigation": "Απόκριση — Πλοήγηση σελίδας",
+          "slider_grip": "Απόκριση — Χειριστήριο ρυθμιστικού",
+          "tab_change": "Απόκριση— Αλλαγή καρτέλας",
+          "primary_cta": "Απόκριση — Κύρια ενέργεια (CTA)",
+          "pull_to_refresh_engage": "Απόκριση— Τραβήξτε για ανανέωση (ενεργοποίηση)",
+          "pull_to_refresh": "Απόκριση — Αφήστε για ανανέωση (απελευθέρωση)",
+          "chart_crosshair": "Απόκριση — Δείκτης γραφήματος",
+          "follow_toggle": "Απόκριση — Εναλλαγή παρακολούθησης"
+        },
+        "raw_styles": {
+          "light": "Ακατέργαστη απόκριση — Ελαφριά",
+          "medium": "Ακατέργαστη απόκριση — Μέτρια",
+          "heavy": "Ακατέργαστη απόκριση — Έντονη",
+          "rigid": "Ακατέργαστη απόκριση — Σταθερή",
+          "soft": "Ακατέργαστη απόκριση — Ήπια"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "Προβλέψεις",
     "add_collectible_button": "Προσθήκη",
     "info": "Πληροφορίες",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "Ανταλλαγή",
     "convert": "Μετατροπή",
     "bridge": "Διασύνδεση",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "Αντιμετώπιση Προβλημάτων",
     "deposit_description": "Τραπεζική μεταφορά ή με κάρτα με χαμηλή χρέωση",
     "buy_description": "Κατάλληλο για την αγορά συγκεκριμένου token",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "Πουλήστε κρυπτονομίσματα για μετρητά",
     "swap_description": "Ανταλλαγή μεταξύ tokens",
     "bridge_description": "Μεταφορά token μεταξύ δικτύων",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "Δωρεάν",
     "tx_details_not_available": "Μη διαθέσιμο",
     "smart_contract_interaction": "Αλληλεπίδραση έξυπνου συμβολαίου",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "Κατάθεση στον λογαριασμό χρημάτων",
+    "money_account_withdraw": "Μεταφορά από τον λογαριασμό χρημάτων",
     "swaps_transaction": "Συναλλαγή ανταλλαγής",
     "bridge_transaction": "Διασύνδεση",
     "approve": "Έγκριση",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "ΚΕΡΔΙΣΤΕ {{percentage}}% ΣΤΑ\nSTABLECOINS",
-        "description": "Μετατρέψτε τα stablecoins σε mUSD και θα κερδίσετε έως και {{percentage}}% μπόνους ετησίως που μπορείτε να εξαργυρώσετε καθημερινά.",
+        "description": "Μετατρέψτε τα stablecoins σας σε mUSD και κερδίστε {{percentage}}% ως ετήσιο μπόνους.",
         "terms_apply": "Ισχύουν όροι.",
         "primary_button": "Ξεκινήστε",
-        "secondary_button": "Όχι τώρα"
+        "secondary_button": "Όχι τώρα",
+        "checklist": {
+          "dollar_backed": "Με στήριξη από το δολάριο",
+          "no_lockups": "Χωρίς δεσμεύσεις",
+          "daily_bonus": "Καθημερινό μπόνους",
+          "metamask_stablecoins": "MetaMask stablecoins",
+          "no_metamask_fee": "Χωρίς χρεώσεις από το MetaMask"
+        }
       },
       "buy_musd": "Αγοράστε mUSD",
       "get_musd": "Αποκτήστε mUSD",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Money",
+    "your_balance": "Το υπόλοιπό σας",
     "apy_label": "{{percentage}}% APY",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "Πληροφορίες για την Ετήσια Ποσοστιαία Απόδοση (APY)",
     "onboarding": {
       "step_progress": "Βήμα {{current}} από {{total}}",
       "title": "Προσθήκη χρημάτων",
-      "description": "Αγοράστε mUSD και αρχίστε να κερδίζετε από την Ετήσια Ποσοστιαία Απόδοση (APY) σήμερα.",
+      "description": "Χρηματοδοτήστε τον λογαριασμό σας και ξεκινήστε να κερδίζετε APY.",
       "add": "Προσθήκη",
       "step2_title": "Αποκτήστε την MetaMask Card",
       "step2_description": "Ξοδέψτε το υπόλοιπο του λογαριασμού σας όσο αυτό αποδίδει, οπουδήποτε γίνεται δεκτή η Mastercard.",
@@ -6497,22 +6611,32 @@
       "card": "Κάρτα"
     },
     "earnings": {
-      "title": "Κέρδη",
-      "lifetime": "Συνολικά κέρδη",
-      "projected": "Εκτιμώμενα κέρδη"
+      "title": "Εκτιμώμενα κέρδη",
+      "estimated_monthly": "Μηνιαία",
+      "estimated_yearly": "Ετησίως",
+      "info_label": "Πληροφορίες για τα κέρδη"
     },
     "how_it_works": {
       "title": "Πώς λειτουργεί",
-      "description_prefix": "Διατηρήστε τα mUSD στον Κύριο Λογαριασμό σας και κερδίστε αυτόματα",
-      "description_suffix": ". Υποστηρίζεται από το δολάριο, έχει πάντα ρευστότητα και έτοιμο για χρήση, συναλλαγές ή αποστολή οποιαδήποτε στιγμή."
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "Προσθήκη"
     },
+    "balance_card": {
+      "label": "Υπόλοιπο χρημάτων",
+      "add": "Προσθήκη",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "Κερδίστε από τα κρυπτονομίσματά σας",
       "description": "Δείτε πώς τα χρήματά σας μπορούν να αυξηθούν με τον χρόνο, μετατρέποντας τα κρυπτονομίσματά σας σε mUSD.",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "Μετατροπή",
+      "convert_cta": "Convert your crypto",
       "no_fee": "Χωρίς χρεώσεις από το MetaMask",
       "view_all": "Προβολή όλων",
       "view_potential_earnings": "Δείτε τα πιθανά κέρδη"
@@ -6522,37 +6646,75 @@
       "subtitle": "Ξοδέψτε τα χρήματά σας όπου θέλετε.",
       "virtual_card": "Εικονική κάρτα",
       "metal_card": "Μεταλλική κάρτα",
-      "cashback": "{{percentage}}% επιστροφή χρημάτων",
+      "cashback": "Απόδοση {{percentage}}% σε mUSD",
       "get_now": "Αποκτήστε την τώρα",
       "link_title": "Σύνδεση της MetaMask Card",
-      "link_subtitle": "Ξοδέψτε το υπόλοιπο του λογαριασμού σας και κερδίστε.",
-      "link_bullet_cashback": "Έως 3% επιστροφή μετρητών",
-      "link_bullet_apy": "Έως {{apy}}% APY",
-      "link_card": "Σύνδεση κάρτας"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "Σύνδεση κάρτας",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "Τι σας προσφέρει",
-      "benefit_auto_earn": "Αυτόματη απόδοση ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "Κρατήστε τα χρήματά σας ασφαλή σε mUSD, ένα stablecoin με αναλογία 1:1 σε δολάρια",
       "benefit_liquidity": "Πλήρης ρευστότητα χωρίς δεσμεύσεις, ώστε να μπορείτε να κάνετε συναλλαγές ή ανάληψη οποιαδήποτε στιγμή",
       "benefit_spend_prefix": "Κάντε αγορές με τη MetaMask Card σε 150M+ σημεία και κερδίστε ",
-      "benefit_spend_cashback": "1–3% επιστροφή χρημάτων",
-      "benefit_transfer": "Μεταφέρετε χρήματα σε οποιοδήποτε από τα πορτοφόλια σας στο MetaMask",
-      "benefit_global": "Στείλτε και λάβετε χρήματα παγκοσμίως",
+      "benefit_spend_cashback": "1-3% απόδοση σε mUSD",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "Μάθετε περισσότερα"
     },
     "footer": {
-      "add_money": "Προσθήκη χρημάτων"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "Προσθήκη χρημάτων",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "Μετατροπή κρυπτονομισμάτων",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "Κατάθεση χρημάτων",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "Λήψη από εξωτερικό πορτοφόλι",
       "coming_soon": "Προσεχώς"
     },
+    "more_sheet": {
+      "title": "Περισσότερα",
+      "how_it_works": "Πώς λειτουργεί",
+      "what_you_get": "Τι σας προσφέρει",
+      "contact_support": "Επικοινωνία με την υποστήριξη"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "Μεταξύ λογαριασμών",
+      "perps_account": "Λογαριασμός Perps",
+      "predictions_account": "Λογαριασμός προβλέψεων",
+      "send_external": "Αποστολή σε εξωτερική διεύθυνση",
+      "withdraw_to_bank": "Ανάληψη σε τράπεζα"
+    },
+    "apy_tooltip": {
+      "title": "Ετήσιο ποσοστό απόδοσης (APY)",
+      "paragraph_1": "Ο λογαριασμός χρημάτων σας αποδίδει έως και {{percentage}}% αυτόματα.",
+      "paragraph_2": "Το επιτόκιο που εμφανίζεται είναι μια εκτιμώμενη ετήσια απόδοση (APY) με βάση τις τρέχουσες συνθήκες της αγοράς. Το ετήσιο ποσοστό απόδοσης (APY) είναι μεταβλητό και μπορεί να αλλάξει λόγω διαφόρων παραγόντων. Το επιτόκιο προκύπτει από τρίτες πλατφόρμες αποκεντρωμένων εφαρμογών που τοποθετούν κεφάλαια σε πρωτόκολλα blockchain.",
+      "paragraph_3": "Όταν συνδέσετε την MetaMask Card σας, οι αγορές θα αφαιρούνται από αυτό το υπόλοιπο."
+    },
+    "earnings_tooltip": {
+      "title": "Εκτιμώμενα κέρδη",
+      "body": "Μια εκτίμηση για το πόσα θα μπορούσατε να κερδίσετε σε μια χρονική περίοδο, με βάση το τρέχον υπόλοιπό σας και το σημερινό APY. Οι εκτιμήσεις δεν αποτελούν εγγυημένες αποδόσεις και ενδέχεται να αλλάξουν."
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "Δραστηριότητα",
       "view_all": "Προβολή όλων",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "Οικονομικά",
       "section_title": "Πώς λειτουργεί",
-      "description_1": "Ο λογαριασμός σας αποδίδει αυτόματα 4% APY (μεταβλητό). Τα κεφάλαια τοποθετούνται σε ένα επιλεγμένο DeFi vault που αποφέρει αποδόσεις μέσω ελεγμένων αγορών δανεισμού — χωρίς δέσμευση κρυπτονομισμάτων, χωρίς διεκδικήσεις ανταμοιβών, χωρίς χρονικές καθυστερήσεις.",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "Το υπόλοιπο του λογαριασμού σας είναι το διαθέσιμο υπόλοιπο για δαπάνες. Συνδέστε την MetaMask Card για να πραγματοποιείτε συναλλαγές σε περισσότερους από 150 εκατομμύρια εμπόρους παγκοσμίως. Τα χρήματά σας συνεχίζουν να αποδίδουν μέχρι τη στιγμή που θα τα χρησιμοποιήσετε.",
-      "faq_title": "Συχνές Ερωτήσεις",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "Προσεχώς.",
-      "faq_q1": "Τι είναι ο λογαριασμός Money;",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "Τι είναι τα mUSD;",
       "faq_q3": "Από πού προέρχεται η απόδοση;",
       "faq_q4": "Είναι τα χρήματά μου δεσμευμένα; Μπορώ να κάνω ανάληψη οποιαδήποτε στιγμή;",
@@ -6608,8 +6770,7 @@
       "faq_q7": "Μπορεί να αλλάξει το ποσοστό APY;",
       "faq_q8": "Είναι αυτός λογαριασμός αποταμίευσης ή λογαριασμός δαπανών;",
       "faq_q9": "Ποιος ελέγχει τα χρήματά μου;",
-      "faq_q10": "Τι επιστροφή μετρητών θα λάβω με την MetaMask Card;",
-      "sounds_good": "Εντάξει"
+      "faq_q10": "Πόση απόδοση σε mUSD προσφέρει η MetaMask Card;"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "Ακύρωση",
     "confirm": "Επιβεβαίωση",
+    "pay_with_bottom_sheet": {
+      "title": "Πληρωμή με",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "Συνεχίζοντας, συμφωνείτε με τους ",
       "terms_of_use": "Όρους Χρήσης",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "Ανάληψη",
       "predict_deposit": "Προσθήκη κεφαλαίων για Προβλέψεις",
       "predict_withdraw": "Ανάληψη",
-      "money_account_deposit": "Προσθήκη κεφαλαίων",
-      "money_account_withdraw": "Ανάληψη χρημάτων"
+      "money_account_add_money": "Προσθήκη χρημάτων",
+      "money_account_transfer_money": "Μεταφορά χρημάτων"
     },
     "sub_title": {
       "permit": "Αυτός ο ιστότοπος θέλει άδεια για να δαπανήσει τα tokens σας.",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "Θα ανταλλάξουμε τα tokens σας με USDC στο HyperCore, το δίκτυο που χρησιμοποιείται από τα Perps. Οι πάροχοι ανταλλαγής ενδέχεται να χρεώσουν προμήθεια, αλλά το MetaMask δεν χρεώνει."
       },
       "predict_deposit": {
-        "transaction_fee": "Θα ανταλλάξουμε τα tokens σας με USDC.e στο δίκτυο Polygon, που χρησιμοποιείται για τις Προβλέψεις. Οι πάροχοι ανταλλαγών ενδέχεται να χρεώσουν προμήθεια, αλλά το MetaMask δεν χρεώνει."
+        "transaction_fee": "Θα ανταλλάξουμε τα tokens σας σε pUSD στο Polygon, το δίκτυο που χρησιμοποιούμε για τις Προβλέψεις. Οι πάροχοι για την ανταλλαγή ενδέχεται να χρεώνουν προμήθεια, αλλά το MetaMask όχι."
       },
       "perps_withdraw": {
         "transaction_fee": "Το MetaMask θα κάνει ανταλλαγή στο token που θέλετε. Δεν υπάρχει χρέωση στο MetaMask όταν κάνετε ανταλλαγή σε mUSD."
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "Τα τέλη μετατροπής σε mUSD περιλαμβάνουν τα έξοδα δικτύου και ενδέχεται να περιλαμβάνουν τα τέλη παρόχου. Δεν υπάρχει χρέωση στο MetaMask όταν μετατρέπετε σε mUSD."
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "Τέλη"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "Αγορά κρυπτονομισμάτων",
       "buy_predict": "Προσθέστε χρήματα στο πορτοφόλι σας για να χρησιμοποιήσετε τις Προβλέψεις.",
-      "buy_perps": "Προσθέστε χρήματα στο πορτοφόλι σας για να χρησιμοποιήσετε τα Perps."
+      "buy_perps": "Προσθέστε χρήματα στο πορτοφόλι σας για να χρησιμοποιήσετε τα Perps.",
+      "projected_five_year_balance": "Προβλεπόμενο υπόλοιπο 5ετίας:"
     },
     "unlimited": "Απεριόριστα",
     "all": "Όλα",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "Συνεχίστε",
     "deposit_edit_amount_done": "Προσθήκη κεφαλαίων",
     "deposit_edit_amount_predict_withdraw": "Ανάληψη",
-    "deposit_edit_amount_musd_conversion": "Μετατροπή σε mUSD"
+    "deposit_edit_amount_musd_conversion": "Μετατροπή σε mUSD",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "Τα αποτελέσματα έχουν αλλάξει",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "Ανταλλαγή",
     "terms_and_conditions": "Όροι & Προϋποθέσεις",
     "select_token": "Επιλέξτε token",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "Δεν βρέθηκαν token",
     "no_tokens_found_description": "Δεν βρέθηκαν token με αυτό το όνομα “{}”. Δοκιμάστε άλλη αναζήτηση.",
     "select_network": "Επιλέξτε δίκτυο",
@@ -7115,6 +7303,7 @@
     "receive_at": "Θα λάβετε στις",
     "recipient": "Αποδέκτης",
     "select_recipient": "Επιλέξτε παραλήπτη",
+    "select_account": "Επιλέξτε λογαριασμό",
     "external_account": "Εξωτερικός λογαριασμός",
     "error_banner_description": "Αυτή η διαδρομή συναλλαγών δεν είναι διαθέσιμη προς το παρόν. Δοκιμάστε να αλλάξετε το ποσό, το δίκτυο ή το token και θα βρούμε την καλύτερη επιλογή.",
     "stock_token_error_banner_description": "Αυτή η διαδρομή συναλλαγών δεν είναι διαθέσιμη αυτήν τη στιγμή. Δοκιμάστε να αλλάξετε το ποσό, το δίκτυο ή το token και θα βρούμε την καλύτερη επιλογή.\n\nΛάβετε υπόψη ότι εάν προσπαθείτε να κάνετε συναλλαγές με μετοχές Ondo Tokenised, ενδέχεται να έχετε γεωγραφικούς περιορισμούς, π.χ. μέσω ΗΠΑ, ΕΕ, Ηνωμένου Βασιλείου και Βραζιλίας.",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "Υψηλή επίδραση στην τιμή",
     "price_impact_error_title": "Πολύ μεγάλη επίδραση στην τιμή",
     "price_impact_error_description": "Θα χάσετε περίπου {{priceImpact}} από την τιμή αγοράς του token σε αυτή την ανταλλαγή. Δοκιμάστε με μικρότερο ποσό ή ένα κανάλι με μεγαλύτερη ρευστότητα για να βελτιώσετε την τιμή.",
+    "insufficient_native_reserve_cta": "Χρήση μέγιστου επιτρεπόμενου",
+    "insufficient_native_reserve_message": "Αυτό το δίκτυο απαιτεί να διατηρείτε τουλάχιστον {{minimumReserve}} {{ticker}} στον λογαριασμό σας. Μπορείτε να χρησιμοποιήσετε το πολύ {{maxSwappable}} {{ticker}}",
+    "insufficient_native_reserve_title": "Απαιτείται ελάχιστο υπόλοιπο σε {{ticker}} που πρέπει να διατηρείται",
     "token_warning_suspicious_banner": "Το {{token}} έχει χαρακτηριστεί ως ύποπτο token.",
     "token_warning_malicious_banner": "Το {{token}} είναι κακόβουλο token. Να είστε προσεκτικοί όταν αλληλεπιδράτε με αυτό.",
     "token_warning_modal_suspicious_title": "Ύποπτο token",
@@ -7542,17 +7734,17 @@
         "price": "Δωρεάν",
         "feature_1": "Εικονική κάρτα για Apple Pay και Google Pay",
         "feature_2": "Πληρώστε με κρυπτονομίσματα (USDC, USDT, WETH και άλλα)",
-        "feature_3": "1% επιστροφή σε USDC σε κάθε αγορά"
+        "feature_3": "Απόδοση 1% σε mUSD με κάθε αγορά"
       },
       "metal_card": {
         "name": "Metal Card",
         "price": "$199/έτος",
         "everything_in_virtual": "Όλα όσα περιλαμβάνει η εικονική κάρτα, καθώς και:",
         "feature_1": "Μεταλλική κάρτα υψηλής ποιότητας με χάραξη",
-        "feature_2": "3% επιστροφή χρημάτων στα πρώτα $10.000/έτος",
+        "feature_2": "Απόδοση 3% σε mUSD στα πρώτα $10.000/έτος",
         "feature_3": "Χωρίς χρεώσεις για διεθνείς συναλλαγές"
       },
-      "earn_up_to_badge": "Κερδίστε έως και $300 επιστροφή χρημάτων κάθε χρόνο",
+      "earn_up_to_badge": "Κερδίστε έως και $300 ως απόδοση σε mUSD ετησίως",
       "upgrade_to_metal_label": "Ή κάντε αναβάθμιση σε Μεταλλική κάρτα για 3× ανταμοιβές"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "Η ΔΙΑΔΙΚΑΣΙΑ ΕΚΔΟΣΗΣ ΤΗΣ ΚΑΡΤΑΣ ΣΑΣ\nΕΧΕΙ ΟΛΟΚΛΗΡΩΘΕΙ",
       "subtitle": "Θα φτάσει σε 4 έως 6 εβδομάδες.",
-      "description": "Ρυθμίστε την εικονική σας κάρτα και προσθέστε την στο ψηφιακό πορτοφόλι σας για να ξεκινήσετε να κερδίζετε ανταμοιβές.",
+      "description": "Ρυθμίστε την εικονική σας κάρτα και προσθέστε την στο ψηφιακό σας πορτοφόλι για να ξεκινήσετε να κερδίζετε mUSD.",
       "set_up_card_button": "Ρύθμιση κάρτας",
       "back_to_card_button": "Πίσω στην Κάρτα"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "Ξοδέψτε \nκαι Κερδίστε",
-      "description": "Η MetaMask Card είναι ο πιο γρήγορος και \nεύκολος τρόπος για να ξοδέψετε τα κρυπτονομίσματά σας και \nνα κερδίσετε έως και 3% σε ανταμοιβές.",
+      "description": "Η MetaMask Card είναι ο γρήγορος και \nεύκολος τρόπος να ξοδεύετε τα κρυπτονομίσματά σας και \nνα κερδίζετε έως και 3% ως απόδοση σε mUSD.",
       "apply_now_button": "Ρύθμιση τώρα",
       "login_button": "Σύνδεση",
       "not_now_button": "Όχι τώρα",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "Ενεργοποίηση κάρτας",
       "enable_assets_button_label": "Ενεργοποιήστε τα περιουσιακά στοιχεία",
       "spending_limit_warning": "Έχετε σχεδόν φτάσει το όριο δαπανών σας. Ενημερώστε για να αποφύγετε απορρίψεις.",
+      "spending_limit_available": "διαθέσιμο",
       "logout": "Αποσύνδεση",
       "contact_support": "Επικοινωνία με την υποστήριξη",
       "logout_confirmation_title": "Αποσύνδεση από την κάρτα;",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "Όροι και προϋποθέσεις",
         "order_metal_card": "Metal Card",
         "order_metal_card_description": "Παραγγείλετε τώρα τη φυσική Metal Card σας",
-        "cashback": "Επιστροφή χρημάτων",
-        "cashback_description": "Κερδίστε 1% επιστροφή σε κάθε συναλλαγή",
-        "cashback_description_metal": "Κερδίστε 3% επιστροφή σε κάθε συναλλαγή",
+        "cashback": "Απόδοση σε mUSD",
+        "cashback_description": "Κερδίστε 1% ως απόδοση σε mUSD σε όλες τις συναλλαγές",
+        "cashback_description_metal": "Κερδίστε 3% ως απόδοση σε mUSD σε όλες τις συναλλαγές",
         "freeze_card": "Πάγωμα κάρτας",
         "unfreeze_card": "Ξεπάγωμα κάρτας",
         "freeze_card_description": "Παύση όλων των δαπανών στην κάρτα σας",
@@ -7917,8 +8110,8 @@
       "token_label": "Token"
     },
     "cashback_screen": {
-      "title": "Επιστροφή χρημάτων",
-      "available_cashback": "Διαθέσιμη επιστροφή χρημάτων",
+      "title": "Απόδοση σε mUSD",
+      "available_cashback": "Διαθέσιμα mUSD",
       "network_fee": "Τέλη δικτύου",
       "expected_to_receive": "Αναμένεται να λάβετε",
       "withdraw": "Ανάληψη",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "Η διαδικασία ανάληψης ξεκίνησε",
       "withdrawal_success": "Η ανάληψη ολοκληρώθηκε με επιτυχία",
       "withdrawal_failed": "Η ανάληψη απέτυχε. Προσπαθήστε ξανά.",
-      "no_cashback": "Δεν υπάρχει διαθέσιμη επιστροφή χρημάτων",
-      "loading_error": "Αποτυχία φόρτωσης της επιστροφής χρημάτων. Προσπαθήστε ξανά."
+      "no_cashback": "Δεν υπάρχει διαθέσιμη απόδοση σε mUSD",
+      "loading_error": "Δεν ήταν δυνατή η φόρτωση απόδοσης σε mUSD. Προσπαθήστε ξανά.",
+      "funding_required": {
+        "title": "Ρύθμιση χρηματοδότησης στο δίκτυο Linea",
+        "description": "Πρέπει να έχετε τουλάχιστον μία εγκεκριμένη πηγή χρηματοδότησης στο δίκτυο Linea πριν εξαργυρώσετε την απόδοση σε mUSD.",
+        "confirm_button_label": "Ρύθμιση χρηματοδότησης"
+      }
     },
     "change_asset": {
       "title": "Αλλαγή token και δικτύου",
@@ -8032,7 +8230,8 @@
     "title": "Επιλέξτε μέθοδο πληρωμής",
     "title_receive": "Επιλέξτε το token που θα λάβετε",
     "no_gas": "Δεν υπάρχει διαθέσιμο υπόλοιπο για τα τέλη συναλλαγών",
-    "not_supported": "Δεν υποστηρίζεται"
+    "not_supported": "Δεν υποστηρίζεται",
+    "crypto": "Κρύπτο"
   },
   "connection_removed_modal": {
     "title": "Οι συνδέσεις αφαιρέθηκαν",
@@ -8048,6 +8247,15 @@
       "title": "Αποτυχία συμμετοχής",
       "description": "Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά."
     },
+    "notifications_nudge": {
+      "title": "Μην το χάσετε",
+      "description": "Ενεργοποιήστε τις ειδοποιήσεις για να ενημερώνεστε για καμπάνιες.",
+      "turn_on_button": "Ενεργοποίηση",
+      "loading": "Ενεργοποίηση ειδοποιήσεων...",
+      "loading_description": "Αυτό μπορεί να διαρκέσει λίγα λεπτά.",
+      "enable_error": "Δεν ήταν δυνατή η ενεργοποίηση των ειδοποιήσεων",
+      "success": "Οι ειδοποιήσεις ενεργοποιήθηκαν"
+    },
     "version_guard": {
       "title": "Απαιτείται ενημέρωση",
       "description": "Απαιτείται νεότερη έκδοση του MetaMask για να χρησιμοποιήσετε τις Ανταμοιβές. Παρακαλούμε ενημερώστε την εφαρμογή για να συνεχίσετε.",
@@ -8126,6 +8334,17 @@
       "retry_button": "Επανάληψη"
     },
     "main_title": "Ανταμοιβές",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "Συστάσεις",
     "referral_stats_earned_from_referrals": "Κερδίσατε από συστάσεις",
     "referral_stats_referrals": "Συστάσεις",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "Ενεργές ενισχύσεις",
     "season_1": "Περίοδος 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "Εκτίμηση του μπόνους σε mUSD",
-      "description": "Δείτε πόσα μπορείτε να κερδίσετε μετατρέποντας τα stablecoins σας σε mUSD.",
-      "amount_label": "Το ποσό μετατράπηκε",
-      "estimated_bonus": "Εκτιμώμενο ετήσιο μπόνους: έως 3%",
-      "initial_amount": "Αρχικό ποσό",
-      "daily_bonus": "Ημερήσιο διαθέσιμο μπόνους",
-      "annualized_bonus": "Ετήσιο μπόνους",
-      "disclaimer": "Πρόκειται μόνο για εκτίμηση. Το μπόνους ενδέχεται να αλλάξει.",
-      "disclaimer_brief": "Το μπόνους είναι κατ' εκτίμηση και μπορεί να αλλάξει.",
+      "page_title": "Εργαλείο υπολογισμού για mUSD",
+      "hero_hold": "Διατηρήστε τα mUSD.",
+      "hero_earn": "Κερδίστε",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/έτος",
+      "earnings_per_month_suffix": "/μήνα",
+      "earnings_per_day_suffix": "/ημέρα διαθέσιμα για εξαργύρωση καθημερινά",
+      "slider_amount_label": "Ποσό",
+      "disclaimer_calculator": "Εκτίμηση με βάση 3% μπόνους. Η ισοτιμία μπορεί να αλλάξει. Εξαργύρωση οποιαδήποτε στιγμή.",
       "buy_button": "Αγοράστε mUSD",
       "swap_button": "Ανταλλαγή σε mUSD"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "Λήγει {{date}}",
       "ended_date": "Έληξε στις {{date}}",
       "pill_up_next": "Προσεχώς",
+      "up_next": "Επόμενο",
+      "notify_me": "Ειδοποιήστε με",
       "pill_active": "Ζωντανά",
       "pill_complete": "Ολοκληρώθηκε",
       "enter": "Είσοδος",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "Δεν είναι διαθέσιμη στην περιοχή σας",
       "geo_locked_toast_description": "Αυτή η καμπάνια δεν είναι διαθέσιμη στην περιοχή σας. Επιστρέψτε αργότερα για νέες καμπάνιες.",
       "geo_locked_cta": "Έλεγχος επιλεξιμότητας",
-      "geo_loading": "Έλεγχος περιοχής…"
+      "geo_loading": "Έλεγχος περιοχής…",
+      "remind_me_success_toast": "Θα σας ενημερώσουμε όταν ξεκινήσει αυτή η καμπάνια.",
+      "remind_me_save_error": "Δεν ήταν δυνατή η αποθήκευση της υπενθύμισης. Προσπαθήστε ξανά."
     },
     "campaign_mechanics": {
       "title": "Κανόνες"
@@ -8479,10 +8701,10 @@
       "qualified_description": "Αυξήστε τις καθαρές εισροές σας για να φτάσετε σε υψηλότερο επιπέδο και να διεκδικήσετε μεγαλύτερες ανταμοιβές.",
       "not_eligible_title": "Δεν πληροίτε τις προϋποθέσεις",
       "not_eligible_description": "Συναλλαγές που ανοίγουν πολύ αργά για να καλύψουν την απαίτηση διακράτησης {{days}} ημερών δεν θα υπολογίζονται στην κατάταξη ή το επίπεδο σας.",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "Συνολικοί συμμετέχοντες",
+      "completed_label_total_tvl": "Συνολική Αξία Κλειδωμένων Κεφαλαίων",
+      "completed_label_top_return": "Κορυφαία απόδοση",
+      "completed_label_winners": "Νικητές"
     },
     "ondo_campaign_activity": {
       "title": "Όλη η δραστηριότητα",
@@ -8508,6 +8730,48 @@
       "cancel": "Ακύρωση",
       "confirm": "Κατανοώ"
     },
+    "perps_trading_campaign": {
+      "title": "Διαγωνισμός Συναλλαγών με Perps",
+      "stats_title": "Στατιστικά",
+      "performance_title": "Απόδοση",
+      "label_rank": "Κατάταξη",
+      "label_your_rank": "Η κατάταξή σας",
+      "label_pnl": "Κέρδη & Ζημιές",
+      "label_volume": "Όγκος",
+      "label_notional_volume": "Ονομαστικός όγκος συναλλαγών",
+      "pending": "Εκκρεμεί",
+      "qualified": "Επιλέξιμος",
+      "open_position_cta": "Ανοιχτή Θέση",
+      "leaderboard_title": "Πίνακας κατάταξης",
+      "leaderboard_total_participants": "{{count}} συμμετέχοντες",
+      "last_updated": "Τελευταία ενημέρωση: {{time}}",
+      "leaderboard_error_loading": "Δεν ήταν δυνατή η φόρτωση του πίνακα κατάταξης",
+      "leaderboard_error_loading_description": "Κάτι πήγε στραβά κατά τη φόρτωση του πίνακα κατάταξης. Παρακαλούμε προσπαθήστε πάλι.",
+      "leaderboard_not_yet_computed": "Ο πίνακας κατάταξης δεν έχει υπολογιστεί ακόμη. Ελέγξτε ξανά σύντομα.",
+      "leaderboard_powered_by_prefix": "Με την υποστήριξη του ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "Σύνολο επάθλων",
+      "prize_pool_current_label": "Τρέχουσα",
+      "prize_pool_next_label": "Επόμενο",
+      "prize_pool_volume_subtext": "{{current}} από {{target}} όγκο συναλλαγών",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}}+ όγκος συναλλαγών — όλα τα ορόσημα επιτεύχθηκαν",
+      "prize_pool_max_badge": "Μεγ",
+      "prize_pool_error_title": "Δεν ήταν δυνατή η φόρτωση του συνόλου επάθλων",
+      "prize_pool_error_description": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση του συνόλου επάθλων. Παρακαλούμε προσπαθήστε ξανά.",
+      "prize_pool_retry_button": "Επανάληψη",
+      "stats_notional_volume_threshold": "Απαιτούνται ${{amount}}",
+      "stats_qualified_title": "Πληροίτε τις προϋποθέσεις",
+      "stats_qualified_description": "Συνεχίστε να κάνετε συναλλαγές για να βελτιώσετε τα Κέρδη & Ζημιές σας και να ανεβείτε στην κατάταξη πριν λήξει ο διαγωνισμός.",
+      "stats_qualify_for_rank_title": "Πληροίτε τα κριτήρια για αυτή την κατηγορία",
+      "stats_qualify_for_rank_description": "Κάντε συναλλαγές επιπλέον {{notionalRemaining}} σε ονομαστικό όγκο για να πληροίτε τα κριτήρια.",
+      "stats_error_title": "Δεν ήταν δυνατή η φόρτωση των στατιστικών",
+      "stats_error_description": "Παρουσιάστηκε πρόβλημα κατά τη φόρτωση των στατιστικών σας. Προσπαθήστε ξανά.",
+      "stats_retry": "Επανάληψη",
+      "completed_label_total_participants": "Συνολικοί συμμετέχοντες",
+      "completed_label_total_volume": "Συνολικός όγκος συναλλαγών",
+      "completed_label_top_pnl": "Κορυφαία Κ&Ζ",
+      "completed_label_winners": "Νικητές"
+    },
     "campaigns_preview": {
       "title": "Καμπάνιες",
       "coming_soon": "Προσεχώς",
@@ -8532,29 +8796,29 @@
       "retry_button": "Επανάληψη",
       "refreshing": "Ανανεώνεται..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "Κερδίσατε",
       "rank_label": "θέση {{place}}",
-      "email_instructions": "Στείλτε email στο ondocampaign@consensys.net με τον κωδικό σας για να διεκδικήσετε το βραβείο σας.",
+      "email_instructions": "Στείλτε email στο {{email}} με τον κωδικό σας για να διεκδικήσετε το έπαθλό σας.",
       "open_mail": "Άνοιγμα αλληλογραφίας",
       "skip_for_now": "Παράλειψη για τώρα",
-      "mail_subject": "Διεκδίκηση βραβείου στην καμπάνια του Ondo",
+      "mail_subject": "Διεκδίκηση επάθλου σε {{campaignName}}",
       "mail_body": "Κωδικός νίκης: {{code}}",
       "winning_code": "Κωδικός νίκης",
       "close_a11y": "Κλείσιμο"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "Κερδίσατε",
-        "description": "Διεκδικήστε το βραβείο σας σήμερα.",
-        "a11y": "Άνοιγμα λεπτομερειών νικητή"
+        "title": "Κερδίσατε!",
+        "description": "Επαληθεύστε τον νικηφόρο κωδικό σας και διεκδικήστε το έπαθλό σας σήμερα.",
+        "a11y": "Δείτε λεπτομέρειες"
       },
       "participant_pending": {
         "title": "Η καμπάνια έχει λήξει.",
         "description": "Επεξεργαζόμαστε τα αποτελέσματα. Ελέγξτε ξανά σύντομα."
       },
       "participant_finalized": {
-        "title": "Τα αποτελέσματα της καμπάνιας είναι έτοιμα",
+        "title": "Τα αποτελέσματα της καμπάνιας είναι έτοιμα.",
         "description": "Δεν κερδίσατε αυτή τη φορά. Δείτε τον πίνακα κατάταξης για να δείτε σε ποια θέση τερματίσατε."
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "Το βραβείο σας είναι καθ’ οδόν — θα επικοινωνήσουμε μαζί σας σύντομα."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "Κερδίσατε 💰",
-        "description": "Διεκδικήστε το βραβείο σας από την {{campaignName}}",
+        "description": "Διεκδικήστε το έπαθλό σας από {{campaignName}} σήμερα.",
         "cta": "Δείτε λεπτομέρειες"
       },
-      "participant_no_winner": {
-        "title": "Τα αποτελέσματα είναι έτοιμα. 🏅",
-        "description": "Δείτε την κατάταξή σας στην {{campaignName}}",
+      "non_winner": {
+        "title": "Τα αποτελέσματα είναι έτοιμα 🏅",
+        "description": "Δείτε την κατάταξή σας στην {{campaignName}}.",
         "cta": "Προβολή"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "Κέρδη που καταβλήθηκαν",
       "predict_deposit": "Λογαριασμός Προβλέψεων με διαθέσιμα κεφάλαια",
       "predict_withdraw": "Ανάληψη",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "Κατάθεση στον λογαριασμό χρημάτων",
+      "money_account_withdraw": "Μεταφορά από τον λογαριασμό χρημάτων",
       "default": "Λεπτομέρειες συναλλαγής"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "Εξερεύνηση",
-    "trending_tokens": "Τάσεις",
+    "crypto_movers": "Διακυμάνσεις κρυπτονομισμάτων",
+    "perps_movers": "Διακυμάνσεις Perps",
+    "trending_tokens": "Δημοφιλή",
+    "crypto": "Κρύπτο",
     "stocks": "Μετοχές",
     "price_change": "Αλλαγή τιμής",
     "all_networks": "Όλα τα δίκτυα",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 ώρα",
     "5_minutes": "5 λεπτά",
     "networks": "Δίκτυα",
+    "ecosystems": "Οικοσυστήματα",
+    "ecosystems_subtitle": "Εξερευνήστε αποκεντρωμένες εφαρμογές, tokens και NFT σε διαφορετικά δίκτυα μέσω του MetaMask Portfolio.",
+    "all_sports": "Δημοφιλή αθλήματα",
+    "basketball": "Μπάσκετ",
+    "football": "Ποδόσφαιρο",
+    "soccer": "Αμερ. ποδόσφαιρο",
+    "tennis": "Τένις",
+    "f1": "F1",
+    "golf": "Γκολφ",
+    "all_sports_no_markets": "Δεν υπάρχουν ακόμη ανοιχτές αγορές σε αυτή την κατηγορία. Ελέγξτε ξανά σύντομα ή επιλέξτε ένα άλλο άθλημα παραπάνω.",
+    "load_more": "Φόρτωση περισσότερων",
     "sort_by": "Ταξινόμηση κατά",
     "volume": "Όγκος",
     "market_cap": "Κεφαλαιοποίηση αγοράς",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "Αναζήτηση token, ιστότοπων, διευθύνσεων URL",
     "cancel": "Άκυρο",
     "perps": "Συμβ.αορ.",
+    "rwa_perps_section": "Συμβ.αορ.",
+    "macro_stocks_commodity_perps": "Συμβ.αορ.",
+    "macro_pill_stocks": "Μετοχές",
+    "macro_pill_commodities": "Εμπορεύματα",
+    "rwa_pill_commodities": "Εμπορεύματα",
+    "rwa_pill_stocks": "Μετοχές",
+    "rwa_pill_forex": "Forex",
+    "crypto_perps_section": "Συμβ.αορ.",
     "predictions": "Προβλέψεις",
     "no_results": "Δεν βρέθηκαν αποτελέσματα",
+    "popular": "Δημοφιλή",
     "sites": "Ιστότοποι",
     "popular_sites": "Δημοφιλείς ιστότοποι",
     "search_sites": "Αναζήτηση ιστότοπων",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "Δεν βρέθηκαν token",
       "description": "Δεν μπορέσαμε να βρούμε αυτό το token"
+    },
+    "tabs": {
+      "now": "Τώρα",
+      "macro": "Μακροοικονομικά",
+      "rwas": "Πραγματικά περιουσιακά στοιχεία (RWA)",
+      "crypto": "Κρύπτο",
+      "sports": "Αθλητικά",
+      "dapps": "Ιστότοποι"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "Άκυρο",
-      "continue": "Συνεχίστε"
+      "continue": "Συνεχίστε",
+      "learn_more": "Μάθετε περισσότερα",
+      "try_again": "Προσπαθήστε ξανά"
     },
     "connecting": {
       "title": "Σύνδεση με το {{device}}...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "Ενεργοποιήστε το Bluetooth για να συνδεθεί με τη συσκευή σας",
       "bluetooth_scan_failed": "Δεν ήταν δυνατή η σάρωση συσκευών. Προσπαθήστε ξανά",
       "bluetooth_connection_failed": "Η σύνδεση με τη συσκευή σας απέτυχε. Προσπαθήστε ξανά",
+      "camera_permission_denied": "Απαιτείται άδεια πρόσβασης στην κάμερα για τη σάρωση κωδικών QR. Ενεργοποιήστε την στις ρυθμίσεις της συσκευής σας",
       "not_supported": "Αυτή η λειτουργία δεν υποστηρίζεται",
       "unknown_error": "Βεβαιωθείτε ότι το {{device}} σας έχει ρυθμιστεί με τη Μυστική Φράση Ανάκτησης ή τη φράση πρόσβασης για αυτόν τον λογαριασμό"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "Απαιτείται άδεια τοποθεσίας",
       "nearby_devices_permission_denied": "Απαιτείται άδεια πρόσβασης για κοντινές συσκευές",
       "scan_failed": "Η σάρωση απέτυχε",
+      "camera_permission_denied": "Απαιτείται άδεια πρόσβασης στην κάμερα",
       "something_went_wrong": "Κάτι πήγε στραβά"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "Σαρώστε τον κωδικό QR για συγχρονισμό με το πορτοφόλι",
+          "body": "Επιστρέψτε στο πορτοφόλι υλικού σας και βρείτε την επιλογή για κοινή χρήση ή εξαγωγή των λογαριασμών σας, επιλέξτε το MetaMask και στη συνέχεια σαρώστε τον κωδικό QR."
+        },
+        "sign": {
+          "title": "Σαρώστε τον κωδικό QR για υπογραφή",
+          "body": "Επιστρέψτε στο πορτοφόλι υλικού σας και εγκρίνετε τη συναλλαγή, στη συνέχεια σαρώστε τον κωδικό QR που εμφανίζεται."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "Λάθος κωδικός QR",
+          "body": "Επιστρέψτε στο πορτοφόλι υλικού σας, επιλέξτε το MetaMask ως τύπο πορτοφολιού και στη συνέχεια δημιουργήστε και σαρώστε έναν νέο κωδικό QR."
+        },
+        "sign": {
+          "title": "Λάθος κωδικός QR",
+          "body": "Επιστρέψτε στο πορτοφόλι υλικού σας και εγκρίνετε τη συναλλαγή, στη συνέχεια σαρώστε τον κωδικό QR που εμφανίζεται."
+        }
+      },
+      "ur_decode_error": {
+        "title": "Δεν ήταν δυνατή η ανάγνωση του κωδικού QR",
+        "body": "Βεβαιωθείτε ότι ο κωδικός QR είναι ευδιάκριτος με καλό φωτισμό και προσπαθήστε ξανά. Αν το πρόβλημα συνεχιστεί, ίσως χρειαστεί να ενημερώσετε το υλικολογισμικό του πορτοφολιού υλικού σας."
+      }
+    },
     "device_selection": {
       "title": "Επιλέξτε το {{device}}",
       "scanning": "Σάρωση για συσκευές...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Οικονομικά",
-      "cash_empty_description": "Δεν έχετε ακόμη mUSD. Μετατρέψτε stablecoins σε mUSD από την ενότητα Οικονομικά στην αρχική σελίδα.",
-      "cash_empty_description_network_filter": "Δεν έχετε mUSD σε αυτό το δίκτυο. Αλλάξτε δίκτυο για να δείτε τα mUSD σας.",
+      "money": "Οικονομικά",
+      "money_empty_description": "Δεν έχετε ακόμη mUSD. Μετατρέψτε stablecoins σε mUSD από την ενότητα Οικονομικά στην αρχική σελίδα.",
+      "money_empty_description_network_filter": "Δεν έχετε mUSD σε αυτό το δίκτυο. Αλλάξτε δίκτυο για να δείτε τα mUSD σας.",
+      "money_empty_state": {
+        "get_started": "Ξεκινήστε",
+        "earn_apy": "Κερδίστε {{percentage}}% APY"
+      },
+      "money_filled_state": {
+        "add": "Προσθήκη",
+        "apy": "{{percentage}}% APY"
+      },
       "tokens": "Token",
+      "perps": "Συμβ.αορ.",
+      "related_assets": "Σχετικά περιουσιακά στοιχεία",
       "perpetuals": "Συμβόλαια αορίστου διάρκειας",
       "predictions": "Προβλέψεις",
       "whats_happening": "Τι συμβαίνει",
+      "whats_happening_ai": "AI",
+      "whats_happening_impact": {
+        "bullish": "Ανοδικό",
+        "bearish": "Πτωτικό",
+        "neutral": "Ουδέτερο"
+      },
       "top_traders": "Κορυφαίοι Traders",
       "whats_happening_categories": {
         "geopolitical": "Γεωπολιτικά",
@@ -8819,7 +9160,7 @@
       },
       "defi": "DeFi",
       "nfts": "NFT",
-      "trending_tokens": "Τάσεις",
+      "trending_tokens": "Δημοφιλή",
       "trending_perpetuals": "Δημοφιλή perpetuals",
       "trending_predictions": "Δημοφιλείς προβλέψεις",
       "import_nfts": "Εισαγωγή NFT",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "Δεν είναι δυνατή η φόρτωση του {{section}}",
       "retry": "Επανάληψη"
     }
+  },
+  "sites": {
+    "popular": "Δημοφιλή"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/en.json b/locales/languages/en.json
index 49f3a986043..fb0bc091384 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -634,7 +634,8 @@
     "trade": "Trade",
     "settings": "Settings",
     "rewards": "Rewards",
-    "trending": "Explore"
+    "trending": "Explore",
+    "money": "Money"
   },
   "drawer": {
     "send_button": "Send",
@@ -708,7 +709,11 @@
     "smart_contract_address": "Smart contract address",
     "smart_contract_address_warning": "The recipient address may not support direct token transfers, which could result in fund loss. Only continue if you're certain this contract can receive your transfer.",
     "i_understand": "I understand",
-    "cancel": "Cancel"
+    "cancel": "Cancel",
+    "new_address_title": "New address",
+    "new_address_message": "You're sending to this address for the first time. Make sure that it's correct before you continue:",
+    "alert_navigation_previous": "Previous alert",
+    "alert_navigation_next": "Next alert"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -6474,10 +6479,17 @@
       },
       "education": {
         "heading": "GET {{percentage}}% ON\nSTABLECOINS",
-        "description": "Convert your stablecoins to mUSD and earn up to a {{percentage}}% annualized bonus that you can claim daily.",
+        "description": "Convert your stablecoins to mUSD and earn a {{percentage}}% annualized bonus.",
         "terms_apply": "Terms apply.",
         "primary_button": "Get Started",
-        "secondary_button": "Not now"
+        "secondary_button": "Not now",
+        "checklist": {
+          "dollar_backed": "Dollar-backed",
+          "no_lockups": "No lockups",
+          "daily_bonus": "Daily bonus",
+          "metamask_stablecoins": "MetaMask stablecoins",
+          "no_metamask_fee": "No MetaMask fee"
+        }
       },
       "buy_musd": "Buy mUSD",
       "get_musd": "Get mUSD",
@@ -6521,12 +6533,13 @@
   },
   "money": {
     "title": "Money",
+    "your_balance": "Your balance",
     "apy_label": "{{percentage}}% APY",
     "apy_info_label": "APY info",
     "onboarding": {
       "step_progress": "Step {{current}} of {{total}}",
       "title": "Add money",
-      "description": "Buy mUSD and start earning APY today.",
+      "description": "Fund your account and start earning APY.",
       "add": "Add",
       "step2_title": "Get your MetaMask Card",
       "step2_description": "Spend your Money balance while it earns, anywhere Mastercard is accepted.",
@@ -6541,9 +6554,10 @@
       "card": "Card"
     },
     "earnings": {
-      "title": "Earnings",
-      "lifetime": "Lifetime earnings",
-      "projected": "Projected earnings"
+      "title": "Estimated earnings",
+      "estimated_monthly": "Monthly",
+      "estimated_yearly": "Annual",
+      "info_label": "Earnings info"
     },
     "how_it_works": {
       "title": "How it works",
@@ -6553,6 +6567,12 @@
     "musd_row": {
       "add": "Add"
     },
+    "balance_card": {
+      "label": "Money balance",
+      "add": "Add",
+      "info_sheet_title": "Money Home",
+      "info_sheet_body": "Your dollar-backed balance, always available. Spend it, send it, or trade it anytime. We don't calculate this into your total account balance."
+    },
     "potential_earnings": {
       "title": "Earn on your crypto",
       "description": "See how your money can grow over time by converting your crypto to mUSD.",
@@ -6566,11 +6586,11 @@
       "subtitle": "Spend your money anywhere.",
       "virtual_card": "Virtual card",
       "metal_card": "Metal card",
-      "cashback": "{{percentage}}% cashback",
+      "cashback": "{{percentage}}% mUSD back",
       "get_now": "Get now",
       "link_title": "Link MetaMask Card",
       "link_subtitle": "Spend your Money balance and earn.",
-      "link_bullet_cashback": "Up to 3% cash back",
+      "link_bullet_cashback": "Up to 3% mUSD back",
       "link_bullet_apy": "Up to {{apy}}% APY",
       "link_card": "Link card"
     },
@@ -6580,7 +6600,7 @@
       "benefit_dollar_backed": "Keep your money secure in mUSD, a 1:1 dollar-backed stablecoin",
       "benefit_liquidity": "Get full liquidity with no lockups, so you can trade or withdraw anytime",
       "benefit_spend_prefix": "Spend at 150M+ merchants with MetaMask Card and earn ",
-      "benefit_spend_cashback": "1-3% cashback",
+      "benefit_spend_cashback": "1-3% mUSD back",
       "benefit_transfer": "Transfer money to any of your wallets across MetaMask",
       "benefit_global": "Send and receive money globally",
       "learn_more": "Learn more"
@@ -6597,6 +6617,31 @@
       "receive_external": "Receive from external wallet",
       "coming_soon": "Coming soon"
     },
+    "more_sheet": {
+      "title": "More",
+      "how_it_works": "How it works",
+      "what_you_get": "What you get",
+      "contact_support": "Contact support"
+    },
+    "transfer_sheet": {
+      "title": "Transfer money",
+      "between_accounts": "Between accounts",
+      "perps_account": "Perps account",
+      "predictions_account": "Predictions account",
+      "send_external": "Send to external address",
+      "withdraw_to_bank": "Withdraw to bank"
+    },
+    "apy_tooltip": {
+      "title": "Annual Percentage Yield (APY)",
+      "paragraph_1": "Your Money account earns up to {{percentage}}% automatically.",
+      "paragraph_2": "The rate shown is an estimated Annual Percentage Yield (APY) based on current market conditions. APY is variable and may change due to various factors. The rate is generated by third-party DeFi platforms that deploy funds in blockchain protocols.",
+      "paragraph_3": "When you link your MetaMask Card, purchases will be deducted from this balance.",
+      "learn_more": "Learn more"
+    },
+    "earnings_tooltip": {
+      "title": "Estimated earnings",
+      "body": "An estimate of how much you could earn over a period based on your current balance and today's APY. Estimates are not guaranteed returns and remain subject to change."
+    },
     "activity": {
       "title": "Activity",
       "view_all": "View all",
@@ -6652,7 +6697,7 @@
       "faq_q7": "Does the APY rate change?",
       "faq_q8": "Is this a savings account or a spending account?",
       "faq_q9": "Who controls my money?",
-      "faq_q10": "What cash back do I get with the MetaMask Card?",
+      "faq_q10": "What mUSD back do I get with the MetaMask Card?",
       "sounds_good": "Sounds good"
     }
   },
@@ -6962,8 +7007,8 @@
       "perps_withdraw": "Withdraw",
       "predict_deposit": "Add Prediction funds",
       "predict_withdraw": "Withdraw",
-      "money_account_deposit": "Add funds",
-      "money_account_withdraw": "Withdraw funds"
+      "money_account_add_money": "Add money",
+      "money_account_transfer_money": "Transfer money"
     },
     "sub_title": {
       "permit": "This site wants permission to spend your tokens.",
@@ -7079,7 +7124,8 @@
     "custom_amount": {
       "buy_button": "Buy crypto",
       "buy_predict": "Add funds to your wallet to use Predictions.",
-      "buy_perps": "Add funds to your wallet to use Perps."
+      "buy_perps": "Add funds to your wallet to use Perps.",
+      "projected_five_year_balance": "Projected 5-year balance:"
     },
     "unlimited": "Unlimited",
     "all": "All",
@@ -7159,6 +7205,7 @@
     "receive_at": "Receive at",
     "recipient": "Recipient",
     "select_recipient": "Select recipient",
+    "select_account": "Select account",
     "external_account": "External account",
     "error_banner_description": "This trade route isn't available right now. Try changing the amount, network, or token and we'll find the best option.",
     "stock_token_error_banner_description": "This trade route isn't available right now. Try changing the amount, network, or token and we'll find the best option.\n\nPlease note if you are attempting to trade Ondo Tokenised Stocks you may be geo-restricted e.g. via US, EU, UK and BR.",
@@ -7230,6 +7277,9 @@
     "price_impact_warning_title": "High price impact",
     "price_impact_error_title": "Very high price impact",
     "price_impact_error_description": "You'll lose approximately {{priceImpact}} of your token's market price on this swap. Try a smaller trade or a more liquid route to improve your rate.",
+    "insufficient_native_reserve_cta": "Use max allowed",
+    "insufficient_native_reserve_message": "This network requires at least {{minimumReserve}} {{ticker}} to remain in your account. You can use a maximum of {{maxSwappable}} {{ticker}}",
+    "insufficient_native_reserve_title": "Minimum {{ticker}} reserve balance required",
     "token_warning_suspicious_banner": "{{token}} is a suspicious token.",
     "token_warning_malicious_banner": "{{token}} is a malicious token. Be cautious interacting with this token.",
     "token_warning_modal_suspicious_title": "Suspicious token",
@@ -7586,17 +7636,17 @@
         "price": "Free",
         "feature_1": "Virtual card for Apple Pay and Google Pay",
         "feature_2": "Pay with crypto (USDC, USDT, WETH, and more)",
-        "feature_3": "1% USDC cashback on every purchase"
+        "feature_3": "1% mUSD back on every purchase"
       },
       "metal_card": {
         "name": "Metal Card",
         "price": "$199/year",
         "everything_in_virtual": "Everything in virtual, plus:",
         "feature_1": "Premium engraved metal card",
-        "feature_2": "3% cashback on first $10,000/year",
+        "feature_2": "3% mUSD back on first $10,000/year",
         "feature_3": "No foreign transaction fees"
       },
-      "earn_up_to_badge": "Earn up to $300 in cashback annually",
+      "earn_up_to_badge": "Earn up to $300 in mUSD back annually",
       "upgrade_to_metal_label": "Or upgrade to Metal for 3x rewards"
     },
     "review_order": {
@@ -7617,7 +7667,7 @@
     "order_completed": {
       "title": "YOUR CARD\nIS ORDERED",
       "subtitle": "It should arrive in 4 to 6 weeks.",
-      "description": "Set up your virtual card and add it to your digital wallet to start earning cashback.",
+      "description": "Set up your virtual card and add it to your digital wallet to start earning mUSD back.",
       "set_up_card_button": "Set up card",
       "back_to_card_button": "Back to Card"
     },
@@ -7636,7 +7686,7 @@
     },
     "card_onboarding": {
       "title": "Spend\nand Earn",
-      "description": "The MetaMask Card is the fast and\neasy way to spend your crypto and\nearn up to 3% cashback.",
+      "description": "The MetaMask Card is the fast and\neasy way to spend your crypto and\nearn up to 3% mUSD back.",
       "apply_now_button": "Set up now",
       "login_button": "Log in",
       "not_now_button": "Not now",
@@ -7837,6 +7887,7 @@
       "enable_card_button_label": "Enable card",
       "enable_assets_button_label": "Enable assets",
       "spending_limit_warning": "You're close to your spending limit. Update to avoid declines.",
+      "spending_limit_available": "available",
       "logout": "Log out",
       "contact_support": "Contact support",
       "logout_confirmation_title": "Log out of Card?",
@@ -7917,9 +7968,9 @@
         "card_tos_title": "Terms and conditions",
         "order_metal_card": "Metal Card",
         "order_metal_card_description": "Order your physical Metal Card now",
-        "cashback": "Cashback",
-        "cashback_description": "Earn 1% back on all spending",
-        "cashback_description_metal": "Earn 3% back on all spending",
+        "cashback": "mUSD Back",
+        "cashback_description": "Earn 1% mUSD back on all spending",
+        "cashback_description_metal": "Earn 3% mUSD back on all spending",
         "freeze_card": "Freeze card",
         "unfreeze_card": "Unfreeze card",
         "freeze_card_description": "Pause all spending on your card",
@@ -7961,8 +8012,8 @@
       "token_label": "Token"
     },
     "cashback_screen": {
-      "title": "Cashback",
-      "available_cashback": "Available cashback",
+      "title": "mUSD Back",
+      "available_cashback": "Available mUSD",
       "network_fee": "Network fee",
       "expected_to_receive": "Expected to receive",
       "withdraw": "Withdraw",
@@ -7970,11 +8021,11 @@
       "withdrawal_initiated": "Withdrawal has been initiated",
       "withdrawal_success": "Withdrawal completed successfully",
       "withdrawal_failed": "Withdrawal failed. Please try again.",
-      "no_cashback": "No cashback available",
-      "loading_error": "Failed to load cashback. Please try again.",
+      "no_cashback": "No mUSD back available",
+      "loading_error": "Failed to load mUSD back. Please try again.",
       "funding_required": {
         "title": "Set up Linea funding",
-        "description": "You need at least one approved funding source on Linea before redeeming cashback.",
+        "description": "You need at least one approved funding source on Linea before redeeming mUSD back.",
         "confirm_button_label": "Set up funding"
       }
     },
@@ -8098,6 +8149,15 @@
       "title": "Opt-in failed",
       "description": "Check your connection and try again."
     },
+    "notifications_nudge": {
+      "title": "Don't miss out",
+      "description": "Enable notifications to stay informed on campaigns.",
+      "turn_on_button": "Turn on",
+      "loading": "Enabling notifications...",
+      "loading_description": "This may take a moment.",
+      "enable_error": "Failed to enable notifications",
+      "success": "Notifications enabled"
+    },
     "version_guard": {
       "title": "Update required",
       "description": "A newer version of MetaMask is required to use Rewards. Please update to continue.",
@@ -8417,6 +8477,8 @@
       "ends_date": "Ends {{date}}",
       "ended_date": "Ended {{date}}",
       "pill_up_next": "Coming soon",
+      "up_next": "Up next",
+      "notify_me": "Notify me",
       "pill_active": "Live",
       "pill_complete": "Complete",
       "enter": "Enter",
@@ -8430,7 +8492,9 @@
       "geo_locked_toast_title": "Not available in your region",
       "geo_locked_toast_description": "This campaign isn't available where you are. Check back later for new campaigns.",
       "geo_locked_cta": "Check eligibility",
-      "geo_loading": "Checking region..."
+      "geo_loading": "Checking region...",
+      "remind_me_success_toast": "We'll let you know when this campaign starts.",
+      "remind_me_save_error": "Could not save your reminder. Please try again."
     },
     "campaign_mechanics": {
       "title": "Mechanics"
@@ -8558,6 +8622,50 @@
       "cancel": "Cancel",
       "confirm": "I understand"
     },
+    "perps_trading_campaign": {
+      "title": "Perps Trading Competition",
+      "stats_title": "Stats",
+      "performance_title": "Performance",
+      "label_rank": "Rank",
+      "label_your_rank": "Your rank",
+      "label_pnl": "PnL",
+      "label_volume": "Volume",
+      "label_notional_volume": "Notional volume",
+      "label_margin": "Margin",
+      "label_margin_deployed": "Margin deployed",
+      "pending": "Pending",
+      "qualified": "Qualified",
+      "open_position_cta": "Open Position",
+      "leaderboard_title": "Leaderboard",
+      "leaderboard_total_participants": "{{count}} participants",
+      "last_updated": "Last updated: {{time}}",
+      "leaderboard_error_loading": "Failed to load leaderboard",
+      "leaderboard_error_loading_description": "Something went wrong while loading the leaderboard. Please try again.",
+      "leaderboard_not_yet_computed": "Leaderboard hasn't been computed yet. Check back soon.",
+      "leaderboard_powered_by_prefix": "Powered by ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "Prize pool",
+      "prize_pool_current_label": "Current",
+      "prize_pool_next_label": "Next",
+      "prize_pool_volume_subtext": "{{current}} of {{target}} volume",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}}+ volume — all milestones reached",
+      "prize_pool_max_badge": "Max",
+      "prize_pool_error_title": "Failed to load prize pool",
+      "prize_pool_error_description": "There was an error loading the prize pool. Please try again.",
+      "prize_pool_retry_button": "Retry",
+      "stats_notional_volume_threshold": "${{amount}} required",
+      "stats_qualified_title": "You're qualified",
+      "stats_qualified_description": "Keep trading to improve your PnL and climb the leaderboard before the competition ends.",
+      "stats_qualify_for_rank_title": "Qualify for this rank",
+      "stats_qualify_for_rank_description": "Trade {{notionalRemaining}} more in notional volume to become eligible.",
+      "stats_error_title": "Unable to load stats",
+      "stats_error_description": "We had a problem loading your stats. Please try again.",
+      "stats_retry": "Retry",
+      "completed_label_total_participants": "Total participants",
+      "completed_label_total_volume": "Total volume",
+      "completed_label_top_pnl": "Top PnL",
+      "completed_label_winners": "Winners"
+    },
     "campaigns_preview": {
       "title": "Campaigns",
       "coming_soon": "Coming soon",
@@ -8582,29 +8690,29 @@
       "retry_button": "Retry",
       "refreshing": "Refreshing..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "You won",
       "rank_label": "{{place}} place",
-      "email_instructions": "Email ondocampaign@consensys.net with your code to claim your prize.",
+      "email_instructions": "Email {{email}} with your code to claim your prize.",
       "open_mail": "Open mail",
       "skip_for_now": "Skip for now",
-      "mail_subject": "Ondo campaign prize claim",
+      "mail_subject": "{{campaignName}} prize claim",
       "mail_body": "My winning code: {{code}}",
       "winning_code": "Winning code",
       "close_a11y": "Close"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "You won",
-        "description": "Claim your prize today.",
-        "a11y": "Open winner details"
+        "title": "You won!",
+        "description": "Verify your winning code and claim your prize today.",
+        "a11y": "View details"
       },
       "participant_pending": {
         "title": "Campaign has ended.",
         "description": "We're determining the results. Check back soon."
       },
       "participant_finalized": {
-        "title": "Campaign results are in",
+        "title": "Campaign results are in.",
         "description": "You didn't win this time. Check the leaderboard to see where you finished."
       },
       "winner_finalized": {
@@ -8612,15 +8720,15 @@
         "description": "Your reward is on its way — we'll be in touch shortly."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "You won 💰",
-        "description": "Claim your prize from the {{campaignName}}",
+        "description": "Claim your prize from the {{campaignName}} today.",
         "cta": "View details"
       },
-      "participant_no_winner": {
-        "title": "The results are in. 🏅",
-        "description": "See your ranking in the {{campaignName}}",
+      "non_winner": {
+        "title": "The results are in 🏅",
+        "description": "See your ranking in the {{campaignName}}.",
         "cta": "View"
       }
     }
@@ -8712,7 +8820,10 @@
   },
   "trending": {
     "title": "Explore",
+    "crypto_movers": "Crypto movers",
+    "perps_movers": "Perps movers",
     "trending_tokens": "Trending",
+    "crypto": "Crypto",
     "stocks": "Stocks",
     "price_change": "Price change",
     "all_networks": "All networks",
@@ -8723,6 +8834,17 @@
     "1_hour": "1 hour",
     "5_minutes": "5 minutes",
     "networks": "Networks",
+    "ecosystems": "Ecosystems",
+    "ecosystems_subtitle": "Explore dApps, tokens, and NFTs across chains on MetaMask Portfolio",
+    "all_sports": "Popular sports",
+    "basketball": "Basketball",
+    "football": "Football",
+    "soccer": "Soccer",
+    "tennis": "Tennis",
+    "f1": "F1",
+    "golf": "Golf",
+    "all_sports_no_markets": "No open markets in this category yet. Check back soon or pick another sport above.",
+    "load_more": "Load more",
     "sort_by": "Sort by",
     "volume": "Volume",
     "market_cap": "Market cap",
@@ -8732,8 +8854,17 @@
     "search_placeholder": "Search tokens, sites, URLs",
     "cancel": "Cancel",
     "perps": "Perps",
+    "rwa_perps_section": "Perps",
+    "macro_stocks_commodity_perps": "Perps",
+    "macro_pill_stocks": "Stocks",
+    "macro_pill_commodities": "Commodities",
+    "rwa_pill_commodities": "Commodities",
+    "rwa_pill_stocks": "Stocks",
+    "rwa_pill_forex": "Forex",
+    "crypto_perps_section": "Perps",
     "predictions": "Predictions",
     "no_results": "No results found",
+    "popular": "Popular",
     "sites": "Sites",
     "popular_sites": "Popular sites",
     "search_sites": "Search sites",
@@ -8749,6 +8880,14 @@
     "empty_search_result_state": {
       "title": "No tokens found",
       "description": "We were not able to find this token"
+    },
+    "tabs": {
+      "now": "Now",
+      "macro": "Macro",
+      "rwas": "RWAs",
+      "crypto": "Crypto",
+      "sports": "Sports",
+      "dapps": "Sites"
     }
   },
   "ota_update_modal": {
@@ -8766,7 +8905,9 @@
     },
     "common": {
       "cancel": "Cancel",
-      "continue": "Continue"
+      "continue": "Continue",
+      "learn_more": "Learn more",
+      "try_again": "Try again"
     },
     "connecting": {
       "title": "Connecting your {{device}}...",
@@ -8812,6 +8953,7 @@
       "bluetooth_off": "Please turn on Bluetooth to connect to your device",
       "bluetooth_scan_failed": "Failed to scan for devices. Please try again",
       "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",
       "unknown_error": "Make sure your {{device}} is set up with the Secret Recovery Phrase or passphrase for this account"
     },
@@ -8835,8 +8977,35 @@
       "location_permission_denied": "Location Permission Required",
       "nearby_devices_permission_denied": "Nearby Devices Permission Required",
       "scan_failed": "Scan Failed",
+      "camera_permission_denied": "Camera Permission Required",
       "something_went_wrong": "Something went wrong"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "Scan wallet sync QR code",
+          "body": "Go back to your hardware wallet and find the option to share or export your accounts, choose MetaMask, then scan the QR code."
+        },
+        "sign": {
+          "title": "Scan signature QR code",
+          "body": "Go back to your hardware wallet and approve the transaction, then scan the QR code it shows."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "Wrong QR code",
+          "body": "Go back to your hardware wallet, choose MetaMask as the wallet type, then generate and scan a new QR code."
+        },
+        "sign": {
+          "title": "Wrong QR code",
+          "body": "Go back to your hardware wallet and approve the transaction, then scan the QR code it shows."
+        }
+      },
+      "ur_decode_error": {
+        "title": "Couldn't read QR code",
+        "body": "Make sure the QR code is fully visible and well-lit, and try again. If the issue continues, you may need to update your hardware wallet's firmware."
+      }
+    },
     "device_selection": {
       "title": "Select {{device}}",
       "scanning": "Scanning for devices...",
@@ -8851,13 +9020,27 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Money",
-      "cash_empty_description": "You don't have any mUSD yet. Convert stablecoins to mUSD from the Money section on the homepage.",
-      "cash_empty_description_network_filter": "No mUSD on this network. Switch network to see your mUSD.",
+      "money": "Money",
+      "money_empty_description": "You don't have any mUSD yet. Convert stablecoins to mUSD from the Money section on the homepage.",
+      "money_empty_description_network_filter": "No mUSD on this network. Switch network to see your mUSD.",
+      "money_empty_state": {
+        "get_started": "Get started",
+        "earn_apy": "Earn {{percentage}}% APY"
+      },
+      "money_filled_state": {
+        "add": "Add",
+        "apy": "{{percentage}}% APY"
+      },
       "tokens": "Tokens",
+      "perps": "Perps",
       "perpetuals": "Perpetuals",
       "predictions": "Predictions",
       "whats_happening": "What's happening",
+      "whats_happening_impact": {
+        "bullish": "Bullish",
+        "bearish": "Bearish",
+        "neutral": "Neutral"
+      },
       "top_traders": "Top Traders",
       "whats_happening_categories": {
         "geopolitical": "Geopolitical",
@@ -8883,5 +9066,8 @@
       "unable_to_load": "Unable to load {{section}}",
       "retry": "Retry"
     }
+  },
+  "sites": {
+    "popular": "Popular"
   }
 }
diff --git a/locales/languages/es.json b/locales/languages/es.json
index 37bc0374b7c..e4539b65600 100644
--- a/locales/languages/es.json
+++ b/locales/languages/es.json
@@ -634,7 +634,8 @@
     "trade": "Operar",
     "settings": "Configuración",
     "rewards": "Recompensas",
-    "trending": "Explorar"
+    "trending": "Explorar",
+    "money": "Money"
   },
   "drawer": {
     "send_button": "Enviar",
@@ -708,7 +709,11 @@
     "smart_contract_address": "Dirección del contrato inteligente",
     "smart_contract_address_warning": "Es posible que la dirección del destinatario no admita transferencias directas de tokens, lo que podría provocar la pérdida de fondos. Continúa solo si estás seguro de que este contrato puede recibir tu transferencia.",
     "i_understand": "Comprendo",
-    "cancel": "Cancelar"
+    "cancel": "Cancelar",
+    "new_address_title": "Nueva dirección",
+    "new_address_message": "Es la primera vez que envías a esta dirección. Asegúrate de que sea correcta antes de continuar:",
+    "alert_navigation_previous": "Alerta anterior",
+    "alert_navigation_next": "Siguiente alerta"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "Traders principales",
       "allow_push_notifications": "Permitir notificaciones push",
       "trades_over_label": "Recibe notificaciones de operaciones realizadas sobre:",
       "traders_you_follow": "Traders que sigues",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "No se pudieron cargar los traders que sigues."
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "Notificaciones de {{traderName}}",
       "allow_push_notifications": "Permitir notificaciones push",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "Recibe notificaciones sobre la actividad de trading de {{traderName}}",
+      "manage_traders": "Gestiona los traders a los que sigues",
       "save": "Guardar"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "Recibe alertas en tiempo real sobre las operaciones de los traders a los que sigues",
       "allow_push_notifications": "Permitir notificaciones push",
       "trades_over_label": "Recibe notificaciones de operaciones realizadas sobre:",
       "save": "Guardar",
@@ -1059,7 +1064,12 @@
       "closed": "Cerrado",
       "no_positions": "Aún no hay posiciones",
       "error_loading_profile": "No se pudo cargar el perfil",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "Ver en X (Twitter)",
+      "sort": {
+        "value": "Valor",
+        "pnl_percent": "P&L %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "Capitalización bursátil",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} vendió",
       "no_trades": "No hay operaciones para este intervalo",
       "closed_position": "Posición cerrada",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "Posición no disponible",
+      "fallback_subtitle": "No pudimos cargar esta posición en este momento.",
+      "fallback_back_to_profile": "Volver al perfil",
+      "fallback_back_to_leaderboard": "Volver a la clasificación"
     },
     "quick_buy": {
       "title": "Comprar {{symbol}}",
@@ -1341,7 +1351,7 @@
         "go_back": "Atrás",
         "asset_not_tradable": "{{asset}} no es un activo negociable"
       },
-      "off": "Parado",
+      "off": "Desact.",
       "estimated_execution_time": "Hora estimada de ejecución",
       "one_to_three_seconds": "1 a 3 segundos",
       "margin": "Margen",
@@ -1549,7 +1559,7 @@
     "tpsl": {
       "title": "Cierre automático",
       "description": "Elige un porcentaje de ganancia o pérdida, o ingresa un precio de activación personalizado para cerrar tu posición automáticamente.",
-      "off": "Parado",
+      "off": "Desact.",
       "current_price": "Precio actual",
       "entry_price": "Precio de entrada",
       "leverage": "Apalancamiento",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "Predicciones de MetaMask",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "Mercados de predicción",
     "market_list": "Lista de mercado",
     "loading": "Cargando…",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "Cambiar método de pago",
+      "add_funds": "Agregar fondos",
+      "add": "Agregar",
+      "predict_balance": "Predecir saldo"
+    },
     "order": {
       "available": "Disponible",
       "cashed_out": "Cobrado",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "El mercado se mueve rápido, así que no pudimos comprar a {{price}}. ¿Quieres volver a intentarlo al mejor precio disponible?",
       "market_busy_body_sell": "El mercado se mueve rápido, así que no pudimos vender a {{price}}. ¿Quieres volver a intentarlo al mejor precio disponible?",
       "order_failed_title": "Orden fallida",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "No se pudo completar tu orden. ¿Intentar de nuevo?",
+      "price_changed_title": "El precio cambió",
+      "price_changed_body": "No se pudo comprar a {{price}}. ¿Intentar al precio de mercado?",
       "retry": "Reintentar",
       "try_again": "Inténtalo de nuevo",
       "view": "Ver",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "Retiro finalizado",
       "withdraw_completed_subtitle": "Se han transferido {{amount}} USDC a tu billetera",
       "withdraw_any_token_completed_subtitle": "Se transfirieron {{amount}} {{token}} a tu billetera",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "Entendido",
       "error_title": "Algo salió mal",
       "error_description": "No se pudo proceder con el retiro",
       "try_again": "Inténtalo de nuevo"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "Se necesita {{tokenSymbol}} para continuar",
     "fund_your_wallet": "Deposita fondos en tu billetera",
     "get_ready_for_web3": "Prepara tu billetera para usar web3",
+    "home_onboarding_steps": {
+      "header": "Pasos",
+      "get_started_title": "Comienza en MetaMask",
+      "fund_title": "Deposita fondos en tu billetera",
+      "fund_subtitle": "A nadie le gusta una billetera vacía. Agrega fondos fácilmente para comenzar a operar.",
+      "fund_primary": "Agregar fondos",
+      "trade_title": "Haz tu primera operación",
+      "trade_subtitle": "Opera con tokens de tendencia en varias redes para hacer crecer tu portafolio.",
+      "trade_primary": "Operar",
+      "notifications_title": "Activar las notificaciones",
+      "notifications_subtitle": "Mantente al día con los cambios del mercado para tomar las mejores decisiones para tu portafolio.",
+      "notifications_primary": "Activar",
+      "skip": "Omitir",
+      "progress_a11y": "Paso {{current}} de {{total}}",
+      "balance_loading_a11y": "Cargando saldo de la billetera"
+    },
     "add_funds": "Agregar fondos",
     "next": "Siguiente",
     "buy_asset": "Comprar {{asset}}",
@@ -2826,10 +2893,10 @@
     "terms": "Términos y condiciones"
   },
   "privacy_policy": {
-    "title": "de privacidad de Transak",
+    "title": "Política de privacidad",
     "fine_print_1": "Le informaremos si decidimos usar estos datos para otros fines. Puede consultar nuestra",
     "fine_print_2": "para más información. Recuerde que puede ir a la configuración y optar por excluirse en cualquier momento.",
-    "privacy_policy_button": "de privacidad de Transak",
+    "privacy_policy_button": "Política de privacidad",
     "agree": "Acepto",
     "decline": "No, gracias",
     "description_title": "Mejorar MetaMask",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "Número no válido. Escriba un número entre 1 y %{maxSafeChainId}.",
     "hide_zero_balance_tokens_title": "Ocultar tokens sin saldo",
     "hide_zero_balance_tokens_desc": "Al ocultar los tokens sin saldo, estos no aparecerán en su lista de tokens.",
+    "haptic_feedback_title": "Respuesta háptica",
+    "haptic_feedback_desc": "Siente vibraciones sutiles para confirmaciones, errores e interacciones. Desactívala para reducir los estímulos hápticos.",
     "token_detection_title": "Detectar tókenes automáticamente",
     "token_detection_description": "Usamos API de terceros para detectar y mostrar nuevos tokens enviados a su monedero. Desactívelo si no desea que la aplicación extraiga datos de esos servicios.",
     "theme_button_text": "Cambiar tema",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "Más confiable",
         "quote_unknown_provider": "Proveedor desconocido",
         "start_headless_buy": "Comenzar compra headless",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "Reemplazar e iniciar compra sin interfaz",
         "start_headless_buy_disabled_hint": "Ingresa una cantidad válida para habilitar",
         "start_headless_buy_pending": "Sesión headless activa — abre BuildQuote",
         "cancel_headless_buy": "Cancelar sesión headless",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "Sesión activa: {{sessionId}} — iniciar otra cotización la cancelará.",
         "event_log_title": "Registro de eventos",
         "event_log_empty": "Aún no hay eventos; inicia una sesión headless y mantente atento.",
         "event_log_started": "sesión iniciada {{sessionId}} (asset={{assetId}}, amount={{amount}}, pago={{paymentMethodId}}{{providerSuffix}})",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "sesión {{sessionId}} cancelada por el usuario"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "Compra sin interfaz",
+        "loading": "Preparando el flujo de compra…",
+        "no_session": "La sesión sin interfaz ya no está activa.",
+        "cancel": "Cancelar"
       }
     },
     "request_feature": "Solicitar una función",
@@ -3553,7 +3622,7 @@
     "security_alerts": "Alertas de seguridad",
     "security_alerts_desc": "Esta función le alerta sobre actividad maliciosa al revisar localmente sus solicitudes de transacción y firma. Haga siempre su propia diligencia debida antes de aprobar cualquier solicitud. No hay garantía de que esta función detecte toda la actividad maliciosa. Al activar esta función, acepta los términos de uso del proveedor.",
     "smart_account_dapp_requests_heading": "Solicitudes de cuentas inteligentes desde dapps",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "Permite que las dapps soliciten funciones de cuenta inteligente para cuentas estándar. MetaMask solo se actualizará a nuestra cuenta inteligente auditada.",
     "smart_transactions_opt_in_heading": "Transacciones inteligentes",
     "smart_transactions_opt_in_desc_supported_networks": "Active las transacciones inteligentes para realizar transacciones más confiables y seguras en las redes compatibles.",
     "smart_transactions_learn_more": "Conozca más",
@@ -3572,6 +3641,39 @@
         "title": "Tarjeta",
         "reset_onboarding_description": "Restablecer el estado de incorporación de la tarjeta para iniciar el proceso de incorporación desde el principio.",
         "reset_onboarding_button": "Restablecer estado de incorporación"
+      },
+      "haptics": {
+        "title": "Háptica",
+        "description": "Previsualiza la respuesta háptica en un dispositivo físico. Esto omite la reducción de la respuesta háptica dentro de la aplicación y el botón de desactivación remota, para que puedas evaluar cada patrón. Los simuladores no suelen reproducir la respuesta háptica.",
+        "catalog_impacts_heading": "Catalogar momentos de impacto",
+        "notifications_heading": "Patrones de notificación",
+        "selection_heading": "Selección",
+        "notification_success_button": "Notificación: Correcta",
+        "notification_error_button": "Notificación: Error",
+        "notification_warning_button": "Notificación: Advertencia",
+        "selection_button": "Selección",
+        "raw_impacts_heading": "Estilos de impacto puros de Expo",
+        "raw_impacts_desc": "Estilos de impacto directos de expo-haptics para comparar con los momentos del catálogo mapeados anteriormente.",
+        "impacts": {
+          "quick_amount_selection": "Impacto: Selección rápida de monto",
+          "slider_tick": "Impacto: Marca del control deslizante",
+          "edge_gesture_engage": "Impacto: Activación del gesto desde el borde",
+          "page_navigation": "Impacto: Navegación por páginas",
+          "slider_grip": "Impacto: Agarre del control deslizante",
+          "tab_change": "Impacto: Cambio de pestaña",
+          "primary_cta": "Impacto: CTA principal",
+          "pull_to_refresh_engage": "Impacto: Deslizar para actualizar (activar)",
+          "pull_to_refresh": "Impacto: Deslizar para actualizar (soltar)",
+          "chart_crosshair": "Impacto: Puntero de gráfico",
+          "follow_toggle": "Impacto: Alternar seguimiento"
+        },
+        "raw_styles": {
+          "light": "Impacto puro: Ligero",
+          "medium": "Impacto puro: Medio",
+          "heavy": "Impacto puro: Fuerte",
+          "rigid": "Impacto puro: Rígido",
+          "soft": "Impacto puro: Suave"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "Predicciones",
     "add_collectible_button": "Agregar",
     "info": "Información",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "Canjear",
     "convert": "Convertir",
     "bridge": "Puentear",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "Solucionar problemas",
     "deposit_description": "Transferencia bancaria o con tarjeta con tarifas bajas",
     "buy_description": "Ideal para comprar un token específico",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "Vender cripto por dinero en efectivo",
     "swap_description": "Cambiar entre tokens",
     "bridge_description": "Transferir tokens entre redes",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "Gratis",
     "tx_details_not_available": "No disponible",
     "smart_contract_interaction": "Interacción con el contrato inteligente",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "Depositar en cuenta Finanzas",
+    "money_account_withdraw": "Transferir desde cuenta Finanzas",
     "swaps_transaction": "Transacción de intercambios",
     "bridge_transaction": "Puentear",
     "approve": "Aprobar",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "OBTÉN {{percentage}} % EN\nMONEDAS ESTABLES",
-        "description": "Convierte tus monedas estables a mUSD y gana hasta un {{percentage}} % de bono anualizado que puedes reclamar diariamente.",
+        "description": "Convierte tus monedas estables a mUSD y gana un bono anualizado del {{percentage}} %.",
         "terms_apply": "Se aplican términos y condiciones.",
         "primary_button": "Comenzar",
-        "secondary_button": "Ahora no"
+        "secondary_button": "Ahora no",
+        "checklist": {
+          "dollar_backed": "Respaldado por dólares",
+          "no_lockups": "Sin bloqueos",
+          "daily_bonus": "Bono diario",
+          "metamask_stablecoins": "Monedas estables de MetaMask",
+          "no_metamask_fee": "Sin tarifa de MetaMask"
+        }
       },
       "buy_musd": "Comprar mUSD",
       "get_musd": "Obtener mUSD",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Money",
+    "your_balance": "Su saldo",
     "apy_label": "{{percentage}} % de APY",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "Información de APY",
     "onboarding": {
       "step_progress": "Paso {{current}} de {{total}}",
       "title": "Agregar dinero",
-      "description": "Compra mUSD y comienza a ganar APY hoy mismo.",
+      "description": "Deposita fondos en tu cuenta y empieza a ganar APY.",
       "add": "Agregar",
       "step2_title": "Obtén tu tarjeta MetaMask",
       "step2_description": "Gasta tu saldo de Money mientras genera ganancias, en cualquier lugar donde se acepte Mastercard.",
@@ -6497,22 +6611,32 @@
       "card": "Tarjeta"
     },
     "earnings": {
-      "title": "Ganancias",
-      "lifetime": "Ganancias totales",
-      "projected": "Ganancias proyectadas"
+      "title": "Ganancias estimadas",
+      "estimated_monthly": "Mensual",
+      "estimated_yearly": "Anuales",
+      "info_label": "Información sobre ganancias"
     },
     "how_it_works": {
       "title": "Cómo funciona",
-      "description_prefix": "Mantén mUSD en tu cuenta Finanzas y gana automáticamente",
-      "description_suffix": ". Es un activo respaldado por el dólar, siempre líquido y disponible para gastar, operar o enviar en cualquier momento."
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "Agregar"
     },
+    "balance_card": {
+      "label": "Saldo de Finanzas",
+      "add": "Agregar",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "Gana con tus criptomonedas",
       "description": "Descubre cómo tu dinero puede crecer con el tiempo al convertir tus criptomonedas a mUSD.",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "Convertir",
+      "convert_cta": "Convert your crypto",
       "no_fee": "Sin tarifa de MetaMask",
       "view_all": "Ver todo",
       "view_potential_earnings": "Ver ganancias potenciales"
@@ -6522,37 +6646,75 @@
       "subtitle": "Gasta tu dinero en cualquier lugar.",
       "virtual_card": "Tarjeta Virtual",
       "metal_card": "Tarjeta Metal",
-      "cashback": "{{percentage}} % de cashback",
+      "cashback": "{{percentage}} % de mUSD de cashback",
       "get_now": "Obtener ahora",
       "link_title": "Vincular la tarjeta MetaMask",
-      "link_subtitle": "Gasta tu saldo y gana.",
-      "link_bullet_cashback": "Hasta 3% de cashback",
-      "link_bullet_apy": "Hasta {{apy}} % de APY",
-      "link_card": "Vincular tarjeta"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "Vincular tarjeta",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "Lo que obtienes",
-      "benefit_auto_earn": "Ganancias automáticas ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "Mantén tu dinero seguro en mUSD, una moneda estable respaldada por el dólar en una proporción de 1:1",
       "benefit_liquidity": "Obtén liquidez total sin bloqueos, para que puedas operar o retirar fondos en cualquier momento",
       "benefit_spend_prefix": "Gasta en más de 150 millones de comercios con la tarjeta MetaMask y gana ",
-      "benefit_spend_cashback": "1-3 % de cashback",
-      "benefit_transfer": "Transfiere dinero a cualquiera de tus billeteras en MetaMask",
-      "benefit_global": "Envía y recibe dinero a nivel mundial",
+      "benefit_spend_cashback": "1-3 % de mUSD de cashback",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "Conozca más"
     },
     "footer": {
-      "add_money": "Agregar dinero"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "Agregar dinero",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "Convertir criptomonedas",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "Depositar fondos",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "Recibir desde una billetera externa",
       "coming_soon": "Próximamente"
     },
+    "more_sheet": {
+      "title": "Más",
+      "how_it_works": "Cómo funciona",
+      "what_you_get": "Lo que obtienes",
+      "contact_support": "Contactar a soporte"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "Entre cuentas",
+      "perps_account": "Cuenta de Perps",
+      "predictions_account": "Cuenta de Predicciones",
+      "send_external": "Enviar a una dirección externa",
+      "withdraw_to_bank": "Retirar a un banco"
+    },
+    "apy_tooltip": {
+      "title": "Rendimiento porcentual anual (APY)",
+      "paragraph_1": "Tu cuenta Finanzas gana hasta un {{percentage}} % automáticamente.",
+      "paragraph_2": "La tasa indicada es un rendimiento porcentual anual (APY) estimado basado en las condiciones actuales del mercado. El APY es variable y puede cambiar debido a diversos factores. La tasa es generada por plataformas DeFi de terceros que despliegan fondos en protocolos de cadena de bloques.",
+      "paragraph_3": "Cuando vincules tu tarjeta MetaMask, las compras se descontarán de este saldo."
+    },
+    "earnings_tooltip": {
+      "title": "Ganancias estimadas",
+      "body": "Una estimación de cuánto podrías ganar durante un período determinado, basada en tu saldo actual y el APY de hoy. Las estimaciones no son rendimientos garantizados y están sujetas a cambios."
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "Actividad",
       "view_all": "Ver todo",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "Money",
       "section_title": "Cómo funciona",
-      "description_1": "Tu cuenta Money genera automáticamente un 4% de APY (variable). Los fondos se asignan a una bóveda DeFi curada que obtiene rendimientos en distintos mercados de préstamo auditados, sin staking, sin necesidad de reclamar recompensas y sin períodos de bloqueo.",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "Tu saldo Money es tu saldo para gastar. Vincula tu tarjeta MetaMask para comprar en más de 150 millones de comercios en todo el mundo. Tu dinero sigue generando intereses hasta el momento en que lo uses.",
-      "faq_title": "Preguntas frecuentes",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "Próximamente.",
-      "faq_q1": "¿Qué es la cuenta Money?",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "¿Qué es mUSD?",
       "faq_q3": "¿De dónde proviene el rendimiento?",
       "faq_q4": "¿Mi dinero está bloqueado? ¿Puedo retirarlo en cualquier momento?",
@@ -6608,8 +6770,7 @@
       "faq_q7": "¿Cambia la tasa APY?",
       "faq_q8": "¿Es una cuenta de ahorros o una cuenta de gastos?",
       "faq_q9": "¿Quién controla mi dinero?",
-      "faq_q10": "¿Qué reembolso obtengo con la tarjeta MetaMask?",
-      "sounds_good": "Me parece bien"
+      "faq_q10": "¿Qué cashback en mUSD obtengo con la tarjeta MetaMask?"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "Cancelar",
     "confirm": "Confirmar",
+    "pay_with_bottom_sheet": {
+      "title": "Pagar con",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "Al continuar, acepta nuestros ",
       "terms_of_use": "Términos de uso",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "Retirar",
       "predict_deposit": "Añadir fondos de Predicciones",
       "predict_withdraw": "Retirar",
-      "money_account_deposit": "Agregar fondos",
-      "money_account_withdraw": "Retirar fondos"
+      "money_account_add_money": "Agregar dinero",
+      "money_account_transfer_money": "Transferir dinero"
     },
     "sub_title": {
       "permit": "Este sitio necesita permiso para gastar sus tokens.",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "Canjearemos tus tokens por USDC en HyperCore, la red que usan los contratos perpetuos. Los proveedores de canje pueden cobrar una comisión, pero MetaMask no."
       },
       "predict_deposit": {
-        "transaction_fee": "Canjearemos tus tokens por USDC en Polygon, la red que usa Predicciones. Los proveedores de canje pueden cobrar una comisión, pero MetaMask no."
+        "transaction_fee": "Canjearemos tus tokens por pUSD en Polygon, la red que usa Predicciones. Los proveedores de canje pueden cobrar una comisión, pero MetaMask no."
       },
       "perps_withdraw": {
         "transaction_fee": "MetaMask realizará el canje por el token que desees. No se aplica ninguna tarifa de MetaMask al canjear a mUSD."
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "Las tarifas de conversión a mUSD incluyen costos de red y pueden incluir tarifas del proveedor. No se aplica ninguna tarifa de MetaMask al convertir a mUSD."
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "Tarifas"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "Comprar criptomonedas",
       "buy_predict": "Añade fondos a tu billetera para utilizar Predicciones.",
-      "buy_perps": "Añade fondos a tu billetera para usar Perps."
+      "buy_perps": "Añade fondos a tu billetera para usar Perps.",
+      "projected_five_year_balance": "Saldo proyectado a 5 años:"
     },
     "unlimited": "Ilimitado",
     "all": "Todo",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "Continuar",
     "deposit_edit_amount_done": "Agregar fondos",
     "deposit_edit_amount_predict_withdraw": "Retirar",
-    "deposit_edit_amount_musd_conversion": "Convertir a mUSD"
+    "deposit_edit_amount_musd_conversion": "Convertir a mUSD",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "Los resultados cambiaron",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "Canjear",
     "terms_and_conditions": "Términos y condiciones",
     "select_token": "Seleccione un token",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "No se encontraron tokens",
     "no_tokens_found_description": "No encontramos ningún token con este nombre. Prueba con otra búsqueda.",
     "select_network": "Seleccionar red",
@@ -7115,6 +7303,7 @@
     "receive_at": "Recibir en",
     "recipient": "Destinatario",
     "select_recipient": "Seleccionar destinatario",
+    "select_account": "Selecciona una cuenta",
     "external_account": "Cuenta externa",
     "error_banner_description": "Esta ruta de operación no está disponible en este momento. Intente cambiar el monto, la red o el token y encontraremos la mejor opción.",
     "stock_token_error_banner_description": "Esta ruta de intercambio no está disponible en este momento. Intenta cambiar la cantidad, la red o el token y encontraremos la mejor opción.\n\nTen en cuenta que si intentas operar con acciones tokenizadas de Ondo, podrías estar sujeto a restricciones geográficas, por ejemplo, en EE. UU., la UE, el Reino Unido y Brasil.",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "Alto impacto en el precio",
     "price_impact_error_title": "Impacto muy alto en el precio",
     "price_impact_error_description": "Perderás aproximadamente {{priceImpact}} del precio de mercado de tu token en este canje. Prueba con una operación más pequeña o una ruta con mayor liquidez para mejorar tu tasa.",
+    "insufficient_native_reserve_cta": "Usar máximo permitido",
+    "insufficient_native_reserve_message": "Esta red requiere que permanezcan al menos {{minimumReserve}} {{ticker}} en tu cuenta. Puedes usar un máximo de {{maxSwappable}} {{ticker}}",
+    "insufficient_native_reserve_title": "Se requiere un saldo mínimo de reserva de {{ticker}}",
     "token_warning_suspicious_banner": "{{token}} es un token sospechoso.",
     "token_warning_malicious_banner": "{{token}} es un token malicioso. Ten cuidado al interactuar con este token.",
     "token_warning_modal_suspicious_title": "Token sospechoso",
@@ -7307,7 +7499,7 @@
     "srps_description": "Tu billetera está más protegida cuando se configuran ambos métodos de recuperación. Si uno falla, el otro te ayuda a recuperar tu billetera."
   },
   "backupAndSync": {
-    "title": "Copia de respaldo y sincronización",
+    "title": "Copia de respaldo y sinc.",
     "description": "Realice una copia de respaldo de sus cuentas y sincronice la configuración.",
     "enabling": "Activar la copia de respaldo y la sincronización",
     "disabling": "Desactivar la copia de respaldo y la sincronización",
@@ -7542,17 +7734,17 @@
         "price": "Gratis",
         "feature_1": "Tarjeta virtual para Apple Pay y Google Pay",
         "feature_2": "Paga con criptomonedas (USDC, USDT, WETH y más)",
-        "feature_3": "1 % de cashback en USDC en cada compra"
+        "feature_3": "1 % de cashback en mUSD en cada compra"
       },
       "metal_card": {
         "name": "Tarjeta Metal",
         "price": "$199/año",
         "everything_in_virtual": "Todo lo que ofrece la versión virtual, más:",
         "feature_1": "Tarjeta metálica grabada premium",
-        "feature_2": "3 % de cashback en los primeros $10.000/año",
+        "feature_2": "3 % de cashback en mUSD en los primeros $10.000/año",
         "feature_3": "Sin tarifas por transacciones internacionales"
       },
-      "earn_up_to_badge": "Gana hasta $300 en cashback al año",
+      "earn_up_to_badge": "Gana hasta $300 de cashback en mUSD al año",
       "upgrade_to_metal_label": "O actualiza a Metal para obtener 3 veces más recompensas"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "TU TARJETA\nHA SIDO SOLICITADA",
       "subtitle": "Debería llegar en un plazo de 4 a 6 semanas.",
-      "description": "Configura tu tarjeta virtual y añádela a tu billetera digital para comenzar a ganar cashback.",
+      "description": "Configura tu tarjeta virtual y añádela a tu billetera digital para comenzar a ganar cashback en mUSD.",
       "set_up_card_button": "Configurar tarjeta",
       "back_to_card_button": "Volver a la tarjeta"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "Gasta\ny gana",
-      "description": "La tarjeta MetaMask es la forma rápida y\nfácil de gastar tus criptomonedas y\nganar hasta un 3 % de cashback.",
+      "description": "La tarjeta MetaMask es la forma rápida y\nfácil de gastar tus criptomonedas y\nganar hasta un 3 % de cashback en mUSD.",
       "apply_now_button": "Configurar ahora",
       "login_button": "Iniciar sesión",
       "not_now_button": "Ahora no",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "Habilitar tarjeta",
       "enable_assets_button_label": "Habilitar activos",
       "spending_limit_warning": "Estás cerca de tu límite de gasto. Actualiza tu cuenta para evitar rechazos.",
+      "spending_limit_available": "disponible",
       "logout": "Cerrar sesión",
       "contact_support": "Contactar a soporte",
       "logout_confirmation_title": "¿Cerrar sesión en Card?",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "Términos y condiciones",
         "order_metal_card": "Tarjeta Metal",
         "order_metal_card_description": "Solicita ya tu tarjeta Metal física",
-        "cashback": "Cashback",
-        "cashback_description": "Obtén 1 % de cashback en todas tus compras",
-        "cashback_description_metal": "Obtén 3 % de cashback en todas tus compras",
+        "cashback": "Cashback en mUSD",
+        "cashback_description": "Gana 1 % de cashback en mUSD en todos tus gastos",
+        "cashback_description_metal": "Gana 3 % de cashback en mUSD en todos tus gastos",
         "freeze_card": "Tarjeta suspendida",
         "unfreeze_card": "Reactivar la tarjeta",
         "freeze_card_description": "Pausa todos los gastos de tu tarjeta",
@@ -7917,8 +8110,8 @@
       "token_label": "Token"
     },
     "cashback_screen": {
-      "title": "Cashback",
-      "available_cashback": "Cashback disponible",
+      "title": "Cashback en mUSD",
+      "available_cashback": "mUSD disponibles",
       "network_fee": "Tarifa de red",
       "expected_to_receive": "Se espera recibir",
       "withdraw": "Retirar",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "Se ha iniciado el retiro",
       "withdrawal_success": "Retiro finalizado correctamente",
       "withdrawal_failed": "Retiro fallido. Inténtalo de nuevo.",
-      "no_cashback": "No hay cashback disponible",
-      "loading_error": "Error al cargar el cashback. Inténtalo de nuevo."
+      "no_cashback": "No hay cashback en mUSD disponible",
+      "loading_error": "Error al cargar el cashback en mUSD. Inténtalo de nuevo.",
+      "funding_required": {
+        "title": "Configurar financiación en Linea",
+        "description": "Necesitas al menos una fuente de financiación aprobada en Linea antes de canjear el cashback en mUSD.",
+        "confirm_button_label": "Configurar financiación"
+      }
     },
     "change_asset": {
       "title": "Cambiar token y red",
@@ -8032,7 +8230,8 @@
     "title": "Seleccionar método de pago",
     "title_receive": "Seleccionar el token a recibir",
     "no_gas": "No hay saldo nativo para gas",
-    "not_supported": "No compatible"
+    "not_supported": "No compatible",
+    "crypto": "Cripto"
   },
   "connection_removed_modal": {
     "title": "Conexiones eliminadas",
@@ -8048,6 +8247,15 @@
       "title": "Error al registrarte",
       "description": "Comprueba tu conexión y vuelve a intentarlo."
     },
+    "notifications_nudge": {
+      "title": "No te lo pierdas",
+      "description": "Activa las notificaciones para mantenerte al tanto de las campañas.",
+      "turn_on_button": "Activar",
+      "loading": "Activando notificaciones...",
+      "loading_description": "Esto puede tardar un momento.",
+      "enable_error": "Error al activar las notificaciones",
+      "success": "Notificaciones activadas"
+    },
     "version_guard": {
       "title": "Se requiere una actualización",
       "description": "Se requiere una versión más reciente de MetaMask para usar Recompensas. Actualiza para continuar.",
@@ -8126,6 +8334,17 @@
       "retry_button": "Reintentar"
     },
     "main_title": "Recompensas",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "Referidos",
     "referral_stats_earned_from_referrals": "Ganancias por referidos",
     "referral_stats_referrals": "Recomendados",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "Potenciadores activos",
     "season_1": "Temporada 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "Calculadora del bono en mUSD",
-      "description": "Descubre cuánto podrías ganar al convertir tus monedas estables a mUSD.",
-      "amount_label": "Monto convertido",
-      "estimated_bonus": "Bono anualizado estimado: hasta 3 %",
-      "initial_amount": "Monto inicial",
-      "daily_bonus": "Bono diario reclamable",
-      "annualized_bonus": "Bono anualizado",
-      "disclaimer": "Esto es solo una estimación. El bono está sujeto a cambios.",
-      "disclaimer_brief": "El bono es una estimación y puede variar.",
+      "page_title": "Calculadora de mUSD",
+      "hero_hold": "Mantener mUSD.",
+      "hero_earn": "Ganar",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/año",
+      "earnings_per_month_suffix": "/mes",
+      "earnings_per_day_suffix": "/día reclamables diariamente",
+      "slider_amount_label": "Cantidad",
+      "disclaimer_calculator": "Estimación basada en un bono del 3 %. La tasa puede cambiar. Reclamable en cualquier momento.",
       "buy_button": "Comprar mUSD",
       "swap_button": "Canjear por mUSD"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "Termina el {{date}}",
       "ended_date": "Finalizó el {{date}}",
       "pill_up_next": "Próximamente",
+      "up_next": "A continuación",
+      "notify_me": "Notificarme",
       "pill_active": "En vivo",
       "pill_complete": "Completado",
       "enter": "Participar",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "No está disponible en tu región",
       "geo_locked_toast_description": "Esta campaña no está disponible en tu ubicación. Vuelve más tarde para ver nuevas campañas.",
       "geo_locked_cta": "Verificar elegibilidad",
-      "geo_loading": "Comprobando región..."
+      "geo_loading": "Comprobando región...",
+      "remind_me_success_toast": "Te avisaremos cuando comience esta campaña.",
+      "remind_me_save_error": "No se pudo guardar tu recordatorio. Inténtalo de nuevo."
     },
     "campaign_mechanics": {
       "title": "Mecánica"
@@ -8479,10 +8701,10 @@
       "qualified_description": "Aumenta tus flujos netos de entrada para alcanzar un nivel más alto y tener la oportunidad de obtener un pago mayor.",
       "not_eligible_title": "No elegible",
       "not_eligible_description": "Las operaciones abiertas demasiado tarde para cumplir con el requisito de retención de {{days}} días no se contabilizarán para tu rango o nivel.",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "Participantes totales",
+      "completed_label_total_tvl": "TVL total",
+      "completed_label_top_return": "Mayor rendimiento",
+      "completed_label_winners": "Ganadores"
     },
     "ondo_campaign_activity": {
       "title": "Toda la actividad",
@@ -8508,6 +8730,48 @@
       "cancel": "Cancelar",
       "confirm": "Comprendo"
     },
+    "perps_trading_campaign": {
+      "title": "Concurso de trading de contratos perpetuos",
+      "stats_title": "Estadísticas",
+      "performance_title": "Desempeño",
+      "label_rank": "Rango",
+      "label_your_rank": "Tu rango",
+      "label_pnl": "P&L",
+      "label_volume": "Volumen",
+      "label_notional_volume": "Volumen nocional",
+      "pending": "Pendiente",
+      "qualified": "Clasificado",
+      "open_position_cta": "Posición abierta",
+      "leaderboard_title": "Clasificación",
+      "leaderboard_total_participants": "{{count}} participantes",
+      "last_updated": "Última actualización: {{time}}",
+      "leaderboard_error_loading": "Error al cargar la clasificación",
+      "leaderboard_error_loading_description": "Se produjo un error al cargar la clasificación. Inténtalo de nuevo.",
+      "leaderboard_not_yet_computed": "La clasificación aún no se ha calculado. Vuelve pronto.",
+      "leaderboard_powered_by_prefix": "Impulsado por ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "Fondo de premios",
+      "prize_pool_current_label": "Actual",
+      "prize_pool_next_label": "Siguiente",
+      "prize_pool_volume_subtext": "{{current}} de {{target}} de volumen",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}}+ de volumen: todos los hitos alcanzados",
+      "prize_pool_max_badge": "Máx.",
+      "prize_pool_error_title": "Error al cargar el fondo de premios",
+      "prize_pool_error_description": "Se produjo un error al cargar el fondo de premios. Inténtalo de nuevo.",
+      "prize_pool_retry_button": "Reintentar",
+      "stats_notional_volume_threshold": "Se requiere ${{amount}}",
+      "stats_qualified_title": "Estás calificado",
+      "stats_qualified_description": "Sigue operando para mejorar tu P&L (ganancias y pérdidas) y subir en la clasificación antes de que termine la competencia.",
+      "stats_qualify_for_rank_title": "Califica para este rango",
+      "stats_qualify_for_rank_description": "Opera {{notionalRemaining}} más en volumen nocional para poder participar.",
+      "stats_error_title": "No se pueden cargar las estadísticas",
+      "stats_error_description": "Hubo un problema al cargar tus estadísticas. Inténtalo de nuevo.",
+      "stats_retry": "Reintentar",
+      "completed_label_total_participants": "Participantes totales",
+      "completed_label_total_volume": "Volumen total",
+      "completed_label_top_pnl": "Mejor P&L",
+      "completed_label_winners": "Ganadores"
+    },
     "campaigns_preview": {
       "title": "Campañas",
       "coming_soon": "Próximamente",
@@ -8532,29 +8796,29 @@
       "retry_button": "Reintentar",
       "refreshing": "Actualizando..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "Tú ganas",
       "rank_label": "{{place}} lugar",
-      "email_instructions": "Para reclamar tu premio, envía un correo electrónico a ondocampaign@consensys.net con tu código.",
+      "email_instructions": "Para reclamar tu premio, envía un correo electrónico a {{email}} con tu código.",
       "open_mail": "Abrir correo",
       "skip_for_now": "Omitir por ahora",
-      "mail_subject": "Reclamación de premio de la campaña de Ondo",
+      "mail_subject": "Reclamo de premio de {{campaignName}}",
       "mail_body": "Mi código ganador: {{code}}",
       "winning_code": "Código ganador",
       "close_a11y": "Cerrar"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "Tú ganas",
-        "description": "Reclama tu premio hoy mismo.",
-        "a11y": "Abrir detalles del ganador"
+        "title": "Tú ganas!",
+        "description": "Verifica tu código ganador y reclama tu premio hoy.",
+        "a11y": "Ver detalles"
       },
       "participant_pending": {
         "title": "La campaña terminó.",
         "description": "Estamos determinando los resultados. Vuelve a consultar pronto."
       },
       "participant_finalized": {
-        "title": "Los resultados de la campaña están en",
+        "title": "Los resultados de la campaña están en.",
         "description": "Esta vez no has ganado. Consulta la clasificación para ver en qué posición has quedado."
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "Tu recompensa está en camino; nos pondremos en contacto contigo en breve."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "Tú ganas 💰",
-        "description": "Reclama tu premio en la {{campaignName}}",
+        "description": "Reclama hoy tu premio de {{campaignName}}.",
         "cta": "Ver detalles"
       },
-      "participant_no_winner": {
-        "title": "Ya tenemos los resultados. 🏅",
-        "description": "Consulta tu clasificación en {{campaignName}}",
+      "non_winner": {
+        "title": "Ya tenemos los resultados 🏅",
+        "description": "Consulta tu clasificación en {{campaignName}}.",
         "cta": "Ver"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "Ganancias reclamadas",
       "predict_deposit": "Cuenta de Predict financiada",
       "predict_withdraw": "Retiro",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "Depositar en cuenta Finanzas",
+      "money_account_withdraw": "Transferir desde cuenta Finanzas",
       "default": "Detalles de la transacción"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "Explorar",
+    "crypto_movers": "Criptomonedas con mayor variación",
+    "perps_movers": "Contratos perpetuos con mayor variación",
     "trending_tokens": "Tendencias",
+    "crypto": "Cripto",
     "stocks": "Acciones",
     "price_change": "Cambio de precio",
     "all_networks": "Todas las redes",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 hora",
     "5_minutes": "5 minutos",
     "networks": "Redes",
+    "ecosystems": "Ecosistemas",
+    "ecosystems_subtitle": "Explora dApps, tokens y NFT en distintas cadenas con MetaMask Portfolio",
+    "all_sports": "Deportes populares",
+    "basketball": "Baloncesto",
+    "football": "Fútbol americano",
+    "soccer": "Fútbol",
+    "tennis": "Tenis",
+    "f1": "F1",
+    "golf": "Golf",
+    "all_sports_no_markets": "Aún no hay mercados abiertos en esta categoría. Vuelve pronto o elige otro deporte arriba.",
+    "load_more": "Cargar más",
     "sort_by": "Ordenar por",
     "volume": "Volumen",
     "market_cap": "Capitalización bursátil",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "Buscar tokens, sitios, URL",
     "cancel": "Cancelar",
     "perps": "Perps",
+    "rwa_perps_section": "Perps",
+    "macro_stocks_commodity_perps": "Perps",
+    "macro_pill_stocks": "Acciones",
+    "macro_pill_commodities": "Materias primas",
+    "rwa_pill_commodities": "Materias primas",
+    "rwa_pill_stocks": "Acciones",
+    "rwa_pill_forex": "Forex",
+    "crypto_perps_section": "Perps",
     "predictions": "Predicciones",
     "no_results": "No se encontraron resultados",
+    "popular": "Populares",
     "sites": "Sitios",
     "popular_sites": "Sitios populares",
     "search_sites": "Sitios de búsqueda",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "No se encontraron tokens",
       "description": "No pudimos encontrar este token"
+    },
+    "tabs": {
+      "now": "Ahora",
+      "macro": "Macro",
+      "rwas": "RWA",
+      "crypto": "Cripto",
+      "sports": "Deportes",
+      "dapps": "Sitios"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "Cancelar",
-      "continue": "Continuar"
+      "continue": "Continuar",
+      "learn_more": "Conozca más",
+      "try_again": "Inténtalo de nuevo"
     },
     "connecting": {
       "title": "Conectando tu {{device}}...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "Activa el Bluetooth para conectar tu dispositivo",
       "bluetooth_scan_failed": "Error al buscar dispositivos. Inténtalo de nuevo",
       "bluetooth_connection_failed": "Falló la conexión con tu dispositivo. Inténtalo de nuevo",
+      "camera_permission_denied": "Se requiere permiso de cámara para escanear códigos QR. Actívalo en la configuración de tu dispositivo",
       "not_supported": "No se admite esta operación",
       "unknown_error": "Asegúrate de que tu {{device}} esté configurado con la frase secreta de recuperación o la frase de contraseña de esta cuenta"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "Se requiere permiso de ubicación",
       "nearby_devices_permission_denied": "Se requiere permiso para dispositivos cercanos",
       "scan_failed": "Error al buscar",
+      "camera_permission_denied": "Se requiere permiso de cámara",
       "something_went_wrong": "Algo salió mal"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "Escanea el código QR de sincronización de billetera",
+          "body": "Vuelve a tu billetera física y busca la opción para compartir o exportar tus cuentas, elige MetaMask y luego escanea el código QR."
+        },
+        "sign": {
+          "title": "Escanea el código QR de firma",
+          "body": "Vuelve a tu billetera de hardware y aprueba la transacción, luego escanea el código QR que se muestra."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "Código QR incorrecto",
+          "body": "Vuelve a tu billetera física, elige MetaMask como tipo de billetera y luego genera y escanea un nuevo código QR."
+        },
+        "sign": {
+          "title": "Código QR incorrecto",
+          "body": "Vuelve a tu billetera de hardware y aprueba la transacción, luego escanea el código QR que se muestra."
+        }
+      },
+      "ur_decode_error": {
+        "title": "No se pudo leer el código QR",
+        "body": "Asegúrate de que el código QR esté completamente visible y bien iluminado, e inténtalo de nuevo. Si el problema continúa, es posible que debas actualizar el firmware de tu billetera física."
+      }
+    },
     "device_selection": {
       "title": "Seleccionar {{device}}",
       "scanning": "Buscando dispositivos...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Money",
-      "cash_empty_description": "Aún no tienes mUSD. Convierte monedas estables a mUSD desde la sección Finanzas en la página de inicio.",
-      "cash_empty_description_network_filter": "No hay mUSD en esta red. Cambia de red para ver tus mUSD.",
+      "money": "Money",
+      "money_empty_description": "Aún no tienes mUSD. Convierte monedas estables a mUSD desde la sección Finanzas en la página de inicio.",
+      "money_empty_description_network_filter": "No hay mUSD en esta red. Cambia de red para ver tus mUSD.",
+      "money_empty_state": {
+        "get_started": "Comenzar",
+        "earn_apy": "Gana un {{percentage}} % de APY"
+      },
+      "money_filled_state": {
+        "add": "Agregar",
+        "apy": "{{percentage}} % de APY"
+      },
       "tokens": "Tokens",
+      "perps": "Perps",
+      "related_assets": "Activos relacionados",
       "perpetuals": "Contratos perpetuos",
       "predictions": "Predicciones",
       "whats_happening": "Qué está pasando",
+      "whats_happening_ai": "IA",
+      "whats_happening_impact": {
+        "bullish": "Al alza",
+        "bearish": "A la baja",
+        "neutral": "Neutral"
+      },
       "top_traders": "Traders principales",
       "whats_happening_categories": {
         "geopolitical": "Geopolítico",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "No se pudo cargar {{section}}",
       "retry": "Reintentar"
     }
+  },
+  "sites": {
+    "popular": "Populares"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/fr.json b/locales/languages/fr.json
index 30a91234937..aa5651ea48c 100644
--- a/locales/languages/fr.json
+++ b/locales/languages/fr.json
@@ -634,7 +634,8 @@
     "trade": "Trader",
     "settings": "Paramètres",
     "rewards": "Récompenses",
-    "trending": "Explorer"
+    "trending": "Explorer",
+    "money": "Money"
   },
   "drawer": {
     "send_button": "Envoyer",
@@ -708,7 +709,11 @@
     "smart_contract_address": "Adresse du contrat intelligent",
     "smart_contract_address_warning": "L’adresse du destinataire ne prend peut-être pas en charge les transferts directs de jetons, ce qui pourrait entraîner une perte de fonds. Ne poursuivez que si vous êtes certain que ce contrat est capable de recevoir votre transfert.",
     "i_understand": "Je comprends",
-    "cancel": "Annuler"
+    "cancel": "Annuler",
+    "new_address_title": "Nouvelle adresse",
+    "new_address_message": "C’est la première fois que vous envoyez à cette adresse. Assurez-vous qu’elle est correcte avant de continuer :",
+    "alert_navigation_previous": "Alerte précédente",
+    "alert_navigation_next": "Alerte suivante"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "Meilleurs traders",
       "allow_push_notifications": "Autoriser les notifications push",
       "trades_over_label": "Recevez des notifications pour les ordres dépassant :",
       "traders_you_follow": "Traders que vous suivez",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "Impossible de charger la liste des traders que vous suivez."
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "Notifications de {{traderName}}",
       "allow_push_notifications": "Autoriser les notifications push",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "Recevez des notifications concernant l’activité de trading de {{traderName}}",
+      "manage_traders": "Gérer les traders que vous suivez",
       "save": "Sauvegarder"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "Recevez des alertes en temps réel sur les transactions des traders que vous suivez",
       "allow_push_notifications": "Autoriser les notifications push",
       "trades_over_label": "Recevez des notifications pour les ordres dépassant :",
       "save": "Sauvegarder",
@@ -1059,7 +1064,12 @@
       "closed": "Fermé",
       "no_positions": "Aucune position pour l’instant",
       "error_loading_profile": "Impossible de charger le profil",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "Voir sur X (Twitter)",
+      "sort": {
+        "value": "Valeur",
+        "pnl_percent": "Résultat %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "Capitalisation boursière",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} a vendu",
       "no_trades": "Aucun ordre pour cette période",
       "closed_position": "Position fermée",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "Position non disponible",
+      "fallback_subtitle": "Impossible de charger cette position actuellement.",
+      "fallback_back_to_profile": "Retour au profil",
+      "fallback_back_to_leaderboard": "Retour au classement"
     },
     "quick_buy": {
       "title": "Achetez {{symbol}}",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "Prédictions MetaMask",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "Marchés prédictifs",
     "market_list": "Liste des marchés",
     "loading": "Chargement…",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "Modifier le mode de paiement",
+      "add_funds": "Ajouter des fonds",
+      "add": "Ajouter",
+      "predict_balance": "Solde « Predict »"
+    },
     "order": {
       "available": "Disponible ",
       "cashed_out": "Encaissé",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "Le marché évolue rapidement, l’achat n’a pu être effectué au prix de {{price}}. Voulez-vous réessayer au meilleur prix disponible ?",
       "market_busy_body_sell": "Le marché évolue rapidement, la vente n’a pu être effectuée au prix de {{price}}. Voulez-vous réessayer au meilleur prix disponible ?",
       "order_failed_title": "L’exécution de l’ordre a échoué",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "Votre ordre n’a pas pu être exécuté. Voulez-vous réessayer ?",
+      "price_changed_title": "Le prix a changé",
+      "price_changed_body": "Impossible d’acheter à {{price}}. Voulez-vous essayer au prix du marché ?",
       "retry": "Réessayer",
       "try_again": "Réessayer",
       "view": "Afficher",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "Retrait effectué",
       "withdraw_completed_subtitle": "{{amount}} USDC transféré vers votre portefeuille",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}} transféré(s) vers votre portefeuille",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "J’ai compris",
       "error_title": "Quelque chose a mal tourné",
       "error_description": "Échec du retrait",
       "try_again": "Réessayez"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "{{tokenSymbol}} est requis pour continuer",
     "fund_your_wallet": "Déposez des fonds sur votre portefeuille",
     "get_ready_for_web3": "Préparez votre portefeuille pour utiliser web3",
+    "home_onboarding_steps": {
+      "header": "Étapes ",
+      "get_started_title": "Commencer avec MetaMask",
+      "fund_title": "Déposez des fonds sur votre portefeuille",
+      "fund_subtitle": "Personne n’aime avoir un portefeuille vide. Ajoutez facilement des fonds pour commencer à trader.",
+      "fund_primary": "Ajouter des fonds",
+      "trade_title": "Passez votre premier ordre de bourse",
+      "trade_subtitle": "Tradez des jetons tendance sur plusieurs réseaux pour élargir votre portefeuille.",
+      "trade_primary": "Trader",
+      "notifications_title": "Activer les notifications",
+      "notifications_subtitle": "Restez informé des évolutions du marché pour prendre des décisions d’investissement éclairées.",
+      "notifications_primary": "Activer",
+      "skip": "Ignorer",
+      "progress_a11y": "Étape {{current}} sur {{total}}",
+      "balance_loading_a11y": "Chargement du solde du portefeuille"
+    },
     "add_funds": "Ajouter des fonds",
     "next": "Suivant",
     "buy_asset": "Achetez {{asset}}",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "Numéro non valide. Saisissez un nombre compris entre 1 et %{maxSafeChainId}.",
     "hide_zero_balance_tokens_title": "Masquer les jetons sans solde",
     "hide_zero_balance_tokens_desc": "Empêche l’affichage des jetons sans solde dans votre liste de jetons.",
+    "haptic_feedback_title": "Retour haptique",
+    "haptic_feedback_desc": "Ressentez de légères vibrations pour les confirmations, les erreurs et les interactions. Désactivez cette fonction pour réduire les stimuli haptiques.",
     "token_detection_title": "Détection automatique des jetons",
     "token_detection_description": "Nous utilisons des API tierces pour détecter et afficher les nouveaux jetons envoyés à votre portefeuille. Désactivez cette option si vous ne souhaitez pas que l’application récupère les données de ces services.",
     "theme_button_text": "Changer le thème",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "Le plus fiable",
         "quote_unknown_provider": "Fournisseur inconnu",
         "start_headless_buy": "Lancer un achat en mode headless",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "Remplacer et effectuer un achat sans interface",
         "start_headless_buy_disabled_hint": "Saisissez un montant valide pour activer cette fonctionnalité",
         "start_headless_buy_pending": "Session headless active — ouvrir BuildQuote",
         "cancel_headless_buy": "Annuler la session headless",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "Session active : {{sessionId}} — le lancement d’une autre cotation l’annulera.",
         "event_log_title": "Journal des événements",
         "event_log_empty": "Aucun événement pour l’instant — lancez une session headless et surveillez cet espace.",
         "event_log_started": "session lancée {{sessionId}} (actif={{assetId}}, montant={{amount}}, paiement={{paymentMethodId}}{{providerSuffix}})",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "session annulée par le consommateur {{sessionId}}"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "Achat sans interface",
+        "loading": "Préparation du processus d’achat…",
+        "no_session": "La session sans interface n’est plus active.",
+        "cancel": "Annuler"
       }
     },
     "request_feature": "Demander une fonction",
@@ -3553,7 +3622,7 @@
     "security_alerts": "Alertes de sécurité",
     "security_alerts_desc": "Cette fonctionnalité vous avertit de toute activité malveillante en examinant localement vos demandes de transaction et de signature. Vous devez faire preuve de diligence raisonnable avant d’approuver toute demande. Rien ne garantit que toutes les activités malveillantes seront détectées par cette fonctionnalité. En l’activant, vous acceptez les conditions d’utilisation du fournisseur.",
     "smart_account_dapp_requests_heading": "Demandes de comptes intelligents émanant de dapps",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "Autorisez les dapps à demander des fonctionnalités de compte intelligent pour les comptes standards. MetaMask effectuera la mise à niveau uniquement vers notre compte intelligent audité.",
     "smart_transactions_opt_in_heading": "Transactions intelligentes",
     "smart_transactions_opt_in_desc_supported_networks": "Activez les transactions intelligentes pour profiter de transactions plus fiables et plus sûres sur les réseaux pris en charge.",
     "smart_transactions_learn_more": "En savoir plus",
@@ -3572,6 +3641,39 @@
         "title": "Card",
         "reset_onboarding_description": "Réinitialiser l’état d’intégration de « Card » pour recommencer le processus d’intégration depuis le début.",
         "reset_onboarding_button": "Réinitialiser l’état d’intégration"
+      },
+      "haptics": {
+        "title": "Retour haptique",
+        "description": "Prévisualisez les retours haptiques sur un appareil physique. Cela ignore les réglages de réduction des vibrations de l’application ainsi que l’interrupteur d’arrêt à distance (kill switch) afin que vous puissiez évaluer chaque modèle. Les simulateurs ne reproduisent souvent pas les vibrations.",
+        "catalog_impacts_heading": "Catalogue des moments d’impact",
+        "notifications_heading": "Modèles de notification",
+        "selection_heading": "Sélection",
+        "notification_success_button": "Notification — Opération réussie",
+        "notification_error_button": "Notification — Erreur",
+        "notification_warning_button": "Notification — Avertissement",
+        "selection_button": "Sélection",
+        "raw_impacts_heading": "Styles d’impacts bruts Expo",
+        "raw_impacts_desc": "Styles d’impacts haptiques Expo directs à comparer avec les moments du catalogue mappés ci-dessus.",
+        "impacts": {
+          "quick_amount_selection": "Impact — Sélection rapide du montant",
+          "slider_tick": "Impact — Graduation du curseur",
+          "edge_gesture_engage": "Impact — Activation du geste sur le bord",
+          "page_navigation": "Impact — Navigation entre les pages",
+          "slider_grip": "Impact — Prise en main du curseur",
+          "tab_change": "Impact — Changement d’onglet",
+          "primary_cta": "Impact — Appel à l’action principal",
+          "pull_to_refresh_engage": "Impact — Tirer pour actualiser (activation)",
+          "pull_to_refresh": "Impact — Tirer pour actualiser (relâcher)",
+          "chart_crosshair": "Impact — Réticule du graphique",
+          "follow_toggle": "Impact — Bouton de suivi"
+        },
+        "raw_styles": {
+          "light": "Impact brut — Léger",
+          "medium": "Impact brut — Moyen",
+          "heavy": "Impact brut — Fort",
+          "rigid": "Impact brut — Rigide",
+          "soft": "Impact brut — Doux"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "Prédictions",
     "add_collectible_button": "Ajouter",
     "info": "Infos",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "Échanger",
     "convert": "Convertir",
     "bridge": "Passerelle",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "Résoudre le problème",
     "deposit_description": "Virement bancaire ou par carte à frais réduits",
     "buy_description": "Convient pour acheter un jeton spécifique",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "Vendre des cryptomonnaies",
     "swap_description": "Échange de jetons",
     "bridge_description": "Transférer des jetons entre différents réseaux",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "Gratuit",
     "tx_details_not_available": "Non disponible",
     "smart_contract_interaction": "Interaction de contrats intelligents",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "Déposer sur le compte Money",
+    "money_account_withdraw": "Transférer depuis le compte Money",
     "swaps_transaction": "Transaction de swap",
     "bridge_transaction": "Passerelle",
     "approve": "Approuver",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "OBTENEZ {{percentage}} % SUR LES\nSTABLECOINS",
-        "description": "Convertissez vos stablecoins en mUSD et gagnez jusqu’à {{percentage}} % de bonus annualisé que vous pouvez réclamer quotidiennement.",
+        "description": "Convertissez vos stablecoins en mUSD et gagnez un bonus annualisé de {{percentage}} %.",
         "terms_apply": "Des conditions s’appliquent.",
         "primary_button": "Commencer",
-        "secondary_button": "Pas maintenant"
+        "secondary_button": "Pas maintenant",
+        "checklist": {
+          "dollar_backed": "Adossé au dollar",
+          "no_lockups": "Pas de blocage de fonds",
+          "daily_bonus": "Bonus quotidien",
+          "metamask_stablecoins": "Stablecoins MetaMask",
+          "no_metamask_fee": "Pas de frais MetaMask"
+        }
       },
       "buy_musd": "Acheter des mUSD",
       "get_musd": "Obtenir des mUSD",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Money",
+    "your_balance": "Votre solde",
     "apy_label": "Taux de rendement annuel de {{percentage}} %",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "Informations sur le taux de rendement annuel",
     "onboarding": {
       "step_progress": "Étape {{current}} sur {{total}}",
       "title": "Ajouter de l’argent",
-      "description": "Achetez des mUSD et commencez dès aujourd’hui à bénéficier d’un taux de rendement annuel.",
+      "description": "Approvisionnez votre compte et commencez à percevoir un rendement annuel.",
       "add": "Ajouter",
       "step2_title": "Obtenez votre carte MetaMask Card",
       "step2_description": "Dépensez l’argent que vous avez déposé sur votre compte Money tout en le faisant fructifier, partout où la carte Mastercard est acceptée.",
@@ -6497,22 +6611,32 @@
       "card": "Carte"
     },
     "earnings": {
-      "title": "Bénéfices",
-      "lifetime": "Gains cumulés",
-      "projected": "Bénéfices prévus"
+      "title": "Gains estimés",
+      "estimated_monthly": "Mensuelle",
+      "estimated_yearly": "Annuel",
+      "info_label": "Informations sur les gains"
     },
     "how_it_works": {
       "title": "Comment ça marche ",
-      "description_prefix": "Conservez des mUSD sur votre compte « Money » et percevez automatiquement des revenus",
-      "description_suffix": ". Les mUSD sont adossés au dollar, toujours liquides et peuvent être dépensés, échangés ou transférés à tout moment."
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "Ajouter"
     },
+    "balance_card": {
+      "label": "Solde du compte Money",
+      "add": "Ajouter",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "Gagnez de l’argent grâce à vos crypto-monnaies",
       "description": "Découvrez comment votre argent peut fructifier au fil du temps en convertissant vos crypto-monnaies en mUSD.",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "Convertir",
+      "convert_cta": "Convert your crypto",
       "no_fee": "Pas de frais MetaMask",
       "view_all": "Tout afficher",
       "view_potential_earnings": "Afficher les gains potentiels"
@@ -6522,37 +6646,75 @@
       "subtitle": "Dépensez votre argent où vous voulez.",
       "virtual_card": "Carte virtuelle",
       "metal_card": "Carte Metal",
-      "cashback": "{{percentage}} % de cashback",
+      "cashback": "{{percentage}} % de cashback en mUSD",
       "get_now": "Obtenir maintenant",
       "link_title": "Associer une carte MetaMask Card",
-      "link_subtitle": "Utilisez votre solde Money pour effectuer des achats et gagnez de l’argent.",
-      "link_bullet_cashback": "Jusqu’à 3 % de cashback",
-      "link_bullet_apy": "Jusqu’à {{apy}} % de rendement annuel",
-      "link_card": "Associer une carte"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "Associer une carte",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "Ce que vous obtenez",
-      "benefit_auto_earn": "Percevez automatiquement des revenus ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "Sécurisez vos fonds en achetant des mUSD, un stablecoin adossé au dollar à un ratio de 1:1",
       "benefit_liquidity": "Profitez d’une liquidité totale sans période de blocage, vous pourrez ainsi trader ou retirer des fonds à tout moment",
       "benefit_spend_prefix": "Effectuez vos achats chez plus de 150 millions de commerçants avec la MetaMask Card et bénéficiez de ",
-      "benefit_spend_cashback": "1 à 3 % de cashback",
-      "benefit_transfer": "Transférez de l’argent vers n’importe lequel de vos portefeuilles via MetaMask",
-      "benefit_global": "Envoyez et recevez de l’argent partout dans le monde",
+      "benefit_spend_cashback": "1 à 3 % de cashback en mUSD",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "En savoir plus"
     },
     "footer": {
-      "add_money": "Ajouter de l’argent"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "Ajouter de l’argent",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "Convertir des crypto-monnaies",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "Déposer des fonds",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "Recevoir depuis un portefeuille externe",
       "coming_soon": "Bientôt disponible"
     },
+    "more_sheet": {
+      "title": "Plus",
+      "how_it_works": "Comment ça marche ",
+      "what_you_get": "Ce que vous obtenez",
+      "contact_support": "Contacter le service d’assistance"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "Entre comptes",
+      "perps_account": "Compte PERPS",
+      "predictions_account": "Compte « Prédictions »",
+      "send_external": "Envoyer à une adresse externe",
+      "withdraw_to_bank": "Retirer vers un compte bancaire"
+    },
+    "apy_tooltip": {
+      "title": "Taux de rendement annuel (APY)",
+      "paragraph_1": "Votre compte « Money » génère automatiquement un rendement allant jusqu’à {{percentage}} %.",
+      "paragraph_2": "Le taux indiqué est un taux de rendement annuel (APY) estimé, basé sur les conditions actuelles du marché. Le taux est variable et peut évoluer en fonction de divers facteurs. Le rendement est généré par des plateformes DeFi tierces qui déploient des fonds dans des protocoles blockchain.",
+      "paragraph_3": "Lorsque vous associez votre carte MetaMask Card, les achats seront déduits de ce solde."
+    },
+    "earnings_tooltip": {
+      "title": "Gains estimés",
+      "body": "Estimation du montant que vous pourriez gagner sur une période donnée, basée sur votre solde actuel et le taux de rendement annuel applicable aujourd’hui. Les estimations ne constituent pas des rendements garantis et sont susceptibles de changer."
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "Activité",
       "view_all": "Tout afficher",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "Money",
       "section_title": "Comment ça marche ",
-      "description_1": "Votre compte Money rapporte automatiquement 4 % de rendement annuel (variable). Les fonds sont placés dans un coffre-fort DeFi soigneusement sélectionné qui génère des rendements sur des marchés de prêt audités — sans staking, sans réclamation, sans blocage de fonds.",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "Le solde de votre compte Money correspond à votre solde disponible. Associez votre carte MetaMask Card pour effectuer des achats auprès de plus de 150 millions de commerçants dans le monde entier. Votre argent continue de générer des revenus jusqu’à ce que vous le dépensiez.",
-      "faq_title": "FAQ",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "Bientôt disponible.",
-      "faq_q1": "Qu’est-ce qu’un compte Money ?",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "Qu’est-ce que le mUSD ?",
       "faq_q3": "D’où provient le rendement ?",
       "faq_q4": "Mon argent est-il bloqué ? Puis-je effectuer un retrait à tout moment ?",
@@ -6608,8 +6770,7 @@
       "faq_q7": "Le taux de rendement annuel varie-t-il ?",
       "faq_q8": "S’agit-il d’un compte d’épargne ou d’un compte courant ?",
       "faq_q9": "Qui gère mon argent ?",
-      "faq_q10": "Quel cashback puis-je obtenir avec la carte MetaMask Card ?",
-      "sounds_good": "Ça a l’air intéressant"
+      "faq_q10": "Quel cashback en mUSD puis-je obtenir avec la carte MetaMask Card ?"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "Annuler",
     "confirm": "Confirmer",
+    "pay_with_bottom_sheet": {
+      "title": "Payer avec",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "En continuant, vous acceptez nos ",
       "terms_of_use": "Conditions d’utilisation",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "Retirer",
       "predict_deposit": "Ajouter des fonds de prédiction",
       "predict_withdraw": "Retirer",
-      "money_account_deposit": "Ajouter des fonds",
-      "money_account_withdraw": "Retirer des fonds"
+      "money_account_add_money": "Ajouter de l’argent",
+      "money_account_transfer_money": "Transférer de l’argent"
     },
     "sub_title": {
       "permit": "Ce site demande l’autorisation de dépenser vos jetons.",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "Nous échangerons vos jetons contre des USDC sur HyperCore, le réseau utilisé par les contrats à terme perpétuels. Les fournisseurs de services d’échange peuvent facturer des frais, mais MetaMask ne le fera pas."
       },
       "predict_deposit": {
-        "transaction_fee": "Nous échangerons vos jetons contre des USDC.e sur Polygon, le réseau utilisé par « Prédictions ». Les fournisseurs de services d’échange peuvent facturer des frais, mais MetaMask ne le fera pas."
+        "transaction_fee": "Nous échangerons vos jetons contre des pUSD sur Polygon, le réseau utilisé par « Prédictions ». Les fournisseurs de services d’échange peuvent facturer des frais, mais MetaMask ne le fera pas."
       },
       "perps_withdraw": {
         "transaction_fee": "MetaMask échangera vos jetons pour vous. Aucuns frais MetaMask ne s’appliquent lorsque vous effectuez un échange contre des mUSD."
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "Les frais de conversion en mUSD comprennent les coûts de réseau et peuvent inclure des frais de fournisseur. Aucuns frais MetaMask ne s’appliquent lorsque vous effectuez un échange contre des mUSD."
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "Frais"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "Acheter des cryptomonnaies",
       "buy_predict": "Ajoutez des fonds à votre portefeuille pour utiliser les Prédictions.",
-      "buy_perps": "Ajoutez des fonds à votre portefeuille pour utiliser les contrats à terme perpétuels."
+      "buy_perps": "Ajoutez des fonds à votre portefeuille pour utiliser les contrats à terme perpétuels.",
+      "projected_five_year_balance": "Solde prévu au bout de 5 ans :"
     },
     "unlimited": "Illimité",
     "all": "Tout",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "Continuer",
     "deposit_edit_amount_done": "Ajouter des fonds",
     "deposit_edit_amount_predict_withdraw": "Retirer",
-    "deposit_edit_amount_musd_conversion": "Convertir en mUSD"
+    "deposit_edit_amount_musd_conversion": "Convertir en mUSD",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "Les résultats ont changé",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "Échanger",
     "terms_and_conditions": "Conditions générales",
     "select_token": "Sélectionnez un jeton",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "Aucun jeton trouvé",
     "no_tokens_found_description": "Nous n’avons trouvé aucun jeton portant ce nom. Veuillez essayer un autre critère de recherche.",
     "select_network": "Sélectionnez le réseau",
@@ -7115,6 +7303,7 @@
     "receive_at": "Recevoir à",
     "recipient": "Destinataire",
     "select_recipient": "Sélectionner le destinataire",
+    "select_account": "Sélectionner un compte",
     "external_account": "Compte externe",
     "error_banner_description": "Cette voie d’échange n’est pas disponible pour le moment. Essayez de modifier le montant, le réseau ou le jeton, et nous trouverons la meilleure option.",
     "stock_token_error_banner_description": "Cette voie d’échange n’est pas disponible pour le moment. Essayez de modifier le montant, le réseau ou le jeton, et nous trouverons la meilleure option.\n\nVeuillez noter que si vous essayez d’échanger des actions tokenisées Ondo, vous pouvez être soumis à des restrictions géographiques imposées par les États-Unis, l’Union européenne, le Royaume-Uni, le Brésil ou d’autres pays.",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "Impact élevé sur le prix",
     "price_impact_error_title": "Impact très élevé sur le prix",
     "price_impact_error_description": "En effectuant cet échange, vous perdrez environ {{priceImpact}} du prix de marché de votre jeton. Essayez un montant plus petit ou une voie plus liquide pour améliorer votre taux de change.",
+    "insufficient_native_reserve_cta": "Utiliser le maximum autorisé",
+    "insufficient_native_reserve_message": "Ce réseau exige que vous mainteniez une réserve d’au moins {{minimumReserve}} {{ticker}} sur votre compte. Vous pouvez utiliser au maximum {{maxSwappable}} {{ticker}}",
+    "insufficient_native_reserve_title": "Solde minimum de réserve en {{ticker}} requis",
     "token_warning_suspicious_banner": "{{token}} est un jeton suspect.",
     "token_warning_malicious_banner": "{{token}} est un jeton malveillant. Soyez prudent lorsque vous interagissez avec ce jeton.",
     "token_warning_modal_suspicious_title": "Jeton suspect",
@@ -7542,17 +7734,17 @@
         "price": "Gratuit",
         "feature_1": "Carte virtuelle pour Apple Pay et Google Pay",
         "feature_2": "Payer avec des cryptomonnaies (USDC, USDT, WETH, etc.)",
-        "feature_3": "1 % de cashback en USDC sur chaque achat"
+        "feature_3": "1 % de cashback en mUSD sur chaque achat"
       },
       "metal_card": {
         "name": "Carte Metal",
         "price": "199 $/an",
         "everything_in_virtual": "Tout ce qu’offre la carte virtuelle, avec en plus :",
         "feature_1": "Une carte métallique gravée haut de gamme",
-        "feature_2": "3 % de cashback sur les premiers 10 000 $ que vous dépensez par an",
+        "feature_2": "3 % de cashback en mUSD sur les premiers 10 000 $ que vous dépensez par an",
         "feature_3": "Pas de frais de transaction à l’étranger"
       },
-      "earn_up_to_badge": "Gagnez jusqu’à 300 $ de cashback par an",
+      "earn_up_to_badge": "Gagnez jusqu’à 300 $ de cashback en mUSD par an",
       "upgrade_to_metal_label": "Ou passez à la carte Metal pour tripler vos récompenses"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "VOTRE CARTE\nA ÉTÉ COMMANDÉE",
       "subtitle": "Elle devrait arriver dans 4 à 6 semaines.",
-      "description": "Configurez votre carte virtuelle et ajoutez-la à votre portefeuille numérique pour commencer à gagner du cashback.",
+      "description": "Configurez votre carte virtuelle et ajoutez-la à votre portefeuille numérique pour commencer à gagner du cashback en mUSD.",
       "set_up_card_button": "Configurer la carte",
       "back_to_card_button": "Retour à « Card »"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "Dépensez\net gagnez",
-      "description": "MetaMask Card est un moyen de paiement rapide et facile à utiliser\nqui vous permet non seulement de dépenser vos cryptomonnaies,\nmais aussi de gagner jusqu’à 3 % de cashback.",
+      "description": "MetaMask Card est un moyen de paiement rapide et facile à utiliser\nqui vous permet non seulement de dépenser vos cryptomonnaies,\nmais aussi de gagner jusqu’à 3 % de cashback en mUSD.",
       "apply_now_button": "Configurer maintenant",
       "login_button": "Se connecter",
       "not_now_button": "Pas maintenant",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "Activer la carte",
       "enable_assets_button_label": "Activer les actifs",
       "spending_limit_warning": "Vous avez presque atteint votre limite de dépenses. Modifiez votre limite de dépenses pour éviter tout refus de paiement.",
+      "spending_limit_available": "disponible",
       "logout": "Déconnexion",
       "contact_support": "Contacter le service d’assistance",
       "logout_confirmation_title": "Voulez-vous vous déconnecter de votre compte MetaMask Card ?",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "Conditions générales",
         "order_metal_card": "Carte Metal",
         "order_metal_card_description": "Commandez votre Carte Metal physique dès maintenant",
-        "cashback": "Cashback",
-        "cashback_description": "Gagner 1 % sur toutes vos dépenses",
-        "cashback_description_metal": "Gagner 3 % sur toutes vos dépenses",
+        "cashback": "Cashback en mUSD",
+        "cashback_description": "Gagner 1 % de cashback en mUSD sur toutes vos dépenses",
+        "cashback_description_metal": "Gagner 3 % de cashback en mUSD sur toutes vos dépenses",
         "freeze_card": "Bloquer la carte",
         "unfreeze_card": "Débloquer la carte",
         "freeze_card_description": "Suspendre tous les paiements avec votre carte",
@@ -7917,8 +8110,8 @@
       "token_label": "Jeton"
     },
     "cashback_screen": {
-      "title": "Cashback",
-      "available_cashback": "Cashback disponible",
+      "title": "Cashback en mUSD",
+      "available_cashback": "mUSD disponibles",
       "network_fee": "Frais de réseau",
       "expected_to_receive": "Montant estimé à recevoir",
       "withdraw": "Retirer",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "Le retrait a été initié",
       "withdrawal_success": "Retrait effectué avec succès",
       "withdrawal_failed": "Le retrait a échoué. Veuillez réessayer.",
-      "no_cashback": "Aucun cashback disponible",
-      "loading_error": "Échec du chargement du cashback. Veuillez réessayer."
+      "no_cashback": "Aucun cashback en mUSD disponible",
+      "loading_error": "Échec du chargement du cashback en mUSD. Veuillez réessayer.",
+      "funding_required": {
+        "title": "Configurer le financement sur Linea",
+        "description": "Vous devez disposer d’au moins une source de financement approuvée sur Linea avant de pouvoir réclamer votre cashback en mUSD.",
+        "confirm_button_label": "Configurer le financement"
+      }
     },
     "change_asset": {
       "title": "Modifier le jeton et le réseau",
@@ -8032,7 +8230,8 @@
     "title": "Sélectionnez le mode de paiement",
     "title_receive": "Sélectionner le jeton à recevoir",
     "no_gas": "Pas de solde natif pour le gaz",
-    "not_supported": "Non pris en charge"
+    "not_supported": "Non pris en charge",
+    "crypto": "Crypto"
   },
   "connection_removed_modal": {
     "title": "Connexions supprimées",
@@ -8048,6 +8247,15 @@
       "title": "Échec de l’inscription",
       "description": "Vérifiez votre connexion et réessayez."
     },
+    "notifications_nudge": {
+      "title": "Ne manquez pas cette occasion",
+      "description": "Activez les notifications pour rester informé des nouvelles campagnes.",
+      "turn_on_button": "Activer",
+      "loading": "Activation des notifications…",
+      "loading_description": "Cela peut prendre quelques minutes.",
+      "enable_error": "Échec de l’activation des notifications",
+      "success": "Notifications activées"
+    },
     "version_guard": {
       "title": "Mise à jour requise",
       "description": "Une version plus récente de MetaMask est nécessaire pour utiliser « Récompenses ». Veuillez effectuer la mise à jour pour continuer.",
@@ -8126,6 +8334,17 @@
       "retry_button": "Réessayer"
     },
     "main_title": "Récompenses",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "Parrainages",
     "referral_stats_earned_from_referrals": "Gagnés grâce aux parrainages",
     "referral_stats_referrals": "Parrainages",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "Boosts actifs",
     "season_1": "Saison 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "Calculateur du bonus en mUSD",
-      "description": "Découvrez combien vous pourriez gagner en convertissant vos stablecoins en mUSD.",
-      "amount_label": "Montant converti",
-      "estimated_bonus": "Bonus annualisé estimé : jusqu’à 3 %",
-      "initial_amount": "Montant initial",
-      "daily_bonus": "Bonus quotidien pouvant être réclamé",
-      "annualized_bonus": "Bonus annualisé",
-      "disclaimer": "Il ne s’agit que d’une estimation. Le montant du bonus peut varier.",
-      "disclaimer_brief": "Le bonus est une estimation et peut varier.",
+      "page_title": "Calculateur des récompenses en mUSD",
+      "hero_hold": "Détenir des mUSD.",
+      "hero_earn": "Gagner",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/an",
+      "earnings_per_month_suffix": "/mois",
+      "earnings_per_day_suffix": "/jour, réclamables quotidiennement",
+      "slider_amount_label": "Montant",
+      "disclaimer_calculator": "Estimation basée sur un bonus de 3 %. Le taux peut varier. Montant réclamable à tout moment.",
       "buy_button": "Acheter des mUSD",
       "swap_button": "Échanger en mUSD"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "Se termine le {{date}}",
       "ended_date": "A pris fin le {{date}}",
       "pill_up_next": "Bientôt disponible",
+      "up_next": "À venir",
+      "notify_me": "M’avertir",
       "pill_active": "Active",
       "pill_complete": "Terminé",
       "enter": "Entrer",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "Non disponible dans votre région",
       "geo_locked_toast_description": "Cette campagne n’est pas disponible dans votre région. Revenez plus tard pour découvrir de nouvelles campagnes.",
       "geo_locked_cta": "Vérifier les conditions d’admissibilité",
-      "geo_loading": "Vérification de la région…"
+      "geo_loading": "Vérification de la région…",
+      "remind_me_success_toast": "Nous vous informerons du lancement de cette campagne.",
+      "remind_me_save_error": "Impossible d’enregistrer votre rappel. Veuillez réessayer."
     },
     "campaign_mechanics": {
       "title": "Déroulement"
@@ -8479,10 +8701,10 @@
       "qualified_description": "Augmentez vos flux nets entrants pour atteindre le niveau supérieur, vous aurez ainsi la chance de remporter une récompense plus importante.",
       "not_eligible_title": "Non admissible",
       "not_eligible_description": "Les positions ouvertes trop tard pour respecter l’exigence de détention de {{days}} jours ne seront pas comptabilisées dans le calcul de votre classement ou de votre niveau.",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "Nombre total de participants",
+      "completed_label_total_tvl": "Valeur totale bloquée",
+      "completed_label_top_return": "Meilleur rendement",
+      "completed_label_winners": "Gagnants"
     },
     "ondo_campaign_activity": {
       "title": "Toute l’activité",
@@ -8508,6 +8730,48 @@
       "cancel": "Annuler",
       "confirm": "Je comprends"
     },
+    "perps_trading_campaign": {
+      "title": "Concours de trading de contrats à terme perpétuels",
+      "stats_title": "Statistiques",
+      "performance_title": "Performance",
+      "label_rank": "Rang",
+      "label_your_rank": "Votre classement",
+      "label_pnl": "Profits et pertes",
+      "label_volume": "Volume",
+      "label_notional_volume": "Volume notionnel",
+      "pending": "En attente",
+      "qualified": "Qualifié",
+      "open_position_cta": "Position ouverte",
+      "leaderboard_title": "Classement",
+      "leaderboard_total_participants": "{{count}} participants",
+      "last_updated": "Dernière mise à jour : {{time}}",
+      "leaderboard_error_loading": "Échec du chargement du classement",
+      "leaderboard_error_loading_description": "Une erreur s’est produite lors du chargement du classement. Veuillez réessayer.",
+      "leaderboard_not_yet_computed": "Le classement n’a pas encore été calculé. Revenez bientôt.",
+      "leaderboard_powered_by_prefix": "Fourni par ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "Cagnotte",
+      "prize_pool_current_label": "Actuel",
+      "prize_pool_next_label": "Suivant",
+      "prize_pool_volume_subtext": "{{current}} sur {{target}} de volume",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}}+ volume — tous les jalons atteints",
+      "prize_pool_max_badge": "Maximum",
+      "prize_pool_error_title": "Échec du chargement de la cagnotte",
+      "prize_pool_error_description": "Une erreur s’est produite lors du chargement de la cagnotte. Veuillez réessayer.",
+      "prize_pool_retry_button": "Réessayer",
+      "stats_notional_volume_threshold": "{{amount}} $ requis",
+      "stats_qualified_title": "Vous êtes qualifié",
+      "stats_qualified_description": "Continuez à trader pour améliorer votre résultat net et grimper dans le classement avant la fin de la compétition.",
+      "stats_qualify_for_rank_title": "Se qualifier pour ce classement",
+      "stats_qualify_for_rank_description": "Tradez {{notionalRemaining}} de plus en volume notionnel pour devenir admissible.",
+      "stats_error_title": "Impossible de charger les statistiques",
+      "stats_error_description": "Nous avons rencontré un problème lors du chargement de vos statistiques. Veuillez réessayer.",
+      "stats_retry": "Réessayer",
+      "completed_label_total_participants": "Nombre total de participants",
+      "completed_label_total_volume": "Volume total",
+      "completed_label_top_pnl": "Meilleur résultat net",
+      "completed_label_winners": "Gagnants"
+    },
     "campaigns_preview": {
       "title": "Campagnes",
       "coming_soon": "Bientôt disponible",
@@ -8532,29 +8796,29 @@
       "retry_button": "Réessayer",
       "refreshing": "Actualisation en cours…"
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "Vous avez gagné",
       "rank_label": "{{place}} place",
-      "email_instructions": "Envoyez votre code par e-mail à ondocampaign@consensys.net pour réclamer votre récompense.",
+      "email_instructions": "Envoyez votre code par e-mail à {{email}} pour réclamer votre récompense.",
       "open_mail": "Ouvrir l’e-mail",
       "skip_for_now": "Ignorer pour l’instant",
-      "mail_subject": "Réclamation du prix que vous avez gagné en participant à la campagne Ondo",
+      "mail_subject": "Réclamation du prix {{campaignName}}",
       "mail_body": "Mon code gagnant : {{code}}",
       "winning_code": "Code gagnant",
       "close_a11y": "Fermer"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "Vous avez gagné",
-        "description": "Réclamez votre prix dès aujourd’hui.",
-        "a11y": "Afficher les détails du gagnant"
+        "title": "Vous avez gagné!",
+        "description": "Vérifiez votre code gagnant et réclamez votre prix dès aujourd’hui.",
+        "a11y": "Voir les détails"
       },
       "participant_pending": {
         "title": "La campagne est terminée.",
         "description": "Nous sommes en train d’évaluer les résultats. Revenez bientôt."
       },
       "participant_finalized": {
-        "title": "Les résultats de la campagne sont disponibles",
+        "title": "Les résultats de la campagne sont disponibles.",
         "description": "Vous n’avez pas gagné cette fois-ci. Découvrez quelle place vous occupez au classement final."
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "Votre prix est en route. Nous vous contacterons bientôt."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "Vous avez gagné 💰",
-        "description": "Réclamez le prix que vous avez gagné en participant à la campagne {{campaignName}}",
+        "description": "Réclamez aujourd’hui le prix que vous avez gagné en participant à la campagne {{campaignName}}.",
         "cta": "Voir les détails"
       },
-      "participant_no_winner": {
-        "title": "Les résultats sont disponibles. 🏅",
-        "description": "Découvrez votre classement dans la campagne {{campaignName}}",
+      "non_winner": {
+        "title": "Les résultats sont disponibles 🏅",
+        "description": "Découvrez votre classement dans la campagne {{campaignName}}.",
         "cta": "Afficher"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "Gains réclamés",
       "predict_deposit": "Compte « Predict » financé",
       "predict_withdraw": "Retrait",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "Déposer sur le compte Money",
+      "money_account_withdraw": "Transférer depuis le compte Money",
       "default": "Détails de la transaction"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "Explorer",
-    "trending_tokens": "Tendances",
+    "crypto_movers": "Les acteurs du marché des cryptomonnaies",
+    "perps_movers": "Les acteurs du marché des contrats à terme perpétuels",
+    "trending_tokens": "Tendance",
+    "crypto": "Crypto",
     "stocks": "Actions",
     "price_change": "Variation du prix",
     "all_networks": "Tous les réseaux",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 heure",
     "5_minutes": "5 minutes",
     "networks": "Réseaux",
+    "ecosystems": "Écosystèmes",
+    "ecosystems_subtitle": "Découvrez les dApps, les jetons et les NFT disponibles sur les différentes chaînes sur MetaMask Portfolio",
+    "all_sports": "Sports populaires",
+    "basketball": "Basket-ball",
+    "football": "Football américain",
+    "soccer": "Football",
+    "tennis": "Tennis",
+    "f1": "F1",
+    "golf": "Golf",
+    "all_sports_no_markets": "Aucun marché ouvert dans cette catégorie pour le moment. Revenez bientôt ou choisissez un autre sport ci-dessus.",
+    "load_more": "Afficher plus",
     "sort_by": "Trier par",
     "volume": "Volume",
     "market_cap": "Capitalisation boursière",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "Rechercher des jetons, des sites, des URL",
     "cancel": "Annuler",
     "perps": "Perps",
+    "rwa_perps_section": "Perps",
+    "macro_stocks_commodity_perps": "Perps",
+    "macro_pill_stocks": "Actions",
+    "macro_pill_commodities": "Matières premières",
+    "rwa_pill_commodities": "Matières premières",
+    "rwa_pill_stocks": "Actions",
+    "rwa_pill_forex": "Forex",
+    "crypto_perps_section": "Perps",
     "predictions": "Prédictions",
     "no_results": "Aucun résultat trouvé",
+    "popular": "Populaire",
     "sites": "Sites",
     "popular_sites": "Sites populaires",
     "search_sites": "Rechercher des sites",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "Aucun jeton trouvé",
       "description": "Nous n’avons pas trouvé ce jeton"
+    },
+    "tabs": {
+      "now": "Maintenant",
+      "macro": "Macroéconomie",
+      "rwas": "Actifs du monde réel",
+      "crypto": "Crypto",
+      "sports": "Sports",
+      "dapps": "Sites"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "Annuler",
-      "continue": "Continuer"
+      "continue": "Continuer",
+      "learn_more": "En savoir plus",
+      "try_again": "Réessayez"
     },
     "connecting": {
       "title": "Connexion de votre {{device}}…",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "Veuillez activer le Bluetooth pour établir une connexion avec votre appareil",
       "bluetooth_scan_failed": "Échec de la recherche d’appareils. Veuillez réessayer",
       "bluetooth_connection_failed": "La connexion à votre appareil a échoué. Veuillez réessayer",
+      "camera_permission_denied": "L’autorisation d’accéder à l’appareil photo est requise pour scanner les codes QR. Veuillez l’activer dans les paramètres de votre appareil",
       "not_supported": "Cette opération n’est pas prise en charge",
       "unknown_error": "Assurez-vous que votre {{device}} est configuré avec la phrase de récupération secrète ou la phrase secrète de ce compte"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "Autorisation de localisation requise",
       "nearby_devices_permission_denied": "L’autorisation d’accès aux appareils à proximité est requise",
       "scan_failed": "La recherche a échoué",
+      "camera_permission_denied": "L’autorisation d’accéder à l’appareil photo est requise",
       "something_went_wrong": "Quelque chose a mal tourné"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "Scannez le code QR de synchronisation du portefeuille",
+          "body": "Retournez sur votre portefeuille matériel et trouvez l’option permettant de partager ou d’exporter vos comptes, choisissez MetaMask, puis scannez le code QR."
+        },
+        "sign": {
+          "title": "Scanner le code QR de signature",
+          "body": "Retournez sur votre portefeuille matériel et approuvez la transaction, puis scannez le code QR qui s’affiche."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "Code QR incorrect",
+          "body": "Retournez sur votre portefeuille matériel, choisissez MetaMask comme type de portefeuille, puis générez un nouveau code QR et scannez-le."
+        },
+        "sign": {
+          "title": "Code QR incorrect",
+          "body": "Retournez sur votre portefeuille matériel et approuvez la transaction, puis scannez le code QR qui s’affiche."
+        }
+      },
+      "ur_decode_error": {
+        "title": "Impossible de lire le code QR",
+        "body": "Assurez-vous que le code QR est entièrement visible et bien éclairé, puis réessayez. Si le problème persiste, essayez de mettre à jour le micrologiciel (firmware) de votre portefeuille matériel."
+      }
+    },
     "device_selection": {
       "title": "Sélectionnez {{device}}",
       "scanning": "Recherche d’appareils…",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Money",
-      "cash_empty_description": "Vous n’avez pas encore de mUSD. Convertissez des stablecoins en mUSD depuis la section « Money » de la page d’accueil.",
-      "cash_empty_description_network_filter": "Pas de mUSD sur ce réseau. Changez de réseau pour consulter votre solde de mUSD.",
+      "money": "Money",
+      "money_empty_description": "Vous n’avez pas encore de mUSD. Convertissez des stablecoins en mUSD depuis la section « Money » de la page d’accueil.",
+      "money_empty_description_network_filter": "Pas de mUSD sur ce réseau. Changez de réseau pour consulter votre solde de mUSD.",
+      "money_empty_state": {
+        "get_started": "Commencer",
+        "earn_apy": "Obtenez un taux de rendement annuel de {{percentage}} %"
+      },
+      "money_filled_state": {
+        "add": "Ajouter",
+        "apy": "Taux de rendement annuel de {{percentage}} %"
+      },
       "tokens": "Jetons",
+      "perps": "Perps",
+      "related_assets": "Actifs associés",
       "perpetuals": "Contrats perpétuels",
       "predictions": "Prédictions",
       "whats_happening": "Actualités",
+      "whats_happening_ai": "IA",
+      "whats_happening_impact": {
+        "bullish": "Haussier",
+        "bearish": "Baissier",
+        "neutral": "Neutre"
+      },
       "top_traders": "Meilleurs traders",
       "whats_happening_categories": {
         "geopolitical": "Géopolitique",
@@ -8819,7 +9160,7 @@
       },
       "defi": "DeFi",
       "nfts": "NFT",
-      "trending_tokens": "Tendances",
+      "trending_tokens": "Tendance",
       "trending_perpetuals": "Contrats à terme perpétuels populaires",
       "trending_predictions": "Prédictions populaires",
       "import_nfts": "Importer des NFT",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "Impossible de charger {{section}}",
       "retry": "Réessayer"
     }
+  },
+  "sites": {
+    "popular": "Populaire"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/hi.json b/locales/languages/hi.json
index 52e911b4787..b70c2e7d997 100644
--- a/locales/languages/hi.json
+++ b/locales/languages/hi.json
@@ -634,7 +634,8 @@
     "trade": "ट्रेड करें",
     "settings": "सेटिंग्स",
     "rewards": "पुरस्कार",
-    "trending": "एक्सप्लोर करें"
+    "trending": "एक्सप्लोर करें",
+    "money": "वित्त"
   },
   "drawer": {
     "send_button": "भेजें",
@@ -708,7 +709,11 @@
     "smart_contract_address": "स्मार्ट कॉन्ट्रैक्ट एड्रेस",
     "smart_contract_address_warning": "हो सकता है कि पाने वाले का पता सीधे टोकन ट्रांसफर को सपोर्ट न करे, जिससे फंड का नुकसान हो सकता है। तभी आगे बढ़ें जब आपको पक्का हो कि यह कॉन्ट्रैक्ट आपका ट्रांसफर प्राप्त कर सकता है।",
     "i_understand": "मैं समझता हूं",
-    "cancel": "कैंसिल करें"
+    "cancel": "कैंसिल करें",
+    "new_address_title": "नया एड्रेस",
+    "new_address_message": "आप इस एड्रेस पर पहली बार भेज रहे हैं। आगे बढ़ने से पहले कृपया सुनिश्चित करें कि यह सही है:",
+    "alert_navigation_previous": "पिछला एलर्ट",
+    "alert_navigation_next": "अगला एलर्ट"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "टॉप ट्रेडर्स",
       "allow_push_notifications": "पुश नोटिफिकेशंस की अनुमति दें",
       "trades_over_label": "ट्रेड्स की सूचना यहां पाएं:",
       "traders_you_follow": "जिन ट्रेडर्स को आप फॉलो करते हैं",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "जिन ट्रेडर्स को आप फ़ॉलो करते हैं उन्हें लोड नहीं किया जा सका।"
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "{{traderName}} से सूचनाएं",
       "allow_push_notifications": "पुश नोटिफिकेशंस की अनुमति दें",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "{{traderName}} की ट्रेडिंग गतिविधि पर सूचनाएं प्राप्त करें",
+      "manage_traders": "आप जिन ट्रेडर्स को फ़ॉलो करते हैं उन्हें प्रबंधित करें",
       "save": "सेव करें"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "आप जिन ट्रेडर्स को फ़ॉलो करते हैं, उनसे होने वाले ट्रेड्स पर रीयल-टाइम एलर्ट पाएं",
       "allow_push_notifications": "पुश नोटिफिकेशंस की अनुमति दें",
       "trades_over_label": "ट्रेड्स की सूचना यहां पाएं:",
       "save": "सेव करें",
@@ -1059,7 +1064,12 @@
       "closed": "बंद किया गया",
       "no_positions": "अभी तक कोई पोजीशन नहीं",
       "error_loading_profile": "प्रोफ़ाइल लोड नहीं हो सकी",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "X (ट्विटर) पर देखें",
+      "sort": {
+        "value": "वैल्यू",
+        "pnl_percent": "पी एंड एल %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "मार्केट कैप",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} ने बेचा",
       "no_trades": "इस समय के लिए कोई ट्रेड नहीं",
       "closed_position": "बंद पोज़िशन",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "पोज़िशन उपलब्ध नहीं है",
+      "fallback_subtitle": "हम इस पोज़िशन को अभी लोड नहीं कर पाए।",
+      "fallback_back_to_profile": "प्रोफ़ाइल पर वापस जाएं",
+      "fallback_back_to_leaderboard": "लीडरबोर्ड पर वापस जाएं"
     },
     "quick_buy": {
       "title": "{{symbol}} खरीदें",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "MetaMask प्रिडिक्शन्स",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "प्रेडिक्शन मार्केट",
     "market_list": "मार्केट लिस्ट",
     "loading": "लोड हो रहा है...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "भुगतान का तरीका बदलें",
+      "add_funds": "फंड जोड़ें",
+      "add": "जोड़ें",
+      "predict_balance": "बैलेंस का अनुमान लगाएं"
+    },
     "order": {
       "available": "उपलब्ध",
       "cashed_out": "कैश आउट किया गया",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "मार्केट तेज़ी से आगे बढ़ रहा है, इसलिए हम {{price}} पर नहीं खरीद सके। सबसे अच्छी उपलब्ध कीमत पर फिर से कोशिश करें?",
       "market_busy_body_sell": "मार्केट तेज़ी से आगे बढ़ रहा है, इसलिए हम {{price}} पर नहीं बेच सके। सबसे अच्छी उपलब्ध कीमत पर फिर से कोशिश करें?",
       "order_failed_title": "ऑर्डर नहीं हो पाया",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "आपका ऑर्डर पूरा नहीं हो सका। फिर से प्रयास करें?",
+      "price_changed_title": "प्राइस बदल गई है",
+      "price_changed_body": "{{price}} पर खरीदारी नहीं हो सकी। क्या आप मार्केट प्राइस पर कोशिश करना चाहेंगे?",
       "retry": "फिर से प्रयास करें",
       "try_again": "फिर से कोशिश करें",
       "view": "देखें",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "विदड्रॉवल पूरा हुआ",
       "withdraw_completed_subtitle": "{{amount}} USDC आपके वॉलेट में भेज दिया गया",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}} आपके वॉलेट में भेजा गया",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "समझ गए",
       "error_title": "कुछ गलत हो गया",
       "error_description": "निकालना जारी नहीं हो पाया",
       "try_again": "फिर से प्रयास करें"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "जारी रखने के लिए {{tokenSymbol}} की आवश्यकता है",
     "fund_your_wallet": "अपने वॉलेट को फंड करें",
     "get_ready_for_web3": "web3 का उपयोग करने के लिए अपना वॉलेट तैयार करें",
+    "home_onboarding_steps": {
+      "header": "चरण",
+      "get_started_title": "MetaMask पर शुरुआत करें",
+      "fund_title": "अपने वॉलेट को फंड करें",
+      "fund_subtitle": "खाली वॉलेट किसी को पसंद नहीं आता। ट्रेडिंग शुरू करने के लिए आसानी से फंड जोड़ें।",
+      "fund_primary": "फंड जोड़ें",
+      "trade_title": "अपना पहला ट्रेड करें",
+      "trade_subtitle": "अपने पोर्टफोलियो को बढ़ाने के लिए कई नेटवर्क्स पर ट्रेंडिंग टोकन्स का ट्रेड करें।",
+      "trade_primary": "ट्रेड करें",
+      "notifications_title": "सूचनाएँ चालू करें",
+      "notifications_subtitle": "अपने पोर्टफोलियो के लिए बेहतर फैसले लेने हेतु मार्केट में होने वाले बदलावों से अपडेट रहें।",
+      "notifications_primary": "चालू करें",
+      "skip": "छोड़ें",
+      "progress_a11y": "{{total}} का स्टेप {{current}}",
+      "balance_loading_a11y": "वॉलेट बैलेंस लोड हो रहा है"
+    },
     "add_funds": "फंड जोड़ें",
     "next": "आगे",
     "buy_asset": "{{asset}} खरीदें",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "अमान्य संख्या। 1 और %{maxSafeChainId} के बीच एक संख्या दर्ज करें",
     "hide_zero_balance_tokens_title": "बिना बैलेंस वाले टोकन छिपाएं",
     "hide_zero_balance_tokens_desc": "आपके टोकन की सूची में बिना बैलेंस वाले टोकन के प्रदर्शन को रोकें।",
+    "haptic_feedback_title": "हैप्टिक फीडबैक",
+    "haptic_feedback_desc": "कन्फर्मेशन, गड़बड़ी और इंटरैक्शन के लिए हल्के वाइब्रेशन महसूस करें। हैप्टिक स्टिमुली कम करने के लिए बंद करें।",
     "token_detection_title": "टोकन ऑटो-डिटेक्ट करें",
     "token_detection_description": "हम तीसरे-पक्ष API का उपयोग आपके वॉलेट में भेजे गए नए टोकन का पता लगाने और प्रदर्शन में करते हैं। बंद कर दें यदि आप नहीं चाहते कि ऐप उन सेवाओं से डेटा अलग करें।",
     "theme_button_text": "थीम बदलें",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "सबसे विश्वसनीय",
         "quote_unknown_provider": "अज्ञात प्रोवाइडर",
         "start_headless_buy": "headless buy शुरू करें",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "बदलें और हेडलेस खरीदारी शुरू करें",
         "start_headless_buy_disabled_hint": "चालू करने के लिए सही राशि डालें",
         "start_headless_buy_pending": "Headless सेशन एक्टिव है — BuildQuote खोलें",
         "cancel_headless_buy": "Headless सेशन कैंसिल करें",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "सक्रिय सत्र: {{sessionId}} — नया कोट शुरू करने पर यह सत्र कैंसिल हो जाएगा।",
         "event_log_title": "इवेंट लॉग",
         "event_log_empty": "अभी तक कोई इवेंट नहीं है — Headless सेशन शुरू करें और इस जगह पर नज़र रखें।",
         "event_log_started": "सेशन शुरू हुआ {{sessionId}} (एसेट={{assetId}}, राशि={{amount}}, पेमेंट={{paymentMethodId}}{{providerSuffix}})",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "कंज्यूमर द्वारा कैंसिल किया गया सेशन {{sessionId}}"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "हेडलेस खरीदारी",
+        "loading": "खरीद प्रक्रिया तैयार की जा रही है…",
+        "no_session": "हेडलेस सत्र अब सक्रिय नहीं है।",
+        "cancel": "कैंसिल करें"
       }
     },
     "request_feature": "एक सुविधा का रिक्वेस्ट करें",
@@ -3553,7 +3622,7 @@
     "security_alerts": "सुरक्षा चेतावनियाँ",
     "security_alerts_desc": "यह सुविधा स्थानीय रूप से आपके ट्रांसेक्शन और हस्ताक्षर अनुरोधों की समीक्षा करके आपको बुरी नीयत वाली गतिविधि के प्रति एलर्ट करती है। किसी भी अनुरोध को मंजूरी देने से पहले हमेशा पूरी जांच-पड़ताल ज़रूर करें। इस बात की कोई गारंटी नहीं है कि यह सुविधा सभी बुरी नीयत वाली गतिविधि का पता लगा लेगी। इस सुविधा को सक्षम करके आप प्रदाता की उपयोग की शर्तों से सहमत होते हैं।",
     "smart_account_dapp_requests_heading": "dapps से स्मार्ट अकाउंट रिक्वेस्ट",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "dapps को स्टैंडर्ड एकाउंट्स के लिए स्मार्ट अकाउंट फीचर्स अनुरोध करने की अनुमति दें। MetaMask केवल हमारे ऑडिट किए गए स्मार्ट अकाउंट में ही अपग्रेड करेगा।",
     "smart_transactions_opt_in_heading": "स्मार्ट ट्रांसेक्शन",
     "smart_transactions_opt_in_desc_supported_networks": "समर्थित नेटवर्क पर अधिक विश्वसनीय और सुरक्षित ट्रांसेक्शन के लिए स्मार्ट ट्रांसेक्शन चालू करें।",
     "smart_transactions_learn_more": "ज़्यादा जानें",
@@ -3572,6 +3641,39 @@
         "title": "कार्ड",
         "reset_onboarding_description": "ऑनबोर्डिंग प्रक्रिया को शुरुआत से दोबारा शुरू करने के लिए कार्ड की ऑनबोर्डिंग स्टेट रीसेट करें।",
         "reset_onboarding_button": "ऑनबोर्डिंग स्टेट रीसेट करें"
+      },
+      "haptics": {
+        "title": "हैप्टिक्स",
+        "description": "भौतिक डिवाइस पर हैप्टिक फीडबैक का पूर्वावलोकन करें। यह ऐप में कम किए गए हैप्टिक्स और रिमोट किल स्विच को बायपास करता है, ताकि आप हर पैटर्न का मूल्यांकन कर सकें। सिमुलेटर अक्सर हैप्टिक्स नहीं चलाते हैं।",
+        "catalog_impacts_heading": "प्रभाव वाले क्षणों को सूचीबद्ध करें",
+        "notifications_heading": "सूचना पैटर्न",
+        "selection_heading": "चुनाव",
+        "notification_success_button": "सूचना — सफलता",
+        "notification_error_button": "सूचना — गड़बड़ी",
+        "notification_warning_button": "सूचना — चेतावनी",
+        "selection_button": "चुनाव",
+        "raw_impacts_heading": "रॉ एक्स्पो इम्पैक्ट स्टाइल्स",
+        "raw_impacts_desc": "तुलना के लिए डायरेक्ट एक्स्पो-हैप्टिक्स इम्पैक्ट स्टाइल्स, ऊपर दिए गए मैप किए गए कैटलॉग मोमेंट्स के साथ।",
+        "impacts": {
+          "quick_amount_selection": "इम्पैक्ट — तेज़ राशि चयन",
+          "slider_tick": "इम्पैक्ट — स्लाइडर टिक",
+          "edge_gesture_engage": "इम्पैक्ट — ऐड्ज जेस्चर इंगेज",
+          "page_navigation": "इम्पैक्ट — पेज नेविगेशन",
+          "slider_grip": "इम्पैक्ट — स्लाइडर ग्रिप",
+          "tab_change": "इम्पैक्ट — टैब परिवर्तन",
+          "primary_cta": "इम्पैक्ट — मुख्य CTA",
+          "pull_to_refresh_engage": "इम्पैक्ट — रिफ्रेश करने के लिए खींचें (इंगेज)",
+          "pull_to_refresh": "इम्पैक्ट — रिफ्रेश करने के लिए खींचें (रिलीज़)",
+          "chart_crosshair": "इम्पैक्ट — चार्ट क्रॉसहेयर",
+          "follow_toggle": "इम्पैक्ट — फॉलो टॉगल"
+        },
+        "raw_styles": {
+          "light": "रॉ इम्पैक्ट — हल्का",
+          "medium": "रॉ इम्पैक्ट — मध्यम",
+          "heavy": "रॉ इम्पैक्ट — भारी",
+          "rigid": "रॉ इम्पैक्ट — कठोर",
+          "soft": "रॉ इम्पैक्ट — नरम"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "प्रेडिक्शंस",
     "add_collectible_button": "जोड़ें",
     "info": "जानकारी",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "स्वैप",
     "convert": "कन्वर्ट करें",
     "bridge": "ब्रिज",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "ट्रबलशूट",
     "deposit_description": "कम शुल्क वाले बैंक या कार्ड ट्रांसफर",
     "buy_description": "एक विशिष्ट टोकन खरीदने के लिए अच्छा है",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "कैश के लिए क्रिप्टो बेचें",
     "swap_description": "टोकन के बीच विनिमय",
     "bridge_description": "अलग-अलग नेटवर्कों के बीच टोकन ट्रांसफर करें",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "मुफ्त",
     "tx_details_not_available": "उपलब्ध नहीं है",
     "smart_contract_interaction": "स्मार्ट अनुबंध संपर्क",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "Money अकाउंट में डिपॉज़िट करें",
+    "money_account_withdraw": "Money अकाउंट से ट्रांसफर करें",
     "swaps_transaction": "स्वैप का लेन-देन",
     "bridge_transaction": "ब्रिज",
     "approve": "स्वीकृति दें",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "स्टेबलकॉइन्स पर {{percentage}}% पाएं",
-        "description": "अपने स्टेबलकॉइन्स को mUSD में बदलें और {{percentage}}% तक वार्षिक बोनस कमाएं, जिसे आप रोज़ाना क्लेम कर सकते हैं।",
+        "description": "अपने स्टेबलकॉइन्स को mUSD में बदलें और {{percentage}}% वार्षिक बोनस कमाएं।",
         "terms_apply": "नियम लागू।",
         "primary_button": "शुरू करें",
-        "secondary_button": "अभी नहीं"
+        "secondary_button": "अभी नहीं",
+        "checklist": {
+          "dollar_backed": "डॉलर-समर्थित",
+          "no_lockups": "कोई लॉकअप नहीं",
+          "daily_bonus": "दैनिक बोनस",
+          "metamask_stablecoins": "MetaMask स्टेबलकॉइन्स",
+          "no_metamask_fee": "कोई MetaMask फीस नहीं"
+        }
       },
       "buy_musd": "mUSD खरीदें",
       "get_musd": "mUSD प्राप्त करें",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Money",
+    "your_balance": "आपका बैलेंस",
     "apy_label": "{{percentage}}% APY",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "एपीवाय की जानकारी",
     "onboarding": {
       "step_progress": "{{total}} का स्टेप {{current}}",
       "title": "धन जोड़ें",
-      "description": "mUSD खरीदें और आज ही एपीवाय कमाना शुरू करें।",
+      "description": "अपना अकाउंट फंड करें और APY कमाना शुरू करें।",
       "add": "जोड़ें",
       "step2_title": "अपना MetaMask कार्ड पाएं",
       "step2_description": "अपना Money बैलेंस पाने के साथ उसे खर्च करें, जहां भी मास्टरकार्ड स्वीकार किया जाता हो।",
@@ -6497,22 +6611,32 @@
       "card": "कार्ड"
     },
     "earnings": {
-      "title": "कमाई",
-      "lifetime": "जीवन भर की कमाई",
-      "projected": "अनुमानित कमाई"
+      "title": "अनुमानित कमाई",
+      "estimated_monthly": "मासिक",
+      "estimated_yearly": "वार्षिक",
+      "info_label": "आय की जानकारी"
     },
     "how_it_works": {
       "title": "ये कैसे काम करता है",
-      "description_prefix": "अपने Money अकाउंट में mUSD रखें और ऑटो-अर्न करें",
-      "description_suffix": "। यह डॉलर-बैक्ड है, हमेशा लिक्विड रहता है, और कभी भी खर्च करने, ट्रेड करने या भेजने के लिए तैयार है।"
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "जोड़ें"
     },
+    "balance_card": {
+      "label": "Money बैलेंस",
+      "add": "जोड़ें",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "अपने क्रिप्टो पर कमाएं",
       "description": "देखें कि अपने क्रिप्टो को mUSD में बदलकर आपका पैसा समय के साथ कैसे बढ़ सकता है।",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "कन्वर्ट करें",
+      "convert_cta": "Convert your crypto",
       "no_fee": "कोई MetaMask फीस नहीं",
       "view_all": "सभी देखें",
       "view_potential_earnings": "संभावित कमाई देखें"
@@ -6522,37 +6646,75 @@
       "subtitle": "अपना पैसा कहीं भी खर्च करें।",
       "virtual_card": "वर्चुअल कार्ड",
       "metal_card": "मेटल कार्ड",
-      "cashback": "{{percentage}}% कैशबैक",
+      "cashback": "{{percentage}}% mUSD वापस",
       "get_now": "अभी पाएं",
       "link_title": "MetaMask कार्ड लिंक करें",
-      "link_subtitle": "अपना Money बैलेंस खर्च करें और कमाएं।",
-      "link_bullet_cashback": "3% तक कैश बैक",
-      "link_bullet_apy": "{{apy}}% APY तक",
-      "link_card": "कार्ड लिंक करें"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "कार्ड लिंक करें",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "आपको क्या मिलता है",
-      "benefit_auto_earn": "ऑटो-अर्न ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "अपना पैसा mUSD में रखें, जो एक 1:1 डॉलर-बैक्ड स्टेबलकॉइन है",
       "benefit_liquidity": "बिना किसी लॉकअप के पूरी लिक्विडिटी पाएं, इसलिए आप कभी भी ट्रेड कर सकते हैं या निकाल सकते हैं",
       "benefit_spend_prefix": "MetaMask कार्ड के साथ 150M+ मर्चेंट पर खर्च करें और कमाएँ ",
-      "benefit_spend_cashback": "1-3% कैशबैक",
-      "benefit_transfer": "MetaMask पर अपने किसी भी वॉलेट में पैसे ट्रांसफर करें",
-      "benefit_global": "दुनिया भर में पैसे भेजें और प्राप्त करें",
+      "benefit_spend_cashback": "1-3% mUSD वापस",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "ज़्यादा जानें"
     },
     "footer": {
-      "add_money": "धन जोड़ें"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "धन जोड़ें",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "क्रिप्टो को कन्वर्ट करें",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "फंड्स डिपॉज़िट करें",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "बाहरी वॉलेट से प्राप्त करें",
       "coming_soon": "जल्द आ रहा है"
     },
+    "more_sheet": {
+      "title": "अधिक",
+      "how_it_works": "ये कैसे काम करता है",
+      "what_you_get": "आपको क्या मिलता है",
+      "contact_support": "सपोर्ट टीम से कॉन्टेक्ट करें"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "एकाउंट्स के बीच",
+      "perps_account": "पर्प्स अकाउंट",
+      "predictions_account": "प्रेडिक्शंस अकाउंट",
+      "send_external": "बाहरी एड्रेस पर भेजें",
+      "withdraw_to_bank": "बैंक में निकालें"
+    },
+    "apy_tooltip": {
+      "title": "वार्षिक प्रतिशत उपज (APY)",
+      "paragraph_1": "आपका Money अकाउंट अपने आप {{percentage}}% तक कमाता है।",
+      "paragraph_2": "दिखाई गई दर वर्तमान बाजार स्थितियों के आधार पर एक अनुमानित वार्षिक प्रतिशत उपज (APY) है। APY परिवर्तनशील है और विभिन्न कारकों के कारण बदल सकती है। यह दर थर्ड-पार्टी DeFi प्लेटफॉर्म द्वारा उत्पन्न की जाती है, जो फंड्स को ब्लॉकचेन प्रोटोकॉल में लगाते हैं।",
+      "paragraph_3": "जब आप अपना MetaMask कार्ड लिंक करते हैं, तो खरीदारी इसी बैलेंस से कटेगी।"
+    },
+    "earnings_tooltip": {
+      "title": "अनुमानित कमाई",
+      "body": "आपके वर्तमान बैलेंस और आज के APY के आधार पर किसी अवधि में आपकी संभावित कमाई का अनुमान। यह अनुमानित रिटर्न की गारंटी नहीं है और इसमें बदलाव हो सकता है।"
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "गतिविधि",
       "view_all": "सभी देखें",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "वित्त",
       "section_title": "ये कैसे काम करता है",
-      "description_1": "आपका Money अकाउंट अपने आप 4% APY (वेरिएबल) कमाता है। फंड एक क्यूरेटेड DeFi वॉल्ट में जाते हैं जो ऑडिटेड लेंडिंग मार्केट में रिटर्न देता है—कोई स्टेकिंग नहीं, कोई क्लेम नहीं, कोई लॉक-अप नहीं।",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "आपका Money बैलेंस आपका खर्च करने का बैलेंस है। दुनिया भर में 150M+ मर्चेंट पर खर्च करने के लिए अपना MetaMask कार्ड लिंक करें। आपका पैसा तब तक कमाता रहता है जब तक आप इसका इस्तेमाल नहीं करते।",
-      "faq_title": "सामान्य प्रश्न",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "जल्द आ रहा है।",
-      "faq_q1": "Money अकाउंट क्या है?",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "mUSD क्या है?",
       "faq_q3": "यील्ड कहाँ से आती है?",
       "faq_q4": "क्या मेरा पैसा लॉक हो गया है? क्या मैं कभी भी निकाल सकता हूँ?",
@@ -6608,8 +6770,7 @@
       "faq_q7": "क्या APY रेट बदलता है?",
       "faq_q8": "क्या यह सेविंग्स अकाउंट है या स्पेंडिंग अकाउंट?",
       "faq_q9": "मेरे पैसे को कौन कंट्रोल करता है?",
-      "faq_q10": "MetaMask कार्ड से मुझे क्या कैश बैक मिलता है?",
-      "sounds_good": "सही लगता है"
+      "faq_q10": "MetaMask कार्ड से मुझे क्या mUSD वापस मिलता है?"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "कैंसिल करें",
     "confirm": "कन्फर्म करें",
+    "pay_with_bottom_sheet": {
+      "title": "के साथ भुगतान करें",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "जारी रखकर, आप हमारी ",
       "terms_of_use": "उपयोग की शर्तों",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "निकालें",
       "predict_deposit": "प्रिडिक्शन फ़ंड जोड़ें",
       "predict_withdraw": "निकालें",
-      "money_account_deposit": "फंड जोड़ें",
-      "money_account_withdraw": "फंड विदड्रॉ करें"
+      "money_account_add_money": "धन जोड़ें",
+      "money_account_transfer_money": "पैसा ट्रांसफर करें"
     },
     "sub_title": {
       "permit": "यह साइट आपके टोकन खर्च करने की अनुमति चाहती है।",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "हम आपके टोकन को HyperCore पर USDC में स्वैप करेंगे, जो पर्प्स द्वारा इस्तेमाल होने वाला नेटवर्क है। स्वैप प्रदाता फीस ले सकते हैं, लेकिन MetaMask कोई फीस नहीं लेगा।"
       },
       "predict_deposit": {
-        "transaction_fee": "हम आपके टोकन को Polygon पर USDC.e में स्वैप करेंगे, जो प्रिडिक्शन्स द्वारा इस्तेमाल होने वाला नेटवर्क है। स्वैप प्रदाता फीस ले सकते हैं, लेकिन MetaMask कोई फीस नहीं लेगा।"
+        "transaction_fee": "हम आपके टोकन को Polygon पर pUSD में स्वैप करेंगे, जो प्रिडिक्शन्स द्वारा इस्तेमाल होने वाला नेटवर्क है। स्वैप प्रदाता फीस ले सकते हैं, लेकिन MetaMask कोई फीस नहीं लेगा।"
       },
       "perps_withdraw": {
         "transaction_fee": "MetaMask आपके लिए आपके पसंदीदा टोकन में स्वैप करेगा। जब आप mUSD में स्वैप करते हैं तो कोई MetaMask शुल्क लागू नहीं होता है।"
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "mUSD कन्वर्शन शुल्क में नेटवर्क लागत शामिल होती है और इसमें प्रदाता शुल्क भी शामिल हो सकता है। जब आप mUSD में कन्वर्ट करते हैं, तो कोई MetaMask शुल्क लागू नहीं होता।"
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "फीस"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "क्रिप्टो खरीदें",
       "buy_predict": "प्रेडिक्शंस का उपयोग करने के लिए अपने वॉलेट में फंड्स जोड़ें।",
-      "buy_perps": "पर्प्स का उपयोग करने के लिए अपने वॉलेट में फंड्स जोड़ें।"
+      "buy_perps": "पर्प्स का उपयोग करने के लिए अपने वॉलेट में फंड्स जोड़ें।",
+      "projected_five_year_balance": "अनुमानित 5-वर्षीय बैलेंस:"
     },
     "unlimited": "असीमित",
     "all": "सभी",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "जारी रखें",
     "deposit_edit_amount_done": "फंड जोड़ें",
     "deposit_edit_amount_predict_withdraw": "निकालें",
-    "deposit_edit_amount_musd_conversion": "mUSD में कन्वर्ट करें"
+    "deposit_edit_amount_musd_conversion": "mUSD में कन्वर्ट करें",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "परिणाम बदल गए हैं",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "स्वैप करें",
     "terms_and_conditions": "नियम और शर्त",
     "select_token": "टोकन चुनें",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "कोई टोकन नहीं मिला",
     "no_tokens_found_description": "हमें इस नाम का कोई टोकन नहीं मिला। कोई एक अलग सर्च से कोशिश करें।",
     "select_network": "नेटवर्क चुनें",
@@ -7115,6 +7303,7 @@
     "receive_at": "यहां प्राप्त करें",
     "recipient": "प्राप्तकर्ता",
     "select_recipient": "प्राप्तकर्ता चुनें",
+    "select_account": "अकाउंट चुनें",
     "external_account": "बाहरी अकाउंट",
     "error_banner_description": "यह ट्रेड रूट अभी उपलब्ध नहीं है। राशि, नेटवर्क या टोकन बदलने का प्रयास करें और हम सबसे अच्छा विकल्प ढूँढ लेंगे।",
     "stock_token_error_banner_description": "यह ट्रेड रूट अभी उपलब्ध नहीं है। अमाउंट, नेटवर्क या टोकन बदलने की कोशिश करें और हम सबसे अच्छा विकल्प ढूंढ लेंगे।",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "हाई प्राइस इम्पैक्ट",
     "price_impact_error_title": "वेरी हाई प्राइस इम्पैक्ट",
     "price_impact_error_description": "इस स्वैप पर आपको अपने टोकन की मार्केट प्राइस का लगभग {{priceImpact}} का नुकसान होगा। अपना रेट बेहतर करने के लिए छोटा ट्रेड या ज़्यादा लिक्विड तरीका आज़माएँ।",
+    "insufficient_native_reserve_cta": "अधिकतम अनुमत उपयोग करें",
+    "insufficient_native_reserve_message": "इस नेटवर्क के लिए आपके अकाउंट में कम से कम {{minimumReserve}} {{ticker}} बनाए रखना आवश्यक है। आप अधिकतम {{maxSwappable}} {{ticker}} का उपयोग कर सकते हैं",
+    "insufficient_native_reserve_title": "न्यूनतम {{ticker}} रिज़र्व बैलेंस आवश्यक है",
     "token_warning_suspicious_banner": "{{token}} एक संदिग्ध टोकन है।",
     "token_warning_malicious_banner": "{{token}} एक बदनीयत वाला टोकन है। इस टोकन के साथ लेन-देन करते समय सावधानी बरतें।",
     "token_warning_modal_suspicious_title": "संदिग्ध टोकन",
@@ -7542,17 +7734,17 @@
         "price": "मुफ्त",
         "feature_1": "Apple Pay और Google Pay के लिए वर्चुअल कार्ड",
         "feature_2": "क्रिप्टो से भुगतान करें (USDC, USDT, WETH और अन्य)",
-        "feature_3": "हर खरीदारी पर 1% USDC कैशबैक"
+        "feature_3": "हर खरीद पर 1% mUSD वापस"
       },
       "metal_card": {
         "name": "मेटल कार्ड",
         "price": "$199/साल",
         "everything_in_virtual": "सब कुछ वर्चुअल, साथ में:",
         "feature_1": "प्रीमियम एनग्रेव्ड मेटल कार्ड",
-        "feature_2": "पहले $10,000/साल पर 3% कैशबैक",
+        "feature_2": "पहले $10,000/वर्ष पर 3% mUSD वापस",
         "feature_3": "कोई विदेशी ट्रांसेक्शन फीस नहीं"
       },
-      "earn_up_to_badge": "सालाना $300 तक कैशबैक कमाएं",
+      "earn_up_to_badge": "हर साल mUSD में $300 तक वापस कमाएं",
       "upgrade_to_metal_label": "या 3x रिवॉर्ड के लिए मेटल में अपग्रेड करें"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "आपका कार्ड ऑर्डर\nकिया गया है",
       "subtitle": "यह 4 से 6 हफ्तों में पहुँच जाएगा।",
-      "description": "अपना वर्चुअल कार्ड सेटअप करें और इसे अपने डिजिटल वॉलेट में जोड़ें ताकि आप कैशबैक कमाना शुरू कर सकें।",
+      "description": "अपना वर्चुअल कार्ड सेटअप करें और इसे अपने डिजिटल वॉलेट में जोड़ें ताकि आप mUSD वापस कमाना शुरू कर सकें।",
       "set_up_card_button": "कार्ड सेट अप करें",
       "back_to_card_button": "कार्ड पर वापस जाएं"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "खर्च करें\nऔर\nकमाएँ",
-      "description": "MetaMask कार्ड आपके क्रिप्टो को खर्च करने \nऔर 3% तक कैशबैक पाने का तेज़ और \nआसान तरीका है।",
+      "description": "MetaMask कार्ड आपके क्रिप्टो को खर्च करने \nऔर 3% तक mUSD वापस पाने का तेज़ और \nआसान तरीका है।",
       "apply_now_button": "अभी सेट अप करें",
       "login_button": "लॉग इन करें",
       "not_now_button": "अभी नहीं",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "कार्ड चालू करें",
       "enable_assets_button_label": "एसेट्स चालू करें",
       "spending_limit_warning": "आप अपनी खर्च सीमा के करीब हैं। अस्वीकृतियों से बचने के लिए अपडेट करें।",
+      "spending_limit_available": "उपलब्ध",
       "logout": "लॉग आउट करें",
       "contact_support": "सपोर्ट टीम से कॉन्टेक्ट करें",
       "logout_confirmation_title": "कार्ड से लॉग आउट करें?",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "नियम और शर्त",
         "order_metal_card": "मेटल कार्ड",
         "order_metal_card_description": "अपना भौतिक मेटल कार्ड अभी ऑर्डर करें",
-        "cashback": "कैशबैक",
-        "cashback_description": "सारी खर्च पर 1% वापस कमाएं",
-        "cashback_description_metal": "सारी खर्च पर 3% वापस कमाएं",
+        "cashback": "mUSD वापस",
+        "cashback_description": "सारी खर्च पर 1% mUSD वापस कमाएं",
+        "cashback_description_metal": "सारी खर्च पर 3% mUSD वापस कमाएं",
         "freeze_card": "कार्ड फ़्रीज़ करें",
         "unfreeze_card": "कार्ड अनफ़्रीज़ करें",
         "freeze_card_description": "अपने कार्ड पर सभी खर्च रोकें",
@@ -7917,8 +8110,8 @@
       "token_label": "टोकन"
     },
     "cashback_screen": {
-      "title": "कैशबैक",
-      "available_cashback": "उपलब्ध कैशबैक",
+      "title": "mUSD वापस",
+      "available_cashback": "उपलब्ध mUSD",
       "network_fee": "नेटवर्क फीस",
       "expected_to_receive": "प्राप्त होने की उम्मीद",
       "withdraw": "निकालें",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "विदड्रॉवल शुरू कर दिया गया है",
       "withdrawal_success": "विदड्रॉवल सफलतापूर्वक पूरा हुआ",
       "withdrawal_failed": "विदड्रॉवल नहीं हो पाया। कृपया फिर से प्रयास करें।",
-      "no_cashback": "कोई कैशबैक उपलब्ध नहीं है",
-      "loading_error": "कैशबैक लोड करना नहीं हो पाया। कृपया फिर से प्रयास करें।"
+      "no_cashback": "कोई mUSD कैशबैक उपलब्ध नहीं है",
+      "loading_error": "mUSD कैशबैक लोड करना नहीं हो पाया। कृपया फिर से प्रयास करें।",
+      "funding_required": {
+        "title": "Linea फंडिंग सेट करें",
+        "description": "mUSD कैशबैक रिडीम करने से पहले Linea पर कम से कम एक एप्रूव किया हुआ फंडिंग स्रोत होना आवश्यक है।",
+        "confirm_button_label": "फंडिंग सेट करें"
+      }
     },
     "change_asset": {
       "title": "टोकन और नेटवर्क बदलें",
@@ -8032,7 +8230,8 @@
     "title": "भुगतान विधि चुनें",
     "title_receive": "प्राप्त करने के लिए टोकन चुनें",
     "no_gas": "गैस के लिए कोई नेटिव बैलेंस नहीं है",
-    "not_supported": "सपोर्ट नहीं किया गया"
+    "not_supported": "सपोर्ट नहीं किया गया",
+    "crypto": "क्रिप्टो"
   },
   "connection_removed_modal": {
     "title": "कनेक्शन हटा दिए गए",
@@ -8048,6 +8247,15 @@
       "title": "ऑप्ट-इन नहीं हो पाया",
       "description": "अपना कनेक्शन जांचें और फिर से प्रयास करें।"
     },
+    "notifications_nudge": {
+      "title": "चूकें नहीं",
+      "description": "कैम्पेन्स की जानकारी पाने के लिए नोटिफिकेशन चालू करें।",
+      "turn_on_button": "चालू करें",
+      "loading": "नोटिफिकेशंस चालू किया जा रहा है...",
+      "loading_description": "इसमें कुछ समय लग सकता है।",
+      "enable_error": "नोटिफिकेशन चालू नहीं हो पाया",
+      "success": "नोटिफिकेशन चालू हो गया"
+    },
     "version_guard": {
       "title": "अपडेट ज़रूरी है",
       "description": "रिवॉर्ड्स इस्तेमाल करने के लिए MetaMask का नया वर्शन ज़रूरी है। जारी रखने के लिए कृपया अपडेट करें।",
@@ -8126,6 +8334,17 @@
       "retry_button": "फिर से प्रयास करें"
     },
     "main_title": "पुरस्कार",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "रेफरल",
     "referral_stats_earned_from_referrals": "रेफरल से अर्जित",
     "referral_stats_referrals": "रेफरल",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "सक्रिय बूस्ट्स",
     "season_1": "सीज़न 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "mUSD बोनस कैलकुलेटर",
-      "description": "देखें कि आप अपने स्टेबलकॉइन को mUSD में बदलकर कितना कमा सकते हैं।",
-      "amount_label": "कन्वर्ट किया गया अमाउंट",
-      "estimated_bonus": "अनुमानित सालाना बोनस: 3% तक",
-      "initial_amount": "शुरुआती अमाउंट",
-      "daily_bonus": "रोज़ाना क्लेम किया जाने वाला बोनस",
-      "annualized_bonus": "सालाना बोनस",
-      "disclaimer": "यह सिर्फ़ एक अनुमान है। बोनस बदल सकता है।",
-      "disclaimer_brief": "बोनस एक अनुमान है और बदल सकता है।",
+      "page_title": "mUSD कैलकुलेटर",
+      "hero_hold": "mUSD को होल्ड करें।",
+      "hero_earn": "कमाएं",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/वर्ष",
+      "earnings_per_month_suffix": "/माह",
+      "earnings_per_day_suffix": "/दिन दैनिक क्लेम करने योग्य",
+      "slider_amount_label": "राशि",
+      "disclaimer_calculator": "3% बोनस के आधार पर अनुमान। दर बदल सकती है। कभी भी क्लेम किया जा सकता है।",
       "buy_button": "mUSD खरीदें",
       "swap_button": "mUSD पर स्वैप करें"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "{{date}} को समाप्त होता है",
       "ended_date": "{{date}} को समाप्त हुआ",
       "pill_up_next": "जल्द आ रहा है",
+      "up_next": "आगे आने वाला है",
+      "notify_me": "मुझे सूचित करें",
       "pill_active": "लाइव",
       "pill_complete": "पूरा",
       "enter": "एंटर करें",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "आपके इलाके में उपलब्ध नहीं है",
       "geo_locked_toast_description": "यह कैंपेन आपके यहां उपलब्ध नहीं है। नए कैंपेन के लिए बाद में फिर से देखें।",
       "geo_locked_cta": "योग्यता चेक करें",
-      "geo_loading": "क्षेत्र की जांच की जा रही है…"
+      "geo_loading": "क्षेत्र की जांच की जा रही है…",
+      "remind_me_success_toast": "हम आपको बताएंगे जब यह कैम्पेन शुरू होगा।",
+      "remind_me_save_error": "आपका रिमाइंडर सेव नहीं हो सका। कृपया फिर से प्रयास करें।"
     },
     "campaign_mechanics": {
       "title": "मैकेनिक्स"
@@ -8479,10 +8701,10 @@
       "qualified_description": "अपने नेट इनफ्लो को बढ़ाकर ऊंचे लेवल पर पहुंचें और ज़्यादा पेआउट का मौका पाएं।",
       "not_eligible_title": "योग्य नहीं हैं",
       "not_eligible_description": "{{days}}-दिन की होल्ड ज़रूरत को पूरा करने के लिए बहुत देर से खोले गए ट्रेड आपके रैंक या टियर में नहीं गिने जाएंगे।",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "कुल प्रतिभागी",
+      "completed_label_total_tvl": "कुल TVL",
+      "completed_label_top_return": "शीर्ष रिटर्न",
+      "completed_label_winners": "विनर"
     },
     "ondo_campaign_activity": {
       "title": "सभी गतिविधि",
@@ -8508,6 +8730,48 @@
       "cancel": "कैंसिल करें",
       "confirm": "मैं समझता हूं"
     },
+    "perps_trading_campaign": {
+      "title": "पर्प्स ट्रेडिंग प्रतियोगिता",
+      "stats_title": "आँकड़े",
+      "performance_title": "प्रदर्शन",
+      "label_rank": "रैंक",
+      "label_your_rank": "आपकी रैंक",
+      "label_pnl": "PnL",
+      "label_volume": "वॉल्यूम",
+      "label_notional_volume": "नोशनल वॉल्यूम",
+      "pending": "अभी पूरा नहीं हुआ",
+      "qualified": "योग्य",
+      "open_position_cta": "ओपन पोज़िशन",
+      "leaderboard_title": "लीडरबोर्ड",
+      "leaderboard_total_participants": "{{count}} प्रतिभागी",
+      "last_updated": "पिछला अपडेट इस समय पर किया गया: {{time}}",
+      "leaderboard_error_loading": "लीडरबोर्ड लोड नहीं हो पाया",
+      "leaderboard_error_loading_description": "लीडरबोर्ड लोड करते समय कुछ गड़बड़ हो गई। कृपया फिर से कोशिश करें।",
+      "leaderboard_not_yet_computed": "लीडरबोर्ड अभी तक कंप्यूट नहीं किया गया है। जल्द ही फिर से देखें।",
+      "leaderboard_powered_by_prefix": "के द्वारा पावर्ड ",
+      "leaderboard_hypertracker_brand": "हाइपरट्रैकर",
+      "prize_pool_title": "प्राइज़ पूल",
+      "prize_pool_current_label": "मौजूदा",
+      "prize_pool_next_label": "आगे",
+      "prize_pool_volume_subtext": "{{target}} वॉल्यूम का {{current}}",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}}+ वॉल्यूम — सभी माइलस्टोन पूरे हो गए",
+      "prize_pool_max_badge": "मैक्स",
+      "prize_pool_error_title": "प्राइज़ पूल लोड नहीं हो पाया",
+      "prize_pool_error_description": "आपका प्राइज़ पूल लोड करते समय एक गड़बड़ी हुई। कृपया फिर से कोशिश करें।",
+      "prize_pool_retry_button": "फिर से प्रयास करें",
+      "stats_notional_volume_threshold": "${{amount}} ज़रूरी है",
+      "stats_qualified_title": "आप क्वालिफ़ाई कर चुके हैं",
+      "stats_qualified_description": "लीडरबोर्ड में ऊपर आने और अपने PnL को बेहतर बनाने के लिए प्रतियोगिता खत्म होने से पहले ट्रेडिंग जारी रखें।",
+      "stats_qualify_for_rank_title": "इस रैंक के लिए क्वालिफ़ाई करें",
+      "stats_qualify_for_rank_description": "योग्य बनने के लिए नोशनल वॉल्यूम में {{notionalRemaining}} और ट्रेड करें।",
+      "stats_error_title": "स्टैट्स लोड नहीं हो पा रहे हैं",
+      "stats_error_description": "हमें आपके स्टैट्स लोड करने में दिक्कत हुई। कृपया फिर से कोशिश करें।",
+      "stats_retry": "फिर से प्रयास करें",
+      "completed_label_total_participants": "कुल प्रतिभागी",
+      "completed_label_total_volume": "कुल वॉल्यूम",
+      "completed_label_top_pnl": "शीर्ष PnL",
+      "completed_label_winners": "विनर"
+    },
     "campaigns_preview": {
       "title": "कैंपेन",
       "coming_soon": "जल्द आ रहा है",
@@ -8532,29 +8796,29 @@
       "retry_button": "फिर से प्रयास करें",
       "refreshing": "रिफ्रेश हो रहा है..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "आप जीत गए",
       "rank_label": "{{place}} जगह",
-      "email_instructions": "अपना इनाम पाने के लिए ondocampaign@consensys.net पर अपना कोड ईमेल करें।",
+      "email_instructions": "अपना इनाम क्लेम करने के लिए {{email}} पर ईमेल करें।",
       "open_mail": "मेल खोलें",
       "skip_for_now": "अभी के लिए स्किप करें",
-      "mail_subject": "Ondo कैंपेन प्राइज़ क्लेम",
+      "mail_subject": "{{campaignName}} प्राइज़ क्लेम",
       "mail_body": "मेरा विनिंग कोड: {{code}}",
       "winning_code": "विनिंग कोड",
       "close_a11y": "बंद करें"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "आप जीत गए",
-        "description": "आज ही अपना प्राइज़ क्लेम करें।",
-        "a11y": "विनर की जानकारी खोलें"
+        "title": "आप जीत गए!",
+        "description": "अपना विजेता कोड सत्यापित करें और आज ही अपना इनाम क्लेम करें।",
+        "a11y": "विवरण देखें"
       },
       "participant_pending": {
         "title": "कैंपेन खत्म हो गया है।",
         "description": "हम रिज़ल्ट तय कर रहे हैं। जल्द ही वापस आकर देखें।"
       },
       "participant_finalized": {
-        "title": "कैंपेन के रिज़ल्ट आ गए हैं",
+        "title": "कैंपेन के रिज़ल्ट आ गए हैं।",
         "description": "आप इस बार नहीं जीते। लीडरबोर्ड देखें कि आप कहाँ पर हैं।"
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "आपका रिवॉर्ड आने वाला है — हम जल्द ही आपसे कॉन्टैक्ट करेंगे।"
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "आप जीत गए 💰",
-        "description": "{{campaignName}} से अपना प्राइज़ क्लेम करें",
+        "description": "{{campaignName}} से आज अपना प्राइज़ क्लेम करें।",
         "cta": "विवरण देखें"
       },
-      "participant_no_winner": {
-        "title": "रिज़ल्ट आ गए हैं। 🏅",
-        "description": "{{campaignName}} में अपनी रैंकिंग देखें",
+      "non_winner": {
+        "title": "रिज़ल्ट आ गए हैं 🏅",
+        "description": "{{campaignName}} में अपनी रैंकिंग देखें।",
         "cta": "देखें"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "क्लेम किया गया जीत का ईनाम",
       "predict_deposit": "फ़ंड किया गया प्रेडिक्ट अकाउंट",
       "predict_withdraw": "विदड्रॉवल",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "Money अकाउंट में डिपॉज़िट करें",
+      "money_account_withdraw": "Money अकाउंट से ट्रांसफर करें",
       "default": "ट्रांसेक्शन संबंधी विवरण"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "एक्सप्लोर करें",
+    "crypto_movers": "क्रिप्टो मूवर्स",
+    "perps_movers": "पर्प्स मूवर्स",
     "trending_tokens": "ट्रेंडिंग",
+    "crypto": "क्रिप्टो",
     "stocks": "स्टॉक्स",
     "price_change": "प्राइस में बदलाव",
     "all_networks": "सभी नेटवर्क",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 घंटा",
     "5_minutes": "5 मिनट",
     "networks": "नेटवर्क",
+    "ecosystems": "इकोसिस्टम",
+    "ecosystems_subtitle": "MetaMask पोर्टफोलियो पर विभिन्न चेन में dApps, टोकन्स और NFTs एक्सप्लोर करें",
+    "all_sports": "लोकप्रिय खेल",
+    "basketball": "बास्केटबाल",
+    "football": "फुटबॉल",
+    "soccer": "सॉकर",
+    "tennis": "टेनिस",
+    "f1": "F1",
+    "golf": "गोल्फ़",
+    "all_sports_no_markets": "इस श्रेणी में अभी कोई खुले मार्केट नहीं हैं। कृपया थोड़ी देर बाद देखें या ऊपर से कोई अन्य खेल चुनें।",
+    "load_more": "और लोड करें",
     "sort_by": "इसके अनुसार क्रमबद्ध करें",
     "volume": "वॉल्यूम",
     "market_cap": "मार्केट कैप",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "टोकन, साइट, URL ढूंढें",
     "cancel": "कैंसिल करें",
     "perps": "पर्प्स",
+    "rwa_perps_section": "पर्प्स",
+    "macro_stocks_commodity_perps": "पर्प्स",
+    "macro_pill_stocks": "स्टॉक्स",
+    "macro_pill_commodities": "कमोडिटीज़",
+    "rwa_pill_commodities": "कमोडिटीज़",
+    "rwa_pill_stocks": "स्टॉक्स",
+    "rwa_pill_forex": "फॉरेक्स",
+    "crypto_perps_section": "पर्प्स",
     "predictions": "प्रेडिक्शंस",
     "no_results": "कोई रिज़ल्ट नहीं मिला",
+    "popular": "लोकप्रिय",
     "sites": "साइट्स",
     "popular_sites": "पॉपुलर साइटें",
     "search_sites": "साइट ढूंढें",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "कोई टोकन नहीं मिला",
       "description": "हमें यह टोकन नहीं मिला"
+    },
+    "tabs": {
+      "now": "अब",
+      "macro": "मैक्रो",
+      "rwas": "RWAs",
+      "crypto": "क्रिप्टो",
+      "sports": "स्पोर्ट्स",
+      "dapps": "साइट्स"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "कैंसिल करें",
-      "continue": "जारी रखें"
+      "continue": "जारी रखें",
+      "learn_more": "ज़्यादा जानें",
+      "try_again": "फिर से प्रयास करें"
     },
     "connecting": {
       "title": "आपका {{device}} कनेक्ट हो रहा है...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "कृपया अपने डिवाइस से कनेक्ट करने के लिए ब्लूटूथ चालू करें",
       "bluetooth_scan_failed": "डिवाइस स्कैन नहीं हो पाया। कृपया दोबारा प्रयास करें",
       "bluetooth_connection_failed": "आपके डिवाइस से कनेक्शन नहीं हो पाया। कृपया फिर से कोशिश करें",
+      "camera_permission_denied": "QR कोड स्कैन करने के लिए कैमरा अनुमति आवश्यक है। कृपया इसे अपने डिवाइस सेटिंग्स में चालू करें",
       "not_supported": "यह ऑपरेशन सपोर्टेड नहीं है",
       "unknown_error": "सुनिश्चित करें कि आपका {{device}} इस अकाउंट के लिए सीक्रेट रिकवरी फ्रेज़ या पासफ़्रेज़ के साथ सेटअप किया गया है"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "लोकेशन की अनुमति आवश्यक है",
       "nearby_devices_permission_denied": "नज़दीकी डिवाइस की अनुमति आवश्यक है",
       "scan_failed": "स्कैन नहीं हो पाया",
+      "camera_permission_denied": "कैमरा की अनुमति आवश्यक है",
       "something_went_wrong": "कुछ गलत हो गया"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "वॉलेट सिंक QR कोड स्कैन करें",
+          "body": "अपने हार्डवेयर वॉलेट पर वापस जाएं और एकाउंट्स शेयर या एक्सपोर्ट करने का विकल्प ढूंढें, MetaMask चुनें, फिर QR कोड स्कैन करें।"
+        },
+        "sign": {
+          "title": "सिग्नेचर QR कोड स्कैन करें",
+          "body": "अपने हार्डवेयर वॉलेट पर वापस जाएं और ट्रांसेक्शन को एप्रूव करें, फिर वहां दिखने वाला QR कोड स्कैन करें।"
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "गलत QR कोड",
+          "body": "अपने हार्डवेयर वॉलेट पर वापस जाएं, MetaMask को वॉलेट प्रकार के रूप में चुनें, फिर नया QR कोड जनरेट करके स्कैन करें।"
+        },
+        "sign": {
+          "title": "गलत QR कोड",
+          "body": "अपने हार्डवेयर वॉलेट पर वापस जाएं और ट्रांसेक्शन को एप्रूव करें, फिर वहां दिखने वाला QR कोड स्कैन करें।"
+        }
+      },
+      "ur_decode_error": {
+        "title": "QR कोड पढ़ा नहीं जा सका",
+        "body": "सुनिश्चित करें कि QR कोड पूरी तरह दिखाई दे रहा है और अच्छी रोशनी में है, फिर से प्रयास करें। यदि समस्या बनी रहती है, तो आपको अपने हार्डवेयर वॉलेट का फर्मवेयर अपडेट करना पड़ सकता है।"
+      }
+    },
     "device_selection": {
       "title": "{{device}} चुनें",
       "scanning": "डिवाइस के लिए स्कैन किया जा रहा है...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "वित्त",
-      "cash_empty_description": "आपके पास अभी तक कोई mUSD नहीं है। होमपेज पर Money सेक्शन से स्टेबलकॉइन को mUSD में कन्वर्ट करें।",
-      "cash_empty_description_network_filter": "इस नेटवर्क पर कोई mUSD नहीं है। अपना mUSD देखने के लिए नेटवर्क बदलें।",
+      "money": "वित्त",
+      "money_empty_description": "आपके पास अभी तक कोई mUSD नहीं है। होमपेज पर Money सेक्शन से स्टेबलकॉइन को mUSD में कन्वर्ट करें।",
+      "money_empty_description_network_filter": "इस नेटवर्क पर कोई mUSD नहीं है। अपना mUSD देखने के लिए नेटवर्क बदलें।",
+      "money_empty_state": {
+        "get_started": "शुरू करें",
+        "earn_apy": "{{percentage}}% APY कमाएं"
+      },
+      "money_filled_state": {
+        "add": "जोड़ें",
+        "apy": "{{percentage}}% APY"
+      },
       "tokens": "टोकन",
+      "perps": "पर्प्स",
+      "related_assets": "संबंधित एसेट्स",
       "perpetuals": "परपेचुअल्स",
       "predictions": "प्रेडिक्शंस",
       "whats_happening": "क्या हो रहा है",
+      "whats_happening_ai": "AI",
+      "whats_happening_impact": {
+        "bullish": "बुलिश",
+        "bearish": "बेयरिश",
+        "neutral": "न्यूट्रल"
+      },
       "top_traders": "टॉप ट्रेडर्स",
       "whats_happening_categories": {
         "geopolitical": "जियोपॉलिटिकल",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "{{section}} लोड करने में असमर्थ",
       "retry": "फिर से प्रयास करें"
     }
+  },
+  "sites": {
+    "popular": "लोकप्रिय"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/id.json b/locales/languages/id.json
index f09d09b6c28..212d44a8c08 100644
--- a/locales/languages/id.json
+++ b/locales/languages/id.json
@@ -634,7 +634,8 @@
     "trade": "Berdagang",
     "settings": "Pengaturan",
     "rewards": "Reward",
-    "trending": "Jelajahi"
+    "trending": "Jelajahi",
+    "money": "Dana"
   },
   "drawer": {
     "send_button": "Kirim",
@@ -708,7 +709,11 @@
     "smart_contract_address": "Alamat kontrak cerdas",
     "smart_contract_address_warning": "Alamat penerima mungkin tidak mendukung transfer token langsung, yang dapat mengakibatkan hilangnya dana. Lanjutkan hanya jika Anda yakin kontrak ini dapat menerima transfer.",
     "i_understand": "Saya mengerti",
-    "cancel": "Batal"
+    "cancel": "Batal",
+    "new_address_title": "Alamat baru",
+    "new_address_message": "Anda mengirim ke alamat ini untuk pertama kalinya. Pastikan alamat tersebut benar sebelum melanjutkan:",
+    "alert_navigation_previous": "Peringatan sebelumnya",
+    "alert_navigation_next": "Peringatan berikutnya"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "Trader top",
       "allow_push_notifications": "Izinkan notifikasi push",
       "trades_over_label": "Dapatkan notifikasi perdagangan melalui:",
       "traders_you_follow": "Trader yang Anda ikuti",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "Tidak dapat memuat trader yang Anda ikuti."
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "Notifikasi dari {{traderName}}",
       "allow_push_notifications": "Izinkan notifikasi push",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "Dapatkan notifikasi seputar aktivitas perdagangan {{traderName}}",
+      "manage_traders": "Kelola trader yang Anda ikuti",
       "save": "Simpan"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "Dapatkan peringatan real-time seputar perdagangan dari trader yang Anda ikuti",
       "allow_push_notifications": "Izinkan notifikasi push",
       "trades_over_label": "Dapatkan notifikasi perdagangan melalui:",
       "save": "Simpan",
@@ -1059,7 +1064,12 @@
       "closed": "Ditutup",
       "no_positions": "Belum ada posisi",
       "error_loading_profile": "Tidak dapat memuat profil",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "Lihat di X (Twitter)",
+      "sort": {
+        "value": "Nilai",
+        "pnl_percent": "P&L %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "Kap pasar",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} terjual",
       "no_trades": "Tidak ada perdagangan untuk interval ini",
       "closed_position": "Posisi tertutup",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "Posisi tidak tersedia",
+      "fallback_subtitle": "Kami tidak dapat memuat posisi ini untuk saat ini.",
+      "fallback_back_to_profile": "Kembali ke profil",
+      "fallback_back_to_leaderboard": "Kembali ke papan peringkat"
     },
     "quick_buy": {
       "title": "Beli {{symbol}}",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "MetaMask Predictions",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "Pasar prediksi",
     "market_list": "Daftar pasar",
     "loading": "Memuat...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "Ubah Metode Pembayaran",
+      "add_funds": "Tambahkan Dana",
+      "add": "Tambah",
+      "predict_balance": "Saldo Predict"
+    },
     "order": {
       "available": "Tersedia",
       "cashed_out": "Dicairkan",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "Pasar bergerak dengan cepat, sehingga kami tidak dapat membeli pada harga {{price}}. Coba lagi dengan harga terbaik yang tersedia?",
       "market_busy_body_sell": "Pasar bergerak dengan cepat, sehingga kami tidak dapat menjual pada harga {{price}}. Coba lagi dengan harga terbaik yang tersedia?",
       "order_failed_title": "Order gagal",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "Order tidak dapat diproses. Coba lagi?",
+      "price_changed_title": "Harga berubah",
+      "price_changed_body": "Tidak dapat membeli dengan harga {{price}}. Coba dengan harga pasar?",
       "retry": "Coba lagi",
       "try_again": "Coba lagi",
       "view": "Lihat",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "Penarikan selesai",
       "withdraw_completed_subtitle": "{{amount}} USDC dipindahkan ke dompet Anda",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}} dipindahkan ke dompet Anda",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "Mengerti",
       "error_title": "Terjadi kesalahan",
       "error_description": "Gagal melanjutkan penarikan",
       "try_again": "Coba lagi"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "{{tokenSymbol}} diperlukan untuk melanjutkan",
     "fund_your_wallet": "Danai dompet Anda",
     "get_ready_for_web3": "Siapkan dompet Anda untuk menggunakan web3",
+    "home_onboarding_steps": {
+      "header": "Langkah",
+      "get_started_title": "Mulailah menggunakan MetaMask",
+      "fund_title": "Danai dompet Anda",
+      "fund_subtitle": "Tak ada yang menyukai dompet kosong. Tambahkan dana dengan mudah untuk memulai perdagangan.",
+      "fund_primary": "Tambahkan dana",
+      "trade_title": "Lakukan perdagangan pertama Anda",
+      "trade_subtitle": "Perdagangkan token yang sedang tren di berbagai jaringan untuk mengembangkan portofolio Anda.",
+      "trade_primary": "Berdagang",
+      "notifications_title": "Aktifkan notifikasi",
+      "notifications_subtitle": "Ikuti terus perkembangan pasar untuk mengambil langkah terbaik bagi portofolio Anda.",
+      "notifications_primary": "Aktifkan",
+      "skip": "Lewati",
+      "progress_a11y": "Langkah {{current}} dari {{total}}",
+      "balance_loading_a11y": "Memuat saldo dompet"
+    },
     "add_funds": "Tambahkan dana",
     "next": "Berikutnya",
     "buy_asset": "Beli {{asset}}",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "Nomor tidak valid. Masukkan angka antara 1 dan %{maxSafeChainId}",
     "hide_zero_balance_tokens_title": "Sembunyikan token tanpa saldo",
     "hide_zero_balance_tokens_desc": "Mencegah token tanpa saldo ditampilkan di daftar token Anda.",
+    "haptic_feedback_title": "Umpan balik haptic",
+    "haptic_feedback_desc": "Rasakan getaran halus untuk konfirmasi, kesalahan, dan interaksi. Nonaktifkan untuk mengurangi rangsangan haptic.",
     "token_detection_title": "Autodeteksi token",
     "token_detection_description": "Kami menggunakan API pihak ketiga untuk mendeteksi dan menampilkan token baru yang dikirim ke dompet Anda. Nonaktifkan jika Anda tidak ingin aplikasi menarik data dari layanan tersebut.",
     "theme_button_text": "Ubah tema",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "Paling dapat diandalkan",
         "quote_unknown_provider": "Penyedia tidak dikenal",
         "start_headless_buy": "Mulai headless buy",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "Ganti & mulai headless buy",
         "start_headless_buy_disabled_hint": "Masukkan jumlah yang valid untuk mengaktifkan",
         "start_headless_buy_pending": "Sesi headless aktif — buka BuildQuote",
         "cancel_headless_buy": "Batalkan sesi headless",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "Sesi aktif: {{sessionId}} — memulai kuotasi lain akan membatalkannya.",
         "event_log_title": "Log acara",
         "event_log_empty": "Belum ada acara — mulai sesi headless dan pantau terus perkembangannya.",
         "event_log_started": "sesi dimulai {{sessionId}} (aset={{assetId}}, jumlah={{amount}}, pembayaran={{paymentMethodId}}{{providerSuffix}})",
@@ -3455,9 +3524,9 @@
       },
       "headless_host": {
         "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "loading": "Mempersiapkan alur pembelian…",
+        "no_session": "Sesi headless sudah tidak aktif lagi.",
+        "cancel": "Batalkan"
       }
     },
     "request_feature": "Minta fitur",
@@ -3553,7 +3622,7 @@
     "security_alerts": "Peringatan keamanan",
     "security_alerts_desc": "Fitur ini memperingatkan Anda tentang aktivitas berbahaya dengan meninjau permintaan transaksi dan tanda tangan secara lokal. Selalu lakukan uji tuntas sendiri sebelum menyetujui permintaan apa pun. Tidak ada jaminan bahwa fitur ini akan mendeteksi semua aktivitas berbahaya. Dengan mengaktifkan fitur ini, Anda menyetujui persyaratan penggunaan penyedia.",
     "smart_account_dapp_requests_heading": "Permintaan akun cerdas dari dapp",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "Izinkan dapp meminta fitur akun cerdas untuk akun standar. MetaMask hanya akan melakukan peningkatan ke akun cerdas kami yang telah diaudit.",
     "smart_transactions_opt_in_heading": "Transaksi Pintar",
     "smart_transactions_opt_in_desc_supported_networks": "Aktifkan Transaksi Pintar untuk transaksi yang lebih andal dan aman pada jaringan yang didukung.",
     "smart_transactions_learn_more": "Pelajari selengkapnya",
@@ -3572,6 +3641,39 @@
         "title": "Kartu",
         "reset_onboarding_description": "Reset status pendaftaran Kartu untuk memulai alur pendaftaran dari awal.",
         "reset_onboarding_button": "Reset Status Pendaftaran"
+      },
+      "haptics": {
+        "title": "Haptic",
+        "description": "Pratinjau umpan balik haptic pada perangkat fisik. Ini melewati pengurangan haptic dalam aplikasi dan sakelar pemutus jarak jauh sehingga Anda dapat mengevaluasi setiap pola. Simulator sering kali tidak memutar umpan balik haptic.",
+        "catalog_impacts_heading": "Momen katalog yang berdampak",
+        "notifications_heading": "Pola notifikasi",
+        "selection_heading": "Pemilihan",
+        "notification_success_button": "Notifikasi — Berhasil",
+        "notification_error_button": "Notifikasi — Kesalahan",
+        "notification_warning_button": "Notifikasi — Peringatan",
+        "selection_button": "Pemilihan",
+        "raw_impacts_heading": "Gaya dampak Raw Expo",
+        "raw_impacts_desc": "Gaya dampak expo-haptic langsung untuk perbandingan dengan momen katalog yang dipetakan di atas.",
+        "impacts": {
+          "quick_amount_selection": "Dampak — Pemilihan jumlah cepat",
+          "slider_tick": "Dampak — Centang penggeser",
+          "edge_gesture_engage": "Dampak — Gerakan tepi aktif",
+          "page_navigation": "Dampak — Navigasi halaman",
+          "slider_grip": "Dampak — Grip penggeser",
+          "tab_change": "Dampak — Perubahan tab",
+          "primary_cta": "Dampak — CTA Utama",
+          "pull_to_refresh_engage": "Dampak — Tarik untuk menyegarkan (aktif)",
+          "pull_to_refresh": "Dampak — Tarik untuk menyegarkan (rilis)",
+          "chart_crosshair": "Dampak — Crosshair grafik",
+          "follow_toggle": "Dampak — Tombol beralih ikuti"
+        },
+        "raw_styles": {
+          "light": "Dampak raw — Ringan",
+          "medium": "Dampak raw — Sedang",
+          "heavy": "Dampak raw — Berat",
+          "rigid": "Dampak raw — Kaku",
+          "soft": "Dampak raw — Lembut"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "Prediksi",
     "add_collectible_button": "Tambahkan",
     "info": "Informasi",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "Tukar",
     "convert": "Konversikan",
     "bridge": "Bridge",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "Troubleshoot",
     "deposit_description": "Transfer bank atau kartu dengan biaya rendah",
     "buy_description": "Cocok untuk membeli token tertentu",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "Jual kripto untuk dapat uang tunai",
     "swap_description": "Pertukaran antar token",
     "bridge_description": "Transfer token antar jaringan",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "Gratis",
     "tx_details_not_available": "Tidak tersedia",
     "smart_contract_interaction": "Interaksi kontrak cerdas",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "Deposit ke Akun Dana",
+    "money_account_withdraw": "Transfer dari Akun Dana",
     "swaps_transaction": "Transaksi swap",
     "bridge_transaction": "Bridge",
     "approve": "Setujui",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "DAPATKAN {{percentage}}% PADA\nSTABLECOIN",
-        "description": "Konversikan stablecoin Anda ke mUSD dan dapatkan bonus tahunan hingga {{percentage}}% yang dapat diklaim setiap hari.",
+        "description": "Konversikan stablecoin Anda ke mUSD dan dapatkan bonus tahunan sebesar {{percentage}}%.",
         "terms_apply": "Syarat berlaku.",
         "primary_button": "Mulai",
-        "secondary_button": "Tidak sekarang"
+        "secondary_button": "Tidak sekarang",
+        "checklist": {
+          "dollar_backed": "Didukung oleh dolar",
+          "no_lockups": "Tidak ada penguncian",
+          "daily_bonus": "Bonus harian",
+          "metamask_stablecoins": "Stablecoin MetaMask",
+          "no_metamask_fee": "Tidak ada biaya MetaMask"
+        }
       },
       "buy_musd": "Beli mUSD",
       "get_musd": "Dapatkan mUSD",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Money",
+    "your_balance": "Saldo Anda",
     "apy_label": "APY {{percentage}}%",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "Informasi APY",
     "onboarding": {
       "step_progress": "Langkah {{current}} dari {{total}}",
       "title": "Tambahkan uang",
-      "description": "Beli mUSD dan mulai dapatkan APY hari ini.",
+      "description": "Danai akun Anda dan mulailah mendapatkan APY.",
       "add": "Tambah",
       "step2_title": "Dapatkan Kartu MetaMask",
       "step2_description": "Gunakan saldo Dana selagi masih menghasilkan, di mana pun Mastercard diterima.",
@@ -6497,22 +6611,32 @@
       "card": "Kartu"
     },
     "earnings": {
-      "title": "Pendapatan",
-      "lifetime": "Penghasilan seumur hidup",
-      "projected": "Proyeksi pendapatan"
+      "title": "Estimasi pendapatan",
+      "estimated_monthly": "Bulanan",
+      "estimated_yearly": "Tahunan",
+      "info_label": "Informasi pendapatan"
     },
     "how_it_works": {
       "title": "Cara kerjanya",
-      "description_prefix": "Simpan mUSD di Akun Dana dan raih pendapatan secara otomatis",
-      "description_suffix": ". Mata uang ini didukung dolar, selalu likuid, dan siap untuk digunakan, diperdagangkan, atau dikirim setiap saat."
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "Tambah"
     },
+    "balance_card": {
+      "label": "Saldo dana",
+      "add": "Tambah",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "Raih pendapatan dari kripto",
       "description": "Lihat bagaimana uang Anda dapat bertambah nilainya dari waktu ke waktu dengan mengonversikan kripto menjadi mUSD.",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "Konversikan",
+      "convert_cta": "Convert your crypto",
       "no_fee": "Tidak ada biaya MetaMask",
       "view_all": "Lihat semua",
       "view_potential_earnings": "Lihat potensi penghasilan"
@@ -6522,37 +6646,75 @@
       "subtitle": "Gunakan uang Anda di mana saja.",
       "virtual_card": "Kartu virtual",
       "metal_card": "Kartu logam",
-      "cashback": "cashback {{percentage}}%",
+      "cashback": "pengembalian {{percentage}}% mUSD",
       "get_now": "Dapatkan sekarang",
       "link_title": "Tautkan Kartu MetaMask",
-      "link_subtitle": "Gunakan saldo Dana dan hasilkan.",
-      "link_bullet_cashback": "Cashback hingga 3%",
-      "link_bullet_apy": "Maksimal {{apy}}% APY",
-      "link_card": "Tautkan kartu"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "Tautkan kartu",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "Yang Anda dapatkan",
-      "benefit_auto_earn": "Penghasilan otomatis ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "Amankan uang Anda di mUSD, stablecoin yang didukung dolar dengan rasio 1:1",
       "benefit_liquidity": "Dapatkan likuiditas penuh tanpa penguncian, sehingga Anda dapat melakukan perdagangan atau penarikan setiap saat",
       "benefit_spend_prefix": "Gunakan di lebih dari 150 juta merchant dengan Kartu MetaMask dan dapatkan ",
-      "benefit_spend_cashback": "cashback 1-3%",
-      "benefit_transfer": "Transfer uang ke dompet milik Anda di MetaMask",
-      "benefit_global": "Kirim dan terima uang secara global",
+      "benefit_spend_cashback": "Pengembalian 1-3% mUSD",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "Pelajari selengkapnya"
     },
     "footer": {
-      "add_money": "Tambahkan uang"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "Tambahkan uang",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "Konversikan kripto",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "Depositkan dana",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "Terima dari dompet eksternal",
       "coming_soon": "Segera hadir"
     },
+    "more_sheet": {
+      "title": "Selengkapnya",
+      "how_it_works": "Cara kerjanya",
+      "what_you_get": "Yang Anda dapatkan",
+      "contact_support": "Hubungi dukungan"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "Antar akun",
+      "perps_account": "Akun perp",
+      "predictions_account": "Akun Predictions",
+      "send_external": "Kirim ke alamat eksternal",
+      "withdraw_to_bank": "Tarik uang ke bank"
+    },
+    "apy_tooltip": {
+      "title": "Persentase Hasil Tahunan (APY)",
+      "paragraph_1": "Akun Dana menghasilkan hingga {{percentage}}% secara otomatis.",
+      "paragraph_2": "Nilai yang ditampilkan merupakan estimasi Persentase Hasil Tahunan (APY) berdasarkan kondisi pasar saat ini. APY bersifat variabel dan dapat berubah karena berbagai faktor. Nilai ini dihasilkan oleh platform DeFi pihak ketiga yang menyalurkan dana dalam protokol blockchain.",
+      "paragraph_3": "Saat menautkan Kartu MetaMask, pembelian akan dipotong dari saldo ini."
+    },
+    "earnings_tooltip": {
+      "title": "Estimasi pendapatan",
+      "body": "Estimasi berapa banyak yang dapat Anda peroleh selama periode tertentu berdasarkan saldo saat ini dan APY (Persentase Hasil Tahunan) hari ini. Estimasi ini bukan jaminan pengembalian dan dapat berubah sewaktu-waktu."
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "Aktivitas",
       "view_all": "Lihat semua",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "Dana",
       "section_title": "Cara kerjanya",
-      "description_1": "Akun Dana milik Anda secara otomatis menghasilkan APY 4% (variabel). Dana masuk ke dalam brankas DeFi pilihan yang menghasilkan keuntungan di pasar pinjaman yang diaudit—tanpa stake, tanpa klaim, tanpa penguncian.",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "Saldo Dana merupakan saldo penggunaan Anda. Hubungkan Kartu MetaMask untuk digunakan di lebih dari 150 juta merchant di seluruh dunia. Dana Anda terus menghasilkan keuntungan hingga saat Anda menggunakannya.",
-      "faq_title": "Pertanyaan Umum",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "Segera hadir.",
-      "faq_q1": "Apa itu akun Dana?",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "Apa itu mUSD?",
       "faq_q3": "Dari mana hasil tersebut berasal?",
       "faq_q4": "Apakah dana saya terkunci? Bisakah saya menarik dana setiap saat?",
@@ -6608,8 +6770,7 @@
       "faq_q7": "Apakah tingkat APY berubah?",
       "faq_q8": "Apakah ini rekening tabungan atau rekening penggunaan?",
       "faq_q9": "Siapa yang mengontrol dana saya?",
-      "faq_q10": "Berapa cashback yang saya dapatkan dengan Kartu MetaMask?",
-      "sounds_good": "Kedengarannya bagus"
+      "faq_q10": "Berapa mUSD yang saya dapatkan dengan Kartu MetaMask?"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "Batalkan",
     "confirm": "Konfirmasikan",
+    "pay_with_bottom_sheet": {
+      "title": "Bayar melalui",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "Dengan melanjutkan, Anda menyetujui ",
       "terms_of_use": "Ketentuan Penggunaan",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "Tarik",
       "predict_deposit": "Tambahkan dana Prediction",
       "predict_withdraw": "Tarik",
-      "money_account_deposit": "Tambahkan dana",
-      "money_account_withdraw": "Tarik dana"
+      "money_account_add_money": "Tambahkan uang",
+      "money_account_transfer_money": "Transfer uang"
     },
     "sub_title": {
       "permit": "Situs ini meminta izin untuk menggunakan token Anda.",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "Kami akan menukar token Anda dengan USDC di HyperCore, jaringan yang digunakan oleh Perp. Penyedia swap mungkin akan mengenakan biaya, tetapi MetaMask tidak."
       },
       "predict_deposit": {
-        "transaction_fee": "Kami akan menukar token Anda dengan USDC.e di Polygon, jaringan yang digunakan oleh Predictions. Penyedia swap mungkin akan mengenakan biaya, tetapi MetaMask tidak."
+        "transaction_fee": "Kami akan menukar token Anda dengan pUSD di Polygon, jaringan yang digunakan oleh Predictions. Penyedia swap mungkin akan mengenakan biaya, tetapi MetaMask tidak."
       },
       "perps_withdraw": {
         "transaction_fee": "MetaMask akan menukar token Anda ke token yang diinginkan. MetaMask tidak mengenakan biaya saat Anda menukar ke mUSD."
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "Biaya konversi mUSD mencakup biaya jaringan dan mungkin termasuk biaya penyedia. MetaMask tidak mengenakan biaya saat Anda mengonversi ke mUSD."
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "Biaya"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "Beli kripto",
       "buy_predict": "Tambahkan dana ke dompet Anda untuk menggunakan Prediksi.",
-      "buy_perps": "Tambahkan dana ke dompet Anda untuk menggunakan Perp."
+      "buy_perps": "Tambahkan dana ke dompet Anda untuk menggunakan Perp.",
+      "projected_five_year_balance": "Proyeksi saldo 5 tahun:"
     },
     "unlimited": "Tak terbatas",
     "all": "Semua",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "Lanjutkan",
     "deposit_edit_amount_done": "Tambahkan dana",
     "deposit_edit_amount_predict_withdraw": "Tarik",
-    "deposit_edit_amount_musd_conversion": "Konversikan ke mUSD"
+    "deposit_edit_amount_musd_conversion": "Konversikan ke mUSD",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "Hasil telah berubah",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "Swap",
     "terms_and_conditions": "Syarat & Ketentuan",
     "select_token": "Pilih token",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "Tidak ada token yang ditemukan",
     "no_tokens_found_description": "Kami tidak dapat menemukan token dengan nama ini. Coba pencarian lain.",
     "select_network": "Pilih jaringan",
@@ -7115,6 +7303,7 @@
     "receive_at": "Terima di",
     "recipient": "Penerima",
     "select_recipient": "Pilih penerima",
+    "select_account": "Pilih akun",
     "external_account": "Akun eksternal",
     "error_banner_description": "Rute perdagangan ini tidak tersedia untuk saat ini. Coba ubah jumlah, jaringan, atau token, dan kami akan mencari opsi terbaik.",
     "stock_token_error_banner_description": "Rute perdagangan ini tidak tersedia untuk saat ini. Coba ubah jumlah, jaringan, atau token, dan kami akan menemukan opsi terbaik.\n\nIngatlah bahwa jika Anda mencoba memperdagangkan Saham Token Ondo, Anda mungkin akan dibatasi secara geografis, misalnya melalui AS, Uni Eropa, Britania Raya, dan Brasil.",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "Dampak harga tinggi",
     "price_impact_error_title": "Dampak harga sangat tinggi",
     "price_impact_error_description": "Anda akan kehilangan sekitar {{priceImpact}} dari harga pasar token Anda pada swap ini. Cobalah perdagangan yang lebih kecil atau rute yang lebih likuid untuk meningkatkan tarif Anda.",
+    "insufficient_native_reserve_cta": "Gunakan jumlah maks yang diizinkan",
+    "insufficient_native_reserve_message": "Jaringan ini membutuhkan minimal {{minimumReserve}} {{ticker}} untuk tetap berada di akun Anda. Anda dapat menggunakan maksimal {{maxSwappable}} {{ticker}}",
+    "insufficient_native_reserve_title": "Saldo cadangan minimum {{ticker}} diperlukan",
     "token_warning_suspicious_banner": "{{token}} adalah token yang mencurigakan.",
     "token_warning_malicious_banner": "{{token}} adalah token berbahaya. Berhati-hatilah saat berinteraksi dengan token ini.",
     "token_warning_modal_suspicious_title": "Token mencurigakan",
@@ -7542,17 +7734,17 @@
         "price": "Gratis",
         "feature_1": "Kartu virtual untuk Apple Pay dan Google Pay",
         "feature_2": "Bayar dengan kripto (USDC, USDT, WETH, dan lainnya)",
-        "feature_3": "Cashback 1% USDC untuk setiap pembelian"
+        "feature_3": "Pengembalian 1% mUSD untuk setiap pembelian"
       },
       "metal_card": {
         "name": "Kartu Logam",
         "price": "$199/tahun",
         "everything_in_virtual": "Semuanya serba virtual, ditambah:",
         "feature_1": "Kartu logam berukir premium",
-        "feature_2": "Cashback 3% untuk $10.000 pertama/tahun",
+        "feature_2": "Pengembalian 3% mUSD untuk $10.000 pertama/tahun",
         "feature_3": "Tidak ada biaya transaksi luar negeri"
       },
-      "earn_up_to_badge": "Dapatkan cashback hingga $300 setiap tahunnya",
+      "earn_up_to_badge": "Dapatkan pengembalian hingga $300 setiap tahunnya",
       "upgrade_to_metal_label": "Atau tingkatkan ke Metal untuk mendapatkan reward 3x"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "KARTU ANDA\nSUDAH DIPESAN",
       "subtitle": "Kartu akan tiba dalam waktu 4 sampai 6 minggu.",
-      "description": "Atur kartu virtual Anda dan tambahkan ke dompet digital untuk mulai mendapatkan cashback.",
+      "description": "Atur kartu virtual Anda dan tambahkan ke dompet digital untuk mulai mendapatkan pengembalian mUSD.",
       "set_up_card_button": "Atur kartu",
       "back_to_card_button": "Kembali ke Kartu"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "Gunakan\ndan Dapatkan",
-      "description": "Kartu MetaMask merupakan cara cepat dan mudah untuk menggunakan kripto dan mendapatkan cashback hingga 3%.",
+      "description": "Kartu MetaMask merupakan cara cepat dan mudah untuk menggunakan kripto dan mendapatkan pengembalian hingga 3% mUSD.",
       "apply_now_button": "Atur sekarang",
       "login_button": "Masuk",
       "not_now_button": "Tidak sekarang",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "Aktifkan kartu",
       "enable_assets_button_label": "Aktifkan aset",
       "spending_limit_warning": "Batas penggunaan hampir tercapai. Perbarui untuk menghindari penolakan.",
+      "spending_limit_available": "tersedia",
       "logout": "Keluar",
       "contact_support": "Hubungi dukungan",
       "logout_confirmation_title": "Keluar dari Kartu?",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "Syarat dan Ketentuan",
         "order_metal_card": "Kartu Logam",
         "order_metal_card_description": "Pesan Kartu Logam fisik sekarang",
-        "cashback": "Cashback",
-        "cashback_description": "Dapatkan pengembalian 1% untuk semua penggunaan",
-        "cashback_description_metal": "Dapatkan pengembalian 3% untuk semua penggunaan",
+        "cashback": "Pengembalian mUSD",
+        "cashback_description": "Dapatkan pengembalian 1% mUSD untuk semua penggunaan",
+        "cashback_description_metal": "Dapatkan pengembalian 3% mUSD untuk semua penggunaan",
         "freeze_card": "Blokir kartu",
         "unfreeze_card": "Buka blokir kartu",
         "freeze_card_description": "Jeda semua penggunaan kartu",
@@ -7917,8 +8110,8 @@
       "token_label": "Token"
     },
     "cashback_screen": {
-      "title": "Cashback",
-      "available_cashback": "Cashback yang tersedia",
+      "title": "Pengembalian mUSD",
+      "available_cashback": "mUSD yang tersedia",
       "network_fee": "Biaya jaringan",
       "expected_to_receive": "Diharapkan menerima",
       "withdraw": "Tarik",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "Penarikan telah dimulai",
       "withdrawal_success": "Penarikan berhasil diselesaikan",
       "withdrawal_failed": "Penarikan gagal. Coba lagi.",
-      "no_cashback": "Cashback tidak tersedia",
-      "loading_error": "Gagal memuat cashback. Coba lagi."
+      "no_cashback": "Pengembalian mUSD tidak tersedia",
+      "loading_error": "Gagal memuat pengembalian mUSD. Coba lagi.",
+      "funding_required": {
+        "title": "Atur pendanaan Linea",
+        "description": "Anda memerlukan minimal satu sumber pendanaan yang disetujui di Linea sebelum menukar pengembalian mUSD.",
+        "confirm_button_label": "Atur pendanaan"
+      }
     },
     "change_asset": {
       "title": "Ubah token dan jaringan",
@@ -8032,7 +8230,8 @@
     "title": "Pilih metode pembayaran",
     "title_receive": "Pilih terima token",
     "no_gas": "Tidak ada saldo asli untuk gas",
-    "not_supported": "Tidak didukung"
+    "not_supported": "Tidak didukung",
+    "crypto": "Kripto"
   },
   "connection_removed_modal": {
     "title": "Koneksi dihapus",
@@ -8048,6 +8247,15 @@
       "title": "Gagal berpartisipasi",
       "description": "Periksa koneksi Anda dan coba lagi."
     },
+    "notifications_nudge": {
+      "title": "Jangan lewatkan",
+      "description": "Aktifkan notifikasi agar Anda tetap mendapatkan informasi terbaru seputar kampanye.",
+      "turn_on_button": "Aktifkan",
+      "loading": "Mengaktifkan notifikasi...",
+      "loading_description": "Butuh waktu beberapa saat.",
+      "enable_error": "Gagal mengaktifkan notifikasi",
+      "success": "Notifikasi diaktifkan"
+    },
     "version_guard": {
       "title": "Pembaruan diperlukan",
       "description": "Versi MetaMask yang lebih baru diperlukan untuk menggunakan Reward. Perbarui untuk melanjutkan.",
@@ -8126,6 +8334,17 @@
       "retry_button": "Coba lagi"
     },
     "main_title": "Reward",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "Rujukan",
     "referral_stats_earned_from_referrals": "Diperoleh dari rujukan",
     "referral_stats_referrals": "Rujukan",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "Peningkatan aktif",
     "season_1": "Musim 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "kalkulator bonus mUSD",
-      "description": "Lihat berapa banyak yang bisa diperoleh dengan mengonversi stablecoin Anda menjadi mUSD.",
-      "amount_label": "Jumlah yang dikonversi",
-      "estimated_bonus": "Estimasi bonus tahunan: hingga 3%",
-      "initial_amount": "Jumlah awal",
-      "daily_bonus": "Bonus yang dapat diklaim setiap hari",
-      "annualized_bonus": "Bonus tahunan",
-      "disclaimer": "Ini hanya estimasi. Bonus dapat berubah sewaktu-waktu.",
-      "disclaimer_brief": "Bonus tersebut merupakan estimasi dan dapat berubah.",
+      "page_title": "kalkulator mUSD",
+      "hero_hold": "Tahan mUSD.",
+      "hero_earn": "Dapatkan",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/tahun",
+      "earnings_per_month_suffix": "/bulan",
+      "earnings_per_day_suffix": "/hari dapat diklaim setiap hari",
+      "slider_amount_label": "Jumlah",
+      "disclaimer_calculator": "Estimasi berdasarkan bonus 3%. Nilai dapat berubah. Dapat diklaim setiap saat.",
       "buy_button": "Beli mUSD",
       "swap_button": "Swap ke mUSD"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "Berakhir {{date}}",
       "ended_date": "Berakhir pada {{date}}",
       "pill_up_next": "Segera hadir",
+      "up_next": "Selanjutnya",
+      "notify_me": "Beri tahu saya",
       "pill_active": "Langsung",
       "pill_complete": "Selesaikan",
       "enter": "Masuk",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "Tidak tersedia di wilayah Anda",
       "geo_locked_toast_description": "Kampanye ini tidak tersedia di lokasi Anda. Periksa kembali nanti untuk kampanye baru.",
       "geo_locked_cta": "Periksa kelayakan",
-      "geo_loading": "Memeriksa wilayah..."
+      "geo_loading": "Memeriksa wilayah...",
+      "remind_me_success_toast": "Kami akan memberi tahu Anda kapan kampanye ini dimulai.",
+      "remind_me_save_error": "Tidak dapat menyimpan pengingat. Coba lagi."
     },
     "campaign_mechanics": {
       "title": "Mekanika"
@@ -8479,10 +8701,10 @@
       "qualified_description": "Tingkatkan arus masuk bersih untuk mencapai tingkatan yang lebih tinggi dan raih peluang untuk mendapatkan bayaran yang lebih besar.",
       "not_eligible_title": "Tidak memenuhi syarat",
       "not_eligible_description": "Perdagangan yang dibuka sangat terlambat untuk memenuhi persyaratan kepemilikan selama {{days}} hari tidak akan dihitung untuk peringkat atau tingkatan Anda.",
-      "completed_label_total_participants": "Total participants",
+      "completed_label_total_participants": "Total peserta",
       "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_top_return": "Pengembalian tertinggi",
+      "completed_label_winners": "Pemenang"
     },
     "ondo_campaign_activity": {
       "title": "Semua aktivitas",
@@ -8508,6 +8730,48 @@
       "cancel": "Batalkan",
       "confirm": "Saya mengerti"
     },
+    "perps_trading_campaign": {
+      "title": "Kompetisi Perdagangan Perp",
+      "stats_title": "Statistik",
+      "performance_title": "Performa",
+      "label_rank": "Peringkat",
+      "label_your_rank": "Peringkat Anda",
+      "label_pnl": "PnL",
+      "label_volume": "Volume",
+      "label_notional_volume": "Volume notional",
+      "pending": "Menunggu",
+      "qualified": "Memenuhi syarat",
+      "open_position_cta": "Buka Posisi",
+      "leaderboard_title": "Papan Peringkat",
+      "leaderboard_total_participants": "{{count}} peserta",
+      "last_updated": "Terakhir diperbarui: {{time}}",
+      "leaderboard_error_loading": "Gagal memuat papan peringkat",
+      "leaderboard_error_loading_description": "Terjadi kesalahan saat memuat papan peringkat. Coba lagi.",
+      "leaderboard_not_yet_computed": "Papan peringkat belum dihitung. Periksa kembali nanti.",
+      "leaderboard_powered_by_prefix": "Didukung oleh ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "Pool hadiah",
+      "prize_pool_current_label": "Saat ini",
+      "prize_pool_next_label": "Berikutnya",
+      "prize_pool_volume_subtext": "{{current}} dari {{target}} volume",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}}+ volume — semua pencapaian tercapai",
+      "prize_pool_max_badge": "Maks",
+      "prize_pool_error_title": "Gagal memuat pool hadiah",
+      "prize_pool_error_description": "Terjadi kesalahan saat memuat pool hadiah. Coba lagi.",
+      "prize_pool_retry_button": "Coba lagi",
+      "stats_notional_volume_threshold": "${{amount}} diperlukan",
+      "stats_qualified_title": "Anda memenuhi syarat",
+      "stats_qualified_description": "Terus lakukan perdagangan untuk meningkatkan PnL dan naiki papan peringkat sebelum kompetisi berakhir.",
+      "stats_qualify_for_rank_title": "Memenuhi syarat untuk peringkat ini",
+      "stats_qualify_for_rank_description": "Lakukan perdagangan {{notionalRemaining}} lagi dalam volume notional untuk memenuhi syarat.",
+      "stats_error_title": "Tidak dapat memuat statistik",
+      "stats_error_description": "Terjadi masalah saat memuat statistik. Coba lagi.",
+      "stats_retry": "Coba lagi",
+      "completed_label_total_participants": "Total peserta",
+      "completed_label_total_volume": "Volume total",
+      "completed_label_top_pnl": "PnL Tertinggi",
+      "completed_label_winners": "Pemenang"
+    },
     "campaigns_preview": {
       "title": "Kampanye",
       "coming_soon": "Segera hadir",
@@ -8532,29 +8796,29 @@
       "retry_button": "Coba lagi",
       "refreshing": "Menyegarkan..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "Anda menang",
       "rank_label": "{{place}} tempat",
-      "email_instructions": "Kirimkan kode Anda ke ondocampaign@consensys.net untuk mengklaim hadiah Anda.",
+      "email_instructions": "Kirimkan kode Anda ke {{email}} untuk mengklaim hadiah Anda.",
       "open_mail": "Buka surat",
       "skip_for_now": "Lewati untuk saat ini",
-      "mail_subject": "Klaim hadiah kampanye Ondo",
+      "mail_subject": "klaim hadiah {{campaignName}}",
       "mail_body": "Kode pemenang: {{code}}",
       "winning_code": "Kode pemenang",
       "close_a11y": "Tutup"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "Anda menang",
-        "description": "Klaim hadiah Anda hari ini.",
-        "a11y": "Buka detail pemenang"
+        "title": "Anda menang!",
+        "description": "Verifikasikan kode kemenangan Anda dan klaim hadiah Anda hari ini.",
+        "a11y": "Lihat detail"
       },
       "participant_pending": {
         "title": "Kampanye telah berakhir.",
         "description": "Kami sedang menentukan hasilnya. Periksa kembali sesaat lagi."
       },
       "participant_finalized": {
-        "title": "Hasil kampanye telah keluar",
+        "title": "Hasil kampanye telah keluar.",
         "description": "Anda tidak menang kali ini. Periksa papan peringkat untuk melihat posisi Anda."
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "Reward sedang dikirim — kami akan segera menghubungi Anda."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "Anda menang 💰",
-        "description": "Klaim hadiah dari {{campaignName}}",
+        "description": "Klaim hadiah Anda dari {{campaignName}} hari ini.",
         "cta": "Lihat detail"
       },
-      "participant_no_winner": {
-        "title": "Hasilnya sudah keluar. 🏅",
-        "description": "Lihat peringkat Anda di {{campaignName}}",
+      "non_winner": {
+        "title": "Hasilnya sudah keluar 🏅",
+        "description": "Lihat peringkat Anda di {{campaignName}}.",
         "cta": "Lihat"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "Klaim kemenangan",
       "predict_deposit": "Akun Predict yang didanai",
       "predict_withdraw": "Penarikan",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "Deposit ke Akun Dana",
+      "money_account_withdraw": "Transfer dari Akun Dana",
       "default": "Detail transaksi"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "Jelajahi",
-    "trending_tokens": "Tren",
+    "crypto_movers": "Penggerak kripto",
+    "perps_movers": "Penggerak perp",
+    "trending_tokens": "Sedang tren",
+    "crypto": "Kripto",
     "stocks": "Saham",
     "price_change": "Perubahan harga",
     "all_networks": "Semua jaringan",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 jam",
     "5_minutes": "5 menit",
     "networks": "Jaringan",
+    "ecosystems": "Ekosistem",
+    "ecosystems_subtitle": "Jelajahi dApp, token, dan NFT lintas chain di MetaMask Portfolio",
+    "all_sports": "Olahraga populer",
+    "basketball": "Basket",
+    "football": "Sepak bola",
+    "soccer": "Sepak bola",
+    "tennis": "Tenis",
+    "f1": "F1",
+    "golf": "Golf",
+    "all_sports_no_markets": "Belum ada pasar terbuka di kategori ini. Periksa kembali segera atau pilih olahraga lain di atas.",
+    "load_more": "Muat lainnya",
     "sort_by": "Urutkan sesuai",
     "volume": "Volume",
     "market_cap": "Kap pasar",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "Cari token, situs, URL",
     "cancel": "Batal",
     "perps": "Perps",
+    "rwa_perps_section": "Perp",
+    "macro_stocks_commodity_perps": "Perp",
+    "macro_pill_stocks": "Saham",
+    "macro_pill_commodities": "Komoditas",
+    "rwa_pill_commodities": "Komoditas",
+    "rwa_pill_stocks": "Saham",
+    "rwa_pill_forex": "Forex",
+    "crypto_perps_section": "Perp",
     "predictions": "Prediksi",
     "no_results": "Hasil tidak ditemukan",
+    "popular": "Populer",
     "sites": "Situs",
     "popular_sites": "Situs populer",
     "search_sites": "Cari situs",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "Tidak ada token yang ditemukan",
       "description": "Kami tidak dapat menemukan token ini"
+    },
+    "tabs": {
+      "now": "Sekarang",
+      "macro": "Makro",
+      "rwas": "RWA",
+      "crypto": "Kripto",
+      "sports": "Olahraga",
+      "dapps": "Situs"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "Batal",
-      "continue": "Lanjutkan"
+      "continue": "Lanjutkan",
+      "learn_more": "Pelajari selengkapnya",
+      "try_again": "Coba lagi"
     },
     "connecting": {
       "title": "Menghubungkan {{device}} Anda...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "Aktifkan Bluetooth untuk terhubung ke perangkat Anda",
       "bluetooth_scan_failed": "Gagal memindai perangkat. Coba lagi",
       "bluetooth_connection_failed": "Koneksi ke perangkat Anda gagal. Coba lagi",
+      "camera_permission_denied": "Izin akses kamera diperlukan untuk memindai kode QR. Aktifkan di pengaturan perangkat Anda",
       "not_supported": "Operasi ini tidak didukung",
       "unknown_error": "Pastikan {{device}} Anda telah diatur dengan Frasa Pemulihan Rahasia atau passphrase untuk akun ini"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "Izin Lokasi Diperlukan",
       "nearby_devices_permission_denied": "Izin Perangkat Terdekat Diperlukan",
       "scan_failed": "Pemindaian Gagal",
+      "camera_permission_denied": "Izin Kamera Diperlukan",
       "something_went_wrong": "Terjadi kesalahan"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "Pindai kode QR sinkronisasi dompet",
+          "body": "Kembali ke dompet perangkat keras dan temukan opsi untuk berbagi atau mengekspor akun Anda, pilih MetaMask, lalu pindai kode QR."
+        },
+        "sign": {
+          "title": "Pindai kode QR tanda tangan",
+          "body": "Kembali ke dompet perangkat keras dan setujui transaksi, lalu pindai kode QR yang muncul."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "Kode QR salah",
+          "body": "Kembali ke dompet perangkat keras, pilih MetaMask sebagai jenis dompet, lalu buat dan pindai kode QR baru."
+        },
+        "sign": {
+          "title": "Kode QR salah",
+          "body": "Kembali ke dompet perangkat keras dan setujui transaksi, lalu pindai kode QR yang muncul."
+        }
+      },
+      "ur_decode_error": {
+        "title": "Tidak dapat membaca kode QR",
+        "body": "Pastikan kode QR terlihat jelas dan terang, lalu coba lagi. Jika masalah berlanjut, Anda mungkin perlu memperbarui firmware dompet perangkat keras."
+      }
+    },
     "device_selection": {
       "title": "Pilih {{device}}",
       "scanning": "Memindai perangkat...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Dana",
-      "cash_empty_description": "Anda belum memiliki mUSD. Konversikan stablecoin ke mUSD dari bagian Dana di halaman utama.",
-      "cash_empty_description_network_filter": "Tidak ada mUSD di jaringan ini. Ganti jaringan untuk melihat mUSD milik Anda.",
+      "money": "Dana",
+      "money_empty_description": "Anda belum memiliki mUSD. Konversikan stablecoin ke mUSD dari bagian Dana di halaman utama.",
+      "money_empty_description_network_filter": "Tidak ada mUSD di jaringan ini. Ganti jaringan untuk melihat mUSD milik Anda.",
+      "money_empty_state": {
+        "get_started": "Mulai",
+        "earn_apy": "Dapatkan APY {{percentage}}%"
+      },
+      "money_filled_state": {
+        "add": "Tambah",
+        "apy": "APY {{percentage}}%"
+      },
       "tokens": "Token",
+      "perps": "Perp",
+      "related_assets": "Aset Terkait",
       "perpetuals": "Abadi",
       "predictions": "Prediksi",
       "whats_happening": "Apa yang sedang terjadi",
+      "whats_happening_ai": "AI",
+      "whats_happening_impact": {
+        "bullish": "Bullish",
+        "bearish": "Bearish",
+        "neutral": "Netral"
+      },
       "top_traders": "Trader Top",
       "whats_happening_categories": {
         "geopolitical": "Geopolitik",
@@ -8819,7 +9160,7 @@
       },
       "defi": "DeFi",
       "nfts": "NFT",
-      "trending_tokens": "Tren",
+      "trending_tokens": "Sedang tren",
       "trending_perpetuals": "Perpetual yang tren",
       "trending_predictions": "Prediksi yang tren",
       "import_nfts": "Impor NFT",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "Tidak dapat memuat {{section}}",
       "retry": "Coba lagi"
     }
+  },
+  "sites": {
+    "popular": "Populer"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/ja.json b/locales/languages/ja.json
index 6fc4b1ccb40..11f65ee17ce 100644
--- a/locales/languages/ja.json
+++ b/locales/languages/ja.json
@@ -634,7 +634,8 @@
     "trade": "取引",
     "settings": "設定",
     "rewards": "報酬",
-    "trending": "閲覧"
+    "trending": "閲覧",
+    "money": "マネー"
   },
   "drawer": {
     "send_button": "送信",
@@ -708,7 +709,11 @@
     "smart_contract_address": "スマートコントラクトアドレス",
     "smart_contract_address_warning": "この受取人のアドレスはトークンの直接送金に対応していない可能性があり、資金を失うおそれがあります。これが送金を受け取れるコントラクトであることを確信している場合のみ、続行してください。",
     "i_understand": "理解しています",
-    "cancel": "キャンセル"
+    "cancel": "キャンセル",
+    "new_address_title": "新しいアドレス",
+    "new_address_message": "このアドレスに初めて送金しようとしています。続行する前に正しいことを確認してください:",
+    "alert_navigation_previous": "前のアラート",
+    "alert_navigation_next": "次のアラート"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "トップトレーダー",
       "allow_push_notifications": "プッシュ通知を許可する",
       "trades_over_label": "次の手段で取引の通知を受ける:",
       "traders_you_follow": "フォローしているトレーダー",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "フォローしているトレーダーを読み込めません。"
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "{{traderName}}からの通知",
       "allow_push_notifications": "プッシュ通知を許可する",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "{{traderName}}のトレーディングに関する通知を受け取る",
+      "manage_traders": "フォローするトレーダーの管理",
       "save": "保存"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "フォローしているトレーダーのトレーディングに関して、リアルタイムのアラートを受け取れます",
       "allow_push_notifications": "プッシュ通知を許可する",
       "trades_over_label": "次の手段で取引の通知を受ける:",
       "save": "保存",
@@ -1059,7 +1064,12 @@
       "closed": "クローズ済み",
       "no_positions": "まだポジションがありません",
       "error_loading_profile": "プロフィールを読み込めませんでした",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "X (Twitter) で表示",
+      "sort": {
+        "value": "価値",
+        "pnl_percent": "損益額 %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "時価総額",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}}さんが売却しました",
       "no_trades": "この期間取引はありません",
       "closed_position": "ポジションをクローズ",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "ポジションが利用できません",
+      "fallback_subtitle": "現在、このポジションを読み込むことができません。",
+      "fallback_back_to_profile": "プロフィールに戻る",
+      "fallback_back_to_leaderboard": "リーダーボードに戻る"
     },
     "quick_buy": {
       "title": "{{symbol}}を購入",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "MetaMask 予測",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "予測市場",
     "market_list": "市場リスト",
     "loading": "読み込み中...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "支払方法を変更",
+      "add_funds": "資金を追加",
+      "add": "追加",
+      "predict_balance": "予測用残高"
+    },
     "order": {
       "available": "使用可能",
       "cashed_out": "キャッシュアウト済み",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "市場が急速に動いているため、{{price}}で購入できませんでした。取引可能な最も有利な価格でもう一度試しますか？",
       "market_busy_body_sell": "市場が急速に動いているため、{{price}}で売却できませんでした。取引可能な最も有利な価格でもう一度試しますか？",
       "order_failed_title": "注文に失敗しました",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "注文が約定しませんでした。もう一度試しますか？",
+      "price_changed_title": "価格が変動しました",
+      "price_changed_body": "{{price}}で買付できませんでした。市場価格で試しますか？",
       "retry": "再試行",
       "try_again": "もう一度お試しください",
       "view": "表示",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "出金完了",
       "withdraw_completed_subtitle": "{{amount}} USDCがウォレットに移動されました",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}}がウォレットに移動されました",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "了解",
       "error_title": "問題が発生しました",
       "error_description": "出金に失敗しました",
       "try_again": "再試行してください"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "続けるには{{tokenSymbol}}が必要です",
     "fund_your_wallet": "ウォレットへの入金",
     "get_ready_for_web3": "Web3を使用できるようにウォレットを準備しましょう",
+    "home_onboarding_steps": {
+      "header": "手順",
+      "get_started_title": "MetaMaskを始める",
+      "fund_title": "ウォレットへの入金",
+      "fund_subtitle": "空のウォレットが好きな人はいません。簡単に資金を追加して取引を始められます。",
+      "fund_primary": "資金を追加",
+      "trade_title": "初めての取引を行う",
+      "trade_subtitle": "複数のネットワークで人気のトークンを取引して、ポートフォリオを成長させましょう。",
+      "trade_primary": "取引",
+      "notifications_title": "通知をオンにする",
+      "notifications_subtitle": "最新のマーケットの動きを把握して、ポートフォリオに合った最善の一手を打ちましょう。",
+      "notifications_primary": "オンにする",
+      "skip": "スキップ",
+      "progress_a11y": "ステップ{{current}}/{{total}}",
+      "balance_loading_a11y": "ウォレットの残高を読み込んでいます"
+    },
     "add_funds": "資金を追加",
     "next": "次へ",
     "buy_asset": "{{asset}}を購入",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "無効な数字です。1と%{maxSafeChainId}の間に数字を入力してください。",
     "hide_zero_balance_tokens_title": "残高のないトークンを非表示",
     "hide_zero_balance_tokens_desc": "トークンリストに残高がないトークンが表示されないようにします。",
+    "haptic_feedback_title": "触覚フィードバック",
+    "haptic_feedback_desc": "承認、エラー、インタラクションを表すわずかな振動を感じます。触覚刺激を減らしたい場合は無効にします。",
     "token_detection_title": "トークンの自動検出",
     "token_detection_description": "サードパーティーAPIを使用して、ウォレットに送られた新しいトークンを検出・表示します。アプリがこれらのサービスからデータを取得しないようにするには、オフにしてください。",
     "theme_button_text": "テーマを変更",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "信頼性が最も高い",
         "quote_unknown_provider": "不明なプロバイダー",
         "start_headless_buy": "ヘッドレス購入を開始",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "置き換え & ヘッドレス購入の開始",
         "start_headless_buy_disabled_hint": "有効にするには、有効な金額を入力してください",
         "start_headless_buy_pending": "ヘッドレスセッションが有効です — BuildQuoteを開く",
         "cancel_headless_buy": "ヘッドレスセッションをキャンセル",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "アクティブなセッション: {{sessionId}} — 別のクォートを開始するとキャンセルされます。",
         "event_log_title": "イベントログ",
         "event_log_empty": "まだイベントがありません — ヘッドレスセッションを開始してこのスペースをご覧ください。",
         "event_log_started": "セッション{{sessionId}}を開始しました (資産={{assetId}}、金額={{amount}}、支払い={{paymentMethodId}}{{providerSuffix}})",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "消費者によりキャンセルされたセッション{{sessionId}}"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "ヘッドレス購入",
+        "loading": "購入フローを準備中…",
+        "no_session": "ヘッドレスセッションがアクティブでなくなりました。",
+        "cancel": "キャンセル"
       }
     },
     "request_feature": "機能のリクエスト",
@@ -3553,7 +3622,7 @@
     "security_alerts": "セキュリティアラート",
     "security_alerts_desc": "この機能は、トランザクションと署名要求をローカルで確認することで、悪質な行為に関するアラートを発します。要求を承認する前に、必ず独自のデューデリジェンスを行ってください。この機能がすべての悪質な行為を検出するという保証はありません。この機能を有効にすることで、プロバイダーの利用規約に同意したものとみなされます。",
     "smart_account_dapp_requests_heading": "DAppからのスマートアカウントリクエスト",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "DAppによる、標準アカウントでのスマートアカウント機能の利用要求を許可します。MetaMaskは、監査済みのスマートアカウントにのみアップグレードします。",
     "smart_transactions_opt_in_heading": "スマートトランザクション",
     "smart_transactions_opt_in_desc_supported_networks": "スマートトランザクションをオンにして、サポートされているネットワーク上でのトランザクションの信頼性と安全性を高めましょう。",
     "smart_transactions_learn_more": "詳細",
@@ -3572,6 +3641,39 @@
         "title": "カード",
         "reset_onboarding_description": "オンボーディングフローをやり直すには、カードのオンボーディングステータスをリセットしてください。",
         "reset_onboarding_button": "オンボーディングステータスのリセット"
+      },
+      "haptics": {
+        "title": "ハプティクス",
+        "description": "触覚フィードバックを実機でプレビューします。ここでは、各パターンを評価できるように、アプリ内の振動抑制設定と遠隔停止スイッチが無視されます。シミュレーターでは、多くの場合、触覚フィードバックは提供されません。",
+        "catalog_impacts_heading": "刺激発生の瞬間をカタログ化",
+        "notifications_heading": "通知パターン",
+        "selection_heading": "選択",
+        "notification_success_button": "通知 — 成功",
+        "notification_error_button": "通知 — エラー",
+        "notification_warning_button": "通知 — 警告",
+        "selection_button": "選択",
+        "raw_impacts_heading": "Expo標準の刺激のスタイル",
+        "raw_impacts_desc": "上記カタログでマッピングされた各瞬間と比較するための、expo-haptics標準の刺激のスタイル。",
+        "impacts": {
+          "quick_amount_selection": "刺激 — 金額のクイック選択",
+          "slider_tick": "刺激 — スライダーの目盛り通過",
+          "edge_gesture_engage": "刺激 — 画面の縁でのジェスチャー開始",
+          "page_navigation": "刺激 — ページナビゲーション",
+          "slider_grip": "刺激 — スライダー操作の開始",
+          "tab_change": "刺激 — タブの切り替え",
+          "primary_cta": "刺激 — プライマリCTA",
+          "pull_to_refresh_engage": "刺激 — 引っ張って更新 (操作の開始)",
+          "pull_to_refresh": "刺激 — 引っ張って更新 (操作の終了)",
+          "chart_crosshair": "刺激 — チャートの十字カーソル",
+          "follow_toggle": "刺激 — フォローの切り替え"
+        },
+        "raw_styles": {
+          "light": "標準の刺激 — ライト",
+          "medium": "標準の刺激 — ミディアム",
+          "heavy": "標準の刺激 — ヘビー",
+          "rigid": "標準の刺激 — 硬い",
+          "soft": "標準の刺激 — 柔らかい"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "予測",
     "add_collectible_button": "追加",
     "info": "情報",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "スワップ",
     "convert": "変換",
     "bridge": "ブリッジ",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "トラブルシューティング",
     "deposit_description": "手数料の少ない銀行またはカード送金",
     "buy_description": "特定のトークンの購入に適しています",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "仮想通貨を売って現金化します",
     "swap_description": "トークン同士を交換します",
     "bridge_description": "ネットワーク間でトークンを転送します",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "無料",
     "tx_details_not_available": "利用できません",
     "smart_contract_interaction": "スマートコントラクトのインタラクション",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "マネーアカウントに入金",
+    "money_account_withdraw": "マネーアカウントから送金",
     "swaps_transaction": "スワップトランザクション",
     "bridge_transaction": "ブリッジ",
     "approve": "承認",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "ステーブルコインで\n{{percentage}}%をゲット",
-        "description": "お持ちのステーブルコインをmUSDに換えて、最大{{percentage}}%の年換算ボーナスを獲得しましょう。このボーナスは毎日請求できます。",
+        "description": "お持ちのステーブルコインをmUSDに換えて、年換算{{percentage}}%のボーナスを獲得しましょう。",
         "terms_apply": "諸条件が適用されます。",
         "primary_button": "開始",
-        "secondary_button": "後で"
+        "secondary_button": "後で",
+        "checklist": {
+          "dollar_backed": "ドルペッグ制",
+          "no_lockups": "ロックアップなし",
+          "daily_bonus": "デイリーボーナス",
+          "metamask_stablecoins": "MetaMaskステーブルコイン",
+          "no_metamask_fee": "MetaMaskの手数料なし"
+        }
       },
       "buy_musd": "mUSDを購入",
       "get_musd": "mUSDを入手",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "マネー",
+    "your_balance": "残高",
     "apy_label": "年換算利率 (APY) {{percentage}}%",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "APY情報",
     "onboarding": {
       "step_progress": "ステップ{{current}}/{{total}}",
       "title": "お金を追加",
-      "description": "mUSDを購入して、今すぐAPYの獲得を始めましょう",
+      "description": "アカウントに入金して、毎年複利で利息を得ましょう。",
       "add": "追加",
       "step2_title": "MetaMaskカードを取得",
       "step2_description": "Mastercardの取扱店であればどこでも、収益を得ると同時にマネー残高を使用できます。",
@@ -6497,22 +6611,32 @@
       "card": "カード"
     },
     "earnings": {
-      "title": "収益",
-      "lifetime": "累積報酬額",
-      "projected": "予想収益"
+      "title": "予想収益",
+      "estimated_monthly": "月次",
+      "estimated_yearly": "1年間",
+      "info_label": "収益情報"
     },
     "how_it_works": {
       "title": "報酬獲得の仕組み",
-      "description_prefix": "マネーアカウントにmUSDを保有すると、自動的に収益が得られます",
-      "description_suffix": "。ドルに裏付けされていて常に流動性が高く、いつでも使用、取引、送金できます。"
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "追加"
     },
+    "balance_card": {
+      "label": "マネー残高",
+      "add": "追加",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "仮想通貨を収益化",
       "description": "仮想通貨をmUSDに換えることで、時間の経過とともにお金がどのように増えるかをご覧ください。",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "変換",
+      "convert_cta": "Convert your crypto",
       "no_fee": "MetaMaskの手数料なし",
       "view_all": "すべて表示",
       "view_potential_earnings": "獲得可能な収益を表示"
@@ -6522,37 +6646,75 @@
       "subtitle": "どこでもお金を使えます。",
       "virtual_card": "バーチャルカード",
       "metal_card": "メタルカード",
-      "cashback": "{{percentage}}%のキャッシュバック",
+      "cashback": "{{percentage}}%のmUSDを還元",
       "get_now": "今すぐ入手",
       "link_title": "MetaMaskカードをリンク",
-      "link_subtitle": "マネー残高を使って収益を得ましょう。",
-      "link_bullet_cashback": "最大3%のキャッシュバック",
-      "link_bullet_apy": "APY最大{{apy}}%",
-      "link_card": "カードをリンク"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "カードをリンク",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "得られるもの",
-      "benefit_auto_earn": "自動で報酬を獲得",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "ドルと1対1で裏付けられたステーブルコイン、mUSDで、資金を安全に守れます",
       "benefit_liquidity": "ロックアップなしで完全な流動性が確保され、いつでも取引や引き出しが可能です",
       "benefit_spend_prefix": "1億5000万店舗を超える加盟店でMetaMaskカードを利用して、",
-      "benefit_spend_cashback": "1～3%のキャッシュバックを獲得",
-      "benefit_transfer": "MetaMaskの自分のどのウォレットにも送金できます",
-      "benefit_global": "世界中と資金をやり取りできます",
+      "benefit_spend_cashback": "1～3%のmUSDを還元",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "詳細"
     },
     "footer": {
-      "add_money": "お金を追加"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "お金を追加",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "仮想通貨を変換",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "資金を入金",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "外部ウォレットから受け取る",
       "coming_soon": "近日追加予定"
     },
+    "more_sheet": {
+      "title": "さらに表示",
+      "how_it_works": "報酬獲得の仕組み",
+      "what_you_get": "得られるもの",
+      "contact_support": "サポートへのお問い合わせ"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "アカウント間",
+      "perps_account": "パーペチュアルアカウント",
+      "predictions_account": "予測市場アカウント",
+      "send_external": "外部アドレスに送金",
+      "withdraw_to_bank": "銀行に出金"
+    },
+    "apy_tooltip": {
+      "title": "年換算利率 (APY)",
+      "paragraph_1": "マネーアカウントで最大{{percentage}}%の収益を自動で獲得できます。",
+      "paragraph_2": "表示されている利率は、現在の市況に基づく予想年換算利率 (APY) です。APYは変動制で、さまざまな要因によって変わる可能性があります。利率は、ブロックチェーンプロトコル上で資金を運用する第三者DeFiプラットフォームによって生成されています。",
+      "paragraph_3": "MetaMaskカードをリンクさせると、購入金額がこの残高から引き落とされます。"
+    },
+    "earnings_tooltip": {
+      "title": "予想収益",
+      "body": "現在の残高および本日のAPYから算出された、一定期間内に獲得可能な金額の見積もり。見積もりはリターンを保証するものではなく、変更される可能性があります。"
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "アクティビティ",
       "view_all": "すべて表示",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "マネー",
       "section_title": "報酬獲得の仕組み",
-      "description_1": "マネーアカウントは4%のAPY (変動式) を自動的に稼ぎます。資金は、監査対象のローン市場で利益を生む、キュレートされたDeFiヴォールトに入ります。ステーキングや請求は不要で、ロックアップもありません。",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "マネー残高は使用可能な残高です。MetaMaskカードをリンクすれば、世界中の1億5千万以上のマーチャントで使用できます。資金は使うまで収益を生み続けます。",
-      "faq_title": "FAQ",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "近日追加予定.",
-      "faq_q1": "マネーアカウントとは？",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "mUSDとは？",
       "faq_q3": "利益はどこから生まれるのですか？",
       "faq_q4": "資金はロックされますか？いつでも引き出せますか？",
@@ -6608,8 +6770,7 @@
       "faq_q7": "APYは変動しますか？",
       "faq_q8": "これは貯蓄用アカウントですか？それとも使用用アカウントですか？",
       "faq_q9": "資金は誰が管理するのですか？",
-      "faq_q10": "MetaMaskカードではどのようなキャッシュバックが受けられますか？",
-      "sounds_good": "いいですね"
+      "faq_q10": "MetaMaskカードではどのようなmUSDの還元が受けられますか？"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "キャンセル",
     "confirm": "確定",
+    "pay_with_bottom_sheet": {
+      "title": "支払方法:",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "続行することで、",
       "terms_of_use": "利用規約",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "出金",
       "predict_deposit": "予測資金を追加",
       "predict_withdraw": "出金",
-      "money_account_deposit": "資金を追加",
-      "money_account_withdraw": "出金"
+      "money_account_add_money": "お金を追加",
+      "money_account_transfer_money": "送金"
     },
     "sub_title": {
       "permit": "このサイトがトークンの使用許可を求めています。",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "HyperCore (パーペチュアル取引で使用されるネットワーク) 上でトークンをUSDCにスワップします。スワッププロバイダーは手数料を請求する場合がありますが、MetaMaskは無料です。"
       },
       "predict_deposit": {
-        "transaction_fee": "Polygon (予測で使用されるネットワーク) 上でトークンをUSDCにスワップします。スワッププロバイダーは手数料を請求する場合がありますが、MetaMaskは無料です。"
+        "transaction_fee": "Polygon (予測で使用されるネットワーク) 上でトークンをpUSDに交換します。スワッププロバイダーは手数料を請求する場合がありますが、MetaMaskは無料です。"
       },
       "perps_withdraw": {
         "transaction_fee": "MetaMaskがユーザーに代わって希望のトークンをスワップします。mUSDへのスワップ時にMetaMaskの手数料は発生しません。"
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "mUSD換算手数料にはネットワークコストが含まれるほか、プロバイダー手数料も含まれる場合があります。なお、mUSDへの換算時にMetaMaskの手数料は発生しません。"
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "手数料"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "仮想通貨を購入",
       "buy_predict": "予測を利用するには、ウォレットに資金を追加してください。",
-      "buy_perps": "パーペチュアルを利用するには、ウォレットに資金を追加してください。"
+      "buy_perps": "パーペチュアルを利用するには、ウォレットに資金を追加してください。",
+      "projected_five_year_balance": "5年後の予想残高:"
     },
     "unlimited": "無制限",
     "all": "すべて",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "続行",
     "deposit_edit_amount_done": "資金を追加",
     "deposit_edit_amount_predict_withdraw": "出金",
-    "deposit_edit_amount_musd_conversion": "mUSDに変換"
+    "deposit_edit_amount_musd_conversion": "mUSDに変換",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "結果が変更になりました",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "スワップ",
     "terms_and_conditions": "利用規約",
     "select_token": "トークンを選択",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "トークンが見つかりませんでした",
     "no_tokens_found_description": "この名前のトークンが見つかりませんでした。別の検索をお試しください。",
     "select_network": "ネットワークを選択",
@@ -7115,6 +7303,7 @@
     "receive_at": "受取先:",
     "recipient": "受取人",
     "select_recipient": "受取人を選択してください",
+    "select_account": "アカウントの選択",
     "external_account": "外部アカウント",
     "error_banner_description": "この取引ルートは現在使用できません。金額、ネットワーク、またはトークンを変更してみてください。最善のオプションを探します。",
     "stock_token_error_banner_description": "この取引ルートは現在使用できません。金額、ネットワーク、またはトークンを変更してみてください。最適なオプションを検索します。",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "高プライスインパクト",
     "price_impact_error_title": "非常に高いプライスインパクト",
     "price_impact_error_description": "このスワップでは、トークンの市場価格の約{{priceImpact}}を失います。より良いレートを得るには、取引量を減らすか、流動性の高いルートをお試しください。",
+    "insufficient_native_reserve_cta": "最大許容額を使用する",
+    "insufficient_native_reserve_message": "このネットワークでは、アカウントの残高を{{minimumReserve}} {{ticker}}以上に維持する必要があります。使用可能な金額は最大{{maxSwappable}} {{ticker}}です。",
+    "insufficient_native_reserve_title": "{{ticker}}の最低準備残高が必要です",
     "token_warning_suspicious_banner": "{{token}}は不審なトークンです。",
     "token_warning_malicious_banner": "{{token}}は悪意のあるトークンです。このトークンをやり取りする際は注意してください。",
     "token_warning_modal_suspicious_title": "不審なトークン",
@@ -7542,17 +7734,17 @@
         "price": "無料",
         "feature_1": "Apple PayとGoogle Payで使えるバーチャルカード",
         "feature_2": "仮想通貨でお支払い (USDC、USDT、WETHなど)",
-        "feature_3": "購入のたびに1%分のUSDCをキャッシュバック"
+        "feature_3": "購入のたびに1%分のmUSDを還元"
       },
       "metal_card": {
         "name": "メタルカード",
         "price": "年間199ドル",
         "everything_in_virtual": "すべてバーチャルで、さらに：",
         "feature_1": "プレミアム刻印入りメタルカード",
-        "feature_2": "年間最初の$10,000に対して3%のキャッシュバック",
+        "feature_2": "年間利用額が$10,000に達した時点で3%のmUSDを還元",
         "feature_3": "海外トランザクション手数料なし"
       },
-      "earn_up_to_badge": "年間最大$300のキャッシュバック獲得",
+      "earn_up_to_badge": "年間最大$300のmUSDを還元",
       "upgrade_to_metal_label": "または、メタルカードにアップグレードして3倍の報酬を獲得"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "カードが\n注文されました",
       "subtitle": "4～6週間後にお届け予定です。",
-      "description": "バーチャルカードを設定し、デジタルウォレットに追加して、キャッシュバックの獲得を始めましょう。",
+      "description": "バーチャルカードを設定し、デジタルウォレットに追加して、mUSD還元サービスの利用を始めましょう。",
       "set_up_card_button": "カードを設定",
       "back_to_card_button": "カードに戻る"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "使えば\n貯まる",
-      "description": "MetaMaskカードなら\n仮想通貨決済を素早く簡単に行え\n3%のキャッシュバックも獲得できます。",
+      "description": "MetaMaskカードなら\n仮想通貨決済を素早く簡単に行えるほか\n3%相当のmUSDが還元されます。",
       "apply_now_button": "今すぐセットアップ",
       "login_button": "ログイン",
       "not_now_button": "後で",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "カードを有効にする",
       "enable_assets_button_label": "アセットを有効にする",
       "spending_limit_warning": "使用上限に近づいています。拒否されないように更新してください。",
+      "spending_limit_available": "使用可能",
       "logout": "ログアウト",
       "contact_support": "サポートへのお問い合わせ",
       "logout_confirmation_title": "カードからログアウトしますか？",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "利用規約",
         "order_metal_card": "メタルカード",
         "order_metal_card_description": "実物のメタルカードを今すぐ注文",
-        "cashback": "キャッシュバック",
-        "cashback_description": "常に支出額の1%をキャッシュバック",
-        "cashback_description_metal": "常に支出額の3%をキャッシュバック",
+        "cashback": "mUSDの還元",
+        "cashback_description": "常に支出額の1%をmUSDで還元",
+        "cashback_description_metal": "常に支出額の3%をmUSDで還元",
         "freeze_card": "カードを凍結する",
         "unfreeze_card": "カードの凍結を解除する",
         "freeze_card_description": "カードでのすべての支払いを一時停止する",
@@ -7917,8 +8110,8 @@
       "token_label": "トークン"
     },
     "cashback_screen": {
-      "title": "キャッシュバック",
-      "available_cashback": "利用可能なキャッシュバック",
+      "title": "mUSDの還元",
+      "available_cashback": "利用可能なmUSD",
       "network_fee": "ネットワーク手数料",
       "expected_to_receive": "受取予定額",
       "withdraw": "出金",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "出金が開始されました",
       "withdrawal_success": "出金が完了しました",
       "withdrawal_failed": "出金に失敗しました。もう一度お試しください。",
-      "no_cashback": "利用可能なキャッシュバックはありません",
-      "loading_error": "キャッシュバックを読み込めませんでした。もう一度お試しください。"
+      "no_cashback": "利用可能なmUSDの還元はありません",
+      "loading_error": "mUSDの還元情報を読み込めませんでした。もう一度お試しください。",
+      "funding_required": {
+        "title": "Lineaの資金源を設定してください",
+        "description": "還元されたmUSDを引き換えるには、Linea上に承認済みの資金源が少なくとも1つは登録されている必要があります。",
+        "confirm_button_label": "資金源を設定する"
+      }
     },
     "change_asset": {
       "title": "トークンとネットワークの変更",
@@ -8032,7 +8230,8 @@
     "title": "支払方法を選択",
     "title_receive": "トークンの受取を選択してください",
     "no_gas": "ガスの支払いに使えるネイティブ残高がありません",
-    "not_supported": "未対応"
+    "not_supported": "未対応",
+    "crypto": "仮想通貨"
   },
   "connection_removed_modal": {
     "title": "接続が削除されました",
@@ -8048,6 +8247,15 @@
       "title": "オプトインに失敗しました",
       "description": "接続を確認して、もう一度お試しください。"
     },
+    "notifications_nudge": {
+      "title": "お見逃しなく",
+      "description": "キャンペーン情報を逃さないように通知を有効にします。",
+      "turn_on_button": "オンにする",
+      "loading": "通知を有効にしています...",
+      "loading_description": "これには少し時間がかかる可能性があります。",
+      "enable_error": "通知を有効にできませんでした",
+      "success": "通知が有効になりました"
+    },
     "version_guard": {
       "title": "アップデートが必要です",
       "description": "Rewardsの利用には、MetaMaskの新しいバージョンが必要です。続けるにはアップデートしてください。",
@@ -8126,6 +8334,17 @@
       "retry_button": "再試行"
     },
     "main_title": "報酬",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "紹介",
     "referral_stats_earned_from_referrals": "紹介して報酬を獲得",
     "referral_stats_referrals": "紹介",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "有効なブースト",
     "season_1": "シーズン1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "mUSDボーナス計算ツール",
-      "description": "ステーブルコインをmUSDに交換することで、どれだけの利益が得られるか確認しましょう。",
-      "amount_label": "変換金額",
-      "estimated_bonus": "推定年率ボーナス：最大3%",
-      "initial_amount": "初期金額",
-      "daily_bonus": "1日あたりに獲得可能なボーナス",
-      "annualized_bonus": "年率ボーナス",
-      "disclaimer": "これはあくまで目安です。ボーナスは変更される場合があります。",
-      "disclaimer_brief": "ボーナスは見込み額であり、変動する場合があります。",
+      "page_title": "mUSD計算ツール",
+      "hero_hold": "mUSDを保有.",
+      "hero_earn": "獲得",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/年",
+      "earnings_per_month_suffix": "/月",
+      "earnings_per_day_suffix": "/請求対象日",
+      "slider_amount_label": "金額",
+      "disclaimer_calculator": "3%のボーナスを基準とした見積もり。利率は変わる可能性があります。請求はいつでも可能です。",
       "buy_button": "mUSDを購入",
       "swap_button": "mUSDにスワップ"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "{{date}}終了",
       "ended_date": "{{date}}に終了",
       "pill_up_next": "近日追加予定",
+      "up_next": "次",
+      "notify_me": "通知を受ける",
       "pill_active": "ライブ",
       "pill_complete": "完了",
       "enter": "応募",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "お客様の地域では利用できません",
       "geo_locked_toast_description": "このキャンペーンは、お客様の場所で利用できません。新しいキャンペーンがないか、後日また確認してください。",
       "geo_locked_cta": "資格を確認",
-      "geo_loading": "地域を確認中…"
+      "geo_loading": "地域を確認中…",
+      "remind_me_success_toast": "このキャンペーンが始まる際にお知らせします。",
+      "remind_me_save_error": "リマインダーを保存できませんでした。もう一度お試しください。"
     },
     "campaign_mechanics": {
       "title": "仕組み"
@@ -8479,10 +8701,10 @@
       "qualified_description": "純流入額を増やすと、より高いレベルに達し、より多くのペイアウトが得られる可能性があります。",
       "not_eligible_title": "対象外",
       "not_eligible_description": "{{days}}日間の保有要件を満たすのに遅すぎるタイミングでオープンされた取引は、ランクやレベルにカウントされません。",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "参加総数",
+      "completed_label_total_tvl": "預かり資産総額",
+      "completed_label_top_return": "最高リターン",
+      "completed_label_winners": "入賞者"
     },
     "ondo_campaign_activity": {
       "title": "すべてのアクティビティ",
@@ -8508,6 +8730,48 @@
       "cancel": "キャンセル",
       "confirm": "理解しています"
     },
+    "perps_trading_campaign": {
+      "title": "パーペチュアル取引コンテンスト",
+      "stats_title": "統計",
+      "performance_title": "成績",
+      "label_rank": "ランキング",
+      "label_your_rank": "ランク",
+      "label_pnl": "損益",
+      "label_volume": "取引量",
+      "label_notional_volume": "名目取引量",
+      "pending": "保留中",
+      "qualified": "対象者",
+      "open_position_cta": "保有中のポジション",
+      "leaderboard_title": "リーダーボード",
+      "leaderboard_total_participants": "参加総数{{count}}人",
+      "last_updated": "最終更新時刻: {{time}}",
+      "leaderboard_error_loading": "リーダーボードの読み込みに失敗しました",
+      "leaderboard_error_loading_description": "リーダーボードの読み込み中に問題が発生しました。もう一度お試しください。",
+      "leaderboard_not_yet_computed": "リーダーボードの計算が完了していません。少し時間を置いてから再確認してください。",
+      "leaderboard_powered_by_prefix": "提供元: ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "プライズプール",
+      "prize_pool_current_label": "現在",
+      "prize_pool_next_label": "次へ",
+      "prize_pool_volume_subtext": "出来高{{current}}/{{target}}",
+      "prize_pool_max_tier_subtext": "取引量{{maxThreshold}}以上 — すべてのマイルストーンを達成",
+      "prize_pool_max_badge": "最大額",
+      "prize_pool_error_title": "プライズプールの読み込みに失敗しました",
+      "prize_pool_error_description": "プライズプールの読み込み中にエラーが発生しました。もう一度お試しください。",
+      "prize_pool_retry_button": "再試行",
+      "stats_notional_volume_threshold": "${{amount}}が必要です",
+      "stats_qualified_title": "対象となります",
+      "stats_qualified_description": "取引を続けて損益を改善し、コンテンストが終了するまでリーダーボードの順位を上げていきましょう。",
+      "stats_qualify_for_rank_title": "このランクの資格を満たすには",
+      "stats_qualify_for_rank_description": "名目取引量があと{{notionalRemaining}}で条件が満たされます。",
+      "stats_error_title": "統計を読み込めません",
+      "stats_error_description": "統計の読み込み中に問題が発生しました。もう一度お試しください。",
+      "stats_retry": "再試行",
+      "completed_label_total_participants": "参加総数",
+      "completed_label_total_volume": "総取引量",
+      "completed_label_top_pnl": "最高損益",
+      "completed_label_winners": "入賞者"
+    },
     "campaigns_preview": {
       "title": "キャンペーン",
       "coming_soon": "近日追加予定",
@@ -8532,29 +8796,29 @@
       "retry_button": "再試行",
       "refreshing": "更新中..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "予測的中",
       "rank_label": "{{place}}位",
-      "email_instructions": "賞品を請求するには、ondocampaign@consensys.netにメールでコードを送信してください。",
+      "email_instructions": "賞品を請求するには、{{email}}にメールでコードを送信してください。",
       "open_mail": "メールを開く",
       "skip_for_now": "今はスキップ",
-      "mail_subject": "Ondoキャンペーン賞品の請求",
+      "mail_subject": "{{campaignName}}の賞品の請求",
       "mail_body": "勝利コード: {{code}}",
       "winning_code": "勝利コード",
       "close_a11y": "閉じる"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "予測的中",
-        "description": "今すぐ賞品を請求しましょう。",
-        "a11y": "勝者の詳細を開く"
+        "title": "予測的中!",
+        "description": "今すぐ入賞コードを認証して、賞品を請求しましょう。",
+        "a11y": "詳細を表示"
       },
       "participant_pending": {
         "title": "キャンペーンが終了しました。",
         "description": "結果を判断しています。近々またご確認ください。"
       },
       "participant_finalized": {
-        "title": "キャンペーンの結果が出ました",
+        "title": "キャンペーンの結果が出ました.",
         "description": "今回は勝ちませんでした。リーダーボードで順位を確認しましょう。"
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "間もなく報酬を受け取れます。近々ご連絡します。"
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "予測的中 💰",
-        "description": "{{campaignName}}の賞品を請求",
+        "description": "{{campaignName}}の賞品を今すぐ請求しましょう。",
         "cta": "詳細を表示"
       },
-      "participant_no_winner": {
-        "title": "結果が出ました。🏅",
-        "description": "{{campaignName}}でのランキングをご覧ください",
+      "non_winner": {
+        "title": "結果が出ました 🏅",
+        "description": "{{campaignName}}でのランキングをご覧ください.",
         "cta": "表示"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "報酬を請求しました",
       "predict_deposit": "Predictアカウントに入金しました",
       "predict_withdraw": "出金",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "マネーアカウントに入金",
+      "money_account_withdraw": "マネーアカウントから送金",
       "default": "トランザクションの詳細"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "閲覧",
-    "trending_tokens": "トレンド",
+    "crypto_movers": "人気の仮想通貨",
+    "perps_movers": "人気のパーペチュアル",
+    "trending_tokens": "人気上昇中",
+    "crypto": "仮想通貨",
     "stocks": "株式",
     "price_change": "価格変動",
     "all_networks": "すべてのネットワーク",
@@ -8673,6 +8940,17 @@
     "1_hour": "1時間",
     "5_minutes": "5分",
     "networks": "ネットワーク",
+    "ecosystems": "エコシステム",
+    "ecosystems_subtitle": "MetaMask PortfolioでさまざまなチェーンのDApp、トークン、NFTを探索",
+    "all_sports": "人気のスポーツ",
+    "basketball": "バスケットボール",
+    "football": "フットボール",
+    "soccer": "サッカー",
+    "tennis": "テニス",
+    "f1": "F1",
+    "golf": "ゴルフ",
+    "all_sports_no_markets": "このカテゴリーで開いている市場はまだありません。少し時間を置くか、画面上部で別のスポーツを選んでください。",
+    "load_more": "さらに読み込む",
     "sort_by": "並べ替え基準",
     "volume": "取引量",
     "market_cap": "時価総額",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "トークン、サイト、URLを検索",
     "cancel": "キャンセル",
     "perps": "パーペチュアル",
+    "rwa_perps_section": "パーペチュアル",
+    "macro_stocks_commodity_perps": "パーペチュアル",
+    "macro_pill_stocks": "株式",
+    "macro_pill_commodities": "商品",
+    "rwa_pill_commodities": "商品",
+    "rwa_pill_stocks": "株式",
+    "rwa_pill_forex": "FX",
+    "crypto_perps_section": "パーペチュアル",
     "predictions": "予測",
     "no_results": "結果が見つかりませんでした",
+    "popular": "人気",
     "sites": "サイト",
     "popular_sites": "人気のサイト",
     "search_sites": "サイトを検索",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "トークンが見つかりませんでした",
       "description": "このトークンを見つけることができませんでした"
+    },
+    "tabs": {
+      "now": "現在",
+      "macro": "マクロ",
+      "rwas": "RWA",
+      "crypto": "仮想通貨",
+      "sports": "スポーツ",
+      "dapps": "サイト"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "キャンセル",
-      "continue": "続行"
+      "continue": "続行",
+      "learn_more": "詳細",
+      "try_again": "もう一度お試しください"
     },
     "connecting": {
       "title": "{{device}}を接続しています...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "デバイスに接続するには、Bluetoothをオンにしてください",
       "bluetooth_scan_failed": "デバイスを検索できませんでした。もう一度お試しください。",
       "bluetooth_connection_failed": "デバイスへの接続に失敗しました。もう一度お試しください",
+      "camera_permission_denied": "QRコードをスキャンするために、カメラへのアクセス許可が必要です。デバイスの設定でアクセス許可を有効にしてください。",
       "not_supported": "この操作はサポートされていません。",
       "unknown_error": "{{device}}がこのアカウント用のシークレットリカバリーフレーズまたはパスフレーズを使ってセットアップされていることを確認してください。"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "位置情報へのアクセス許可が必要です",
       "nearby_devices_permission_denied": "付近のデバイスへのアクセス許可が必要です",
       "scan_failed": "検索に失敗しました",
+      "camera_permission_denied": "カメラへのアクセス許可が必要です",
       "something_went_wrong": "問題が発生しました"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "ウォレット同期用のQRコードをスキャンしてください",
+          "body": "ハードウェアウォレットに戻り、アカウントの共有またはエクスポートのオプションを探してください。MetaMaskを選択して、QRコードをスキャンします。"
+        },
+        "sign": {
+          "title": "署名済みQRコードをスキャンしてください",
+          "body": "ハードウェアウォレットに戻り、トランザクションを承認してから、表示されるQRコードをスキャンしてください。"
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "QRコードが間違っています",
+          "body": "ハードウェアウォレットに戻り、ウォレットの種類でMetaMaskを選択してから、新しいQRコードを生成し、スキャンしてください。"
+        },
+        "sign": {
+          "title": "QRコードが間違っています",
+          "body": "ハードウェアウォレットに戻り、トランザクションを承認してから、表示されるQRコードをスキャンしてください。"
+        }
+      },
+      "ur_decode_error": {
+        "title": "QRコードを読み取れませんでした",
+        "body": "QRコードが完全に表示され、照明が十分であることを確認してから、もう一度お試しください。問題が続く場合は、ハードウェアウォレットのファームウェアの更新が必要かもしれません。"
+      }
+    },
     "device_selection": {
       "title": "{{device}}の選択",
       "scanning": "デバイスを検索中...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "マネー",
-      "cash_empty_description": "まだmUSDがありません。ホームページの「マネー」セクションでステーブルコインをmUSDに換金してください。",
-      "cash_empty_description_network_filter": "このネットワークにはmUSDがありません。ネットワークを切り替えてお持ちのmUSDをご確認ください。",
+      "money": "マネー",
+      "money_empty_description": "まだmUSDがありません。ホームページの「マネー」セクションでステーブルコインをmUSDに換金してください。",
+      "money_empty_description_network_filter": "このネットワークにはmUSDがありません。ネットワークを切り替えてお持ちのmUSDをご確認ください。",
+      "money_empty_state": {
+        "get_started": "開始",
+        "earn_apy": "年換算利率 (APY) {{percentage}}%を獲得"
+      },
+      "money_filled_state": {
+        "add": "追加",
+        "apy": "年換算利率 (APY) {{percentage}}%"
+      },
       "tokens": "トークン",
+      "perps": "パーペチュアル",
+      "related_assets": "関連する資産",
       "perpetuals": "パーペチュアル",
       "predictions": "予測",
       "whats_happening": "現在起きていること",
+      "whats_happening_ai": "AI",
+      "whats_happening_impact": {
+        "bullish": "強気",
+        "bearish": "弱気",
+        "neutral": "中立"
+      },
       "top_traders": "トップトレーダー",
       "whats_happening_categories": {
         "geopolitical": "地政学",
@@ -8819,7 +9160,7 @@
       },
       "defi": "DeFi",
       "nfts": "NFT",
-      "trending_tokens": "トレンド",
+      "trending_tokens": "人気上昇中",
       "trending_perpetuals": "人気のパーペチュアル",
       "trending_predictions": "人気の予測",
       "import_nfts": "NFTをインポート",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "{{section}}を読み込めませんでした",
       "retry": "再試行"
     }
+  },
+  "sites": {
+    "popular": "人気"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/ko.json b/locales/languages/ko.json
index bff6910b8fd..94a0e91200a 100644
--- a/locales/languages/ko.json
+++ b/locales/languages/ko.json
@@ -634,7 +634,8 @@
     "trade": "거래하기",
     "settings": "설정",
     "rewards": "보상",
-    "trending": "둘러보기"
+    "trending": "둘러보기",
+    "money": "머니"
   },
   "drawer": {
     "send_button": "보내기",
@@ -708,7 +709,11 @@
     "smart_contract_address": "스마트 계약 주소",
     "smart_contract_address_warning": "수신자 주소가 직접 토큰 전송을 지원하지 않을 수 있습니다. 이 경우 자금이 손실될 수 있습니다. 이 계약이 전송되는 토큰을 받을 수 있다는 확신이 있을 때만 계속하세요.",
     "i_understand": "견적은 다음 기간 전에 만료됨을",
-    "cancel": "취소"
+    "cancel": "취소",
+    "new_address_title": "새 주소",
+    "new_address_message": "해당 주소로 처음 전송하려 합니다. 주소가 정확한지 확인한 후 계속 진행하세요.",
+    "alert_navigation_previous": "이전 알림",
+    "alert_navigation_next": "다음 알림"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "상위 트레이더",
       "allow_push_notifications": "푸시 알림 허용",
       "trades_over_label": "다음 금액 초과 거래 알림 받기:",
       "traders_you_follow": "팔로우 중인 트레이더",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "팔로우 중인 트레이더를 불러올 수 없습니다."
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "{{traderName}}의 알림",
       "allow_push_notifications": "푸시 알림 허용",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "{{traderName}}의 거래 활동에 대한 알림 받기",
+      "manage_traders": "팔로우 중인 트레이더 관리",
       "save": "저장"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "팔로우 중인 트레이더의 거래에 대한 실시간 알림 받기",
       "allow_push_notifications": "푸시 알림 허용",
       "trades_over_label": "다음 금액 초과 거래 알림 받기:",
       "save": "저장",
@@ -1059,7 +1064,12 @@
       "closed": "닫힘",
       "no_positions": "아직 포지션이 없습니다",
       "error_loading_profile": "프로필을 불러올 수 없음",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "X(Twitter)에서 보기",
+      "sort": {
+        "value": "가격",
+        "pnl_percent": "P&L %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "시가총액",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} 매도함",
       "no_trades": "이 기간에는 거래가 없습니다",
       "closed_position": "포지션 청산",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "포지션 확인할 수 없음",
+      "fallback_subtitle": "현재 이 포지션을 불러올 수 없습니다.",
+      "fallback_back_to_profile": "프로필로 돌아가기",
+      "fallback_back_to_leaderboard": "리더보드로 돌아가기"
     },
     "quick_buy": {
       "title": "{{symbol}} 구매",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "MetaMask 예측",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "예측 시장",
     "market_list": "시장 목록",
     "loading": "로딩 중...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "결제 방법 변경",
+      "add_funds": "자금 추가",
+      "add": "추가",
+      "predict_balance": "잔액 예측"
+    },
     "order": {
       "available": "사용 가능",
       "cashed_out": "출금 완료",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "시장이 빠르게 움직이고 있어 {{price}}에 매수할 수 없습니다. 현재 가능한 최적 가격으로 다시 주문하시겠습니까?",
       "market_busy_body_sell": "시장이 빠르게 움직이고 있어 {{price}}에 매도할 수 없습니다. 현재 가능한 최적 가격으로 다시 주문하시겠습니까?",
       "order_failed_title": "주문 실패",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "주문이 체결되지 않았습니다. 다시 시도하시겠습니까?",
+      "price_changed_title": "가격 변경됨",
+      "price_changed_body": "{{price}}에 매수할 수 없습니다. 시장가로 매수해 보시겠습니까?",
       "retry": "다시 시도",
       "try_again": "다시 시도",
       "view": "보기",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "출금 완료",
       "withdraw_completed_subtitle": "{{amount}} USDC가 지갑으로 전송되었습니다",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}}이(가) 지갑으로 이동했습니다",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "컨펌",
       "error_title": "문제가 발생했습니다",
       "error_description": "출금에 실패했습니다",
       "try_again": "다시 시도"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "계속하려면 {{tokenSymbol}}이(가) 필요합니다",
     "fund_your_wallet": "지갑에 자금 추가",
     "get_ready_for_web3": "Web3를 사용할 수 있도록 지갑을 준비해 주세요",
+    "home_onboarding_steps": {
+      "header": "단계",
+      "get_started_title": "MetaMask 시작하기",
+      "fund_title": "지갑에 자금 추가",
+      "fund_subtitle": "빈 지갑을 좋아하는 사람은 없습니다. 간편하게 자금을 추가하여 거래를 시작하세요.",
+      "fund_primary": "자금 추가",
+      "trade_title": "첫 거래 시작하기",
+      "trade_subtitle": "다양한 네트워크에서 인기 토큰을 거래하며 포트폴리오를 키워보세요.",
+      "trade_primary": "거래하기",
+      "notifications_title": "알림 켜기",
+      "notifications_subtitle": "시장 변화를 계속 확인하며 포트폴리오에 가장 유리한 투자 결정을 내리세요.",
+      "notifications_primary": "켜기",
+      "skip": "건너뛰기",
+      "progress_a11y": "{{current}} 단계/{{total}} 단계",
+      "balance_loading_a11y": "지갑 잔액 불러오는 중"
+    },
     "add_funds": "자금 추가",
     "next": "다음",
     "buy_asset": "{{asset}} 구매",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "잘못된 숫자입니다. 1과 %{maxSafeChainId} 사이에 숫자를 입력하세요",
     "hide_zero_balance_tokens_title": "잔고 없는 토큰 숨기기",
     "hide_zero_balance_tokens_desc": "토큰 목록에서 잔고가 없는 토큰을 보이지 않게 합니다.",
+    "haptic_feedback_title": "햅틱 피드백",
+    "haptic_feedback_desc": "확인, 오류, 상호작용 시 미세한 진동을 느낄 수 있습니다. 햅틱 자극을 줄이려면 이 기능을 끄세요.",
     "token_detection_title": "토큰 자동 감지",
     "token_detection_description": "MetaMask는 지갑에 보내진 새로운 토큰을 감지해 표시하기 위해 타사 API를 사용합니다. 이 서비스로부터 데이터를 가져오기를 원치 않으시면 해당 기능을 끄세요.",
     "theme_button_text": "테마 변경",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "가장 신뢰할 수 있음",
         "quote_unknown_provider": "알 수 없는 공급자",
         "start_headless_buy": "헤드리스 바이 시작",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "교체 후 헤드리스 매수 시작",
         "start_headless_buy_disabled_hint": "활성화하려면 유효한 금액을 입력하세요",
         "start_headless_buy_pending": "헤드리스 세션 활성화됨 — 견적 빌드 열기",
         "cancel_headless_buy": "헤드리스 세션 취소",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "활성 세션: {{sessionId}} - 새 견적 요청을 시작하면 현 세션이 취소됩니다.",
         "event_log_title": "이벤트 로그",
         "event_log_empty": "아직 이벤트가 없습니다. 헤드리스 세션을 시작하고 이 영역을 모니터하세요.",
         "event_log_started": "{{sessionId}} 세션 시작됨 (자산={{assetId}}, 금액={{amount}}, 결제={{paymentMethodId}}{{providerSuffix}})",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "소비자 취소 세션 {{sessionId}}"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "헤드리스 매수",
+        "loading": "매수 절차 준비 중…",
+        "no_session": "헤드리스 세션이 더 이상 활성화 상태가 아닙니다.",
+        "cancel": "취소"
       }
     },
     "request_feature": "기능 요청",
@@ -3553,7 +3622,7 @@
     "security_alerts": "보안 경고",
     "security_alerts_desc": "이 기능은 거래 및 서명 요청을 로컬에서 검토하여 악의적인 활동이 있는 경우 경고합니다. 요청을 승인하기 전에 항상 직접 검토하세요. 이 기능이 모든 악성 활동 탐지를 보장하지는 않습니다. 이 기능을 활성화하면 제공 업체의 이용 약관에 동의하는 것이 됩니다.",
     "smart_account_dapp_requests_heading": "디앱의 스마트 계정 요청",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "디앱이 일반 계정에 대한 스마트 계정 기능을 요청할 수 있도록 허용합니다. MetaMask는 감사가 완료된 자체 스마트 계정으로만 업그레이드를 진행합니다.",
     "smart_transactions_opt_in_heading": "스마트 트랜잭션",
     "smart_transactions_opt_in_desc_supported_networks": "지원되는 네트워크에서 더 안정적이고 안전하게 트랜잭션을 진행하려면 스마트 트랜잭션을 활성화하세요.",
     "smart_transactions_learn_more": "더 보기",
@@ -3572,6 +3641,39 @@
         "title": "카드",
         "reset_onboarding_description": "온보딩 흐름을 처음부터 다시 시작하려면 카드 온보딩 상태를 초기화하세요.",
         "reset_onboarding_button": "온보딩 상태 초기화"
+      },
+      "haptics": {
+        "title": "햅틱",
+        "description": "실제 기기에서 햅틱 피드백을 미리 확인하세요. 앱 내 햅틱 감소 설정과 원격 비활성화 스위치를 우회하여 각 패턴을 평가할 수 있습니다. 시뮬레이터는 햅틱이 재생되지 않는 경우가 많습니다.",
+        "catalog_impacts_heading": "임팩트 순간 카탈로그",
+        "notifications_heading": "알림 패턴",
+        "selection_heading": "선택",
+        "notification_success_button": "알림 - 성공",
+        "notification_error_button": "알림 - 오류",
+        "notification_warning_button": "알림 - 경고",
+        "selection_button": "선택",
+        "raw_impacts_heading": "Raw Exp 임팩트 스타일",
+        "raw_impacts_desc": "위의 매핑된 카탈로그 순간들과 비교하기 위한 직접적인 expo-haptics 임팩트 스타일입니다.",
+        "impacts": {
+          "quick_amount_selection": "임팩트 - 빠른 금액 선택",
+          "slider_tick": "임팩트 - 슬라이더 눈금",
+          "edge_gesture_engage": "임팩트 - 가장자리 제스처 활성화",
+          "page_navigation": "임팩트 - 페이지 이동",
+          "slider_grip": "임팩트 - 슬라이더 잡기",
+          "tab_change": "임팩트 - 탭 변경",
+          "primary_cta": "임팩트 - 주요 CTA",
+          "pull_to_refresh_engage": "임팩트 - 당겨서 새로고침(시작)",
+          "pull_to_refresh": "임팩트 - 당겨서 새로고침(해제)",
+          "chart_crosshair": "임팩트 - 차트 십자선",
+          "follow_toggle": "임팩트 - 팔로우 토글"
+        },
+        "raw_styles": {
+          "light": "Raw 임팩트 - 약함 ",
+          "medium": "Raw 임팩트 - 보통",
+          "heavy": "Raw 임팩트 - 강함",
+          "rigid": "Raw 임팩트 - 단단함",
+          "soft": "Raw 임팩트 - 부드러움"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "예측",
     "add_collectible_button": "추가",
     "info": "정보",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "스왑",
     "convert": "전환",
     "bridge": "브릿지",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "문제 해결",
     "deposit_description": "수수료가 낮은 은행 또는 카드 이체",
     "buy_description": "특정 토큰 매수에 적합",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "암호화폐를 현금에 매도",
     "swap_description": "토큰 간 교환",
     "bridge_description": "네트워크간 토큰 전송",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "수수료",
     "tx_details_not_available": "이용할 수 없음",
     "smart_contract_interaction": "스마트 계약 인터렉션",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "머니 계정에 입금하기",
+    "money_account_withdraw": "머니 계정에서 이체하기",
     "swaps_transaction": "스와프 트랜잭션",
     "bridge_transaction": "브릿지",
     "approve": "승인",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "스테이블 코인\n{{percentage}}% 혜택",
-        "description": "스테이블코인을 mUSD로 환전하고 매일 청구 가능한 최대 {{percentage}}%의 연간 보너스를 받으세요.",
+        "description": "스테이블코인을 mUSD로 전환하면 연 {{percentage}}% 보너스를 받을 수 있습니다.",
         "terms_apply": "약관이 적용됩니다.",
         "primary_button": "시작하기",
-        "secondary_button": "나중에"
+        "secondary_button": "나중에",
+        "checklist": {
+          "dollar_backed": "달러 연동",
+          "no_lockups": "예치 기간 없음",
+          "daily_bonus": "일일 보너스",
+          "metamask_stablecoins": "MetaMask 스테이블코인",
+          "no_metamask_fee": "MetaMask 수수료 없음"
+        }
       },
       "buy_musd": "mUSD 구매",
       "get_musd": "mUSD 받기",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Money",
+    "your_balance": "내 잔액",
     "apy_label": "{{percentage}}% APY",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "APY 정보",
     "onboarding": {
       "step_progress": "{{current}} 단계/{{total}} 단계",
       "title": "자금 추가",
-      "description": "mUSD를 구매하여 오늘부터 APY를 버세요.",
+      "description": "계정에 입금하고 연 수익(APY)을 버세요.",
       "add": "추가",
       "step2_title": "MetaMask 카드 받기",
       "step2_description": "Mastercard가 허용되는 모든 곳에서 수익이 쌓이는 동안 Money 잔액을 사용하세요.",
@@ -6497,22 +6611,32 @@
       "card": "카드"
     },
     "earnings": {
-      "title": "수익",
-      "lifetime": "누적 수익",
-      "projected": "예상 수익"
+      "title": "예상 수익",
+      "estimated_monthly": "월간",
+      "estimated_yearly": "연간",
+      "info_label": "수익 정보"
     },
     "how_it_works": {
       "title": "작동 방식",
-      "description_prefix": "머니 계정에 mUSD를 보관하고 자동으로 수익을 올리세요",
-      "description_suffix": ". 머니 계정은 달러에 연동되어 있고 언제나 유동성이 보장되며 항상 지출, 거래, 송금할 수 있습니다."
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "추가"
     },
+    "balance_card": {
+      "label": "머니 잔액",
+      "add": "추가",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "암호화폐로 수익 얻기",
       "description": "암호화폐를 mUSD로 전환했을 때 자금이 시간에 따라 어떻게 늘어날 수 있는지 확인해 보세요.",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "전환",
+      "convert_cta": "Convert your crypto",
       "no_fee": "MetaMask 수수료 없음",
       "view_all": "모두 보기",
       "view_potential_earnings": "예상 수익 보기"
@@ -6522,37 +6646,75 @@
       "subtitle": "자금을 어디서나 사용하세요.",
       "virtual_card": "가상 카드",
       "metal_card": "메탈 카드",
-      "cashback": "{{percentage}}% 캐시백",
+      "cashback": "{{percentage}}% mUSD 캐시백",
       "get_now": "지금 받기",
       "link_title": "MetaMask 카드 연결",
-      "link_subtitle": "Money 잔액을 사용하고 수익도 받으세요.",
-      "link_bullet_cashback": "최대 3% 캐시백",
-      "link_bullet_apy": "최대 {{apy}}% APY",
-      "link_card": "카드 연결"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "카드 연결",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "혜택",
-      "benefit_auto_earn": "자동 수익 ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "1:1 달러 연동 스테이블코인인 mUSD로 자금을 안전하게 보관하세요",
       "benefit_liquidity": "락업 없이 완전한 유동성을 제공하므로 언제든지 거래하거나 출금할 수 있습니다",
       "benefit_spend_prefix": "MetaMask Card로 1억 5천만 개 이상의 가맹점에서 결제하고 ",
-      "benefit_spend_cashback": "1~3% 캐시백을 받으세요",
-      "benefit_transfer": "MetaMask의 모든 지갑으로 자금을 전송할 수 있습니다",
-      "benefit_global": "전 세계 어디서나 자금을 보내고 받을 수 있습니다",
+      "benefit_spend_cashback": "1-3% mUSD 캐시백",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "더 보기"
     },
     "footer": {
-      "add_money": "자금 추가"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "자금 추가",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "암호자산 전환",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "자금 예치",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "외부 지갑에서 받기",
       "coming_soon": "곧 추가 예정"
     },
+    "more_sheet": {
+      "title": "더 보기",
+      "how_it_works": "작동 방식",
+      "what_you_get": "혜택",
+      "contact_support": "지원팀에 문의"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "계좌 간",
+      "perps_account": "무기한 선물 계정",
+      "predictions_account": "예측 계정",
+      "send_external": "외부 주소에 전송",
+      "withdraw_to_bank": "은행으로 출금"
+    },
+    "apy_tooltip": {
+      "title": "연간수익률(APY)",
+      "paragraph_1": "회원님의 머니 계정은 자동으로 최대 {{percentage}}%의 수익을 올릴 수 있습니다.",
+      "paragraph_2": "표시된 수익률은 현재 시장 상황에 기반한 예상 연간수익률(APY)입니다. 연간수익률은 변동형이며 다양한 요인에 따라 달라질 수 있습니다. 수익률은 블록체인 프로토콜에서 자금을 운용하는 제3자 디파이 플랫폼에 의해 산정됩니다.",
+      "paragraph_3": "MetaMask 카드를 연결하면 결제액이 이 잔액에서 차감됩니다."
+    },
+    "earnings_tooltip": {
+      "title": "예상 수익",
+      "body": "현재 잔액과 오늘의 연간수익률을 기준으로 계산한 일정 기간의 예상 수익입니다. 예상 수익은 보장되지 않으며 변동될 수 있습니다."
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "활동",
       "view_all": "모두 보기",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "머니",
       "section_title": "작동 방식",
-      "description_1": "Money 계정은 자동으로 4% APY(변동)를 제공합니다. 자금은 엄선된 DeFi 금고에 예치되어 감사를 받은 대출 시장 전반에서 수익을 창출합니다. 스테이킹도, 청구도, 락업도 없습니다.",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "Money 잔액은 결제에 사용할 수 있는 잔액입니다. MetaMask 카드를 연결하면 전 세계 1억 5천만 개 이상의 가맹점에서 사용할 수 있습니다. 자금은 사용하는 순간까지 계속 수익을 냅니다.",
-      "faq_title": "FAQ",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "곧 추가 예정.",
-      "faq_q1": "Money 계정이란 무엇인가요?",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "mUSD란 무엇인가요?",
       "faq_q3": "수익은 어디에서 발생하나요?",
       "faq_q4": "자금은 묶이나요? 언제든지 인출할 수 있나요?",
@@ -6608,8 +6770,7 @@
       "faq_q7": "APY 비율은 변경되나요?",
       "faq_q8": "이 계정은 저축 계정인가요, 결제 계정인가요?",
       "faq_q9": "제 자금은 누가 관리하나요?",
-      "faq_q10": "MetaMask 카드로 어떤 캐시백을 받을 수 있나요?",
-      "sounds_good": "좋아요"
+      "faq_q10": "MetaMask 카드를 사용하면 mUSD 캐시백을 얼마나 받을 수 있나요?"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "취소",
     "confirm": "컨펌",
+    "pay_with_bottom_sheet": {
+      "title": "결제 수단:",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "계속 진행하면 당사의 ",
       "terms_of_use": "이용약관",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "출금",
       "predict_deposit": "예측 자금 추가",
       "predict_withdraw": "출금",
-      "money_account_deposit": "자금 추가",
-      "money_account_withdraw": "자금 출금"
+      "money_account_add_money": "자금 추가",
+      "money_account_transfer_money": "송금"
     },
     "sub_title": {
       "permit": "이 사이트에서 토큰 사용 권한을 요청합니다.",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "무기한 선물 거래 시 사용되는 네트워크인 HyperCore에서 토큰을 USDC로 스왑합니다. 스왑 제공업체가 수수료를 부과할 수 있지만 MetaMask에서 부과하는 수수료는 없습니다."
       },
       "predict_deposit": {
-        "transaction_fee": "예측에서 사용하는 네트워크인 Polygon에서 토큰을 USDC.e로 스왑합니다. 스왑 제공업체가 수수료를 부과할 수 있지만 MetaMask에서 부과하는 수수료는 없습니다."
+        "transaction_fee": "'예측'에서 사용하는 Polygon 네트워크를 통해 회원님의 토큰을 pUSD로 스왑합니다. 스왑 제공업체는 수수료를 부과할 수 있으나 MetaMask의 경우 수수료가 없습니다."
       },
       "perps_withdraw": {
         "transaction_fee": "MetaMask가 원하는 토큰으로 스왑해 드립니다. mUSD로 스왑할 때 MetaMask 수수료는 적용되지 않습니다."
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "mUSD 환전 수수료에는 네트워크 비용이 포함되며 제공업체 수수료가 포함될 수 있습니다. mUSD로 환전할 때 MetaMask 수수료는 적용되지 않습니다."
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "수수료"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "암호화폐 구매",
       "buy_predict": "예측 기능을 사용하려면 지갑에 자금을 추가하세요.",
-      "buy_perps": "무기한 선물을 사용하려면 지갑에 자금을 추가하세요."
+      "buy_perps": "무기한 선물을 사용하려면 지갑에 자금을 추가하세요.",
+      "projected_five_year_balance": "5년 후 예상 잔액:"
     },
     "unlimited": "무제한",
     "all": "모두",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "계속",
     "deposit_edit_amount_done": "자금 추가",
     "deposit_edit_amount_predict_withdraw": "출금",
-    "deposit_edit_amount_musd_conversion": "mUSD로 전환"
+    "deposit_edit_amount_musd_conversion": "mUSD로 전환",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "결과가 변경되었습니다",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "스왑",
     "terms_and_conditions": "이용약관",
     "select_token": "토큰 선택",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "토큰을 찾을 수 없습니다",
     "no_tokens_found_description": "해당 이름의 토큰을 찾을 수 없습니다. 다른 검색어를 입력해 보세요.",
     "select_network": "네트워크 선택",
@@ -7115,6 +7303,7 @@
     "receive_at": "수령 주소:",
     "recipient": "받는 사람",
     "select_recipient": "수신자 선택",
+    "select_account": "계정 선택",
     "external_account": "외부 계정",
     "error_banner_description": "현재 이 거래 경로를 이용할 수 없습니다. 금액이나 네트워크, 토큰을 변경해 보세요. 최적의 옵션을 찾아드리겠습니다.",
     "stock_token_error_banner_description": "현재 이 거래 경로를 이용할 수 없습니다. 금액이나 네트워크, 토큰을 변경해 보세요. 최적의 옵션을 찾아드리겠습니다.\n\nOndo 토큰화 주식을 거래하려는 경우 미국, EU, 영국, 브라질 등 지역 제한이 적용될 수 있습니다.",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "높은 가격 영향",
     "price_impact_error_title": "매우 높은 가격 영향",
     "price_impact_error_description": "이번 스왑으로 토큰의 시장 가격 대비 약 {{priceImpact}}만큼 손실이 발생합니다. 더 작은 규모로 거래하거나 유동성이 더 높은 경로를 선택하면 더 나은 비율을 받을 수 있습니다.",
+    "insufficient_native_reserve_cta": "최대 허용 금액 사용",
+    "insufficient_native_reserve_message": "이 네트워크를 이용하려면 계정에 최소 {{minimumReserve}} {{ticker}}의 잔액이 남아 있어야 합니다. 최대 {{maxSwappable}} {{ticker}}을(를) 사용할 수 있습니다.",
+    "insufficient_native_reserve_title": "최소 {{ticker}}의 예치금 필요함",
     "token_warning_suspicious_banner": "{{token}}은(는) 의심스러운 토큰입니다.",
     "token_warning_malicious_banner": "{{token}}은(는) 악성 토큰입니다. 이 토큰과 상호작용할 때 주의하세요.",
     "token_warning_modal_suspicious_title": "의심스러운 토큰",
@@ -7542,17 +7734,17 @@
         "price": "수수료",
         "feature_1": "Apple Pay 및 Google Pay용 가상 카드",
         "feature_2": "암호화폐로 결제 (USDC, USDT, WETH 등)",
-        "feature_3": "모든 구매 시 USDC 1% 캐시백"
+        "feature_3": "모든 결제 시 1% mUSD 캐시백"
       },
       "metal_card": {
         "name": "메탈 카드",
         "price": "연 $199",
         "everything_in_virtual": "가상 카드의 모든 혜택에 더해, 다음 특전도 제공됩니다.",
         "feature_1": "프리미엄 각인 메탈 카드",
-        "feature_2": "연간 첫 $10,000 사용액에 대해 3% 캐시백",
+        "feature_2": "매년 $10,000까지의 누적 결제액에 대해 3% mUSD 캐시백",
         "feature_3": "해외 결제 수수료 없음"
       },
-      "earn_up_to_badge": "연간 최대 $300 캐시백 적립",
+      "earn_up_to_badge": "매년 최대 $300의 캐시백 받기",
       "upgrade_to_metal_label": "또는 Metal로 업그레이드하고 3배 보상 적립"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "카드 주문이\n완료되었습니다",
       "subtitle": "4~6주 내에 배송될 예정입니다.",
-      "description": "가상 카드를 설정하고 디지털 지갑에 추가해 캐시백 받기를 시작하세요.",
+      "description": "가상 카드를 설정하고 디지털 지갑에 추가하여 mUSD 캐시백을 받으세요.",
       "set_up_card_button": "카드 설정",
       "back_to_card_button": "카드로 돌아가기"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "결제와 동시에\n수익 창출",
-      "description": "MetaMask 카드를 이용하면\n암호화폐를 쉽고 빠르게 결제하며\n최대 3%의 캐시백을 받을 수 있습니다.",
+      "description": "MetaMask 카드로 암호자산을\n쉽고 빠르게 결제에 사용하고 최대 \n3% mUSD 캐시백을 받을 수 있습니다.",
       "apply_now_button": "설정하기",
       "login_button": "로그인",
       "not_now_button": "나중에",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "카드 활성화",
       "enable_assets_button_label": "자산 활성화",
       "spending_limit_warning": "지출 한도가 거의 찼습니다. 결제가 거부되지 않도록 정보를 업데이트하세요.",
+      "spending_limit_available": "사용 가능",
       "logout": "로그아웃",
       "contact_support": "지원팀에 문의",
       "logout_confirmation_title": "카드에서 로그아웃하시겠습니까?",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "이용약관",
         "order_metal_card": "메탈 카드",
         "order_metal_card_description": "실물 메탈 카드를 지금 주문하세요",
-        "cashback": "캐시백",
-        "cashback_description": "모든 결제 금액의 1% 돌려받기",
-        "cashback_description_metal": "모든 결제 금액의 3% 돌려받기",
+        "cashback": "mUSD 캐시백",
+        "cashback_description": "모든 결제 시 1% mUSD 캐시백 받기",
+        "cashback_description_metal": "모든 결제 시 3% mUSD 캐시백 받기",
         "freeze_card": "카드 정지",
         "unfreeze_card": "카드 정지 해제",
         "freeze_card_description": "카드의 모든 사용 일시 중지",
@@ -7917,8 +8110,8 @@
       "token_label": "토큰"
     },
     "cashback_screen": {
-      "title": "캐시백",
-      "available_cashback": "사용 가능한 캐시백",
+      "title": "mUSD 캐시백",
+      "available_cashback": "사용 가능한 mUSD",
       "network_fee": "네트워크 수수료",
       "expected_to_receive": "예상 수령액",
       "withdraw": "출금",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "출금이 시작되었습니다",
       "withdrawal_success": "성공적으로 출금 완료",
       "withdrawal_failed": "출금에 실패했습니다. 다시 시도하세요.",
-      "no_cashback": "캐시백을 사용할 수 없음",
-      "loading_error": "캐시백을 불러오지 못했습니다. 다시 시도하세요."
+      "no_cashback": "mUSD 캐시백을 받을 수 없음",
+      "loading_error": "mUSD 캐시백 정보를 불러오지 못했습니다. 다시 시도하세요.",
+      "funding_required": {
+        "title": "Linea 자금 조달 설정",
+        "description": "mUSD 캐시백을 받기 전에 Linea에서 승인된 자금 조달 출처를 한 개 이상 설정해야 합니다.",
+        "confirm_button_label": "자금 조달 설정"
+      }
     },
     "change_asset": {
       "title": "토큰 및 네트워크 변경",
@@ -8032,7 +8230,8 @@
     "title": "결제 방법 선택",
     "title_receive": "토큰 받기 선택",
     "no_gas": "가스비로 사용할 네이티브 토큰 잔액 없음",
-    "not_supported": "지원되지 않음"
+    "not_supported": "지원되지 않음",
+    "crypto": "암호화폐"
   },
   "connection_removed_modal": {
     "title": "연결 제거 완료",
@@ -8048,6 +8247,15 @@
       "title": "참여 실패",
       "description": "연결 상태를 확인하고 다시 시도하세요."
     },
+    "notifications_nudge": {
+      "title": "기회를 놓치지 마세요",
+      "description": "캠페인 소식을 받아보려면 알림을 활성화하세요.",
+      "turn_on_button": "켜기",
+      "loading": "알림 활성화 중...",
+      "loading_description": "이 작업은 약간 시간이 걸릴 수 있습니다.",
+      "enable_error": "알림 활성화 실패",
+      "success": "알림 활성화됨"
+    },
     "version_guard": {
       "title": "업데이트 필요",
       "description": "보상을 사용하려면 더 최신 버전의 MetaMask가 필요합니다. 계속하려면 업데이트하세요.",
@@ -8126,6 +8334,17 @@
       "retry_button": "다시 시도"
     },
     "main_title": "보상",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "추천",
     "referral_stats_earned_from_referrals": "추천을 통해 적립",
     "referral_stats_referrals": "추천",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "적용 중인 부스트",
     "season_1": "시즌 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "mUSD 보너스 계산기",
-      "description": "스테이블코인을 mUSD로 전환하면 얼마나 적립할 수 있는지 확인해 보세요.",
-      "amount_label": "전환 금액",
-      "estimated_bonus": "예상 연환산 보너스: 최대 3%",
-      "initial_amount": "초기 금액",
-      "daily_bonus": "매일 청구 가능 보너스",
-      "annualized_bonus": "연환산 보너스",
-      "disclaimer": "이는 추정치일 뿐입니다. 보너스는 변경될 수 있습니다.",
-      "disclaimer_brief": "보너스는 예상치이며 변경될 수 있습니다.",
+      "page_title": "mUSD 계산기",
+      "hero_hold": "mUSD 보유.",
+      "hero_earn": "수익 창출",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/년",
+      "earnings_per_month_suffix": "/월",
+      "earnings_per_day_suffix": "/일 매일 수령 가능",
+      "slider_amount_label": "수량",
+      "disclaimer_calculator": "3% 보너스를 기준으로 계산한 예상 금액입니다. 보너스율은 변동될 수 있습니다. 언제든지 수령 가능합니다.",
       "buy_button": "mUSD 구매",
       "swap_button": "mUSD로 스왑"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "종료일: {{date}}",
       "ended_date": "{{date}}에 종료됨",
       "pill_up_next": "곧 추가 예정",
+      "up_next": "다음 일정",
+      "notify_me": "알림 받기",
       "pill_active": "진행 중",
       "pill_complete": "완료",
       "enter": "참여",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "회원님의 지역에서 사용할 수 없습니다",
       "geo_locked_toast_description": "이 캠페인은 해당 지역에서 이용할 수 없습니다. 새 캠페인이 있는지 나중에 다시 확인해 주세요.",
       "geo_locked_cta": "자격 확인",
-      "geo_loading": "지역 확인 중..."
+      "geo_loading": "지역 확인 중...",
+      "remind_me_success_toast": "이 캠페인이 시작되면 알려드립니다.",
+      "remind_me_save_error": "알림을 저장할 수 없습니다. 다시 시도하세요."
     },
     "campaign_mechanics": {
       "title": "운영 방식"
@@ -8479,10 +8701,10 @@
       "qualified_description": "순유입을 늘려 티어를 높이면 더 큰 보상을 받을 기회를 얻을 수 있습니다.",
       "not_eligible_title": "자격 없음",
       "not_eligible_description": "거래 시점이 너무 늦어 {{days}}일 보유 요건을 충족하지 못하는 거래는 등급이나 티어 산정 시 제외됩니다.",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "총 참여자 수",
+      "completed_label_total_tvl": "총 TVL",
+      "completed_label_top_return": "최고 수익률",
+      "completed_label_winners": "수상자"
     },
     "ondo_campaign_activity": {
       "title": "전체 활동",
@@ -8508,6 +8730,48 @@
       "cancel": "취소",
       "confirm": "견적은 다음 기간 전에 만료됨을"
     },
+    "perps_trading_campaign": {
+      "title": "무기한 선물 트레이딩 대회",
+      "stats_title": "통계",
+      "performance_title": "실적",
+      "label_rank": "순위",
+      "label_your_rank": "내 등급",
+      "label_pnl": "손익",
+      "label_volume": "거래량",
+      "label_notional_volume": "명목 거래량",
+      "pending": "보류 중",
+      "qualified": "자격 획득",
+      "open_position_cta": "열린 포지션",
+      "leaderboard_title": "리더보드",
+      "leaderboard_total_participants": "참여자 {{count}}명",
+      "last_updated": "마지막 업데이트: {{time}}",
+      "leaderboard_error_loading": "리더보드 불러오기 실패",
+      "leaderboard_error_loading_description": "리더보드를 불러오는 중 문제가 발생했습니다. 다시 시도해 주세요.",
+      "leaderboard_not_yet_computed": "리더보드 집계가 아직 완료되지 않았습니다. 잠시 후에 다시 확인해 주세요.",
+      "leaderboard_powered_by_prefix": "제공자 ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "총 상금 규모",
+      "prize_pool_current_label": "현재",
+      "prize_pool_next_label": "다음",
+      "prize_pool_volume_subtext": "{{target}}의 거래량 중 {{current}}",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}} + 거래량: 모든 단계 달성됨",
+      "prize_pool_max_badge": "최대",
+      "prize_pool_error_title": "총 상금 규모를 불러올 수 없음",
+      "prize_pool_error_description": "총 상금 규모를 불러오는 중에 오류가 발생했습니다. 다시 시도하세요.",
+      "prize_pool_retry_button": "다시 시도",
+      "stats_notional_volume_threshold": "${{amount}} 필요함",
+      "stats_qualified_title": "자격 충족",
+      "stats_qualified_description": "대회 종료 전까지 계속 거래해 손익을 개선하고 리더보드 순위도 올려보세요.",
+      "stats_qualify_for_rank_title": "이 등급 자격 획득하기",
+      "stats_qualify_for_rank_description": "참가 자격을 획득하려면 명목 거래량 기준으로 {{notionalRemaining}}만큼 더 거래해야 합니다.",
+      "stats_error_title": "통계를 불러올 수 없음",
+      "stats_error_description": "통계를 불러오는 중에 문제가 발생했습니다. 다시 시도하세요.",
+      "stats_retry": "다시 시도",
+      "completed_label_total_participants": "총 참가자 수",
+      "completed_label_total_volume": "총 거래량",
+      "completed_label_top_pnl": "손익 상위",
+      "completed_label_winners": "수상자"
+    },
     "campaigns_preview": {
       "title": "캠페인",
       "coming_soon": "곧 추가 예정",
@@ -8532,29 +8796,29 @@
       "retry_button": "다시 시도",
       "refreshing": "새로 고침 중..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "승리하셨습니다",
       "rank_label": "{{place}} 장소",
-      "email_instructions": "상품을 받으려면 당첨 코드를 ondocampaign@consensys.net으로 이메일로 보내세요.",
+      "email_instructions": "상품을 수령하려면 코드를 포함한 이메일을 {{email}}에 보내세요.",
       "open_mail": "메일 열기",
       "skip_for_now": "지금은 건너뛰기",
-      "mail_subject": "Ondo 캠페인 상품 청구",
+      "mail_subject": "{{campaignName}} 상품 수령",
       "mail_body": "당첨 코드: {{code}}",
       "winning_code": "당첨 코드",
       "close_a11y": "닫기"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "승리하셨습니다",
-        "description": "오늘 상품을 청구하세요.",
-        "a11y": "당첨자 세부 정보 열기"
+        "title": "승리하셨습니다!",
+        "description": "수상 코드를 인증하여 상품을 수령하세요.",
+        "a11y": "세부 정보 보기"
       },
       "participant_pending": {
         "title": "캠페인이 종료되었습니다.",
         "description": "결과를 확인 중입니다. 곧 다시 확인해 주세요."
       },
       "participant_finalized": {
-        "title": "캠페인 결과가 발표되었습니다",
+        "title": "캠페인 결과가 발표되었습니다.",
         "description": "이번에는 당첨되지 않았습니다. 리더보드에서 순위를 확인해 보세요."
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "보상이 지급될 예정입니다. 곧 연락드리겠습니다."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "승리하셨습니다 💰",
-        "description": "{{campaignName}} 상품을 청구하세요",
+        "description": "{{campaignName}}의 상품을 수령하세요.",
         "cta": "세부 정보 보기"
       },
-      "participant_no_winner": {
-        "title": "결과가 발표되었습니다. 🏅",
-        "description": "{{campaignName}}에서 내 순위 보기",
+      "non_winner": {
+        "title": "결과가 발표되었습니다 🏅",
+        "description": "{{campaignName}}에서 내 순위 보기.",
         "cta": "보기"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "수익금 수령함",
       "predict_deposit": "예측 계정에 입금함",
       "predict_withdraw": "출금",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "머니 계정에 입금하기",
+      "money_account_withdraw": "머니 계정에서 이체",
       "default": "트랜잭션 세부 사항"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "둘러보기",
-    "trending_tokens": "트렌드",
+    "crypto_movers": "암호자산 변동 종목 ",
+    "perps_movers": "무기한 선물 변동 종목",
+    "trending_tokens": "인기",
+    "crypto": "암호화폐",
     "stocks": "주식",
     "price_change": "가격 변동",
     "all_networks": "모든 네트워크",
@@ -8673,6 +8940,17 @@
     "1_hour": "1시간",
     "5_minutes": "5분",
     "networks": "네트워크",
+    "ecosystems": "생태계",
+    "ecosystems_subtitle": "MetaMask Portfolio에서 다양한 체인의 디앱, 토큰, NFT를 둘러보세요.",
+    "all_sports": "인기 스포츠",
+    "basketball": "농구",
+    "football": "풋볼",
+    "soccer": "축구",
+    "tennis": "테니스",
+    "f1": "F1",
+    "golf": "골프",
+    "all_sports_no_markets": "이 카테고리에는 아직 진행 중인 마켓이 없습니다. 잠시 후 다시 확인하거나 위에서 다른 스포츠를 선택해 주세요.",
+    "load_more": "더 불러오기",
     "sort_by": "정렬 기준",
     "volume": "거래량",
     "market_cap": "시가총액",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "토큰, 사이트 및 URL 검색",
     "cancel": "취소",
     "perps": "무기한 선물",
+    "rwa_perps_section": "무기한 선물",
+    "macro_stocks_commodity_perps": "무기한 선물",
+    "macro_pill_stocks": "주식",
+    "macro_pill_commodities": "상품",
+    "rwa_pill_commodities": "상품",
+    "rwa_pill_stocks": "주식",
+    "rwa_pill_forex": "외환",
+    "crypto_perps_section": "무기한 선물",
     "predictions": "예측",
     "no_results": "검색 결과가 없습니다",
+    "popular": "인기",
     "sites": "사이트",
     "popular_sites": "인기 사이트",
     "search_sites": "사이트 검색",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "토큰을 찾을 수 없습니다",
       "description": "해당 토큰을 찾을 수 없습니다"
+    },
+    "tabs": {
+      "now": "지금",
+      "macro": "거시 경제",
+      "rwas": "실물연계자산",
+      "crypto": "암호화폐",
+      "sports": "스포츠",
+      "dapps": "사이트"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "취소",
-      "continue": "계속"
+      "continue": "계속",
+      "learn_more": "더 보기",
+      "try_again": "다시 시도"
     },
     "connecting": {
       "title": "{{device}} 연결 중...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "장치에 연결하려면 블루투스를 켜세요",
       "bluetooth_scan_failed": "장치를 스캔하지 못했습니다. 다시 시도하세요",
       "bluetooth_connection_failed": "기기 연결에 실패했습니다. 다시 시도하세요",
+      "camera_permission_denied": "QR 코드를 스캔하려면 카메라 권한이 필요합니다. 기기 설정에서 해당 권한을 활성화하세요.",
       "not_supported": "지원되지 않는 작업입니다",
       "unknown_error": "이 계정에 대한 비밀복구구문 또는 패스프레이즈로 {{device}}이(가) 설정되어 있는지 확인하세요"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "위치 권한 필요",
       "nearby_devices_permission_denied": "근처 장치 권한 필요",
       "scan_failed": "스캔 실패",
+      "camera_permission_denied": "카메라 권한 필요",
       "something_went_wrong": "문제가 발생했습니다"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "지갑 동기화 QR 코드 스캔하기",
+          "body": "하드웨어 지갑으로 돌아가 계정 공유 또는 계정 내보내기 옵션을 찾은 후 MetaMask를 선택하고 QR 코드를 스캔하세요."
+        },
+        "sign": {
+          "title": "서명 QR 코드 스캔하기",
+          "body": "하드웨어 지갑으로 돌아가 거래를 승인한 후 표시된 QR 코드를 스캔하세요."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "잘못된 QR 코드",
+          "body": "하드웨어 지갑으로 돌아가 MetaMask를 지갑 유형으로 선택한 후, 새 QR 코드를 생성해 스캔하세요."
+        },
+        "sign": {
+          "title": "잘못된 QR 코드",
+          "body": "하드웨어 지갑으로 돌아가 거래를 승인한 후 표시된 QR 코드를 스캔하세요."
+        }
+      },
+      "ur_decode_error": {
+        "title": "QR 코드를 읽을 수 없음",
+        "body": "QR 코드가 화면에 완전히 표시되고 주변 조명이 충분히 밝은지 확인한 후 다시 시도해 주세요. 문제가 계속되는 경우, 하드웨어 지갑의 펌웨어를 업데이트해야 할 수 있습니다."
+      }
+    },
     "device_selection": {
       "title": "{{device}} 선택",
       "scanning": "장치 스캔 중...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "머니",
-      "cash_empty_description": "아직 mUSD가 없습니다. 홈 화면의 Money 섹션에서 스테이블코인을 mUSD로 전환하세요.",
-      "cash_empty_description_network_filter": "이 네트워크에는 mUSD가 없습니다. mUSD를 확인하려면 네트워크를 전환하세요.",
+      "money": "머니",
+      "money_empty_description": "아직 mUSD가 없습니다. 홈 화면의 Money 섹션에서 스테이블코인을 mUSD로 전환하세요.",
+      "money_empty_description_network_filter": "이 네트워크에는 mUSD가 없습니다. mUSD를 확인하려면 네트워크를 전환하세요.",
+      "money_empty_state": {
+        "get_started": "지금 시작하세요",
+        "earn_apy": "{{percentage}}% APY 수익 얻기"
+      },
+      "money_filled_state": {
+        "add": "추가",
+        "apy": "{{percentage}}% APY"
+      },
       "tokens": "토큰",
+      "perps": "무기한 선물",
+      "related_assets": "관련 자산",
       "perpetuals": "영구계약",
       "predictions": "예측",
       "whats_happening": "주요 동향",
+      "whats_happening_ai": "AI",
+      "whats_happening_impact": {
+        "bullish": "강세",
+        "bearish": "약세",
+        "neutral": "중립"
+      },
       "top_traders": "상위 트레이더",
       "whats_happening_categories": {
         "geopolitical": "지정학",
@@ -8819,7 +9160,7 @@
       },
       "defi": "디파이",
       "nfts": "NFT",
-      "trending_tokens": "트렌드",
+      "trending_tokens": "인기",
       "trending_perpetuals": "인기 무기한 선물",
       "trending_predictions": "인기 예측",
       "import_nfts": "NFT 가져오기",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "{{section}} 불러올 수 없음",
       "retry": "다시 시도"
     }
+  },
+  "sites": {
+    "popular": "인기"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/pt.json b/locales/languages/pt.json
index 1e25a0282ee..9101c2f7357 100644
--- a/locales/languages/pt.json
+++ b/locales/languages/pt.json
@@ -634,7 +634,8 @@
     "trade": "Negociar",
     "settings": "Configurações",
     "rewards": "Recompensas",
-    "trending": "Explorar"
+    "trending": "Explorar",
+    "money": "Money"
   },
   "drawer": {
     "send_button": "Enviar",
@@ -708,7 +709,11 @@
     "smart_contract_address": "Endereço de contrato inteligente",
     "smart_contract_address_warning": "O endereço do destinatário pode não aceitar transferências diretas de tokens, o que pode resultar na perda de fundos. Prossiga apenas se tiver certeza de que este contrato pode receber sua transferência.",
     "i_understand": "Eu compreendo",
-    "cancel": "Cancelar"
+    "cancel": "Cancelar",
+    "new_address_title": "Novo endereço",
+    "new_address_message": "Este é o seu primeiro envio para este endereço. Certifique-se de que ele está correto antes de continuar:",
+    "alert_navigation_previous": "Alerta anterior",
+    "alert_navigation_next": "Próximo alerta"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "Melhores traders",
       "allow_push_notifications": "Permitir notificações push",
       "trades_over_label": "Receba notificações de negociações acima de:",
       "traders_you_follow": "Traders que você segue",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "Não foi possível carregar os traders que você segue."
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "Notificações de {{traderName}}",
       "allow_push_notifications": "Permitir notificações push",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "Receba notificações sobre a atividade de negociação de {{traderName}}",
+      "manage_traders": "Gerencie os traders que você segue",
       "save": "Salvar"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "Receba alertas em tempo real sobre negociações de traders que você segue",
       "allow_push_notifications": "Permitir notificações push",
       "trades_over_label": "Receba notificações de negociações acima de:",
       "save": "Salvar",
@@ -1059,7 +1064,12 @@
       "closed": "Fechado",
       "no_positions": "Ainda não há posições",
       "error_loading_profile": "Não foi possível carregar perfil",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "Ver no X (Twitter)",
+      "sort": {
+        "value": "Valor",
+        "pnl_percent": "P&L %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "Capitalização de mercado",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} vendido",
       "no_trades": "Nenhuma negociação durante este período",
       "closed_position": "Posição encerrada",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "Posição não disponível",
+      "fallback_subtitle": "Não foi possível carregar esta posição agora.",
+      "fallback_back_to_profile": "Voltar ao perfil",
+      "fallback_back_to_leaderboard": "Voltar à tabela de classificação"
     },
     "quick_buy": {
       "title": "Comprar {{symbol}}",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "Previsões da MetaMask",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "Mercados de previsão",
     "market_list": "Lista de mercado",
     "loading": "Carregando...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "Alterar método de pagamento",
+      "add_funds": "Adicionar fundos",
+      "add": "Adicionar",
+      "predict_balance": "Prever saldo"
+    },
     "order": {
       "available": "Disponível",
       "cashed_out": "Sacado",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "A movimentação do mercado está muito rápida, por isso não foi possível comprar a {{price}}. Que tal tentar novamente pelo melhor preço disponível?",
       "market_busy_body_sell": "A movimentação do mercado está muito rápida, por isso não foi possível vender a {{price}}. Que tal tentar novamente pelo melhor preço disponível?",
       "order_failed_title": "Ordem falhou",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "Não foi possível processar sua ordem. Tentar novamente?",
+      "price_changed_title": "Preço alterado",
+      "price_changed_body": "Não foi possível comprar por {{price}}. Tentar ao preço de mercado?",
       "retry": "Tentar novamente",
       "try_again": "Tentar novamente",
       "view": "Ver",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "Saque concluído",
       "withdraw_completed_subtitle": "{{amount}} USDC transferidos para sua carteira",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}} transferidos para sua carteira",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "Entendi",
       "error_title": "Ocorreu algum erro",
       "error_description": "Falha ao continuar com a retirada",
       "try_again": "Tentar novamente"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "É necessário {{tokenSymbol}} para continuar",
     "fund_your_wallet": "Deposite fundos em sua carteira",
     "get_ready_for_web3": "Prepare sua carteira para usar a web3",
+    "home_onboarding_steps": {
+      "header": "Etapas",
+      "get_started_title": "Comece a usar a MetaMask",
+      "fund_title": "Deposite fundos em sua carteira",
+      "fund_subtitle": "Ninguém gosta de ficar com a carteira vazia. Adicione fundos facilmente para começar a negociar.",
+      "fund_primary": "Adicionar fundos",
+      "trade_title": "Faça sua primeira negociação",
+      "trade_subtitle": "Negocie tokens populares em diversas redes para expandir seu portfólio.",
+      "trade_primary": "Negociar",
+      "notifications_title": "Ativar notificações",
+      "notifications_subtitle": "Mantenha-se atualizado sobre as mudanças do mercado para tomar as melhores decisões para o seu portfólio.",
+      "notifications_primary": "Ativar",
+      "skip": "Pular",
+      "progress_a11y": "Etapa {{current}} de {{total}}",
+      "balance_loading_a11y": "Carregando saldo da carteira"
+    },
     "add_funds": "Adicionar fundos",
     "next": "Avançar",
     "buy_asset": "Comprar {{asset}}",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "Número inválido. Insira um número entre 1 e %{maxSafeChainId}",
     "hide_zero_balance_tokens_title": "Ocultar tokens sem saldo",
     "hide_zero_balance_tokens_desc": "Evita que tokens sem saldo sejam exibidos na sua listagem de tokens.",
+    "haptic_feedback_title": "Feedback háptico",
+    "haptic_feedback_desc": "Sinta vibrações sutis para confirmações, erros e interações. Desative para reduzir os estímulos háptico.",
     "token_detection_title": "Detectar tokens automaticamente",
     "token_detection_description": "Usamos APIs de terceiros para detectar e exibir novos tokens enviados à sua carteira. Desative essa opção caso não queira que o app extraia dados desses serviços.",
     "theme_button_text": "Mudar tema",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "Mais confiável",
         "quote_unknown_provider": "Provedor desconhecido",
         "start_headless_buy": "Iniciar compra sem interface",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "Substitua e inicie o modo sem interface",
         "start_headless_buy_disabled_hint": "Insira um valor válido para ativar",
         "start_headless_buy_pending": "Sessão sem interface ativada — abrir BuildQuote",
         "cancel_headless_buy": "Cancelar sessão sem interface",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "Sessão ativa: {{sessionId}} — iniciar outra cotação irá cancelá-la.",
         "event_log_title": "Registro de eventos",
         "event_log_empty": "Nenhum evento ainda — inicie uma sessão sem interface e fique atento(a).",
         "event_log_started": "iniciou sessão {{sessionId}} (ativo={{assetId}}, valor={{amount}}, pagamento={{paymentMethodId}}{{providerSuffix}})",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "sessão cancelada pelo consumidor {{sessionId}}"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "Compra sem interface",
+        "loading": "Preparando o fluxo de compras…",
+        "no_session": "A sessão sem interface não está mais ativa.",
+        "cancel": "Cancelar"
       }
     },
     "request_feature": "Solicitar um recurso",
@@ -3553,7 +3622,7 @@
     "security_alerts": "Alertas de segurança",
     "security_alerts_desc": "Esse recurso alerta sobre atividades mal-intencionadas por meio da análise local de solicitações de transações e assinaturas. Sempre realize sua própria devida diligência antes de aprovar solicitações. Não há garantia de que esse recurso detectará toda e qualquer atividade mal-intencionada. Ao ativar esse recurso, você concorda com os termos de uso do provedor.",
     "smart_account_dapp_requests_heading": "Solicitações de conta inteligente vindas de dapps",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "Permita que aplicativos descentralizados (dApps) solicitem recursos de conta inteligente para contas padrão. A MetaMask fará upgrade apenas para nossa conta inteligente auditada.",
     "smart_transactions_opt_in_heading": "Transações inteligentes",
     "smart_transactions_opt_in_desc_supported_networks": "Ative as transações inteligentes para fazer transações mais confiáveis e seguras nas redes suportadas.",
     "smart_transactions_learn_more": "Saiba mais",
@@ -3572,6 +3641,39 @@
         "title": "Cartão",
         "reset_onboarding_description": "Redefina o estado de integração do Cartão para iniciar o fluxo de integração desde o início.",
         "reset_onboarding_button": "Redefinir estado de integração"
+      },
+      "haptics": {
+        "title": "Háptica",
+        "description": "Antecipe a resposta háptica em um dispositivo físico. Essa opção contorna a redução da resposta háptica no aplicativo e o botão de desativação remota, permitindo que você avalie cada padrão. Simuladores geralmente não reproduzem a resposta háptica.",
+        "catalog_impacts_heading": "Catalogar momentos de impacto",
+        "notifications_heading": "Padrões de notificação",
+        "selection_heading": "Seleção",
+        "notification_success_button": "Notificação – Sucesso",
+        "notification_error_button": "Notificação – Erro",
+        "notification_warning_button": "Notificação – Aviso",
+        "selection_button": "Seleção",
+        "raw_impacts_heading": "Estilos de impacto da Raw Expo",
+        "raw_impacts_desc": "Estilos de impacto expo-háptico direto para comparação com os momentos mapeados no catálogo acima.",
+        "impacts": {
+          "quick_amount_selection": "Impacto — Seleção rápida de valor",
+          "slider_tick": "Impacto — Marcação do controle deslizante",
+          "edge_gesture_engage": "Impacto — Ativar gesto de computação de borda",
+          "page_navigation": "Impacto – Navegação na página",
+          "slider_grip": "Impacto — Empunhadura deslizante",
+          "tab_change": "Impacto — Mudança de guia",
+          "primary_cta": "Impacto – CTA principal",
+          "pull_to_refresh_engage": "Impacto — Puxar para atualizar (acionar)",
+          "pull_to_refresh": "Impacto – Puxar para atualizar (liberar)",
+          "chart_crosshair": "Impacto — Retículo de linha do gráfico",
+          "follow_toggle": "Impacto – Seguir alternância"
+        },
+        "raw_styles": {
+          "light": "Impacto bruto – Leve",
+          "medium": "Impacto bruto - Médio",
+          "heavy": "Impacto bruto – Forte",
+          "rigid": "Impacto bruto – Rígido",
+          "soft": "Impacto bruto – Suave"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "Previsões",
     "add_collectible_button": "Adicionar",
     "info": "Informações",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "Troca",
     "convert": "Converter",
     "bridge": "Ponte",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "Solução de problemas",
     "deposit_description": "Transferência bancária ou com cartão com taxas baixas",
     "buy_description": "Bom para comprar um token específico",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "Venda criptoativos por dinheiro",
     "swap_description": "Faça câmbio entre tokens",
     "bridge_description": "Transferir tokens entre redes",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "Gratuito",
     "tx_details_not_available": "Não disponível",
     "smart_contract_interaction": "Interação com contrato inteligente",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "Depositar em conta bancária",
+    "money_account_withdraw": "Transferência da conta bancária",
     "swaps_transaction": "Transação de trocas",
     "bridge_transaction": "Ponte",
     "approve": "Aprovar",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "RECEBA {{percentage}}% EM \nSTABLECOINS",
-        "description": "Converta suas moedas estáveis em mUSD e ganhe um bônus anualizado de até {{percentage}}% que você pode resgatar diariamente.",
+        "description": "Converta suas moedas estáveis em mUSD e ganhe um bônus anualizado de {{percentage}}%.",
         "terms_apply": "Sujeito a termos e condições.",
         "primary_button": "Comece já",
-        "secondary_button": "Agora não"
+        "secondary_button": "Agora não",
+        "checklist": {
+          "dollar_backed": "Lastreado em dólar",
+          "no_lockups": "Sem bloqueios",
+          "daily_bonus": "Bônus diário",
+          "metamask_stablecoins": "Moedas estáveis ​​da MetaMask",
+          "no_metamask_fee": "Sem taxas da MetaMask"
+        }
       },
       "buy_musd": "Comprar mUSD",
       "get_musd": "Obter mUSD",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Dinheiro",
+    "your_balance": "Seu saldo",
     "apy_label": "{{percentage}}% APY",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "Informações sobre APY",
     "onboarding": {
       "step_progress": "Etapa {{current}} de {{total}}",
       "title": "Adicionar dinheiro",
-      "description": "Compre mUSD e comece a ganhar APY hoje mesmo.",
+      "description": "Deposite fundos em sua conta e comece a ganhar rendimento percentual anual (APY).",
       "add": "Adicionar",
       "step2_title": "Peça o seu Cartão MetaMask",
       "step2_description": "Use o saldo do seu cartão Money enquanto ele rende, em qualquer lugar que aceite o Mastercard.",
@@ -6497,22 +6611,32 @@
       "card": "Cartão"
     },
     "earnings": {
-      "title": "Ganhos",
-      "lifetime": "Ganhos vitalícios",
-      "projected": "Ganhos projetados"
+      "title": "Ganhos estimados",
+      "estimated_monthly": "Mensal",
+      "estimated_yearly": "Anual",
+      "info_label": "Informações sobre ganhos"
     },
     "how_it_works": {
       "title": "Como funciona",
-      "description_prefix": "Mantenha mUSD na sua Conta Monetária e ganhe automaticamente",
-      "description_suffix": ". Essa opção é lastreada em dólar, sempre líquida e pronta para gastar, negociar ou enviar a qualquer momento."
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "Adicionar"
     },
+    "balance_card": {
+      "label": "Saldo monetário",
+      "add": "Adicionar",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "Ganhe com suas criptomoedas",
       "description": "Veja como seu dinheiro pode render ao longo do tempo convertendo suas criptomoedas em mUSD.",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "Converter",
+      "convert_cta": "Convert your crypto",
       "no_fee": "Sem taxas da MetaMask",
       "view_all": "Exibir tudo",
       "view_potential_earnings": "Visualizar ganhos potenciais"
@@ -6522,37 +6646,75 @@
       "subtitle": "Gaste seu dinheiro onde desejar.",
       "virtual_card": "Cartão virtual",
       "metal_card": "Cartão Metal",
-      "cashback": "{{percentage}}% de cashback",
+      "cashback": "{{percentage}}% de cashback em mUSD",
       "get_now": "Adquira já",
       "link_title": "Vincular cartão MetaMask",
-      "link_subtitle": "Gaste seu saldo no cartão Money e ganhe.",
-      "link_bullet_cashback": "Até 3% em cashback",
-      "link_bullet_apy": "Até {{apy}}% de APY (rendimento anual)",
-      "link_card": "Vincular cartão"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "Vincular cartão",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "O que você recebe",
-      "benefit_auto_earn": "Ganhe automaticamente ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "Mantenha seu dinheiro seguro em mUSD, uma stablecoin lastreada em dólar na proporção de 1:1",
       "benefit_liquidity": "Obtenha liquidez total sem períodos de bloqueio, permitindo que você possa negociar ou sacar quando quiser",
       "benefit_spend_prefix": "Gaste em mais de 150 milhões de estabelecimentos comerciais com o cartão MetaMask e ganhe",
-      "benefit_spend_cashback": "1-3% de cashback",
-      "benefit_transfer": "Transfira dinheiro para qualquer uma de suas carteiras na MetaMask",
-      "benefit_global": "Envie e receba dinheiro globalmente",
+      "benefit_spend_cashback": "1-3% de cashback em mUSD",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "Saiba mais"
     },
     "footer": {
-      "add_money": "Adicionar dinheiro"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "Adicionar dinheiro",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "Converter criptomoedas",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "Depositar fundos",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "Receber de carteira externa",
       "coming_soon": "Em breve"
     },
+    "more_sheet": {
+      "title": "Mais",
+      "how_it_works": "Como funciona",
+      "what_you_get": "O que você recebe",
+      "contact_support": "Falar com o suporte"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "Entre contas",
+      "perps_account": "Conta de perps",
+      "predictions_account": "Conta de previsões",
+      "send_external": "Enviar para endereço externo",
+      "withdraw_to_bank": "Transferir para o banco"
+    },
+    "apy_tooltip": {
+      "title": "Rendimento Percentual Anual (APY)",
+      "paragraph_1": "Sua conta Money rende até {{percentage}}% automaticamente.",
+      "paragraph_2": "A taxa apresentada é uma estimativa da taxa de rendimento percentual anual (APY) com base nas condições atuais do mercado. A APY é variável e pode mudar devido a diversos fatores. A taxa é gerada por plataformas DeFi de terceiros que aplicam fundos em protocolos blockchain.",
+      "paragraph_3": "Ao vincular seu cartão MetaMask, as compras serão deduzidas desse saldo."
+    },
+    "earnings_tooltip": {
+      "title": "Ganhos estimados",
+      "body": "Uma estimativa de quanto você poderia ganhar ao longo de um determinado período, com base no seu saldo atual e na APY de hoje. Estimativas não são garantias de retorno e estão sujeitas a alterações."
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "Atividade",
       "view_all": "Exibir tudo",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "Money",
       "section_title": "Como funciona",
-      "description_1": "Sua conta Money rende 4% de APY (variável) automaticamente. Os fundos são depositados em um cofre DeFi selecionado que gera rendimentos em mercados de empréstimo auditados — sem staking, sem necessidade de resgate e sem períodos de bloqueio.",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "O saldo da sua conta Money é o seu saldo disponível para gastos. Vincule seu cartão MetaMask para gastar em mais de 150 milhões de estabelecimentos comerciais em todo o mundo. Seu dinheiro continua rendendo até o momento em que você o utiliza.",
-      "faq_title": "Perguntas frequentes",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "Em breve.",
-      "faq_q1": "O que é a conta Money?",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "O que é mUSD?",
       "faq_q3": "De onde vem o rendimento?",
       "faq_q4": "Meu dinheiro está bloqueado? Posso sacar a qualquer hora?",
@@ -6608,8 +6770,7 @@
       "faq_q7": "A taxa APY muda?",
       "faq_q8": "Trata-se de uma conta poupança ou é uma conta corrente?",
       "faq_q9": "Quem controla meu dinheiro?",
-      "faq_q10": "Que tipo de cashback eu recebo com o cartão MetaMask?",
-      "sounds_good": "Parece bom"
+      "faq_q10": "Qual o valor do cashback em mUSD que recebo ao usar o cartão MetaMask?"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "Cancelar",
     "confirm": "Confirmar",
+    "pay_with_bottom_sheet": {
+      "title": "Pagar com",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "Ao continuar, você concorda com os nossos ",
       "terms_of_use": "Termos de uso",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "Sacar",
       "predict_deposit": "Adicionar fundos de previsão",
       "predict_withdraw": "Sacar",
-      "money_account_deposit": "Adicionar fundos",
-      "money_account_withdraw": "Sacar fundos"
+      "money_account_add_money": "Adicionar dinheiro",
+      "money_account_transfer_money": "Transferir dinheiro"
     },
     "sub_title": {
       "permit": "Este site quer permissão para gastar seus tokens.",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "Trocaremos seus tokens por USDC na HyperCore, a rede usada pelos perps. Os provedores de troca podem cobrar uma taxa, mas a MetaMask não cobra."
       },
       "predict_deposit": {
-        "transaction_fee": "Trocaremos seus tokens por USDC.e na Polygon, a rede usada pela Predictions. Provedores de swaps talvez cobrem taxas, mas a MetaMask não cobra."
+        "transaction_fee": "Trocaremos seus tokens por pUSD na Polygon, a rede usada pela Predictions. Provedores de trocas talvez cobrem taxas, mas a MetaMask não cobra."
       },
       "perps_withdraw": {
         "transaction_fee": "A MetaMask fará a conversão para o token desejado para você. A MetaMask não aplica taxas quando você converte para mUSD."
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "As taxas de conversão de mUSD incluem custos de rede e podem incluir taxas do provedor. A MetaMask não aplica taxas quando você converte para mUSD."
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "Taxas"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "Comprar criptomoedas",
       "buy_predict": "Adicione fundos à sua carteira para usar as Previsões.",
-      "buy_perps": "Adicione fundos à sua carteira para usar perps."
+      "buy_perps": "Adicione fundos à sua carteira para usar perps.",
+      "projected_five_year_balance": "Saldo projetado para 5 anos:"
     },
     "unlimited": "Ilimitado",
     "all": "Tudo",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "Continuar",
     "deposit_edit_amount_done": "Adicionar fundos",
     "deposit_edit_amount_predict_withdraw": "Sacar",
-    "deposit_edit_amount_musd_conversion": "Converter para mUSD"
+    "deposit_edit_amount_musd_conversion": "Converter para mUSD",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "Os resultados mudaram",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "Swap",
     "terms_and_conditions": "Termos e condições",
     "select_token": "Selecionar token",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "Nenhum token encontrado",
     "no_tokens_found_description": "Não encontramos tokens com este nome. Tente outro termo de pesquisa.",
     "select_network": "Selecionar rede",
@@ -7115,6 +7303,7 @@
     "receive_at": "Receber em",
     "recipient": "Destinatário",
     "select_recipient": "Selecionar destinatário",
+    "select_account": "Selecionar conta",
     "external_account": "Conta externa",
     "error_banner_description": "Esta rota comercial não está disponível no momento. Experimente mudar o valor, a rede ou o token e encontraremos a melhor opção.",
     "stock_token_error_banner_description": "Esta rota de negociação não está disponível no momento. Tente alterar o valor, a rede ou o token e nós encontraremos a melhor opção.\n\nObserve que, se você estiver tentando negociar ações tokenizadas da Ondo (Ondo Tokenised Stocks), pode haver restrições geográficas, por exemplo, nos EUA, UE, Reino Unido e Brasil.",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "Alto impacto no preço",
     "price_impact_error_title": "Impacto de preço muito elevado",
     "price_impact_error_description": "Você perderá aproximadamente {{priceImpact}} do valor de mercado do seu token neste swap. Tente uma negociação de valor menor ou uma rota com mais liquidez para melhorar sua taxa.",
+    "insufficient_native_reserve_cta": "Use o máximo permitido",
+    "insufficient_native_reserve_message": "Esta rede exige que você mantenha pelo menos {{minimumReserve}} {{ticker}} em sua conta. Você pode usar no máximo {{maxSwappable}} {{ticker}}",
+    "insufficient_native_reserve_title": "Saldo mínimo de {{ticker}} de reserva exigido",
     "token_warning_suspicious_banner": "{{token}} é um token suspeito.",
     "token_warning_malicious_banner": "{{token}} é um token malicioso. Tenha cuidado ao interagir com este token.",
     "token_warning_modal_suspicious_title": "Token suspeito",
@@ -7542,17 +7734,17 @@
         "price": "Gratuito",
         "feature_1": "Cartão virtual para Apple Pay e Google Pay",
         "feature_2": "Pague com criptomoedas (USDC, USDT, WETH e várias outras)",
-        "feature_3": "1% de cashback em USDC em todas as compras"
+        "feature_3": "1% de cashback em mUSD em todas as compras"
       },
       "metal_card": {
         "name": "Cartão Metal",
         "price": "US$ 199/ano",
         "everything_in_virtual": "Tudo em formato virtual, além de:",
         "feature_1": "Cartão premium de metal entalhado",
-        "feature_2": "3% de cashback nos primeiros US$ 10.000/ano",
+        "feature_2": "3% de cashback em mUSD sobre os primeiros US$ 10.000/ano",
         "feature_3": "Sem taxas de transação internacional"
       },
-      "earn_up_to_badge": "Ganhe até US$ 300 em cashback anualmente",
+      "earn_up_to_badge": "Recupere até US$ 300 em mUSD anualmente",
       "upgrade_to_metal_label": "Ou faça upgrade para Metal e ganhe 3x mais recompensas"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "SEU CARTÃO\nFOI SOLICITADO",
       "subtitle": "Ele deverá chegar em 4 a 6 semanas.",
-      "description": "Configure seu cartão virtual e adicione-o à sua carteira digital para começar a ganhar cashback.",
+      "description": "Configure seu cartão virtual e adicione-o à sua carteira digital para começar a ganhar cashback em mUSD.",
       "set_up_card_button": "Configurar cartão",
       "back_to_card_button": "Voltar ao Cartão"
     },
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "Habilitar cartão",
       "enable_assets_button_label": "Habilitar ativos",
       "spending_limit_warning": "Você está perto de atingir seu limite de gastos. Atualize sua conta para evitar recusas.",
+      "spending_limit_available": "disponível",
       "logout": "Sair",
       "contact_support": "Falar com o suporte",
       "logout_confirmation_title": "Sair do cartão?",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "Termos e condições",
         "order_metal_card": "Cartão Metal",
         "order_metal_card_description": "Peça já o seu Cartão Metal físico",
-        "cashback": "Cashback",
-        "cashback_description": "Receba 1% de volta em todos os seus gastos",
-        "cashback_description_metal": "Receba 3% de volta em todos os seus gastos",
+        "cashback": "Cashback em mUSD",
+        "cashback_description": "Receba 1% de cashback em mUSD em todos os seus gastos",
+        "cashback_description_metal": "Receba 3% de cashback em mUSD em todos os seus gastos",
         "freeze_card": "Congelar cartão",
         "unfreeze_card": "Descongelar cartão",
         "freeze_card_description": "Pausar todos os gastos com seu cartão",
@@ -7917,8 +8110,8 @@
       "token_label": "Token"
     },
     "cashback_screen": {
-      "title": "Cashback",
-      "available_cashback": "Cashback disponível",
+      "title": "Cashback em mUSD",
+      "available_cashback": "mUSD disponível",
       "network_fee": "Taxa de rede",
       "expected_to_receive": "Recebimento previsto",
       "withdraw": "Sacar",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "O processo de saque foi iniciado",
       "withdrawal_success": "Saque concluído com sucesso",
       "withdrawal_failed": "Saque falhou. Tente novamente.",
-      "no_cashback": "Sem cashback disponível",
-      "loading_error": "Falha ao carregar cashback. Tente novamente."
+      "no_cashback": "Sem opção de cashback em mUSD disponível",
+      "loading_error": "Falha ao carregar cashback em mUSD. Tente novamente.",
+      "funding_required": {
+        "title": "Configurar financiamento Linea",
+        "description": "Você precisa de pelo menos uma fonte de financiamento aprovada na Linea antes de resgatar cashback em mUSD.",
+        "confirm_button_label": "Configurar financiamento"
+      }
     },
     "change_asset": {
       "title": "Alterar token e rede",
@@ -8032,7 +8230,8 @@
     "title": "Selecione o método de pagamento",
     "title_receive": "Selecionar token de recebimento",
     "no_gas": "Sem saldo nativo para gas",
-    "not_supported": "Sem suporte"
+    "not_supported": "Sem suporte",
+    "crypto": "Cripto"
   },
   "connection_removed_modal": {
     "title": "Conexões removidas",
@@ -8048,6 +8247,15 @@
       "title": "A participação falhou",
       "description": "Verifique sua conexão e tente novamente."
     },
+    "notifications_nudge": {
+      "title": "Não perca",
+      "description": "Ative as notificações para ficar por dentro das campanhas.",
+      "turn_on_button": "Ativar",
+      "loading": "Ativando notificações...",
+      "loading_description": "Isso pode levar alguns instantes.",
+      "enable_error": "Falha ao ativar notificações",
+      "success": "Notificações ativadas"
+    },
     "version_guard": {
       "title": "Atualização necessária",
       "description": "O uso do programa de Recompensas requer uma versão mais recente da MetaMask. Atualize para continuar.",
@@ -8126,6 +8334,17 @@
       "retry_button": "Tentar novamente"
     },
     "main_title": "Recompensas",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "Indicações",
     "referral_stats_earned_from_referrals": "Ganho por meio de indicações",
     "referral_stats_referrals": "Indicações",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "Incrementos ativos",
     "season_1": "Temporada 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "Calculadora de bônus mUSD",
-      "description": "Veja quanto você pode ganhar convertendo suas stablecoins para mUSD.",
-      "amount_label": "Valor convertido",
-      "estimated_bonus": "Bônus anual estimado: até 3%",
-      "initial_amount": "Valor inicial",
-      "daily_bonus": "Bônus diário resgatável",
-      "annualized_bonus": "Bônus anualizado",
-      "disclaimer": "Este valor é apenas uma estimativa. O bônus está sujeito a alterações.",
-      "disclaimer_brief": "O bônus é uma estimativa e pode sofrer alterações.",
+      "page_title": "Calculadora de mUSD",
+      "hero_hold": "Manter mUSD.",
+      "hero_earn": "Ganhe",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/ano",
+      "earnings_per_month_suffix": "/mês",
+      "earnings_per_day_suffix": "/dia resgatável diariamente",
+      "slider_amount_label": "Valor",
+      "disclaimer_calculator": "Estimativa baseada em bônus de 3%. A taxa pode sofrer alterações. Resgatável a qualquer momento.",
       "buy_button": "Comprar mUSD",
       "swap_button": "Converter para mUSD"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "Termina em {{date}}",
       "ended_date": "Encerrado em {{date}}",
       "pill_up_next": "Em breve",
+      "up_next": "Em seguida",
+      "notify_me": "Avisar-me",
       "pill_active": "Em tempo real",
       "pill_complete": "Concluído",
       "enter": "Entrar",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "Não disponível em sua região",
       "geo_locked_toast_description": "Esta campanha não está disponível em sua região. Volte mais tarde para conferir novas campanhas.",
       "geo_locked_cta": "Verificar elegibilidade",
-      "geo_loading": "Verificando região..."
+      "geo_loading": "Verificando região...",
+      "remind_me_success_toast": "Avisaremos quando esta campanha começar.",
+      "remind_me_save_error": "Não foi possível salvar seu lembrete. Tente novamente."
     },
     "campaign_mechanics": {
       "title": "Mecânica"
@@ -8479,10 +8701,10 @@
       "qualified_description": "Aumente seus fluxos de entrada líquidos para alcançar um nível mais elevado e ter a chance de obter um pagamento maior.",
       "not_eligible_title": "Não elegível",
       "not_eligible_description": "Negociações abertas tarde demais para atender ao requisito de retenção por {{days}} dias não contarão para sua qualificação ou nível.",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "Total de participantes",
+      "completed_label_total_tvl": "TVL total",
+      "completed_label_top_return": "Melhor retorno",
+      "completed_label_winners": "Ganhadores"
     },
     "ondo_campaign_activity": {
       "title": "Todas as atividades",
@@ -8508,6 +8730,48 @@
       "cancel": "Cancelar",
       "confirm": "Eu compreendo"
     },
+    "perps_trading_campaign": {
+      "title": "Concurso de negociação de perps",
+      "stats_title": "Estatísticas",
+      "performance_title": "Desempenho",
+      "label_rank": "Classificação",
+      "label_your_rank": "Sua classificação",
+      "label_pnl": "PnL",
+      "label_volume": "Volume",
+      "label_notional_volume": "Volume nocional",
+      "pending": "Pendente",
+      "qualified": "Qualificado",
+      "open_position_cta": "Posição aberta",
+      "leaderboard_title": "Tabela de classificação",
+      "leaderboard_total_participants": "{{count}} participantes",
+      "last_updated": "Última atualização: {{time}}",
+      "leaderboard_error_loading": "Falha ao carregar a tabela de classificação",
+      "leaderboard_error_loading_description": "Ocorreu um erro ao carregar a tabela de classificação. Tente novamente.",
+      "leaderboard_not_yet_computed": "A tabela de classificação ainda não foi calculada. Volte mais tarde.",
+      "leaderboard_powered_by_prefix": "Com tecnologia da ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "Prêmio acumulado",
+      "prize_pool_current_label": "Atual",
+      "prize_pool_next_label": "Avançar",
+      "prize_pool_volume_subtext": "{{current}} do volume de {{target}}",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}}+ volume — todas as metas alcançadas",
+      "prize_pool_max_badge": "Máx.",
+      "prize_pool_error_title": "Falha ao carregar o prêmio acumulado",
+      "prize_pool_error_description": "Ocorreu um erro ao carregar o prêmio acumulado. Tente novamente.",
+      "prize_pool_retry_button": "Tentar novamente",
+      "stats_notional_volume_threshold": "${{amount}} obrigatório",
+      "stats_qualified_title": "Você se qualifica",
+      "stats_qualified_description": "Continue negociando para aumentar seu PnL e subir na tabela de classificação antes do fim do concurso.",
+      "stats_qualify_for_rank_title": "Qualifica para esta classificação",
+      "stats_qualify_for_rank_description": "Negocie mais {{notionalRemaining}} em volume nocional para se qualificar.",
+      "stats_error_title": "Não foi possível carregar estatísticas",
+      "stats_error_description": "Tivemos um problema ao carregar suas estatísticas. Tente novamente.",
+      "stats_retry": "Tentar novamente",
+      "completed_label_total_participants": "Total de participantes",
+      "completed_label_total_volume": "Valor total",
+      "completed_label_top_pnl": "Melhor PnL",
+      "completed_label_winners": "Ganhadores"
+    },
     "campaigns_preview": {
       "title": "Campanhas",
       "coming_soon": "Em breve",
@@ -8532,29 +8796,29 @@
       "retry_button": "Tentar novamente",
       "refreshing": "Atualizando..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "Você ganhou",
       "rank_label": "{{place}} lugar",
-      "email_instructions": "Envie um e-mail para ondocampaign@consensys.net com o seu código para reivindicar seu prêmio.",
+      "email_instructions": "Envie e-mail para {{email}} com seu código para reivindicar seu prêmio.",
       "open_mail": "Abrir e-mail",
       "skip_for_now": "Ignorar por enquanto",
-      "mail_subject": "Reivindicação de prêmio da campanha Ondo",
+      "mail_subject": "Reivindicação de prêmio da {{campaignName}}",
       "mail_body": "Meu código ganhador: {{code}}",
       "winning_code": "Código ganhador",
       "close_a11y": "Fechar"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "Você ganhou",
-        "description": "Reivindique seu prêmio hoje mesmo.",
-        "a11y": "Ver detalhes dos ganhadores"
+        "title": "Você ganhou!",
+        "description": "Confira seu código premiado e resgate seu prêmio hoje mesmo.",
+        "a11y": "Ver detalhes"
       },
       "participant_pending": {
         "title": "A campanha terminou.",
         "description": "Estamos analisando os resultados. Volte em breve."
       },
       "participant_finalized": {
-        "title": "Os resultados da campanha foram divulgados",
+        "title": "Os resultados da campanha foram divulgados.",
         "description": "Você não ganhou desta vez. Confira o placar de classificação para ver sua posição final."
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "Sua recompensa está a caminho. Entraremos em contato em breve."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "Você ganhou 💰",
-        "description": "Reivindique seu prêmio da {{campaignName}}",
+        "description": "Reivindique seu prêmio da {{campaignName}} hoje mesmo.",
         "cta": "Ver detalhes"
       },
-      "participant_no_winner": {
-        "title": "Os resultados foram divulgados.🏅",
-        "description": "Veja sua classificação na {{campaignName}}",
+      "non_winner": {
+        "title": "Os resultados estão em 🏅",
+        "description": "Veja sua classificação na {{campaignName}}.",
         "cta": "Ver"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "Ganhos resgatados",
       "predict_deposit": "Conta Predict creditada",
       "predict_withdraw": "Sacar",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "Depositar em conta bancária",
+      "money_account_withdraw": "Transferência da conta bancária",
       "default": "Dados da transação"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "Explorar",
-    "trending_tokens": "Tendências",
+    "crypto_movers": "Movimentação de criptomoedas",
+    "perps_movers": "Movimentação de perps",
+    "trending_tokens": "Tendência",
+    "crypto": "Cripto",
     "stocks": "Ações",
     "price_change": "Variação de preço",
     "all_networks": "Todas as redes",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 hora",
     "5_minutes": "5 minutos",
     "networks": "Redes",
+    "ecosystems": "Ecossistemas",
+    "ecosystems_subtitle": "Explore dApps, tokens e NFTs em diversas blockchains no Portfólio da MetaMask",
+    "all_sports": "Esportes populares",
+    "basketball": "Basquetebol",
+    "football": "Futebol americano",
+    "soccer": "Futebol",
+    "tennis": "Tênis",
+    "f1": "Fórmula 1",
+    "golf": "Golfe",
+    "all_sports_no_markets": "Ainda não há mercados abertos nesta categoria. Volte em breve ou selecione outro esporte acima.",
+    "load_more": "Carregar mais",
     "sort_by": "Classificar por",
     "volume": "Volume",
     "market_cap": "Capitalização de mercado",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "Pesquisar tokens, sites, URLs",
     "cancel": "Cancelar",
     "perps": "Perps",
+    "rwa_perps_section": "Perps",
+    "macro_stocks_commodity_perps": "Perps",
+    "macro_pill_stocks": "Ações",
+    "macro_pill_commodities": "Commodities",
+    "rwa_pill_commodities": "Commodities",
+    "rwa_pill_stocks": "Ações",
+    "rwa_pill_forex": "Forex",
+    "crypto_perps_section": "Perps",
     "predictions": "Previsões",
     "no_results": "Nenhum resultado encontrado",
+    "popular": "Populares",
     "sites": "Sites",
     "popular_sites": "Websites populares",
     "search_sites": "Pesquisar websites",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "Nenhum token encontrado",
       "description": "Não foi possível encontrar este token"
+    },
+    "tabs": {
+      "now": "Agora",
+      "macro": "Macro",
+      "rwas": "RWAs",
+      "crypto": "Cripto",
+      "sports": "Esportes",
+      "dapps": "Sites"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "Cancelar",
-      "continue": "Continuar"
+      "continue": "Continuar",
+      "learn_more": "Saiba mais",
+      "try_again": "Tentar novamente"
     },
     "connecting": {
       "title": "Conectando seu {{device}}...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "Ative o Bluetooth para se conectar ao seu dispositivo",
       "bluetooth_scan_failed": "Falha ao procurar dispositivos. Tente novamente",
       "bluetooth_connection_failed": "A conexão com seu dispositivo falhou. Tente novamente",
+      "camera_permission_denied": "É necessário permitir que a câmera seja usada para ler códigos QR. Ative essa opção nas configurações do seu dispositivo",
       "not_supported": "Esta operação não é suportada",
       "unknown_error": "Certifique-se de que seu {{device}} esteja configurado com a Frase de Recuperação Secreta ou com a senha para esta conta"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "Necessário permissão de localização",
       "nearby_devices_permission_denied": "Necessário permissão para dispositivos próximos",
       "scan_failed": "Verificação falhou",
+      "camera_permission_denied": "Necessário permissão de câmera",
       "something_went_wrong": "Ocorreu algum erro"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "Escaneie o código QR para sincronizar a carteira",
+          "body": "Volte à sua carteira de hardware e procure a opção para compartilhar ou exportar suas contas, escolha MetaMask e, em seguida, escaneie o código QR."
+        },
+        "sign": {
+          "title": "Escaneie o código QR da assinatura",
+          "body": "Volte à sua carteira de hardware, aprove a transação e, em seguida, escaneie o código QR exibido."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "Código QR errado",
+          "body": "Volte à sua carteira de hardware, escolha MetaMask como tipo de carteira e, em seguida, gere e escaneie um novo código QR."
+        },
+        "sign": {
+          "title": "Código QR errado",
+          "body": "Volte à sua carteira de hardware, aprove a transação e, em seguida, escaneie o código QR exibido."
+        }
+      },
+      "ur_decode_error": {
+        "title": "Não foi possível ler o código QR",
+        "body": "Certifique-se de que o código QR esteja totalmente visível e bem iluminado e tente novamente. Se o problema persistir, talvez seja necessário atualizar o firmware da sua carteira de hardware."
+      }
+    },
     "device_selection": {
       "title": "Selecione {{device}}",
       "scanning": "Procurando dispositivos...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Money",
-      "cash_empty_description": "Você ainda não tem mUSD. Converta stablecoins para mUSD na seção \"Dinheiro\" da página inicial.",
-      "cash_empty_description_network_filter": "Não há mUSD nesta rede. Mude de rede para ver seus mUSD.",
+      "money": "Money",
+      "money_empty_description": "Você ainda não tem mUSD. Converta stablecoins para mUSD na seção \"Dinheiro\" da página inicial.",
+      "money_empty_description_network_filter": "Não há mUSD nesta rede. Mude de rede para ver seus mUSD.",
+      "money_empty_state": {
+        "get_started": "Comece já",
+        "earn_apy": "Ganhe {{percentage}}% de APY"
+      },
+      "money_filled_state": {
+        "add": "Adicionar",
+        "apy": "{{percentage}}% APY"
+      },
       "tokens": "Tokens",
+      "perps": "Perps",
+      "related_assets": "Ativos relacionados",
       "perpetuals": "Perpétuos",
       "predictions": "Previsões",
       "whats_happening": "O que está acontecendo",
+      "whats_happening_ai": "IA",
+      "whats_happening_impact": {
+        "bullish": "Otimista",
+        "bearish": "Pessimista",
+        "neutral": "Neutro"
+      },
       "top_traders": "Principais traders",
       "whats_happening_categories": {
         "geopolitical": "Geopolítica",
@@ -8819,7 +9160,7 @@
       },
       "defi": "DeFi",
       "nfts": "NFTs",
-      "trending_tokens": "Tendências",
+      "trending_tokens": "Tendência",
       "trending_perpetuals": "Perpétuos em alta",
       "trending_predictions": "Previsões em alta",
       "import_nfts": "Importar NFTs",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "Não foi possível carregar {{section}}",
       "retry": "Tentar novamente"
     }
+  },
+  "sites": {
+    "popular": "Populares"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/ru.json b/locales/languages/ru.json
index 02f888bf777..62136349c3f 100644
--- a/locales/languages/ru.json
+++ b/locales/languages/ru.json
@@ -634,7 +634,8 @@
     "trade": "Торговать",
     "settings": "Настройки",
     "rewards": "Награды",
-    "trending": "Обзор"
+    "trending": "Обзор",
+    "money": "Финансы"
   },
   "drawer": {
     "send_button": "Отправить",
@@ -708,7 +709,11 @@
     "smart_contract_address": "Адрес смарт-контракта",
     "smart_contract_address_warning": "Адрес получателя может не поддерживать прямые переводы токенов, что может привести к потере средств. Продолжайте только в том случае, если вы уверены, что этот контракт может получить ваш перевод.",
     "i_understand": "Я понимаю",
-    "cancel": "Отмена"
+    "cancel": "Отмена",
+    "new_address_title": "Новый адрес",
+    "new_address_message": "Вы отправляете на этот адрес впервые. Перед продолжением убедитесь, что он правильный:",
+    "alert_navigation_previous": "Предыдущее оповещение",
+    "alert_navigation_next": "Следующее оповещение"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "Лучшие трейдеры",
       "allow_push_notifications": "Разрешить push-уведомления",
       "trades_over_label": "Получать уведомления о сделках свыше:",
       "traders_you_follow": "Трейдеры, на которых вы подписаны",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "Не удалось загрузить трейдеров, на которых вы подписаны."
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "Уведомления от {{traderName}}",
       "allow_push_notifications": "Разрешить push-уведомления",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "Получать уведомления о торговой активности {{traderName}}",
+      "manage_traders": "Управление трейдерами, на которых вы подписаны",
       "save": "Сохранить"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "Получайте оповещения в реальном времени о сделках трейдеров, на которых вы подписаны.",
       "allow_push_notifications": "Разрешить push-уведомления",
       "trades_over_label": "Получать уведомления о сделках свыше:",
       "save": "Сохранить",
@@ -1059,7 +1064,12 @@
       "closed": "Закрыто",
       "no_positions": "Пока нет позиций",
       "error_loading_profile": "Не удалось загрузить профиль",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "Смотреть в X (Twitter)",
+      "sort": {
+        "value": "Значение",
+        "pnl_percent": "П/У %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "Рыночная капитализация",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} продал(-а)",
       "no_trades": "Нет сделок за этот период",
       "closed_position": "Закрытая позиция",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "Позиция недоступна",
+      "fallback_subtitle": "В данный момент мы не смогли загрузить эту позицию.",
+      "fallback_back_to_profile": "Вернуться в профиль",
+      "fallback_back_to_leaderboard": "Вернуться к таблице лидеров"
     },
     "quick_buy": {
       "title": "Купить {{symbol}}",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "Прогнозы MetaMask",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "Рынки прогнозов",
     "market_list": "Список рынков",
     "loading": "Загрузка...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "Изменить способ оплаты",
+      "add_funds": "Внести средства",
+      "add": "Добавить",
+      "predict_balance": "Баланс прогнозов"
+    },
     "order": {
       "available": "Доступно",
       "cashed_out": "Деньги выведены",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "Рынок быстро меняется, поэтому мы не смогли купить за {{price}}. Повторить попытку по лучшей доступной цене?",
       "market_busy_body_sell": "Рынок быстро меняется, поэтому мы не смогли продать за {{price}}. Повторить попытку по лучшей доступной цене?",
       "order_failed_title": "Ордер не выполнен",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "Ваш ордер не может быть исполнен. Попробовать еще раз?",
+      "price_changed_title": "Цена изменилась",
+      "price_changed_body": "Не удалось купить по цене {{price}}. Попробовать по рыночной цене?",
       "retry": "Повтор",
       "try_again": "Повторить попытку",
       "view": "Просмотр",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "Вывод средств завершен",
       "withdraw_completed_subtitle": "{{amount}} USDC переведены в ваш кошелек",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}} переведены в ваш кошелек",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "Понятно",
       "error_title": "Что-то пошло не так",
       "error_description": "Не удалось продолжить вывод средств",
       "try_again": "Повторить попытку"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "{{tokenSymbol}} необходимый для продолжения",
     "fund_your_wallet": "Пополните свой кошелек",
     "get_ready_for_web3": "Подготовьте свой кошелек к использованию web3",
+    "home_onboarding_steps": {
+      "header": "Шаги",
+      "get_started_title": "Начало работы с MetaMask",
+      "fund_title": "Пополните свой кошелек",
+      "fund_subtitle": "Никто не любит пустые кошельки. Легко пополняйте счет, чтобы начать торговать.",
+      "fund_primary": "Внести средства",
+      "trade_title": "Совершите свою первую сделку",
+      "trade_subtitle": "Торгуйте популярными токенами в разных сетях, чтобы увеличить свой портфель.",
+      "trade_primary": "Торговать",
+      "notifications_title": "Включить уведомления",
+      "notifications_subtitle": "Оставайтесь в курсе изменений на рынке, чтобы принимать лучшие решения для своего портфеля.",
+      "notifications_primary": "Включить",
+      "skip": "Пропустить",
+      "progress_a11y": "Шаг {{current}} из {{total}}",
+      "balance_loading_a11y": "Загрузка баланса кошелька"
+    },
     "add_funds": "Внести средства",
     "next": "Далее",
     "buy_asset": "Купить {{asset}}",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "Неверное число. Введите число между 1 и %{maxSafeChainId}",
     "hide_zero_balance_tokens_title": "Скрыть токены без баланса",
     "hide_zero_balance_tokens_desc": "Предотвращает отображение токенов без баланса в вашем списке токенов.",
+    "haptic_feedback_title": "Тактильный отклик",
+    "haptic_feedback_desc": "Ощущайте легкие вибрации при подтверждениях, ошибках и взаимодействиях. Отключите, чтобы уменьшить тактильные стимулы.",
     "token_detection_title": "Автоопределение токенов",
     "token_detection_description": "Мы используем сторонние API для обнаружения и отображения новых токенов, отправленных в ваш кошелек. Отключите, если не хотите, чтобы приложение извлекало данные из этих служб.",
     "theme_button_text": "Изменить тему",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "Самый надежный",
         "quote_unknown_provider": "Неизвестный поставщик",
         "start_headless_buy": "Начать headless-покупку",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "Заменить и начать фоновую покупку",
         "start_headless_buy_disabled_hint": "Введите действительную сумму для включения",
         "start_headless_buy_pending": "Headless-сессия активна — откройте BuildQuote",
         "cancel_headless_buy": "Отменить headless-сессию",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "Активный сеанс: {{sessionId}} — начало новой котировки отменит его.",
         "event_log_title": "Журнал событий",
         "event_log_empty": "Пока нет событий — начните headless-сессию и следите за обновлениями здесь.",
         "event_log_started": "сессия начата {{sessionId}} (актив={{assetId}}, сумма={{amount}}, оплата={{paymentMethodId}}{{providerSuffix}})",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "сессия отменена потребителем {{sessionId}}"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "Фоновая покупка",
+        "loading": "Подготовка процесса покупки…",
+        "no_session": "Фоновый сеанс больше не активен.",
+        "cancel": "Отмена"
       }
     },
     "request_feature": "Запросить функцию",
@@ -3553,7 +3622,7 @@
     "security_alerts": "Оповещения безопасности",
     "security_alerts_desc": "Эта функция предупреждает вас о вредоносной активности, проверяя запросы транзакций и подписей локально. Всегда проводите комплексную проверку перед утверждением каких-либо запросов. Нет никакой гарантии, что эта функция обнаружит всю вредоносную активность. Включая эту функцию, вы соглашаетесь с условиями использования поставщика.",
     "smart_account_dapp_requests_heading": "Запросы на создание смарт-счетов от dapps",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "Разрешить dapps запрашивать функции смарт-счета для стандартных счетов. MetaMask выполнит обновление только до нашего проверенного смарт-счета.",
     "smart_transactions_opt_in_heading": "Умные транзакции",
     "smart_transactions_opt_in_desc_supported_networks": "Включите функцию «Умные транзакции» для более надежных и безопасных транзакций в поддерживаемых сетях.",
     "smart_transactions_learn_more": "Подробнее",
@@ -3572,6 +3641,39 @@
         "title": "Карта",
         "reset_onboarding_description": "Сбросьте состояние начальной регистрации карты, чтобы начать процесс регистрации с самого начала.",
         "reset_onboarding_button": "Сбросить состояние начальной регистрации"
+      },
+      "haptics": {
+        "title": "Тактильный отклик",
+        "description": "Предварительный просмотр тактильного отклика на физическом устройстве. Это обходит встроенное ограничение тактильности и удаленный аварийный выключатель, чтобы вы могли оценить каждый паттерн. Эмуляторы часто не воспроизводят тактильный отклик.",
+        "catalog_impacts_heading": "Каталогизировать моменты отклика",
+        "notifications_heading": "Паттерны уведомлений",
+        "selection_heading": "Выбор",
+        "notification_success_button": "Уведомление — успех",
+        "notification_error_button": "Уведомление — ошибка",
+        "notification_warning_button": "Уведомление — предупреждение",
+        "selection_button": "Выбор",
+        "raw_impacts_heading": "Стили отклика Raw Expo",
+        "raw_impacts_desc": "Прямые стили экспо-тактильного отклика для сравнения с сопоставленными моментами каталога выше.",
+        "impacts": {
+          "quick_amount_selection": "Отклик — быстрый выбор суммы",
+          "slider_tick": "Отклик — шаг ползунка",
+          "edge_gesture_engage": "Отклик — жест от края экрана",
+          "page_navigation": "Отклик — навигация по странице",
+          "slider_grip": "Отклик — захват ползунка",
+          "tab_change": "Отклик — смена вкладки",
+          "primary_cta": "Отклик —основной призыв к действию (CTA)",
+          "pull_to_refresh_engage": "Отклик — потянуть для обновления (нажатие)",
+          "pull_to_refresh": "Отклик — потянуть для обновления (отпускание)",
+          "chart_crosshair": "Отклик — перекрестие графика",
+          "follow_toggle": "Отклик — переключатель подписки"
+        },
+        "raw_styles": {
+          "light": "Чистый отклик — легкий",
+          "medium": "Чистый отклик — средний",
+          "heavy": "Чистый отклик — сильный",
+          "rigid": "Чистый отклик — жесткий",
+          "soft": "Чистый отклик — мягкий"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "Прогнозы",
     "add_collectible_button": "Добавить",
     "info": "Информация",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "Обменять",
     "convert": "Конвертировать",
     "bridge": "Мост",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "Устранение неполадок",
     "deposit_description": "Банковский перевод или перевод на карту с низкой комиссией",
     "buy_description": "Подходит для покупки определенного токена",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "Продать криптовалюту за наличные",
     "swap_description": "Обменивайте одни токены на другие",
     "bridge_description": "Передача токенов между сетями",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "Бесплатно",
     "tx_details_not_available": "Недоступен",
     "smart_contract_interaction": "Взаимодействие со смарт-контрактом",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "Внести на счет Money",
+    "money_account_withdraw": "Перевести со счета Money",
     "swaps_transaction": "Транзакция свопа",
     "bridge_transaction": "Мост",
     "approve": "Одобрить",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "ПОЛУЧИТЕ {{percentage}}% НА\nСТЕЙБЛКОИНЫ",
-        "description": "Конвертируйте свои стейблкоины в mUSD и получайте до {{percentage}}% годовых в виде бонуса, который можно забирать ежедневно.",
+        "description": "Конвертируйте свои стейблкоины в mUSD и получайте бонус {{percentage}}% годовых.",
         "terms_apply": "Применяются условия.",
         "primary_button": "Начало работы",
-        "secondary_button": "Не сейчас"
+        "secondary_button": "Не сейчас",
+        "checklist": {
+          "dollar_backed": "Обеспечено долларом",
+          "no_lockups": "Без блокировки",
+          "daily_bonus": "Ежедневный бонус",
+          "metamask_stablecoins": "Стейблкоины MetaMask",
+          "no_metamask_fee": "Без комиссии MetaMask"
+        }
       },
       "buy_musd": "Купить mUSD",
       "get_musd": "Получить mUSD",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Деньги",
+    "your_balance": "Ваш баланс",
     "apy_label": "{{percentage}}% годовых",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "Информация о годовом процентном доходе (APY)",
     "onboarding": {
       "step_progress": "Шаг {{current}} из {{total}}",
       "title": "Пополнить",
-      "description": "Купите mUSD и начните зарабатывать годовой процентный доход (APY) уже сегодня.",
+      "description": "Пополните свой счет и начните зарабатывать годовые.",
       "add": "Добавить",
       "step2_title": "Получите карту MetaMask Card",
       "step2_description": "Тратьте свой баланс Money, пока он приносит доход, везде, где принимают Mastercard.",
@@ -6497,22 +6611,32 @@
       "card": "Карта"
     },
     "earnings": {
-      "title": "Заработок",
-      "lifetime": "Заработок за все время",
-      "projected": "Прогнозируемый заработок"
+      "title": "Ожидаемый заработок",
+      "estimated_monthly": "Месячный",
+      "estimated_yearly": "За год",
+      "info_label": "Информация о заработке"
     },
     "how_it_works": {
       "title": "Как это работает",
-      "description_prefix": "Храните mUSD на своем Денежном счете и автоматически зарабатывайте",
-      "description_suffix": ". Это обеспеченный долларами, всегда ликвидный актив, готовый к использованию, торговле или отправке в любое время."
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "Добавить"
     },
+    "balance_card": {
+      "label": "Баланс Money",
+      "add": "Добавить",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "Зарабатывайте на своей криптовалюте",
       "description": "Посмотрите, как сумма ваших средств может вырасти со временем, если конвертировать вашу криптовалюту в mUSD.",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "Конвертировать",
+      "convert_cta": "Convert your crypto",
       "no_fee": "Без комиссии MetaMask",
       "view_all": "Смотреть все",
       "view_potential_earnings": "Посмотреть потенциальный доход"
@@ -6522,37 +6646,75 @@
       "subtitle": "Тратьте свои деньги где угодно.",
       "virtual_card": "Виртуальная карта",
       "metal_card": "Металлическая карта",
-      "cashback": "{{percentage}}% кешбэка",
+      "cashback": "{{percentage}}% кэшбэка в mUSD",
       "get_now": "Получить сейчас",
       "link_title": "Привязать карту MetaMask",
-      "link_subtitle": "Тратьте свой баланс Money и зарабатывайте.",
-      "link_bullet_cashback": "До 3% кешбэка",
-      "link_bullet_apy": "APY до {{apy}}%",
-      "link_card": "Привязать карту"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "Привязать карту",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "Что вы получаете",
-      "benefit_auto_earn": "Автозаработок ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "Храните свои деньги в безопасности в mUSD, стейблкоине, обеспеченном долларом 1:1",
       "benefit_liquidity": "Получите полную ликвидность без блокировок, чтобы вы могли торговать или выводить средства в любое время",
       "benefit_spend_prefix": "Тратьте средства у более чем 150 млн продавцов с картой MetaMask и зарабатывайте ",
-      "benefit_spend_cashback": "1-3% кэшбэка",
-      "benefit_transfer": "Переводите деньги на любые ваши кошельки в MetaMask",
-      "benefit_global": "Отправляйте и получайте деньги по всему миру",
+      "benefit_spend_cashback": "1-3% кэшбэка в mUSD",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "Подробнее"
     },
     "footer": {
-      "add_money": "Пополнить"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "Пополнить",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "Конвертировать крипту",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "Внести средства",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "Получить с внешнего кошелька",
       "coming_soon": "Скоро появятся"
     },
+    "more_sheet": {
+      "title": "Еще",
+      "how_it_works": "Как это работает",
+      "what_you_get": "Что вы получаете",
+      "contact_support": "Связаться с поддержкой"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "Между счетами",
+      "perps_account": "Счет перпов",
+      "predictions_account": "Счет прогнозов",
+      "send_external": "Отправить на внешний адрес",
+      "withdraw_to_bank": "Вывести на банковский счет"
+    },
+    "apy_tooltip": {
+      "title": "Годовая процентная доходность (годовые)",
+      "paragraph_1": "Ваш счет Money автоматически зарабатывает до {{percentage}}%.",
+      "paragraph_2": "Показанная ставка является расчетной годовой процентной доходностью (годовыми), основанной на текущих рыночных условиях. APY является переменной величиной и может меняться под влиянием различных факторов. Ставка генерируется сторонними DeFi-платформами, которые размещают средства в блокчейн-протоколах.",
+      "paragraph_3": "При привязке карты MetaMask Card покупки будут списываться с этого баланса."
+    },
+    "earnings_tooltip": {
+      "title": "Ожидаемый заработок",
+      "body": "Оценка того, сколько вы могли бы заработать за период на основе вашего текущего баланса и сегодняшней APY. Оценки не гарантируют доходность и могут меняться."
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "Деятельность",
       "view_all": "Смотреть все",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "Финансы",
       "section_title": "Как это работает",
-      "description_1": "Ваш Денежный счет автоматически приносит 4% годовых (переменная ставка). Средства поступают в отобранное DeFi-хранилище, которое генерирует доход на проверенных рынках кредитования — без стейкинга, без клейма и без блокировок.",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "Ваш Денежный баланс — это ваш баланс для расходов. Привяжите свою карту MetaMask, чтобы расплачиваться в более чем 150 млн магазинов по всему миру. Ваши деньги продолжают приносить доход до того момента, пока вы их не потратите.",
-      "faq_title": "Вопросы и ответы",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "Скоро появятся.",
-      "faq_q1": "Что такое Денежный счет?",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "Что такое mUSD?",
       "faq_q3": "Откуда берется доходность?",
       "faq_q4": "Заблокированы ли мои деньги? Могу ли я вывести их в любое время?",
@@ -6608,8 +6770,7 @@
       "faq_q7": "Меняется ли годовая процентная ставка?",
       "faq_q8": "Это сберегательный или расчетный счет?",
       "faq_q9": "Кто контролирует мои деньги?",
-      "faq_q10": "Какой кешбэк я получаю от карты MetaMask?",
-      "sounds_good": "Звучит отлично"
+      "faq_q10": "Какой кэшбэк в mUSD я получу с картой MetaMask Card?"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "Отмена",
     "confirm": "Подтвердить",
+    "pay_with_bottom_sheet": {
+      "title": "Оплатить с помощью",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "Продолжая, вы соглашаетесь с нашими ",
       "terms_of_use": "Условиями использования",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "Вывести средства",
       "predict_deposit": "Внести средства для прогнозирования",
       "predict_withdraw": "Вывести средства",
-      "money_account_deposit": "Внести средства",
-      "money_account_withdraw": "Вывести средства"
+      "money_account_add_money": "Пополнить",
+      "money_account_transfer_money": "Перевести деньги"
     },
     "sub_title": {
       "permit": "Этот сайт запрашивает разрешение на трату ваших токенов.",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "Мы обменяем ваши токены на USDC в HyperCore, сети, используемой перпами. Поставщики услуг свопов могут взимать комиссию, но MetaMask не взимает ее."
       },
       "predict_deposit": {
-        "transaction_fee": "Мы обменяем ваши токены на USDC.e в Polygon, сети, используемой функцией «Прогнозы». Поставщики услуг свопов могут взимать комиссию, но MetaMask не взимает ее."
+        "transaction_fee": "Мы обменяем ваши токены на pUSD в Polygon — сети, используемой Прогнозами. Поставщикик услуг обмена могут взимать комиссию, но MetaMask — нет."
       },
       "perps_withdraw": {
         "transaction_fee": "MetaMask автоматически обменяет ваш токен на желаемый. При обмене на mUSD комиссия MetaMask не взимается."
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "В стоимость конвертации mUSD входят расходы сети, а также могут входить комиссии поставщика. При обмене на mUSD комиссия MetaMask не взимается."
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "Комиссии"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "Купить криптовалюту",
       "buy_predict": "Добавьте средства в свой кошелек, чтобы воспользоваться функцией «Прогнозы».",
-      "buy_perps": "Добавьте средства в свой кошелек, чтобы использовать Перпы."
+      "buy_perps": "Добавьте средства в свой кошелек, чтобы использовать Перпы.",
+      "projected_five_year_balance": "Прогнозируемый баланс через 5 лет:"
     },
     "unlimited": "Неограничено",
     "all": "Все",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "Продолжить",
     "deposit_edit_amount_done": "Внести средства",
     "deposit_edit_amount_predict_withdraw": "Вывести средства",
-    "deposit_edit_amount_musd_conversion": "Конвертировать в mUSD"
+    "deposit_edit_amount_musd_conversion": "Конвертировать в mUSD",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "Результаты изменились",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "Обменять",
     "terms_and_conditions": "Положения и условия",
     "select_token": "Выберите токен",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "Токены не найдены",
     "no_tokens_found_description": "Не удалось найти токены с этим именем. Попробуйте другой поисковый запрос.",
     "select_network": "Выбрать сеть",
@@ -7115,6 +7303,7 @@
     "receive_at": "Получить в",
     "recipient": "Получатель",
     "select_recipient": "Выберите получателя",
+    "select_account": "Выбрать счет",
     "external_account": "Внешний счет",
     "error_banner_description": "Этот торговый маршрут сейчас недоступен. Попробуйте изменить сумму, сеть или токен, и мы найдем лучший вариант.",
     "stock_token_error_banner_description": "Этот торговый маршрут в данный момент недоступен. Попробуйте изменить сумму, сеть или токен, и мы найдем наиболее подходящий вариант.\n\nОбратите внимание: при попытке торговли токенизированными акциями Ondo вы можете столкнуться с географическими ограничениями, например, с проблемами с доступом из США, ЕС, Великобритании и Бразилии.",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "Сильное влияние на цену",
     "price_impact_error_title": "Очень высокое влияние на цену",
     "price_impact_error_description": "В результате этой сделки вы потеряете примерно {{priceImpact}} от рыночной цены вашего токена. Попробуйте совершить сделку меньшего размера или использовать более ликвидный путь, чтобы улучшить свой курс.",
+    "insufficient_native_reserve_cta": "Использовать максимум",
+    "insufficient_native_reserve_message": "Эта сеть требует, чтобы на вашем счете оставалось не менее {{minimumReserve}} {{ticker}}. Вы можете использовать максимум {{maxSwappable}} {{ticker}}",
+    "insufficient_native_reserve_title": "Требуется минимальный резервный баланс в размере {{ticker}}",
     "token_warning_suspicious_banner": "{{token}} — подозрительный токен.",
     "token_warning_malicious_banner": "{{token}} — это вредоносный токен. Будьте осторожны при взаимодействии с ним.",
     "token_warning_modal_suspicious_title": "Подозрительный токен",
@@ -7542,17 +7734,17 @@
         "price": "Бесплатно",
         "feature_1": "Виртуальная карта для Apple Pay и Google Pay",
         "feature_2": "Оплата криптовалютой (USDC, USDT, WETH и другие)",
-        "feature_3": "1% кэшбек в USDC от каждой покупки"
+        "feature_3": "Кэшбэк 1% в mUSD с каждой покупки"
       },
       "metal_card": {
         "name": "Металлическая карта",
         "price": "$199/год",
         "everything_in_virtual": "Все то же, что и для виртуальной карты, плюс:",
         "feature_1": "Премиальная металлическая карта с гравировкой",
-        "feature_2": "Кешбэк 3% на первые 10 000 $ в год",
+        "feature_2": "Кэшбэк 3% в mUSD на первые 10 000 $ в год",
         "feature_3": "Без комиссий за зарубежные транзакции"
       },
-      "earn_up_to_badge": "Зарабатывайте до 300 $ кешбэка ежегодно",
+      "earn_up_to_badge": "Получайте до 300 $ кэшбэка в mUSD ежегодно",
       "upgrade_to_metal_label": "Или перейдите на план Metal и получайте трехкратные бонусы"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "ВАША КАРТА ЗАКАЗАНА",
       "subtitle": "Доставка должна занять от 4 до 6 недель.",
-      "description": "Создайте свою виртуальную карту и добавьте ее в свой цифровой кошелек, чтобы начать получать кэшбек.",
+      "description": "Настройте виртуальную карту и добавьте ее в свой цифровой кошелек, чтобы начать получать кэшбэк в mUSD.",
       "set_up_card_button": "Настроить карту",
       "back_to_card_button": "Назад к карте"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "Тратьте\nи зарабатывайте",
-      "description": "Карта MetaMask — это быстрый и\nпростой способ тратить криптовалюту и\nзарабатывать кэшбек до 3%.",
+      "description": "Карта MetaMask Card — это быстрый и\nпростой способ тратить криптовалюту и\nполучать кэшбэк до 3% в mUSD.",
       "apply_now_button": "Настройте сейчас",
       "login_button": "Войти",
       "not_now_button": "Не сейчас",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "Включить карту",
       "enable_assets_button_label": "Активировать активы",
       "spending_limit_warning": "Вы почти достигли лимита расходов. Обновите, чтобы избежать отказов.",
+      "spending_limit_available": "доступные",
       "logout": "Выйти",
       "contact_support": "Связаться с поддержкой",
       "logout_confirmation_title": "Выйти из карты?",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "Положения и условия",
         "order_metal_card": "Металлическая карта",
         "order_metal_card_description": "Закажите свою физическую металлическую карту прямо сейчас",
-        "cashback": "Кешбэк",
-        "cashback_description": "Получайте 1% всех трат обратно",
-        "cashback_description_metal": "Получайте 3% всех трат обратно",
+        "cashback": "Кэшбэк mUSD",
+        "cashback_description": "Получайте кэшбэк 1% в mUSD со всех трат",
+        "cashback_description_metal": "Получайте кэшбэк 3% в mUSD со всех трат",
         "freeze_card": "Заблокировать карту",
         "unfreeze_card": "Разблокировать карту",
         "freeze_card_description": "Приостановить все расходы по вашей карте",
@@ -7917,8 +8110,8 @@
       "token_label": "Токен"
     },
     "cashback_screen": {
-      "title": "Кэшбэк",
-      "available_cashback": "Доступный кешбэк",
+      "title": "Кэшбэк mUSD",
+      "available_cashback": "Доступные mUSD",
       "network_fee": "Комиссия сети",
       "expected_to_receive": "Ожидается к получению",
       "withdraw": "Вывести средства",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "Вывод инициирован",
       "withdrawal_success": "Вывод успешно завершен",
       "withdrawal_failed": "Ошибка вывода. Повторите попытку.",
-      "no_cashback": "Нет доступного кешбэка",
-      "loading_error": "Не удалось загрузить кешбэк. Повторите попытку."
+      "no_cashback": "Кэшбэк mUSD недоступен",
+      "loading_error": "Не удалось загрузить кэшбэк mUSD. Пожалуйста, попробуйте еще раз.",
+      "funding_required": {
+        "title": "Настройка пополнения через Linea",
+        "description": "Вам нужен как минимум один одобренный источник пополнения в Linea перед тем, как обналичить кэшбэк mUSD.",
+        "confirm_button_label": "Настроить пополнение"
+      }
     },
     "change_asset": {
       "title": "Измените токен и сеть",
@@ -8032,7 +8230,8 @@
     "title": "Выбрать способ оплаты",
     "title_receive": "Выберите токен для получения",
     "no_gas": "Нет нативного баланса для оплаты газа",
-    "not_supported": "Не поддерживается"
+    "not_supported": "Не поддерживается",
+    "crypto": "Крипто"
   },
   "connection_removed_modal": {
     "title": "Соединения удалены",
@@ -8048,6 +8247,15 @@
       "title": "Не удалось согласиться",
       "description": "Проверьте соединение и повторите попытку."
     },
+    "notifications_nudge": {
+      "title": "Не пропустите",
+      "description": "Включите уведомления, чтобы быть в курсе кампаний.",
+      "turn_on_button": "Включить",
+      "loading": "Включение уведомлений...",
+      "loading_description": "Это может занять некоторое время.",
+      "enable_error": "Не удалось включить уведомления",
+      "success": "Уведомления включены"
+    },
     "version_guard": {
       "title": "Требуется обновление",
       "description": "Для использования функции «Бонусы» требуется более новая версия MetaMask. Обновите приложение, чтобы продолжить.",
@@ -8126,6 +8334,17 @@
       "retry_button": "Повтор"
     },
     "main_title": "Награды",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "Рефералы",
     "referral_stats_earned_from_referrals": "Заработано на рефералах",
     "referral_stats_referrals": "Рефералы",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "Активные повышающие коэффициенты",
     "season_1": "Сезон 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "Калькулятор бонусов mUSD",
-      "description": "Посмотрите, сколько вы могли бы заработать, конвертировав ваши стейблкоины в mUSD.",
-      "amount_label": "Сконвертированная сумма",
-      "estimated_bonus": "Расчетный годовой бонус: до 3%",
-      "initial_amount": "Начальная сумма",
-      "daily_bonus": "Ежедневный бонус, доступный для получения",
-      "annualized_bonus": "Годовой бонус",
-      "disclaimer": "Это лишь приблизительная оценка. Размер бонуса может измениться.",
-      "disclaimer_brief": "Бонус является приблизительным и может измениться.",
+      "page_title": "Калькулятор mUSD",
+      "hero_hold": "Владейте mUSD.",
+      "hero_earn": "Заработать",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/год",
+      "earnings_per_month_suffix": "/мес",
+      "earnings_per_day_suffix": "/день (ежедневное получение)",
+      "slider_amount_label": "Сумма",
+      "disclaimer_calculator": "Оценка основана на бонусе 3%. Ставка может измениться. Доступно для получения в любое время.",
       "buy_button": "Купить mUSD",
       "swap_button": "Обменять на mUSD"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "Заканчивается {{date}}",
       "ended_date": "Завершено {{date}}",
       "pill_up_next": "Скоро появятся",
+      "up_next": "Далее",
+      "notify_me": "Уведомить меня",
       "pill_active": "Идет сейчас",
       "pill_complete": "Завершено",
       "enter": "Участвовать",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "Недоступно в вашем регионе",
       "geo_locked_toast_description": "Данная кампания недоступна в вашем регионе. Загляните позже, чтобы узнать о новых кампаниях.",
       "geo_locked_cta": "Проверить доступность",
-      "geo_loading": "Проверка региона..."
+      "geo_loading": "Проверка региона...",
+      "remind_me_success_toast": "Мы сообщим вам, когда начнется эта кампания.",
+      "remind_me_save_error": "Не удалось сохранить ваше напоминание. Пожалуйста, попробуйте еще раз."
     },
     "campaign_mechanics": {
       "title": "Механизм"
@@ -8479,10 +8701,10 @@
       "qualified_description": "Увеличьте свой чистый приток, чтобы достичь более высокого уровня и получить шанс на бо́льшую выплату.",
       "not_eligible_title": "Не подходит",
       "not_eligible_description": "Сделки, открытые слишком поздно для выполнения требования об удержании в течение {{days}} дн., не будут учитываться в вашем ранге или уровне.",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "Всего участников",
+      "completed_label_total_tvl": "Общиая заблокированная стоимость (TVL)",
+      "completed_label_top_return": "Лучшая доходность",
+      "completed_label_winners": "Победители"
     },
     "ondo_campaign_activity": {
       "title": "Вся активность",
@@ -8508,6 +8730,48 @@
       "cancel": "Отмена",
       "confirm": "Я понимаю"
     },
+    "perps_trading_campaign": {
+      "title": "Конкурс торговли перпами",
+      "stats_title": "Статистика",
+      "performance_title": "Результативность",
+      "label_rank": "Рейтинг",
+      "label_your_rank": "Ваш ранг",
+      "label_pnl": "П/У",
+      "label_volume": "Объем",
+      "label_notional_volume": "Номинальный объем",
+      "pending": "Ожидающий",
+      "qualified": "Квалифицирован",
+      "open_position_cta": "Открытая позиция",
+      "leaderboard_title": "Таблица лидеров",
+      "leaderboard_total_participants": "{{count}} участника(-ов)",
+      "last_updated": "Последнее обновление: {{time}}",
+      "leaderboard_error_loading": "Не удалось загрузить таблицу лидеров",
+      "leaderboard_error_loading_description": "При загрузке таблицы лидеров возникла ошибка. Пожалуйста, попробуйте еще раз.",
+      "leaderboard_not_yet_computed": "Таблица лидеров еще не сформирована. Загляните попозже.",
+      "leaderboard_powered_by_prefix": "На основе ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "Призовой фонд",
+      "prize_pool_current_label": "Текущая",
+      "prize_pool_next_label": "Далее",
+      "prize_pool_volume_subtext": "{{current}} из {{target}} объема",
+      "prize_pool_max_tier_subtext": "Объем {{maxThreshold}}+ — все этапы пройдены",
+      "prize_pool_max_badge": "Максимум",
+      "prize_pool_error_title": "Не удалось загрузить призовой фонд",
+      "prize_pool_error_description": "Произошла ошибка при загрузке призового фонда. Попробуйте еще раз.",
+      "prize_pool_retry_button": "Повтор",
+      "stats_notional_volume_threshold": "Требуется {{amount}} $",
+      "stats_qualified_title": "Вы соответствуете требованиям",
+      "stats_qualified_description": "Продолжайте торговать, чтобы улучшить свой показатель прибыли и убытков (П/У) и подняться в таблице лидеров до окончания соревнования.",
+      "stats_qualify_for_rank_title": "Квалифицироваться на этот ранг",
+      "stats_qualify_for_rank_description": "Наторгуйте еще {{notionalRemaining}} номинального объема, чтобы получить право на участие.",
+      "stats_error_title": "Не удалось загрузить статистику",
+      "stats_error_description": "У нас возникла проблема с загрузкой вашей статистики. Пожалуйста, попробуйте еще раз.",
+      "stats_retry": "Повтор",
+      "completed_label_total_participants": "Всего участников",
+      "completed_label_total_volume": "Общий объем",
+      "completed_label_top_pnl": "Лучший показатель П/У",
+      "completed_label_winners": "Победители"
+    },
     "campaigns_preview": {
       "title": "Кампании",
       "coming_soon": "Скоро появятся",
@@ -8532,29 +8796,29 @@
       "retry_button": "Повтор",
       "refreshing": "Обновление..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "Вы выиграли",
       "rank_label": "{{place}} место",
-      "email_instructions": "Отправьте письмо со своим кодом на адрес ondocampaign@consensys.net, чтобы получить приз.",
+      "email_instructions": "Отправьте письмо на {{email}} с вашим кодом, чтобы получить приз.",
       "open_mail": "Открыть почту",
       "skip_for_now": "Пока пропустить",
-      "mail_subject": "Получение приза кампании Ondo",
+      "mail_subject": "Получение приза {{campaignName}}",
       "mail_body": "Мой выигрышный код: {{code}}",
       "winning_code": "Выигрышный код",
       "close_a11y": "Закрыть"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "Вы выиграли",
-        "description": "Получите свой приз сегодня.",
-        "a11y": "Открыть детали победителя"
+        "title": "Вы выиграли!",
+        "description": "Подтвердите свой выигрышный код и заберите приз сегодня.",
+        "a11y": "Просмотр подробностей"
       },
       "participant_pending": {
         "title": "Кампания завершена.",
         "description": "Мы определяем результаты. Загляните сюда позже."
       },
       "participant_finalized": {
-        "title": "Результаты кампании подведены",
+        "title": "Результаты кампании подведены.",
         "description": "В этот раз вы не выиграли. Проверьте таблицу лидеров, чтобы узнать свое место."
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "Ваша награда уже в пути — мы скоро свяжемся с вами."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "Вы выиграли 💰",
-        "description": "Получите свой приз в кампании {{campaignName}}",
+        "description": "Заберите свой приз из кампании {{campaignName}} сегодня.",
         "cta": "Просмотр подробностей"
       },
-      "participant_no_winner": {
-        "title": "Результаты готовы. 🏅",
-        "description": "Посмотрите свой рейтинг в кампании {{campaignName}}",
+      "non_winner": {
+        "title": "Результаты готовы 🏅",
+        "description": "Посмотрите свой рейтинг в кампании {{campaignName}}.",
         "cta": "Просмотр"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "Востребованные выигрыши",
       "predict_deposit": "Счет «Прогнозирование» пополнен",
       "predict_withdraw": "Вывод средств",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "Пополнение счета Money",
+      "money_account_withdraw": "Перевод со счета Money",
       "default": "Сведения о транзакции"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "Обзор",
-    "trending_tokens": "Тренды",
+    "crypto_movers": "Лидеры крипторынка",
+    "perps_movers": "Лидеры среди перпов",
+    "trending_tokens": "Популярное",
+    "crypto": "Крипто",
     "stocks": "Акции",
     "price_change": "Изменение цены",
     "all_networks": "Все сети",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 час",
     "5_minutes": "5 минут",
     "networks": "Сети",
+    "ecosystems": "Экосистемы",
+    "ecosystems_subtitle": "Изучайте dApps, токены и NFT в разных сетях на MetaMask Portfolio",
+    "all_sports": "Популярные виды спорта",
+    "basketball": "Баскетбол",
+    "football": "Американский футбол",
+    "soccer": "Футбол",
+    "tennis": "Теннис",
+    "f1": "Формула 1",
+    "golf": "Гольф",
+    "all_sports_no_markets": "В этой категории пока нет открытых рынков. Загляните позже или выберите другой вид спорта выше.",
+    "load_more": "Загрузить еще",
     "sort_by": "Сортировать по",
     "volume": "Объем",
     "market_cap": "Рыночная капитализация",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "Поиск токенов, сайтов и URL-адресов",
     "cancel": "Отмена",
     "perps": "Перпы",
+    "rwa_perps_section": "Перпы",
+    "macro_stocks_commodity_perps": "Перпы",
+    "macro_pill_stocks": "Акции",
+    "macro_pill_commodities": "Товары",
+    "rwa_pill_commodities": "Товары",
+    "rwa_pill_stocks": "Акции",
+    "rwa_pill_forex": "Валюты",
+    "crypto_perps_section": "Перпы",
     "predictions": "Прогнозы",
     "no_results": "Результаты не найдены",
+    "popular": "Популярные",
     "sites": "Сайты",
     "popular_sites": "Популярные сайты",
     "search_sites": "Поиск по сайтам",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "Токены не найдены",
       "description": "Нам не удалось найти этот токен"
+    },
+    "tabs": {
+      "now": "Сейчас",
+      "macro": "Макро",
+      "rwas": "Реальные активы (RWA)",
+      "crypto": "Крипто",
+      "sports": "Спорт",
+      "dapps": "Сайты"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "Отмена",
-      "continue": "Продолжить"
+      "continue": "Продолжить",
+      "learn_more": "Узнайте подробнее",
+      "try_again": "Повторить попытку"
     },
     "connecting": {
       "title": "Подключение вашего {{device}}...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "Включите Bluetooth для подключения к вашему устройству",
       "bluetooth_scan_failed": "Не удалось выполнить поиск устройств. Повторите попытку",
       "bluetooth_connection_failed": "Сбой подключения к вашему устройству. Повторите попытку",
+      "camera_permission_denied": "Для сканирования QR-кодов требуется разрешение на использование камеры. Пожалуйста, включите его в настройках вашего устройства",
       "not_supported": "Эта операция не поддерживается",
       "unknown_error": "Убедитесь, что ваш {{device}} настроен с помощью секретной фразой для восстановления или пароля для этого счета"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "Требуется разрешение на геолокацию",
       "nearby_devices_permission_denied": "Требуется разрешение на поиск устройств поблизости",
       "scan_failed": "Ошибка поиска",
+      "camera_permission_denied": "Требуется разрешение на использование камеры",
       "something_went_wrong": "Что-то пошло не так"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "Отсканируйте QR-код синхронизации кошелька",
+          "body": "Вернитесь в свой аппаратный кошелек и найдите опцию поделиться или экспортировать свои счета, выберите MetaMask, затем отсканируйте QR-код."
+        },
+        "sign": {
+          "title": "Отсканируйте QR-код подписи",
+          "body": "Вернитесь к аппаратному кошельку и одобрите транзакцию, затем отсканируйте появившийся QR-код."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "Неверный QR-код",
+          "body": "Вернитесь в свой аппаратный кошелек, выберите MetaMask в качестве типа кошелька, затем сгенерируйте и отсканируйте новый QR-код."
+        },
+        "sign": {
+          "title": "Неверный QR-код",
+          "body": "Вернитесь к аппаратному кошельку и одобрите транзакцию, затем отсканируйте появившийся QR-код."
+        }
+      },
+      "ur_decode_error": {
+        "title": "Не удалось прочитать QR-код",
+        "body": "Убедитесь, что QR-код полностью виден и хорошо освещен, и попробуйте снова. Если проблема не исчезнет, возможно, вам потребуется обновить прошивку аппаратного кошелька."
+      }
+    },
     "device_selection": {
       "title": "Выберите {{device}}",
       "scanning": "Поиск устройств...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Финансы",
-      "cash_empty_description": "У вас пока нет mUSD. Конвертируйте стейблкоины в mUSD в разделе «Деньги» на главной странице.",
-      "cash_empty_description_network_filter": "В этой сети нет mUSD. Переключитесь на другую сеть, чтобы увидеть свои mUSD.",
+      "money": "Финансы",
+      "money_empty_description": "У вас пока нет mUSD. Конвертируйте стейблкоины в mUSD в разделе «Деньги» на главной странице.",
+      "money_empty_description_network_filter": "В этой сети нет mUSD. Переключитесь на другую сеть, чтобы увидеть свои mUSD.",
+      "money_empty_state": {
+        "get_started": "С чего начать",
+        "earn_apy": "Зарабатывайте {{percentage}}% годовых"
+      },
+      "money_filled_state": {
+        "add": "Добавить",
+        "apy": "{{percentage}}% годовых"
+      },
       "tokens": "Токены",
+      "perps": "Перпы",
+      "related_assets": "Связанные активы",
       "perpetuals": "Бессрочные контракты",
       "predictions": "Прогнозы",
       "whats_happening": "Что происходит",
+      "whats_happening_ai": "ИИ",
+      "whats_happening_impact": {
+        "bullish": "Бычий",
+        "bearish": "Медвежий",
+        "neutral": "Нейтральный"
+      },
       "top_traders": "Лучшие трейдеры",
       "whats_happening_categories": {
         "geopolitical": "Геополитика",
@@ -8819,7 +9160,7 @@
       },
       "defi": "DeFi",
       "nfts": "NFT",
-      "trending_tokens": "Тренды",
+      "trending_tokens": "Популярное",
       "trending_perpetuals": "Популярные перпы",
       "trending_predictions": "Популярные прогнозы",
       "import_nfts": "Импорт NFT",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "Не удалось загрузить {{section}}",
       "retry": "Повтор"
     }
+  },
+  "sites": {
+    "popular": "Популярные"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/tl.json b/locales/languages/tl.json
index 62a1f473852..2738b317c2f 100644
--- a/locales/languages/tl.json
+++ b/locales/languages/tl.json
@@ -634,7 +634,8 @@
     "trade": "Mag-trade",
     "settings": "Mga Setting",
     "rewards": "Mga Reward",
-    "trending": "Tuklasin"
+    "trending": "Tuklasin",
+    "money": "Pera"
   },
   "drawer": {
     "send_button": "Ipadala",
@@ -708,7 +709,11 @@
     "smart_contract_address": "Address ng smart na kontrata",
     "smart_contract_address_warning": "Maaaring hindi sinusuportahan ng address ng tatanggap ang direktang mga paglilipat ng token, na maaaring magresulta sa pagkalugi ng pondo. Magpatuloy lamang kung tiyak ka na matatanggap ng kontratang ito ang paglilipat mo.",
     "i_understand": "Nauunawaan ko",
-    "cancel": "Kanselahin"
+    "cancel": "Kanselahin",
+    "new_address_title": "Bagong address",
+    "new_address_message": "Ito ang unang beses na nagpapadala ka sa site na ito. Tiyaking tama ito bago ka magpatuloy:",
+    "alert_navigation_previous": "Nakaraang alerto",
+    "alert_navigation_next": "Susunod na alerto"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "Mga nangungunang trader",
       "allow_push_notifications": "Payagan ang mga push na notipikasyon",
       "trades_over_label": "Maabisuhan tungkol sa mga trade sa:",
       "traders_you_follow": "Mga trader na fina-follow mo",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "Hindi mai-load ang mga trader na fina-follow mo."
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "Mga notipikasyon mula kay {{traderName}}",
       "allow_push_notifications": "Payagan ang mga push na notipikasyon",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "Maabisuhan sa aktibidad sa pag-trade ni {{traderName}}.",
+      "manage_traders": "Pamahalaan ang mga trade na fina-follow mo",
       "save": "I-save"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "Makakuha ng mga real-time na alerto sa mga trade mula sa mga trader na fina-follow mo",
       "allow_push_notifications": "Payagan ang mga push na notipikasyon",
       "trades_over_label": "Maabisuhan tungkol sa mga trade sa:",
       "save": "I-save",
@@ -1059,7 +1064,12 @@
       "closed": "Nakasara",
       "no_positions": "Wala pang mga posisyon",
       "error_loading_profile": "Hindi mai-load ang profile",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "Tingnan sa X (Twitter)",
+      "sort": {
+        "value": "Value",
+        "pnl_percent": "P&L %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "Market cap",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} na ibinenta",
       "no_trades": "Walang trade para sa interval na ito",
       "closed_position": "Nakasarang posisyon",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "Hindi available ang posisyon",
+      "fallback_subtitle": "Hindi namin mai-load ang posisyong ito sa ngayon.",
+      "fallback_back_to_profile": "Bumalik sa profile",
+      "fallback_back_to_leaderboard": "Bumalik sa leaderboard"
     },
     "quick_buy": {
       "title": "Bumili ng {{symbol}}",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "Mga Predisksyon ng MetaMask",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "Mga market ng prediksyon",
     "market_list": "Listahan ng market",
     "loading": "Nilo-load...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "Baguhin ang Paraan ng Pagbabayad",
+      "add_funds": "Magdagdag ng mga Pondo",
+      "add": "Idagdag",
+      "predict_balance": "Hulaan ang balanse"
+    },
     "order": {
       "available": "Available",
       "cashed_out": "Nag-cash out",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "Mabilis na gumagalaw ang market, kaya hindi kami nakabili sa {{price}}. Subukan muli sa pinakasulit na presyong available?",
       "market_busy_body_sell": "Mabilis na gumagalaw ang market, kaya hindi kami nakapagbenta sa {{price}}. Subukan muli sa pinakasulit na presyong available?",
       "order_failed_title": "Nabigo ang order",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "Hindi ma-fill ang order mo. Subukan ulit?",
+      "price_changed_title": "Nagbago ang presyo",
+      "price_changed_body": "Hindi makabili sa halagang {{price}}. Subukan sa market price?",
       "retry": "Subukang muli",
       "try_again": "Subukang muli",
       "view": "Tingnan",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "Tapos ng mag-withdraw",
       "withdraw_completed_subtitle": "Nailipat ang {{amount}} USDC sa iyong wallet",
       "withdraw_any_token_completed_subtitle": "Nailipat ang {{amount}}{{token}} sa iyong wallet",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "Nakuha ko",
       "error_title": "Mayroong nang mali",
       "error_description": "Nabigong magpatuloy sa pag-withdraw",
       "try_again": "Subukang muli"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "Kinakailangan ng {{tokenSymbol}} para makapagpatuloy",
     "fund_your_wallet": "Pondohan ang wallet mo",
     "get_ready_for_web3": "Ihanda ang wallet mo upang magamit ang web3.",
+    "home_onboarding_steps": {
+      "header": "Mga Hakbang",
+      "get_started_title": "Magsimula sa MetaMask",
+      "fund_title": "Pondohan ang wallet mo",
+      "fund_subtitle": "Walang may gusto ng wallet na walang laman. Magdagdag ng mga pondo nang madali para makapagsimulang mag-trade.",
+      "fund_primary": "Magdagdag ng pondo",
+      "trade_title": "Gawin ang una mong trade",
+      "trade_subtitle": "Mag-trade ng mga trending na token sa maraming network para palaguin ang portfolio mo.",
+      "trade_primary": "Mag-trade",
+      "notifications_title": "I-on ang mga notipikasyon",
+      "notifications_subtitle": "Manatiling updated sa mga pagbabago sa merkado para magawa mo ang pinakamainam para sa portfolio mo.",
+      "notifications_primary": "I-on",
+      "skip": "Laktawan",
+      "progress_a11y": "Hakbang {{current}} ng {{total}}",
+      "balance_loading_a11y": "Nilo-load ang balanse sa wallet"
+    },
     "add_funds": "Magdagdag ng pondo",
     "next": "Susunod",
     "buy_asset": "Bumili ng {{asset}}",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "Di-wastong numero. Maglagay ng numero sa pagitan ng 1 at %{maxSafeChainId}",
     "hide_zero_balance_tokens_title": "Itago ang mga token na walang balanse",
     "hide_zero_balance_tokens_desc": "Pigilan ang mga token na walang balanse na lumabas sa iyong listahan ng token.",
+    "haptic_feedback_title": "Haptic feedback",
+    "haptic_feedback_desc": "Makaramdam ng mga banayad na pag-vibrate para sa mga kumpirmasyon, error, at interaksyon. Huwag paganahin para bawasan ang haptic stimuli.",
     "token_detection_title": "I-autodetect ang mga token",
     "token_detection_description": "Gumagamit kami ng mga third-party na API para tumuklas at magpakita ng mga bagong token na ipinadala sa iyong wallet. I-off kung ayaw mong kunin ng app ang datos mula sa mga serbisyong iyon.",
     "theme_button_text": "Baguhin ang tema",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "Pinakamaasahan",
         "quote_unknown_provider": "Hindi kilalang provider",
         "start_headless_buy": "Simulan ang headless buy",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "Palitan at simulan ang headless buy",
         "start_headless_buy_disabled_hint": "Maglagay ng valid na halaga para i-enable",
         "start_headless_buy_pending": "Aktibo ang headless na sesyon — buksan ang BuildQuote",
         "cancel_headless_buy": "Kanselahin ang headless na sesyon",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "Aktibong sesyon: {{sessionId}} — makakansela ito kapag nagsimula ng ibang quote.",
         "event_log_title": "Log ng event",
         "event_log_empty": "Wala pang event — magsimula ng headless na sesyon at bantayan ang espasyong ito.",
         "event_log_started": "sinimulang sesyon {{sessionId}} (asset={{assetId}}, halaga={{amount}}, pagbabayad={{paymentMethodId}}{{providerSuffix}})",
@@ -3455,9 +3524,9 @@
       },
       "headless_host": {
         "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "loading": "Inihahanda ang buy flow…",
+        "no_session": "Hindi na aktibo ang headless na sesyon.",
+        "cancel": "Kanselahin"
       }
     },
     "request_feature": "Humiling ng feature",
@@ -3553,7 +3622,7 @@
     "security_alerts": "Mga alerto sa seguridad",
     "security_alerts_desc": "Inaalertuhan ka ng tampok na ito sa mga aktibidad na may masamang hangarin sa pamamagitan ng lokal na pagsusuri sa iyong mga transaksyon at kahilingan sa paglagda. Palaging gumawa ng sarili mong pag-iingat bago aprubahan ang anumang mga kahilingan. Walang garantiya na made-detect ng tampok na ito ang lahat ng aktibidad na may masamang hangarin. Sa pagpapagana sa tampok na ito, sumasang-ayon ka sa mga tuntunin ng paggamit ng provider.",
     "smart_account_dapp_requests_heading": "Mga kahilingan na smart account mula sa dapps",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "Payagan ang mga dapp na humiling ng mga feature ng smart account para sa mga karaniwang account. Mag-a-upgrade lang ang MetaMask sa aming mga na-audit na smart account.",
     "smart_transactions_opt_in_heading": "Mga Smart Transaction",
     "smart_transactions_opt_in_desc_supported_networks": "I-on ang mga Smart na Transaksyon para sa mas maaasahan at ligtas na mga transaksyon sa mga suportadong network.",
     "smart_transactions_learn_more": "Matuto pa",
@@ -3572,6 +3641,39 @@
         "title": "Card",
         "reset_onboarding_description": "I-reset ang estado ng Card onboarding para simulan ang daloy ng onboarding mula sa simula.",
         "reset_onboarding_button": "I-reset ang Estado ng Onboarding"
+      },
+      "haptics": {
+        "title": "Haptics",
+        "description": "Tingnan ang haptic feedback sa pisikal na device. Nilalaktawan nito ang reduced-haptics sa app at remote kill switch para masuri mo ang bawat pattern. Karaniwang di nagpe-play ng haptics ang mga simulator.",
+        "catalog_impacts_heading": "Mga moment ng epekto ng catalog",
+        "notifications_heading": "Mga pattern ng notipikasyon",
+        "selection_heading": "Pagpipilian",
+        "notification_success_button": "Notipikasyon — Tagumpay",
+        "notification_error_button": "Notipikasyon — Error",
+        "notification_warning_button": "Notipikasyon — Babala",
+        "selection_button": "Pagpili",
+        "raw_impacts_heading": "Mga estilo ng epekto ng Raw Expo",
+        "raw_impacts_desc": "Mga estilo ng epekto ng direktang expo-haptics na ihahambing sa mga nakamapang moment ng catalog sa itaas.",
+        "impacts": {
+          "quick_amount_selection": "Epekto — Mabilis na pagpili sa halaga",
+          "slider_tick": "Epekto — Slider tick",
+          "edge_gesture_engage": "Epekto — Edge gesture engage",
+          "page_navigation": "Epekto — Pag-navigate sa page",
+          "slider_grip": "Impact — Slider grip",
+          "tab_change": "Epekto — Pagbago ng tab",
+          "primary_cta": "Epekto — Pangunahing CTA",
+          "pull_to_refresh_engage": "Epekto — I-pull para i-refresh (i-engage)",
+          "pull_to_refresh": "Epekto — Pull to refresh (i-release)",
+          "chart_crosshair": "Epekto — Chart crosshair",
+          "follow_toggle": "Epekto — Toggle ng I-follow"
+        },
+        "raw_styles": {
+          "light": "Raw na epekto — Magaan",
+          "medium": "Raw na epekto — Katamtaman",
+          "heavy": "Raw na epekto — Mabigat",
+          "rigid": "Raw na epekto — Matigas",
+          "soft": "Raw na epekto — Malambot"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "Mga hula",
     "add_collectible_button": "Idagdag",
     "info": "Impormasyon",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "Mag-swap",
     "convert": "I-convert",
     "bridge": "Mag-bridge",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "I-troubleshoot",
     "deposit_description": "Mababang bayad para sa bank o card transfer",
     "buy_description": "Mainam para sa pagbili ng partikular na token",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "Magbenta ng crypto para sa pera",
     "swap_description": "Palitan sa pagitan ng mga token",
     "bridge_description": "Maglipat ng mga token sa pagitan ng mga network",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "Libre",
     "tx_details_not_available": "Hindi available",
     "smart_contract_interaction": "Interaksyon sa smart na kontrata",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "Ideposito sa Money Account",
+    "money_account_withdraw": "Ilipat mula sa Money Account",
     "swaps_transaction": "Transaksyon sa mga swap",
     "bridge_transaction": "Mag-bridge",
     "approve": "Aprubahan",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "MAKAKUHA NG {{percentage}}% SA\nMGA STABLECOIN",
-        "description": "I-convert ang mga stablecoin mo sa mUSD at kumita ng hanggang {{percentage}}% taunang bonus na puwede mong ma-claim araw-araw.",
+        "description": "I-convert ang mga stablecoin mo sa mUSD at kumita ng {{percentage}}% taunang bonus.",
         "terms_apply": "Nalalapat ang mga tuntunin.",
         "primary_button": "Magsimula",
-        "secondary_button": "Hindi sa ngayon"
+        "secondary_button": "Hindi sa ngayon",
+        "checklist": {
+          "dollar_backed": "Sinusuportahan ng Dolyar",
+          "no_lockups": "Walang mga lockup",
+          "daily_bonus": "Araw-araw na bonus",
+          "metamask_stablecoins": "Mga stablecoin ng MetaMask",
+          "no_metamask_fee": "Walang bayad sa MetaMask"
+        }
       },
       "buy_musd": "Bumili ng mUSD",
       "get_musd": "Kumuha ng mUSD",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Pera",
+    "your_balance": "Iyong balanse",
     "apy_label": "{{percentage}}% APY",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "Impormasyon ng APY",
     "onboarding": {
       "step_progress": "Hakbang {{current}} ng {{total}}",
       "title": "Magdagdag ng pera",
-      "description": "Bumili ng mUSD at magsimulang kumita ng APY ngayong araw.",
+      "description": "Pondohan ang account mo at simulang kumita ng APY.",
       "add": "Idagdag",
       "step2_title": "Kunin ang MetaMask Card mo",
       "step2_description": "Gastusin ang balanse mo sa Money habang kumikita ito, saanman tinatanggap ang Mastercard.",
@@ -6497,22 +6611,32 @@
       "card": "Card"
     },
     "earnings": {
-      "title": "Mga Kita",
-      "lifetime": "Panghabambuhay na kita",
-      "projected": "Mga tinatayang kita"
+      "title": "Mga tinatayang kita",
+      "estimated_monthly": "Buwanan",
+      "estimated_yearly": "Taon-taon",
+      "info_label": "Impormasyon sa kita"
     },
     "how_it_works": {
       "title": "Paano ito gumagana",
-      "description_prefix": "Mag-hold ng mUSD sa Money Account mo at awtomatikong kumita",
-      "description_suffix": ". Sinusuportahan ito ng dollar, laging liquid, at handang gastusin, i-trade, o ipadala anumang oras."
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "Idagdag"
     },
+    "balance_card": {
+      "label": "Balanse sa Money",
+      "add": "Idagdag",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "Kumita sa crypto mo",
       "description": "Tingnan kung paano maaaring lumago ang pera mo sa paglipas ng panahon sa pamamagitan ng pag-convert ng iyong crypto sa mUSD.",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "I-convert",
+      "convert_cta": "Convert your crypto",
       "no_fee": "Walang bayad sa MetaMask",
       "view_all": "Tingnan lahat",
       "view_potential_earnings": "Tingnan ang potensyal na kikitain"
@@ -6522,37 +6646,75 @@
       "subtitle": "Gastusin ang pera mo kahit saan.",
       "virtual_card": "Virtual card",
       "metal_card": "Metal card",
-      "cashback": "{{percentage}}% cashback",
+      "cashback": "Ibabalik na {{percentage}}% mUSD",
       "get_now": "Kunin ngayon",
       "link_title": "I-link ang MetaMask Card",
-      "link_subtitle": "Gastusin ang balanse mo sa Money at kumita.",
-      "link_bullet_cashback": "Hanggang 3% cash back",
-      "link_bullet_apy": "Hanggang {{apy}}% APY",
-      "link_card": "I-link ang card"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "I-link ang card",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "Ano ang makukuha mo",
-      "benefit_auto_earn": "Awtomatikong kumita",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "Itabi nang ligtas ang pera mo sa mUSD, isang stablecoin na sinusuportahan ng dolyar nang 1:1",
       "benefit_liquidity": "Makakuha ng ganap na liquidity nang walang lockup, kaya maaari kang mag-trade o mag-withdraw anumang oras",
       "benefit_spend_prefix": "Gastusin sa 150M+ merchant gamit ang MetaMask Card at kumita ",
-      "benefit_spend_cashback": "1-3% cashback",
-      "benefit_transfer": "Maglipat ng pera sa alinman sa iyong mga wallet sa buong MetaMask",
-      "benefit_global": "Magpadala at makatanggap ng pera saanman sa mundo",
+      "benefit_spend_cashback": "Ibabalik na 1-3% mUSD",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "Matuto pa"
     },
     "footer": {
-      "add_money": "Magdagdag ng pera"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "Magdagdag ng pera",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "Mag-convert ng crypto",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "Magdeposito ng mga pondo",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "Tumanggap mula sa panlabas na wallet",
       "coming_soon": "Paparating na"
     },
+    "more_sheet": {
+      "title": "Higit pa",
+      "how_it_works": "Paano ito gumagana",
+      "what_you_get": "Ano ang makukuha mo",
+      "contact_support": "Kontakin ang suporta"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "Sa pagitan ng mga account",
+      "perps_account": "Perps account",
+      "predictions_account": "Account sa Predictions",
+      "send_external": "Ipadala sa panlabas na address",
+      "withdraw_to_bank": "I-withdraw sa bangko"
+    },
+    "apy_tooltip": {
+      "title": "Annual Percentage Yield (APY)",
+      "paragraph_1": "Awtomatikong kumikita ang Money account mo ng hanggang {{percentage}}%.",
+      "paragraph_2": "Ang rate na ipinapakita ay ang tinatayang Annual Percentage Yield (APY) batay sa kasalukuyang mga kundisyon ng merkado. Nag-iiba-iba ang APY at posible itong magbago dahil sa iba't ibang salik. Binubuo ang rate ng mga third-party na platform ng DeFi na naglalagay ng mga pondo sa mga protocol ng blockchain.",
+      "paragraph_3": "Kapag ni-link mo ang MetaMask Card mo, ibabawas ang mga binili mo sa balanseng ito."
+    },
+    "earnings_tooltip": {
+      "title": "Mga tinatayang kita",
+      "body": "Pagtataya ng puwede mong kitain sa loob ng isang yugto ng panahon batay sa kasalukuyan mong balanse at APY ngayong araw. Hindi garantisado ang mga return at posible pa ring magbago ang mga ito."
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "Aktibidad",
       "view_all": "Tingnan lahat",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "Pera",
       "section_title": "Paano ito gumagana",
-      "description_1": "Kumikita ang Money account mo ng 4% APY (variable) nang awtomatiko. Napupunta ang mga pondo sa na-curate na DeFi vault na kumikita ng mga return sa lahat ng na-audit na lending market nang walang pag-stake, pag-claim, at lock-up.",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "Ang balanse mo sa Money ang balanseng puwede mong gastusin. I-link ang MetaMask Card mo para magamit ito sa 150M+ merchant sa buong mundo. Patuloy na kikita ang pera mo hanggang sa gastusin mo ito.",
-      "faq_title": "FAQ",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "Paparating na.",
-      "faq_q1": "Ano ang Money account?",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "Ano ang mUSD?",
       "faq_q3": "Saan nanggagaling ang yield?",
       "faq_q4": "Naka-lock ba ang pera ko? Puwede ba akong mag-withdraw anumang oras?",
@@ -6608,8 +6770,7 @@
       "faq_q7": "Nagbabago ba ang rate ng APY?",
       "faq_q8": "Isa ba itong savings account o spending account?",
       "faq_q9": "Sino ang kumokontrol sa pera ko?",
-      "faq_q10": "Ano ang makukuha kong cashback sa paggamit ng MetaMask Card?",
-      "sounds_good": "Mukhang maganda"
+      "faq_q10": "Ano ang makukuha ko pabalik na mUSD sa MetaMask Card?"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "Kanselahin",
     "confirm": "Kumpirmahin",
+    "pay_with_bottom_sheet": {
+      "title": "Magbayad gamit ang",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "Sa pagpapatuloy, sumasang-ayon ka sa aming ",
       "terms_of_use": "Mga Tuntunin ng Paggamit",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "Mag-withdraw",
       "predict_deposit": "Magdagdag ng mga pondo para sa Prediksyon",
       "predict_withdraw": "Mag-withdraw",
-      "money_account_deposit": "Magdagdag ng pondo",
-      "money_account_withdraw": "I-withdraw ang mga pondo"
+      "money_account_add_money": "Magdagdag ng pera",
+      "money_account_transfer_money": "Maglipat ng pera"
     },
     "sub_title": {
       "permit": "Kailangan ng site na ito ng pahintulot para gastusin ang mga token mo.",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "Isa-swap namin ang iyong mga token para sa USDC sa HyperCore, ang network na ginagamit ng Perps. Maaaring maningil ng bayarin ang mga swap provider, ngunit hindi ang MetaMask."
       },
       "predict_deposit": {
-        "transaction_fee": "Isu-swap namin ang mga token mo para sa USDE.e sa Polygon, ang network na ginamit ng mga Prediksyon. Maaaring maningil ang mga swap provider, ngunit hindi ang MetaMask."
+        "transaction_fee": "Isu-swap namin ang mga token mo para sa pUSD sa Polygon, ang network na ginamit ng Predictions. Maaaring maningil ang mga swap provider, ngunit hindi ang MetaMask."
       },
       "perps_withdraw": {
         "transaction_fee": "Magsu-swap ang MetaMask ng token na gusto mo para sa iyo. Walang hihinging bayad sa MetaMask kapag nag-swap ka sa mUSD."
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "Kasama sa mga bayarin sa pag-convert ng mUSD ang mga bayad sa network at posible ring kasama ang mga bayarin sa provider. Walang hihinging bayad sa MetaMask kapag nag-convert ka sa mUSD."
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "Mga Bayarin"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "Bumili ng crypto",
       "buy_predict": "Magdagdag ng pondo sa wallet mo para magamit ang Mga Prediksyon.",
-      "buy_perps": "Magdagdag ng pondo sa wallet mo para magamit ang Perps."
+      "buy_perps": "Magdagdag ng pondo sa wallet mo para magamit ang Perps.",
+      "projected_five_year_balance": "Tinatayang balanse para sa limang taon:"
     },
     "unlimited": "Walang limitasyon",
     "all": "Lahat",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "Magpatuloy",
     "deposit_edit_amount_done": "Magdagdag ng pondo",
     "deposit_edit_amount_predict_withdraw": "Mag-withdraw",
-    "deposit_edit_amount_musd_conversion": "I-convert sa mUSD"
+    "deposit_edit_amount_musd_conversion": "I-convert sa mUSD",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "Nagbago ang mga resulta",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "Mag-swap",
     "terms_and_conditions": "Mga Tuntunin at Kundisyon",
     "select_token": "Pumili ng token",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "Walang nakitang token",
     "no_tokens_found_description": "Wala kaming nakitang anumang token na may ganitong pangalan. Subukang maghanap ng iba.",
     "select_network": "Pumili ng network",
@@ -7115,6 +7303,7 @@
     "receive_at": "Natanggap sa",
     "recipient": "Tatanggap",
     "select_recipient": "Pumili ng tatanggap",
+    "select_account": "Pumili ng account",
     "external_account": "External account",
     "error_banner_description": "Hindi available ang ruta ng trade na ito sa ngayon. Subukang baguhin ang halaga, network, o token at hahanapin namin ang pinakamainam na solusyon.",
     "stock_token_error_banner_description": "Hindi available ang ruta ng trade na ito sa ngayon. Subukang baguhin ang halaga, network, o token at hahanapin namin ang pinakamainam na opsyon.\n\nPakitandaan na kung sinusubukan mong mag-trade ng Ondo Tokenised na mga Stock, maaari geo-restricted ka hal. sa pamamagitan ng US, EU, UK at BR.",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "Matinding epekto sa presyo",
     "price_impact_error_title": "Napakatinding epekto sa presyo",
     "price_impact_error_description": "Mawawalan ka ng tinatayang {{priceImpact}} ng market price ng token mo sa swap na ito. Subukan ang mas maliit na trade o mas liquid na ruta para pahusayin ang rate mo.",
+    "insufficient_native_reserve_cta": "Gamitin ang max na pinapayagan",
+    "insufficient_native_reserve_message": "Kinakailangan ng network na ito na may lamang kahit man lang {{minimumReserve}} {{ticker}} ang account mo. Puwede kang gumamit ng maximum na {{maxSwappable}} {{ticker}}",
+    "insufficient_native_reserve_title": "Minimum na {{ticker}} na reserbang balanse na kinakailangan",
     "token_warning_suspicious_banner": "Ang {{token}} ay isang kahina-hinalang token.",
     "token_warning_malicious_banner": "Ang{{token}} ay isang mapaminsalang token. Maging maingat sa pakikipag-ugnayan sa token na ito.",
     "token_warning_modal_suspicious_title": "Kahina-hinalang token",
@@ -7542,17 +7734,17 @@
         "price": "Libre",
         "feature_1": "Virtual card para sa Apple Pay at Google Pay",
         "feature_2": "Magbayad gamit ang crypto (USDC, USDT, WETH, at iba pa)",
-        "feature_3": "1% USDC na cashback sa bawat pagbili"
+        "feature_3": "Ibabalik na 1% mUSD sa bawat pagbili"
       },
       "metal_card": {
         "name": "Metal Card",
         "price": "$199/taon",
         "everything_in_virtual": "Virtual ang lahat, at:",
         "feature_1": "Premium na nakaukit na metal card",
-        "feature_2": "3% cashback sa unang $10,000 kada taon",
+        "feature_2": "Ibabalik na 3% mUSD sa unang $10,000/taon",
         "feature_3": "Walang bayad sa transaksyon ang tagaibang bansa"
       },
-      "earn_up_to_badge": "Kumita ng hanggang $300 sa cashback taun-taon",
+      "earn_up_to_badge": "Makakuha ng ibabalik na hanggang $300 na mUSD taon-taon",
       "upgrade_to_metal_label": "O mag-upgrade sa Metal para sa 3x na mga reward"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "NA-ORDER NA\nANG CARD MO",
       "subtitle": "Darating ito sa loob ng 4 hanggang 6 na linggo.",
-      "description": "I-set up ang virtual card mo at idagdag ito sa iyong digital wallet para simulang kumita ng cashback.",
+      "description": "I-set up ang virtual card mo at idagdag ito sa iyong digital wallet para magsimulang makakuha ng ibabalik na mUSD.",
       "set_up_card_button": "I-set up ang card",
       "back_to_card_button": "Bumalik sa Card"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "Gumastos \nat Kumita",
-      "description": "Ang MetaMask Card ang mabilis at\nmadaling paraan para gastusin ang crypto mo at\nkumita ng 3% na cashback.",
+      "description": "Ang MetaMask Card ang mabilis at\nmadaling paraan para gastusin ang crypto mo at\nmakakuha ng ibabalik na hanggang 3% mUSD.",
       "apply_now_button": "I-set up ngayon",
       "login_button": "Mag-log in",
       "not_now_button": "Hindi sa ngayon",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "Paganahin ang card",
       "enable_assets_button_label": "I-enable ang mga asset",
       "spending_limit_warning": "Malapit mo nang maabot ang limit ng paggastos. Mag-update para maiwasan ang hindi pagtanggap.",
+      "spending_limit_available": "available",
       "logout": "Mag-log out",
       "contact_support": "Kontakin ang suporta",
       "logout_confirmation_title": "I-log out ang Card?",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "Mga tuntunin at kundisyon",
         "order_metal_card": "Metal Card",
         "order_metal_card_description": "I-order ngayon ang pisikal na Metal Card mo",
-        "cashback": "Cashback",
-        "cashback_description": "Makakuha 1% na balik sa lahat ng nagastos mo",
-        "cashback_description_metal": "Makakuha 3% na balik sa lahat ng nagastos mo",
+        "cashback": "Ibabalik na mUSD",
+        "cashback_description": "Makakuha ng ibabalik na 1% mUSD sa lahat ng nagastos mo",
+        "cashback_description_metal": "Makakuha ng ibabalik na 3% mUSD sa lahat ng nagastos mo",
         "freeze_card": "I-freeze ang card",
         "unfreeze_card": "I-unfreeze ang card",
         "freeze_card_description": "Ihinto ang lahat ng paggastos sa iyong card",
@@ -7917,8 +8110,8 @@
       "token_label": "Token"
     },
     "cashback_screen": {
-      "title": "Cashback",
-      "available_cashback": "Available na cashback",
+      "title": "cashback na mUSD",
+      "available_cashback": "Available na mUSD",
       "network_fee": "Bayad sa network",
       "expected_to_receive": "Inaasahang matanggap",
       "withdraw": "Mag-withdraw",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "Nasimulan na ang pag-withdraw",
       "withdrawal_success": "Matagumpay na nakumpleto ang pag-withdraw",
       "withdrawal_failed": "Pumalya ang pag-withdraw. Subukan ulit mamaya.",
-      "no_cashback": "Walang cashback na available",
-      "loading_error": "Hindi nakapag-load ng cashback. Subukan ulit."
+      "no_cashback": "Walang ibabalik na mUSD na available",
+      "loading_error": "Hindi nakapag-load ng ibabalik na mUSD. Subukan ulit.",
+      "funding_required": {
+        "title": "I-set up ang pagpopondo ng Linea",
+        "description": "Kailangan mo ng kahit man lang isang naaprubahang pagmumulan ng pondo sa Linea bago kumuha ng ibabalik na mUSD.",
+        "confirm_button_label": "I-set up ang pagpopondo"
+      }
     },
     "change_asset": {
       "title": "Palitan ang token at network",
@@ -8032,7 +8230,8 @@
     "title": "Pumili ng paraan ng pagbabayad",
     "title_receive": "Piliin ang tatanggaping token",
     "no_gas": "Walang native na balanse para sa gas",
-    "not_supported": "Hindi suportado"
+    "not_supported": "Hindi suportado",
+    "crypto": "Crypto"
   },
   "connection_removed_modal": {
     "title": "Naalis na ang mga koneksyon",
@@ -8048,6 +8247,15 @@
       "title": "Nabigong mag-opt-in",
       "description": "Suriin ang iyong koneksyon at subukang muli."
     },
+    "notifications_nudge": {
+      "title": "Huwag palampasin",
+      "description": "Paganahin ang mga notipikasyon para manatiling may alam tungkol sa mga campaign.",
+      "turn_on_button": "I-on",
+      "loading": "Pinapagana ang mga notipikasyon...",
+      "loading_description": "Posibleng magtagal ito nang ilang sandali.",
+      "enable_error": "Hindi napagana ang mga notipikasyon",
+      "success": "Napagana ang mga notipikasyon"
+    },
     "version_guard": {
       "title": "Kinakailangan ng update",
       "description": "Kinakailangan ang mas bagong bersyon ng MetaMask para magamit ang mga Reward. Paki-update para makapagpatuloy.",
@@ -8126,6 +8334,17 @@
       "retry_button": "Subukang muli"
     },
     "main_title": "Mga Reward",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "Mga Referral",
     "referral_stats_earned_from_referrals": "Nakuha mula sa mga referral",
     "referral_stats_referrals": "Mga Referral",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "Mga active boost",
     "season_1": "Season 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "bonus calculator ng mUSD",
-      "description": "Tingnan kung magkano ang maaari mong kitain sa pamamagitan ng pag-convert sa mga stablecoin mo sa mUSD.",
-      "amount_label": "Halagang na-convert",
-      "estimated_bonus": "Tinatayang taunang bonus: hanggang 3%",
-      "initial_amount": "Paunang halaga",
-      "daily_bonus": "Maki-claim na bonus araw-araw",
-      "annualized_bonus": "Taunang bonus",
-      "disclaimer": "Pagtataya lamang ito. Maaaring magbago ang bonus.",
-      "disclaimer_brief": "Ang bonus ay tinantya lamang at maaaring magbago.",
+      "page_title": "mUSD calculator",
+      "hero_hold": "Mag-hold ng mUSD.",
+      "hero_earn": "Kumita",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/taon",
+      "earnings_per_month_suffix": "/buwan",
+      "earnings_per_day_suffix": "/araw ang maki-claim araw-araw",
+      "slider_amount_label": "Halaga",
+      "disclaimer_calculator": "Nakabatay ang pagtatantiya sa 3% bonus. Posibleng magbago ang rate. Puwedeng ma-claim anumang oras.",
       "buy_button": "Bumili ng mUSD",
       "swap_button": "I-swap sa mUSD"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "Matatapos sa {{date}}",
       "ended_date": "Natapos {{date}}",
       "pill_up_next": "Paparating na",
+      "up_next": "Susunod",
+      "notify_me": "Abisuhan ako",
       "pill_active": "Live",
       "pill_complete": "Kumpleto na",
       "enter": "Ilagay",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "Hindi available sa rehiyon mo",
       "geo_locked_toast_description": "Hindi available ang campaign na ito sa lugar kung nasaan ka. Bumalik sa ibang pagkakataon para sa mga bagong campaign.",
       "geo_locked_cta": "Alamin kung kwalipikado",
-      "geo_loading": "Sinusuri ang rehiyon..."
+      "geo_loading": "Sinusuri ang rehiyon...",
+      "remind_me_success_toast": "Ipapaalam namin sa iyo kung kailan magsisimula ang campaign na ito.",
+      "remind_me_save_error": "Hindi ma-save ang paalala mo. Subukan ulit."
     },
     "campaign_mechanics": {
       "title": "Mechanics"
@@ -8479,10 +8701,10 @@
       "qualified_description": "Pataasin ang mga net inflow mo para maabot ang mas mataas na tier at magkaroon ng tsansa sa mas mataas na payout.",
       "not_eligible_title": "Hindi kwalipikado",
       "not_eligible_description": "Hindi mabibilang sa rank o tier mo ang mga trade na binuksan nang huli para matugunan ang {{days}}-araw na kinakailangan sa pag-hold.",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "Kabuuang bilang ng mga kalahok",
+      "completed_label_total_tvl": "Kabuuang TVL",
+      "completed_label_top_return": "Nangungunang return",
+      "completed_label_winners": "Mga nanalo"
     },
     "ondo_campaign_activity": {
       "title": "Lahat ng aktibidad",
@@ -8508,6 +8730,48 @@
       "cancel": "Kanselahin",
       "confirm": "Nauunawaan ko"
     },
+    "perps_trading_campaign": {
+      "title": "Kumpetisyon sa Pag-trade ng Perps",
+      "stats_title": "Estadistika",
+      "performance_title": "Performance",
+      "label_rank": "Rank",
+      "label_your_rank": "Rank mo",
+      "label_pnl": "PnL",
+      "label_volume": "Volume",
+      "label_notional_volume": "Notional na dami",
+      "pending": "Nakabinbin",
+      "qualified": "Kwalipikado",
+      "open_position_cta": "Bukas na Posisyon",
+      "leaderboard_title": "Leaderboard",
+      "leaderboard_total_participants": "{{count}} (na) kalahok",
+      "last_updated": "Huling na-update: {{time}}",
+      "leaderboard_error_loading": "Hindi nai-load ang leaderboard",
+      "leaderboard_error_loading_description": "Nagkaproblema habang nilo-load ang leaderboard. Pakisubukan muli.",
+      "leaderboard_not_yet_computed": "Hindi pa na-compute ang leaderboard. Bumalik na lang agad.",
+      "leaderboard_powered_by_prefix": "Pinapagana ng ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "Pool ng premyo",
+      "prize_pool_current_label": "Kasalukuyan",
+      "prize_pool_next_label": "Susunod",
+      "prize_pool_volume_subtext": "{{current}} sa {{target}} dami",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}}+ dami — naabot ang lahat ng milestone",
+      "prize_pool_max_badge": "Pinakamataas",
+      "prize_pool_error_title": "Hindi nai-load ang pool ng premyo",
+      "prize_pool_error_description": "Nagkaroon ng error sa pag-load ng pool ng premyo. Subukan ulit.",
+      "prize_pool_retry_button": "Subukang muli",
+      "stats_notional_volume_threshold": "${{amount}} ang kinakailangan",
+      "stats_qualified_title": "Kwalipikado ka",
+      "stats_qualified_description": "Patuloy na mag-trade para mas mapaganda ang PnL mo at makaakyat ka sa leaderboard bago matapos ang kumpetisyon.",
+      "stats_qualify_for_rank_title": "Maging kwalipikado para sa rank na ito",
+      "stats_qualify_for_rank_description": "Mag-trade ng {{notionalRemaining}} pang notional na dami para maging kwalipikado.",
+      "stats_error_title": "Hindi nai-load ang mga stat",
+      "stats_error_description": "Nagkaproblema kami sa pag-load ng mga stat mo. Subukan ulit.",
+      "stats_retry": "Subukang muli",
+      "completed_label_total_participants": "Kabuuang bilang ng mga kalahok",
+      "completed_label_total_volume": "Kabuuang dami",
+      "completed_label_top_pnl": "Nangungunang PnL",
+      "completed_label_winners": "Mga nanalo"
+    },
     "campaigns_preview": {
       "title": "Mga campaign",
       "coming_soon": "Paparating na",
@@ -8532,29 +8796,29 @@
       "retry_button": "Subukang muli",
       "refreshing": "Nire-refresh..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "Nanalo ka",
       "rank_label": "{{place}} lugar",
-      "email_instructions": "I-email sa ondocampaign@consensys.net ang code mo para kunin ang premyo mo.",
+      "email_instructions": "I-email sa {{email}} ang code mo para kunin ang premyo mo.",
       "open_mail": "Buksan ang mail",
       "skip_for_now": "Laktawan muna",
-      "mail_subject": "Pagkuha ng premyo ng campaign ng Ondo",
+      "mail_subject": "Pagkuha ng premyo sa {{campaignName}}",
       "mail_body": "Ang nanalong code: {{code}}",
       "winning_code": "Nanalong code",
       "close_a11y": "Isara"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "Nanalo ka",
-        "description": "Kunin ang premyo mo ngayon.",
-        "a11y": "Ipakita ang mga detalye ng nanalo"
+        "title": "Nanalo ka!",
+        "description": "Beripikahin ang nanalong code mo at kunin ang premyo mo ngayong araw.",
+        "a11y": "Tingnan ang mga detalye"
       },
       "participant_pending": {
         "title": "Tapos na ang campaign.",
         "description": "Inaalam na namin ang resulta. Bumalik sa lalong madaling panahon."
       },
       "participant_finalized": {
-        "title": "Lumabas na ang resulta ng campaign",
+        "title": "Lumabas na ang resulta ng campaign.",
         "description": "Hindi ka nanalo sa pagkakataong ito. Tingnan ang leaderboard para malaman kung ano ang rank mo."
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "Parating na ang reward mo — makikipag-ugnayan kami sa iyo sa lalong madaling panahon."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "Nanalo ka 💰",
-        "description": "Kunin ang premyo mo mula sa {{campaignName}}",
+        "description": "Kunin ang premyo mo mula sa {{campaignName}} ngayong araw.",
         "cta": "Tingnan ang mga detalye"
       },
-      "participant_no_winner": {
-        "title": "Lumabas na ang resulta. 🏅",
-        "description": "Tingnan ang ranking mo sa {{campaignName}}",
+      "non_winner": {
+        "title": "Lumabas na ang resulta 🏅",
+        "description": "Tingnan ang ranking mo sa {{campaignName}}.",
         "cta": "Tingnan"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "Na-claim na mga panalo",
       "predict_deposit": "Pinondohang Hinulaang account",
       "predict_withdraw": "Pag-withdraw",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "Ideposito sa Money Account",
+      "money_account_withdraw": "Maglipat mula sa Money Account",
       "default": "Mga detalye ng transaksyon"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "Tuklasin",
-    "trending_tokens": "Trending",
+    "crypto_movers": "Mga crypto mover",
+    "perps_movers": "Mga Perps mover",
+    "trending_tokens": "Nagte-trend",
+    "crypto": "Crypto",
     "stocks": "Stocks",
     "price_change": "Pagbabago ng presyo",
     "all_networks": "Lahat ng network",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 oras",
     "5_minutes": "5 minuto",
     "networks": "Mga Network",
+    "ecosystems": "Mga ecosystem",
+    "ecosystems_subtitle": "Tuklasin ang mga dApp, token, at NFT sa lahat ng chain sa MetaMask Portfolio",
+    "all_sports": "Mga sikat na sport",
+    "basketball": "Basketball",
+    "football": "Football",
+    "soccer": "Soccer",
+    "tennis": "Tennis",
+    "f1": "F1",
+    "golf": "Golf",
+    "all_sports_no_markets": "Wala pang bukas na merkado sa kategoryang ito. Bumalik na lang agadd o pumili ng ibang sport sa itaas.",
+    "load_more": "Mag-load pa",
     "sort_by": "I-sort ayon sa",
     "volume": "Volume",
     "market_cap": "Market cap",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "Maghanap ng mga token, site, URL",
     "cancel": "Kanselahin",
     "perps": "Perps",
+    "rwa_perps_section": "Perps",
+    "macro_stocks_commodity_perps": "Perps",
+    "macro_pill_stocks": "Stocks",
+    "macro_pill_commodities": "Mga Commodity",
+    "rwa_pill_commodities": "Mga Commodity",
+    "rwa_pill_stocks": "Stocks",
+    "rwa_pill_forex": "Forex",
+    "crypto_perps_section": "Perps",
     "predictions": "Mga hula",
     "no_results": "Walang nahanap na mga resulta",
+    "popular": "Sikat",
     "sites": "Mga Site",
     "popular_sites": "Mga sikat na site",
     "search_sites": "Maghanap ng mga site",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "Walang nakitang token",
       "description": "Hindi namin nahanap ang token na ito"
+    },
+    "tabs": {
+      "now": "Ngayon",
+      "macro": "Makro",
+      "rwas": "Mga RWA",
+      "crypto": "Crypto",
+      "sports": "Palakasan",
+      "dapps": "Mga Site"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "Kanselahin",
-      "continue": "Magpatuloy"
+      "continue": "Magpatuloy",
+      "learn_more": "Matuto pa",
+      "try_again": "Subukang muli"
     },
     "connecting": {
       "title": "Ikinokonekta ang iyong {{device}}...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "I-on ang Bluetooth para kumonekta sa device mo",
       "bluetooth_scan_failed": "Hindi nakapag-scan ng mga device. Subukan ulit",
       "bluetooth_connection_failed": "Pumalya ang koneksyon sa iyong device. Pakisubukan muli",
+      "camera_permission_denied": "Kinakailangan ang pahintulot sa camera para mag-scan ng mga QR code. Paganahin ito sa mga setting ng device mo.",
       "not_supported": "Hindi sinusuportahan ang operasyong ito",
       "unknown_error": "Siguraduhing may naka-set up na Lihim na Parirala sa Pagbawi o passphrase ang {{device}} mo para sa account na ito"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "Kinakailangan ang Pahintulot sa Lokasyon",
       "nearby_devices_permission_denied": "Kinakailangan ang Pahintulot sa Mga Device sa Paligid",
       "scan_failed": "Pumalya ang Pag-scan",
+      "camera_permission_denied": "Kinakailangan ang Pahintulot sa Camera",
       "something_went_wrong": "Mayroong nang mali"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "I-scan ang pag-sync ng QR code sa wallet",
+          "body": "Bumalik sa wallet na hardware mo at hanapin ang opsyon na ibahagi o i-export ang mga account mo, piliin ang MetaMask, at pagkatapos, i-scan ang QR code."
+        },
+        "sign": {
+          "title": "I-scan ang QR code ng lagda",
+          "body": "Bumalik sa wallet na hardware mo at aprubahan ang transaksyon, saka i-scan ang QR code na ipapakita nito."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "Maling QR code",
+          "body": "Bumalik sa wallet na hardware mo, piliin ang MetaMask sa uri ng wallet, at bumuo at mag-scan ng bagong QR code."
+        },
+        "sign": {
+          "title": "Maling QR code",
+          "body": "Bumalik sa wallet na hardware mo at aprubahan ang transaksyon, saka i-scan ang QR code na ipapakita nito."
+        }
+      },
+      "ur_decode_error": {
+        "title": "Hindi mabasa ang QR code",
+        "body": "Siguraduhing nakikita nang buo at may sapat na liwanag ang QR code at subukan ulit. Kung may isyu pa rin, baka kailanganin mong i-update ang firmware ng wallet na hardware mo."
+      }
+    },
     "device_selection": {
       "title": "Piliin ang {{device}}",
       "scanning": "Nagsa-scan ng mga device...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Pera",
-      "cash_empty_description": "Wala ka pang kahit anong mUSD. I-convert ang mga stablecoin papuntang mUSD mula sa seksyon ng Pera sa homepage.",
-      "cash_empty_description_network_filter": "Walang mUSD sa network na ito. Lumipat ng network para makita ang mUSD mo.",
+      "money": "Pera",
+      "money_empty_description": "Wala ka pang kahit anong mUSD. I-convert ang mga stablecoin papuntang mUSD mula sa seksyon ng Pera sa homepage.",
+      "money_empty_description_network_filter": "Walang mUSD sa network na ito. Lumipat ng network para makita ang mUSD mo.",
+      "money_empty_state": {
+        "get_started": "Magsimula",
+        "earn_apy": "Kumita ng {{percentage}}% APY"
+      },
+      "money_filled_state": {
+        "add": "Idagdag",
+        "apy": "{{percentage}}% APY"
+      },
       "tokens": "Mga Token",
+      "perps": "Perps",
+      "related_assets": "Mga Nauugnay na Asset",
       "perpetuals": "Perpetuals",
       "predictions": "Mga hula",
       "whats_happening": "Ano ang nangyayari",
+      "whats_happening_ai": "AI",
+      "whats_happening_impact": {
+        "bullish": "Bullish",
+        "bearish": "Bearish",
+        "neutral": "Neutral"
+      },
       "top_traders": "Mga Nangungunang Trader",
       "whats_happening_categories": {
         "geopolitical": "Heopolitikal",
@@ -8819,7 +9160,7 @@
       },
       "defi": "DeFi",
       "nfts": "Mga NFT",
-      "trending_tokens": "Trending",
+      "trending_tokens": "Nagte-trend",
       "trending_perpetuals": "Mga trending na perpetual",
       "trending_predictions": "Mga trending na prediksyon",
       "import_nfts": "Mag-import ng mga NFT",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "Hindi nai-load ang {{section}}",
       "retry": "Subukang muli"
     }
+  },
+  "sites": {
+    "popular": "Sikat"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/tr.json b/locales/languages/tr.json
index 8d54e190e85..1c7e7798e4c 100644
--- a/locales/languages/tr.json
+++ b/locales/languages/tr.json
@@ -390,7 +390,7 @@
       "content1": "Bu simgeye dokunarak Etherscan üzerinde hesap adınızı düzenleyin, işlemleri görüntüleyin, genel anahtarınızı paylaşın ve özel anahtarınızı görün"
     },
     "step4": {
-      "title": "Cüzdanınızın kullanımı",
+      "title": "Bildirimler",
       "content1": "Bu simgeye dokunarak varlık satın alın, gönderin, swap işlemi gerçekleştirin ve varlık alın"
     },
     "step5": {
@@ -630,18 +630,19 @@
   "bottom_nav": {
     "home": "Ana Sayfa",
     "browser": "Tarayıcı",
-    "activity": "Aktivite",
+    "activity": "İşlemler",
     "trade": "İşlem Yap",
     "settings": "Ayarlar",
     "rewards": "Ödüller",
-    "trending": "Keşfet"
+    "trending": "Keşfet",
+    "money": "Para"
   },
   "drawer": {
     "send_button": "Gönder",
     "receive_button": "Para ekle",
     "coming_soon": "Çok yakında...",
     "wallet": "Cüzdan",
-    "transaction_activity": "Faaliyet",
+    "transaction_activity": "İşlemler",
     "request_feature": "Bir Özellik Talep Et",
     "submit_feedback_message": "Gönderilecek geri bildirim türünü seçin.",
     "submit_bug": "Hata raporu",
@@ -708,7 +709,11 @@
     "smart_contract_address": "Akıllı sözleşme adresi",
     "smart_contract_address_warning": "Alıcı adresi doğrudan token transferlerini desteklemiyor olabilir ve bu durum para kaybına neden olabilir. Yalnızca transferinizin bu sözleşmeye ulaşabileceğinden eminseniz devam edin.",
     "i_understand": "Anlıyorum",
-    "cancel": "İptal"
+    "cancel": "İptal",
+    "new_address_title": "Yeni adres",
+    "new_address_message": "Bu adrese ilk kez gönderim yapıyorsunuz. Devam etmeden önce doğru olduğundan emin olun:",
+    "alert_navigation_previous": "Önceki uyarı",
+    "alert_navigation_next": "Sonraki uyarı"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "En iyi yatırımcılar",
       "allow_push_notifications": "Anlık bildirimlere izin ver",
       "trades_over_label": "Şunun üzerindeki işlemlerde bildirim al:",
       "traders_you_follow": "Takip ettiğiniz yatırımcılar",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "Takip ettiğiniz yatırımcılar yüklenemiyor."
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "{{traderName}} adlı yatırımcıdan bildirimler",
       "allow_push_notifications": "Anlık bildirimlere izin ver",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "{{traderName}} adlı yatırımcının işlem hareketleri hakkında bildirim al",
+      "manage_traders": "Takip ettiğin yatırımcıları yönet",
       "save": "Kaydet"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "Takip ettiğin yatırımcıların işlemleri hakkında gerçek zamanlı uyarılar al",
       "allow_push_notifications": "Anlık bildirimlere izin ver",
       "trades_over_label": "Şunun üzerindeki işlemlerde bildirim al:",
       "save": "Kaydet",
@@ -1059,7 +1064,12 @@
       "closed": "Kapatıldı",
       "no_positions": "Henüz pozisyon yok",
       "error_loading_profile": "Profil yüklenemedi",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "X (Twitter) üzerinde görüntüle",
+      "sort": {
+        "value": "Değer",
+        "pnl_percent": "K&Z %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "Piyasa değeri",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} sattı",
       "no_trades": "Bu aralık için yatırımcı yok",
       "closed_position": "Kapalı pozisyon",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "Pozisyon mevcut değil",
+      "fallback_subtitle": "Şu anda bu pozisyonu yükleyemedik.",
+      "fallback_back_to_profile": "Profile geri dön",
+      "fallback_back_to_leaderboard": "Liderlik tablosuna geri dön"
     },
     "quick_buy": {
       "title": "{{symbol}} satın al",
@@ -1102,7 +1112,7 @@
     "margin_used": "Kullanılan marj",
     "gtm_content": {
       "title": "SÜREKLİ VADELİ İŞLEM SÖZLEŞMELERİ BURADA",
-      "title_description": "40 kata kadar kaldıraçla uzun veya kısa pozisyon. Hesabınızı tek tıkta fonlayın.",
+      "title_description": "40 kata kadar kaldıraçla uzun veya kısa pozisyon. Tek tıkla hesabınızı fonlayın.",
       "not_now": "Şimdi değil",
       "try_now": "Başlarken"
     },
@@ -1133,7 +1143,7 @@
       "edit_button": "Düzenle"
     },
     "stop_loss_prompt": {
-      "near_liquidation_title": "Likidasyona yalnızca %{{distance}} uzaktasınız",
+      "near_liquidation_title": "Likidasyona yalnızca %%{distance} uzaktasınız",
       "near_liquidation_subtitle": "Pozisyonunuzun riskini azaltmak için marj ekleyin",
       "add_margin_button": "Ekle",
       "protect_losses_title": "Daha fazla zarara karşı korunun",
@@ -1385,7 +1395,7 @@
         "current_price": "Mevcut fiyat",
         "liquidation_price": "Likidasyon fiyatı",
         "liquidation_distance": "Likidasyon mesafesi",
-        "liquidation_warning": "Fiyat %{{percentage}} {{direction}} yaşarsa pozisyonunuz likidasyona uğrar",
+        "liquidation_warning": "Fiyat {{percentage}}% {{direction}} yaşarsa pozisyonunuz likidasyona uğrar",
         "drops": "düşüş",
         "rises": "yükseliş",
         "set_leverage": "{{leverage}} kaldıraç ayarla"
@@ -1815,7 +1825,7 @@
         "provider_fee": "Sağlayıcı ücreti",
         "bridge_fee": "Köprü ücreti",
         "total": "Toplam ücretler",
-        "discount_message": "MetaMask Ödülleri ile %{{percentage}} tasarruf ediyorsunuz."
+        "discount_message": "MetaMask Ödülleri ile %%{percentage} tasarruf ediyorsunuz."
       },
       "closing_fees": {
         "title": "Kapatma ücretleri",
@@ -1836,7 +1846,7 @@
       },
       "funding_rate": {
         "title": "Fonlama oranı",
-        "content": "Fiyatları piyasa ile uyumlu tutmak için yatırımcılar arasında saatlik bir işlem ücreti ödenir. Oran pozitifse uzunlar kısalara ödeme yapar. Negatifse kısalar uzunlara ödeme yapar."
+        "content": "Fiyatları piyasa ile uyumlu tutmak için yatırımcılar arasında saatlik bir işlem ücreti ödenir. Oran pozitifse uzun pozisyonlar kısa pozisyonlara ödeme yapar. Negatifse kısa poziasyonlar uzun pozisyonlara ödeme yapar."
       },
       "oracle_price": {
         "title": "Oracle fiyatı",
@@ -1941,7 +1951,7 @@
       "close_all": "Tümünü kapat",
       "cancel_all": "Tümünü iptal et",
       "no_markets": "Piyasa yok",
-      "recent_activity": "Aktivite",
+      "recent_activity": "İşlemler",
       "loading": "Yükleniyor...",
       "no_activity": "Son aktivite yok",
       "see_all": "Tümünü gör",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "MetaMask Tahminler",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "Tahmin piyasaları",
     "market_list": "Piyasa listesi",
     "loading": "Yükleniyor...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "Ödeme Yöntemini Değiştir",
+      "add_funds": "Fon Ekle",
+      "add": "Ekle",
+      "predict_balance": "Tahmin bakiyesi"
+    },
     "order": {
       "available": "Kullanılabilir",
       "cashed_out": "Nakit çıkışı yapıldı",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "Piyasa hızlı hareket ediyor, bu nedenle {{price}} fiyatından alış gerçekleştiremedik. En iyi mevcut fiyatta tekrar denemek ister misiniz?",
       "market_busy_body_sell": "Piyasa hızlı hareket ediyor, bu nedenle {{price}} fiyatından satış gerçekleştiremedik. En iyi mevcut fiyatta tekrar denemek ister misiniz?",
       "order_failed_title": "Emir başarısız oldu",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "Emriniz gerçekleştirilemedi. Tekrar denensin mi?",
+      "price_changed_title": "Fiyat değişti",
+      "price_changed_body": "{{price}} fiyatından satın alınamadı. Piyasa fiyatından denensin mi?",
       "retry": "Tekrar Dene",
       "try_again": "Tekrar dene",
       "view": "Görüntüle",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "Çekme işlemi tamamlandı",
       "withdraw_completed_subtitle": "{{amount}} USDC cüzdanınıza aktarıldı",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}} cüzdanınıza taşındı",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "Anladım",
       "error_title": "Bir şeyler ters gitti",
       "error_description": "Çekme işlemine ilerlenemedi",
       "try_again": "Tekrar dene"
@@ -2508,7 +2559,7 @@
       "slippage": "Kayma",
       "price_details": "Fiyat bilgileri",
       "prediction_order": "Tahmin emri",
-      "prediction_order_description": "Her biri {{price}} fiyatta ~{{count}} sözleşme. Son tutar, emir defteri kullanılabilirliğe göre değişiklik gösterebilir (%{{slippage}} orana kadar).",
+      "prediction_order_description": "Her biri {{price}} fiyatta ~{{count}} sözleşme. Son tutar, emir defteri kullanılabilirliğe göre değişiklik gösterebilir (%%{slippage} orana kadar).",
       "metamask_fee_description": "Bu tahmin işlemine yönelik hizmet ücreti",
       "exchange_fee": "Borsa ücreti",
       "exchange_fee_description": "Borsaya veya piyasaya ödenen ücret",
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "Devam etmek için {{tokenSymbol}} gerekli",
     "fund_your_wallet": "Cüzdanınıza para ekleyin",
     "get_ready_for_web3": "Cüzdanınızı web3 kullanmaya hazır hale getirin",
+    "home_onboarding_steps": {
+      "header": "Adımlar",
+      "get_started_title": "MetaMask'e başlarken",
+      "fund_title": "Cüzdanınıza para ekleyin",
+      "fund_subtitle": "Boş bir cüzdanı kimse sevmez. İşlem yapmaya başlamak için kolayca para ekleyin.",
+      "fund_primary": "Fon ekle",
+      "trade_title": "İlk işleminizi yapın",
+      "trade_subtitle": "Portföyünüzü büyütmek için birden fazla ağ genelinde trend tokenlar ile işlem yapın.",
+      "trade_primary": "İşlem Yap",
+      "notifications_title": "Bildirimleri aç",
+      "notifications_subtitle": "Portföyünüzde en iyi hamleleri yapmak için piyasadaki değişimler hakkında güncel kalın.",
+      "notifications_primary": "Aç",
+      "skip": "Atla",
+      "progress_a11y": "Adım {{current}}/{{total}}",
+      "balance_loading_a11y": "Cüzdan bakiyesi yükleniyor"
+    },
     "add_funds": "Fon ekle",
     "next": "Sonraki",
     "buy_asset": "{{asset}} satın alın",
@@ -3099,7 +3166,7 @@
     "settings": "Ayarlar",
     "networks": "Ağlar",
     "log_out": "Oturumu kapat",
-    "notifications": "Cüzdanınızın kullanımı",
+    "notifications": "Bildirimler",
     "buy": "Al",
     "scan": "Tara"
   },
@@ -3180,7 +3247,7 @@
     "show_fiat_on_testnets_modal_description": "Sizden bu özelliği açmanız istenirse dolandırılıyor olabilirsiniz. Bu tokenlerin hiçbir parasal değeri yoktur ve sadece test amaçlıdır. Bu özellik, geliştiricilerin uygulamalarının çalıştığından emin olmalarına yardımcı olur.",
     "show_fiat_on_testnets_modal_learn_more": "Daha fazla bilgi edin",
     "show_fiat_on_testnets_modal_button": "Devam et",
-    "show_hex_data": "On altılı verileri göster",
+    "show_hex_data": "Hex veriyi göster",
     "show_hex_data_desc": "Gönderim ekranında on altılı veri alanını göstermek için bunu seçin.",
     "accounts_identicon_title": "Hesap simgesi",
     "accounts_identicon_desc": "Hesapları hemen tanımlamanıza yardımcı olabilen üç farklı eşsiz simge stili arasından seçiminizi yapın.",
@@ -3190,7 +3257,7 @@
     "general_desc": "Para birimi dönüştürme, birincil para birimi, dil ve arama motoru.",
     "advanced_title": "Gelişmiş",
     "advanced_desc": "Geliştirici özelliklerine erişin, hesabı sıfırlayın, test ağlarını, durum günlüklerini ve özel RPC'yi kurun.",
-    "notifications_title": "Cüzdanınızın kullanımı",
+    "notifications_title": "Bildirimler",
     "notifications_desc": "Bildirimlerinizi yönetin",
     "allow_notifications": "Bildirimlere izin ver",
     "enable_push_notifications": "Anlık bildirimleri etkinleştir",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "Geçersiz sayı. 1 ile %{maxSafeChainId} arasında bir sayı girin.",
     "hide_zero_balance_tokens_title": "Bakiyesi olmayan tokenları gizle",
     "hide_zero_balance_tokens_desc": "Bakiyesi olmayan tokenlerin token listenizde gösterilmesini önler.",
+    "haptic_feedback_title": "Dokunsal geri bildirim",
+    "haptic_feedback_desc": "Onaylar, hatalar ve etkileşimler için hafif titreşim hissedin. Dokunsal uyarıları azaltmak için devre dışı bırakın.",
     "token_detection_title": "Token'leri otomatik algıla",
     "token_detection_description": "Cüzdanınıza gönderilen yeni tokenleri algılamak ve göstermek için üçüncü taraf API'leri kullanırız. Bu hizmetlerden veri çekmek istemiyorsanız kapatın.",
     "theme_button_text": "Temayı değiştir",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "En güvenilir",
         "quote_unknown_provider": "Bilinmeyen sağlayıcı",
         "start_headless_buy": "Arayüzsüz satın almayı başlat",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "Değiştirin ve arayüzsüz satın almayı başlatın",
         "start_headless_buy_disabled_hint": "Etkinleştirmek için geçerli bir tutar girin",
         "start_headless_buy_pending": "Arayüzsüz oturum aktif - BuildQuote'u aç",
         "cancel_headless_buy": "Arayüzsüz oturumu iptal et",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "Aktif oturum: {{sessionId}} — başka bir fiyat teklifi başlatıldığında iptal edilir.",
         "event_log_title": "Olay günlüğü",
         "event_log_empty": "Henüz olay yok — arayüzsüz oturum başlatın ve bu alanı izleyin.",
         "event_log_started": "{{sessionId}} oturumu başlatıldı (varlık={{assetId}}, tutar={{amount}}, ödeme={{paymentMethodId}}{{providerSuffix}})",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "tüketici tarafından iptal edilen oturum {{sessionId}}"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "Arayüzsüz satın alma",
+        "loading": "Satın alma akışı hazırlanıyor…",
+        "no_session": "Arayüzsüz oturum artık aktif değil.",
+        "cancel": "İptal et"
       }
     },
     "request_feature": "Bir özellik talep et",
@@ -3553,7 +3622,7 @@
     "security_alerts": "Güvenlik uyarıları",
     "security_alerts_desc": "Bu özellik, işlem ve imza taleplerinizi yerel olarak incelerken gizliliğinizi koruyarak Ethereum Ana Ağındaki kötü amaçlı aktivitelere karşı sizi uyarır. Talepleri onaylamadan önce her zaman gereken özeni kendiniz gösterin. Bu özelliğin tüm kötü amaçlı faaliyetleri algılayacağına dair herhangi bir garanti bulunmamaktadır. Bu özelliği etkinleştirerek sağlayıcının kullanım koşullarını kabul etmiş olursunuz.",
     "smart_account_dapp_requests_heading": "Dapp'lerden akıllı hesap talepleri",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "Dapp'lerin standart hesaplar için akıllı hesap özelliklerini talep etmesine izin verin. MetaMask yalnızca denetlenmiş akıllı hesabımıza yükseltecektir.",
     "smart_transactions_opt_in_heading": "Akıllı İşlemler",
     "smart_transactions_opt_in_desc_supported_networks": "Desteklenen ağlarda daha güvenilir ve güvenli işlemler için Akıllı İşlemleri açın.",
     "smart_transactions_learn_more": "Daha fazla bilgi edin",
@@ -3572,6 +3641,39 @@
         "title": "Kart",
         "reset_onboarding_description": "Kayıt akışını baştan başlatmak için Kart kayıt durumunu sıfırlayın.",
         "reset_onboarding_button": "Kayıt Durumunu Sıfırla"
+      },
+      "haptics": {
+        "title": "Dokunsal bildirimler",
+        "description": "Fiziksel bir cihazda dokunsal geri bildirim önizlemesini alın. Bu işlem, her bir modeli değerlendirebilmeniz için uygulama içi azaltılmış dokunsal bildirim ayarını ve uzaktan durdurma anahtarını devre dışı bırakır.",
+        "catalog_impacts_heading": "Katalog etki anları",
+        "notifications_heading": "Bildirim modelleri",
+        "selection_heading": "Seçim",
+        "notification_success_button": "Bildirim — Başarılı",
+        "notification_error_button": "Bildirim — Hata",
+        "notification_warning_button": "Bildirim — Uyarı",
+        "selection_button": "Seçim",
+        "raw_impacts_heading": "Ham Expo etki stilleri",
+        "raw_impacts_desc": "Yukarıdaki eşleştirilmiş katalog anlarıyla karşılaştırma için doğrudan expo-dokunsal etki stilleri.",
+        "impacts": {
+          "quick_amount_selection": "Etki — Hızlı miktar seçimi",
+          "slider_tick": "Etki — Kaydırıcı tık vuruşu",
+          "edge_gesture_engage": "Etki — Kenar hareketini tetikleme",
+          "page_navigation": "Etki — Sayfada gezinme",
+          "slider_grip": "Etki — Kaydırıcı tutma",
+          "tab_change": "Etki — Sekme değiştirme",
+          "primary_cta": "Etki — Ana Eylem Çağrısı (CTA)",
+          "pull_to_refresh_engage": "Etki — Yenilemek için çek (başlat)",
+          "pull_to_refresh": "Etki — Yenilemek için çek (bırak)",
+          "chart_crosshair": "Etki — Grafik imleci",
+          "follow_toggle": "Etki — Takip açma/kapama düğmesi"
+        },
+        "raw_styles": {
+          "light": "Ham etki — Hafif",
+          "medium": "Ham etki — Orta",
+          "heavy": "Ham etki — Ağır",
+          "rigid": "Ham etki — Sert",
+          "soft": "Ham etki — Yumuşak"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "Tahminler",
     "add_collectible_button": "Ekle",
     "info": "Bilgi",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "Takas Et",
     "convert": "Dönüştür",
     "bridge": "Köprü",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "Sorun Giderme",
     "deposit_description": "Düşük ücretli banka veya kart transferi",
     "buy_description": "Belirli bir token'ı almak için iyi",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "Nakit karşılığında kripto sat",
     "swap_description": "Tokenler arasında swap gerçekleştirin",
     "bridge_description": "Farklı ağlar arasında token transfer et",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "Ücretsiz",
     "tx_details_not_available": "Mevcut değil",
     "smart_contract_interaction": "Akıllı sözleşme etkileşimi",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "Para Hesabına Para Yatır",
+    "money_account_withdraw": "Para Hesabından Para Transfer Et",
     "swaps_transaction": "Swap işlemi",
     "bridge_transaction": "Köprü",
     "approve": "Onayla",
@@ -5693,8 +5798,8 @@
     "included": "dahil",
     "max_gas_fee": "Maks. gaz ücreti",
     "edit": "Düzenle",
-    "quotes_include_fee": "%{{fee}} MetaMask ücreti tekliflere dahildir",
-    "quotes_include_gas_and_metamask_fee": "Gaz ve %{{fee}} MetaMask ücreti teklife dahildir",
+    "quotes_include_fee": "%%{fee} MetaMask ücreti tekliflere dahildir",
+    "quotes_include_gas_and_metamask_fee": "Gaz ve %%{fee} MetaMask ücreti teklife dahildir",
     "tap_to_swap": "Takas işlemi gerçekleştirmek için dokunun",
     "swipe_to_swap": "Swap gerçekleştirmek için kaydır",
     "swipe_to": "Swap gerçekleştirmek için",
@@ -6298,16 +6403,16 @@
   },
   "earn": {
     "claimable_bonus_tooltip": "mUSD tuttuğunuz için kazandığınız yıllıklandırılmış bonus. Bonusunuzu Linea üzerinde günlük olarak alabilirsiniz.",
-    "earn_a_percentage_bonus": "%{{percentage}} bonus kazanın",
-    "percentage_bonus": "%{{percentage}} bonus",
+    "earn_a_percentage_bonus": "%%{percentage} bonus kazanın",
+    "percentage_bonus": "%%{percentage} bonus",
     "claimable_bonus": "Alınabilir bonus",
     "claim_bonus": "Bonusu al",
     "claim_bonus_with_fiat": "{{amount}} al",
     "claim_bonus_subtitle": "Bonus, {{networkName}} üzerinde ödenecektir.",
-    "percentage_bonus_on_linea": "Linea üzerinde %{{percentage}} bonus",
+    "percentage_bonus_on_linea": "Linea üzerinde %%{percentage} bonus",
     "claim": "Al",
     "sounds_good": "Kulağa hoş geliyor",
-    "claimable_bonus_tooltip_with_percentage": "mUSD tuttuğunuz için kazandığınız %{{percentage}} yıllıklandırılmış bonus. Bonusunuzu Linea üzerinde günlük olarak alabilirsiniz.",
+    "claimable_bonus_tooltip_with_percentage": "mUSD tuttuğunuz için kazandığınız %%{percentage} yıllıklandırılmış bonus. Bonusunuzu Linea üzerinde günlük olarak alabilirsiniz.",
     "your_bonus": "Bonusunuz",
     "estimated_annual_bonus": "Tahmini yıllık bonus",
     "lifetime_bonus_claimed": "Toplam bonus alındı",
@@ -6315,7 +6420,7 @@
     "no_accruing_bonus": "Biriken bonus yok",
     "claim_amount_bonus": "{{amount}}$ bonus al",
     "your_bonus_tooltip_your_bonus": "Bonusunuz",
-    "your_bonus_tooltip_your_bonus_desc": ":  Yalnızca mUSD tutarak kazandığınız %{{percentage}} yıllıklandırılmış bonus. Bonusunuzu Linea üzerinde günlük olarak alabilirsiniz. ",
+    "your_bonus_tooltip_your_bonus_desc": ":  Yalnızca mUSD tutarak kazandığınız %%{percentage} yıllıklandırılmış bonus. Bonusunuzu Linea üzerinde günlük olarak alabilirsiniz. ",
     "your_bonus_tooltip_annual_bonus": "Tahmini yıllık bonus: ",
     "your_bonus_tooltip_annual_bonus_desc": "Mevcut bakiyenize ve oranınıza göre bir yıl içinde kazanabileceğiniz tahmini tutar. Oran değişkendir ve farklılık gösterebilir.",
     "your_bonus_tooltip_lifetime_bonus": "Alınan toplam bonus: ",
@@ -6406,14 +6511,14 @@
     "musd_conversion": {
       "ok": "Tamam",
       "continue": "Devam et",
-      "convert_and_get_percentage_bonus": "Dönüştür ve %{{percentage}} al",
+      "convert_and_get_percentage_bonus": "Dönüştür ve %%{percentage} al",
       "your_musd": "mUSD bakiyeniz",
       "balance_breakdown_title": "Ağa göre mUSD bakiyeleriniz",
       "balance_amount": "{{amount}} mUSD",
       "balance_amount_with_symbol": "{{amount}} {{symbol}}",
       "balance_fiat_unavailable": "—",
       "convert_to_musd": "mUSD'ye dönüştür",
-      "get_a_percentage_musd_bonus": "%{{percentage}} mUSD bonus al",
+      "get_a_percentage_musd_bonus": "%%{percentage} mUSD bonus al",
       "convert": "Dönüştür",
       "fetching_quote": "Teklif alınıyor...",
       "you_convert": "Dönüştürdüğünüz tutar",
@@ -6429,16 +6534,23 @@
         "failed": "mUSD dönüştürme işlemi başarısız oldu"
       },
       "education": {
-        "heading": "STABİL KRİPTO PARALARDA\n%{{percentage}} AL",
-        "description": "Stabil kripto paralarınızı mUSD'ye dönüştürün ve günlük olarak alabileceğiniz %{{percentage}} oranına varan yıllıklandırılmış bonus kazanın.",
+        "heading": "STABİL KRİPTO PARALARDA\n{{percentage}}% AL",
+        "description": "Stabil kripto paralarınızı mUSD'ye dönüştürün ve {{percentage}}% oranında yıllıklandırılmış bonus kazanın.",
         "terms_apply": "Şartlar uygulanır.",
         "primary_button": "Başlarken",
-        "secondary_button": "Şimdi değil"
+        "secondary_button": "Şimdi değil",
+        "checklist": {
+          "dollar_backed": "Dolar destekli",
+          "no_lockups": "Kilitleme yok",
+          "daily_bonus": "Günlük bonus",
+          "metamask_stablecoins": "MetaMask stabil kripto paralar",
+          "no_metamask_fee": "MetaMask ücreti yok"
+        }
       },
       "buy_musd": "mUSD al",
       "get_musd": "mUSD kazan",
-      "bonus_title": "Stabil kripto paranızda %{{percentage}} bonus kazanın",
-      "bonus_description": "Stabil kripto paranızı mUSD'ye dönüştürün ve %{{percentage}} oranında yıllıklandırılmış bonus alın.",
+      "bonus_title": "Stabil kripto paranızda %%{percentage} bonus kazanın",
+      "bonus_description": "Stabil kripto paranızı mUSD'ye dönüştürün ve %%{percentage} oranında yıllıklandırılmış bonus alın.",
       "powered_by_relay": "Destekleyen Relay",
       "max": "Maksimum",
       "quick_convert_button": "Dönüştür",
@@ -6446,15 +6558,15 @@
       "tooltip_title": "mUSD ile getiri elde et",
       "tooltip_content": "USDC, USDT veya DAI'nizi MetaMask'in dolar destekli stabil kripto parası olan mUSD'ye dönüştürün. Tuttuğunuz her dolar için {{apy}} getiri elde edin.",
       "quick_convert": {
-        "title": "Dönüştür ve %{{percentage}} al",
-        "subtitle": "Stabil kripto paralarınızı mUSD'ye dönüştürün ve günlük olarak alabileceğiniz %{{percentage}} oranına varan yıllıklandırılmış bonus alın.",
+        "title": "Dönüştür ve %%{percentage} al",
+        "subtitle": "Stabil kripto paralarınızı mUSD'ye dönüştürün ve günlük olarak alabileceğiniz %%{percentage} oranına varan yıllıklandırılmış bonus alın.",
         "inline_failed_message": "Dönüştürme işlemi başarısız oldu. Tekrar deneyin.",
         "confirmation": {
           "title": "Maksimumu dönüştür"
         }
       },
-      "percentage_bonus": "%{{percentage}} bonus",
-      "claim_percentage_bonus": "%{{percentage}} bonus al",
+      "percentage_bonus": "%%{percentage} bonus",
+      "claim_percentage_bonus": "%%{percentage} bonus al",
       "rate": "Oran"
     },
     "bonus_claim": {
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Para",
-    "apy_label": "%{{percentage}} Yıllık Bileşik Getiri",
+    "your_balance": "Bakiyeniz",
+    "apy_label": "{{percentage}}% Yıllık Bileşik Getiri",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "Yıllık Yüzde Getiri (APY) bilgisi",
     "onboarding": {
       "step_progress": "Adım {{current}}/{{total}}",
       "title": "Para ekle",
-      "description": "Bugün mUSD alın ve APY kazanmaya başlayın.",
+      "description": "Hesabınıza para yatırın ve APY kazanmaya başlayın.",
       "add": "Ekle",
       "step2_title": "MetaMask Card'ınızı alın",
       "step2_description": "Para bakiyenizi Mastercard kabul edilen her yerde kazanırken harcamaya devam edin.",
@@ -6497,22 +6611,32 @@
       "card": "Kart"
     },
     "earnings": {
-      "title": "Kazançlar",
-      "lifetime": "Toplam kazançlar",
-      "projected": "Öngörülen kazançlar"
+      "title": "Tahmini kazançlar",
+      "estimated_monthly": "Aylık",
+      "estimated_yearly": "Yıllık",
+      "info_label": "Kazanç bilgisi"
     },
     "how_it_works": {
       "title": "Nasıl çalışır?",
-      "description_prefix": "Para Hesabınızda mUSD tutun ve otomatik kazanın",
-      "description_suffix": ". Dolar desteklidir, her zaman likittir ve dilediğiniz zaman harcamaya, işlem yapmaya ve gönderilmeye hazırdır."
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "Ekle"
     },
+    "balance_card": {
+      "label": "Para bakiyesi",
+      "add": "Ekle",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "Kriptonuzdan kazanç sağlayın",
       "description": "Kriptonuzu mUSD'ye dönüştürerek paranızın zaman içinde nasıl artabileceğini görün.",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "Dönüştür",
+      "convert_cta": "Convert your crypto",
       "no_fee": "MetaMask ücreti yok",
       "view_all": "Tümünü görüntüle",
       "view_potential_earnings": "Potansiyel kazançları görüntüle"
@@ -6522,37 +6646,75 @@
       "subtitle": "Paranızı dilediğiniz yerde harcayın.",
       "virtual_card": "Sanal kart",
       "metal_card": "Metal kart",
-      "cashback": "%{{percentage}} para iadesi",
+      "cashback": "{{percentage}}% mUSD iadesi",
       "get_now": "Hemen alın",
       "link_title": "MetaMask Card'ı bağla",
-      "link_subtitle": "Para bakiyenizi harcayın ve kazanın.",
-      "link_bullet_cashback": "%3'e kadar para iadesi",
-      "link_bullet_apy": "%{{apy}} APY'ye varan",
-      "link_card": "Kartı bağla"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "Kartı bağla",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "Alacağınız tutar",
-      "benefit_auto_earn": "Otomatik kazanın ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "Paranız 1:1 dolar destekli bir stabil kripto para olan mUSD'de güvende tutun",
       "benefit_liquidity": "Kilitleme olmadan tam likidite alarak dilediğiniz zaman işlem yapabilir veya para çekebilirsiniz",
       "benefit_spend_prefix": "MetaMask Card ile 150 milyondana fazla satıcıda harcama yapın ve şunu kazanın ",
-      "benefit_spend_cashback": "%1-3 para iadesi",
-      "benefit_transfer": "MetaMask genelindeki tüm cüzdanlarınıza para transferi yapın",
-      "benefit_global": "Dünya çapında para gönderin ve alın",
+      "benefit_spend_cashback": "%1-3 mUSD iadesi",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "Daha fazla bilgi edin"
     },
     "footer": {
-      "add_money": "Para ekle"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "Para ekle",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "Kripto dönüştür",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "Fon yatır",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "Harici cüzdandan al",
       "coming_soon": "Çok yakında"
     },
+    "more_sheet": {
+      "title": "Daha fazla",
+      "how_it_works": "Nasıl çalışır?",
+      "what_you_get": "Alacağınız tutar",
+      "contact_support": "Destek ile iletişime geç"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "Hesaplar arasında",
+      "perps_account": "Perps hesabı",
+      "predictions_account": "Tahminler hesabı",
+      "send_external": "Harici adrese gönder",
+      "withdraw_to_bank": "Bankaya çek"
+    },
+    "apy_tooltip": {
+      "title": "Yıllık Yüzde Getiri (APY)",
+      "paragraph_1": "Para hesabınız otomatik olarak {{percentage}}% orana kadar kazanır.",
+      "paragraph_2": "Gösterilen oran, güncel piyasa koşullarına göre tahmini bir Yıllık Yüzde Getiri'dir (APY). APY değişkendir ve çeşitli faktörlerden dolayı değişebilir. Oran, blokzinciri protokollerinde para kullanan üçüncü taraf DeFi platformları tarafından oluşturulur.",
+      "paragraph_3": "MetaMask Card'ınızı bağladığınızda satın alma işlemleri bu bakiyeden düşer."
+    },
+    "earnings_tooltip": {
+      "title": "Tahmini kazançlar",
+      "body": "Güncel bakiyenize ve bugünkü APY'ye göre bir dönem boyunca ne kadar kazanabileceğinize dair bir tahmin. Tahminler garantili getiriler olmayıp değişikliğe tabidir."
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "Aktivite",
       "view_all": "Tümünü görüntüle",
@@ -6581,7 +6743,7 @@
     "convert_stablecoins": {
       "title": "Stabil kripto paralarınızı dönüştürün",
       "description_prefix": "USDC, USDT ve DAI'yi mUSD'ye dönüştürerek ",
-      "description_bonus": "%3 yıllıklandırılmış bonus",
+      "description_bonus": "%3 yıllık getiri bonusu",
       "description_suffix": " alın.",
       "tag_dollar_backed": "Dolar destekli",
       "tag_no_lockups": "Kilitleme yok",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "Para",
       "section_title": "Nasıl çalışır?",
-      "description_1": "Para hesabınız otomatik olarak %4 APY (değişken) kazanır. Fonlar; denetlenmiş borç verme piyasaları genelinde getiri sağlayan, özel olarak seçilmiş bir DeFi kasasına aktarılır — stake yok, hak talebinde bulunma yok, kilitleme yok.\n",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "Para bakiyeniz, bakiyenizi harcıyor. MetaMask Card'ınızı bağlayarak dünya çapında 150 milyondan fazla satıcıda harcama yapabilirsiniz. Kullandığınız ana kadar para kazanmaya devam eder.",
-      "faq_title": "SSS",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "Çok yakında.",
-      "faq_q1": "Para hesabı nedir?",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "mUSD nedir?",
       "faq_q3": "Getiri nereden gelir?",
       "faq_q4": "Param kilitli mi? Dilediğim zaman çekebilir miyim?",
@@ -6608,8 +6770,7 @@
       "faq_q7": "APY oranı değişir mi?",
       "faq_q8": "Bu bir tasarruf hesabı mı yoksa harcama hesabı mı?",
       "faq_q9": "Paramın kontrolü kimde?",
-      "faq_q10": "MetaMask Card ile ne kadar para iadesi alırım?",
-      "sounds_good": "Kulağa hoş geliyor"
+      "faq_q10": "MetaMask Card ile ne kadar mUSD geri alırım?"
     }
   },
   "stake": {
@@ -6762,7 +6923,7 @@
     "you_could_earn_up_to": "Yılda",
     "per_year_on_your_tokens": "kazanabilirsiniz",
     "deposit": "Para Yatır",
-    "gas_cost_impact_warning": "Uyarı: İşlemin gaz maliyeti yatırdığınız paranın %{{percentOverDeposit}} fazlası olacaktır.",
+    "gas_cost_impact_warning": "Uyarı: İşlemin gaz maliyeti yatırdığınız paranın %%{percentOverDeposit} fazlası olacaktır.",
     "earnings_history_title": "{{ticker}} kazançları",
     "apr": "APR",
     "interactive_chart": {
@@ -6800,7 +6961,7 @@
       "description_off2": "Bunu kapattığınızda şuradaki tüm özellikler de devre dışı bırakılır:",
       "description_off2_related_features1": "güvenlik ve gizlilik, yedekleme ve senkronizasyon",
       "description_off2_related_features1_and": "ve",
-      "description_off2_related_features2": "cüzdanınızın kullanımı.",
+      "description_off2_related_features2": "bildirimler.",
       "title_on": "Temel işlevselliği aç",
       "description_on": "MetaMask'te zamanınızı tamamen optimize etmek için bu özelliği açmanız gerekecektir. Temel özellikler (token bilgileri, en iyi gaz ayarları, bildirimler vb. gibi) web3 deneyimi için önemlidir.",
       "checkbox_label": "Anlıyorum ve devam etmek istiyorum",
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "İptal et",
     "confirm": "Onayla",
+    "pay_with_bottom_sheet": {
+      "title": "Ödeme aracı",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "Devam ederek şu bölümlerimizi kabul edersiniz: ",
       "terms_of_use": "Kullanım Şartları",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "Çek",
       "predict_deposit": "Tahmin fonu ekle",
       "predict_withdraw": "Çek",
-      "money_account_deposit": "Fon ekle",
-      "money_account_withdraw": "Para çek"
+      "money_account_add_money": "Para ekle",
+      "money_account_transfer_money": "Para transfer et"
     },
     "sub_title": {
       "permit": "Bu site token'larınızı harcamak için izin istiyor.",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "Tokenlerinizi Sürekli Vadeli İşlem Sözleşmelerinin kullandığı HyperCore ağı üzerinden USDC’ye çevireceğiz. Takas sağlayıcıları ücret alabilir, ancak MetaMask ücret talep etmez."
       },
       "predict_deposit": {
-        "transaction_fee": "Tokenlerinizi Tahminler tarafından kullanılan Polygon ağı üzerinden USDC ile takas edeceğiz. Takas sağlayıcıları ücret alabilir ancak MetaMask ücret talep etmez."
+        "transaction_fee": "Tokenlarınızı, Tahminler tarafından kullanılan ağ olan Polygon üzerinde pUSD ile takas edeceğiz. Takas sağlayıcıları ücret alabilir ancak MetaMask almayacaktır."
       },
       "perps_withdraw": {
         "transaction_fee": "MetaMask, sizin için istediğiniz tokena takas gerçekleştirecek. mUSD'ye takas gerçekleştirirken MetaMask ücreti uygulanmaz."
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "mUSD dönüştürme işlemine ağ maliyetleri dahildir ve sağlayıcı ücretleri dahil olabilir. mUSD dönüştürürken MetaMask ücreti uygulanmaz."
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "Ücretler"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "Kripto satın alın",
       "buy_predict": "Tahminleri kullanmak için cüzdanınıza fon ekleyin.",
-      "buy_perps": "Sürekli Vadeli İşlem Sözleşmelerini kullanmak için cüzdanınıza fon ekleyin."
+      "buy_perps": "Sürekli Vadeli İşlem Sözleşmelerini kullanmak için cüzdanınıza fon ekleyin.",
+      "projected_five_year_balance": "Öngörülen 5 yıllık bakiye:"
     },
     "unlimited": "Sınırsız",
     "all": "Tümü",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "Devam et",
     "deposit_edit_amount_done": "Fon ekle",
     "deposit_edit_amount_predict_withdraw": "Çek",
-    "deposit_edit_amount_musd_conversion": "mUSD'ye dönüştür"
+    "deposit_edit_amount_musd_conversion": "mUSD'ye dönüştür",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "Sonuçlar değişti",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "Swap Yap",
     "terms_and_conditions": "Şart ve Koşullar",
     "select_token": "Token seç",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "Token bulunamadı",
     "no_tokens_found_description": "Bu isimde token bulamadık. Farklı bir arama yapmayı deneyin.",
     "select_network": "Ağ seç",
@@ -7115,6 +7303,7 @@
     "receive_at": "Şurada alınacak:",
     "recipient": "Alıcı",
     "select_recipient": "Alıcı seç",
+    "select_account": "Hesap seç",
     "external_account": "Harici hesap",
     "error_banner_description": "Bu işlem rotası şu anda kullanılamıyor. Tutarı, ağı veya token'ı değiştirmeyi deneyin ve sizin için en iyi seçeneği bulalım.",
     "stock_token_error_banner_description": "Bu işlem rotası şu anda kullanılamıyor. Tutarı, ağı veya tokenı değiştirmeyi deneyin ve en iyi seçeneği bulalım.\n\nOndo Tokenize Edilmiş Hisse Senetleri ile işlem yapmaya çalışıyorsanız ABD, AB, Birleşik Krallık ve Brezilya gibi bölgelerde coğrafi kısıtlamaya tabi olabilirsiniz.",
@@ -7128,7 +7317,7 @@
     "title": "Köprü",
     "submitting_transaction": "Gönderiliyor",
     "fetching_quote": "Teklif alınıyor",
-    "fee_disclaimer": "%{{feePercentage}} MetaMask ücreti dahildir.",
+    "fee_disclaimer": "%%{feePercentage} MetaMask ücreti dahildir.",
     "no_mm_fee": "MM ücreti yok",
     "token_suspicious": "Şüpheli",
     "token_malicious": "Kötü amaçlı",
@@ -7174,8 +7363,8 @@
     "confirm": "Onayla",
     "exceeding_upper_slippage_warning": "Yüksek kayma; bu durum istenmeyen bir takas ile sonuçlanabilir",
     "exceeding_lower_slippage_warning": "Düşük kayma; bu durum istenmeyen bir takas ile sonuçlanabilir",
-    "exceeding_lower_slippage_error": "%{{value}} değerin üzerinde olan bir değer girin",
-    "exceeding_upper_slippage_error": "%{{value}} değerin üzerinde olan bir değer giremezsiniz",
+    "exceeding_lower_slippage_error": "%%{value} değerin üzerinde olan bir değer girin",
+    "exceeding_upper_slippage_error": "%%{value} değerin üzerinde olan bir değer giremezsiniz",
     "custom": "Özel",
     "invalid_recipient_address": "Geçersiz adres",
     "select_quote": "Teklif Seç",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "Yüksek fiyat etkisi",
     "price_impact_error_title": "Çok yüksek fiyat etkisi",
     "price_impact_error_description": "Bu takas işleminde tokenınızın piyasa fiyatından yaklaşık {{priceImpact}} kaybedeceksiniz. Oranınızı iyileştirmek için daha küçük bir işlem veya daha likit bir rota deneyin.",
+    "insufficient_native_reserve_cta": "İzin verilen maksimumu kullanın",
+    "insufficient_native_reserve_message": "Bu ağ için hesabınızda en az {{minimumReserve}} {{ticker}} kalması gerekiyor. Maksimum {{maxSwappable}} {{ticker}} kullanabilirsiniz",
+    "insufficient_native_reserve_title": "Minimum {{ticker}} rezerv bakiyesi gereklidir",
     "token_warning_suspicious_banner": "{{token}} şüpheli bir token.",
     "token_warning_malicious_banner": "{{token}} kötü amaçlı bir token. Bu token ile etkileşimde bulunurken dikkatli olun.",
     "token_warning_modal_suspicious_title": "Şüpheli tokenlar",
@@ -7542,17 +7734,17 @@
         "price": "Ücretsiz",
         "feature_1": "Apple Pay ve Google Pay için sanal kart",
         "feature_2": "Kripto ile öde (USDC, USDT, WETH ve daha fazlası)",
-        "feature_3": "Her satın alma işleminde %1 USDC para iadesi"
+        "feature_3": "Her satın alma işleminde %1 mUSD iadesi"
       },
       "metal_card": {
         "name": "Metal Kart",
         "price": "199$/yıl",
         "everything_in_virtual": "Her şey sanal ortamdadır, ayrıca:",
         "feature_1": "Premium gravürlü metal kart",
-        "feature_2": "İlk 10.000$/yıl için %3 para iadesi",
+        "feature_2": "İlk 10.000$/yıl için %3 mUSD iadesi",
         "feature_3": "Yabancı işlem ücretleri yok"
       },
-      "earn_up_to_badge": "Yılda 300$'a kadar para iadesi kazanın",
+      "earn_up_to_badge": "Yılda 300$'a kadar mUSD iadesi kazanın",
       "upgrade_to_metal_label": "Veya 3 katı ödül için Metal karta yükseltin"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "KART SİPARİŞİNİZ\nVERİLDİ",
       "subtitle": "4 ila 6 hafta içinde ulaşacaktır.",
-      "description": "Para iadesi kazanmaya başlamak için sanal kart kurulumunuzu yapın ve dijital cüzdanınıza ekleyin.",
+      "description": "mUSD iadesi kazanmaya başlamak için sanal kartınızın kurulumunu yapın ve dijital cüzdanınıza ekleyin.",
       "set_up_card_button": "Kart kurulumunu yap",
       "back_to_card_button": "Karta Geri Dön"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "Harca\nve Kazan",
-      "description": "MetaMask Kart, kriptonuzu harcamanın\nve %3'e varan para iadesi kazanmanın\nhızlı ve kolay yoludur.",
+      "description": "MetaMask Card kriptonuzu\nharcamanın ve %3'e varan mUSD iadesi\nkazanmanın hızlı ve kolay yoludur.",
       "apply_now_button": "Şimdi kur",
       "login_button": "Giriş yap",
       "not_now_button": "Şimdi değil",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "Kartı etkinleştir",
       "enable_assets_button_label": "Varlıkları etkinleştir",
       "spending_limit_warning": "Harcama limitinize yaklaştınız. Reddedilmeleri önlemek için güncelleyin.",
+      "spending_limit_available": "kullanılabilir",
       "logout": "Oturumu kapat",
       "contact_support": "Destek ile iletişime geç",
       "logout_confirmation_title": "Kart oturumu kapatılsın mı?",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "Şart ve koşullar",
         "order_metal_card": "Metal Kart",
         "order_metal_card_description": "Hemen Fiziksel Metal Kart siparişinizi verin",
-        "cashback": "Para iadesi",
-        "cashback_description": "Tüm harcamalarda %1 iade al",
-        "cashback_description_metal": "Tüm harcamalarda %3 iade al",
+        "cashback": "mUSD İadesi",
+        "cashback_description": "Tüm harcamalarda %1 mUSD iadesi kazanın",
+        "cashback_description_metal": "Tüm harcamalarda %3 mUSD iadesi kazanın",
         "freeze_card": "Kartı dondur",
         "unfreeze_card": "Kartı dondurma işlemini iptal et",
         "freeze_card_description": "Kartındaki tüm harcamaları duraklat",
@@ -7917,8 +8110,8 @@
       "token_label": "tokenlar"
     },
     "cashback_screen": {
-      "title": "Para iadesi",
-      "available_cashback": "Kullanılabilir para iadesi",
+      "title": "mUSD İadesi",
+      "available_cashback": "Kullanılabilir mUSD",
       "network_fee": "Ağ ücreti",
       "expected_to_receive": "Alınması beklenen",
       "withdraw": "Çek",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "Para çekme başlatıldı",
       "withdrawal_success": "Para çekme başarıyla tamamlandı",
       "withdrawal_failed": "Para çekme başarısız oldu. Lütfen tekrar deneyin.",
-      "no_cashback": "Para iadesi mevcut değil",
-      "loading_error": "Para iadesi yüklenemedi. Lütfen tekrar deneyin."
+      "no_cashback": "mUSD iadesi mevcut değil",
+      "loading_error": "mUSD iadesi yüklenemedi. Lütfen tekrar deneyin.",
+      "funding_required": {
+        "title": "Linea fonlamasını kurun",
+        "description": "mUSD iadesini kullanabilmek için önce Linea'da en az bir onaylı para kaynağınızın olması gerekir.",
+        "confirm_button_label": "Fonlamayı kurun"
+      }
     },
     "change_asset": {
       "title": "Token'ı ve ağı değiştir",
@@ -8032,7 +8230,8 @@
     "title": "Ödeme yöntemi seç",
     "title_receive": "Token al seçeneğini seç",
     "no_gas": "Gaz için yerel bakiye yok",
-    "not_supported": "Desteklenmiyor"
+    "not_supported": "Desteklenmiyor",
+    "crypto": "Kripto"
   },
   "connection_removed_modal": {
     "title": "Bağlantılar kaldırıldı",
@@ -8048,6 +8247,15 @@
       "title": "Katılım başarısız oldu",
       "description": "Bağlantınızı kontrol edin ve tekrar deneyin."
     },
+    "notifications_nudge": {
+      "title": "Kaçırmayın",
+      "description": "Kampanyalar hakkında bilgi almaya devam etmek için bildirimleri etkinleştirin.",
+      "turn_on_button": "Aç",
+      "loading": "Bildirimler etkinleştiriliyor...",
+      "loading_description": "Bu işlem biraz zaman alabilir.",
+      "enable_error": "Bildirimler etkinleştirilemedi",
+      "success": "Bildirimler etkinleştirildi"
+    },
     "version_guard": {
       "title": "Güncelleme gerekli",
       "description": "Ödüller programının kullanılabilmesi için MetaMask'in daha yeni bir sürümü gereklidir. Devam etmek için lütfen güncelleyin.",
@@ -8126,6 +8334,17 @@
       "retry_button": "Tekrar Dene"
     },
     "main_title": "Ödüller",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "Referanslar",
     "referral_stats_earned_from_referrals": "Referanslardan kazanılan",
     "referral_stats_referrals": "Referanslar",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "Aktif yükseltmeler",
     "season_1": "Sezon 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "mUSD bonus hesaplayıcı",
-      "description": "Stabil kripto paralarınızı mUSD'ye dönüştürerek ne kadar kazanabileceğinize bakın.",
-      "amount_label": "Dönüştürülen miktar",
-      "estimated_bonus": "Tahmini yıllıklandırılmış bonus: %3'e kadar",
-      "initial_amount": "Başlangıç miktarı",
-      "daily_bonus": "Günlük alınabilir bonus",
-      "annualized_bonus": "Yıllıklandırılmış bonus",
-      "disclaimer": "Bu yalnızca bir tahmindir. Bonus değişikliğe tabidir.",
-      "disclaimer_brief": "Bonus tahminidir ve değişebilir.",
+      "page_title": "mUSD hesaplayıcı",
+      "hero_hold": "mUSD tut.",
+      "hero_earn": "Kazan",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/yıl",
+      "earnings_per_month_suffix": "/ay",
+      "earnings_per_day_suffix": "/gün günlük alınabilir",
+      "slider_amount_label": "Tutar",
+      "disclaimer_calculator": "%3 bonusa göre tahmin. Oran değişebilir. Dilediğiniz zaman alabilirsiniz.",
       "buy_button": "mUSD al",
       "swap_button": "mUSD'ye takas et"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "Bitiş tarihi {{date}}",
       "ended_date": "Bitiş tarihi {{date}}",
       "pill_up_next": "Çok yakında",
+      "up_next": "Sırada",
+      "notify_me": "Bana bildir",
       "pill_active": "Canlı",
       "pill_complete": "Tamamlandı",
       "enter": "Giriş yap",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "Bölgenizde kullanılamıyor",
       "geo_locked_toast_description": "Bu kampanya bulunduğunuz yerde kullanılamıyor. Yeni kampanyalar için daha sonra tekrar kontrol edin.",
       "geo_locked_cta": "Uygunluğu kontrol et",
-      "geo_loading": "Bölge kontrol ediliyor..."
+      "geo_loading": "Bölge kontrol ediliyor...",
+      "remind_me_success_toast": "Bu kampanya başladığında sizi bilgilendireceğiz.",
+      "remind_me_save_error": "Hatırlatıcınız kaydedilemedi. Lütfen tekrar deneyin."
     },
     "campaign_mechanics": {
       "title": "İşleyiş"
@@ -8479,10 +8701,10 @@
       "qualified_description": "Daha yüksek bir aşamaya ulaşmak ve daha büyük ödeme şansı yakalamak için net para girişlerinizi artırın.",
       "not_eligible_title": "Uygun değil",
       "not_eligible_description": "{{days}} gün tutma şartını karşılamak için çok geç açılan işlemler, sıralamanızı veya aşamanızı etkilemez.",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "Toplam katılımcı",
+      "completed_label_total_tvl": "Toplam TVL",
+      "completed_label_top_return": "En yüksek getiri",
+      "completed_label_winners": "Kazananlar"
     },
     "ondo_campaign_activity": {
       "title": "Tüm aktiviteler",
@@ -8508,6 +8730,48 @@
       "cancel": "İptal et",
       "confirm": "Anlıyorum"
     },
+    "perps_trading_campaign": {
+      "title": "Perps İşlem Yarışması",
+      "stats_title": "İstatistikler",
+      "performance_title": "Performans",
+      "label_rank": "Sıralama",
+      "label_your_rank": "Sıralamanız",
+      "label_pnl": "Kazanç/Zarar",
+      "label_volume": "Hacim",
+      "label_notional_volume": "Nominal hacim",
+      "pending": "Bekliyor",
+      "qualified": "Uygun",
+      "open_position_cta": "Açık Pozisyon",
+      "leaderboard_title": "Liderlik Tablosu",
+      "leaderboard_total_participants": "{{count}} katılımcı",
+      "last_updated": "Son güncelleme: {{time}}",
+      "leaderboard_error_loading": "Liderlik tablosu yüklenemedi",
+      "leaderboard_error_loading_description": "Liderlik tablosu yüklenirken bir şeyler ters gitti. Lütfen tekrar deneyin.",
+      "leaderboard_not_yet_computed": "Liderlik tablosu henüz hesaplanmadı. Kısa bir süre sonra tekrar kontrol edin.",
+      "leaderboard_powered_by_prefix": "Destekleyen ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "Ödül havuzu",
+      "prize_pool_current_label": "Mevcut",
+      "prize_pool_next_label": "Sonraki",
+      "prize_pool_volume_subtext": "{{current}} / {{target}} hacim",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}}+ hacim — tüm hedeflere ulaşıldı",
+      "prize_pool_max_badge": "Maksimum",
+      "prize_pool_error_title": "Ödül havuzu yüklenemedi",
+      "prize_pool_error_description": "Ödül havuzu yüklenirken bir hata oldu. Lütfen tekrar deneyin.",
+      "prize_pool_retry_button": "Tekrar Dene",
+      "stats_notional_volume_threshold": "{{amount}}$ gereklidir",
+      "stats_qualified_title": "Uygunsunuz",
+      "stats_qualified_description": "Yarışma sona ermeden Kazanç/Zarar durumunuzu iyileştirmek ve liderlik tablosunda yükselmek için işlem yapmaya devam edin.",
+      "stats_qualify_for_rank_title": "Bu sıralama için uygunluk kazanın",
+      "stats_qualify_for_rank_description": "Uygunluk kazanmak için {{notionalRemaining}} daha nominal hacimli işlem yapın.",
+      "stats_error_title": "İstatistikler yüklenemiyor",
+      "stats_error_description": "İstatistikleriniz yüklenirken bir problem yaşadık. Lütfen tekrar deneyin.",
+      "stats_retry": "Tekrar Dene",
+      "completed_label_total_participants": "Toplam katılımcı",
+      "completed_label_total_volume": "Toplam hacim",
+      "completed_label_top_pnl": "Toplam Kazanç/Zarar",
+      "completed_label_winners": "Kazananlar"
+    },
     "campaigns_preview": {
       "title": "Kampanyalar",
       "coming_soon": "Çok yakında",
@@ -8532,29 +8796,29 @@
       "retry_button": "Tekrar Dene",
       "refreshing": "Yenileniyor..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "Kazancınız",
       "rank_label": "{{place}}. sıra",
-      "email_instructions": "Ödülünüzü almak için kodunuzla ondocampaign@consensys.net adresine e-posta gönderin.",
+      "email_instructions": "Ödülünüzü almak için kodunuzla {{email}} adresine e-posta gönderin.",
       "open_mail": "Postayı aç",
       "skip_for_now": "Şimdilik atla",
-      "mail_subject": "Ondo kampanyası ödül talebi",
+      "mail_subject": "{{campaignName}} ödülü alın",
       "mail_body": "Kazanma kodum: {{code}}",
       "winning_code": "Kazanma kodu",
       "close_a11y": "Kapat"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "Kazancınız",
-        "description": "Ödülünüzü bugün alın.",
-        "a11y": "Kazanan bilgilerini aç"
+        "title": "Kazancınız!",
+        "description": "Kazanma kodunuzu doğrulayın ve ödülünüzü bugün alın.",
+        "a11y": "Ayrıntıları görüntüle"
       },
       "participant_pending": {
         "title": "Kampanya sona erdi.",
         "description": "Sonuçları belirliyoruz. Kısa bir süre tekrar kontrol edin."
       },
       "participant_finalized": {
-        "title": "Kampanya sonuçları açıklandı",
+        "title": "Kampanya sonuçları açıklandı.",
         "description": "Bu kez kazanamadınız. Nerede bitirdiğinizi görmek için liderlik tablosunu kontrol edin."
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "Ödülünüz yolda - kısa bir süre sonra iletişime geçeceğiz."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "Kazancınız 💰",
-        "description": "{{campaignName}} adlı kampanyadan ödülünüzü alın",
+        "description": "{{campaignName}} ödülünüzü bugün alın.",
         "cta": "Ayrıntıları görüntüle"
       },
-      "participant_no_winner": {
-        "title": "Sonuçlar belli oldu. 🏅",
-        "description": "{{campaignName}} adlı kampanyadaki sıralamanızı görün",
+      "non_winner": {
+        "title": "Sonuçlar belli oldu 🏅",
+        "description": "{{campaignName}} adlı kampanyadaki sıralamanızı görün.",
         "cta": "Görüntüle"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "Kazançlar alındı",
       "predict_deposit": "Fonlanmış Predict hesabı",
       "predict_withdraw": "Çekme işlemi",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "Para Hesabına Para Yatır",
+      "money_account_withdraw": "Para Hesabından Para Transfer Et",
       "default": "İşlem bilgileri"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "Keşfet",
+    "crypto_movers": "Kriptoda hareketlenenler",
+    "perps_movers": "Perps işlemlerinde hareketlenenler",
     "trending_tokens": "Trend",
+    "crypto": "Kripto",
     "stocks": "Hisse Senetleri",
     "price_change": "Fiyat değişikliği",
     "all_networks": "Tüm ağlar",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 saat",
     "5_minutes": "5 dakika",
     "networks": "Ağlar",
+    "ecosystems": "Ekosistemler",
+    "ecosystems_subtitle": "MetaMask Portfolio üzerindeki zincirler genelinde dapp'leri, tokenları ve NFT'leri keşfedin.",
+    "all_sports": "Popüler sporlar",
+    "basketball": "Basketbol",
+    "football": "Amerikan Futbolu",
+    "soccer": "Futbol",
+    "tennis": "Tenis",
+    "f1": "F1",
+    "golf": "Golf",
+    "all_sports_no_markets": "Henüz bu kategoride açık piyasa yok. Bir süre sonra tekrar kontrol edin veya yukarıdan başka spor seçin.",
+    "load_more": "Daha fazlasını yükle",
     "sort_by": "Şuna göre sırala",
     "volume": "Hacim",
     "market_cap": "Piyasa değeri",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "Token, site, URL ara",
     "cancel": "İptal",
     "perps": "Sürekli Vadeli",
+    "rwa_perps_section": "Sürekli Vadeli",
+    "macro_stocks_commodity_perps": "Sürekli Vadeli",
+    "macro_pill_stocks": "Hisse Senetleri",
+    "macro_pill_commodities": "Emtialar",
+    "rwa_pill_commodities": "Emtialar",
+    "rwa_pill_stocks": "Hisse Senetleri",
+    "rwa_pill_forex": "Forex",
+    "crypto_perps_section": "Sürekli Vadeli",
     "predictions": "Tahminler",
     "no_results": "Sonuç bulunamadı",
+    "popular": "Popüler",
     "sites": "Siteler",
     "popular_sites": "Popüler siteler",
     "search_sites": "Siteleri ara",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "Token bulunamadı",
       "description": "Bu tokenı bulamadık"
+    },
+    "tabs": {
+      "now": "Şimdi",
+      "macro": "Makro",
+      "rwas": "RWA'lar",
+      "crypto": "Kripto",
+      "sports": "Spor",
+      "dapps": "Siteler"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "İptal",
-      "continue": "Devam et"
+      "continue": "Devam et",
+      "learn_more": "Daha fazla bilgi edin",
+      "try_again": "Tekrar dene"
     },
     "connecting": {
       "title": "{{device}} cihazınız bağlanıyor...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "Cihazınıza bağlanmak için lütfen Bluetooth'u açın",
       "bluetooth_scan_failed": "Cihazlar taranamadı. Lütfen tekrar deneyin",
       "bluetooth_connection_failed": "Cihazınıza bağlanılamadı. Lütfen tekrar deneyin",
+      "camera_permission_denied": "QR kodlarını taramak için kamera izni gereklidir. Lütfen cihaz ayarlarınızda etkinleştirin",
       "not_supported": "Bu işlem desteklenmiyor",
       "unknown_error": "{{device}} cihazınızda bu hesap için Gizli Kurtarma İfadesi veya parola kurulumunun yapıldığından emin olun"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "Konum İzni Gerekli",
       "nearby_devices_permission_denied": "Yakındaki Cihazlar İzni Gerekli",
       "scan_failed": "Tarama Başarısız Oldu",
+      "camera_permission_denied": "Kamera İzni Gerekli",
       "something_went_wrong": "Bir şeyler ters gitti"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "Cüzdan eşitleme QR kodunu tara",
+          "body": "Donanım cüzdanınıza geri dönün ve hesaplarınızı paylaşma veya dışa aktarma seçeneğini bulun, MetaMask seçeneğini seçin, ardından QR kodunu tarayın."
+        },
+        "sign": {
+          "title": "İmza QR kodunu tara",
+          "body": "Donanım cüzdanınıza geri dönün ve işlemi onaylayın, ardından orada gösterilen QR kodunu tarayın."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "QR kodu yanlış",
+          "body": "Donanım cüzdanınıza geri dönün, cüzdan türü olarak MetaMask'i seçin, ardından yeni bir QR kodu oluşturun ve tarayın."
+        },
+        "sign": {
+          "title": "QR kodu yanlış",
+          "body": "Donanım cüzdanınıza geri dönün ve işlemi onaylayın, ardından orada gösterilen QR kodunu tarayın."
+        }
+      },
+      "ur_decode_error": {
+        "title": "QR kodu okunamadı",
+        "body": "QR kodunun tamamen görünür olduğundan ve iyi aydınlatılmış olduğundan emin olup tekrar deneyin. Sorun devam ederse donanım cüzdanınızın yazılımını güncellemeniz gerekebilir."
+      }
+    },
     "device_selection": {
       "title": "{{device}} cihazını seçin",
       "scanning": "Cihazlar taranıyor...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Para",
-      "cash_empty_description": "Henüz mUSD'niz yok. Ana sayfada Para kısmından stabil kripto paraları mUSD'ye dönüştürün.",
-      "cash_empty_description_network_filter": "Bu ağda mUSD yok. mUSD'nizi görmek için ağ değiştirin.",
+      "money": "Para",
+      "money_empty_description": "Henüz mUSD'niz yok. Ana sayfada Para kısmından stabil kripto paraları mUSD'ye dönüştürün.",
+      "money_empty_description_network_filter": "Bu ağda mUSD yok. mUSD'nizi görmek için ağ değiştirin.",
+      "money_empty_state": {
+        "get_started": "Başlarken",
+        "earn_apy": "{{percentage}}% APY kazan"
+      },
+      "money_filled_state": {
+        "add": "Ekle",
+        "apy": "%%{percentage} Yıllık Bileşik Getiri"
+      },
       "tokens": "tokenlar",
+      "perps": "Sürekli Vadeli",
+      "related_assets": "İlgili Varlıklar",
       "perpetuals": "Sürekli Vadeli İşlemler",
       "predictions": "Tahminler",
       "whats_happening": "Neler oluyor",
+      "whats_happening_ai": "Yapay Zeka",
+      "whats_happening_impact": {
+        "bullish": "Boğa",
+        "bearish": "Ayı",
+        "neutral": "Nötr"
+      },
       "top_traders": "En İyi Yatırımcılar",
       "whats_happening_categories": {
         "geopolitical": "Jeopolitik",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "{{section}} yüklenemiyor",
       "retry": "Tekrar Dene"
     }
+  },
+  "sites": {
+    "popular": "Popüler"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/vi.json b/locales/languages/vi.json
index 535aa362074..4a0cca60d75 100644
--- a/locales/languages/vi.json
+++ b/locales/languages/vi.json
@@ -634,7 +634,8 @@
     "trade": "Giao dịch",
     "settings": "Cài đặt",
     "rewards": "Phần thưởng",
-    "trending": "Khám phá"
+    "trending": "Khám phá",
+    "money": "Tài chính"
   },
   "drawer": {
     "send_button": "Gửi",
@@ -708,7 +709,11 @@
     "smart_contract_address": "Địa chỉ hợp đồng thông minh",
     "smart_contract_address_warning": "Địa chỉ người nhận có thể không hỗ trợ chuyển khoản token trực tiếp, điều này có thể dẫn đến mất tiền. Chỉ tiếp tục nếu bạn chắc chắn hợp đồng này có thể nhận khoản chuyển của bạn.",
     "i_understand": "Tôi hiểu",
-    "cancel": "Hủy"
+    "cancel": "Hủy",
+    "new_address_title": "Địa chỉ mới",
+    "new_address_message": "Bạn đang gửi đến địa chỉ này lần đầu tiên. Hãy đảm bảo địa chỉ chính xác trước khi tiếp tục:",
+    "alert_navigation_previous": "Cảnh báo trước",
+    "alert_navigation_next": "Cảnh báo tiếp theo"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "Nhà giao dịch hàng đầu",
       "allow_push_notifications": "Cho phép thông báo đẩy",
       "trades_over_label": "Nhận thông báo về các giao dịch trên:",
       "traders_you_follow": "Nhà giao dịch mà bạn theo dõi",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "Không thể tải các nhà giao dịch mà bạn theo dõi."
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "Thông báo từ {{traderName}}",
       "allow_push_notifications": "Cho phép thông báo đẩy",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "Nhận thông báo về hoạt động giao dịch của {{traderName}}",
+      "manage_traders": "Quản lý các nhà giao dịch mà bạn theo dõi",
       "save": "Lưu"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "Nhận cảnh báo theo thời gian thực về các giao dịch từ những nhà giao dịch mà bạn theo dõi",
       "allow_push_notifications": "Cho phép thông báo đẩy",
       "trades_over_label": "Nhận thông báo về các giao dịch trên:",
       "save": "Lưu",
@@ -1059,7 +1064,12 @@
       "closed": "Đã đóng",
       "no_positions": "Chưa có vị thế nào",
       "error_loading_profile": "Không thể tải hồ sơ",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "Xem trên X (Twitter)",
+      "sort": {
+        "value": "Giá trị",
+        "pnl_percent": "Lãi/Lỗ %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "Vốn hóa thị trường",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} đã bán",
       "no_trades": "Không có giao dịch nào trong khoảng thời gian này",
       "closed_position": "Vị thế đã đóng",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "Vị thế không khả dụng",
+      "fallback_subtitle": "Chúng tôi không thể tải vị thế này ngay lúc này.",
+      "fallback_back_to_profile": "Quay lại hồ sơ",
+      "fallback_back_to_leaderboard": "Quay lại bảng xếp hạng"
     },
     "quick_buy": {
       "title": "Mua {{symbol}}",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "MetaMask Dự đoán",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "Thị trường dự đoán",
     "market_list": "Danh sách thị trường",
     "loading": "Đang tải...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "Thay đổi phương thức thanh toán",
+      "add_funds": "Nạp tiền",
+      "add": "Thêm",
+      "predict_balance": "Dự đoán số dư"
+    },
     "order": {
       "available": "Khả dụng",
       "cashed_out": "Đã rút tiền",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "Thị trường đang biến động nhanh, vì vậy chúng tôi không thể mua ở mức {{price}}. Thử lại với mức giá tốt nhất hiện có?",
       "market_busy_body_sell": "Thị trường đang biến động nhanh, vì vậy chúng tôi không thể bán ở mức {{price}}. Thử lại với mức giá tốt nhất hiện có?",
       "order_failed_title": "Đặt lệnh không thành công",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "Không thể khớp lệnh của bạn. Thử lại?",
+      "price_changed_title": "Giá đã thay đổi",
+      "price_changed_body": "Không thể mua ở giá {{price}}. Thử mua theo giá thị trường?",
       "retry": "Thử lại",
       "try_again": "Thử lại",
       "view": "Xem",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "Rút tiền hoàn tất",
       "withdraw_completed_subtitle": "{{amount}} USDC đã được chuyển vào ví của bạn",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}} đã được chuyển vào ví của bạn",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "Tôi đã hiểu",
       "error_title": "Đã xảy ra sự cố",
       "error_description": "Không thể thực hiện yêu cầu rút tiền",
       "try_again": "Thử lại"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "Cần {{tokenSymbol}} để tiếp tục",
     "fund_your_wallet": "Nạp tiền vào ví của bạn",
     "get_ready_for_web3": "Chuẩn bị ví của bạn để sử dụng web3",
+    "home_onboarding_steps": {
+      "header": "Các bước",
+      "get_started_title": "Bắt đầu với MetaMask",
+      "fund_title": "Nạp tiền vào ví của bạn",
+      "fund_subtitle": "Không ai thích một chiếc ví trống. Dễ dàng nạp tiền để bắt đầu giao dịch.",
+      "fund_primary": "Nạp tiền",
+      "trade_title": "Thực hiện giao dịch đầu tiên của bạn",
+      "trade_subtitle": "Giao dịch các token đang thịnh hành trên nhiều mạng để tăng trưởng danh mục đầu tư của bạn.",
+      "trade_primary": "Giao dịch",
+      "notifications_title": "Bật thông báo",
+      "notifications_subtitle": "Luôn cập nhật những biến động của thị trường để đưa ra quyết định tốt nhất cho danh mục đầu tư của bạn.",
+      "notifications_primary": "Bật",
+      "skip": "Bỏ qua",
+      "progress_a11y": "Bước {{current}}/{{total}}",
+      "balance_loading_a11y": "Đang tải số dư ví"
+    },
     "add_funds": "Nạp tiền",
     "next": "Tiếp theo",
     "buy_asset": "Mua {{asset}}",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "Số không hợp lệ. Hãy nhập một số từ 1 đến %{maxSafeChainId}",
     "hide_zero_balance_tokens_title": "Ẩn token không có số dư",
     "hide_zero_balance_tokens_desc": "Không hiển thị các Token không có số dư trong danh sách Token của bạn.",
+    "haptic_feedback_title": "Phản hồi rung",
+    "haptic_feedback_desc": "Cảm nhận rung nhẹ cho các xác nhận, lỗi và thao tác tương tác. Tắt để giảm kích thích rung.",
     "token_detection_title": "Tự động phát hiện token",
     "token_detection_description": "Chúng tôi sử dụng các API của bên thứ ba để phát hiện và hiển thị các Token mới được gửi đến ví của bạn. Hãy tắt nếu bạn không muốn ứng dụng lấy dữ liệu từ các dịch vụ đó.",
     "theme_button_text": "Thay đổi chủ đề",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "Đáng tin cậy nhất",
         "quote_unknown_provider": "Nhà cung cấp không xác định",
         "start_headless_buy": "Bắt đầu mua trực tiếp",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "Thay thế & bắt đầu mua trực tiếp",
         "start_headless_buy_disabled_hint": "Nhập số tiền hợp lệ để kích hoạt",
         "start_headless_buy_pending": "Phiên mua trực tiếp đang hoạt động — mở BuildQuote",
         "cancel_headless_buy": "Hủy phiên mua trực tiếp",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "Phiên hoạt động: {{sessionId}} — việc bắt đầu một báo giá khác sẽ hủy phiên này.",
         "event_log_title": "Nhật ký sự kiện",
         "event_log_empty": "Chưa có sự kiện nào — bắt đầu một phiên mua trực tiếp và theo dõi tại đây.",
         "event_log_started": "đã bắt đầu phiên {{sessionId}} (tài sản={{assetId}}, số tiền={{amount}}, thanh toán={{paymentMethodId}}{{providerSuffix}})",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "người tiêu dùng đã hủy phiên {{sessionId}}"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "Mua trực tiếp",
+        "loading": "Đang chuẩn bị quy trình mua…",
+        "no_session": "Phiên mua trực tiếp không còn hoạt động.",
+        "cancel": "Hủy"
       }
     },
     "request_feature": "Yêu cầu tính năng",
@@ -3553,7 +3622,7 @@
     "security_alerts": "Cảnh báo bảo mật",
     "security_alerts_desc": "Tính năng này sẽ cảnh báo bạn về hoạt động độc hại bằng cách xem xét cục bộ các yêu cầu giao dịch và chữ ký của bạn. Hãy luôn tự mình thực hiện quy trình thẩm định trước khi chấp thuận bất kỳ yêu cầu nào. Không có gì đảm bảo rằng tính năng này sẽ phát hiện được tất cả các hoạt động độc hại. Bằng cách bật tính năng này, bạn đồng ý với các điều khoản sử dụng của nhà cung cấp.",
     "smart_account_dapp_requests_heading": "Yêu cầu tài khoản thông minh từ dapp",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "Cho phép dapp yêu cầu các tính năng tài khoản thông minh cho tài khoản tiêu chuẩn. MetaMask sẽ chỉ nâng cấp lên tài khoản thông minh đã được kiểm tra của chúng tôi.",
     "smart_transactions_opt_in_heading": "Giao dịch thông minh",
     "smart_transactions_opt_in_desc_supported_networks": "Bật Giao dịch thông minh để có các giao dịch đáng tin cậy và an toàn hơn trên các mạng được hỗ trợ.",
     "smart_transactions_learn_more": "Tìm hiểu thêm",
@@ -3572,6 +3641,39 @@
         "title": "Thẻ",
         "reset_onboarding_description": "Đặt lại trạng thái thiết lập Thẻ để bắt đầu lại quy trình thiết lập từ đầu.",
         "reset_onboarding_button": "Đặt lại trạng thái thiết lập"
+      },
+      "haptics": {
+        "title": "Phản hồi rung",
+        "description": "Xem trước phản hồi rung trên thiết bị vật lý. Thao tác này sẽ bỏ qua cài đặt giảm rung trong ứng dụng và công tắc vô hiệu hóa từ xa để bạn có thể đánh giá từng kiểu rung. Trình mô phỏng thường không hỗ trợ phản hồi rung.",
+        "catalog_impacts_heading": "Danh mục các thời điểm tạo phản hồi",
+        "notifications_heading": "Mẫu thông báo",
+        "selection_heading": "Lựa chọn",
+        "notification_success_button": "Thông báo — Thành công",
+        "notification_error_button": "Thông báo — Lỗi",
+        "notification_warning_button": "Thông báo — Cảnh báo",
+        "selection_button": "Lựa chọn",
+        "raw_impacts_heading": "Kiểu phản hồi Tiếp xúc thô",
+        "raw_impacts_desc": "Các kiểu phản hồi rung khi tiếp xúc trực tiếp để so sánh với các thời điểm trong danh mục được ánh xạ ở trên.",
+        "impacts": {
+          "quick_amount_selection": "Phản hồi — Chọn nhanh số lượng",
+          "slider_tick": "Phản hồi — Nấc thanh trượt",
+          "edge_gesture_engage": "Phản hồi — Kích hoạt cử chỉ cạnh",
+          "page_navigation": "Phản hồi — Điều hướng trang",
+          "slider_grip": "Phản hồi — Tay cầm thanh trượt",
+          "tab_change": "Phản hồi — Thay đổi tab",
+          "primary_cta": "Phản hồi — Kêu gọi hành động chính",
+          "pull_to_refresh_engage": "Phản hồi — Kéo để làm mới (kích hoạt)",
+          "pull_to_refresh": "Phản hồi — Kéo để làm mới (thả)",
+          "chart_crosshair": "Phản hồi — Tâm biểu đồ",
+          "follow_toggle": "Phản hồi — Chuyển đổi theo dõi"
+        },
+        "raw_styles": {
+          "light": "Phản hồi thô — Nhẹ",
+          "medium": "Phản hồi thô — Trung bình",
+          "heavy": "Phản hồi thô — Mạnh",
+          "rigid": "Phản hồi thô — Cứng",
+          "soft": "Phản hồi thô — Mềm"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "Dự đoán",
     "add_collectible_button": "Thêm",
     "info": "Thông tin",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "Hoán đổi",
     "convert": "Chuyển đổi",
     "bridge": "Cầu nối",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "Khắc phục sự cố",
     "deposit_description": "Chuyển khoản ngân hàng hoặc thẻ với phí thấp",
     "buy_description": "Phù hợp để mua một token cụ thể",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "Bán tiền mã hóa lấy tiền mặt",
     "swap_description": "Chuyển đổi giữa các token",
     "bridge_description": "Chuyển token giữa các mạng",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "Miễn phí",
     "tx_details_not_available": "Không có sẵn",
     "smart_contract_interaction": "Tương tác hợp đồng thông minh",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "Nạp tiền vào Tài khoản Tài chính",
+    "money_account_withdraw": "Chuyển tiền từ Tài khoản Tài chính",
     "swaps_transaction": "Giao dịch hoán đổi",
     "bridge_transaction": "Cầu nối",
     "approve": "Phê duyệt",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "NHẬN {{percentage}}%\nĐỒNG ỔN ĐỊNH",
-        "description": "Chuyển đổi đồng ổn định của bạn sang mUSD và nhận thưởng quy đổi theo năm lên đến {{percentage}}% mà bạn có thể nhận hằng ngày.",
+        "description": "Chuyển đổi đồng ổn định của bạn sang mUSD và nhận thưởng quy đổi theo năm {{percentage}}%.",
         "terms_apply": "Áp dụng điều khoản.",
         "primary_button": "Bắt đầu",
-        "secondary_button": "Không phải bây giờ"
+        "secondary_button": "Không phải bây giờ",
+        "checklist": {
+          "dollar_backed": "Được đảm bảo bằng đồng đô la Mỹ",
+          "no_lockups": "Không bị khóa vốn",
+          "daily_bonus": "Thưởng hằng ngày",
+          "metamask_stablecoins": "Đồng ổn định MetaMask",
+          "no_metamask_fee": "Không có phí MetaMask"
+        }
       },
       "buy_musd": "Mua mUSD",
       "get_musd": "Nhận mUSD",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Tài chính",
+    "your_balance": "Số dư của bạn",
     "apy_label": "APY {{percentage}}%",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "Thông tin APY",
     "onboarding": {
       "step_progress": "Bước {{current}}/{{total}}",
       "title": "Nạp tiền",
-      "description": "Mua mUSD và bắt đầu nhận APY ngay hôm nay.",
+      "description": "Nạp tiền vào tài khoản của bạn và bắt đầu nhận APY.",
       "add": "Thêm",
       "step2_title": "Nhận Thẻ MetaMask của bạn",
       "step2_description": "Chi tiêu số dư Tài chính của bạn trong khi vẫn sinh lời, ở bất kỳ đâu chấp nhận Mastercard.",
@@ -6497,22 +6611,32 @@
       "card": "Thẻ"
     },
     "earnings": {
-      "title": "Thu nhập",
-      "lifetime": "Thu nhập trọn đời",
-      "projected": "Thu nhập dự kiến"
+      "title": "Thu nhập ước tính",
+      "estimated_monthly": "Hằng tháng",
+      "estimated_yearly": "Hằng năm",
+      "info_label": "Thông tin thu nhập"
     },
     "how_it_works": {
       "title": "Cách hoạt động",
-      "description_prefix": "Nắm giữ mUSD trong Tài khoản Tài chính và tự động sinh lời",
-      "description_suffix": ". Đây là đồng ổn định được bảo chứng theo USD, luôn có thanh khoản và sẵn sàng để chi tiêu, giao dịch hoặc gửi bất cứ lúc nào."
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "Thêm"
     },
+    "balance_card": {
+      "label": "Số dư Tài chính",
+      "add": "Thêm",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "Kiếm lợi nhuận từ tiền mã hóa của bạn",
       "description": "Xem tiền của bạn có thể tăng trưởng theo thời gian như thế nào bằng cách chuyển đổi tiền mã hóa sang mUSD.",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "Chuyển đổi",
+      "convert_cta": "Convert your crypto",
       "no_fee": "Không có phí MetaMask",
       "view_all": "Xem tất cả",
       "view_potential_earnings": "Xem thu nhập tiềm năng"
@@ -6522,37 +6646,75 @@
       "subtitle": "Chi tiêu tiền của bạn ở mọi nơi.",
       "virtual_card": "Thẻ ảo",
       "metal_card": "Thẻ kim loại",
-      "cashback": "Hoàn tiền {{percentage}}%",
+      "cashback": "Hoàn tiền {{percentage}}% bằng mUSD",
       "get_now": "Nhận ngay",
       "link_title": "Liên kết Thẻ MetaMask",
-      "link_subtitle": "Chi tiêu số dư Tài chính của bạn và sinh lời.",
-      "link_bullet_cashback": "Hoàn tiền lên đến 3%",
-      "link_bullet_apy": "Lên đến {{apy}}% APY",
-      "link_card": "Liên kết thẻ"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "Liên kết thẻ",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "Những gì bạn nhận được",
-      "benefit_auto_earn": "Tự động sinh lời ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "Giữ tiền của bạn an toàn dưới dạng mUSD, một đồng ổn định được bảo chứng 1:1 theo USD",
       "benefit_liquidity": "Có khả năng thanh khoản cao, không bị khóa vốn, cho phép giao dịch hoặc rút tiền bất cứ lúc nào",
       "benefit_spend_prefix": "Chi tiêu tại hơn 150 triệu điểm chấp nhận với Thẻ MetaMask và được ",
-      "benefit_spend_cashback": "hoàn tiền 1-3%",
-      "benefit_transfer": "Chuyển tiền đến bất kỳ ví nào của bạn trên MetaMask",
-      "benefit_global": "Gửi và nhận tiền toàn cầu",
+      "benefit_spend_cashback": "Hoàn tiền 1-3% bằng mUSD",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "Tìm hiểu thêm"
     },
     "footer": {
-      "add_money": "Nạp tiền"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "Nạp tiền",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "Chuyển đổi tiền mã hóa",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "Nạp tiền",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "Nhận từ ví bên ngoài",
       "coming_soon": "Sắp ra mắt"
     },
+    "more_sheet": {
+      "title": "Thêm",
+      "how_it_works": "Cách hoạt động",
+      "what_you_get": "Những gì bạn nhận được",
+      "contact_support": "Liên hệ bộ phận hỗ trợ"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "Giữa các tài khoản",
+      "perps_account": "Tài khoản hợp đồng vĩnh cửu",
+      "predictions_account": "Tài khoản dự đoán",
+      "send_external": "Gửi đến địa chỉ bên ngoài",
+      "withdraw_to_bank": "Rút về ngân hàng"
+    },
+    "apy_tooltip": {
+      "title": "Lợi suất phần trăm hằng năm (APY)",
+      "paragraph_1": "Tài khoản Tài chính của bạn tự động nhận lên đến {{percentage}}%.",
+      "paragraph_2": "Mức lãi suất hiển thị là Lợi suất phần trăm hằng năm (APY) ước tính dựa trên điều kiện thị trường hiện tại. APY sẽ biến đổi và có thể thay đổi do nhiều yếu tố khác nhau. Mức lãi suất này được tạo bởi các nền tảng DeFi bên thứ ba triển khai nguồn vốn vào các giao thức chuỗi khối.",
+      "paragraph_3": "Khi bạn liên kết MetaMask Card, các giao dịch mua sẽ được khấu trừ từ số dư này."
+    },
+    "earnings_tooltip": {
+      "title": "Thu nhập ước tính",
+      "body": "Ước tính số tiền bạn có thể kiếm được trong một khoảng thời gian dựa trên số dư hiện tại và APY hôm nay của bạn. Các khoản ước tính không phải là lợi nhuận được đảm bảo và vẫn có thể thay đổi."
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "Hoạt động",
       "view_all": "Xem tất cả",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "Tài chính",
       "section_title": "Cách hoạt động",
-      "description_1": "Tài khoản Tài chính của bạn tự động sinh lời 4% APY (biến động). Tiền được đưa vào một kho DeFi được chọn lọc, tạo lợi nhuận trên các thị trường cho vay đã được kiểm toán — không cần ký gửi, không cần nhận, không bị khóa.",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "Số dư Tài chính của bạn là số dư để chi tiêu. Liên kết Thẻ MetaMask để chi tiêu tại hơn 150 triệu cửa hàng trên toàn cầu. Tiền của bạn vẫn sinh lời cho đến thời điểm bạn sử dụng.",
-      "faq_title": "Câu hỏi thường gặp",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "Sắp ra mắt.",
-      "faq_q1": "Tài khoản Tài chính là gì?",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "mUSD là gì?",
       "faq_q3": "Lợi suất đến từ đâu?",
       "faq_q4": "Tiền của tôi có bị khóa không? Tôi có thể rút tiền bất cứ lúc nào không?",
@@ -6608,8 +6770,7 @@
       "faq_q7": "Tỷ lệ APY có thay đổi không?",
       "faq_q8": "Đây là tài khoản tiết kiệm hay tài khoản chi tiêu?",
       "faq_q9": "Ai kiểm soát tiền của tôi?",
-      "faq_q10": "Tôi được hoàn tiền bao nhiêu khi sử dụng Thẻ MetaMask?",
-      "sounds_good": "Có vẻ tốt"
+      "faq_q10": "Tôi sẽ được hoàn lại bao nhiêu mUSD khi sử dụng MetaMask Card?"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "Hủy",
     "confirm": "Xác nhận",
+    "pay_with_bottom_sheet": {
+      "title": "Thanh toán bằng",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "Bằng cách tiếp tục, bạn đồng ý với ",
       "terms_of_use": "Điều khoản sử dụng",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "Rút tiền",
       "predict_deposit": "Nạp tiền Dự đoán",
       "predict_withdraw": "Rút tiền",
-      "money_account_deposit": "Nạp tiền",
-      "money_account_withdraw": "Rút tiền"
+      "money_account_add_money": "Nạp tiền",
+      "money_account_transfer_money": "Chuyển tiền"
     },
     "sub_title": {
       "permit": "Trang web này muốn được cấp quyền chi tiêu token của bạn.",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "Chúng tôi sẽ hoán đổi token của bạn sang USDC trên HyperCore, mạng được Hợp đồng vĩnh cửu sử dụng. Các nhà cung cấp dịch vụ hoán đổi có thể tính phí, nhưng MetaMask thì không."
       },
       "predict_deposit": {
-        "transaction_fee": "Chúng tôi sẽ hoán đổi token của bạn sang USDC.e trên Polygon, mạng được thị trường Dự đoán sử dụng. Các nhà cung cấp dịch vụ hoán đổi có thể tính phí, nhưng MetaMask thì không."
+        "transaction_fee": "Chúng tôi sẽ hoán đổi token của bạn sang pUSD trên Polygon, mạng được thị trường Dự đoán sử dụng. Các nhà cung cấp dịch vụ hoán đổi có thể tính phí, nhưng MetaMask thì không."
       },
       "perps_withdraw": {
         "transaction_fee": "MetaMask sẽ hoán đổi sang token mà bạn mong muốn. Không áp dụng phí MetaMask khi bạn hoán đổi sang mUSD."
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "Phí chuyển đổi mUSD bao gồm phí mạng và có thể bao gồm phí từ nhà cung cấp. Không áp dụng phí MetaMask khi bạn chuyển đổi sang mUSD."
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "Phí"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "Mua tiền mã hóa",
       "buy_predict": "Nạp tiền vào ví của bạn để sử dụng Dự đoán.",
-      "buy_perps": "Nạp tiền vào ví của bạn để sử dụng Hợp đồng vĩnh cửu."
+      "buy_perps": "Nạp tiền vào ví của bạn để sử dụng Hợp đồng vĩnh cửu.",
+      "projected_five_year_balance": "Số dư dự kiến sau 5 năm:"
     },
     "unlimited": "Không giới hạn",
     "all": "Tất cả",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "Tiếp tục",
     "deposit_edit_amount_done": "Nạp tiền",
     "deposit_edit_amount_predict_withdraw": "Rút tiền",
-    "deposit_edit_amount_musd_conversion": "Chuyển đổi sang mUSD"
+    "deposit_edit_amount_musd_conversion": "Chuyển đổi sang mUSD",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "Kết quả đã thay đổi",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "Hoán đổi",
     "terms_and_conditions": "Điều khoản và điều kiện",
     "select_token": "Chọn token",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "Không tìm thấy token",
     "no_tokens_found_description": "Chúng tôi không tìm thấy token nào với tên này. Hãy thử từ khóa tìm kiếm khác.",
     "select_network": "Chọn mạng",
@@ -7115,6 +7303,7 @@
     "receive_at": "Nhận tại",
     "recipient": "Người nhận",
     "select_recipient": "Chọn người nhận",
+    "select_account": "Chọn tài khoản",
     "external_account": "Tài khoản bên ngoài",
     "error_banner_description": "Lộ trình giao dịch này hiện không khả dụng. Hãy thử thay đổi số lượng, mạng hoặc token và chúng tôi sẽ tìm phương án tốt nhất.",
     "stock_token_error_banner_description": "Tuyến giao dịch này hiện không khả dụng. Hãy thử thay đổi số lượng, mạng hoặc token và chúng tôi sẽ tìm phương án tốt nhất.\n\nLưu ý, nếu bạn đang cố giao dịch Ondo Tokenised Stocks, bạn có thể bị hạn chế theo khu vực, ví dụ như tại Mỹ, Liên minh Châu Âu, Vương quốc Anh và Brazil.",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "Tác động giá cao",
     "price_impact_error_title": "Tác động giá rất cao",
     "price_impact_error_description": "Bạn sẽ mất khoảng {{priceImpact}} giá thị trường của token trong giao dịch hoán đổi này. Hãy thử giao dịch với số lượng nhỏ hơn hoặc một lộ trình có thanh khoản cao hơn để cải thiện tỷ giá.",
+    "insufficient_native_reserve_cta": "Sử dụng mức tối đa được cho phép",
+    "insufficient_native_reserve_message": "Mạng này yêu cầu tối thiểu {{minimumReserve}} {{ticker}} phải còn lại trong tài khoản của bạn. Bạn có thể sử dụng tối đa {{maxSwappable}} {{ticker}}",
+    "insufficient_native_reserve_title": "Yêu cầu số dư dự trữ tối thiểu {{ticker}}",
     "token_warning_suspicious_banner": "{{token}} là một token đáng ngờ.",
     "token_warning_malicious_banner": "{{token}} là một token độc hại. Hãy cẩn trọng khi tương tác với token này.",
     "token_warning_modal_suspicious_title": "Token đáng ngờ",
@@ -7542,17 +7734,17 @@
         "price": "Miễn phí",
         "feature_1": "Thẻ ảo dùng cho Apple Pay và Google Pay",
         "feature_2": "Thanh toán bằng tiền mã hoá (USDC, USDT, WETH, v.v.)",
-        "feature_3": "Hoàn tiền 1% USDC cho mỗi giao dịch mua hàng"
+        "feature_3": "Hoàn tiền 1% bằng mUSD cho mỗi giao dịch mua"
       },
       "metal_card": {
         "name": "Thẻ Metal",
         "price": "$199/năm",
         "everything_in_virtual": "Mọi thứ có trong thẻ ảo, cộng thêm:",
         "feature_1": "Thẻ kim loại khắc tên cao cấp",
-        "feature_2": "Hoàn tiền 3% cho $10.000 đầu tiên mỗi năm",
+        "feature_2": "Hoàn tiền 3% bằng mUSD cho $10.000 đầu tiên mỗi năm",
         "feature_3": "Không tính phí giao dịch quốc tế"
       },
-      "earn_up_to_badge": "Nhận tối đa $300 hoàn tiền mỗi năm",
+      "earn_up_to_badge": "Nhận hoàn tiền tối đa $300 bằng mUSD mỗi năm",
       "upgrade_to_metal_label": "Hoặc nâng cấp lên Metal để nhận phần thưởng gấp 3 lần"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "THẺ CỦA BẠN\nĐÃ ĐƯỢC ĐẶT",
       "subtitle": "Thẻ sẽ được gửi đến trong vòng 4 đến 6 tuần.",
-      "description": "Thiết lập thẻ ảo và thêm vào ví kỹ thuật số để bắt đầu nhận hoàn tiền.",
+      "description": "Thiết lập thẻ ảo và thêm vào ví kỹ thuật số để bắt đầu nhận hoàn tiền bằng mUSD.",
       "set_up_card_button": "Thiết lập thẻ",
       "back_to_card_button": "Quay lại Thẻ"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "Chi tiêu\nvà Nhận thưởng",
-      "description": "Thẻ MetaMask là cách nhanh chóng và\ndễ dàng để chi tiêu tiền mã hóa và\nnhận hoàn tiền tới 3%.",
+      "description": "MetaMask Card là cách nhanh chóng\nvà dễ dàng để chi tiêu tiền mã hóa của bạn\nvà nhận hoàn tiền lên đến 3% bằng mUSD.",
       "apply_now_button": "Thiết lập ngay",
       "login_button": "Đăng nhập",
       "not_now_button": "Không phải bây giờ",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "Kích hoạt thẻ",
       "enable_assets_button_label": "Kích hoạt tài sản",
       "spending_limit_warning": "Bạn sắp đạt đến hạn mức chi tiêu. Cập nhật để tránh bị từ chối.",
+      "spending_limit_available": "khả dụng",
       "logout": "Đăng xuất",
       "contact_support": "Liên hệ bộ phận hỗ trợ",
       "logout_confirmation_title": "Đăng xuất khỏi Thẻ?",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "Điều khoản và điều kiện",
         "order_metal_card": "Thẻ Metal",
         "order_metal_card_description": "Đặt hàng Thẻ Metal vật lý ngay",
-        "cashback": "Hoàn tiền",
-        "cashback_description": "Nhận lại 1% cho mọi chi tiêu",
-        "cashback_description_metal": "Nhận lại 3% cho mọi chi tiêu",
+        "cashback": "Hoàn tiền bằng mUSD",
+        "cashback_description": "Nhận hoàn tiền 1% bằng mUSD cho mọi khoản chi tiêu",
+        "cashback_description_metal": "Nhận hoàn tiền 3% bằng mUSD cho mọi khoản chi tiêu",
         "freeze_card": "Khóa thẻ",
         "unfreeze_card": "Mở khóa thẻ",
         "freeze_card_description": "Tạm dừng mọi chi tiêu trên thẻ của bạn",
@@ -7917,8 +8110,8 @@
       "token_label": "Token"
     },
     "cashback_screen": {
-      "title": "Hoàn tiền",
-      "available_cashback": "Hoàn tiền khả dụng",
+      "title": "Hoàn tiền bằng mUSD",
+      "available_cashback": "mUSD khả dụng",
       "network_fee": "Phí mạng",
       "expected_to_receive": "Dự kiến nhận được",
       "withdraw": "Rút tiền",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "Đã khởi tạo lệnh rút tiền",
       "withdrawal_success": "Rút tiền thành công",
       "withdrawal_failed": "Rút tiền thất bại. Vui lòng thử lại.",
-      "no_cashback": "Không có hoàn tiền khả dụng",
-      "loading_error": "Không thể tải thông tin hoàn tiền. Vui lòng thử lại."
+      "no_cashback": "Không có mUSD hoàn tiền khả dụng",
+      "loading_error": "Không thể tải thông tin hoàn tiền bằng mUSD. Vui lòng thử lại.",
+      "funding_required": {
+        "title": "Thiết lập nguồn tiền trên Linea",
+        "description": "Bạn cần ít nhất một nguồn tiền được phê duyệt trên Linea trước khi quy đổi hoàn tiền bằng mUSD.",
+        "confirm_button_label": "Thiết lập nguồn tiền"
+      }
     },
     "change_asset": {
       "title": "Thay đổi token và mạng",
@@ -8032,7 +8230,8 @@
     "title": "Chọn phương thức thanh toán",
     "title_receive": "Chọn token nhận được",
     "no_gas": "Không có số dư token gốc để trả phí gas",
-    "not_supported": "Không được hỗ trợ"
+    "not_supported": "Không được hỗ trợ",
+    "crypto": "Crypto"
   },
   "connection_removed_modal": {
     "title": "Kết nối đã bị xóa",
@@ -8048,6 +8247,15 @@
       "title": "Đăng ký tham gia thất bại",
       "description": "Kiểm tra kết nối của bạn và thử lại."
     },
+    "notifications_nudge": {
+      "title": "Đừng bỏ lỡ cơ hội",
+      "description": "Bật thông báo để luôn được cập nhật về các chiến dịch.",
+      "turn_on_button": "Bật",
+      "loading": "Đang bật thông báo...",
+      "loading_description": "Quá trình này có thể mất một chút thời gian.",
+      "enable_error": "Không thể bật thông báo",
+      "success": "Đã bật thông báo"
+    },
     "version_guard": {
       "title": "Yêu cầu cập nhật",
       "description": "Cần phiên bản MetaMask mới hơn để sử dụng Phần thưởng. Vui lòng cập nhật để tiếp tục.",
@@ -8126,6 +8334,17 @@
       "retry_button": "Thử lại"
     },
     "main_title": "Phần thưởng",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "Giới thiệu",
     "referral_stats_earned_from_referrals": "Nhận được từ giới thiệu",
     "referral_stats_referrals": "Giới thiệu",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "Tính năng tăng cường đang hoạt động",
     "season_1": "Mùa 1",
     "musd": {
-      "page_title": "mUSD",
-      "title": "Máy tính thưởng mUSD",
-      "description": "Xem bạn có thể nhận được bao nhiêu khi chuyển đổi đồng ổn định của mình sang mUSD.",
-      "amount_label": "Số lượng đã chuyển đổi",
-      "estimated_bonus": "Thưởng ước tính theo năm: tối đa 3%",
-      "initial_amount": "Số lượng ban đầu",
-      "daily_bonus": "Thưởng có thể nhận hằng ngày",
-      "annualized_bonus": "Thưởng theo năm",
-      "disclaimer": "Đây chỉ là ước tính. Phần thưởng có thể thay đổi.",
-      "disclaimer_brief": "Mức thưởng chỉ là ước tính và có thể thay đổi.",
+      "page_title": "Máy tính mUSD",
+      "hero_hold": "Nắm giữ mUSD.",
+      "hero_earn": "Kiếm lợi nhuận",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/năm",
+      "earnings_per_month_suffix": "/tháng",
+      "earnings_per_day_suffix": "/ngày có thể nhận hằng ngày",
+      "slider_amount_label": "Số lượng",
+      "disclaimer_calculator": "Ước tính dựa trên mức thưởng 3%. Tỷ lệ có thể thay đổi. Có thể nhận bất cứ lúc nào.",
       "buy_button": "Mua mUSD",
       "swap_button": "Hoán đổi sang mUSD"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "Kết thúc {{date}}",
       "ended_date": "Đã kết thúc {{date}}",
       "pill_up_next": "Sắp ra mắt",
+      "up_next": "Sắp tới",
+      "notify_me": "Thông báo cho tôi",
       "pill_active": "Đang diễn ra",
       "pill_complete": "Hoàn tất",
       "enter": "Tham gia",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "Không khả dụng tại khu vực của bạn",
       "geo_locked_toast_description": "Chiến dịch này không khả dụng tại khu vực của bạn. Vui lòng quay lại sau để xem các chiến dịch mới.",
       "geo_locked_cta": "Kiểm tra điều kiện đủ",
-      "geo_loading": "Đang kiểm tra khu vực..."
+      "geo_loading": "Đang kiểm tra khu vực...",
+      "remind_me_success_toast": "Chúng tôi sẽ thông báo cho bạn khi chiến dịch này bắt đầu.",
+      "remind_me_save_error": "Không thể lưu lời nhắc của bạn. Vui lòng thử lại."
     },
     "campaign_mechanics": {
       "title": "Cơ chế"
@@ -8479,10 +8701,10 @@
       "qualified_description": "Tăng dòng tiền vào ròng của bạn để đạt bậc cao hơn và có cơ hội nhận phần thưởng lớn hơn.",
       "not_eligible_title": "Không đủ điều kiện",
       "not_eligible_description": "Các giao dịch được mở quá muộn để đáp ứng yêu cầu nắm giữ {{days}} ngày sẽ không được tính vào thứ hạng hoặc bậc của bạn.",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "Tổng số người tham gia",
+      "completed_label_total_tvl": "Tổng TVL",
+      "completed_label_top_return": "Lợi nhuận cao nhất",
+      "completed_label_winners": "Người chiến thắng"
     },
     "ondo_campaign_activity": {
       "title": "Tất cả hoạt động",
@@ -8508,6 +8730,48 @@
       "cancel": "Hủy",
       "confirm": "Tôi hiểu"
     },
+    "perps_trading_campaign": {
+      "title": "Cuộc thi Giao dịch Hợp đồng vĩnh cửu",
+      "stats_title": "Thống kê",
+      "performance_title": "Hiệu suất",
+      "label_rank": "Xếp hạng",
+      "label_your_rank": "Thứ hạng của bạn",
+      "label_pnl": "Lãi/Lỗ",
+      "label_volume": "Khối lượng",
+      "label_notional_volume": "Khối lượng danh nghĩa",
+      "pending": "Chờ xử lý",
+      "qualified": "Đủ điều kiện",
+      "open_position_cta": "Vị thế đang mở",
+      "leaderboard_title": "Bảng xếp hạng",
+      "leaderboard_total_participants": "{{count}} người tham gia",
+      "last_updated": "Cập nhật lần cuối: {{time}}",
+      "leaderboard_error_loading": "Không thể tải bảng xếp hạng",
+      "leaderboard_error_loading_description": "Đã xảy ra lỗi khi tải bảng xếp hạng. Vui lòng thử lại.",
+      "leaderboard_not_yet_computed": "Bảng xếp hạng chưa được tính toán xong. Vui lòng quay lại sau.",
+      "leaderboard_powered_by_prefix": "Được cung cấp bởi ",
+      "leaderboard_hypertracker_brand": "HyperTracker",
+      "prize_pool_title": "Quỹ giải thưởng",
+      "prize_pool_current_label": "Hiện tại",
+      "prize_pool_next_label": "Tiếp theo",
+      "prize_pool_volume_subtext": "Khối lượng {{current}}/{{target}}",
+      "prize_pool_max_tier_subtext": "Khối lượng {{maxThreshold}}+ — đã đạt tất cả các mốc",
+      "prize_pool_max_badge": "Tối đa",
+      "prize_pool_error_title": "Không thể tải quỹ giải thưởng",
+      "prize_pool_error_description": "Đã xảy ra lỗi khi tải quỹ giải thưởng. Vui lòng thử lại.",
+      "prize_pool_retry_button": "Thử lại",
+      "stats_notional_volume_threshold": "Yêu cầu ${{amount}}",
+      "stats_qualified_title": "Bạn đủ điều kiện",
+      "stats_qualified_description": "Tiếp tục giao dịch để cải thiện Lãi/Lỗ và leo lên bảng xếp hạng trước khi cuộc thi kết thúc.",
+      "stats_qualify_for_rank_title": "Đủ điều kiện cho hạng này",
+      "stats_qualify_for_rank_description": "Giao dịch thêm {{notionalRemaining}} khối lượng danh nghĩa để đủ điều kiện tham gia.",
+      "stats_error_title": "Không thể tải số liệu thống kê",
+      "stats_error_description": "Chúng tôi đã gặp sự cố khi tải số liệu thống kê của bạn. Vui lòng thử lại.",
+      "stats_retry": "Thử lại",
+      "completed_label_total_participants": "Tổng số người tham gia",
+      "completed_label_total_volume": "Tổng khối lượng",
+      "completed_label_top_pnl": "Lãi/Lỗ cao nhất",
+      "completed_label_winners": "Người chiến thắng"
+    },
     "campaigns_preview": {
       "title": "Chiến dịch",
       "coming_soon": "Sắp ra mắt",
@@ -8532,29 +8796,29 @@
       "retry_button": "Thử lại",
       "refreshing": "Đang làm mới..."
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "Bạn đã thắng",
       "rank_label": "Hạng {{place}}",
-      "email_instructions": "Gửi email đến ondocampaign@consensys.net kèm mã của bạn để nhận thưởng.",
+      "email_instructions": "Gửi email đến {{email}} kèm mã của bạn để nhận giải thưởng.",
       "open_mail": "Mở thư",
       "skip_for_now": "Bỏ qua bây giờ",
-      "mail_subject": "Nhận thưởng chiến dịch Ondo",
+      "mail_subject": "Nhận giải thưởng {{campaignName}}",
       "mail_body": "Mã trúng thưởng của tôi: {{code}}",
       "winning_code": "Mã trúng thưởng",
       "close_a11y": "Đóng"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "Bạn đã thắng",
-        "description": "Nhận giải thưởng của bạn ngay hôm nay.",
-        "a11y": "Mở thông tin người chiến thắng"
+        "title": "Bạn đã thắng!",
+        "description": "Xác minh mã chiến thắng của bạn và nhận giải thưởng ngay hôm nay.",
+        "a11y": "Xem chi tiết"
       },
       "participant_pending": {
         "title": "Chiến dịch đã kết thúc.",
         "description": "Chúng tôi đang xác định kết quả. Hãy quay lại sau."
       },
       "participant_finalized": {
-        "title": "Kết quả chiến dịch đã có",
+        "title": "Kết quả chiến dịch đã có.",
         "description": "Lần này bạn đã không giành chiến thắng. Hãy kiểm tra bảng xếp hạng để xem bạn đứng ở vị trí nào."
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "Phần thưởng của bạn đang được gửi — chúng tôi sẽ sớm liên hệ với bạn."
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "Bạn đã thắng 💰",
-        "description": "Nhận giải thưởng của bạn từ {{campaignName}}",
+        "description": "Nhận giải thưởng từ {{campaignName}} ngay hôm nay.",
         "cta": "Xem chi tiết"
       },
-      "participant_no_winner": {
-        "title": "Kết quả đã có. 🏅",
-        "description": "Xem thứ hạng của bạn trong {{campaignName}}",
+      "non_winner": {
+        "title": "Kết quả đã có 🏅",
+        "description": "Xem thứ hạng của bạn trong {{campaignName}}.",
         "cta": "Xem"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "Đã nhận tiền thắng",
       "predict_deposit": "Tài khoản Dự đoán đã được nạp tiền",
       "predict_withdraw": "Rút tiền",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "Nạp tiền vào Tài khoản Tài chính",
+      "money_account_withdraw": "Chuyển tiền từ Tài khoản Tài chính",
       "default": "Chi tiết giao dịch"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "Khám phá",
+    "crypto_movers": "Tiền mã hóa biến động mạnh",
+    "perps_movers": "Hợp đồng vĩnh cửu biến động mạnh",
     "trending_tokens": "Xu hướng",
+    "crypto": "Crypto",
     "stocks": "Cổ phiếu",
     "price_change": "Biến động giá",
     "all_networks": "Tất cả mạng",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 giờ",
     "5_minutes": "5 phút",
     "networks": "Mạng",
+    "ecosystems": "Hệ sinh thái",
+    "ecosystems_subtitle": "Khám phá các dapp, token và NFT trên nhiều chuỗi khác nhau trong MetaMask Portfolio",
+    "all_sports": "Môn thể thao phổ biến",
+    "basketball": "Bóng rổ",
+    "football": "Bóng bầu dục",
+    "soccer": "Bóng đá",
+    "tennis": "Quần vợt",
+    "f1": "F1",
+    "golf": "Golf",
+    "all_sports_no_markets": "Chưa có thị trường mở nào trong danh mục này. Hãy quay lại sau hoặc chọn môn thể thao khác ở trên.",
+    "load_more": "Tải thêm",
     "sort_by": "Sắp xếp theo",
     "volume": "Khối lượng",
     "market_cap": "Vốn hóa thị trường",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "Tìm kiếm token, trang web, URL",
     "cancel": "Hủy",
     "perps": "Vĩnh cửu",
+    "rwa_perps_section": "Vĩnh cửu",
+    "macro_stocks_commodity_perps": "Vĩnh cửu",
+    "macro_pill_stocks": "Cổ phiếu",
+    "macro_pill_commodities": "Hàng hóa",
+    "rwa_pill_commodities": "Hàng hóa",
+    "rwa_pill_stocks": "Cổ phiếu",
+    "rwa_pill_forex": "Ngoại hối",
+    "crypto_perps_section": "Vĩnh cửu",
     "predictions": "Dự đoán",
     "no_results": "Không tìm thấy kết quả",
+    "popular": "Phổ biến",
     "sites": "Trang web",
     "popular_sites": "Trang web phổ biến",
     "search_sites": "Tìm kiếm trang web",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "Không tìm thấy token",
       "description": "Chúng tôi không thể tìm thấy token này"
+    },
+    "tabs": {
+      "now": "Ngay bây giờ",
+      "macro": "Vĩ mô",
+      "rwas": "RWA",
+      "crypto": "Crypto",
+      "sports": "Thể thao",
+      "dapps": "Trang web"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "Hủy",
-      "continue": "Tiếp tục"
+      "continue": "Tiếp tục",
+      "learn_more": "Tìm hiểu thêm",
+      "try_again": "Thử lại"
     },
     "connecting": {
       "title": "Đang kết nối {{device}} của bạn...",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "Vui lòng bật Bluetooth để kết nối với thiết bị của bạn",
       "bluetooth_scan_failed": "Không thể quét thiết bị. Vui lòng thử lại",
       "bluetooth_connection_failed": "Kết nối với thiết bị của bạn không thành công. Vui lòng thử lại",
+      "camera_permission_denied": "Cần cấp quyền truy cập camera để quét mã QR. Vui lòng bật quyền này trong cài đặt thiết bị của bạn",
       "not_supported": "Thao tác này không được hỗ trợ",
       "unknown_error": "Đảm bảo {{device}} của bạn đã được thiết lập với Cụm từ khôi phục bí mật hoặc cụm mật khẩu cho tài khoản này"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "Yêu cầu quyền truy cập Vị trí",
       "nearby_devices_permission_denied": "Yêu cầu quyền truy cập Thiết bị lân cận",
       "scan_failed": "Quét thất bại",
+      "camera_permission_denied": "Yêu cầu quyền truy cập camera",
       "something_went_wrong": "Đã xảy ra sự cố"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "Quét mã QR đồng bộ ví",
+          "body": "Quay lại ví cứng của bạn và tìm tùy chọn chia sẻ hoặc xuất tài khoản, chọn MetaMask, sau đó quét mã QR."
+        },
+        "sign": {
+          "title": "Quét mã QR chữ ký",
+          "body": "Quay lại ví cứng của bạn và chấp thuận giao dịch, sau đó quét mã QR hiển thị."
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "Sai mã QR",
+          "body": "Quay lại ví cứng của bạn, chọn MetaMask làm loại ví, sau đó tạo và quét mã QR mới."
+        },
+        "sign": {
+          "title": "Sai mã QR",
+          "body": "Quay lại ví cứng của bạn và chấp thuận giao dịch, sau đó quét mã QR hiển thị."
+        }
+      },
+      "ur_decode_error": {
+        "title": "Không thể đọc mã QR",
+        "body": "Đảm bảo mã QR hiển thị đầy đủ và đủ ánh sáng, sau đó thử lại. Nếu sự cố vẫn tiếp diễn, bạn có thể cần cập nhật firmware của ví cứng."
+      }
+    },
     "device_selection": {
       "title": "Chọn {{device}}",
       "scanning": "Đang quét thiết bị...",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Tài chính",
-      "cash_empty_description": "Bạn chưa có mUSD. Hãy chuyển đổi đồng ổn định sang mUSD từ mục Tài chính trên trang chủ.",
-      "cash_empty_description_network_filter": "Không có mUSD trên mạng này. Hãy chuyển mạng để xem mUSD của bạn.",
+      "money": "Tài chính",
+      "money_empty_description": "Bạn chưa có mUSD. Hãy chuyển đổi đồng ổn định sang mUSD từ mục Tài chính trên trang chủ.",
+      "money_empty_description_network_filter": "Không có mUSD trên mạng này. Hãy chuyển mạng để xem mUSD của bạn.",
+      "money_empty_state": {
+        "get_started": "Bắt đầu",
+        "earn_apy": "Nhận {{percentage}}% APY"
+      },
+      "money_filled_state": {
+        "add": "Thêm",
+        "apy": "APY {{percentage}}%"
+      },
       "tokens": "Token",
+      "perps": "Vĩnh cửu",
+      "related_assets": "Tài sản liên quan",
       "perpetuals": "Hợp đồng vĩnh cửu",
       "predictions": "Dự đoán",
       "whats_happening": "Tình hình hiện nay",
+      "whats_happening_ai": "AI",
+      "whats_happening_impact": {
+        "bullish": "Xu hướng tăng",
+        "bearish": "Xu hướng giảm",
+        "neutral": "Trung lập"
+      },
       "top_traders": "Nhà giao dịch hàng đầu",
       "whats_happening_categories": {
         "geopolitical": "Địa chính trị",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "Không thể tải {{section}}",
       "retry": "Thử lại"
     }
+  },
+  "sites": {
+    "popular": "Phổ biến"
   }
-}
+}
\ No newline at end of file
diff --git a/locales/languages/zh.json b/locales/languages/zh.json
index 82ba35a0a88..f544d1a0682 100644
--- a/locales/languages/zh.json
+++ b/locales/languages/zh.json
@@ -634,7 +634,8 @@
     "trade": "交易",
     "settings": "设置",
     "rewards": "奖励",
-    "trending": "探索"
+    "trending": "探索",
+    "money": "Money"
   },
   "drawer": {
     "send_button": "发送",
@@ -708,7 +709,11 @@
     "smart_contract_address": "智能合约地址",
     "smart_contract_address_warning": "该代币接收地址可能不支持直接转账，这可能导致资金损失。建议仅在确认该合约能够接收转账的情况下继续操作。",
     "i_understand": "我理解",
-    "cancel": "取消"
+    "cancel": "取消",
+    "new_address_title": "新地址",
+    "new_address_message": "这是您首次向此地址付款。继续操作前，请确保地址无误：",
+    "alert_navigation_previous": "上一个提醒",
+    "alert_navigation_next": "下一个提醒"
   },
   "unified_ramp": {
     "networks_filter_bar": {
@@ -1021,7 +1026,7 @@
       }
     },
     "notification_preferences": {
-      "title": "Top traders",
+      "title": "顶级交易员",
       "allow_push_notifications": "允许推送通知",
       "trades_over_label": "当交易超过以下金额时获取通知：",
       "traders_you_follow": "您关注的交易者",
@@ -1030,14 +1035,14 @@
       "error_loading_followed": "无法加载您关注的交易者。"
     },
     "trader_notifications": {
-      "title": "Notifications from {{traderName}}",
+      "title": "来自{{traderName}}的通知",
       "allow_push_notifications": "允许推送通知",
-      "allow_push_notifications_desc": "Get notified on {{traderName}}'s trading activity",
-      "manage_traders": "Manage traders you follow",
+      "allow_push_notifications_desc": "获取{{traderName}}交易活动的通知",
+      "manage_traders": "管理您关注的交易员",
       "save": "保存"
     },
     "trader_notifications_setup": {
-      "description": "Get real-time alerts on trades from the traders you follow",
+      "description": "实时获取您所关注交易员的交易提醒",
       "allow_push_notifications": "允许推送通知",
       "trades_over_label": "当交易超过以下金额时获取通知：",
       "save": "保存",
@@ -1059,7 +1064,12 @@
       "closed": "已平仓",
       "no_positions": "暂无持仓",
       "error_loading_profile": "无法加载个人资料",
-      "twitter_link": "View on X (Twitter)"
+      "twitter_link": "在X(Twitter)上查看",
+      "sort": {
+        "value": "价值",
+        "pnl_percent": "损益 %",
+        "recent": "Recent"
+      }
     },
     "trader_position": {
       "market_cap": "市值",
@@ -1070,10 +1080,10 @@
       "sold": "{{name}} 已卖出",
       "no_trades": "此时间段内无交易",
       "closed_position": "已平仓位",
-      "fallback_title": "Position not available",
-      "fallback_subtitle": "We couldn't load this position right now.",
-      "fallback_back_to_profile": "Back to profile",
-      "fallback_back_to_leaderboard": "Back to leaderboard"
+      "fallback_title": "仓位不可用",
+      "fallback_subtitle": "我们目前无法加载此仓位。",
+      "fallback_back_to_profile": "返回个人主页",
+      "fallback_back_to_leaderboard": "返回排行榜"
     },
     "quick_buy": {
       "title": "买入 {{symbol}}",
@@ -2216,6 +2226,38 @@
   },
   "predict": {
     "title": "MetaMask 预测",
+    "world_cup": {
+      "title": "World Cup",
+      "banner_title": "World Cup 2026",
+      "banner_description": "Trade on World Cup markets",
+      "tabs": {
+        "all": "All",
+        "props": "Props",
+        "live": "Live"
+      },
+      "stages": {
+        "group_stage": "Group Stage",
+        "round_of_32": "Round of 32",
+        "round_of_16": "Round of 16",
+        "quarterfinals": "Quarterfinals",
+        "semifinals": "Semifinals",
+        "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",
+        "third_place_match": "Third Place Match"
+      }
+    },
     "prediction_markets": "预测市场",
     "market_list": "市场列表",
     "loading": "正在加载...",
@@ -2446,6 +2488,12 @@
         }
       }
     },
+    "payment": {
+      "change_payment_method": "更改支付方式",
+      "add_funds": "充值",
+      "add": "添加",
+      "predict_balance": "预测余额"
+    },
     "order": {
       "available": "可用",
       "cashed_out": "已提现",
@@ -2471,9 +2519,9 @@
       "market_busy_body_buy": "市场波动剧烈，因此我们无法以 {{price}} 的价格买入。是否以当前最优可用价格再次尝试买入？",
       "market_busy_body_sell": "市场波动剧烈，因此我们无法以 {{price}} 的价格卖出。是否以当前最优可用价格再次尝试卖出？",
       "order_failed_title": "订单下达失败",
-      "order_failed_body": "Your order couldn't be filled. Try again?",
-      "price_changed_title": "Price changed",
-      "price_changed_body": "Couldn't buy at {{price}}. Try at market price?",
+      "order_failed_body": "您的订单无法成交。要再试一次吗？",
+      "price_changed_title": "价格已变动",
+      "price_changed_body": "无法以 {{price}} 的价格买入。尝试按市价买入？",
       "retry": "重试",
       "try_again": "请重试",
       "view": "查看",
@@ -2489,6 +2537,9 @@
       "withdraw_completed": "提取完成",
       "withdraw_completed_subtitle": "{{amount}} USDC 已转移到您的钱包",
       "withdraw_any_token_completed_subtitle": "{{amount}} {{token}} 已转入您的钱包",
+      "unavailable_title": "Withdrawals temporarily unavailable",
+      "unavailable_description": "For urgent assistance, please contact Customer Service.",
+      "unavailable_got_it": "知道了",
       "error_title": "出错了......",
       "error_description": "提款处理失败",
       "try_again": "请重试"
@@ -2668,6 +2719,22 @@
     "token_is_needed_to_continue": "需要 {{tokenSymbol}} 以继续",
     "fund_your_wallet": "为您的钱包充值",
     "get_ready_for_web3": "准备好钱包以便使用 Web3",
+    "home_onboarding_steps": {
+      "header": "步骤",
+      "get_started_title": "开始使用MetaMask",
+      "fund_title": "为您的钱包充值",
+      "fund_subtitle": "谁都不想钱包空空如也。轻松充值即可开始交易。",
+      "fund_primary": "充值",
+      "trade_title": "完成您的首笔交易",
+      "trade_subtitle": "在多个网络上交易热门代币，助推您的投资组合增长。",
+      "trade_primary": "交易",
+      "notifications_title": "开启通知",
+      "notifications_subtitle": "实时掌握市场变化，为您的投资组合做出最佳决策。",
+      "notifications_primary": "开启",
+      "skip": "跳过",
+      "progress_a11y": "第 {{current}} 步（共 {{total}} 步）",
+      "balance_loading_a11y": "正在加载钱包余额"
+    },
     "add_funds": "充值",
     "next": "下一步",
     "buy_asset": "买入 {{asset}}",
@@ -3314,6 +3381,8 @@
     "invalid_number_range": "无效数字。输入1至%{maxSafeChainId}之间的数字",
     "hide_zero_balance_tokens_title": "隐藏没有余额的代币",
     "hide_zero_balance_tokens_desc": "防止没有余额的代币显示在您的代币列表中。",
+    "haptic_feedback_title": "振动反馈",
+    "haptic_feedback_desc": "在确认、出现错误和交互时伴有轻微振动。禁用可减少此类提醒。",
     "token_detection_title": "自动检测代币",
     "token_detection_description": "我们使用第三方 API 来检测和显示发送到您钱包的新代币。如果您不希望该应用程序从这些服务中获取数据，请关闭。",
     "theme_button_text": "更改主题",
@@ -3440,11 +3509,11 @@
         "quote_tag_most_reliable": "最可靠",
         "quote_unknown_provider": "未知提供商",
         "start_headless_buy": "启动无头购买",
-        "replace_and_start_headless_buy": "Replace & start headless buy",
+        "replace_and_start_headless_buy": "替换并开始无感购买",
         "start_headless_buy_disabled_hint": "输入有效金额以启用",
         "start_headless_buy_pending": "无头会话运行中——开启 BuildQuote",
         "cancel_headless_buy": "取消无头会话",
-        "active_session_hint": "Active session: {{sessionId}} — starting another quote will cancel it.",
+        "active_session_hint": "当前会话：{{sessionId}} —— 获取新报价将终止此流程。",
         "event_log_title": "事件日志",
         "event_log_empty": "暂无事件——启动无头会话，并关注此区域。",
         "event_log_started": "已启动会话 {{sessionId}}（资产={{assetId}}，金额={{amount}}，支付方式={{paymentMethodId}}{{providerSuffix}}）",
@@ -3454,10 +3523,10 @@
         "event_log_cancelled": "消费者已取消会话 {{sessionId}}"
       },
       "headless_host": {
-        "title": "Headless buy",
-        "loading": "Preparing the buy flow…",
-        "no_session": "Headless session is no longer active.",
-        "cancel": "Cancel"
+        "title": "无感购买",
+        "loading": "正在准备购买流程…",
+        "no_session": "无感购买会话已失效。",
+        "cancel": "取消"
       }
     },
     "request_feature": "功能请求",
@@ -3553,7 +3622,7 @@
     "security_alerts": "安全警报",
     "security_alerts_desc": "此功能通过本地审查您的交易和签名请求来提醒您注意恶意活动。在批准任何请求之前，请务必自行进行审慎调查。无法保证此功能能够检测到所有恶意活动。启用此功能即表示您同意提供商的使用条款。",
     "smart_account_dapp_requests_heading": "来自 dapp 的智能账户请求",
-    "smart_account_dapp_requests_desc_v2": "Let dapps request smart account features for standard accounts. MetaMask will only upgrade to our audited smart account.",
+    "smart_account_dapp_requests_desc_v2": "允许 dApp 为常规账户请求智能账户功能 。MetaMask 仅会升级至经我们安全审计的智能账户。",
     "smart_transactions_opt_in_heading": "智能交易",
     "smart_transactions_opt_in_desc_supported_networks": "开启智能交易，以便在支持网络上实现更加安全可靠的交易。",
     "smart_transactions_learn_more": "了解详情",
@@ -3572,6 +3641,39 @@
         "title": "卡",
         "reset_onboarding_description": "重设卡绑定状态，使绑定流程从头开始。",
         "reset_onboarding_button": "重设绑定状态"
+      },
+      "haptics": {
+        "title": "振动",
+        "description": "在实体设备上体验振动效果。此操作将绕过应用内的“减弱触感”设置和远程开关，以便您测试各种反馈模式。模拟器通常无法触发振动。",
+        "catalog_impacts_heading": "交互场景预设反馈",
+        "notifications_heading": "通知提醒模式",
+        "selection_heading": "选择",
+        "notification_success_button": "通知 — 成功",
+        "notification_error_button": "通知 — 错误",
+        "notification_warning_button": "通知 — 警告",
+        "selection_button": "选择",
+        "raw_impacts_heading": "Expo 原始触感样式",
+        "raw_impacts_desc": "直接调用 expo-haptics 的原始触感样式，方便与上方关联的场景预设进行对比。",
+        "impacts": {
+          "quick_amount_selection": "触感反馈 —— 快速选择金额",
+          "slider_tick": "触感反馈 —— 滑块刻度",
+          "edge_gesture_engage": "触感反馈 —— 边缘手势触发",
+          "page_navigation": "触感反馈 —— 页面切换",
+          "slider_grip": "触感反馈 —— 抓取滑块",
+          "tab_change": "触感反馈 — 标签页切换",
+          "primary_cta": "触感反馈 — 主要行动按钮",
+          "pull_to_refresh_engage": "触感反馈 — 下拉刷新（触发）",
+          "pull_to_refresh": "触感反馈 — 下拉刷新（释放）",
+          "chart_crosshair": "触感反馈 — 图表十字准星",
+          "follow_toggle": "触感反馈 — 关注开关切换"
+        },
+        "raw_styles": {
+          "light": "原始触感 —— 轻微",
+          "medium": "原始触感 —— 中等",
+          "heavy": "原始触感 —— 强烈",
+          "rigid": "原始触感 —— 硬实",
+          "soft": "原始触感 —— 柔和"
+        }
       }
     },
     "feature_flag_override": {
@@ -3740,6 +3842,8 @@
     "predict_button": "预测",
     "add_collectible_button": "添加",
     "info": "信息",
+    "batch_sell": "Batch Sell",
+    "batch_sell_new_label": "New",
     "swap": "兑换",
     "convert": "兑换",
     "bridge": "桥接",
@@ -3779,6 +3883,7 @@
     "troubleshoot": "故障排除",
     "deposit_description": "低手续费的银行或卡转账",
     "buy_description": "适合购买特定代币",
+    "batch_sell_description": "Sell up to 5 tokens for a stablecoin",
     "sell_description": "卖出加密货币换取现金",
     "swap_description": "代币之间的兑换",
     "bridge_description": "在不同网络间传送代币",
@@ -4333,8 +4438,8 @@
     "tx_details_free": "免费",
     "tx_details_not_available": "不可用",
     "smart_contract_interaction": "智能合约交互",
-    "money_account_deposit": "Deposit to Money Account",
-    "money_account_withdraw": "Transfer from Money Account",
+    "money_account_deposit": "向 Money 账户充值",
+    "money_account_withdraw": "从 Money 账户提现",
     "swaps_transaction": "兑换交易",
     "bridge_transaction": "桥接",
     "approve": "批准",
@@ -6430,10 +6535,17 @@
       },
       "education": {
         "heading": "获取 {{percentage}}% 稳定币收益",
-        "description": "将您的稳定币兑换为 mUSD，即可赚取高达 {{percentage}}% 的年化奖励，该奖励每日可领取。",
+        "description": "将您的稳定币兑换为 mUSD，即可赚取 {{percentage}}% 的年化奖励。",
         "terms_apply": "具体条款适用。",
         "primary_button": "开始",
-        "secondary_button": "暂时不"
+        "secondary_button": "暂时不",
+        "checklist": {
+          "dollar_backed": "美元挂钩",
+          "no_lockups": "无锁仓限制",
+          "daily_bonus": "每日奖励",
+          "metamask_stablecoins": "MetaMask稳定币",
+          "no_metamask_fee": "无 MetaMask 手续费"
+        }
       },
       "buy_musd": "购买 mUSD",
       "get_musd": "获取 mUSD",
@@ -6477,12 +6589,14 @@
   },
   "money": {
     "title": "Money",
+    "your_balance": "您的余额",
     "apy_label": "{{percentage}}% 年化收益率",
+    "apy_currency_suffix": " • mUSD",
     "apy_info_label": "年收益率信息",
     "onboarding": {
       "step_progress": "第 {{current}} 步（共 {{total}} 步）",
       "title": "存入资金",
-      "description": "购买 mUSD，即日起赚取年化收益。",
+      "description": "为您的账户充值并开始赚取收益（APY）。",
       "add": "添加",
       "step2_title": "获取您的 MetaMask 卡",
       "step2_description": "在任何受理万事达卡的地方，使用您的 Money 账户余额消费，同时赚取收益。",
@@ -6497,22 +6611,32 @@
       "card": "卡"
     },
     "earnings": {
-      "title": "收益",
-      "lifetime": "累计收益",
-      "projected": "预估收益"
+      "title": "预估收益",
+      "estimated_monthly": "每月",
+      "estimated_yearly": "年化",
+      "info_label": "收益信息"
     },
     "how_it_works": {
       "title": "如何运行",
-      "description_prefix": "在 Money 账户中持有 mUSD 即可自动赚取收益",
-      "description_suffix": "。它由美元支持，始终具备高流动性，可随时用于消费、交易或转账。"
+      "description_prefix": "Deposit mUSD into your Money account and earn up to",
+      "description_suffix": ". Your balance is dollar-backed and ready to spend, trade, or send anytime."
     },
     "musd_row": {
       "add": "添加"
     },
+    "balance_card": {
+      "label": "Money 余额",
+      "add": "添加",
+      "info_sheet_title": "Money balance",
+      "info_sheet_body": "Your dollar-backed mUSD balance that's always available to spend, send, or trade anytime. We don't calculate this into your total account balance.\n\nWithdrawals process immediately, subject to standard network confirmation times on the relevant blockchain. If liquidity is tight, there may be temporary delays."
+    },
     "potential_earnings": {
       "title": "用您的加密货币赚取收益",
       "description": "了解将您的加密货币转换为 mUSD 后，资金如何随时间增值。",
+      "description_with_amounts_prefix": "Convert your {{total}} in assets and you could earn up to",
+      "description_with_amounts_suffix": "in one year.",
       "convert": "兑换",
+      "convert_cta": "Convert your crypto",
       "no_fee": "无 MetaMask 手续费",
       "view_all": "查看全部",
       "view_potential_earnings": "查看潜在收益"
@@ -6522,37 +6646,75 @@
       "subtitle": "可随处使用您的资金。",
       "virtual_card": "虚拟卡",
       "metal_card": "金属卡",
-      "cashback": "{{percentage}}% 返现",
+      "cashback": "{{percentage}}% mUSD 返现",
       "get_now": "立即获取",
       "link_title": "关联 MetaMask 卡",
-      "link_subtitle": "使用您的 Money 账户余额消费并赚取收益。",
-      "link_bullet_cashback": "最高可享 3% 返现",
-      "link_bullet_apy": "高达 {{apy}}% 年化收益率",
-      "link_card": "关联卡"
+      "link_subtitle": "Spend your Money balance and earn on purchases. Plus, up to {{apy}}% APY on your balance.",
+      "link_bullet_cashback": "Get {{percentage}}% mUSD back",
+      "link_bullet_apy": "Earn up to {{apy}}% APY",
+      "link_card": "关联卡",
+      "link_pending_title": "Linking card",
+      "link_pending_description": "Approving spending limit…",
+      "link_success_title": "Card linked successfully",
+      "link_success_description": "You can now spend while you earn",
+      "link_error": "Couldn't link card",
+      "manage_card": "Manage",
+      "avail_balance": "Avail. balance"
     },
     "what_you_get": {
       "title": "您将获得",
-      "benefit_auto_earn": "自动赚取 ",
+      "benefit_auto_earn": "Auto-earn up to",
       "benefit_dollar_backed": "将您的资金安全存放于 mUSD（一种 1:1 锚定美元的稳定币）",
       "benefit_liquidity": "享受完全流动性，无锁仓期限制，可随时交易或提现",
       "benefit_spend_prefix": "通过 MetaMask 卡可在超过 1.5 亿家商户消费，并赚取 ",
-      "benefit_spend_cashback": "1-3% 返现",
-      "benefit_transfer": "将资金转入您 MetaMask 中的任意钱包",
-      "benefit_global": "全球收发资金",
+      "benefit_spend_cashback": "1-3% mUSD 返现",
+      "benefit_transfer": "Transfer to any of your wallets across MetaMask",
+      "benefit_global": "Send and receive funds globally",
       "learn_more": "了解详情"
     },
     "footer": {
-      "add_money": "存入资金"
+      "add_money": "Add funds"
     },
     "add_money_sheet": {
-      "title": "存入资金",
-      "convert_crypto": "Convert crypto",
+      "title": "Add funds",
+      "convert_crypto": "兑换加密货币",
+      "convert_crypto_description": "From any account",
       "deposit_funds": "存入资金",
-      "move_musd": "Move your {{amount}} mUSD",
-      "move_musd_no_amount": "Move your mUSD",
-      "receive_external": "Receive from external wallet",
+      "deposit_funds_description": "From debit card or bank",
+      "move_musd": "Transfer your {{amount}} mUSD",
+      "move_musd_no_amount": "Transfer your mUSD",
+      "move_musd_description": "From your balance",
+      "receive_external": "从外部钱包收款",
       "coming_soon": "即将推出"
     },
+    "more_sheet": {
+      "title": "展开",
+      "how_it_works": "如何运行",
+      "what_you_get": "您将获得",
+      "contact_support": "联系支持团队"
+    },
+    "transfer_sheet": {
+      "title": "Transfer funds",
+      "between_accounts": "账户间转账",
+      "perps_account": "永续合约（Perps）账户",
+      "predictions_account": "预测（Predictions）账户",
+      "send_external": "发送至外部地址",
+      "withdraw_to_bank": "提现至银行卡"
+    },
+    "apy_tooltip": {
+      "title": "年化收益率（APY）",
+      "paragraph_1": "您的Money账户可自动赚取最高{{percentage}}%的收益。",
+      "paragraph_2": "显示的利率是根据当前市场状况估算的年化收益率 (APY)。APY 是浮动的，可能会因各种因素而改变。该利率由在区块链协议中部署资金的第三方 DeFi 平台产生。",
+      "paragraph_3": "当您关联 MetaMask Card 后，消费金额将从此余额中扣除。"
+    },
+    "earnings_tooltip": {
+      "title": "预估收益",
+      "body": "根据您当前的余额和今天的 APY，估算您在一段时间内可能赚取的收益。预估收益仅供参考，不代表实际到账收益，且可能随市场波动。"
+    },
+    "earn_crypto_info_sheet": {
+      "title": "Earn on your crypto",
+      "body": "Illustration assumes {{percentage}}% Annual Percentage Yield (APY) remains unchanged for one year. APY is variable and may change due to various factors. No guarantee of return."
+    },
     "activity": {
       "title": "活动",
       "view_all": "查看全部",
@@ -6595,11 +6757,11 @@
     "how_it_works_page": {
       "header_title": "Money",
       "section_title": "如何运行",
-      "description_1": "您的 Money 账户自动赚取 4% 年化收益率（浮动）。资金存入精选 DeFi 金库，在经审计的借贷市场中产生收益——无需质押、无需领取、无锁仓。",
+      "description_1": "Deposit mUSD into your Money account and earn up to {{percentage}}% APY (variable) automatically. Funds go into a DeFi vault that generates returns across audited lending markets—no staking, no claiming, no lock-ups.",
       "description_2": "您的 Money 账户余额即您的消费余额。关联您的 MetaMask 卡，即可在全球超过 1.5 亿家商户消费。您的资金在您使用之前会持续赚取收益。",
-      "faq_title": "常见问题解答",
+      "faq_title": "Frequently asked questions",
       "faq_placeholder_answer": "即将推出.",
-      "faq_q1": "什么是 Money 账户？",
+      "faq_q1": "How does the {{percentage}}% APY work?",
       "faq_q2": "什么是 mUSD？",
       "faq_q3": "收益从何而来？",
       "faq_q4": "我的资金会被锁定吗？可以随时提现吗？",
@@ -6608,8 +6770,7 @@
       "faq_q7": "年化收益率会变化吗？",
       "faq_q8": "这是储蓄账户还是消费账户？",
       "faq_q9": "谁控制我的资金？",
-      "faq_q10": "MetaMask 卡提供哪些返现？",
-      "sounds_good": "听起来不错"
+      "faq_q10": "使用 MetaMask Card 可以获得多少 mUSD 返现？"
     }
   },
   "stake": {
@@ -6867,6 +7028,14 @@
   "confirm": {
     "cancel": "取消",
     "confirm": "确认",
+    "pay_with_bottom_sheet": {
+      "title": "支付方式：",
+      "last_used": "Last used",
+      "crypto": "Crypto",
+      "available_balance": "{{balance}} available",
+      "other_assets": "Other assets",
+      "other_assets_description": "Select from your tokens"
+    },
     "staking_footer": {
       "part1": "继续即表示您同意我们的 ",
       "terms_of_use": "使用条款",
@@ -6918,8 +7087,8 @@
       "perps_withdraw": "提取",
       "predict_deposit": "存入预测资金",
       "predict_withdraw": "提取",
-      "money_account_deposit": "充值",
-      "money_account_withdraw": "提取资金"
+      "money_account_add_money": "存入资金",
+      "money_account_transfer_money": "转账"
     },
     "sub_title": {
       "permit": "该网站想获得花费您的代币的许可。",
@@ -6939,7 +7108,7 @@
         "transaction_fee": "我们将在永续合约所用的 HyperCore 网络上将您的代币兑换为 USDC。兑换提供商可能收取费用，但 MetaMask 不另收费。"
       },
       "predict_deposit": {
-        "transaction_fee": "我们将在预测所使用的 Polygon 网络上将您的代币兑换为 USDC.e。兑换提供商可能收取费用，但 MetaMask 不收取费用。"
+        "transaction_fee": "我们将在预测所使用的 Polygon 网络上将您的代币兑换为 pUSD。兑换提供商可能收取费用，但 MetaMask 不收取费用。"
       },
       "perps_withdraw": {
         "transaction_fee": "MetaMask 将为您兑换为您想要的代币。兑换至 mUSD 时，MetaMask 不收取任何费用。"
@@ -6950,6 +7119,9 @@
       "musd_conversion": {
         "transaction_fee": "mUSD 兑换费用包含网络费用，并可能包含提供商费用。兑换为 mUSD 时，MetaMask 不收取任何费用。"
       },
+      "money_account_withdraw": {
+        "transaction_fee": "MetaMask will swap your mUSD for your desired token. Swap providers may charge a fee, but MetaMask won't."
+      },
       "title": {
         "transaction_fee": "费用"
       },
@@ -7035,7 +7207,8 @@
     "custom_amount": {
       "buy_button": "购买加密货币",
       "buy_predict": "为钱包充值以使用预测服务。",
-      "buy_perps": "为钱包充值以使用永续合约。"
+      "buy_perps": "为钱包充值以使用永续合约。",
+      "projected_five_year_balance": "预计 5 年后的余额："
     },
     "unlimited": "无限制",
     "all": "所有",
@@ -7051,7 +7224,8 @@
     "edit_amount_done": "继续",
     "deposit_edit_amount_done": "充值",
     "deposit_edit_amount_predict_withdraw": "提取",
-    "deposit_edit_amount_musd_conversion": "兑换为 mUSD"
+    "deposit_edit_amount_musd_conversion": "兑换为 mUSD",
+    "preparing_order": "Preparing order"
   },
   "change_in_simulation_modal": {
     "title": "结果已发生变化",
@@ -7076,6 +7250,20 @@
     "confirm_swap": "交换",
     "terms_and_conditions": "条款和条件",
     "select_token": "选择代币",
+    "batch_sell_select_title": "Select up to 5 tokens",
+    "batch_sell_select_subtitle": "All tokens need to be on the same network.",
+    "batch_sell_empty_state_title": "No tokens. No problem.",
+    "batch_sell_empty_state_description": "No tokens. No problem. Explore and buy tokens to batch sell.",
+    "batch_sell_continue_with_one_token": "Continue with (1) token",
+    "batch_sell_continue_with_tokens": "Continue with ({{tokenCount}}) tokens",
+    "batch_sell_max_tokens_allowed": "Max 5 tokens allowed",
+    "batch_sell_single_token_dialog_title": "High rate alert",
+    "batch_sell_single_token_dialog_description": "Batch selling one token could lead to a higher rate. Want to do a swap instead?",
+    "batch_sell_swap_instead": "Yes, swap",
+    "batch_sell_checkbox_label": "Batch Sell token",
+    "sort_balance": "Balance",
+    "next": "Next",
+    "explore_tokens": "Explore tokens",
     "no_tokens_found": "找不到代币",
     "no_tokens_found_description": "我们未找到与此名称匹配的代币。请尝试其他搜索方式。",
     "select_network": "选择网络",
@@ -7115,6 +7303,7 @@
     "receive_at": "接收地址：",
     "recipient": "接收者",
     "select_recipient": "选择接收方",
+    "select_account": "选择账户",
     "external_account": "外部账户",
     "error_banner_description": "目前该交易路线不可用。请调整交易金额、切换网络或更换代币类型，我们将为您自动匹配最优通道。",
     "stock_token_error_banner_description": "此交易路径当前不可用。请尝试调整金额、网络或代币，我们将为您找到最佳方案。\n\n请注意，如果您想要交易 Ondo 代币化股票，可能会受到地域限制（例如美国、欧盟、英国和巴西等地区）。",
@@ -7186,6 +7375,9 @@
     "price_impact_warning_title": "高价格影响",
     "price_impact_error_title": "价格影响极高",
     "price_impact_error_description": "本次兑换将导致您损失约 {{priceImpact}} 的代币市值。请尝试减少交易量或选择流动性更高的路径，以获取更优汇率。",
+    "insufficient_native_reserve_cta": "使用允许的最大值",
+    "insufficient_native_reserve_message": "此网络要求您的账户中至少保留 {{minimumReserve}} {{ticker}}。您最多可以使用 {{maxSwappable}} {{ticker}}",
+    "insufficient_native_reserve_title": "需要最低{{ticker}}预留余额",
     "token_warning_suspicious_banner": "{{token}} 是可疑代币。",
     "token_warning_malicious_banner": "{{token}} 为恶意代币。请谨慎与之交互。",
     "token_warning_modal_suspicious_title": "可疑代币",
@@ -7542,17 +7734,17 @@
         "price": "免费",
         "feature_1": "用于 Apple Pay 和 Google Pay 的虚拟卡",
         "feature_2": "使用加密货币支付（支持 USDC、USDT、WETH 等代币）",
-        "feature_3": "每笔消费享 1% USDC 返现"
+        "feature_3": "每笔消费返现 1% mUSD"
       },
       "metal_card": {
         "name": "金属卡",
         "price": "199美元/年",
         "everything_in_virtual": "所有虚拟资产，外加：",
         "feature_1": "高级镌刻金属卡",
-        "feature_2": "每年首 10000 美元消费可获 3% 返现",
+        "feature_2": "每年首笔 10,000 美元消费返现 3% mUSD",
         "feature_3": "无外币交易费用"
       },
-      "earn_up_to_badge": "每年最高可获得 300 美元返现",
+      "earn_up_to_badge": "每年最高赚取 300 美元的 mUSD 返现",
       "upgrade_to_metal_label": "或升级至金属卡可享三倍奖励"
     },
     "review_order": {
@@ -7573,7 +7765,7 @@
     "order_completed": {
       "title": "您的卡\n已订购成功",
       "subtitle": "预计在 4 到 6 周内送达。",
-      "description": "设置虚拟卡并添加至数字钱包，即可开始赚取返现。",
+      "description": "设置您的虚拟卡并将其添加到您的数字钱包，即可开始赚取mUSD返现。",
       "set_up_card_button": "设置卡",
       "back_to_card_button": "返回卡"
     },
@@ -7592,7 +7784,7 @@
     },
     "card_onboarding": {
       "title": "消费并赚取",
-      "description": "MetaMask 卡是一款快捷的支付工具，让您能轻松消费加密货币，并享受高达 3% 返现。",
+      "description": "使用 MetaMask 卡消费加密货币，\n轻松赚取高达 3% 的 \nmUSD 返现奖励。",
       "apply_now_button": "立即设置",
       "login_button": "登录",
       "not_now_button": "暂时不",
@@ -7793,6 +7985,7 @@
       "enable_card_button_label": "启用卡",
       "enable_assets_button_label": "启用资产",
       "spending_limit_warning": "您已接近消费限额。请及时更新以避免交易被拒。",
+      "spending_limit_available": "可用",
       "logout": "退出登录",
       "contact_support": "联系支持团队",
       "logout_confirmation_title": "确定要退出卡账户吗？",
@@ -7873,9 +8066,9 @@
         "card_tos_title": "条款和条件",
         "order_metal_card": "金属卡",
         "order_metal_card_description": "立即订购您的实体金属卡",
-        "cashback": "返现",
-        "cashback_description": "所有消费享 1% 返现",
-        "cashback_description_metal": "所有消费享 3% 返现",
+        "cashback": "mUSD 返现",
+        "cashback_description": "所有消费均可赚取 1% mUSD 返现",
+        "cashback_description_metal": "所有消费均可赚取 3% mUSD 返现",
         "freeze_card": "冻结卡",
         "unfreeze_card": "解冻卡",
         "freeze_card_description": "暂停卡所有消费",
@@ -7917,8 +8110,8 @@
       "token_label": "代币"
     },
     "cashback_screen": {
-      "title": "返现",
-      "available_cashback": "可用返现",
+      "title": "mUSD 返现",
+      "available_cashback": "可用 mUSD",
       "network_fee": "网络费",
       "expected_to_receive": "预计收到",
       "withdraw": "提取",
@@ -7926,8 +8119,13 @@
       "withdrawal_initiated": "已发起提现",
       "withdrawal_success": "提现成功完成",
       "withdrawal_failed": "提现失败。请重试。",
-      "no_cashback": "无可用返现",
-      "loading_error": "加载返现失败。请重试。"
+      "no_cashback": "暂无可用 mUSD 返现",
+      "loading_error": "加载 mUSD 返现失败。请重试。",
+      "funding_required": {
+        "title": "设置 Linea 充值",
+        "description": "在兑换 mUSD 返现之前，您需要在Linea上至少有一个经批准的充值来源。",
+        "confirm_button_label": "设置充值"
+      }
     },
     "change_asset": {
       "title": "更改代币和网络",
@@ -8032,7 +8230,8 @@
     "title": "选择付款方式",
     "title_receive": "选择收款代币",
     "no_gas": "无支付燃料所需的原生代币余额",
-    "not_supported": "不支持"
+    "not_supported": "不支持",
+    "crypto": "加密货币"
   },
   "connection_removed_modal": {
     "title": "连接已删除",
@@ -8048,6 +8247,15 @@
       "title": "参与失败",
       "description": "请检查连接后重试。"
     },
+    "notifications_nudge": {
+      "title": "切勿错过",
+      "description": "启用通知以实时掌握活动资讯。",
+      "turn_on_button": "开启",
+      "loading": "正在启用通知...",
+      "loading_description": "这可能需要一点时间。",
+      "enable_error": "启用通知失败",
+      "success": "通知已启用"
+    },
     "version_guard": {
       "title": "需要更新",
       "description": "需要更高版本的 MetaMask 才能使用奖励功能。请更新后继续。",
@@ -8126,6 +8334,17 @@
       "retry_button": "重试"
     },
     "main_title": "奖励",
+    "vip": {
+      "bps_unit": "bps",
+      "swaps_label": "Swaps",
+      "perps_label": "Perps",
+      "error_title": "We couldn’t load your VIP dashboard",
+      "error_description": "Check your connection and try again.",
+      "retry_button": "Retry",
+      "tiers_title": "Tiers",
+      "tier_thresholds": "{{swaps}} Swaps • {{perps}} Perps",
+      "bps_value": "{{bps}} bps"
+    },
     "referral_title": "推荐",
     "referral_stats_earned_from_referrals": "通过推荐所获奖励",
     "referral_stats_referrals": "推荐",
@@ -8309,16 +8528,15 @@
     "active_boosts_title": "活跃加成",
     "season_1": "第 1 季",
     "musd": {
-      "page_title": "mUSD",
-      "title": "mUSD 奖励计算器",
-      "description": "看看您将稳定币兑换为 mUSD 能赚取多少收益。",
-      "amount_label": "已兑换金额",
-      "estimated_bonus": "预估年化奖励：最高可达 3%",
-      "initial_amount": "初始金额",
-      "daily_bonus": "每日可领取奖励",
-      "annualized_bonus": "年化奖励",
-      "disclaimer": "仅为预估。奖励可能会有变动。",
-      "disclaimer_brief": "此奖励为预估金额，可能发生变动。",
+      "page_title": "mUSD 计算器",
+      "hero_hold": "持有 mUSD.",
+      "hero_earn": "赚取",
+      "yearly_positive_prefix": "+",
+      "earnings_per_year_suffix": "/年",
+      "earnings_per_month_suffix": "/月",
+      "earnings_per_day_suffix": "/天，每日可领",
+      "slider_amount_label": "金额",
+      "disclaimer_calculator": "按 3% 奖励系数预估。收益率随市场波动，奖励可随时提取。",
       "buy_button": "购买 mUSD",
       "swap_button": "兑换为 mUSD"
     },
@@ -8367,6 +8585,8 @@
       "ends_date": "结束于 {{date}}",
       "ended_date": "结束时间：{{date}}",
       "pill_up_next": "即将推出",
+      "up_next": "即将到来",
+      "notify_me": "通知我",
       "pill_active": "进行中",
       "pill_complete": "完成",
       "enter": "参加",
@@ -8380,7 +8600,9 @@
       "geo_locked_toast_title": "您所在区域不可用",
       "geo_locked_toast_description": "该活动在您所在地区暂未开放。请稍后回来查看新活动。",
       "geo_locked_cta": "检查资格",
-      "geo_loading": "正在检查地区……"
+      "geo_loading": "正在检查地区……",
+      "remind_me_success_toast": "活动开始时我们会通知您。",
+      "remind_me_save_error": "无法保存提醒设置。请重试。"
     },
     "campaign_mechanics": {
       "title": "机制"
@@ -8479,10 +8701,10 @@
       "qualified_description": "增加您的净流入以提升等级，争取更高奖励。",
       "not_eligible_title": "不符合资格",
       "not_eligible_description": "开仓时间过晚，无法满足 {{days}} 天持有期限要求的交易将不计入您的排名或等级评定。",
-      "completed_label_total_participants": "Total participants",
-      "completed_label_total_tvl": "Total TVL",
-      "completed_label_top_return": "Top return",
-      "completed_label_winners": "Winners"
+      "completed_label_total_participants": "总参与人数",
+      "completed_label_total_tvl": "总锁仓价值（TVL）",
+      "completed_label_top_return": "最高收益",
+      "completed_label_winners": "获胜者"
     },
     "ondo_campaign_activity": {
       "title": "全部活动",
@@ -8508,6 +8730,48 @@
       "cancel": "取消",
       "confirm": "我理解"
     },
+    "perps_trading_campaign": {
+      "title": "永续合约（Perps）交易竞赛",
+      "stats_title": "统计数据",
+      "performance_title": "表现",
+      "label_rank": "排名",
+      "label_your_rank": "您的排名",
+      "label_pnl": "盈亏",
+      "label_volume": "交易量",
+      "label_notional_volume": "名义交易量",
+      "pending": "待定",
+      "qualified": "已获得资格",
+      "open_position_cta": "未平仓仓位",
+      "leaderboard_title": "排行榜",
+      "leaderboard_total_participants": "{{count}} 位参与者",
+      "last_updated": "最后更新于：{{time}}",
+      "leaderboard_error_loading": "加载排行榜失败",
+      "leaderboard_error_loading_description": "加载排行榜时遇到问题。请重试。",
+      "leaderboard_not_yet_computed": "排行榜尚未统计完成。请稍后再查看。",
+      "leaderboard_powered_by_prefix": "技术支持： ",
+      "leaderboard_hypertracker_brand": "HyperTracker 极速追踪",
+      "prize_pool_title": "奖池",
+      "prize_pool_current_label": "当前",
+      "prize_pool_next_label": "下一步",
+      "prize_pool_volume_subtext": "{{current}} / {{target}} 交易量",
+      "prize_pool_max_tier_subtext": "{{maxThreshold}}+ 交易量 — 已达到所有里程碑",
+      "prize_pool_max_badge": "最大值",
+      "prize_pool_error_title": "加载奖池失败",
+      "prize_pool_error_description": "加载奖池时出错。请重试。",
+      "prize_pool_retry_button": "重试",
+      "stats_notional_volume_threshold": "需要 {{amount}} 美元",
+      "stats_qualified_title": "您已具备资格",
+      "stats_qualified_description": "在比赛结束前继续交易，提升您的盈亏（PnL）表现并冲击排行榜。",
+      "stats_qualify_for_rank_title": "符合此排名的资格",
+      "stats_qualify_for_rank_description": "还需完成{{notionalRemaining}}名义交易量即可获得资格。",
+      "stats_error_title": "无法加载统计数据",
+      "stats_error_description": "加载您的统计数据时遇到问题。请重试。",
+      "stats_retry": "重试",
+      "completed_label_total_participants": "总参与人数",
+      "completed_label_total_volume": "总交易量",
+      "completed_label_top_pnl": "最高盈亏（PnL）",
+      "completed_label_winners": "获胜者"
+    },
     "campaigns_preview": {
       "title": "活动",
       "coming_soon": "即将推出",
@@ -8532,29 +8796,29 @@
       "retry_button": "重试",
       "refreshing": "正在刷新……"
     },
-    "ondo_campaign_winning": {
+    "campaign_winning": {
       "you_won": "您已获胜",
       "rank_label": "第 {{place}} 名",
-      "email_instructions": "请将您的代码发送至 ondocampaign@consensys.net 领取奖品。",
+      "email_instructions": "发送包含兑奖码的邮件至 {{email}} 以领取您的奖品。",
       "open_mail": "打开邮件",
       "skip_for_now": "暂时跳过",
-      "mail_subject": "领取 Ondo 活动奖品",
+      "mail_subject": "{{campaignName}} 奖品领取",
       "mail_body": "我的获奖码：{{code}}",
       "winning_code": "获奖码",
       "close_a11y": "关闭"
     },
-    "ondo_outcome_banner": {
+    "campaign_outcome_banner": {
       "winner_pending": {
-        "title": "您已获胜",
-        "description": "立即领取您的奖品。",
-        "a11y": "打开获奖者详情"
+        "title": "您已获胜!",
+        "description": "立即验证您的获奖码并领取奖品。",
+        "a11y": "查看详情"
       },
       "participant_pending": {
         "title": "活动已结束。",
         "description": "我们正在确定结果。请稍后再来查看。"
       },
       "participant_finalized": {
-        "title": "活动结果已出炉",
+        "title": "活动结果已出炉.",
         "description": "您这次未中奖。查看排行榜了解您的最终排名。"
       },
       "winner_finalized": {
@@ -8562,15 +8826,15 @@
         "description": "您的奖励正在发放中——我们将很快联系您。"
       }
     },
-    "ondo_outcome_toast": {
-      "winner_verify": {
+    "campaign_outcome_toast": {
+      "winner": {
         "title": "您已获胜 💰",
-        "description": "领取您在 {{campaignName}} 中的奖品",
+        "description": "立即领取 {{campaignName}} 的奖品。",
         "cta": "查看详情"
       },
-      "participant_no_winner": {
-        "title": "结果已揭晓。🏅",
-        "description": "查看您在 {{campaignName}} 中的排名",
+      "non_winner": {
+        "title": "结果已公布 🏅",
+        "description": "查看您在 {{campaignName}} 中的排名.",
         "cta": "查看"
       }
     }
@@ -8588,8 +8852,8 @@
       "predict_claim": "已领取收益",
       "predict_deposit": "预测账户已存入资金",
       "predict_withdraw": "提取",
-      "money_account_deposit": "Deposit to Money Account",
-      "money_account_withdraw": "Transfer from Money Account",
+      "money_account_deposit": "充值到 Money 账户",
+      "money_account_withdraw": "从 Money 账户转账",
       "default": "交易详情"
     },
     "label": {
@@ -8662,7 +8926,10 @@
   },
   "trending": {
     "title": "探索",
-    "trending_tokens": "热门",
+    "crypto_movers": "加密货币行情波动榜",
+    "perps_movers": "永续合约行情波动榜",
+    "trending_tokens": "趋势",
+    "crypto": "加密货币",
     "stocks": "股票",
     "price_change": "价格变化",
     "all_networks": "所有网络",
@@ -8673,6 +8940,17 @@
     "1_hour": "1 小时",
     "5_minutes": "5 分钟",
     "networks": "网络",
+    "ecosystems": "生态系统",
+    "ecosystems_subtitle": "在 MetaMask Portfolio 上探索跨链的 dApp、代币和 NFT",
+    "all_sports": "热门运动",
+    "basketball": "篮球",
+    "football": "美式足球",
+    "soccer": "足球",
+    "tennis": "网球",
+    "f1": "F1 赛车",
+    "golf": "高尔夫",
+    "all_sports_no_markets": "该类别暂无开放市场。请稍后再查看，或在上方选择其他运动。",
+    "load_more": "加载更多",
     "sort_by": "排序方式",
     "volume": "交易量",
     "market_cap": "市值",
@@ -8682,8 +8960,17 @@
     "search_placeholder": "搜索代币、网站、URL",
     "cancel": "取消",
     "perps": "永续合约",
+    "rwa_perps_section": "永续合约",
+    "macro_stocks_commodity_perps": "永续合约",
+    "macro_pill_stocks": "股票",
+    "macro_pill_commodities": "大宗商品",
+    "rwa_pill_commodities": "大宗商品",
+    "rwa_pill_stocks": "股票",
+    "rwa_pill_forex": "外汇",
+    "crypto_perps_section": "永续合约",
     "predictions": "预测",
     "no_results": "未找到结果",
+    "popular": "热门",
     "sites": "网站",
     "popular_sites": "热门网站",
     "search_sites": "搜索网站",
@@ -8699,6 +8986,14 @@
     "empty_search_result_state": {
       "title": "找不到代币",
       "description": "我们找不到此代币"
+    },
+    "tabs": {
+      "now": "立即",
+      "macro": "宏观",
+      "rwas": "现实世界资产（RWA）",
+      "crypto": "加密货币",
+      "sports": "体育",
+      "dapps": "网站"
     }
   },
   "ota_update_modal": {
@@ -8716,7 +9011,9 @@
     },
     "common": {
       "cancel": "取消",
-      "continue": "继续"
+      "continue": "继续",
+      "learn_more": "了解详情",
+      "try_again": "请重试"
     },
     "connecting": {
       "title": "正在连接您的 {{device}}……",
@@ -8762,6 +9059,7 @@
       "bluetooth_off": "请开启蓝牙以连接到您的设备",
       "bluetooth_scan_failed": "扫描设备失败。请重试",
       "bluetooth_connection_failed": "连接您的设备失败。请重试",
+      "camera_permission_denied": "扫描二维码需要相机权限许可。请在设备设置中启用",
       "not_supported": "不支持此操作",
       "unknown_error": "确保您的 {{device}} 已使用此账户的私钥助记词或密语进行设置"
     },
@@ -8785,8 +9083,35 @@
       "location_permission_denied": "需要位置许可",
       "nearby_devices_permission_denied": "需要附近设备许可",
       "scan_failed": "扫描失败",
+      "camera_permission_denied": "需要相机权限",
       "something_went_wrong": "出错了......"
     },
+    "qr_scan_errors": {
+      "non_ur_qr_scanned": {
+        "pair": {
+          "title": "扫描钱包同步二维码",
+          "body": "返回您的硬件钱包，找到分享或导出账户的选项，选择MetaMask，然后扫描显示的二维码。"
+        },
+        "sign": {
+          "title": "扫描签名二维码",
+          "body": "返回您的硬件钱包并批准交易，然后扫描显示的二维码。"
+        }
+      },
+      "wrong_ur_type": {
+        "pair": {
+          "title": "二维码错误",
+          "body": "返回您的硬件钱包，选择 MetaMask 作为钱包类型，然后生成并扫描新的二维码。"
+        },
+        "sign": {
+          "title": "二维码错误",
+          "body": "返回您的硬件钱包并批准交易，然后扫描显示的二维码。"
+        }
+      },
+      "ur_decode_error": {
+        "title": "无法读取二维码",
+        "body": "确保二维码完整可见且光线充足，然后重试。如果问题仍然存在，您可能需要更新硬件钱包的固件。"
+      }
+    },
     "device_selection": {
       "title": "选择 {{device}}",
       "scanning": "正在扫描设备……",
@@ -8801,13 +9126,29 @@
   },
   "homepage": {
     "sections": {
-      "cash": "Money",
-      "cash_empty_description": "您目前尚未持有任何 mUSD。请从首页的“资金”部分将稳定币兑换为 mUSD。",
-      "cash_empty_description_network_filter": "此网络中没有 mUSD。请切换网络以查看您的 mUSD。",
+      "money": "Money",
+      "money_empty_description": "您目前尚未持有任何 mUSD。请从首页的“资金”部分将稳定币兑换为 mUSD。",
+      "money_empty_description_network_filter": "此网络中没有 mUSD。请切换网络以查看您的 mUSD。",
+      "money_empty_state": {
+        "get_started": "开始",
+        "earn_apy": "赚取{{percentage}}% APY"
+      },
+      "money_filled_state": {
+        "add": "添加",
+        "apy": "{{percentage}}% 年化收益率"
+      },
       "tokens": "代币",
+      "perps": "永续合约",
+      "related_assets": "相关资产",
       "perpetuals": "永续合约",
       "predictions": "预测",
       "whats_happening": "发生了什么",
+      "whats_happening_ai": "人工智能（AI）",
+      "whats_happening_impact": {
+        "bullish": "看涨",
+        "bearish": "看跌",
+        "neutral": "看平"
+      },
       "top_traders": "顶尖交易者",
       "whats_happening_categories": {
         "geopolitical": "地缘政治",
@@ -8819,7 +9160,7 @@
       },
       "defi": "DeFi",
       "nfts": "NFT",
-      "trending_tokens": "热门",
+      "trending_tokens": "趋势",
       "trending_perpetuals": "热门永续合约",
       "trending_predictions": "热门预测",
       "import_nfts": "导入 NFT",
@@ -8833,5 +9174,8 @@
       "unable_to_load": "无法加载 {{section}}",
       "retry": "重试"
     }
+  },
+  "sites": {
+    "popular": "热门"
   }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 9e026f3ce4e..ccd1122b4fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask",
-  "version": "7.76.0",
+  "version": "7.77.0",
   "private": true,
   "scripts": {
     "install:foundryup": "yarn mm-foundryup",
@@ -15,10 +15,10 @@
     "clean": "yarn clean:ios && yarn clean:android && yarn install --immutable",
     "generate-method-action-types": "messenger-generate-action-types --fix app && prettier --write 'app/**/*-method-action-types.ts'",
     "generate-method-action-types:check": "yarn generate-method-action-types && git diff --exit-code 'app/**/*-method-action-types.ts'",
-    "lint": "NODE_OPTIONS='--max-old-space-size=8192' eslint '**/*.{js,ts,tsx}' --cache && yarn generate-method-action-types:check",
-    "lint:fix": "NODE_OPTIONS='--max-old-space-size=8192' eslint '**/*.{js,ts,tsx}' --fix --cache && yarn generate-method-action-types",
+    "lint": "NODE_OPTIONS='--max-old-space-size=12288' eslint '**/*.{js,ts,tsx}' --cache && yarn generate-method-action-types:check",
+    "lint:fix": "NODE_OPTIONS='--max-old-space-size=12288' eslint '**/*.{js,ts,tsx}' --fix --cache && yarn generate-method-action-types",
     "lint:clean": "rm -f .eslintcache",
-    "lint:tsc": "NODE_OPTIONS='--max-old-space-size=8192' tsc --project ./tsconfig.json",
+    "lint:tsc": "NODE_OPTIONS='--max-old-space-size=12288' tsc --project ./tsconfig.json",
     "format": "prettier '**/*.{js,ts,tsx,json}' --write",
     "format:check": "prettier '**/*.{js,ts,tsx,json}' --check",
     "format:check:changed": "git diff --name-only --diff-filter=ACM HEAD~1 | { grep -E '\\.(js|ts|tsx|json)$' || true; } | xargs --no-run-if-empty prettier --check",
@@ -129,6 +129,10 @@
     "run-system-tests:ios-login": "yarn playwright test --project system-ios-login --config tests/playwright.system.config.ts",
     "run-system-tests:ios-onboarding": "yarn playwright test --project system-ios-onboarding --config tests/playwright.system.config.ts",
     "run-system-tests:all": "yarn playwright test --config tests/playwright.system.config.ts",
+    "run-system-tests:android-login-emu": "yarn playwright test --project system-android-login-emu --config tests/playwright.system-emulator.config.ts",
+    "run-system-tests:android-onboarding-emu": "yarn playwright test --project system-android-onboarding-emu --config tests/playwright.system-emulator.config.ts",
+    "run-system-tests:ios-login-sim": "yarn playwright test --project system-ios-login-sim --config tests/playwright.system-emulator.config.ts",
+    "run-system-tests:ios-onboarding-sim": "yarn playwright test --project system-ios-onboarding-sim --config tests/playwright.system-emulator.config.ts",
     "test:depcheck": "yarn depcheck",
     "test:tgz-check": "./scripts/tgz-check.sh",
     "test:attribution-check": "./scripts/attributions-check.sh",
@@ -201,15 +205,15 @@
     "bn.js@npm:5.2.1": "5.2.3",
     "expo-web-browser@npm:~14.0.2": "patch:expo-web-browser@npm%3A14.0.2#~/.yarn/patches/expo-web-browser-npm-14.0.2-98d00ce880.patch",
     "@metamask/messenger@^0.3.0": "^1.0.0",
-    "@metamask/accounts-controller": "^37.2.0",
+    "@metamask/messenger": "^1.1.0",
+    "@metamask/keyring-internal-api": "^11.0.1",
+    "@metamask/accounts-controller": "^38.0.0",
     "@metamask/profile-sync-controller": "^28.0.2",
     "@metamask/transaction-controller@^63.0.0": "^65.0.0",
-    "@metamask/keyring-api@npm:^21.3.0": "21.6.0",
-    "@metamask/keyring-api@npm:^21.4.0": "21.6.0",
-    "@metamask/keyring-api@npm:^21.5.0": "21.6.0",
-    "@metamask/keyring-api@npm:^21.6.0": "23.0.1",
-    "@metamask/keyring-api@npm:^22.0.0": "23.0.1",
-    "@metamask/keyring-api@npm:^23.0.1": "23.0.1",
+    "@metamask/keyring-api@npm:^21.3.0": "23.1.0",
+    "@metamask/keyring-api@npm:^21.4.0": "23.1.0",
+    "@metamask/keyring-api@npm:^21.6.0": "23.1.0",
+    "@metamask/keyring-api@npm:^22.0.0": "23.1.0",
     "@metamask/bridge-status-controller@npm:^71.0.0": "patch:@metamask/bridge-status-controller@npm%3A71.1.0#~/.yarn/patches/@metamask-bridge-status-controller-npm-71.1.0-6140a0bdf3.patch"
   },
   "dependencies": {
@@ -228,11 +232,11 @@
     "@ledgerhq/hw-app-eth": "^6.42.0",
     "@ledgerhq/react-native-hw-transport-ble": "^6.37.0",
     "@metamask/abi-utils": "^3.0.0",
-    "@metamask/account-api": "^1.0.0",
-    "@metamask/account-tree-controller": "^7.1.0",
-    "@metamask/accounts-controller": "^37.2.0",
+    "@metamask/account-api": "^1.0.4",
+    "@metamask/account-tree-controller": "^7.2.0",
+    "@metamask/accounts-controller": "^38.0.0",
     "@metamask/address-book-controller": "^7.1.0",
-    "@metamask/ai-controllers": "^0.6.0",
+    "@metamask/ai-controllers": "0.6.3",
     "@metamask/analytics-controller": "^1.0.0",
     "@metamask/app-metadata-controller": "^2.0.0",
     "@metamask/approval-controller": "^9.0.0",
@@ -244,6 +248,7 @@
     "@metamask/bridge-controller": "^71.0.0",
     "@metamask/bridge-status-controller": "patch:@metamask/bridge-status-controller@npm%3A71.1.0#~/.yarn/patches/@metamask-bridge-status-controller-npm-71.1.0-6140a0bdf3.patch",
     "@metamask/chain-agnostic-permission": "^1.5.0",
+    "@metamask/chomp-api-service": "3.0.0",
     "@metamask/client-controller": "^1.0.1",
     "@metamask/compliance-controller": "2.0.0",
     "@metamask/connectivity-controller": "^0.1.0",
@@ -251,22 +256,22 @@
     "@metamask/core-backend": "^6.2.0",
     "@metamask/delegation-controller": "^2.0.2",
     "@metamask/delegation-deployments": "^1.0.0",
-    "@metamask/design-system-react-native": "^0.21.0",
+    "@metamask/design-system-react-native": "^0.23.0",
     "@metamask/design-system-twrnc-preset": "^0.4.2",
-    "@metamask/design-tokens": "^8.3.0",
-    "@metamask/earn-controller": "^12.0.0",
+    "@metamask/design-tokens": "^8.4.0",
+    "@metamask/earn-controller": "^12.1.0",
     "@metamask/eip-5792-middleware": "^2.0.0",
     "@metamask/eip1193-permission-middleware": "^1.0.2",
     "@metamask/ens-resolver-snap": "^1.2.0",
-    "@metamask/eth-hd-keyring": "^13.0.0",
+    "@metamask/eth-hd-keyring": "^14.1.1",
     "@metamask/eth-json-rpc-filters": "^9.0.0",
     "@metamask/eth-json-rpc-middleware": "^23.1.2",
-    "@metamask/eth-ledger-bridge-keyring": "^11.4.0",
-    "@metamask/eth-money-keyring": "^2.0.0",
-    "@metamask/eth-qr-keyring": "^1.1.0",
+    "@metamask/eth-ledger-bridge-keyring": "^12.0.2",
+    "@metamask/eth-money-keyring": "^2.0.4",
+    "@metamask/eth-qr-keyring": "^2.0.2",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/eth-sig-util": "^8.0.0",
-    "@metamask/eth-snap-keyring": "^20.0.0",
+    "@metamask/eth-snap-keyring": "^22.0.1",
     "@metamask/etherscan-link": "^2.0.0",
     "@metamask/ethjs-contract": "^0.4.1",
     "@metamask/ethjs-query": "^0.7.1",
@@ -274,15 +279,15 @@
     "@metamask/gas-fee-controller": "^26.1.0",
     "@metamask/gator-permissions-controller": "^4.0.0",
     "@metamask/geolocation-controller": "^0.1.1",
-    "@metamask/hw-wallet-sdk": "^0.7.0",
+    "@metamask/hw-wallet-sdk": "^0.8.0",
     "@metamask/json-rpc-engine": "^10.2.3",
     "@metamask/json-rpc-middleware-stream": "^8.0.7",
     "@metamask/key-tree": "patch:@metamask/key-tree@npm%3A10.1.1#~/.yarn/patches/@metamask-key-tree-npm-10.1.1-0bfab435ac.patch",
-    "@metamask/keyring-api": "^21.6.0",
-    "@metamask/keyring-controller": "^25.2.0",
-    "@metamask/keyring-internal-api": "^10.0.0",
-    "@metamask/keyring-sdk": "^1.1.0",
-    "@metamask/keyring-snap-client": "^8.2.1",
+    "@metamask/keyring-api": "^23.1.0",
+    "@metamask/keyring-controller": "^25.4.0",
+    "@metamask/keyring-internal-api": "^11.0.1",
+    "@metamask/keyring-sdk": "^2.0.2",
+    "@metamask/keyring-snap-client": "^9.0.2",
     "@metamask/keyring-utils": "^3.2.0",
     "@metamask/logging-controller": "^8.0.0",
     "@metamask/message-signing-snap": "^1.1.2",
@@ -291,15 +296,16 @@
     "@metamask/mobile-wallet-protocol-core": "^0.4.0",
     "@metamask/mobile-wallet-protocol-wallet-client": "^0.3.0",
     "@metamask/money-account-balance-service": "^0.2.0",
-    "@metamask/money-account-controller": "^0.1.0",
+    "@metamask/money-account-controller": "^0.2.0",
+    "@metamask/money-account-upgrade-controller": "^1.3.1",
     "@metamask/multichain-account-service": "^8.0.1",
     "@metamask/multichain-api-client": "^0.10.1",
     "@metamask/multichain-api-middleware": "^2.0.0",
-    "@metamask/multichain-network-controller": "^3.0.5",
-    "@metamask/multichain-transactions-controller": "^7.0.4",
+    "@metamask/multichain-network-controller": "^3.1.0",
+    "@metamask/multichain-transactions-controller": "^7.1.0",
     "@metamask/native-utils": "^0.8.0",
     "@metamask/network-controller": "^30.0.0",
-    "@metamask/network-enablement-controller": "^4.2.0",
+    "@metamask/network-enablement-controller": "^5.1.0",
     "@metamask/notification-services-controller": "^23.1.0",
     "@metamask/permission-controller": "^12.2.1",
     "@metamask/phishing-controller": "^17.1.1",
@@ -338,8 +344,8 @@
     "@metamask/storage-service": "^1.0.0",
     "@metamask/superstruct": "^3.2.1",
     "@metamask/swappable-obj-proxy": "^2.1.0",
-    "@metamask/transaction-controller": "^65.0.0",
-    "@metamask/transaction-pay-controller": "^20.0.0",
+    "@metamask/transaction-controller": "^65.1.0",
+    "@metamask/transaction-pay-controller": "^21.0.0",
     "@metamask/tron-wallet-snap": "^1.25.3",
     "@metamask/utils": "^11.11.0",
     "@myx-trade/sdk": "^0.1.265",
@@ -642,6 +648,7 @@
     "eslint-config-prettier": "^8.1.0",
     "eslint-import-resolver-typescript": "^3.6.3",
     "eslint-plugin-import-x": "^0.5.1",
+    "eslint-plugin-jest": "^29.14.0",
     "eslint-plugin-jsdoc": "43.0.7",
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-promise": "^7.2.1",
diff --git a/scripts/build.sh b/scripts/build.sh
index ea04929e6d2..b8dda7bf595 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -246,15 +246,7 @@ remapEnvVariableQA() {
   	remapEnvVariable "SEGMENT_PROXY_URL_QA" "SEGMENT_PROXY_URL"
   	remapEnvVariable "SEGMENT_DELETE_API_SOURCE_ID_QA" "SEGMENT_DELETE_API_SOURCE_ID"
   	remapEnvVariable "SEGMENT_REGULATIONS_ENDPOINT_QA" "SEGMENT_REGULATIONS_ENDPOINT"
-
-	remapEnvVariable "MAIN_IOS_GOOGLE_CLIENT_ID_UAT" "IOS_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_IOS_GOOGLE_REDIRECT_URI_UAT" "IOS_GOOGLE_REDIRECT_URI"
-	remapEnvVariable "MAIN_ANDROID_APPLE_CLIENT_ID_UAT" "ANDROID_APPLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT" "ANDROID_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT" "ANDROID_GOOGLE_SERVER_CLIENT_ID"
-
 	remapEnvVariable "MM_CARD_BAANX_API_CLIENT_KEY_UAT" "MM_CARD_BAANX_API_CLIENT_KEY"
-
 }
 
 # Mapping for Main env variables in the e2e environment
@@ -264,13 +256,6 @@ remapMainE2EEnvVariables() {
   	remapEnvVariable "SEGMENT_PROXY_URL_QA" "SEGMENT_PROXY_URL"
   	remapEnvVariable "SEGMENT_DELETE_API_SOURCE_ID_QA" "SEGMENT_DELETE_API_SOURCE_ID"
   	remapEnvVariable "SEGMENT_REGULATIONS_ENDPOINT_QA" "SEGMENT_REGULATIONS_ENDPOINT"
-
-	remapEnvVariable "MAIN_IOS_GOOGLE_CLIENT_ID_UAT" "IOS_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_IOS_GOOGLE_REDIRECT_URI_UAT" "IOS_GOOGLE_REDIRECT_URI"
-	remapEnvVariable "MAIN_ANDROID_APPLE_CLIENT_ID_UAT" "ANDROID_APPLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT" "ANDROID_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT" "ANDROID_GOOGLE_SERVER_CLIENT_ID"
-
 	remapEnvVariable "MM_CARD_BAANX_API_CLIENT_KEY_UAT" "MM_CARD_BAANX_API_CLIENT_KEY"
 }
 
@@ -281,13 +266,6 @@ remapMainTestEnvVariables() {
   	remapEnvVariable "SEGMENT_PROXY_URL_QA" "SEGMENT_PROXY_URL"
   	remapEnvVariable "SEGMENT_DELETE_API_SOURCE_ID_QA" "SEGMENT_DELETE_API_SOURCE_ID"
   	remapEnvVariable "SEGMENT_REGULATIONS_ENDPOINT_QA" "SEGMENT_REGULATIONS_ENDPOINT"
-
-	remapEnvVariable "MAIN_IOS_GOOGLE_CLIENT_ID_UAT" "IOS_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_IOS_GOOGLE_REDIRECT_URI_UAT" "IOS_GOOGLE_REDIRECT_URI"
-	remapEnvVariable "MAIN_ANDROID_APPLE_CLIENT_ID_UAT" "ANDROID_APPLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT" "ANDROID_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT" "ANDROID_GOOGLE_SERVER_CLIENT_ID"
-
 	remapEnvVariable "MM_CARD_BAANX_API_CLIENT_KEY_UAT" "MM_CARD_BAANX_API_CLIENT_KEY"
 }
 
@@ -298,13 +276,6 @@ remapMainProdEnvVariables() {
   	remapEnvVariable "SEGMENT_PROXY_URL_PROD" "SEGMENT_PROXY_URL"
   	remapEnvVariable "SEGMENT_DELETE_API_SOURCE_ID_PROD" "SEGMENT_DELETE_API_SOURCE_ID"
   	remapEnvVariable "SEGMENT_REGULATIONS_ENDPOINT_PROD" "SEGMENT_REGULATIONS_ENDPOINT"
-
-	remapEnvVariable "MAIN_IOS_GOOGLE_CLIENT_ID_PROD" "IOS_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_IOS_GOOGLE_REDIRECT_URI_PROD" "IOS_GOOGLE_REDIRECT_URI"
-	remapEnvVariable "MAIN_ANDROID_APPLE_CLIENT_ID_PROD" "ANDROID_APPLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_CLIENT_ID_PROD" "ANDROID_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_PROD" "ANDROID_GOOGLE_SERVER_CLIENT_ID"
-
 	remapEnvVariable "MM_CARD_BAANX_API_CLIENT_KEY_PROD" "MM_CARD_BAANX_API_CLIENT_KEY"
 }
 
@@ -315,13 +286,6 @@ remapFlaskProdEnvVariables() {
   	remapEnvVariable "SEGMENT_PROXY_URL_FLASK" "SEGMENT_PROXY_URL"
   	remapEnvVariable "SEGMENT_DELETE_API_SOURCE_ID_FLASK" "SEGMENT_DELETE_API_SOURCE_ID"
   	remapEnvVariable "SEGMENT_REGULATIONS_ENDPOINT_FLASK" "SEGMENT_REGULATIONS_ENDPOINT"
-
-	remapEnvVariable "FLASK_IOS_GOOGLE_CLIENT_ID_PROD" "IOS_GOOGLE_CLIENT_ID"
-	remapEnvVariable "FLASK_IOS_GOOGLE_REDIRECT_URI_PROD" "IOS_GOOGLE_REDIRECT_URI"
-	remapEnvVariable "FLASK_ANDROID_APPLE_CLIENT_ID_PROD" "ANDROID_APPLE_CLIENT_ID"
-	remapEnvVariable "FLASK_ANDROID_GOOGLE_CLIENT_ID_PROD" "ANDROID_GOOGLE_CLIENT_ID"
-	remapEnvVariable "FLASK_ANDROID_GOOGLE_SERVER_CLIENT_ID_PROD" "ANDROID_GOOGLE_SERVER_CLIENT_ID"
-
 	remapEnvVariable "MM_CARD_BAANX_API_CLIENT_KEY_PROD" "MM_CARD_BAANX_API_CLIENT_KEY"
 }
 
@@ -332,13 +296,6 @@ remapFlaskTestEnvVariables() {
   	remapEnvVariable "SEGMENT_PROXY_URL_QA" "SEGMENT_PROXY_URL"
   	remapEnvVariable "SEGMENT_DELETE_API_SOURCE_ID_QA" "SEGMENT_DELETE_API_SOURCE_ID"
   	remapEnvVariable "SEGMENT_REGULATIONS_ENDPOINT_QA" "SEGMENT_REGULATIONS_ENDPOINT"
-
-	remapEnvVariable "FLASK_IOS_GOOGLE_CLIENT_ID_PROD" "IOS_GOOGLE_CLIENT_ID"
-	remapEnvVariable "FLASK_IOS_GOOGLE_REDIRECT_URI_PROD" "IOS_GOOGLE_REDIRECT_URI"
-	remapEnvVariable "FLASK_ANDROID_APPLE_CLIENT_ID_PROD" "ANDROID_APPLE_CLIENT_ID"
-	remapEnvVariable "FLASK_ANDROID_GOOGLE_CLIENT_ID_PROD" "ANDROID_GOOGLE_CLIENT_ID"
-	remapEnvVariable "FLASK_ANDROID_GOOGLE_SERVER_CLIENT_ID_PROD" "ANDROID_GOOGLE_SERVER_CLIENT_ID"
-
 	remapEnvVariable "MM_CARD_BAANX_API_CLIENT_KEY_UAT" "MM_CARD_BAANX_API_CLIENT_KEY"
 }
 
@@ -349,13 +306,6 @@ remapFlaskE2EEnvVariables() {
   	remapEnvVariable "SEGMENT_PROXY_URL_QA" "SEGMENT_PROXY_URL"
   	remapEnvVariable "SEGMENT_DELETE_API_SOURCE_ID_QA" "SEGMENT_DELETE_API_SOURCE_ID"
   	remapEnvVariable "SEGMENT_REGULATIONS_ENDPOINT_QA" "SEGMENT_REGULATIONS_ENDPOINT"
-
-	remapEnvVariable "FLASK_IOS_GOOGLE_CLIENT_ID_PROD" "IOS_GOOGLE_CLIENT_ID"
-	remapEnvVariable "FLASK_IOS_GOOGLE_REDIRECT_URI_PROD" "IOS_GOOGLE_REDIRECT_URI"
-	remapEnvVariable "FLASK_ANDROID_APPLE_CLIENT_ID_PROD" "ANDROID_APPLE_CLIENT_ID"
-	remapEnvVariable "FLASK_ANDROID_GOOGLE_CLIENT_ID_PROD" "ANDROID_GOOGLE_CLIENT_ID"
-	remapEnvVariable "FLASK_ANDROID_GOOGLE_SERVER_CLIENT_ID_PROD" "ANDROID_GOOGLE_SERVER_CLIENT_ID"
-
 	remapEnvVariable "MM_CARD_BAANX_API_CLIENT_KEY_UAT" "MM_CARD_BAANX_API_CLIENT_KEY"
 }
 
@@ -366,13 +316,6 @@ remapMainBetaEnvVariables() {
     remapEnvVariable "SEGMENT_PROXY_URL_BETA" "SEGMENT_PROXY_URL"
     remapEnvVariable "SEGMENT_DELETE_API_SOURCE_ID_QA" "SEGMENT_DELETE_API_SOURCE_ID"
     remapEnvVariable "SEGMENT_REGULATIONS_ENDPOINT_QA" "SEGMENT_REGULATIONS_ENDPOINT"
-
-	remapEnvVariable "MAIN_IOS_GOOGLE_CLIENT_ID_PROD" "IOS_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_IOS_GOOGLE_REDIRECT_URI_PROD" "IOS_GOOGLE_REDIRECT_URI"
-	remapEnvVariable "MAIN_ANDROID_APPLE_CLIENT_ID_PROD" "ANDROID_APPLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_CLIENT_ID_PROD" "ANDROID_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_PROD" "ANDROID_GOOGLE_SERVER_CLIENT_ID"
-
 	remapEnvVariable "MM_CARD_BAANX_API_CLIENT_KEY_PROD" "MM_CARD_BAANX_API_CLIENT_KEY"
 }
 
@@ -383,13 +326,6 @@ remapMainReleaseCandidateEnvVariables() {
   	remapEnvVariable "SEGMENT_PROXY_URL_QA" "SEGMENT_PROXY_URL"
   	remapEnvVariable "SEGMENT_DELETE_API_SOURCE_ID_QA" "SEGMENT_DELETE_API_SOURCE_ID"
   	remapEnvVariable "SEGMENT_REGULATIONS_ENDPOINT_QA" "SEGMENT_REGULATIONS_ENDPOINT"
-
-	remapEnvVariable "MAIN_IOS_GOOGLE_CLIENT_ID_PROD" "IOS_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_IOS_GOOGLE_REDIRECT_URI_PROD" "IOS_GOOGLE_REDIRECT_URI"
-	remapEnvVariable "MAIN_ANDROID_APPLE_CLIENT_ID_PROD" "ANDROID_APPLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_CLIENT_ID_PROD" "ANDROID_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_PROD" "ANDROID_GOOGLE_SERVER_CLIENT_ID"
-
 	remapEnvVariable "MM_CARD_BAANX_API_CLIENT_KEY_PROD" "MM_CARD_BAANX_API_CLIENT_KEY"
 }
 
@@ -401,13 +337,6 @@ remapMainExperimentalEnvVariables() {
     remapEnvVariable "SEGMENT_DELETE_API_SOURCE_ID_QA" "SEGMENT_DELETE_API_SOURCE_ID"
   	remapEnvVariable "SEGMENT_REGULATIONS_ENDPOINT_QA" "SEGMENT_REGULATIONS_ENDPOINT"
 	remapEnvVariable "MAIN_WEB3AUTH_NETWORK_PROD" "WEB3AUTH_NETWORK"
-
-	remapEnvVariable "MAIN_IOS_GOOGLE_CLIENT_ID_UAT" "IOS_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_IOS_GOOGLE_REDIRECT_URI_UAT" "IOS_GOOGLE_REDIRECT_URI"
-	remapEnvVariable "MAIN_ANDROID_APPLE_CLIENT_ID_UAT" "ANDROID_APPLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT" "ANDROID_GOOGLE_CLIENT_ID"
-	remapEnvVariable "MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT" "ANDROID_GOOGLE_SERVER_CLIENT_ID"
-
 	remapEnvVariable "MM_CARD_BAANX_API_CLIENT_KEY_UAT" "MM_CARD_BAANX_API_CLIENT_KEY"
 }
 
@@ -517,31 +446,25 @@ generateIosBinary() {
 		exit 1
 	fi
 
+	# PROFILE: 'development' or 'release' (set in builds.yml, defaults to 'release')
+	local profile="${PROFILE:-release}"
+
 	if [ "$scheme" = "MetaMask" ] ; then
-		# Main target
-		if [ "$configuration" = "Debug" ] ; then
-			# Debug configuration
+		if [ "$profile" = "development" ] ; then
 			exportOptionsPlist="MetaMask/IosExportOptionsMetaMaskDevelopment.plist"
 		else
-			# Release configuration
 			exportOptionsPlist="MetaMask/IosExportOptionsMetaMaskRelease.plist"
 		fi
 	elif [ "$scheme" = "MetaMask-QA" ] ; then
-		# QA target
-		if [ "$configuration" = "Debug" ] ; then
-			# Debug configuration
+		if [ "$profile" = "development" ] ; then
 			exportOptionsPlist="MetaMask/IosExportOptionsMetaMaskQADevelopment.plist"
 		else
-			# Release configuration
 			exportOptionsPlist="MetaMask/IosExportOptionsMetaMaskQARelease.plist"
 		fi
 	elif [ "$scheme" = "MetaMask-Flask" ] ; then
-		# Flask target
-		if [ "$configuration" = "Debug" ] ; then
-			# Debug configuration
+		if [ "$profile" = "development" ] ; then
 			exportOptionsPlist="MetaMask/IosExportOptionsMetaMaskFlaskDevelopment.plist"
 		else
-			# Release configuration
 			exportOptionsPlist="MetaMask/IosExportOptionsMetaMaskFlaskRelease.plist"
 		fi
 	fi
@@ -551,17 +474,25 @@ generateIosBinary() {
 	if [ "$IS_SIM_BUILD" = "true" ]; then
     	echo "Binary build type: Simulator"
 		xcodebuild -workspace MetaMask.xcworkspace -scheme $scheme -configuration $configuration -sdk iphonesimulator -derivedDataPath build
+	fi
+	
+	if [ "$IS_DEVICE_BUILD" = "true" ] || [ -z "$IS_SIM_BUILD" ]; then
+		echo "Binary build type: Device"
 
-		# Also generate an .ipa to run on devices
-		if [ "$IS_DEVICE_BUILD" = "true" ]; then
-			echo "Binary build type: Device"
-			xcodebuild -workspace MetaMask.xcworkspace -scheme $scheme -configuration $configuration archive -archivePath build/$scheme.xcarchive -destination generic/platform=ios
-			echo "Generating ipa for $scheme"
-			xcodebuild -exportArchive -archivePath build/$scheme.xcarchive -exportPath build/output -exportOptionsPlist $exportOptionsPlist
+		# When PROFILE=development, override the signing settings so a Release
+		# archive can be signed with the development certificate and profile
+		# instead of the distribution identity hardcoded in the Xcode project.
+		local -a archiveOverrides=()
+		if [ "$profile" = "development" ] && [ "$configuration" = "Release" ]; then
+			archiveOverrides=(
+				CODE_SIGN_STYLE=Manual
+				"PROVISIONING_PROFILE_SPECIFIER=development-metamask"
+				"CODE_SIGN_IDENTITY=Apple Development"
+			)
+			echo "Overriding signing: using development certificate and profile for Release archive"
 		fi
-	else
-		echo "Binary build type: Device"
-		xcodebuild -workspace MetaMask.xcworkspace -scheme $scheme -configuration $configuration archive -archivePath build/$scheme.xcarchive -destination generic/platform=ios
+
+		xcodebuild -workspace MetaMask.xcworkspace -scheme "$scheme" -configuration "$configuration" archive -archivePath "build/$scheme.xcarchive" -destination generic/platform=ios "${archiveOverrides[@]}"
 		echo "Generating ipa for $scheme"
 		xcodebuild -exportArchive -archivePath build/$scheme.xcarchive -exportPath build/output -exportOptionsPlist $exportOptionsPlist
 	fi
diff --git a/scripts/lib/validate-value.js b/scripts/lib/validate-value.js
new file mode 100644
index 00000000000..aca4abbd1db
--- /dev/null
+++ b/scripts/lib/validate-value.js
@@ -0,0 +1,187 @@
+/**
+ * Shared hygiene checks for CI-injected values (GitHub secrets and builds.yml env values).
+ *
+ * The goal is to catch operator mistakes (trailing newline, Windows line endings,
+ * invisible characters pasted from rich text editors, etc.) at build time, before
+ * malformed values end up baked into a production binary.
+ *
+ * Intentionally format-agnostic: it does not try to understand whether a value
+ * is a URL, base64 blob, JWT, etc. It only enforces generic hygiene.
+ *
+ * Usage:
+ *   const { checkValue } = require('./lib/validate-value');
+ *   const issues = checkValue('MM_SENTRY_DSN', value);
+ *   // issues is an array; empty => value is clean.
+ *
+ * Output contract: issue messages MUST NOT include the value itself or any
+ * substring of it. Only the length, offsets, and character code points are
+ * safe to surface.
+ */
+
+/* global Buffer */
+
+// eslint-disable-next-line no-misleading-character-class -- intentional set of invisible code points (ZWSP/ZWNJ/ZWJ/BOM)
+const ZERO_WIDTH_CHARS = /[\u200B\u200C\u200D\uFEFF]/;
+
+// C0/C1 control chars, excluding tab (\u0009), line feed (\u000A), and
+// carriage return (\u000D). CR is reported separately with a friendlier
+// message. LF is allowed mid-value for multi-line secrets (PEM keys, base64).
+/* eslint-disable no-control-regex -- intentionally matches control characters to flag them */
+const CONTROL_CHARS =
+  /[\u0001-\u0008\u000B\u000C\u000E-\u001F\u007F-\u009F]/;
+/* eslint-enable no-control-regex */
+
+function formatCodePoint(ch) {
+  return `U+${ch.charCodeAt(0).toString(16).padStart(4, '0').toUpperCase()}`;
+}
+
+/**
+ * @param {string} name - Identifier to report in violations (e.g. secret name or env key).
+ * @param {unknown} value - The value to check. Non-string values are coerced via String().
+ * @param {object} [options]
+ * @param {boolean} [options.allowEmpty=false] - If true, an empty string is not a violation.
+ *   Whitespace-only strings still fail even when allowEmpty is true (they indicate a typo).
+ * @returns {{ code: string, message: string }[]} - One entry per distinct violation; empty array means clean.
+ */
+function checkValue(name, value, options = {}) {
+  const { allowEmpty = false } = options;
+  const violations = [];
+
+  /**
+   * `missing`: the value is `undefined` or `null`. For secrets, this means the
+   * referenced GitHub Environment secret was never set (or the Environment
+   * itself is misconfigured). For YAML env entries, it usually means a key
+   * like `FOO:` was written with no value, which js-yaml parses as `null`.
+   * Short-circuits: nothing else can be checked without a value.
+   */
+  if (value === undefined || value === null) {
+    violations.push({
+      code: 'missing',
+      message: `${name}: value is null or not defined`,
+    });
+    return violations;
+  }
+
+  const str = String(value);
+  const len = Buffer.byteLength(str, 'utf8');
+
+  /**
+   * `empty`: the value is the empty string `""`. Skipped when the caller
+   * passes `{ allowEmpty: true }`, used for intentionally-empty YAML entries
+   * such as optional allowlists (e.g. `MM_PERPS_HIP3_ALLOWLIST_MARKETS: ''`).
+   * Short-circuits: the remaining checks don't apply to an empty string.
+   */
+  if (str === '') {
+    if (!allowEmpty) {
+      violations.push({
+        code: 'empty',
+        message: `${name}: value is an empty string`,
+      });
+    }
+    return violations;
+  }
+
+  /**
+   * `whitespace_only`: the value is non-empty but contains nothing except
+   * whitespace. Almost always a typo (e.g. someone pasted a single space
+   * into the GitHub Secret UI). Fails even with `allowEmpty: true`, because
+   * "intentionally empty" should be `""`, not `"   "`.
+   * Short-circuits: the value has no meaningful content to inspect further.
+   */
+  if (str.trim() === '') {
+    violations.push({
+      code: 'whitespace_only',
+      message: `${name}: value is whitespace-only (${len} bytes)`,
+    });
+    return violations;
+  }
+
+  /**
+   * `leading_whitespace`: the value begins with whitespace (space, tab, LF,
+   * etc.). Accidental leading whitespace breaks URL parsing, base64 decoding,
+   * and token comparisons — almost never intentional.
+   */
+  if (/^\s/.test(str)) {
+    violations.push({
+      code: 'leading_whitespace',
+      message: `${name}: value has leading whitespace (${len} bytes total)`,
+    });
+  }
+
+  /**
+   * `trailing_whitespace`: the value ends with whitespace. This is the
+   * single most common real-world paste mistake — e.g. copying a token from
+   * a terminal or editor ends up including the trailing `\n`. It's the
+   * specific failure mode this entire module was built to catch.
+   */
+  if (/\s$/.test(str)) {
+    violations.push({
+      code: 'trailing_whitespace',
+      message: `${name}: value has trailing whitespace (${len} bytes total); a trailing newline pasted from a terminal or editor is the most common cause`,
+    });
+  }
+
+  /**
+   * `carriage_return`: the value contains `\r` anywhere. CR is not part of
+   * the base64 alphabet, PEM uses LF, and no sanctioned secret format needs
+   * it — its presence is essentially always an artifact of Windows CRLF line
+   * endings surviving a copy-paste. Reported separately from `control_chars`
+   * so the remediation message can specifically call out Windows endings.
+   */
+  const crIndex = str.indexOf('\r');
+  if (crIndex !== -1) {
+    violations.push({
+      code: 'carriage_return',
+      message: `${name}: value contains a carriage return (\\r) at offset ${crIndex}/${len}; strip Windows line endings before saving the secret`,
+    });
+  }
+
+  /**
+   * `nul_byte`: the value contains `\u0000`. Never legitimate in any secret
+   * format we use. A NUL byte can terminate strings prematurely in C-based
+   * tooling and is a classic source of silent truncation bugs.
+   */
+  const nulIndex = str.indexOf('\u0000');
+  if (nulIndex !== -1) {
+    violations.push({
+      code: 'nul_byte',
+      message: `${name}: value contains a NUL byte at offset ${nulIndex}/${len}`,
+    });
+  }
+
+  /**
+   * `control_chars`: the value contains any other C0/C1 control character
+   * (range defined in CONTROL_CHARS — excludes tab, LF, and CR, which are
+   * allowed or reported separately). Hits here usually indicate non-text
+   * binary data was pasted as if it were a string, or a stray escape
+   * sequence. The message includes the specific code point (e.g. U+0007)
+   * so operators can identify what was pasted.
+   */
+  const ctrlMatch = CONTROL_CHARS.exec(str);
+  if (ctrlMatch) {
+    violations.push({
+      code: 'control_chars',
+      message: `${name}: value contains control character ${formatCodePoint(ctrlMatch[0])} at offset ${ctrlMatch.index}/${len}`,
+    });
+  }
+
+  /**
+   * `zero_width`: the value contains an invisible Unicode character —
+   * zero-width space (U+200B), zero-width non-joiner (U+200C), zero-width
+   * joiner (U+200D), or byte-order mark (U+FEFF). These are introduced when
+   * copying from rich-text sources (Google Docs, Slack, Notion, Confluence)
+   * and are invisible to the human eye but break exact-match comparisons
+   * and break formats like base64 that only accept a strict alphabet.
+   */
+  const zwMatch = ZERO_WIDTH_CHARS.exec(str);
+  if (zwMatch) {
+    violations.push({
+      code: 'zero_width',
+      message: `${name}: value contains invisible character ${formatCodePoint(zwMatch[0])} at offset ${zwMatch.index}/${len}; likely pasted from a rich text source`,
+    });
+  }
+
+  return violations;
+}
+
+module.exports = { checkValue };
diff --git a/scripts/lib/validate-value.test.js b/scripts/lib/validate-value.test.js
new file mode 100644
index 00000000000..ebb47a272bf
--- /dev/null
+++ b/scripts/lib/validate-value.test.js
@@ -0,0 +1,145 @@
+const { checkValue } = require('./validate-value');
+
+const codes = (issues) => issues.map((i) => i.code);
+
+describe('checkValue', () => {
+  describe('happy path', () => {
+    it('returns no issues for a typical single-line secret', () => {
+      expect(checkValue('X', 'key_live_abc123xyz')).toEqual([]);
+    });
+
+    it('returns no issues for a multi-line base64 blob (embedded \\n mid-value is allowed)', () => {
+      const b64 = 'eyJhcGlLZXkiOiJhYmMifQ==\nsecond-line-content==';
+      expect(checkValue('GOOGLE_SERVICES_B64_IOS', b64)).toEqual([]);
+    });
+
+    it('coerces non-string values via String()', () => {
+      expect(checkValue('N', 42)).toEqual([]);
+      expect(checkValue('B', true)).toEqual([]);
+    });
+  });
+
+  describe('missing / empty', () => {
+    it('flags undefined', () => {
+      expect(codes(checkValue('X', undefined))).toEqual(['missing']);
+    });
+
+    it('flags null', () => {
+      expect(codes(checkValue('X', null))).toEqual(['missing']);
+    });
+
+    it('flags empty string by default', () => {
+      expect(codes(checkValue('X', ''))).toEqual(['empty']);
+    });
+
+    it('allows empty string when allowEmpty=true', () => {
+      expect(checkValue('X', '', { allowEmpty: true })).toEqual([]);
+    });
+
+    it('flags whitespace-only even when allowEmpty=true', () => {
+      expect(codes(checkValue('X', '   ', { allowEmpty: true }))).toEqual([
+        'whitespace_only',
+      ]);
+    });
+  });
+
+  describe('leading / trailing whitespace', () => {
+    it('flags trailing newline (the classic paste mistake)', () => {
+      expect(codes(checkValue('X', 'value\n'))).toEqual([
+        'trailing_whitespace',
+      ]);
+    });
+
+    it('flags trailing space', () => {
+      expect(codes(checkValue('X', 'value '))).toEqual([
+        'trailing_whitespace',
+      ]);
+    });
+
+    it('flags trailing tab', () => {
+      expect(codes(checkValue('X', 'value\t'))).toEqual([
+        'trailing_whitespace',
+      ]);
+    });
+
+    it('flags leading space', () => {
+      expect(codes(checkValue('X', ' value'))).toEqual([
+        'leading_whitespace',
+      ]);
+    });
+
+    it('flags both leading and trailing whitespace in one pass', () => {
+      expect(codes(checkValue('X', ' value '))).toEqual([
+        'leading_whitespace',
+        'trailing_whitespace',
+      ]);
+    });
+  });
+
+  describe('control characters', () => {
+    it('flags any \\r (Windows line endings)', () => {
+      expect(codes(checkValue('X', 'abc\r\ndef'))).toContain('carriage_return');
+    });
+
+    it('flags a standalone \\r mid-value', () => {
+      expect(codes(checkValue('X', 'abc\rdef'))).toContain('carriage_return');
+    });
+
+    it('flags NUL bytes', () => {
+      expect(codes(checkValue('X', 'abc\u0000def'))).toContain('nul_byte');
+    });
+
+    it('flags other C0 control characters', () => {
+      expect(codes(checkValue('X', 'abc\u0007def'))).toContain(
+        'control_chars',
+      );
+    });
+
+    it('flags DEL (U+007F)', () => {
+      expect(codes(checkValue('X', 'abc\u007Fdef'))).toContain(
+        'control_chars',
+      );
+    });
+
+    it('does NOT flag tab mid-value', () => {
+      expect(checkValue('X', 'abc\tdef')).toEqual([]);
+    });
+
+    it('does NOT flag LF mid-value (allowed for PEM / base64)', () => {
+      expect(checkValue('X', 'abc\ndef')).toEqual([]);
+    });
+  });
+
+  describe('invisible characters', () => {
+    it('flags zero-width space', () => {
+      expect(codes(checkValue('X', 'abc\u200Bdef'))).toContain('zero_width');
+    });
+
+    it('flags BOM', () => {
+      expect(codes(checkValue('X', '\uFEFFvalue'))).toEqual(
+        expect.arrayContaining(['leading_whitespace', 'zero_width']),
+      );
+    });
+
+    it('flags zero-width joiner', () => {
+      expect(codes(checkValue('X', 'abc\u200Ddef'))).toContain('zero_width');
+    });
+  });
+
+  describe('message safety', () => {
+    it('never includes the value in the message', () => {
+      const secret = 'super-secret-token-xyz';
+      const issues = checkValue('X', `${secret}\n`);
+      for (const { message } of issues) {
+        expect(message).not.toContain(secret);
+      }
+    });
+
+    it('includes the name, a byte length, and the code in the output', () => {
+      const [issue] = checkValue('MM_SENTRY_DSN', 'abc ');
+      expect(issue.code).toBe('trailing_whitespace');
+      expect(issue.message).toContain('MM_SENTRY_DSN');
+      expect(issue.message).toMatch(/\d+ bytes/);
+    });
+  });
+});
diff --git a/scripts/perps/agentic/teams/perps/evals.json b/scripts/perps/agentic/teams/perps/evals.json
index 2af01b70c39..31e60411ee8 100644
--- a/scripts/perps/agentic/teams/perps/evals.json
+++ b/scripts/perps/agentic/teams/perps/evals.json
@@ -51,7 +51,7 @@
   },
   "hl-fixture-state": {
     "description": "HL fixture provisioning snapshot: balances and derived shape flags used by hl-provision-fixture flow and post-op assertions",
-    "expression": "(function(){var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var avail=parseFloat(s.availableBalance||'0');var trade=parseFloat(s.availableToTradeBalance||s.availableBalance||'0');var total=parseFloat(s.totalBalance||'0');var spotFold=+(trade-avail).toFixed(6);return JSON.stringify({availableBalance:avail,availableToTradeBalance:trade,totalBalance:total,spotFold:spotFold,hasPerpsBalance:avail>0.01,hasSpotBalance:spotFold>0.01,isEmpty:total<0.01})})()",
+    "expression": "(function(){var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var avail=parseFloat(s.withdrawableBalance||'0');var trade=parseFloat(s.spendableBalance||s.withdrawableBalance||'0');var total=parseFloat(s.totalBalance||'0');var spotFold=+(trade-avail).toFixed(6);return JSON.stringify({withdrawableBalance:avail,spendableBalance:trade,totalBalance:total,spotFold:spotFold,hasPerpsBalance:avail>0.01,hasSpotBalance:spotFold>0.01,isEmpty:total<0.01})})()",
     "async": false
   }
 }
\ No newline at end of file
diff --git a/scripts/perps/agentic/teams/perps/flows/hl-balance-contract-check.json b/scripts/perps/agentic/teams/perps/flows/hl-balance-contract-check.json
new file mode 100644
index 00000000000..c02813aafd4
--- /dev/null
+++ b/scripts/perps/agentic/teams/perps/flows/hl-balance-contract-check.json
@@ -0,0 +1,57 @@
+{
+  "title": "HL — assert AccountState three-field contract (TAT-3047)",
+  "description": "Switches to {{address}}, waits for PerpsController.accountState to populate, then asserts the new three-field balance contract: spendableBalance + withdrawableBalance + totalBalance present, and no legacy availableBalance / availableToTradeBalance keys. Provider-agnostic shape check — passes on any HL or MYX account.",
+  "inputs": {
+    "address": {
+      "type": "string",
+      "description": "EVM address to select before asserting"
+    },
+    "phaseLabel": {
+      "type": "string",
+      "default": "contract-check",
+      "description": "Short label surfaced in assertions and screenshots"
+    }
+  },
+  "validate": {
+    "workflow": {
+      "pre_conditions": ["wallet.unlocked"],
+      "entry": "select",
+      "nodes": {
+        "select": {
+          "action": "select_account",
+          "address": "{{address}}",
+          "next": "wait-account"
+        },
+        "wait-account": {
+          "action": "wait_for",
+          "expression": "Engine.context.PerpsController.getAccountState().then(function(r){return JSON.stringify({ready:!!r,hasSpendable:typeof r.spendableBalance==='string',hasWithdrawable:typeof r.withdrawableBalance==='string',phase:'{{phaseLabel}}'})}).catch(function(e){return JSON.stringify({ready:false,error:String(e),phase:'{{phaseLabel}}'})})",
+          "assert": {
+            "all": [
+              { "operator": "eq", "field": "ready", "value": true },
+              { "operator": "eq", "field": "hasSpendable", "value": true },
+              { "operator": "eq", "field": "hasWithdrawable", "value": true }
+            ]
+          },
+          "timeout_ms": 30000,
+          "next": "assert-shape"
+        },
+        "assert-shape": {
+          "description": "Contract: spendable + withdrawable + total present, no legacy fields",
+          "action": "eval_sync",
+          "expression": "(function(){var s=Engine.context.PerpsController.state.accountState||{};return JSON.stringify({hasSpendable:typeof s.spendableBalance==='string',hasWithdrawable:typeof s.withdrawableBalance==='string',hasTotal:typeof s.totalBalance==='string',hasLegacyAvailable:'availableBalance' in s,hasLegacyTradeable:'availableToTradeBalance' in s,spendableBalance:s.spendableBalance,withdrawableBalance:s.withdrawableBalance,totalBalance:s.totalBalance,phase:'{{phaseLabel}}'})})()",
+          "assert": {
+            "all": [
+              { "operator": "eq", "field": "hasSpendable", "value": true },
+              { "operator": "eq", "field": "hasWithdrawable", "value": true },
+              { "operator": "eq", "field": "hasTotal", "value": true },
+              { "operator": "eq", "field": "hasLegacyAvailable", "value": false },
+              { "operator": "eq", "field": "hasLegacyTradeable", "value": false }
+            ]
+          },
+          "next": "done"
+        },
+        "done": { "action": "end", "status": "pass" }
+      }
+    }
+  }
+}
diff --git a/scripts/perps/agentic/teams/perps/flows/hl-balance-math-check.json b/scripts/perps/agentic/teams/perps/flows/hl-balance-math-check.json
new file mode 100644
index 00000000000..aa9f877859a
--- /dev/null
+++ b/scripts/perps/agentic/teams/perps/flows/hl-balance-math-check.json
@@ -0,0 +1,61 @@
+{
+  "title": "HL — assert controller balance math matches raw HL REST (TAT-3047)",
+  "description": "Asserts PerpsController.accountState is consistent with raw HL state. Uses the controller's own subAccountBreakdown (pre-spot-fold per-DEX values) as perps-side truth plus spotClearinghouseState via HL REST for spot-side truth. When `foldIntoCollateral` is true (Unified / Portfolio), expects spendable/withdrawable = Σ(breakdown) + freeSpot. When false (Standard / DEX-abstraction), expects spendable/withdrawable = Σ(breakdown) — spot is NOT folded into collateral fields. `totalBalance` always equals Σ(breakdown.total) + spot.total − spot.hold (display reflects combined wealth regardless of mode).",
+  "inputs": {
+    "address": {
+      "type": "string",
+      "description": "EVM address to query via HL REST and select in the app"
+    },
+    "phaseLabel": {
+      "type": "string",
+      "default": "math-check",
+      "description": "Short label surfaced in assertions"
+    },
+    "epsilon": {
+      "type": "number",
+      "default": 0.01,
+      "description": "Rounding tolerance when comparing controller fields vs REST-derived expected values"
+    },
+    "foldIntoCollateral": {
+      "type": "boolean",
+      "default": true,
+      "description": "Expected mode-aware behavior: true when the account is in a unifying mode (Unified / Portfolio), false for Standard / DEX-abstraction. Governs how expected spendable/withdrawable are derived."
+    }
+  },
+  "validate": {
+    "workflow": {
+      "pre_conditions": ["wallet.unlocked"],
+      "entry": "select",
+      "nodes": {
+        "select": {
+          "action": "select_account",
+          "address": "{{address}}",
+          "next": "wait-account"
+        },
+        "wait-account": {
+          "action": "wait_for",
+          "expression": "Engine.context.PerpsController.getAccountState().then(function(r){return JSON.stringify({ready:!!r,phase:'{{phaseLabel}}'})}).catch(function(e){return JSON.stringify({ready:false,error:String(e)})})",
+          "assert": { "operator": "eq", "field": "ready", "value": true },
+          "timeout_ms": 30000,
+          "next": "assert-rest-vs-state"
+        },
+        "assert-rest-vs-state": {
+          "description": "Derive expected values from breakdown (perps-side truth, covers HIP-3) + HL REST spot; compare against controller fields; gate fold on foldIntoCollateral input.",
+          "action": "eval_async",
+          "expression": "(function(){var addr='{{address}}'.toLowerCase();var eps={{epsilon}};var fold={{foldIntoCollateral}};var base='https://api.hyperliquid.xyz/info';return fetch(base,{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({type:'spotClearinghouseState',user:addr})}).then(function(r){return r.json()}).then(function(spot){var usdc=((spot&&spot.balances)||[]).find(function(b){return b.coin==='USDC'})||{};var t=parseFloat(usdc.total||'0');var h=parseFloat(usdc.hold||'0');var free=Math.max(0,t-h);var s=Engine.context.PerpsController.state.accountState||{};var breakdown=s.subAccountBreakdown||{};var sumSpendable=0;var sumWithdrawable=0;var sumTotal=0;Object.keys(breakdown).forEach(function(k){var e=breakdown[k]||{};sumSpendable+=parseFloat(e.spendableBalance||'0');sumWithdrawable+=parseFloat(e.withdrawableBalance||'0');sumTotal+=parseFloat(e.totalBalance||'0')});var expectedSpendable=fold?sumSpendable+free:sumSpendable;var expectedWithdrawable=fold?sumWithdrawable+free:sumWithdrawable;var expectedTotal=sumTotal+t-h;var actualSpendable=parseFloat(s.spendableBalance||'0');var actualWithdrawable=parseFloat(s.withdrawableBalance||'0');var actualTotal=parseFloat(s.totalBalance||'0');return JSON.stringify({phase:'{{phaseLabel}}',foldIntoCollateral:fold,spot:{total:t,hold:h,free:free},breakdownPerpsSums:{spendable:sumSpendable,withdrawable:sumWithdrawable,total:sumTotal},expected:{spendable:expectedSpendable,withdrawable:expectedWithdrawable,total:expectedTotal},actual:{spendable:actualSpendable,withdrawable:actualWithdrawable,total:actualTotal},spendableMatches:Math.abs(actualSpendable-expectedSpendable)<=eps,withdrawableMatches:Math.abs(actualWithdrawable-expectedWithdrawable)<=eps,totalMatches:Math.abs(actualTotal-expectedTotal)<=eps,spendableEqualsWithdrawable:Math.abs(actualSpendable-actualWithdrawable)<=eps})})})()",
+          "assert": {
+            "all": [
+              { "operator": "eq", "field": "spendableMatches", "value": true },
+              { "operator": "eq", "field": "withdrawableMatches", "value": true },
+              { "operator": "eq", "field": "totalMatches", "value": true },
+              { "operator": "eq", "field": "spendableEqualsWithdrawable", "value": true }
+            ]
+          },
+          "timeout_ms": 20000,
+          "next": "done"
+        },
+        "done": { "action": "end", "status": "pass" }
+      }
+    }
+  }
+}
diff --git a/scripts/perps/agentic/teams/perps/flows/hl-balance-validation.json b/scripts/perps/agentic/teams/perps/flows/hl-balance-validation.json
index 1a9a272eee8..a51552c6eb2 100644
--- a/scripts/perps/agentic/teams/perps/flows/hl-balance-validation.json
+++ b/scripts/perps/agentic/teams/perps/flows/hl-balance-validation.json
@@ -1,7 +1,7 @@
 {
     "title": "HL balance validation — phase={{phaseLabel}} expectedMode={{expectedMode}}",
     "schema_version": 1,
-    "description": "Captures and asserts the three balance readouts the TAT-3016 hotfix touches: (1) PerpsController.state.accountState (availableBalance vs availableToTradeBalance), (2) PerpsMarketDetails balance text (perps-market-available-balance-text — gates order-entry Long/Add-Funds CTA), (3) PerpsWithdraw balance text (perps-withdraw-available-balance-text — must show availableBalance only, never the spot fold). Screenshots per screen tagged with phaseLabel for reviewer before/after comparison. Fold invariant (trade >= avail) is asserted unconditionally. expectedMode='unified' additionally asserts the fold amount is non-trivial when spot USDC is present; expectedMode='standard' asserts withdrawable==availableBalance (no leak from fold into the withdrawable path).",
+    "description": "Captures and asserts the three balance readouts the TAT-3016 hotfix touches: (1) PerpsController.state.accountState (withdrawableBalance vs spendableBalance), (2) PerpsMarketDetails balance text (perps-market-available-balance-text — gates order-entry Long/Add-Funds CTA), (3) PerpsWithdraw balance text (perps-withdraw-available-balance-text — must show withdrawableBalance only, never the spot fold). Screenshots per screen tagged with phaseLabel for reviewer before/after comparison. Fold invariant (trade >= avail) is asserted unconditionally. expectedMode='unified' additionally asserts the fold amount is non-trivial when spot USDC is present; expectedMode='standard' asserts withdrawable==withdrawableBalance (no leak from fold into the withdrawable path).",
     "inputs": {
       "expectedMode": {
         "type": "string",
@@ -24,7 +24,7 @@
         "nodes": {
           "refresh-state": {
             "action": "eval_async",
-            "expression": "Engine.context.PerpsController.getAccountState().then(function(r){return JSON.stringify({ok:true,availableBalance:r.availableBalance,availableToTradeBalance:r.availableToTradeBalance,totalBalance:r.totalBalance,phase:'{{phaseLabel}}'})}).catch(function(e){return JSON.stringify({ok:false,error:String(e),phase:'{{phaseLabel}}'})})",
+            "expression": "Engine.context.PerpsController.getAccountState().then(function(r){return JSON.stringify({ok:true,withdrawableBalance:r.withdrawableBalance,spendableBalance:r.spendableBalance,totalBalance:r.totalBalance,phase:'{{phaseLabel}}'})}).catch(function(e){return JSON.stringify({ok:false,error:String(e),phase:'{{phaseLabel}}'})})",
             "assert": { "operator": "eq", "field": "ok", "value": true },
             "timeout_ms": 20000,
             "next": "capture-controller-state"
@@ -34,13 +34,13 @@
             "ref": "perps/hl-fixture-state",
             "assert": {
               "operator": "not_null",
-              "field": "availableToTradeBalance"
+              "field": "spendableBalance"
             },
             "next": "assert-fold-invariant"
           },
           "assert-fold-invariant": {
             "action": "eval_sync",
-            "expression": "(function(){var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var avail=parseFloat(s.availableBalance||'0');var trade=parseFloat(s.availableToTradeBalance||s.availableBalance||'0');var spotFold=+(trade-avail).toFixed(6);return JSON.stringify({availableBalance:avail,availableToTradeBalance:trade,spotFold:spotFold,foldInvariant:trade>=avail,phase:'{{phaseLabel}}'})})()",
+            "expression": "(function(){var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var avail=parseFloat(s.withdrawableBalance||'0');var trade=parseFloat(s.spendableBalance||s.withdrawableBalance||'0');var spotFold=+(trade-avail).toFixed(6);return JSON.stringify({withdrawableBalance:avail,spendableBalance:trade,spotFold:spotFold,foldInvariant:trade>=avail,phase:'{{phaseLabel}}'})})()",
             "assert": {
               "operator": "eq",
               "field": "foldInvariant",
@@ -73,7 +73,7 @@
           },
           "capture-market-list-balance": {
             "action": "eval_sync",
-            "expression": "(function(){try{var a=globalThis.__AGENTIC__;var display=a&&a.getTextByTestId('perps-market-available-balance-text')||'';var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var trade=parseFloat(s.availableToTradeBalance||s.availableBalance||'0');var tradeFloor=Math.floor(trade);var tradeStr=tradeFloor.toString();var mentionsTrade=display.length>0&&(display.indexOf(tradeStr)>=0||display.indexOf('$0')>=0&&trade<1);return JSON.stringify({display:display,availableToTradeBalance:trade,displayMatchesTradeBalance:mentionsTrade,phase:'{{phaseLabel}}'})}catch(e){return JSON.stringify({error:String(e)})}})()",
+            "expression": "(function(){try{var a=globalThis.__AGENTIC__;var display=a&&a.getTextByTestId('perps-market-available-balance-text')||'';var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var trade=parseFloat(s.spendableBalance||s.withdrawableBalance||'0');var tradeFloor=Math.floor(trade);var tradeStr=tradeFloor.toString();var mentionsTrade=display.length>0&&(display.indexOf(tradeStr)>=0||display.indexOf('$0')>=0&&trade<1);return JSON.stringify({display:display,spendableBalance:trade,displayMatchesTradeBalance:mentionsTrade,phase:'{{phaseLabel}}'})}catch(e){return JSON.stringify({error:String(e)})}})()",
             "assert": {
               "operator": "not_null",
               "field": "display"
@@ -111,7 +111,7 @@
           },
           "capture-withdraw-balance": {
             "action": "eval_sync",
-            "expression": "(function(){try{var a=globalThis.__AGENTIC__;var display=a&&a.getTextByTestId('perps-withdraw-available-balance-text')||'';var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var avail=parseFloat(s.availableBalance||'0');var trade=parseFloat(s.availableToTradeBalance||s.availableBalance||'0');var availFloor=Math.floor(avail);var availStr=availFloor.toString();var mentionsAvail=display.length>0&&(display.indexOf(availStr)>=0||(avail<1&&display.indexOf('$0')>=0));var leaksFold=trade>avail+0.5&&display.indexOf(Math.floor(trade).toString())>=0;return JSON.stringify({display:display,availableBalance:avail,availableToTradeBalance:trade,displayMatchesWithdrawable:mentionsAvail,displayLeaksFold:leaksFold,phase:'{{phaseLabel}}'})}catch(e){return JSON.stringify({error:String(e)})}})()",
+            "expression": "(function(){try{var a=globalThis.__AGENTIC__;var display=a&&a.getTextByTestId('perps-withdraw-available-balance-text')||'';var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var avail=parseFloat(s.withdrawableBalance||'0');var trade=parseFloat(s.spendableBalance||s.withdrawableBalance||'0');var availFloor=Math.floor(avail);var availStr=availFloor.toString();var mentionsAvail=display.length>0&&(display.indexOf(availStr)>=0||(avail<1&&display.indexOf('$0')>=0));var leaksFold=trade>avail+0.5&&display.indexOf(Math.floor(trade).toString())>=0;return JSON.stringify({display:display,withdrawableBalance:avail,spendableBalance:trade,displayMatchesWithdrawable:mentionsAvail,displayLeaksFold:leaksFold,phase:'{{phaseLabel}}'})}catch(e){return JSON.stringify({error:String(e)})}})()",
             "assert": {
               "all": [
                 { "operator": "eq", "field": "displayMatchesWithdrawable", "value": true },
@@ -163,7 +163,7 @@
           },
           "capture-order-form": {
             "action": "eval_sync",
-            "expression": "(function(){try{var a=globalThis.__AGENTIC__;var paySymbol=a&&a.getTextByTestId('pay-with-symbol')||'';var placeOrderMounted=!!(a&&a.findFiberByTestId('perps-order-view-place-order-button'));var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var trade=parseFloat(s.availableToTradeBalance||s.availableBalance||'0');var expectsPerpsBalance=trade>0;var paysWithPerps=paySymbol.toLowerCase().indexOf('perps')>=0;return JSON.stringify({paySymbol:paySymbol,paysWithPerpsBalance:paysWithPerps,placeOrderButtonMounted:placeOrderMounted,defaultsCorrectly:expectsPerpsBalance?paysWithPerps:true,phase:'{{phaseLabel}}'})}catch(e){return JSON.stringify({error:String(e)})}})()",
+            "expression": "(function(){try{var a=globalThis.__AGENTIC__;var paySymbol=a&&a.getTextByTestId('pay-with-symbol')||'';var placeOrderMounted=!!(a&&a.findFiberByTestId('perps-order-view-place-order-button'));var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var trade=parseFloat(s.spendableBalance||s.withdrawableBalance||'0');var expectsPerpsBalance=trade>0;var paysWithPerps=paySymbol.toLowerCase().indexOf('perps')>=0;return JSON.stringify({paySymbol:paySymbol,paysWithPerpsBalance:paysWithPerps,placeOrderButtonMounted:placeOrderMounted,defaultsCorrectly:expectsPerpsBalance?paysWithPerps:true,phase:'{{phaseLabel}}'})}catch(e){return JSON.stringify({error:String(e)})}})()",
             "assert": {
               "all": [
                 { "operator": "eq", "field": "defaultsCorrectly", "value": true },
@@ -209,7 +209,7 @@
           },
           "assert-unified-shape": {
             "action": "eval_sync",
-            "expression": "(function(){var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var avail=parseFloat(s.availableBalance||'0');var trade=parseFloat(s.availableToTradeBalance||s.availableBalance||'0');var spotFold=+(trade-avail).toFixed(6);return JSON.stringify({availableBalance:avail,availableToTradeBalance:trade,spotFold:spotFold,tradeExceedsAvail:trade>=avail,expectedMode:'unified',phase:'{{phaseLabel}}'})})()",
+            "expression": "(function(){var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var avail=parseFloat(s.withdrawableBalance||'0');var trade=parseFloat(s.spendableBalance||s.withdrawableBalance||'0');var spotFold=+(trade-avail).toFixed(6);return JSON.stringify({withdrawableBalance:avail,spendableBalance:trade,spotFold:spotFold,tradeExceedsAvail:trade>=avail,expectedMode:'unified',phase:'{{phaseLabel}}'})})()",
             "assert": {
               "operator": "eq",
               "field": "tradeExceedsAvail",
@@ -219,7 +219,7 @@
           },
           "assert-standard-shape": {
             "action": "eval_sync",
-            "expression": "(function(){var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var avail=parseFloat(s.availableBalance||'0');var trade=parseFloat(s.availableToTradeBalance||s.availableBalance||'0');var spotFold=+(trade-avail).toFixed(6);return JSON.stringify({availableBalance:avail,availableToTradeBalance:trade,spotFold:spotFold,foldInvariant:trade>=avail,standardContract:true,expectedMode:'standard',phase:'{{phaseLabel}}'})})()",
+            "expression": "(function(){var s=(Engine.context.PerpsController.state&&Engine.context.PerpsController.state.accountState)||{};var avail=parseFloat(s.withdrawableBalance||'0');var trade=parseFloat(s.spendableBalance||s.withdrawableBalance||'0');var spotFold=+(trade-avail).toFixed(6);return JSON.stringify({withdrawableBalance:avail,spendableBalance:trade,spotFold:spotFold,foldInvariant:trade>=avail,standardContract:true,expectedMode:'standard',phase:'{{phaseLabel}}'})})()",
             "assert": {
               "operator": "eq",
               "field": "foldInvariant",
diff --git a/scripts/perps/agentic/teams/perps/flows/hl-provision-fixture.json b/scripts/perps/agentic/teams/perps/flows/hl-provision-fixture.json
index a9e42f2d3c8..3d12a418e7b 100644
--- a/scripts/perps/agentic/teams/perps/flows/hl-provision-fixture.json
+++ b/scripts/perps/agentic/teams/perps/flows/hl-provision-fixture.json
@@ -82,7 +82,7 @@
           },
           "transfer-to-spot": {
             "action": "eval_async",
-            "expression": "(function(){try{var ctrl=Engine.context.PerpsController;var provider=ctrl.getActiveProvider();var s=(ctrl.state&&ctrl.state.accountState)||{};var amountInput='{{transferAmount}}';var amount=amountInput==='max'?String(parseFloat(s.availableBalance||'0')):amountInput;if(!(parseFloat(amount)>0))return JSON.stringify({ok:false,error:'nothing to transfer',source:'perps',amount:amount});return provider.getExchangeClient().then(function(client){return client.usdClassTransfer({amount:amount,toPerp:false})}).then(function(r){return JSON.stringify({ok:true,direction:'to-spot',amount:amount,status:(r&&r.status)||'ok'})}).catch(function(e){return JSON.stringify({ok:false,error:String(e&&e.message||e),amount:amount})})}catch(e){return JSON.stringify({ok:false,error:String(e)})}})()",
+            "expression": "(function(){try{var ctrl=Engine.context.PerpsController;var provider=ctrl.getActiveProvider();var isTestnet=!!(ctrl.state&&ctrl.state.isTestnet);var base=isTestnet?'https://api.hyperliquid-testnet.xyz/info':'https://api.hyperliquid.xyz/info';var accs=Engine.context.AccountsController.state.internalAccounts;var user=accs.accounts[accs.selectedAccount].address;var amountInput='{{transferAmount}}';var resolveMax=amountInput==='max'?fetch(base,{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({type:'clearinghouseState',user:user})}).then(function(r){return r.json()}).then(function(j){return String(parseFloat((j&&j.withdrawable)||'0'))}):Promise.resolve(amountInput);return resolveMax.then(function(amount){if(!(parseFloat(amount)>0))return JSON.stringify({ok:false,error:'nothing to transfer',source:'perps',amount:amount});return provider.getExchangeClient().then(function(client){return client.usdClassTransfer({amount:amount,toPerp:false})}).then(function(r){return JSON.stringify({ok:true,direction:'to-spot',amount:amount,status:(r&&r.status)||'ok'})})}).catch(function(e){return JSON.stringify({ok:false,error:String(e&&e.message||e)})})}catch(e){return JSON.stringify({ok:false,error:String(e)})}})()",
             "assert": {
               "operator": "eq",
               "field": "ok",
@@ -93,7 +93,7 @@
           },
           "transfer-to-perp": {
             "action": "eval_async",
-            "expression": "(function(){try{var ctrl=Engine.context.PerpsController;var provider=ctrl.getActiveProvider();var s=(ctrl.state&&ctrl.state.accountState)||{};var amountInput='{{transferAmount}}';var avail=parseFloat(s.availableBalance||'0');var trade=parseFloat(s.availableToTradeBalance||s.availableBalance||'0');var spotFold=Math.max(0,trade-avail);var amount=amountInput==='max'?String(spotFold):amountInput;if(!(parseFloat(amount)>0))return JSON.stringify({ok:false,error:'nothing to transfer',source:'spot',amount:amount});return provider.getExchangeClient().then(function(client){return client.usdClassTransfer({amount:amount,toPerp:true})}).then(function(r){return JSON.stringify({ok:true,direction:'to-perp',amount:amount,status:(r&&r.status)||'ok'})}).catch(function(e){return JSON.stringify({ok:false,error:String(e&&e.message||e),amount:amount})})}catch(e){return JSON.stringify({ok:false,error:String(e)})}})()",
+            "expression": "(function(){try{var ctrl=Engine.context.PerpsController;var provider=ctrl.getActiveProvider();var isTestnet=!!(ctrl.state&&ctrl.state.isTestnet);var base=isTestnet?'https://api.hyperliquid-testnet.xyz/info':'https://api.hyperliquid.xyz/info';var accs=Engine.context.AccountsController.state.internalAccounts;var user=accs.accounts[accs.selectedAccount].address;var amountInput='{{transferAmount}}';var resolveMax=amountInput==='max'?fetch(base,{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({type:'spotClearinghouseState',user:user})}).then(function(r){return r.json()}).then(function(j){var bals=(j&&j.balances)||[];var free=0;for(var i=0;i<bals.length;i++){if(bals[i].coin==='USDC'){free=Math.max(0,parseFloat(bals[i].total||'0')-parseFloat(bals[i].hold||'0'));break}}return String(free)}):Promise.resolve(amountInput);return resolveMax.then(function(amount){if(!(parseFloat(amount)>0))return JSON.stringify({ok:false,error:'nothing to transfer',source:'spot',amount:amount});return provider.getExchangeClient().then(function(client){return client.usdClassTransfer({amount:amount,toPerp:true})}).then(function(r){return JSON.stringify({ok:true,direction:'to-perp',amount:amount,status:(r&&r.status)||'ok'})})}).catch(function(e){return JSON.stringify({ok:false,error:String(e&&e.message||e)})})}catch(e){return JSON.stringify({ok:false,error:String(e)})}})()",
             "assert": {
               "operator": "eq",
               "field": "ok",
@@ -104,7 +104,7 @@
           },
           "wait-transfer-settle": {
             "action": "wait_for",
-            "expression": "Engine.context.PerpsController.getAccountState().then(function(r){return JSON.stringify({refreshed:!!r,availableBalance:r&&r.availableBalance,availableToTradeBalance:r&&r.availableToTradeBalance})}).catch(function(e){return JSON.stringify({refreshed:false,error:String(e)})})",
+            "expression": "Engine.context.PerpsController.getAccountState().then(function(r){return JSON.stringify({refreshed:!!r,withdrawableBalance:r&&r.withdrawableBalance,spendableBalance:r&&r.spendableBalance})}).catch(function(e){return JSON.stringify({refreshed:false,error:String(e)})})",
             "assert": { "operator": "eq", "field": "refreshed", "value": true },
             "timeout_ms": 60000,
             "next": "verify-state"
diff --git a/scripts/perps/agentic/teams/perps/pre-conditions.js b/scripts/perps/agentic/teams/perps/pre-conditions.js
index 3e9110803bb..8a146b87d16 100644
--- a/scripts/perps/agentic/teams/perps/pre-conditions.js
+++ b/scripts/perps/agentic/teams/perps/pre-conditions.js
@@ -86,7 +86,7 @@ const REGISTRY = {
   'perps.sufficient_balance': {
     description: 'Perps account has a non-zero available balance',
     async: true,
-    expression: 'Engine.context.PerpsController.getAccountState().then(function(r){ return JSON.stringify({balance: parseFloat(r.availableBalance||"0")}); })',
+    expression: 'Engine.context.PerpsController.getAccountState().then(function(r){ return JSON.stringify({balance: parseFloat(r.withdrawableBalance||"0")}); })',
     assert: { operator: 'gt', field: 'balance', value: 0 },
     hint: 'Deposit funds into your Perps account before placing orders.',
     fixtures: {
diff --git a/scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json b/scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json
new file mode 100644
index 00000000000..dd0d6732532
--- /dev/null
+++ b/scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json
@@ -0,0 +1,375 @@
+{
+  "pr": "29303",
+  "schema_version": 1,
+  "title": "TAT-3047 validation — single-account state machine (parametric)",
+  "jira": "TAT-3047",
+  "description": "Single-account validation. Reviewer picks the fixture via `--input address=0x...` (default Trading). Recipe entry probes for open positions/orders and routes to one of two paths: Path A (clean account) runs the full Unified ↔ Standard mode-flip state machine to prove the mode-aware fold gate; Path B (positions present, e.g. Trading with HIP-3 hold) skips mode flips (HL rejects them while positions exist) and exercises the spot-fold math under non-trivial spot.hold. Manual reproduction steps map each state to an HL-web action: docs/perps/perps-account-abstraction-and-balance-contract.md#manual-reproduction. Recovery: if Path A crashes mid-mode-flip, the account is left in Standard — restore via `hl-provision-fixture abstraction=unifiedAccount transferDirection=none` standalone or by toggling 'Disable Unified Account Mode' off in HL web settings.",
+  "acceptance_criteria": [
+    "AC1: Three-field contract present, no legacy keys, on the runtime-selected account.",
+    "AC2: Controller balances reconcile against raw HL REST under both Unified and (Path A only) Standard modes.",
+    "AC3: PerpsWithdrawView renders folded withdrawableBalance (not \\$0) when account is Unified spot-funded.",
+    "AC4: PerpsMarketListView header renders spendableBalance.",
+    "AC5: useWithdrawValidation enables Continue when typed amount ≤ withdrawable.",
+    "AC6: Over-amount strictly exceeds withdrawableBalance (field contract supplies real data to validation hook).",
+    "AC7 (Path A): hyperLiquidModeFoldsSpot gate keeps spendable/withdrawable perps-only on Standard mode."
+  ],
+  "inputs": {
+    "address": {
+      "type": "string",
+      "default": "0x316BDE155acd07609872a56Bc32CcfB0B13201fA",
+      "description": "EVM address to validate against. Default: Trading. Pass via `--input address=0x...` to switch fixtures."
+    }
+  },
+  "initial_conditions": {
+    "testnet": false
+  },
+  "validate": {
+    "workflow": {
+      "pre_conditions": ["wallet.unlocked", "perps.feature_enabled"],
+      "entry": "gate-check-route",
+      "nodes": {
+        "gate-check-route": {
+          "description": "Capture entry route; if inside Perps views, navigate home first so the recipe runs from a clean baseline.",
+          "action": "eval_sync",
+          "expression": "JSON.stringify({ currentRoute: (function(){ try { var r = __AGENTIC__.getRoute(); return r ? r.name : 'unknown'; } catch(e) { return 'unknown'; } })() })",
+          "assert": { "operator": "neq", "field": "currentRoute", "value": "unknown" },
+          "next": "gate-route-switch"
+        },
+        "gate-route-switch": {
+          "action": "switch",
+          "cases": [
+            { "when": { "operator": "eq", "field": "last.currentRoute", "value": "PerpsWithdraw" }, "next": "go-home" },
+            { "when": { "operator": "eq", "field": "last.currentRoute", "value": "PerpsMarketListView" }, "next": "go-home" },
+            { "when": { "operator": "eq", "field": "last.currentRoute", "value": "PerpsHomeView" }, "next": "go-home" }
+          ],
+          "default": "select-account"
+        },
+        "go-home": {
+          "action": "navigate",
+          "target": "WalletView",
+          "next": "select-account"
+        },
+
+        "select-account": {
+          "description": "Switch to the parametric address (defaults to Trading). Subsequent flow calls take the same address so a manual --input override drives the entire recipe.",
+          "action": "select_account",
+          "address": "{{address}}",
+          "next": "wait-account"
+        },
+        "wait-account": {
+          "action": "wait_for",
+          "expression": "Engine.context.PerpsController.getAccountState().then(function(r){return JSON.stringify({ready:!!r,hasSpendable:typeof r.spendableBalance==='string'})}).catch(function(e){return JSON.stringify({ready:false,error:String(e)})})",
+          "assert": {
+            "all": [
+              { "operator": "eq", "field": "ready", "value": true },
+              { "operator": "eq", "field": "hasSpendable", "value": true }
+            ]
+          },
+          "timeout_ms": 30000,
+          "next": "preflight-probe"
+        },
+        "preflight-probe": {
+          "description": "Classify account into Path A (clean — full mode-flip matrix) or Path B (positions/orders present — limited matrix). HL rejects userSetAbstraction when positions/orders/TWAPs exist, so the path choice is forced by venue state, not preference.",
+          "action": "eval_async",
+          "expression": "(function(){var addr='{{address}}'.toLowerCase();var base='https://api.hyperliquid.xyz/info';return Promise.all([fetch(base,{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({type:'clearinghouseState',user:addr})}).then(function(r){return r.json()}),fetch(base,{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({type:'openOrders',user:addr})}).then(function(r){return r.json()}),fetch(base,{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({type:'spotClearinghouseState',user:addr})}).then(function(r){return r.json()}),fetch(base,{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({type:'userAbstraction',user:addr})}).then(function(r){return r.json()})]).then(function(res){var perps=res[0]||{};var orders=res[1]||[];var spot=res[2]||{};var mode=res[3];var positions=(perps.assetPositions||[]).length;var pendingOrders=Array.isArray(orders)?orders.length:0;var usdc=((spot.balances)||[]).find(function(b){return b.coin==='USDC'})||{};var perpsWithdrawable=parseFloat(perps.withdrawable||'0');var spotTotal=parseFloat(usdc.total||'0');var spotHold=parseFloat(usdc.hold||'0');var freeSpot=Math.max(0,spotTotal-spotHold);var totalUsdc=perpsWithdrawable+freeSpot;return JSON.stringify({address:addr,pathA:positions===0&&pendingOrders===0,positions:positions,pendingOrders:pendingOrders,mode:mode,perpsWithdrawable:perpsWithdrawable,spotTotal:spotTotal,spotHold:spotHold,freeSpot:freeSpot,totalUsdc:totalUsdc,hasFunds:totalUsdc>=1})})})()",
+          "assert": {
+            "all": [
+              { "operator": "not_null", "field": "address" },
+              { "operator": "eq", "field": "hasFunds", "value": true }
+            ]
+          },
+          "save_as": "preflight",
+          "timeout_ms": 30000,
+          "next": "shared-contract"
+        },
+
+        "shared-contract": {
+          "description": "Mode-agnostic shape check — runs on both paths.",
+          "action": "call",
+          "ref": "perps/hl-balance-contract-check",
+          "params": {
+            "address": "{{address}}",
+            "phaseLabel": "shared-entry"
+          },
+          "next": "shared-math"
+        },
+        "shared-math": {
+          "description": "Mode-agnostic math check — runs on both paths. Uses controller subAccountBreakdown as perps truth + HL REST spot. Fold expectation = whatever the runtime mode dictates (Unified default).",
+          "action": "call",
+          "ref": "perps/hl-balance-math-check",
+          "params": {
+            "address": "{{address}}",
+            "phaseLabel": "shared-entry"
+          },
+          "next": "shared-ui-checks"
+        },
+        "shared-ui-checks": {
+          "description": "PerpsMarketListView + PerpsWithdrawView assertions + keypad valid/over checks. These run on both paths; on a spot-only Unified account they prove TAT-3047's primary fix (withdraw shows real number, not $0).",
+          "action": "navigate",
+          "target": "PerpsMarketListView",
+          "next": "shared-wait-market-list"
+        },
+        "shared-wait-market-list": {
+          "action": "wait_for",
+          "expression": "JSON.stringify({mounted:!!(globalThis.__AGENTIC__&&__AGENTIC__.findFiberByTestId&&__AGENTIC__.findFiberByTestId('perps-market-available-balance-text'))})",
+          "assert": { "operator": "eq", "field": "mounted", "value": true },
+          "timeout_ms": 15000,
+          "next": "shared-assert-market-list"
+        },
+        "shared-assert-market-list": {
+          "description": "AC4: PerpsMarketBalanceActions header text matches accountState.spendableBalance.",
+          "action": "eval_sync",
+          "expression": "(function(){try{var display=__AGENTIC__.getTextByTestId('perps-market-available-balance-text')||'';var s=Engine.context.PerpsController.state.accountState||{};var spendable=parseFloat(s.spendableBalance||'0');var spendableFloor=Math.floor(spendable);var matches=display.length>0&&display.indexOf(String(spendableFloor))>=0;return JSON.stringify({display:display,spendable:spendable,displayMatchesSpendable:matches})}catch(e){return JSON.stringify({error:String(e)})}})()",
+          "assert": { "operator": "eq", "field": "displayMatchesSpendable", "value": true },
+          "next": "shared-screenshot-market-list"
+        },
+        "shared-screenshot-market-list": {
+          "action": "screenshot",
+          "filename": "shared-market-list.png",
+          "note": "AC4: Market list header renders spendableBalance",
+          "next": "shared-nav-withdraw"
+        },
+        "shared-nav-withdraw": {
+          "action": "navigate",
+          "target": "PerpsWithdraw",
+          "next": "shared-wait-withdraw"
+        },
+        "shared-wait-withdraw": {
+          "action": "wait_for",
+          "expression": "JSON.stringify({mounted:!!(globalThis.__AGENTIC__&&__AGENTIC__.findFiberByTestId&&__AGENTIC__.findFiberByTestId('perps-withdraw-available-balance-text'))})",
+          "assert": { "operator": "eq", "field": "mounted", "value": true },
+          "timeout_ms": 15000,
+          "next": "shared-assert-withdraw"
+        },
+        "shared-assert-withdraw": {
+          "description": "AC3: PerpsWithdrawView renders accountState.withdrawableBalance, not $0.",
+          "action": "eval_sync",
+          "expression": "(function(){try{var display=__AGENTIC__.getTextByTestId('perps-withdraw-available-balance-text')||'';var s=Engine.context.PerpsController.state.accountState||{};var withdrawable=parseFloat(s.withdrawableBalance||'0');var withdrawableFloor=Math.floor(withdrawable);var matches=display.length>0&&display.indexOf(String(withdrawableFloor))>=0;var showsZero=display.indexOf('$0.00')>=0||display.indexOf('$0 ')>=0;return JSON.stringify({display:display,withdrawable:withdrawable,displayMatchesWithdrawable:matches,displayShowsZero:showsZero})}catch(e){return JSON.stringify({error:String(e)})}})()",
+          "assert": {
+            "all": [
+              { "operator": "eq", "field": "displayMatchesWithdrawable", "value": true },
+              { "operator": "eq", "field": "displayShowsZero", "value": false }
+            ]
+          },
+          "next": "shared-screenshot-withdraw"
+        },
+        "shared-screenshot-withdraw": {
+          "action": "screenshot",
+          "filename": "shared-withdraw-folded.png",
+          "note": "AC3: Withdraw view shows withdrawableBalance, never $0 (TAT-3047 fix)",
+          "next": "shared-valid-clear"
+        },
+        "shared-valid-clear": {
+          "description": "AC5: typing $1 leaves Continue button enabled (validation hook says input ≤ withdrawable).",
+          "action": "clear_keypad",
+          "count": 12,
+          "next": "shared-valid-digits"
+        },
+        "shared-valid-digits": {
+          "action": "type_keypad",
+          "value": "1",
+          "next": "shared-assert-valid"
+        },
+        "shared-assert-valid": {
+          "action": "wait_for",
+          "expression": "(function(){try{var fiber=__AGENTIC__.findFiberByTestId('continue-button');var props=fiber&&fiber.memoizedProps;return JSON.stringify({buttonMounted:!!fiber,disabled:!!(props&&props.disabled)})}catch(e){return JSON.stringify({error:String(e)})}})()",
+          "assert": {
+            "all": [
+              { "operator": "eq", "field": "buttonMounted", "value": true },
+              { "operator": "eq", "field": "disabled", "value": false }
+            ]
+          },
+          "timeout_ms": 3000,
+          "next": "shared-over-clear"
+        },
+        "shared-over-clear": {
+          "description": "AC6: $99999 strictly exceeds withdrawable on any reasonable fixture; recipe asserts contract supplies the real data.",
+          "action": "clear_keypad",
+          "count": 12,
+          "next": "shared-over-digits"
+        },
+        "shared-over-digits": {
+          "action": "type_keypad",
+          "value": "99999",
+          "next": "shared-assert-over"
+        },
+        "shared-assert-over": {
+          "action": "eval_sync",
+          "expression": "(function(){try{var s=Engine.context.PerpsController.state.accountState||{};var w=parseFloat(s.withdrawableBalance||'0');return JSON.stringify({withdrawable:w,overAmount:99999,overExceedsWithdrawable:99999>w})}catch(e){return JSON.stringify({error:String(e)})}})()",
+          "assert": {
+            "all": [
+              { "operator": "gt", "field": "withdrawable", "value": 0 },
+              { "operator": "eq", "field": "overExceedsWithdrawable", "value": true }
+            ]
+          },
+          "next": "go-home-before-paths"
+        },
+
+        "go-home-before-paths": {
+          "action": "navigate",
+          "target": "WalletView",
+          "next": "path-switch"
+        },
+
+        "path-switch": {
+          "description": "Route to Path A (full mode-flip) or Path B (positions present — perps↔spot transfers only).",
+          "action": "switch",
+          "cases": [
+            { "when": { "operator": "eq", "field": "vars.preflight.pathA", "value": true }, "next": "pathA-flip-standard", "label": "PATH A — clean account, full mode-flip matrix" },
+            { "when": { "operator": "eq", "field": "vars.preflight.pathA", "value": false }, "next": "pathB-shift-spot", "label": "PATH B — positions present, transfer-only matrix" }
+          ],
+          "default": "done"
+        },
+
+        "pathA-flip-standard": {
+          "description": "Path A — Unified → Standard. Equivalent to checking 'Disable Unified Account Mode' in HL web settings.",
+          "action": "call",
+          "ref": "perps/hl-provision-fixture",
+          "params": {
+            "abstraction": "disabled",
+            "transferDirection": "none"
+          },
+          "next": "pathA-wait-standard"
+        },
+        "pathA-wait-standard": {
+          "description": "Bite on HL-side propagation: poll userAbstraction REST until 'disabled'. Catches the userSetAbstraction-returned-ok-before-validators-propagate race.",
+          "action": "wait_for",
+          "expression": "(function(){var addr='{{address}}'.toLowerCase();return fetch('https://api.hyperliquid.xyz/info',{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({type:'userAbstraction',user:addr})}).then(function(r){return r.json()}).then(function(mode){return JSON.stringify({mode:mode,isStandard:mode==='disabled'})}).catch(function(e){return JSON.stringify({mode:null,isStandard:false,error:String(e)})})})()",
+          "assert": { "operator": "eq", "field": "isStandard", "value": true },
+          "timeout_ms": 30000,
+          "next": "pathA-contract-standard"
+        },
+        "pathA-contract-standard": {
+          "description": "Contract shape stays mode-agnostic on Standard.",
+          "action": "call",
+          "ref": "perps/hl-balance-contract-check",
+          "params": {
+            "address": "{{address}}",
+            "phaseLabel": "pathA-standard"
+          },
+          "next": "pathA-math-standard"
+        },
+        "pathA-math-standard": {
+          "description": "Math in Standard with foldIntoCollateral=false: spendable/withdrawable must match Σ(breakdown) without spot fold.",
+          "action": "call",
+          "ref": "perps/hl-balance-math-check",
+          "params": {
+            "address": "{{address}}",
+            "phaseLabel": "pathA-standard-no-fold",
+            "foldIntoCollateral": false
+          },
+          "next": "pathA-fold-correctness"
+        },
+        "pathA-fold-correctness": {
+          "description": "AC7: Standard-mode regression guard — quantify inflation vs Σ(breakdown) and assert ≤ ε. Inlined here because it's the only Standard-mode call site; math-check{foldIntoCollateral=false} above already proves the gate, this node turns it into a delta a reviewer can read in the trace.",
+          "action": "eval_async",
+          "expression": "(function(){var addr='{{address}}'.toLowerCase();var minSignal=0.5;var eps=0.05;return fetch('https://api.hyperliquid.xyz/info',{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({type:'spotClearinghouseState',user:addr})}).then(function(r){return r.json()}).then(function(spot){var usdc=((spot&&spot.balances)||[]).find(function(b){return b.coin==='USDC'})||{};var t=parseFloat(usdc.total||'0');var h=parseFloat(usdc.hold||'0');var free=Math.max(0,t-h);var s=Engine.context.PerpsController.state.accountState||{};var breakdown=s.subAccountBreakdown||{};var perpsOnlySpendable=0;var perpsOnlyWithdrawable=0;Object.keys(breakdown).forEach(function(k){var e=breakdown[k]||{};perpsOnlySpendable+=parseFloat(e.spendableBalance||'0');perpsOnlyWithdrawable+=parseFloat(e.withdrawableBalance||'0')});var actualSpendable=parseFloat(s.spendableBalance||'0');var actualWithdrawable=parseFloat(s.withdrawableBalance||'0');var spendableInflation=actualSpendable-perpsOnlySpendable;var withdrawableInflation=actualWithdrawable-perpsOnlyWithdrawable;return JSON.stringify({phase:'pathA-standard-fold-quantified',spot:{total:t,hold:h,free:free},standardSemanticExpected:{spendable:perpsOnlySpendable,withdrawable:perpsOnlyWithdrawable},adapterActual:{spendable:actualSpendable,withdrawable:actualWithdrawable},observedInflation:{spendable:spendableInflation,withdrawable:withdrawableInflation},freeSpotMeaningful:free>=minSignal,spendableMatchesPerpsOnly:Math.abs(spendableInflation)<=eps,withdrawableMatchesPerpsOnly:Math.abs(withdrawableInflation)<=eps,standardModeCorrect:Math.abs(spendableInflation)<=eps&&Math.abs(withdrawableInflation)<=eps})})})()",
+          "assert": {
+            "all": [
+              { "operator": "eq", "field": "freeSpotMeaningful", "value": true },
+              { "operator": "eq", "field": "standardModeCorrect", "value": true }
+            ]
+          },
+          "timeout_ms": 20000,
+          "next": "pathA-restore-unified"
+        },
+        "pathA-restore-unified": {
+          "description": "Path A teardown — flip back to Unified. If anything below this fails, account stays in Standard; recover per the recipe-level recovery note.",
+          "action": "call",
+          "ref": "perps/hl-provision-fixture",
+          "params": {
+            "abstraction": "unifiedAccount",
+            "transferDirection": "none"
+          },
+          "next": "pathA-wait-restored"
+        },
+        "pathA-wait-restored": {
+          "description": "Bite on HL-side propagation back to Unified before the post-restore contract check runs.",
+          "action": "wait_for",
+          "expression": "(function(){var addr='{{address}}'.toLowerCase();return fetch('https://api.hyperliquid.xyz/info',{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({type:'userAbstraction',user:addr})}).then(function(r){return r.json()}).then(function(mode){return JSON.stringify({mode:mode,isUnified:mode==='unifiedAccount'})}).catch(function(e){return JSON.stringify({mode:null,isUnified:false,error:String(e)})})})()",
+          "assert": { "operator": "eq", "field": "isUnified", "value": true },
+          "timeout_ms": 30000,
+          "next": "pathA-verify-restored"
+        },
+        "pathA-verify-restored": {
+          "description": "Shape survives Unified → Standard → Unified round trip.",
+          "action": "call",
+          "ref": "perps/hl-balance-contract-check",
+          "params": {
+            "address": "{{address}}",
+            "phaseLabel": "pathA-restored"
+          },
+          "next": "done"
+        },
+
+        "pathB-shift-spot": {
+          "description": "Path B — exercise the spot-fold math under non-trivial spot.hold (e.g. Trading's HIP-3 margin lock). usdClassTransfer is allowed even with positions, so we shift any free perps margin to spot to grow the fold delta, then restore.",
+          "action": "call",
+          "ref": "perps/hl-provision-fixture",
+          "params": {
+            "abstraction": "none",
+            "transferDirection": "to-spot",
+            "transferAmount": "max"
+          },
+          "next": "pathB-contract-shifted"
+        },
+        "pathB-contract-shifted": {
+          "description": "Shape after spot shift — should be unchanged (mode hasn't flipped).",
+          "action": "call",
+          "ref": "perps/hl-balance-contract-check",
+          "params": {
+            "address": "{{address}}",
+            "phaseLabel": "pathB-spot-shifted"
+          },
+          "next": "pathB-math-shifted"
+        },
+        "pathB-math-shifted": {
+          "description": "Math under shifted spot. spot.hold from positions remains intact; controller total must not double-count it (regression vector).",
+          "action": "call",
+          "ref": "perps/hl-balance-math-check",
+          "params": {
+            "address": "{{address}}",
+            "phaseLabel": "pathB-spot-shifted"
+          },
+          "next": "pathB-restore"
+        },
+        "pathB-restore": {
+          "description": "Restore — pull free spot back to perps. Positions stay untouched.",
+          "action": "call",
+          "ref": "perps/hl-provision-fixture",
+          "params": {
+            "abstraction": "none",
+            "transferDirection": "to-perp",
+            "transferAmount": "max"
+          },
+          "next": "done"
+        },
+
+        "done": { "action": "end", "status": "pass" }
+      },
+      "setup": [
+        {
+          "id": "setup-ensure-mainnet",
+          "description": "Recipe targets HyperLiquid mainnet (real fixtures, real userAbstraction). Force isTestnet=false so a stale testnet toggle from a prior run can't poison the validation.",
+          "action": "toggle_testnet",
+          "enabled": false
+        },
+        {
+          "id": "setup-wait-mainnet",
+          "description": "Bite on the controller flipping back to mainnet before the graph runs.",
+          "action": "wait_for",
+          "expression": "JSON.stringify({ isTestnet: Engine.context.PerpsController.state.isTestnet })",
+          "assert": { "operator": "eq", "field": "isTestnet", "value": false },
+          "timeout_ms": 15000
+        }
+      ],
+      "teardown": [
+        {
+          "id": "teardown-nav-home",
+          "action": "navigate",
+          "target": "WalletView"
+        }
+      ]
+    }
+  }
+}
diff --git a/scripts/rename-artifacts.js b/scripts/rename-artifacts.js
index edc07fe0b51..14f60d3ca27 100644
--- a/scripts/rename-artifacts.js
+++ b/scripts/rename-artifacts.js
@@ -10,7 +10,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const { execFileSync } = require('child_process');
+const { execSync } = require('child_process');
 
 const platform = process.argv[2];
 
@@ -72,11 +72,9 @@ if (!buildType || !environment) {
  */
 function findFiles(dir, pattern) {
   try {
-    const output = execFileSync(
-      'find',
-      [dir, '-name', pattern, '-type', 'f'],
-      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] },
-    ).trim();
+    const output = execSync(`find "${dir}" -name "${pattern}" -type f 2>/dev/null || true`, {
+      encoding: 'utf8',
+    }).trim();
     return output ? output.split('\n') : [];
   } catch {
     return [];
@@ -88,11 +86,9 @@ function findFiles(dir, pattern) {
  */
 function findDirs(dir, pattern) {
   try {
-    const output = execFileSync(
-      'find',
-      [dir, '-name', pattern, '-type', 'd'],
-      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] },
-    ).trim();
+    const output = execSync(`find "${dir}" -name "${pattern}" -type d 2>/dev/null || true`, {
+      encoding: 'utf8',
+    }).trim();
     return output ? output.split('\n') : [];
   } catch {
     return [];
@@ -218,27 +214,10 @@ function setGithubOutput(key, value) {
   }
 }
 
-/**
- * Path relative to GITHUB_WORKSPACE (or cwd) for upload-artifact.
- * upload-artifact treats `.app` bundles as directories; staging the outer zip
- * under ios-simulator-upload/ and emitting this path ensures the artifact is a file.
- */
-function toRepoRelative(absFilePath) {
-  const root = process.env.GITHUB_WORKSPACE || process.cwd();
-  const resolved = path.resolve(absFilePath);
-  const rel = path.relative(root, resolved);
-  if (rel.startsWith('..')) {
-    return resolved;
-  }
-  return rel;
-}
-
 /**
  * Rename iOS artifacts
  *
- * Simulator-only: ios_simulator_path — inner zip is ditto of .app; outer zip is
- * ditto of that inner zip (double-zip). Under CI, the outer zip is copied to
- * ios-simulator-upload/ for upload-artifact.
+ * Simulator-only: ios_simulator_path (zipped .app).
  * Device-only: ios_ipa_path, ios_archive_path, ios_sourcemap_path.
  * Dual (IS_SIM_BUILD + IS_DEVICE_BUILD, e.g. main-dev): all of the above.
  */
@@ -281,36 +260,15 @@ function renameIos() {
     const oldApp = path.join(simProductsDir, `${appName}.app`);
     if (fs.existsSync(oldApp)) {
       const newApp = path.join(simProductsDir, `${newSimBaseName}.app`);
-      execFileSync('cp', ['-r', oldApp, newApp], { stdio: 'inherit' });
+      execSync(`cp -r "${oldApp}" "${newApp}"`);
       console.log(`✅ Renamed simulator .app: ${newApp}`);
 
       const zipPath = path.join(simProductsDir, `${newSimBaseName}.zip`);
-      execFileSync(
-        'ditto',
-        ['-c', '-k', '--sequesterRsrc', '--keepParent', newApp, zipPath],
-        { stdio: 'inherit' },
+      execSync(
+        `ditto -c -k --sequesterRsrc --keepParent "${newApp}" "${zipPath}"`,
       );
       console.log(`✅ Zipped: ${zipPath}`);
-
-      const doubleZipPath = path.join(simProductsDir, `${newSimBaseName}.app.zip`);
-      execFileSync(
-        'ditto',
-        ['-c', '-k', '--sequesterRsrc', zipPath, doubleZipPath],
-        { stdio: 'inherit' },
-      );
-      console.log(`✅ Double-zipped (outer contains inner .zip): ${doubleZipPath}`);
-
-      let simulatorUploadPath = doubleZipPath;
-      if (process.env.GITHUB_OUTPUT) {
-        const stagingDir = path.join(__dirname, '../ios-simulator-upload');
-        fs.rmSync(stagingDir, { recursive: true, force: true });
-        fs.mkdirSync(stagingDir, { recursive: true });
-        const stagedZip = path.join(stagingDir, path.basename(doubleZipPath));
-        fs.copyFileSync(doubleZipPath, stagedZip);
-        simulatorUploadPath = stagedZip;
-        console.log(`✅ Staged simulator double-zip for CI upload: ${stagedZip}`);
-      }
-      setGithubOutput('ios_simulator_path', toRepoRelative(simulatorUploadPath));
+      setGithubOutput('ios_simulator_path', zipPath);
     } else {
       console.log(`⚠️  Simulator .app not found: ${oldApp}`);
     }
@@ -338,10 +296,8 @@ function renameIos() {
         __dirname,
         `../ios/build/${newDeviceBaseName}.xcarchive.zip`,
       );
-      execFileSync(
-        'ditto',
-        ['-c', '-k', '--sequesterRsrc', '--keepParent', oldArchive, archiveZip],
-        { stdio: 'inherit' },
+      execSync(
+        `ditto -c -k --sequesterRsrc --keepParent "${oldArchive}" "${archiveZip}"`,
       );
       console.log(`✅ Zipped archive: ${archiveZip}`);
       setGithubOutput('ios_archive_path', archiveZip);
diff --git a/scripts/validate-build-config.js b/scripts/validate-build-config.js
index ec67e5bf9ed..7f9d82d40d2 100755
--- a/scripts/validate-build-config.js
+++ b/scripts/validate-build-config.js
@@ -6,9 +6,21 @@
 const fs = require('fs');
 const path = require('path');
 const yaml = require('js-yaml');
+const { checkValue } = require('./lib/validate-value');
 
 const BUILDS_PATH = path.join(__dirname, '../builds.yml');
 
+// Env keys in builds.yml that may legitimately be the empty string. Every
+// other declared env key must have a non-empty value, so an accidental
+// `PORTFOLIO_API_URL: ''` (or a botched YAML anchor merge) fails validation
+// instead of shipping with a blank value. Adding to this list should be
+// deliberate: the review on that PR is the gate for "yes, this key is
+// intentionally optional."
+const ENV_KEYS_ALLOWED_EMPTY = new Set([
+  'MM_PERPS_HIP3_ALLOWLIST_MARKETS',
+  'MM_PERPS_HIP3_BLOCKLIST_MARKETS',
+]);
+
 function validate() {
   if (!fs.existsSync(BUILDS_PATH)) {
     console.error('❌ builds.yml not found');
@@ -46,6 +58,20 @@ function validate() {
     if (!build.github_environment) {
       errors.push(`${name}: missing github_environment`);
     }
+
+    // Hygiene checks on env values: catch trailing whitespace, stray \r,
+    // invisible characters, accidental empties, etc. so operator typos fail
+    // CI before the build fans out. Strict by default; only the keys in
+    // ENV_KEYS_ALLOWED_EMPTY may be the empty string. Whitespace-only values
+    // always fail, since "intentionally empty" should be `''` not `'   '`.
+    if (build.env && typeof build.env === 'object') {
+      for (const [envKey, envVal] of Object.entries(build.env)) {
+        const issues = checkValue(`${name}.env.${envKey}`, envVal, {
+          allowEmpty: ENV_KEYS_ALLOWED_EMPTY.has(envKey),
+        });
+        issues.forEach((issue) => errors.push(issue.message));
+      }
+    }
   });
 
   if (errors.length > 0) {
diff --git a/scripts/validate-secrets-from-config.js b/scripts/validate-secrets-from-config.js
index bc48285aee3..2006b412563 100755
--- a/scripts/validate-secrets-from-config.js
+++ b/scripts/validate-secrets-from-config.js
@@ -1,66 +1,60 @@
 #!/usr/bin/env node
 /**
  * Validates that all secrets required by the current build (from builds.yml)
- * are defined and applied. Used in CI before "Set secrets" to fail fast and
- * cancel the build if any required secret is missing or empty.
+ * are defined, non-empty, and free of common paste artifacts (trailing
+ * newlines, Windows line endings, invisible characters, etc.). Runs in CI
+ * before "Set secrets" to fail fast and prevent a malformed value from being
+ * written to GITHUB_ENV and baked into the build.
  *
- * CI-agnostic: secrets are resolved from process.env by default. Pass
- * SECRETS_JSON (a JSON object mapping secret name → value) to override,
- * e.g. when the CI platform exposes all secrets as a single JSON blob rather
- * than individual env vars.
- *
- * Fails when:
- * - A secret is absent (not in env / not in SECRETS_JSON).
- * - A secret is present but empty (defined but not set in the CI environment).
+ * Secrets are resolved from SECRETS_JSON when present (e.g. GitHub's
+ * toJSON(secrets) blob) and fall back to individual process.env lookups so
+ * the script works on any CI without extra wiring.
  *
  * Reads CONFIG_SECRETS (same format as set-secrets-from-config.js):
  *   { "ENV_VAR_NAME": "SECRET_NAME", ... }
  *
- * Exits 0 if every secret has a non-empty value; exits 1 otherwise.
+ * Exits 0 if every secret is present and clean; exits 1 otherwise, listing
+ * every offender in a single pass so operators can fix them all at once.
+ *
+ * Never logs secret values or any substring of them. Reports only names,
+ * byte lengths, offsets, and control-character code points.
  */
 
+const { checkValue } = require('./lib/validate-value');
+
 const secretsMapping = JSON.parse(process.env.CONFIG_SECRETS || '{}');
-// SECRETS_JSON lets callers pass all secrets as a JSON blob (e.g. GitHub's
-// toJSON(secrets)); falls back to individual process.env lookups so the script
-// works on any CI without extra wiring.
 const secretsSource = process.env.SECRETS_JSON
   ? JSON.parse(process.env.SECRETS_JSON)
   : process.env;
-const missing = [];
-const notApplied = [];
+
+const offenders = [];
 
 for (const [envVar, secretName] of Object.entries(secretsMapping)) {
-  const value = secretsSource[secretName];
-  if (value === undefined || value === null) {
-    missing.push({ envVar, secretName });
-  } else if (String(value).trim() === '') {
-    notApplied.push({ envVar, secretName });
+  const issues = checkValue(secretName, secretsSource[secretName]);
+  if (issues.length > 0) {
+    offenders.push({ envVar, secretName, issues });
   }
 }
 
-const invalid = missing.length + notApplied.length;
-if (invalid > 0) {
+if (offenders.length > 0) {
   console.error(
-    'Build validation failed: required secrets are not defined or not applied from GitHub.',
+    'Build validation failed: one or more required secrets are missing or malformed.',
   );
-  if (missing.length > 0) {
-    console.error('Not in environment:');
-    missing.forEach(({ envVar, secretName }) => {
-      console.error(`  - ${secretName} (for ${envVar})`);
-    });
-  }
-  if (notApplied.length > 0) {
-    console.error('In environment but empty (not set in GitHub Environment):');
-    notApplied.forEach(({ envVar, secretName }) => {
-      console.error(`  - ${secretName} (for ${envVar})`);
-    });
+  console.error('');
+  for (const { envVar, secretName, issues } of offenders) {
+    for (const issue of issues) {
+      // GitHub Actions annotation so the error surfaces on the run summary.
+      console.error(`::error title=Malformed secret::${issue.message} (mapped to ${envVar})`);
+    }
+    console.error(`  - ${secretName} (for ${envVar})`);
   }
+  console.error('');
   console.error(
-    'Ensure these secrets are set in the GitHub Environment for this build.',
+    'Common cause: pasting a value with a trailing newline or Windows (CRLF) line endings. Re-paste the value carefully and ensure no surrounding whitespace.',
   );
   process.exit(1);
 }
 
 console.log(
-  `All ${Object.keys(secretsMapping).length} required secret(s) are defined and applied.`,
+  `All ${Object.keys(secretsMapping).length} required secret(s) are defined and well-formed.`,
 );
diff --git a/tests/api-mocking/mock-e2e-allowlist.ts b/tests/api-mocking/mock-e2e-allowlist.ts
index 6e8fdb55b59..9749085bc6c 100644
--- a/tests/api-mocking/mock-e2e-allowlist.ts
+++ b/tests/api-mocking/mock-e2e-allowlist.ts
@@ -6,37 +6,9 @@ export const ALLOWLISTED_HOSTS = [
   '127.0.0.1',
   'localhost',
   '10.0.2.2', // Android emulator host
-  'api.tenderly.co',
-  'rpc.tenderly.co',
-  'virtual.mainnet.rpc.tenderly.co',
-  'testnet-rpc.monad.xyz',
-  'virtual.linea.rpc.tenderly.co',
-  'nft.dev-api.cx.metamask.io',
-  'nft.uat-api.cx.metamask.io',
-  'nft.api.cx.metamask.io',
   'gamma-api.polymarket.com',
   '*.polymarket.com',
   'metamask.github.io', // Test-snaps and test-dapp pages loaded in browser
 ];
 
-export const ALLOWLISTED_URLS = [
-  // Temporarily allow existing live requests during migration
-  'https://clients3.google.com/generate_204',
-  'https://api.avax.network/ext/bc/C/rpc',
-  // Token SVGs in notifications list
-  'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/usdc.svg',
-  'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/shib.svg',
-  'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/usdt.svg',
-  'https://token.api.cx.metamask.io/assets/nativeCurrencyLogos/ethereum.svg',
-  'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/stETH.svg',
-  'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/rETH.svg',
-  'https://signature-insights.api.cx.metamask.io/v1/signature?chainId=0x539',
-  'https://mainnet.era.zksync.io/',
-  'https://rpc.atlantischain.network/',
-  'https://nft.api.cx.metamask.io/collections?chainId=0x539&contract=0xb2552e4f4bc23e1572041677234d192774558bf0',
-  'https://metamask.github.io/test-dapp/metamask-fox.svg',
-  'https://nft.api.cx.metamask.io/collections?contract=0xb66a603f4cfe17e3d27b87a8bfcad319856518b8&chainId=1',
-  'https://nft.api.cx.metamask.io/users/0x76cf1cdd1fcc252442b50d6e97207228aa4aefc3/tokens?chainIds=1&limit=50&includeTopBid=true&continuation=',
-  'https://signature-insights.api.cx.metamask.io/v1/signature?chainId=0x1',
-  'https://signature-insights.api.cx.metamask.io/v1/signature?chainId=0xaa36a7',
-];
+export const ALLOWLISTED_URLS: string[] = [];
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 1666319f5c9..4ee2deef8f8 100644
--- a/tests/api-mocking/mock-responses/custom-rpc-provider-mocks.ts
+++ b/tests/api-mocking/mock-responses/custom-rpc-provider-mocks.ts
@@ -16,11 +16,9 @@ const MOCK_BLOCK = {
   transactions: [],
 };
 
-// Method-specific mock responses for Ethereum mainnet RPC calls
-const MOCK_RESPONSES: Record<string, unknown> = {
+// Shared method-specific mock responses applied to all proxied RPC hosts
+const SHARED_MOCK_RESPONSES: Record<string, unknown> = {
   eth_blockNumber: '0x178a60b',
-  net_version: '1',
-  eth_chainId: '0x1',
   eth_getBlockByNumber: MOCK_BLOCK,
   eth_call:
     '0x0000000000000000000000000000000000000000000000000000000000000000',
@@ -30,11 +28,28 @@ const MOCK_RESPONSES: Record<string, unknown> = {
   eth_estimateGas: '0x5208',
 };
 
-const LLAMARPC_URL = 'https://eth.llamarpc.com';
+// Per-host overrides ensure each mocked RPC reports the correct chain identity
+// (returning Ethereum mainnet values for non-mainnet hosts can mask chain-switch bugs).
+const PROXIED_RPC_CONFIGS: {
+  url: string;
+  chainId: string;
+  netVersion: string;
+}[] = [
+  { url: 'https://eth.llamarpc.com', chainId: '0x1', netVersion: '1' },
+  {
+    url: 'https://rpc.atlantischain.network',
+    chainId: '0x53a',
+    netVersion: '1338',
+  },
+];
+
+const findRpcConfig = (urlParam: string | null) =>
+  PROXIED_RPC_CONFIGS.find((config) => urlParam?.startsWith(config.url));
 
 /**
- * TestSpecificMock that intercepts eth.llamarpc.com RPC calls
- * through the mobile proxy, returning static responses per JSON-RPC method.
+ * TestSpecificMock that intercepts custom-RPC provider calls
+ * (eth.llamarpc.com, rpc.atlantischain.network) through the mobile
+ * proxy, returning static responses per JSON-RPC method.
  */
 export const CUSTOM_RPC_PROVIDER_MOCKS: TestSpecificMock = async (
   mockServer: Mockttp,
@@ -43,15 +58,26 @@ export const CUSTOM_RPC_PROVIDER_MOCKS: TestSpecificMock = async (
     .forPost('/proxy')
     .matching((request) => {
       const urlParam = new URL(request.url).searchParams.get('url');
-      return Boolean(urlParam?.startsWith(LLAMARPC_URL));
+      return Boolean(findRpcConfig(urlParam));
     })
     .asPriority(1000)
     .thenCallback(async (request) => {
+      const urlParam = new URL(request.url).searchParams.get('url');
+      const rpcConfig = findRpcConfig(urlParam);
+
       try {
         const bodyText = await request.body.getText();
         const body = bodyText ? JSON.parse(bodyText) : undefined;
         const method = body?.method as string | undefined;
-        const result = method ? (MOCK_RESPONSES[method] ?? '0x') : '0x';
+
+        let result: unknown = '0x';
+        if (method === 'eth_chainId') {
+          result = rpcConfig?.chainId ?? '0x1';
+        } else if (method === 'net_version') {
+          result = rpcConfig?.netVersion ?? '1';
+        } else if (method) {
+          result = SHARED_MOCK_RESPONSES[method] ?? '0x';
+        }
 
         return {
           statusCode: 200,
diff --git a/tests/api-mocking/mock-responses/defaults/index.ts b/tests/api-mocking/mock-responses/defaults/index.ts
index a660afe2cae..eeda04ff7a0 100644
--- a/tests/api-mocking/mock-responses/defaults/index.ts
+++ b/tests/api-mocking/mock-responses/defaults/index.ts
@@ -31,6 +31,9 @@ import { TRENDING_API_MOCKS } from '../trending-api-mocks.ts';
 import { TX_SENTINEL_NETWORKS_MAP } from '../tx-sentinel-networks-map.ts';
 import { DIGEST_API_MOCKS } from './digest-api.ts';
 import { MONEY_ACCOUNT_MOCKS } from './money-account.ts';
+import { STATIC_ASSETS_MOCKS } from './static-assets.ts';
+import { SIGNATURE_INSIGHTS_MOCKS } from './signature-insights.ts';
+import { NFT_API_MOCKS } from './nft-api.ts';
 
 // Get auth mocks
 const authMocks = getAuthMocks();
@@ -59,6 +62,8 @@ export const DEFAULT_MOCKS = {
     ...(TRENDING_API_MOCKS.GET || []),
     ...(DIGEST_API_MOCKS.GET || []),
     ...(MONEY_ACCOUNT_MOCKS.GET || []),
+    ...(STATIC_ASSETS_MOCKS.GET || []),
+    ...(NFT_API_MOCKS.GET || []),
     // Chains Network Mock - Provides blockchain network data
     {
       urlEndpoint: 'https://chainid.network/chains.json',
@@ -151,6 +156,7 @@ export const DEFAULT_MOCKS = {
     ...(METAMETRICS_API_MOCKS.POST || []),
     ...(DEFAULT_RPC_ENDPOINT_MOCKS.POST || []),
     ...(INFURA_MOCKS.POST || []),
+    ...(SIGNATURE_INSIGHTS_MOCKS.POST || []),
     {
       urlEndpoint: 'https://api.mixpanel.com/track',
       responseCode: 200,
@@ -205,4 +211,5 @@ export const DEFAULT_MOCKS = {
   ],
   DELETE: [],
   PATCH: [],
+  HEAD: [...(STATIC_ASSETS_MOCKS.HEAD || [])],
 };
diff --git a/tests/api-mocking/mock-responses/defaults/money-account.ts b/tests/api-mocking/mock-responses/defaults/money-account.ts
index 2d53f1deb99..49156dcfaa5 100644
--- a/tests/api-mocking/mock-responses/defaults/money-account.ts
+++ b/tests/api-mocking/mock-responses/defaults/money-account.ts
@@ -1,5 +1,9 @@
 import { MockEventsObject } from '../../../framework';
 
+const MUSD_ARBITRUM_TOKEN_ADDRESS =
+  '0x00000000000000000000000000000000000000aa';
+const ARBITRUM_CHAIN_ID = '0xa4b1';
+
 export const MONEY_ACCOUNT_MOCKS: MockEventsObject = {
   GET: [
     {
@@ -10,5 +14,32 @@ export const MONEY_ACCOUNT_MOCKS: MockEventsObject = {
         timestamp: new Date().toISOString(),
       },
     },
+    // CHOMP service details — called on every keyring unlock by the
+    // MoneyAccountUpgradeController bootstrap. Any live-network hit here
+    // fails E2E tests that simply log in, so a valid default is required.
+    {
+      urlEndpoint: /^https:\/\/chomp\.[^/]*metamask\.io\/v1\/chomp(\?|$)/,
+      responseCode: 200,
+      response: {
+        auth: { message: '' },
+        chains: {
+          [ARBITRUM_CHAIN_ID]: {
+            autoDepositDelegate: '0x0000000000000000000000000000000000000001',
+            protocol: {
+              vedaProtocol: {
+                supportedTokens: [
+                  {
+                    tokenAddress: MUSD_ARBITRUM_TOKEN_ADDRESS,
+                    tokenDecimals: 6,
+                  },
+                ],
+                adapterAddress: '0x0000000000000000000000000000000000000002',
+                intentTypes: ['cash-deposit', 'cash-withdrawal'],
+              },
+            },
+          },
+        },
+      },
+    },
   ],
 };
diff --git a/tests/api-mocking/mock-responses/defaults/nft-api.ts b/tests/api-mocking/mock-responses/defaults/nft-api.ts
new file mode 100644
index 00000000000..9649c21bffc
--- /dev/null
+++ b/tests/api-mocking/mock-responses/defaults/nft-api.ts
@@ -0,0 +1,29 @@
+import { MockEventsObject } from '../../../framework';
+
+export const NFT_API_MOCKS: MockEventsObject = {
+  GET: [
+    {
+      urlEndpoint:
+        /^https:\/\/nft\.api\.cx\.metamask\.io\/users\/0x[0-9a-fA-F]+\/tokens\?.*$/,
+      responseCode: 200,
+      response: {
+        tokens: [],
+        continuation: null,
+      },
+    },
+    {
+      urlEndpoint: /^https:\/\/nft\.api\.cx\.metamask\.io\/collections\?.*$/,
+      responseCode: 200,
+      response: {
+        collections: [],
+      },
+    },
+    {
+      urlEndpoint: /^https:\/\/nft\.api\.cx\.metamask\.io\/explore\/sites\?.*$/,
+      responseCode: 200,
+      response: {
+        dapps: [],
+      },
+    },
+  ],
+};
diff --git a/tests/api-mocking/mock-responses/defaults/rpc-endpoints.ts b/tests/api-mocking/mock-responses/defaults/rpc-endpoints.ts
index ff807c358eb..c22266761b0 100644
--- a/tests/api-mocking/mock-responses/defaults/rpc-endpoints.ts
+++ b/tests/api-mocking/mock-responses/defaults/rpc-endpoints.ts
@@ -24,5 +24,41 @@ export const DEFAULT_RPC_ENDPOINT_MOCKS: MockEventsObject = {
         result: '0x0',
       },
     },
+    {
+      urlEndpoint: 'https://api.avax.network/ext/bc/C/rpc',
+      responseCode: 200,
+      response: {
+        jsonrpc: '2.0',
+        id: 1,
+        result: '0x0',
+      },
+    },
+    {
+      urlEndpoint: 'https://mainnet.era.zksync.io/',
+      responseCode: 200,
+      response: {
+        jsonrpc: '2.0',
+        id: 1,
+        result: '0x0',
+      },
+    },
+    {
+      urlEndpoint: /^https:\/\/virtual\.mainnet\.rpc\.tenderly\.co\/.+$/,
+      responseCode: 200,
+      response: {
+        jsonrpc: '2.0',
+        id: 1,
+        result: '0x0',
+      },
+    },
+    {
+      urlEndpoint: 'https://testnet-rpc.monad.xyz/',
+      responseCode: 200,
+      response: {
+        jsonrpc: '2.0',
+        id: 1,
+        result: '0x0',
+      },
+    },
   ],
 };
diff --git a/tests/api-mocking/mock-responses/defaults/signature-insights.ts b/tests/api-mocking/mock-responses/defaults/signature-insights.ts
new file mode 100644
index 00000000000..d38686fe05d
--- /dev/null
+++ b/tests/api-mocking/mock-responses/defaults/signature-insights.ts
@@ -0,0 +1,18 @@
+import { MockEventsObject } from '../../../framework';
+
+export const SIGNATURE_INSIGHTS_MOCKS: MockEventsObject = {
+  POST: [
+    {
+      urlEndpoint:
+        /^https:\/\/signature-insights\.api\.cx\.metamask\.io\/v1\/signature\?chainId=0x[0-9a-fA-F]+$/,
+      responseCode: 200,
+      response: {
+        stateChanges: null,
+        error: {
+          message: 'Unsupported signature.',
+          type: 'UNSUPPORTED_SIGNATURE',
+        },
+      },
+    },
+  ],
+};
diff --git a/tests/api-mocking/mock-responses/defaults/static-assets.ts b/tests/api-mocking/mock-responses/defaults/static-assets.ts
new file mode 100644
index 00000000000..377bf3ac28f
--- /dev/null
+++ b/tests/api-mocking/mock-responses/defaults/static-assets.ts
@@ -0,0 +1,33 @@
+import { MockEventsObject } from '../../../framework';
+
+const MINIMAL_SVG = '<svg xmlns="http://www.w3.org/2000/svg"/>';
+
+export const STATIC_ASSETS_MOCKS: MockEventsObject = {
+  HEAD: [
+    {
+      urlEndpoint: /^https:\/\/clients3\.google\.com\/generate_204$/,
+      responseCode: 204,
+      response: '',
+    },
+  ],
+  GET: [
+    {
+      urlEndpoint:
+        /^https:\/\/raw\.githubusercontent\.com\/MetaMask\/contract-metadata\/[^/]+\/images\/.+\.svg$/,
+      responseCode: 200,
+      response: MINIMAL_SVG,
+    },
+    {
+      urlEndpoint:
+        /^https:\/\/token\.api\.cx\.metamask\.io\/assets\/nativeCurrencyLogos\/.+\.svg$/,
+      responseCode: 200,
+      response: MINIMAL_SVG,
+    },
+    {
+      urlEndpoint:
+        /^https:\/\/metamask\.github\.io\/test-dapp\/metamask-fox\.svg$/,
+      responseCode: 200,
+      response: MINIMAL_SVG,
+    },
+  ],
+};
diff --git a/tests/api-mocking/mock-responses/feature-flags-mocks.ts b/tests/api-mocking/mock-responses/feature-flags-mocks.ts
index 6169d1937ba..7367345a830 100644
--- a/tests/api-mocking/mock-responses/feature-flags-mocks.ts
+++ b/tests/api-mocking/mock-responses/feature-flags-mocks.ts
@@ -132,13 +132,6 @@ export const remoteFeatureFlagPredictEnabled = (enabled = true) => ({
     enabled: false,
     minimumVersion: '7.60.0',
   },
-  // Exclude 'nba' — NBA markets render PredictGameDetailsContent which uses a different cash-out testID not yet supported by E2E page objects
-  predictLiveSports: {
-    versions: {
-      '7.67.0': { enabled: true, leagues: ['nfl'] },
-      '7.70.0': { enabled: true, leagues: ['nfl'] },
-    },
-  },
 });
 
 export const remoteFeatureFlagHomepageSectionsV1Enabled = (enabled = true) => ({
diff --git a/tests/api-mocking/mock-responses/musd/musd-mocks.ts b/tests/api-mocking/mock-responses/musd/musd-mocks.ts
index 3e1e1172ca5..4764a34093a 100644
--- a/tests/api-mocking/mock-responses/musd/musd-mocks.ts
+++ b/tests/api-mocking/mock-responses/musd/musd-mocks.ts
@@ -147,8 +147,6 @@ export async function setupMusdMocks(
     earnMusdConvertibleTokensAllowlist: { '*': ['USDC'] },
     earnMusdConversionMinAssetBalanceRequired: 0.01,
     earnMusdConversionGeoBlockedCountries: { blockedRegions: ['GB'] },
-    homepageRedesignV1: { enabled: false, minimumVersion: '0.0.0' },
-    homepageSectionsV1: { enabled: false, minimumVersion: '0.0.0' },
   });
 
   await setupMockRequest(mockServer, {
diff --git a/tests/api-mocking/mock-responses/polymarket/polymarket-constants.ts b/tests/api-mocking/mock-responses/polymarket/polymarket-constants.ts
index 5feec61bb0b..f73485a2c21 100644
--- a/tests/api-mocking/mock-responses/polymarket/polymarket-constants.ts
+++ b/tests/api-mocking/mock-responses/polymarket/polymarket-constants.ts
@@ -42,6 +42,10 @@ export const CONDITIONAL_TOKENS_CONTRACT_ADDRESS =
 export const POLYGON_EIP7702_CONTRACT_ADDRESS =
   '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B';
 
+// Predict position ID for Spurs vs. Pelicans
+export const SPURS_PELICANS_POSITION_ID =
+  '110743925263777693447488608878982152642205002490046349037358337248548507433643';
+
 // EIP-7702 format: 0xef01 (magic byte) + 00 (padding) + 20-byte contract address
 // This format indicates an EOA is upgraded with EIP-7702
 export const EIP7702_CODE_FORMAT = (contractAddress: string): string => {
diff --git a/tests/api-mocking/mock-responses/simulations.ts b/tests/api-mocking/mock-responses/simulations.ts
index 7fc65b4cbfc..181979f557a 100644
--- a/tests/api-mocking/mock-responses/simulations.ts
+++ b/tests/api-mocking/mock-responses/simulations.ts
@@ -6,8 +6,8 @@ const RECIPIENT_ADDRESS_MOCK = '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb';
 const SENTINEL_URL = 'https://tx-sentinel-ethereum-mainnet.api.cx.metamask.io';
 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/';
+    ? 'https://tx-sentinel-127.0.0.1.api.cx.metamask.io'
+    : 'https://tx-sentinel-localhost.api.cx.metamask.io';
 
 export const SEND_ETH_TRANSACTION_MOCK = {
   data: '0x',
diff --git a/tests/api-mocking/mock-responses/transaction-relay-mocks.ts b/tests/api-mocking/mock-responses/transaction-relay-mocks.ts
index b30ab470418..aa614891204 100644
--- a/tests/api-mocking/mock-responses/transaction-relay-mocks.ts
+++ b/tests/api-mocking/mock-responses/transaction-relay-mocks.ts
@@ -11,8 +11,8 @@ const TRANSACTION_HASH =
 const SENTINEL_URL = 'https://tx-sentinel-ethereum-mainnet.api.cx.metamask.io';
 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/';
+    ? 'https://tx-sentinel-127.0.0.1.api.cx.metamask.io'
+    : 'https://tx-sentinel-localhost.api.cx.metamask.io';
 
 export const SEND_ETH_TRANSACTION_MOCK = {
   data: '0x',
diff --git a/tests/api-mocking/mock-responses/tx-sentinel-networks-map.ts b/tests/api-mocking/mock-responses/tx-sentinel-networks-map.ts
index 0a28e014b13..ab1175e59fd 100644
--- a/tests/api-mocking/mock-responses/tx-sentinel-networks-map.ts
+++ b/tests/api-mocking/mock-responses/tx-sentinel-networks-map.ts
@@ -64,13 +64,35 @@ export const TX_SENTINEL_NETWORKS_MAP = {
       decimals: 18,
     },
     network: 'sei-mainnet',
-    explorer: 'https://seitrace.com',
+    explorer: 'https://seiscan.io',
     confirmations: true,
     smartTransactions: false,
     relayTransactions: false,
     hidden: false,
     sendBundle: false,
   },
+  /**
+   * Local Anvil / fixture chain (0x539). Required for EIP-7702 relay + gasless
+   * confirmation E2E (`gas-fee-tokens-eip-7702-sponsored.spec.ts`): `isRelaySupported`
+   * reads Sentinel `/networks` via `getSentinelNetworkFlags`.
+   */
+  '1337': {
+    name: 'Localhost',
+    group: 'ethereum',
+    chainID: 1337,
+    nativeCurrency: {
+      name: 'ETH',
+      symbol: 'ETH',
+      decimals: 18,
+    },
+    network: 'localhost',
+    explorer: 'http://localhost:8545/explorer',
+    confirmations: true,
+    smartTransactions: true,
+    relayTransactions: true,
+    hidden: false,
+    sendBundle: false,
+  },
   '137': {
     name: 'Polygon Mainnet',
     group: 'polygon',
diff --git a/tests/component-view/api-mocking/sentinel-networks.ts b/tests/component-view/api-mocking/sentinel-networks.ts
new file mode 100644
index 00000000000..764ce14e3bf
--- /dev/null
+++ b/tests/component-view/api-mocking/sentinel-networks.ts
@@ -0,0 +1,58 @@
+/**
+ * Sentinel `/networks` API mock for component view tests that need relay / gasless
+ * eligibility (e.g. EIP-7702 sponsored fee row). Matches
+ * `getAllSentinelNetworkFlags` → `https://tx-sentinel-ethereum-mainnet.api.cx.metamask.io/networks`.
+ */
+
+// eslint-disable-next-line import-x/no-extraneous-dependencies
+import nock from 'nock';
+
+import { clearSentinelNetworkCache } from '../../../app/util/transactions/sentinel-api';
+import {
+  clearAllNockMocks,
+  disableNetConnect,
+  teardownNock,
+} from './nockHelpers';
+
+const SENTINEL_ETHEREUM_MAINNET_ORIGIN =
+  'https://tx-sentinel-ethereum-mainnet.api.cx.metamask.io';
+
+/** Minimal shape consumed by `getSentinelNetworkFlags` / relay URL resolution. */
+const ETHEREUM_MAINNET_FLAGS = {
+  name: 'Ethereum Mainnet',
+  group: 'ethereum',
+  chainID: 1,
+  nativeCurrency: {
+    name: 'Ether',
+    symbol: 'ETH',
+    decimals: 18,
+  },
+  network: 'ethereum-mainnet',
+  explorer: 'https://etherscan.io',
+  confirmations: true,
+  smartTransactions: false,
+  relayTransactions: true,
+  hidden: false,
+  sendBundle: false,
+};
+
+/**
+ * Enables relay + 7702 gasless checks for chain id `0x1` (decimal key `"1"`).
+ * Call `clearSentinelNetworkCache()` before setup so the in-memory sentinel cache refetches.
+ */
+export function setupSentinelNetworksRelayEnabledMock(): void {
+  clearSentinelNetworkCache();
+  disableNetConnect();
+  nock(SENTINEL_ETHEREUM_MAINNET_ORIGIN)
+    .get('/networks')
+    .reply(200, {
+      '1': ETHEREUM_MAINNET_FLAGS,
+    })
+    .persist();
+}
+
+export function clearSentinelNetworksMocks(): void {
+  clearAllNockMocks();
+  clearSentinelNetworkCache();
+  teardownNock();
+}
diff --git a/tests/component-view/fixtures/perpsMarketInsights.ts b/tests/component-view/fixtures/perpsMarketInsights.ts
index df2eaca55bd..2a7fb1c5a78 100644
--- a/tests/component-view/fixtures/perpsMarketInsights.ts
+++ b/tests/component-view/fixtures/perpsMarketInsights.ts
@@ -100,3 +100,6 @@ export function setupPerpsMarketInsightsEngineMock(
     setSelectedToken: jest.fn(),
   };
 }
+
+/** Same engine wiring as Perps insights; use for token Asset Details + MarketInsightsView CV tests. */
+export const setupMarketInsightsEngineMock = setupPerpsMarketInsightsEngineMock;
diff --git a/tests/component-view/helpers/snapRequests.ts b/tests/component-view/helpers/snapRequests.ts
new file mode 100644
index 00000000000..6005ff7cd34
--- /dev/null
+++ b/tests/component-view/helpers/snapRequests.ts
@@ -0,0 +1,75 @@
+import Engine from '../../../app/core/Engine';
+
+type SnapRequestMethod = 'onAmountInput' | 'confirmSend';
+
+interface SetupSnapControllerHandleRequestMockOptions {
+  onAmountInputResponse?: unknown;
+  confirmSendResponse?: unknown;
+}
+
+let snapHandleRequestSpy: jest.SpyInstance | undefined;
+
+/**
+ * Intercepts SnapController handleRequest calls for component-view tests while
+ * delegating all non-snap actions to the original controller messenger.
+ */
+export function setupSnapControllerHandleRequestMock(
+  options: SetupSnapControllerHandleRequestMockOptions = {},
+) {
+  const {
+    onAmountInputResponse = { valid: true, errors: [] },
+    confirmSendResponse = { valid: true },
+  } = options;
+
+  const originalCall = Engine.controllerMessenger.call.bind(
+    Engine.controllerMessenger,
+  );
+
+  clearSnapControllerHandleRequestMock();
+
+  snapHandleRequestSpy = jest
+    .spyOn(Engine.controllerMessenger, 'call')
+    .mockImplementation((...messengerArgs) => {
+      const [action, ...args] = messengerArgs as [string, ...unknown[]];
+      if (action !== 'SnapController:handleRequest') {
+        const passthroughArgs = messengerArgs as Parameters<
+          typeof Engine.controllerMessenger.call
+        >;
+        return Reflect.apply(
+          originalCall,
+          Engine.controllerMessenger,
+          passthroughArgs,
+        ) as ReturnType<typeof Engine.controllerMessenger.call>;
+      }
+
+      const params = args[0] as
+        | { request?: { method?: SnapRequestMethod } }
+        | undefined;
+      const requestMethod = params?.request?.method;
+
+      if (requestMethod === 'onAmountInput') {
+        return Promise.resolve(onAmountInputResponse) as ReturnType<
+          typeof Engine.controllerMessenger.call
+        >;
+      }
+
+      if (requestMethod === 'confirmSend') {
+        return Promise.resolve(confirmSendResponse) as ReturnType<
+          typeof Engine.controllerMessenger.call
+        >;
+      }
+
+      return Promise.resolve(undefined) as ReturnType<
+        typeof Engine.controllerMessenger.call
+      >;
+    });
+
+  return snapHandleRequestSpy;
+}
+
+export function clearSnapControllerHandleRequestMock() {
+  if (snapHandleRequestSpy) {
+    snapHandleRequestSpy.mockRestore();
+    snapHandleRequestSpy = undefined;
+  }
+}
diff --git a/tests/component-view/mocks.ts b/tests/component-view/mocks.ts
index 73694f2bb1e..e474a79605a 100644
--- a/tests/component-view/mocks.ts
+++ b/tests/component-view/mocks.ts
@@ -6,6 +6,7 @@
 // Engine mock (singleton default export)
 jest.mock('../../app/core/Engine', () => {
   const engine = {
+    acceptPendingApproval: jest.fn().mockResolvedValue(undefined),
     context: {
       KeyringController: {
         state: {
@@ -125,6 +126,56 @@ jest.mock('../../app/core/Engine', () => {
       AuthenticationController: {
         getBearerToken: jest.fn().mockResolvedValue('mock-bearer-token'),
       },
+      // Notifications: stubbed so notification view + settings flows can call
+      // controller methods (enable / disable / toggleFeatureAnnouncements /
+      // markMetamaskNotificationsAsRead / fetchAndUpdateMetamaskNotifications
+      // / enableAccounts / disableAccounts) without touching the real services.
+      NotificationServicesController: {
+        state: {
+          isNotificationServicesEnabled: true,
+          isFeatureAnnouncementsEnabled: true,
+          metamaskNotificationsList: [],
+          metamaskNotificationsReadList: [],
+        },
+        enableMetamaskNotifications: jest.fn().mockResolvedValue(undefined),
+        disableMetamaskNotifications: jest.fn().mockResolvedValue(undefined),
+        enableNotificationServices: jest.fn().mockResolvedValue(undefined),
+        disableNotificationServices: jest.fn().mockResolvedValue(undefined),
+        enablePushNotifications: jest.fn().mockResolvedValue(undefined),
+        disablePushNotifications: jest.fn().mockResolvedValue(undefined),
+        setFeatureAnnouncementsEnabled: jest.fn().mockResolvedValue(undefined),
+        toggleFeatureAnnouncements: jest.fn().mockResolvedValue(undefined),
+        markMetamaskNotificationsAsRead: jest.fn().mockResolvedValue(undefined),
+        fetchAndUpdateMetamaskNotifications: jest
+          .fn()
+          .mockResolvedValue(undefined),
+        enableAccounts: jest.fn().mockResolvedValue(undefined),
+        disableAccounts: jest.fn().mockResolvedValue(undefined),
+        createOnChainTriggers: jest.fn().mockResolvedValue(undefined),
+        checkAccountsPresence: jest
+          .fn()
+          .mockResolvedValue({} as Record<string, boolean>),
+      },
+      NotificationServicesPushController: {
+        state: { isPushEnabled: true, fcmToken: 'mock-fcm-token' },
+        enablePushNotifications: jest.fn().mockResolvedValue(undefined),
+        disablePushNotifications: jest.fn().mockResolvedValue(undefined),
+        updateTriggerPushNotifications: jest.fn().mockResolvedValue(undefined),
+      },
+      RemoteFeatureFlagController: {
+        state: {
+          remoteFeatureFlags: {
+            assetsNotificationsEnabled: true,
+          },
+        },
+      },
+      AiDigestController: {
+        fetchMarketInsights: jest.fn().mockResolvedValue(null),
+        fetchMarketOverview: jest.fn().mockResolvedValue(undefined),
+      },
+      RampsController: {
+        setSelectedToken: jest.fn(),
+      },
       AssetsContractController: {
         getTokenStandardAndDetails: jest.fn().mockResolvedValue({}),
       },
@@ -187,6 +238,8 @@ jest.mock('../../app/core/Engine', () => {
         getBalance: jest.fn().mockResolvedValue(0),
         getPositions: jest.fn().mockResolvedValue([]),
         getPrices: jest.fn().mockResolvedValue({ providerId: '', results: [] }),
+        subscribeToMarketPrices: jest.fn(() => () => undefined),
+        getConnectionStatus: jest.fn(() => ({ marketConnected: false })),
         trackFeedViewed: jest.fn(),
         trackTabChanged: jest.fn(),
         trackMarketDetailsOpened: jest.fn(),
diff --git a/tests/component-view/presets/marketInsightsView.ts b/tests/component-view/presets/marketInsightsView.ts
new file mode 100644
index 00000000000..1ff4dd77ea7
--- /dev/null
+++ b/tests/component-view/presets/marketInsightsView.ts
@@ -0,0 +1,29 @@
+import type { DeepPartial } from '../../../app/util/test/renderWithProvider';
+import type { RootState } from '../../../app/reducers';
+import { UnifiedRampRoutingType } from '../../../app/reducers/fiatOrders';
+import { initialStateBridge } from './bridge';
+
+/**
+ * Redux preset for MarketInsightsView component-view tests: bridge + fiat state,
+ * market insights and ramps V2 flags (version gate 0.0.0 for unit/view runs).
+ */
+export const initialStateMarketInsightsView = () =>
+  initialStateBridge({ deterministicFiat: true }).withRemoteFeatureFlags({
+    aiSocialMarketAnalysisEnabled: {
+      enabled: true,
+      minimumVersion: '0.0.0',
+    },
+    rampsUnifiedBuyV2: {
+      enabled: true,
+      minimumVersion: '0.0.0',
+    },
+  } as unknown as Record<string, unknown>);
+
+/**
+ * Ensures `goToBuy` does not open eligibility/error modals (unified routing).
+ */
+export const fiatOrdersRampRoutingSupported: DeepPartial<RootState> = {
+  fiatOrders: {
+    rampRoutingDecision: UnifiedRampRoutingType.AGGREGATOR,
+  },
+};
diff --git a/tests/component-view/presets/notifications.ts b/tests/component-view/presets/notifications.ts
new file mode 100644
index 00000000000..a81662a4f32
--- /dev/null
+++ b/tests/component-view/presets/notifications.ts
@@ -0,0 +1,156 @@
+import {
+  MOCK_FEATURE_ANNOUNCEMENT_NOTIFICATIONS,
+  MOCK_ON_CHAIN_NOTIFICATIONS,
+} from '../../../app/components/UI/Notification/__mocks__/mock_notifications';
+import type { DeepPartial } from '../../../app/util/test/renderWithProvider';
+import type { RootState } from '../../../app/reducers';
+import { AvatarAccountType } from '../../../app/component-library/components/Avatars/Avatar';
+
+/**
+ * Notifications fixture mirroring the smoke `withDefaultFixture()` mocks: the same
+ * on-chain wallet notifications + one feature announcement (`MOCK_NOTIFICATIONS`),
+ * but seeded directly into Redux instead of fetched via mockttp.
+ *
+ * Smoke E2E refs:
+ * - tests/smoke/notifications/enable-notifications-after-onboarding.spec.ts
+ * - tests/smoke/notifications/utils/mocks.ts
+ */
+export const MOCK_NOTIFICATIONS = [
+  ...MOCK_FEATURE_ANNOUNCEMENT_NOTIFICATIONS,
+  ...MOCK_ON_CHAIN_NOTIFICATIONS,
+];
+
+export const FEATURE_ANNOUNCEMENT_ID =
+  MOCK_FEATURE_ANNOUNCEMENT_NOTIFICATIONS[0].id;
+
+export const WALLET_NOTIFICATION_IDS = MOCK_ON_CHAIN_NOTIFICATIONS.map(
+  (n) => n.id,
+);
+
+/**
+ * Single HD wallet + EVM account used by the notification settings preset so
+ * `useFirstHDWalletAccounts` resolves and `AccountsList` renders one toggle for
+ * `NOTIFICATIONS_ACCOUNT_ADDRESS` (parity with smoke `DEFAULT_FIXTURE_ACCOUNT_CHECKSUM`).
+ */
+export const NOTIFICATIONS_ACCOUNT_ADDRESS =
+  '0x0000000000000000000000000000000000000001';
+const NOTIFICATIONS_ACCOUNT_ID = 'acc-notifications-1';
+const NOTIFICATIONS_HD_WALLET_ID = 'entropy:wallet1';
+const NOTIFICATIONS_HD_GROUP_ID = 'entropy:wallet1/0';
+
+interface NotificationsPresetOptions {
+  notificationsEnabled?: boolean;
+  featureAnnouncementsEnabled?: boolean;
+  pushEnabled?: boolean;
+  notifications?: typeof MOCK_NOTIFICATIONS;
+}
+
+/**
+ * Redux preset for Notification view + settings CV tests.
+ *
+ * Seeds the controllers used by `selectIs*` selectors and `getNotificationsList`
+ * so the screen renders the same data the E2E sees after the controller fetches.
+ *
+ * `AccountsController` + `AccountTreeController` are seeded with one HD wallet
+ * group containing one EVM account so `AccountsList` renders the per-account
+ * toggle in the settings flow without mocking any hooks.
+ */
+export function buildNotificationsState(
+  options: NotificationsPresetOptions = {},
+): DeepPartial<RootState> {
+  const {
+    notificationsEnabled = true,
+    featureAnnouncementsEnabled = true,
+    pushEnabled = true,
+    notifications = MOCK_NOTIFICATIONS,
+  } = options;
+
+  return {
+    settings: {
+      basicFunctionalityEnabled: true,
+      avatarAccountType: AvatarAccountType.Maskicon,
+    } as DeepPartial<RootState>['settings'],
+    engine: {
+      backgroundState: {
+        NotificationServicesController: {
+          isNotificationServicesEnabled: notificationsEnabled,
+          isMetamaskNotificationsFeatureSeen: true,
+          isUpdatingMetamaskNotifications: false,
+          isFetchingMetamaskNotifications: false,
+          isFeatureAnnouncementsEnabled: featureAnnouncementsEnabled,
+          isPerpsNotificationsEnabled: false,
+          isUpdatingMetamaskNotificationsAccount: [],
+          isCheckingAccountsPresence: false,
+          metamaskNotificationsReadList: [],
+          metamaskNotificationsList: notifications,
+          subscriptionAccountsSeen: [NOTIFICATIONS_ACCOUNT_ADDRESS],
+        },
+        NotificationServicesPushController: {
+          isPushEnabled: pushEnabled,
+          isUpdatingFCMToken: false,
+          fcmToken: 'mock-fcm-token',
+        },
+        RemoteFeatureFlagController: {
+          remoteFeatureFlags: {
+            assetsNotificationsEnabled: true,
+          },
+        },
+        AccountsController: {
+          internalAccounts: {
+            accounts: {
+              [NOTIFICATIONS_ACCOUNT_ID]: {
+                id: NOTIFICATIONS_ACCOUNT_ID,
+                address: NOTIFICATIONS_ACCOUNT_ADDRESS,
+                metadata: {
+                  name: 'Account 1',
+                  importTime: 0,
+                  keyring: { type: 'HD Key Tree' },
+                },
+                options: {},
+                methods: [
+                  'personal_sign',
+                  'eth_sign',
+                  'eth_signTransaction',
+                  'eth_signTypedData_v1',
+                  'eth_signTypedData_v3',
+                  'eth_signTypedData_v4',
+                ],
+                type: 'eip155:eoa',
+                scopes: ['eip155:0'],
+              },
+            },
+            selectedAccount: NOTIFICATIONS_ACCOUNT_ID,
+          },
+        },
+        AccountTreeController: {
+          accountTree: {
+            wallets: {
+              [NOTIFICATIONS_HD_WALLET_ID]: {
+                id: NOTIFICATIONS_HD_WALLET_ID,
+                type: 'entropy',
+                metadata: {
+                  name: 'Wallet 1',
+                  entropy: { id: 'wallet1' },
+                },
+                groups: {
+                  [NOTIFICATIONS_HD_GROUP_ID]: {
+                    id: NOTIFICATIONS_HD_GROUP_ID,
+                    type: 'MultipleAccount',
+                    metadata: {
+                      name: 'Account 1',
+                      pinned: false,
+                      hidden: false,
+                      lastSelected: 0,
+                    },
+                    accounts: [NOTIFICATIONS_ACCOUNT_ID],
+                  },
+                },
+              },
+            },
+          },
+          selectedAccountGroup: NOTIFICATIONS_HD_GROUP_ID,
+        },
+      },
+    } as unknown as DeepPartial<RootState>['engine'],
+  };
+}
diff --git a/tests/component-view/presets/send.ts b/tests/component-view/presets/send.ts
index d1acd4b1d5b..ac89ffa98b8 100644
--- a/tests/component-view/presets/send.ts
+++ b/tests/component-view/presets/send.ts
@@ -1,5 +1,6 @@
 import type { DeepPartial } from 'app/util/test/renderWithProvider';
 import type { RootState } from 'app/reducers';
+import { BtcAccountType } from '@metamask/keyring-api';
 
 /**
  * Base state overrides for Send view component tests.
@@ -53,6 +54,12 @@ export interface TronSendFixture {
   recipientAddresses: [string, string];
 }
 
+export const NON_EVM_SOLANA_ACCOUNT_ID = 'solana-acc-1';
+export const NON_EVM_BTC_ACCOUNT_ID = 'btc-acc-1';
+
+const SOLANA_MAINNET_SCOPE = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';
+const BTC_MAINNET_SCOPE = 'bip122:000000000019d6689c085ae165831e93';
+
 /**
  * Builds state overrides and recipient addresses for TRON send view tests.
  * Use with initialStateWallet().withOverrides(tronOverrides).build().
@@ -117,7 +124,7 @@ export function buildTronSendFixture(
     ...sendViewOverrides,
     engine: {
       backgroundState: {
-        ...(baseEngine?.backgroundState ?? {}),
+        ...baseEngine?.backgroundState,
         MultichainNetworkController: {
           isEvmSelected: false,
         },
@@ -195,3 +202,45 @@ export function buildAddressBookOverridesWithEvmContact(
     },
   } as unknown as DeepPartial<RootState>;
 }
+
+/**
+ * Builds non-EVM internal accounts (Solana + Bitcoin) for send CV tests that
+ * need a concrete `fromAccount` to drive snap amount/submit validation.
+ */
+export function buildNonEvmSendAccountsOverrides(): DeepPartial<RootState> {
+  return {
+    engine: {
+      backgroundState: {
+        AccountsController: {
+          internalAccounts: {
+            accounts: {
+              [NON_EVM_SOLANA_ACCOUNT_ID]: {
+                id: NON_EVM_SOLANA_ACCOUNT_ID,
+                address: '11111111111111111111111111111111',
+                type: 'solana:data-account',
+                options: {},
+                methods: [],
+                metadata: {
+                  name: 'Solana Account 1',
+                },
+                scopes: [SOLANA_MAINNET_SCOPE],
+              },
+              [NON_EVM_BTC_ACCOUNT_ID]: {
+                id: NON_EVM_BTC_ACCOUNT_ID,
+                address: 'bc1qxy2kgdygjrsqtzq2n0yrf2493p83kkfjhx0wlh',
+                type: BtcAccountType.P2wpkh,
+                options: {},
+                methods: [],
+                metadata: {
+                  name: 'Bitcoin Account 1',
+                },
+                scopes: [BTC_MAINNET_SCOPE],
+              },
+            },
+            selectedAccount: NON_EVM_SOLANA_ACCOUNT_ID,
+          },
+        },
+      },
+    },
+  } as unknown as DeepPartial<RootState>;
+}
diff --git a/tests/component-view/renderers/marketInsights.tsx b/tests/component-view/renderers/marketInsights.tsx
new file mode 100644
index 00000000000..1c237366a5c
--- /dev/null
+++ b/tests/component-view/renderers/marketInsights.tsx
@@ -0,0 +1,122 @@
+import '../mocks';
+import React from 'react';
+import { Text } from 'react-native';
+import { createStackNavigator } from '@react-navigation/stack';
+import renderWithProvider, {
+  type DeepPartial,
+} from '../../../app/util/test/renderWithProvider';
+import type { RootState } from '../../../app/reducers';
+import Routes from '../../../app/constants/navigation/Routes';
+import { AccessRestrictedProvider } from '../../../app/components/UI/Compliance';
+import MarketInsightsView from '../../../app/components/UI/MarketInsights/Views/MarketInsightsView/MarketInsightsView';
+import { BuildQuoteSelectors } from '../../../app/components/UI/Ramp/Aggregator/Views/BuildQuote/BuildQuote.testIds';
+import {
+  initialStateMarketInsightsView,
+  fiatOrdersRampRoutingSupported,
+} from '../presets/marketInsightsView';
+
+const RootStack = createStackNavigator();
+const BridgeInnerStack = createStackNavigator();
+const RampMainStack = createStackNavigator();
+const RampOuterStack = createStackNavigator();
+
+const BridgeViewProbe = (): React.ReactElement => (
+  <Text testID="route-BridgeView">BridgeView</Text>
+);
+
+const TokenSelectionProbe = (): React.ReactElement => (
+  <Text testID="route-RampTokenSelectionInner">TokenSelection</Text>
+);
+
+const AmountInputProbe = (): React.ReactElement => (
+  <Text testID={BuildQuoteSelectors.CONTINUE_BUTTON}>Continue</Text>
+);
+
+function BridgeNavigator(): React.ReactElement {
+  return (
+    <BridgeInnerStack.Navigator screenOptions={{ headerShown: false }}>
+      <BridgeInnerStack.Screen
+        name={Routes.BRIDGE.BRIDGE_VIEW}
+        component={BridgeViewProbe}
+      />
+    </BridgeInnerStack.Navigator>
+  );
+}
+
+function RampMainRoutes(): React.ReactElement {
+  return (
+    <RampMainStack.Navigator
+      initialRouteName={Routes.RAMP.TOKEN_SELECTION}
+      screenOptions={{ headerShown: false }}
+    >
+      <RampMainStack.Screen
+        name={Routes.RAMP.TOKEN_SELECTION}
+        component={TokenSelectionProbe}
+      />
+      <RampMainStack.Screen
+        name={Routes.RAMP.AMOUNT_INPUT}
+        component={AmountInputProbe}
+      />
+    </RampMainStack.Navigator>
+  );
+}
+
+function RampNavigator(): React.ReactElement {
+  return (
+    <RampOuterStack.Navigator
+      initialRouteName={Routes.RAMP.TOKEN_SELECTION}
+      screenOptions={{ headerShown: false }}
+    >
+      <RampOuterStack.Screen
+        name={Routes.RAMP.TOKEN_SELECTION}
+        component={RampMainRoutes}
+      />
+    </RampOuterStack.Navigator>
+  );
+}
+
+interface RenderMarketInsightsViewOptions {
+  overrides?: DeepPartial<RootState>;
+  initialParams?: Record<string, unknown>;
+}
+
+/**
+ * Renders MarketInsightsView with Bridge + Ramps stacks registered so swap/buy navigation can be asserted.
+ */
+export function renderMarketInsightsViewWithNavigation(
+  options: RenderMarketInsightsViewOptions = {},
+) {
+  const { overrides, initialParams } = options;
+
+  const builder = initialStateMarketInsightsView();
+  builder.withOverrides(fiatOrdersRampRoutingSupported);
+  if (overrides) {
+    builder.withOverrides(overrides);
+  }
+  const state = builder.build();
+
+  const stackTree = (
+    <AccessRestrictedProvider>
+      <RootStack.Navigator
+        initialRouteName={Routes.MARKET_INSIGHTS.VIEW}
+        screenOptions={{ headerShown: false }}
+      >
+        <RootStack.Screen
+          name={Routes.MARKET_INSIGHTS.VIEW}
+          component={MarketInsightsView as unknown as React.ComponentType}
+          initialParams={initialParams}
+        />
+        <RootStack.Screen
+          name={Routes.BRIDGE.ROOT}
+          component={BridgeNavigator}
+        />
+        <RootStack.Screen
+          name={Routes.RAMP.TOKEN_SELECTION}
+          component={RampNavigator}
+        />
+      </RootStack.Navigator>
+    </AccessRestrictedProvider>
+  );
+
+  return renderWithProvider(stackTree, { state });
+}
diff --git a/tests/component-view/renderers/perpsViewRenderer.tsx b/tests/component-view/renderers/perpsViewRenderer.tsx
index 6af4240a2a5..a2ddabb2de6 100644
--- a/tests/component-view/renderers/perpsViewRenderer.tsx
+++ b/tests/component-view/renderers/perpsViewRenderer.tsx
@@ -56,7 +56,8 @@ const testConnectionValue: PerpsConnectionContextValue = {
 
 /** Minimal account so usePerpsLiveAccount sets isInitialLoading=false; non-zero totalBalance so PerpsTabControlBar shows balance button */
 const initialAccount = {
-  availableBalance: '1',
+  spendableBalance: '1',
+  withdrawableBalance: '1',
   totalBalance: '1',
   marginUsed: '0',
   unrealizedPnl: '0',
diff --git a/tests/controller-mocking/mock-config/perps-controller-mixin.ts b/tests/controller-mocking/mock-config/perps-controller-mixin.ts
index cee2eaa6c7b..d7c6fd6628d 100644
--- a/tests/controller-mocking/mock-config/perps-controller-mixin.ts
+++ b/tests/controller-mocking/mock-config/perps-controller-mixin.ts
@@ -565,7 +565,8 @@ export function applyE2EPerpsControllerMocks(controller: unknown): void {
   const mockPositions = mockService.getMockPositions();
 
   console.log('Initializing Redux state with mock data:', {
-    availableBalance: mockAccount.availableBalance,
+    spendableBalance: mockAccount.spendableBalance,
+    withdrawableBalance: mockAccount.spendableBalance,
     totalBalance: mockAccount.totalBalance,
     positionsCount: mockPositions.length,
   });
diff --git a/tests/controller-mocking/mock-responses/perps/perps-e2e-mocks.ts b/tests/controller-mocking/mock-responses/perps/perps-e2e-mocks.ts
index 669dadf8c55..829ca0941f5 100644
--- a/tests/controller-mocking/mock-responses/perps/perps-e2e-mocks.ts
+++ b/tests/controller-mocking/mock-responses/perps/perps-e2e-mocks.ts
@@ -28,7 +28,8 @@ export class PerpsE2EMockService {
 
   // Mock state that persists across the E2E session
   private mockAccount: AccountState = {
-    availableBalance: '8000.00',
+    spendableBalance: '8000.00',
+    withdrawableBalance: '8000.00',
     marginUsed: '2000.00',
     unrealizedPnl: '150.00',
     returnOnEquity: '0',
@@ -75,7 +76,8 @@ export class PerpsE2EMockService {
     // Default account state
     this.mockAccount = {
       totalBalance: profile === 'no-funds' ? '0.00' : '10000.00',
-      availableBalance: profile === 'no-funds' ? '0.00' : '8000.00',
+      spendableBalance: profile === 'no-funds' ? '0.00' : '8000.00',
+      withdrawableBalance: profile === 'no-funds' ? '0.00' : '8000.00',
       marginUsed: profile === 'no-funds' ? '0.00' : '2000.00',
       // Set a temporary value; we will recompute from positions below
       unrealizedPnl: '0.00',
@@ -250,12 +252,13 @@ export class PerpsE2EMockService {
 
     // Update available balance
     const newAvailableBalance =
-      parseFloat(this.mockAccount.availableBalance) - marginUsed;
+      parseFloat(this.mockAccount.spendableBalance) - marginUsed;
     const newMarginUsed = parseFloat(this.mockAccount.marginUsed) + marginUsed;
 
     this.mockAccount = {
       ...this.mockAccount,
-      availableBalance: newAvailableBalance.toString(),
+      spendableBalance: newAvailableBalance.toString(),
+      withdrawableBalance: newAvailableBalance.toString(),
       marginUsed: newMarginUsed.toString(),
     };
 
@@ -325,7 +328,7 @@ export class PerpsE2EMockService {
   // Mock withdrawal (reserved for upcoming tests)
   public mockWithdraw(params: WithdrawParams): WithdrawResult {
     const withdrawAmount = parseFloat(params.amount);
-    const currentBalance = parseFloat(this.mockAccount.availableBalance);
+    const currentBalance = parseFloat(this.mockAccount.spendableBalance);
 
     if (withdrawAmount > currentBalance) {
       return {
@@ -342,7 +345,8 @@ export class PerpsE2EMockService {
     this.mockAccount = {
       ...this.mockAccount,
       totalBalance: newTotalBalance.toString(),
-      availableBalance: newAvailableBalance.toString(),
+      spendableBalance: newAvailableBalance.toString(),
+      withdrawableBalance: newAvailableBalance.toString(),
     };
 
     // Notify subscribers
@@ -358,7 +362,7 @@ export class PerpsE2EMockService {
 
   /**
    * Mock deposit in USD into the perps trading account.
-   * Increases both availableBalance and totalBalance by the provided fiat amount.
+   * Increases both spendableBalance and totalBalance by the provided fiat amount.
    */
   public mockDepositUSD(amountFiat: string): { success: boolean } {
     const delta = parseFloat(amountFiat || '0');
@@ -366,12 +370,13 @@ export class PerpsE2EMockService {
       return { success: false };
     }
 
-    const newAvailable = parseFloat(this.mockAccount.availableBalance) + delta;
+    const newAvailable = parseFloat(this.mockAccount.spendableBalance) + delta;
     const newTotal = parseFloat(this.mockAccount.totalBalance) + delta;
 
     this.mockAccount = {
       ...this.mockAccount,
-      availableBalance: newAvailable.toString(),
+      spendableBalance: newAvailable.toString(),
+      withdrawableBalance: newAvailable.toString(),
       totalBalance: newTotal.toString(),
     };
 
@@ -398,7 +403,7 @@ export class PerpsE2EMockService {
 
     // Update account balances with realized PnL
     const newAvailableBalance =
-      parseFloat(this.mockAccount.availableBalance) +
+      parseFloat(this.mockAccount.spendableBalance) +
       parseFloat(existingPosition.marginUsed) +
       pnl;
     const newMarginUsed =
@@ -407,7 +412,8 @@ export class PerpsE2EMockService {
     const newTotalBalance = parseFloat(this.mockAccount.totalBalance) + pnl;
     this.mockAccount = {
       ...this.mockAccount,
-      availableBalance: newAvailableBalance.toString(),
+      spendableBalance: newAvailableBalance.toString(),
+      withdrawableBalance: newAvailableBalance.toString(),
       marginUsed: newMarginUsed.toString(),
       totalBalance: newTotalBalance.toString(),
     };
@@ -497,7 +503,7 @@ export class PerpsE2EMockService {
   private notifyAccountCallbacks(): void {
     console.log(
       '🎭 E2E Mock: Notifying account callbacks, balance:',
-      this.mockAccount.availableBalance,
+      this.mockAccount.spendableBalance,
     );
     this.accountCallbacks.forEach((callback) => {
       try {
@@ -781,7 +787,7 @@ export class PerpsE2EMockService {
     const pnl = parseFloat(existingPosition.unrealizedPnl || '0');
 
     const newAvailableBalance =
-      parseFloat(this.mockAccount.availableBalance) +
+      parseFloat(this.mockAccount.spendableBalance) +
       parseFloat(existingPosition.marginUsed) +
       pnl;
     const newMarginUsed =
@@ -790,7 +796,8 @@ export class PerpsE2EMockService {
     const newTotalBalance = parseFloat(this.mockAccount.totalBalance) + pnl;
     this.mockAccount = {
       ...this.mockAccount,
-      availableBalance: newAvailableBalance.toString(),
+      spendableBalance: newAvailableBalance.toString(),
+      withdrawableBalance: newAvailableBalance.toString(),
       marginUsed: newMarginUsed.toString(),
       totalBalance: newTotalBalance.toString(),
     };
@@ -926,12 +933,13 @@ export class PerpsE2EMockService {
 
         // Update account balances for margin usage
         const newAvailableBalance =
-          parseFloat(this.mockAccount.availableBalance) - marginUsed;
+          parseFloat(this.mockAccount.spendableBalance) - marginUsed;
         const newMarginUsed =
           parseFloat(this.mockAccount.marginUsed) + marginUsed;
         this.mockAccount = {
           ...this.mockAccount,
-          availableBalance: newAvailableBalance.toString(),
+          spendableBalance: newAvailableBalance.toString(),
+          withdrawableBalance: newAvailableBalance.toString(),
           marginUsed: newMarginUsed.toString(),
         };
 
@@ -1047,7 +1055,7 @@ export class PerpsE2EMockService {
         // Realize PnL and close this position
         const pnl = parseFloat(pos.unrealizedPnl || '0');
         const newAvailableBalance =
-          parseFloat(this.mockAccount.availableBalance) +
+          parseFloat(this.mockAccount.spendableBalance) +
           parseFloat(pos.marginUsed) +
           pnl;
         const newMarginUsed =
@@ -1056,7 +1064,8 @@ export class PerpsE2EMockService {
 
         this.mockAccount = {
           ...this.mockAccount,
-          availableBalance: newAvailableBalance.toString(),
+          spendableBalance: newAvailableBalance.toString(),
+          withdrawableBalance: newAvailableBalance.toString(),
           marginUsed: newMarginUsed.toString(),
           totalBalance: newTotalBalance.toString(),
         };
diff --git a/tests/feature-flags/feature-flag-registry.ts b/tests/feature-flags/feature-flag-registry.ts
index 7f5d264baa3..650d70ac7a1 100644
--- a/tests/feature-flags/feature-flag-registry.ts
+++ b/tests/feature-flags/feature-flag-registry.ts
@@ -2748,6 +2748,16 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     status: FeatureFlagStatus.Active,
   },
 
+  earnChompApiConfig: {
+    name: 'earnChompApiConfig',
+    type: FeatureFlagType.Remote,
+    inProd: false,
+    productionDefault: {
+      baseUrl: 'https://chomp.dev-api.cx.metamask.io',
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
   earnFeatureFlagTemplate: {
     name: 'earnFeatureFlagTemplate',
     type: FeatureFlagType.Remote,
@@ -2884,25 +2894,6 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     status: FeatureFlagStatus.Active,
   },
 
-  earnMusdQuickConvertEnabled: {
-    name: 'earnMusdQuickConvertEnabled',
-    type: FeatureFlagType.Remote,
-    inProd: true,
-    productionDefault: {
-      minimumVersion: '0.0.0',
-      enabled: false,
-    },
-    status: FeatureFlagStatus.Active,
-  },
-
-  earnMusdQuickConvertPercentage: {
-    name: 'earnMusdQuickConvertPercentage',
-    type: FeatureFlagType.Remote,
-    inProd: true,
-    productionDefault: 0.9,
-    status: FeatureFlagStatus.Active,
-  },
-
   earnMusdTokenRegistrationChainIds: {
     name: 'earnMusdTokenRegistrationChainIds',
     type: FeatureFlagType.Remote,
@@ -2981,11 +2972,11 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     status: FeatureFlagStatus.Active,
   },
 
-  exploreSectionsOrder: {
-    name: 'exploreSectionsOrder',
+  explorePageV2Enabled: {
+    name: 'explorePageV2Enabled',
     type: FeatureFlagType.Remote,
-    inProd: true,
-    productionDefault: {},
+    inProd: false,
+    productionDefault: false,
     status: FeatureFlagStatus.Active,
   },
 
diff --git a/tests/flows/wallet.flow.ts b/tests/flows/wallet.flow.ts
index 12c1b64ff7c..e6a7a53ff90 100644
--- a/tests/flows/wallet.flow.ts
+++ b/tests/flows/wallet.flow.ts
@@ -25,7 +25,7 @@ import OnboardingSuccessView from '../page-objects/Onboarding/OnboardingSuccessV
 import ImportWalletView from '../page-objects/Onboarding/ImportWalletView';
 import OnboardingView from '../page-objects/Onboarding/OnboardingView';
 import OnboardingSheet from '../page-objects/Onboarding/OnboardingSheet';
-import Accounts from '../../wdio/helpers/Accounts';
+import Accounts from '../utils/Accounts';
 import EnableDeviceNotificationsAlert from '../page-objects/Onboarding/EnableDeviceNotificationsAlert';
 import ProtectYourWalletModal from '../page-objects/Onboarding/ProtectYourWalletModal';
 import SkipAccountSecurityModal from '../page-objects/Onboarding/SkipAccountSecurityModal';
diff --git a/tests/framework/DeviceInfoCache.ts b/tests/framework/DeviceInfoCache.ts
new file mode 100644
index 00000000000..cfab74e57b9
--- /dev/null
+++ b/tests/framework/DeviceInfoCache.ts
@@ -0,0 +1,80 @@
+/**
+ * Cached device information to avoid repeated HTTP calls to the Appium server.
+ *
+ * Used only on the Playwright + WebdriverIO/Appium path (`tests/framework/fixture`, gestures,
+ * utilities). Detox smoke/regression does not use this module — `PlatformDetector` reads from
+ * Detox `device` there, not from this cache.
+ *
+ * Populated once when the Playwright `driver` fixture creates the session.
+ */
+let cachedPlatform: 'android' | 'ios' = 'android';
+let cachedWindowSize: { width: number; height: number } = {
+  width: 0,
+  height: 0,
+};
+let isPopulated = false;
+
+const NOT_INITIALIZED_MESSAGE =
+  'Device info cache is not initialized. It must be populated via setDeviceInfo() after the driver session is created (Playwright fixture), or set explicitly in unit tests.';
+
+function assertPositiveWindowSize(windowSize: {
+  width: number;
+  height: number;
+}): void {
+  const { width, height } = windowSize;
+  if (
+    !Number.isFinite(width) ||
+    !Number.isFinite(height) ||
+    width <= 0 ||
+    height <= 0
+  ) {
+    throw new Error(
+      `Device info cache requires a positive window size; got width=${String(width)}, height=${String(height)}.`,
+    );
+  }
+}
+
+/**
+ * Initialize the device info cache from the driver session.
+ * Called once in the fixture at session creation.
+ */
+export function setDeviceInfo(
+  platform: 'android' | 'ios',
+  windowSize: { width: number; height: number },
+): void {
+  assertPositiveWindowSize(windowSize);
+  cachedPlatform = platform;
+  cachedWindowSize = windowSize;
+  isPopulated = true;
+}
+
+/**
+ * Restores the module cache to its initial state. Used by unit tests between cases.
+ */
+export function resetDeviceInfo(): void {
+  isPopulated = false;
+  cachedPlatform = 'android';
+  cachedWindowSize = { width: 0, height: 0 };
+}
+
+/**
+ * Get the cached platform.
+ * @throws If the cache was never populated (e.g. resetDeviceInfo() without setDeviceInfo()).
+ */
+export function getPlatform(): 'android' | 'ios' {
+  if (!isPopulated) {
+    throw new Error(NOT_INITIALIZED_MESSAGE);
+  }
+  return cachedPlatform;
+}
+
+/**
+ * Get the cached window size.
+ * @throws If the cache was never populated.
+ */
+export function getWindowSize(): { width: number; height: number } {
+  if (!isPopulated) {
+    throw new Error(NOT_INITIALIZED_MESSAGE);
+  }
+  return cachedWindowSize;
+}
diff --git a/tests/framework/EncapsulatedElement.test.ts b/tests/framework/EncapsulatedElement.test.ts
index 39049126437..f4c220d1fdf 100644
--- a/tests/framework/EncapsulatedElement.test.ts
+++ b/tests/framework/EncapsulatedElement.test.ts
@@ -28,6 +28,7 @@ import {
   TestFramework,
 } from './index.ts';
 import type { PlaywrightElement } from './PlaywrightAdapter.ts';
+import { resetDeviceInfo, setDeviceInfo } from './DeviceInfoCache.ts';
 
 // Type augmentation for test globals
 declare const global: typeof globalThis & {
@@ -279,104 +280,92 @@ describe('EncapsulatedElement', () => {
   });
 
   describe('PlatformDetector', () => {
+    beforeEach(() => {
+      resetDeviceInfo();
+    });
+
     describe('getPlatform', () => {
-      it('returns platform from device.getPlatform() in Detox context', async () => {
+      it('returns platform from device.getPlatform() in Detox context', () => {
         FrameworkDetector.setFramework(TestFramework.DETOX);
         (global as Record<string, unknown>).device = {
           getPlatform: jest.fn().mockReturnValue('android'),
         };
 
-        const result = await PlatformDetector.getPlatform();
+        const result = PlatformDetector.getPlatform();
 
         expect(result).toBe('android');
       });
 
-      it('returns "android" when Appium capabilities platformName is "Android"', async () => {
+      it('returns "android" when Appium device info cache was set to android', () => {
         FrameworkDetector.setFramework(TestFramework.APPIUM);
-        (global as Record<string, unknown>).driver = {
-          capabilities: Promise.resolve({ platformName: 'Android' }),
-        };
+        setDeviceInfo('android', { width: 400, height: 800 });
 
-        const result = await PlatformDetector.getPlatform();
+        const result = PlatformDetector.getPlatform();
 
         expect(result).toBe('android');
       });
 
-      it('returns "ios" when Appium capabilities platformName is "iOS"', async () => {
-        FrameworkDetector.setFramework(TestFramework.APPIUM);
-        (global as Record<string, unknown>).driver = {
-          capabilities: Promise.resolve({ platformName: 'iOS' }),
-        };
-
-        const result = await PlatformDetector.getPlatform();
-
-        expect(result).toBe('ios');
-      });
-
-      it('returns "ios" when Appium capabilities platformName is undefined', async () => {
+      it('returns "ios" when Appium device info cache was set to ios', () => {
         FrameworkDetector.setFramework(TestFramework.APPIUM);
-        (global as Record<string, unknown>).driver = {
-          capabilities: Promise.resolve({}),
-        };
+        setDeviceInfo('ios', { width: 390, height: 844 });
 
-        const result = await PlatformDetector.getPlatform();
+        const result = PlatformDetector.getPlatform();
 
         expect(result).toBe('ios');
       });
 
-      it('throws error when unable to detect platform', async () => {
+      it('throws when Appium device info cache was reset and not repopulated', () => {
         FrameworkDetector.setFramework(TestFramework.APPIUM);
-        // No driver defined
 
-        await expect(PlatformDetector.getPlatform()).rejects.toThrow(
-          'Unable to detect platform',
+        expect(() => PlatformDetector.getPlatform()).toThrow(
+          /Device info cache is not initialized/,
         );
       });
     });
 
     describe('isAndroid', () => {
-      it('returns true when platform is android', async () => {
+      it('returns true when platform is android', () => {
         FrameworkDetector.setFramework(TestFramework.DETOX);
         (global as Record<string, unknown>).device = {
           getPlatform: jest.fn().mockReturnValue('android'),
         };
 
-        const result = await PlatformDetector.isAndroid();
+        const result = PlatformDetector.isAndroid();
 
         expect(result).toBe(true);
       });
 
-      it('returns false when platform is ios', async () => {
+      it('returns false when platform is ios', () => {
         FrameworkDetector.setFramework(TestFramework.DETOX);
         (global as Record<string, unknown>).device = {
           getPlatform: jest.fn().mockReturnValue('ios'),
         };
 
-        const result = await PlatformDetector.isAndroid();
+        const result = PlatformDetector.isAndroid();
 
         expect(result).toBe(false);
       });
     });
 
     describe('isIOS', () => {
-      it('returns true when platform is ios', async () => {
+      it('returns true when platform is ios', () => {
         FrameworkDetector.setFramework(TestFramework.DETOX);
         (global as Record<string, unknown>).device = {
           getPlatform: jest.fn().mockReturnValue('ios'),
         };
 
-        const result = await PlatformDetector.isIOS();
+        const result = PlatformDetector.isIOS();
 
         expect(result).toBe(true);
       });
 
-      it('returns false when platform is android', async () => {
+      it('returns false when platform is android', () => {
         FrameworkDetector.setFramework(TestFramework.DETOX);
         (global as Record<string, unknown>).device = {
           getPlatform: jest.fn().mockReturnValue('android'),
         };
 
-        const result = await PlatformDetector.isIOS();
+        const result = PlatformDetector.isIOS();
 
         expect(result).toBe(false);
       });
@@ -426,6 +415,8 @@ describe('EncapsulatedElement', () => {
     describe('Appium context', () => {
       beforeEach(() => {
         FrameworkDetector.setFramework(TestFramework.APPIUM);
+        resetDeviceInfo();
+        setDeviceInfo('android', { width: 400, height: 800 });
       });
 
       it('returns Appium element when in Appium context with generic locator', async () => {
@@ -462,9 +453,6 @@ describe('EncapsulatedElement', () => {
       });
 
       it('uses platform-specific appium locator for android', async () => {
-        (global as Record<string, unknown>).driver = {
-          capabilities: Promise.resolve({ platformName: 'Android' }),
-        };
         const mockPlaywrightElement = createMockPlaywrightElement();
         const androidFn = jest.fn().mockResolvedValue(mockPlaywrightElement);
         const iosFn = jest.fn();
@@ -482,9 +470,7 @@ describe('EncapsulatedElement', () => {
       });
 
       it('uses platform-specific appium locator for ios', async () => {
-        (global as Record<string, unknown>).driver = {
-          capabilities: Promise.resolve({ platformName: 'iOS' }),
-        };
+        setDeviceInfo('ios', { width: 390, height: 844 });
         const mockPlaywrightElement = createMockPlaywrightElement();
         const androidFn = jest.fn();
         const iosFn = jest.fn().mockResolvedValue(mockPlaywrightElement);
@@ -502,9 +488,6 @@ describe('EncapsulatedElement', () => {
       });
 
       it('throws error when platform-specific locator is missing for android', async () => {
-        (global as Record<string, unknown>).driver = {
-          capabilities: Promise.resolve({ platformName: 'Android' }),
-        };
         const config: LocatorConfig = {
           appium: {
             ios: () => Promise.resolve(createMockPlaywrightElement()),
@@ -517,9 +500,7 @@ describe('EncapsulatedElement', () => {
       });
 
       it('throws error when platform-specific locator is missing for ios', async () => {
-        (global as Record<string, unknown>).driver = {
-          capabilities: Promise.resolve({ platformName: 'iOS' }),
-        };
+        setDeviceInfo('ios', { width: 390, height: 844 });
         const config: LocatorConfig = {
           appium: {
             android: () => Promise.resolve(createMockPlaywrightElement()),
diff --git a/tests/framework/EncapsulatedElement.ts b/tests/framework/EncapsulatedElement.ts
index 0526b8a580e..24bcc54b1b8 100644
--- a/tests/framework/EncapsulatedElement.ts
+++ b/tests/framework/EncapsulatedElement.ts
@@ -141,7 +141,7 @@ export class EncapsulatedElement {
     }
 
     // Otherwise, it's a platform-specific configuration
-    const platform = await PlatformDetector.getPlatform();
+    const platform = PlatformDetector.getPlatform();
     const platformLocator = config.appium[platform];
 
     if (!platformLocator) {
diff --git a/tests/framework/PageObjectMigrationTestUtils.ts b/tests/framework/PageObjectMigrationTestUtils.ts
index 8b482e23d49..6b4f5532687 100644
--- a/tests/framework/PageObjectMigrationTestUtils.ts
+++ b/tests/framework/PageObjectMigrationTestUtils.ts
@@ -2,6 +2,7 @@ import { FrameworkDetector, TestFramework } from './FrameworkDetector';
 import { EncapsulatedElement } from './EncapsulatedElement';
 import Matchers from './Matchers';
 import PlaywrightMatchers from './PlaywrightMatchers';
+import { resetDeviceInfo, setDeviceInfo } from './DeviceInfoCache.ts';
 
 function findPageObjectsWithEncapsulated(dir: string): string[] {
   const fs = jest.requireActual<typeof import('fs')>('fs');
@@ -121,14 +122,13 @@ function describeGetters(
         jest.clearAllMocks();
         FrameworkDetector.reset();
         FrameworkDetector.setFramework(TestFramework.APPIUM);
-        (global as Record<string, unknown>).driver = {
-          capabilities: Promise.resolve({ platformName: 'iOS' }),
-        };
+        resetDeviceInfo();
+        setDeviceInfo('ios', { width: 390, height: 844 });
       });
 
       afterEach(() => {
         FrameworkDetector.reset();
-        delete (global as Record<string, unknown>).driver;
+        resetDeviceInfo();
       });
 
       for (const name of getterNames) {
@@ -150,14 +150,13 @@ function describeGetters(
         jest.clearAllMocks();
         FrameworkDetector.reset();
         FrameworkDetector.setFramework(TestFramework.APPIUM);
-        (global as Record<string, unknown>).driver = {
-          capabilities: Promise.resolve({ platformName: 'Android' }),
-        };
+        resetDeviceInfo();
+        setDeviceInfo('android', { width: 400, height: 800 });
       });
 
       afterEach(() => {
         FrameworkDetector.reset();
-        delete (global as Record<string, unknown>).driver;
+        resetDeviceInfo();
       });
 
       for (const name of getterNames) {
diff --git a/tests/framework/PlatformLocator.ts b/tests/framework/PlatformLocator.ts
index eb44ace0ef1..07e29b42c09 100644
--- a/tests/framework/PlatformLocator.ts
+++ b/tests/framework/PlatformLocator.ts
@@ -1,39 +1,36 @@
 import { FrameworkDetector } from './FrameworkDetector.ts';
+import { getPlatform as getCachedPlatform } from './DeviceInfoCache.ts';
 
 /**
  * Platform detector for Appium/WebdriverIO and Detox context
+ * Uses cached device info to avoid repeated HTTP calls to the Appium server.
  */
 export class PlatformDetector {
   /**
-   * Get current platform (android/ios)
+   * Get current platform (android/ios).
+   * For Appium/WebdriverIO, reads from the cached device info populated once in the fixture.
+   * For Detox, reads from the Detox device object.
    */
-  static async getPlatform(): Promise<'android' | 'ios'> {
+  static getPlatform(): 'android' | 'ios' {
     if (FrameworkDetector.isDetox()) {
       return device.getPlatform() as 'android' | 'ios';
     }
 
-    // For Appium/WebdriverIO
-    if (typeof driver !== 'undefined') {
-      const capabilities = await driver.capabilities;
-      return capabilities.platformName?.toLowerCase() === 'android'
-        ? 'android'
-        : 'ios';
-    }
-
-    throw new Error('Unable to detect platform');
+    // For Appium/WebdriverIO, read from cache (no HTTP call)
+    return getCachedPlatform();
   }
 
   /**
    * Check if running on Android
    */
-  static async isAndroid(): Promise<boolean> {
-    return (await this.getPlatform()) === 'android';
+  static isAndroid(): boolean {
+    return PlatformDetector.getPlatform() === 'android';
   }
 
   /**
    * Check if running on iOS
    */
-  static async isIOS(): Promise<boolean> {
-    return (await this.getPlatform()) === 'ios';
+  static isIOS(): boolean {
+    return PlatformDetector.getPlatform() === 'ios';
   }
 }
diff --git a/tests/framework/PlaywrightGestures.ts b/tests/framework/PlaywrightGestures.ts
index c653742f7fa..56d0e514f38 100644
--- a/tests/framework/PlaywrightGestures.ts
+++ b/tests/framework/PlaywrightGestures.ts
@@ -1,3 +1,4 @@
+import { getWindowSize } from './DeviceInfoCache.ts';
 import { CurrentDeviceDetails } from './fixture';
 import { PlatformDetector } from './PlatformLocator';
 import { PlaywrightElement } from './PlaywrightAdapter';
@@ -252,7 +253,7 @@ export default class PlaywrightGestures {
 
     const location = await elem.unwrap().getLocation();
     const size = await elem.unwrap().getSize();
-    const windowSize = await drv.getWindowSize();
+    const windowSize = getWindowSize();
     const elementBottom = location.y + size.height;
     const safeBottom = windowSize.height * 0.85;
 
@@ -294,11 +295,14 @@ export default class PlaywrightGestures {
     let retries = maxRetries;
 
     if (
-      (await PlatformDetector.isAndroid()) &&
+      currentDeviceDetails.platform === 'android' &&
       currentDeviceDetails.packageName
     ) {
       bundleId = currentDeviceDetails.packageName;
-    } else if ((await PlatformDetector.isIOS()) && currentDeviceDetails.appId) {
+    } else if (
+      currentDeviceDetails.platform === 'ios' &&
+      currentDeviceDetails.appId
+    ) {
       bundleId = currentDeviceDetails.appId;
     } else {
       throw new Error('Package name or app id is not available');
@@ -376,7 +380,7 @@ export default class PlaywrightGestures {
     const drv = getDriver();
     if (!drv) throw new Error('Driver is not available');
 
-    if (await PlatformDetector.isAndroid()) {
+    if (PlatformDetector.isAndroid()) {
       await drv.hideKeyboard();
     } else {
       // iOS - try pressKey strategy first, fallback to tap outside
diff --git a/tests/framework/PlaywrightMatchers.ts b/tests/framework/PlaywrightMatchers.ts
index 2347b26f1fb..7037bc93d20 100644
--- a/tests/framework/PlaywrightMatchers.ts
+++ b/tests/framework/PlaywrightMatchers.ts
@@ -229,12 +229,19 @@ export default class PlaywrightMatchers {
   /**
    * Get element by name on iOS
    * @param name - The name to search for
+   * @param lazy - Whether to get a lazy element. Lazy elements are not required to be present in the DOM. This is useful for negative assertions where the element may never have been rendered (e.g. waitForDisplayed({ reverse: true })).
    * @returns The wrapped element
    */
-  static async getElementByNameiOS(name: string): Promise<PlaywrightElement> {
+  static async getElementByNameiOS(
+    name: string,
+    lazy = false,
+  ): Promise<PlaywrightElement> {
     const isIOS = await PlatformDetector.isIOS();
     if (!isIOS) throw new Error('This function is only valid for iOS');
     const xpath = `//*[contains(@name,'${name}')]`;
+    if (lazy) {
+      return await this.getLazyElementByXPath(xpath);
+    }
     return await this.getElementByXPath(xpath);
   }
 
diff --git a/tests/framework/PlaywrightUtilities.ts b/tests/framework/PlaywrightUtilities.ts
index 244178978a9..4f6242e6e70 100644
--- a/tests/framework/PlaywrightUtilities.ts
+++ b/tests/framework/PlaywrightUtilities.ts
@@ -1,5 +1,6 @@
 import test from '@playwright/test';
 import type { DeviceMatrix } from './types';
+import { getWindowSize } from './DeviceInfoCache.ts';
 import { PlaywrightElement } from './PlaywrightAdapter';
 import { CHROME_PACKAGE, DEFAULT_IMPLICIT_WAIT_MS } from './Constants';
 // eslint-disable-next-line import-x/no-nodejs-modules
@@ -143,7 +144,7 @@ class PlaywrightUtilities {
     width: number;
     height: number;
   }> {
-    const screenSize = await getDriver().getWindowSize();
+    const screenSize = getWindowSize();
     return { width: screenSize.width, height: screenSize.height };
   }
 
diff --git a/tests/framework/fixture/index.ts b/tests/framework/fixture/index.ts
index a5abc7aa215..7b4d385b966 100644
--- a/tests/framework/fixture/index.ts
+++ b/tests/framework/fixture/index.ts
@@ -22,6 +22,7 @@ import {
 import { getTeamInfoFromTags } from '../utils/teams';
 import { publishPerformanceScenarioToSentry } from '../../reporters/providers/sentry/PerformanceSentryPublisher';
 
+import { setDeviceInfo } from '../DeviceInfoCache.ts';
 // Extend globalThis to include driver property
 declare global {
   // eslint-disable-next-line no-var
@@ -167,6 +168,16 @@ export const test = base.extend<TestLevelFixtures>({
       // Make driver globally accessible for utilities
       globalThis.driver = driver;
 
+      // Populate device info cache once per session (avoid repeated Appium calls during tests).
+      const platformName = (await driver.capabilities)?.platformName;
+      const windowSize = await driver.getWindowSize();
+      setDeviceInfo(
+        (platformName?.toLowerCase() === 'android' ? 'android' : 'ios') as
+          | 'android'
+          | 'ios',
+        { width: windowSize.width, height: windowSize.height },
+      );
+
       // Add test metadata as annotations
       const deviceProviderName = project.use.device?.provider;
 
diff --git a/tests/framework/fixtures/FixtureHelper.ts b/tests/framework/fixtures/FixtureHelper.ts
index 98cf21b79c2..c025a85a39a 100644
--- a/tests/framework/fixtures/FixtureHelper.ts
+++ b/tests/framework/fixtures/FixtureHelper.ts
@@ -549,7 +549,10 @@ export async function withFixtures(
   let mockServerPort;
   const fixtureServer = new FixtureServer();
   const commandQueueServer = new CommandQueueServer();
-  const accountActivityWsServer = new LocalWebSocketServer('accountActivity');
+  const accountActivityWsServer = new LocalWebSocketServer(
+    'accountActivity',
+    ResourceType.ACCOUNT_ACTIVITY_WS,
+  );
   let testError: Error | null = null;
 
   try {
diff --git a/tests/framework/fixtures/json/default-fixture.json b/tests/framework/fixtures/json/default-fixture.json
index c1b3d08a775..b0707628f8b 100644
--- a/tests/framework/fixtures/json/default-fixture.json
+++ b/tests/framework/fixtures/json/default-fixture.json
@@ -352,7 +352,8 @@
         },
         "PerpsController": {
           "accountState": {
-            "availableBalance": "8000.00",
+            "spendableBalance": "8000.00",
+            "withdrawableBalance": "8000.00",
             "marginUsed": "2000.00",
             "returnOnEquity": "0",
             "totalBalance": "10000.00",
diff --git a/tests/framework/utils/Flows.js b/tests/framework/utils/Flows.js
deleted file mode 100644
index d26c1b79602..00000000000
--- a/tests/framework/utils/Flows.js
+++ /dev/null
@@ -1,221 +0,0 @@
-import AccountListComponent from '../../../wdio/screen-objects/AccountListComponent.js';
-import ImportFromSeedScreen from '../../../wdio/screen-objects/Onboarding/ImportFromSeedScreen.js';
-import WalletMainScreen from '../../../wdio/screen-objects/WalletMainScreen.js';
-import WelcomeScreen from '../../../wdio/screen-objects/Onboarding/OnboardingCarousel.js';
-import TermOfUseScreen from '../../../wdio/screen-objects/Modals/TermOfUseScreen.js';
-import OnboardingScreen from '../../../wdio/screen-objects/Onboarding/OnboardingScreen.js';
-import OnboardingSheet from '../../../wdio/screen-objects/Onboarding/OnboardingSheet.js';
-import CreatePasswordScreen from '../../../wdio/screen-objects/Onboarding/CreatePasswordScreen.js';
-import MetaMetricsScreen from '../../../wdio/screen-objects/Onboarding/MetaMetricsScreen.js';
-import OnboardingSucessScreen from '../../../wdio/screen-objects/OnboardingSucessScreen.js';
-import { getPasswordForScenario } from './TestConstants.js';
-import LoginScreen from '../../../wdio/screen-objects/LoginScreen.js';
-import MultichainAccountEducationModal from '../../../wdio/screen-objects/Modals/MultichainAccountEducationModal.js';
-import PerpsGTMModal from '../../../wdio/screen-objects/Modals/PerpsGTMModal.js';
-import RewardsGTMModal from '../../../wdio/screen-objects/Modals/RewardsGTMModal.js';
-import AppwrightGestures from '../AppwrightGestures.ts';
-import AppwrightSelectors from '../AppwrightSelectors.ts';
-import { expect } from 'appwright';
-import deviceMatrix from '../../performance/device-matrix.json' with { type: 'json' };
-
-/**
- * Builds a device-to-account mapping from device-matrix.json
- * Account assignments:
- * - Account 1: Default (first device in each platform category with 'low' category)
- * - Account 3: First Android device with 'high' category
- * - Account 4: First iOS device with 'high' category
- * - Account 5: Second iOS device (low category)
- * - Account 2: Reserved for 'stable' testing (not used in this function)
- */
-function buildDeviceAccountMapping() {
-  const mapping = {};
-
-  // Process Android devices
-  deviceMatrix.android_devices.forEach((device, index) => {
-    if (device.category === 'high') {
-      mapping[device.name] = 'Account 3';
-    } else if (device.category === 'low') {
-      // Low category Android devices use default Account 1
-      mapping[device.name] = null;
-    }
-  });
-
-  // Process iOS devices
-  deviceMatrix.ios_devices.forEach((device, index) => {
-    if (device.category === 'high') {
-      mapping[device.name] = 'Account 4';
-    } else if (device.category === 'low') {
-      mapping[device.name] = 'Account 5';
-    }
-  });
-
-  return mapping;
-}
-
-// Build the mapping once at module load
-const deviceAccountMapping = buildDeviceAccountMapping();
-
-export async function selectAccountDevice(device, testInfo) {
-  // Access device name from testInfo.project.use.device
-  const deviceName = testInfo.project.use.device.name;
-  console.log(`📱 Device executing the test: ${deviceName}`);
-
-  // Get account name from the dynamic mapping
-  const accountName = deviceAccountMapping[deviceName];
-
-  // If no account mapping exists or accountName is null, use default Account 1
-  if (!accountName) {
-    console.log(
-      `🔄 Account 1 is selected by default in the app for device: ${deviceName}`,
-    );
-    return;
-  }
-  // Account 2 is called stable and not used in this function
-
-  console.log(
-    `🔄 Switching to account: ${accountName} for device: ${deviceName}`,
-  );
-
-  // Set device for screen objects
-  WalletMainScreen.device = device;
-  AccountListComponent.device = device;
-
-  // Perform account switch
-  await WalletMainScreen.tapIdenticon();
-  await AccountListComponent.isComponentDisplayed();
-  await AccountListComponent.waitForSyncingToComplete();
-  await AccountListComponent.tapOnAccountByName(accountName);
-
-  // Verify we are back on main screen (tapping account usually closes modal)
-  await WalletMainScreen.isMainWalletViewVisible();
-}
-
-export async function onboardingFlowImportSRP(device, srp) {
-  WelcomeScreen.device = device;
-  TermOfUseScreen.device = device;
-  OnboardingScreen.device = device;
-  OnboardingSheet.device = device;
-  ImportFromSeedScreen.device = device;
-  CreatePasswordScreen.device = device;
-  MetaMetricsScreen.device = device;
-  OnboardingSucessScreen.device = device;
-
-  await OnboardingScreen.isScreenTitleVisible();
-
-  await OnboardingScreen.tapHaveAnExistingWallet();
-  await OnboardingSheet.isVisible();
-  await OnboardingSheet.tapImportSeedButton();
-  await ImportFromSeedScreen.isScreenTitleVisible();
-
-  await ImportFromSeedScreen.typeSecretRecoveryPhrase(srp, true);
-  await ImportFromSeedScreen.tapImportScreenTitleToDismissKeyboard();
-
-  await ImportFromSeedScreen.tapContinueButton();
-
-  await CreatePasswordScreen.isVisible();
-
-  await CreatePasswordScreen.enterPassword(
-    getPasswordForScenario('onboarding'),
-  );
-  await CreatePasswordScreen.reEnterPassword(
-    getPasswordForScenario('onboarding'),
-  );
-  await CreatePasswordScreen.tapIUnderstandCheckBox();
-  await CreatePasswordScreen.tapCreatePasswordButton();
-
-  await MetaMetricsScreen.isScreenTitleVisible();
-  await MetaMetricsScreen.tapIAgreeButton();
-
-  await OnboardingSucessScreen.isVisible();
-  await OnboardingSucessScreen.tapDone();
-
-  //await dismissRewardsBottomSheetModal(device);
-  await dissmissPredictionsModal(device);
-  await WalletMainScreen.isMainWalletViewVisible();
-}
-
-export async function dissmissAllModals(device) {
-  await dismissAddAccountModal(device);
-  await dismissMultichainAccountsIntroModal(device);
-  await dissmissPredictionsModal(device);
-}
-
-export async function dissmissPredictionsModal(device) {
-  const notNowPredictionsModalButton = await AppwrightSelectors.getElementByID(
-    device,
-    'predict-gtm-not-now-button',
-  );
-  if (await notNowPredictionsModalButton.isVisible({ timeout: 10000 })) {
-    await AppwrightGestures.tap(notNowPredictionsModalButton);
-  }
-}
-
-export async function checkPredictionsModalIsVisible(device) {
-  const notNowPredictionsModalButton = await AppwrightSelectors.getElementByID(
-    device,
-    'predict-gtm-not-now-button',
-  );
-  await expect(notNowPredictionsModalButton).toBeVisible({ timeout: 10000 });
-}
-
-export async function login(device, options = {}) {
-  LoginScreen.device = device;
-  const { scenarioType = 'login', dismissModals = false } = options;
-
-  const password = getPasswordForScenario(scenarioType);
-  // Type password and unlock
-  await LoginScreen.typePassword(password);
-  await LoginScreen.tapUnlockButton();
-  if (dismissModals) {
-    await dissmissAllModals(device);
-  }
-  await AppwrightGestures.wait(5000);
-}
-
-export async function tapPerpsBottomSheetGotItButton(device) {
-  PerpsGTMModal.device = device;
-  const container = await PerpsGTMModal.container;
-  if (await container.isVisible({ timeout: 5000 })) {
-    await PerpsGTMModal.tapNotNowButton();
-    console.log('Perps onboarding dismissed');
-    return;
-  }
-}
-
-export async function dismissRewardsBottomSheetModal(device) {
-  RewardsGTMModal.device = device;
-  const container = await RewardsGTMModal.notNowButton;
-  if (await container.isVisible({ timeout: 5000 })) {
-    await RewardsGTMModal.tapNotNowButton();
-  }
-}
-
-export async function dismissMultichainAccountsIntroModal(
-  device,
-  timeout = 10000,
-) {
-  MultichainAccountEducationModal.device = device;
-  const closeButton = await MultichainAccountEducationModal.closeButton;
-  if (await closeButton.isVisible({ timeout })) {
-    await MultichainAccountEducationModal.tapGotItButton();
-    return;
-  }
-}
-
-export async function dismissAddAccountModal(device) {
-  // Fix this for iOS
-  if (!device || !AppwrightSelectors.isAndroid(device)) {
-    return;
-  }
-  const cancelButton = await AppwrightSelectors.getElementByXpath(
-    device,
-    '//android.widget.Button[@content-desc="Cancel"]',
-  );
-  if (await cancelButton.isVisible({ timeout: 5000 })) {
-    await AppwrightGestures.tap(cancelButton);
-    return;
-  }
-  if (await cancelButton.isVisible({ timeout: 5000 })) {
-    await AppwrightGestures.tap(cancelButton);
-  }
-}
diff --git a/tests/framework/utils/MobileBrowser.js b/tests/framework/utils/MobileBrowser.js
deleted file mode 100644
index ad6e36a0c82..00000000000
--- a/tests/framework/utils/MobileBrowser.js
+++ /dev/null
@@ -1,208 +0,0 @@
-/* eslint-disable import-x/no-nodejs-modules */
-import { execSync } from 'child_process';
-
-import AppwrightSelectors from '../AppwrightSelectors.ts';
-import MobileBrowserScreen from '../../../wdio/screen-objects/MobileBrowser.js';
-import AppwrightGestures from '../AppwrightGestures.ts';
-
-const CHROME_PACKAGE = 'com.android.chrome';
-
-/** Max time to wait for a Chrome modal dismissal (find + tap). Prevents long hangs. */
-const CHROME_DISMISS_TIMEOUT_MS = 5000;
-
-/** Delay after dismissals so Chrome UI can settle before we interact with the URL bar. Kept short to avoid app auto-lock. */
-const CHROME_UI_SETTLE_MS = 800;
-
-/**
- * Run an async step with a timeout. Rejects after ms so callers can catch and continue.
- */
-function withTimeout(promise, ms, label = 'operation') {
-  return Promise.race([
-    promise,
-    new Promise((_, reject) =>
-      setTimeout(
-        () => reject(new Error(`${label} timed out after ${ms}ms`)),
-        ms,
-      ),
-    ),
-  ]);
-}
-
-/**
- * Configure Chrome to skip First Run Experience (FRE) including "Enhanced ad privacy".
- * Uses Chrome's command-line file; requires set-debug-app. Non-fatal if adb fails.
- */
-function setupChromeDisableFre() {
-  try {
-    execSync(`adb shell am set-debug-app --persistent ${CHROME_PACKAGE}`, {
-      stdio: 'pipe',
-    });
-  } catch (error) {
-    console.warn(
-      `Could not set Chrome as debug app (FRE may show): ${error.message}`,
-    );
-  }
-  try {
-    execSync(
-      `adb shell "echo 'chrome --disable-fre --no-default-browser-check --no-first-run' > /data/local/tmp/chrome-command-line"`,
-      { stdio: 'pipe' },
-    );
-  } catch (error) {
-    console.warn(
-      `Could not write Chrome command-line (FRE may show): ${error.message}`,
-    );
-  }
-}
-
-/**
- * Clear Chrome app data so it opens with a single default tab (no previous tabs).
- * Falls back to no-op if adb fails (e.g. not Android, no adb).
- */
-function clearChromeData() {
-  try {
-    execSync(`adb shell pm clear ${CHROME_PACKAGE}`, { stdio: 'pipe' });
-  } catch (error) {
-    console.warn(
-      `Could not clear Chrome data (Chrome may open with existing tabs): ${error.message}`,
-    );
-    return false;
-  }
-  return true;
-}
-
-/**
- * Dismiss "Enhanced ad privacy" (or similar) dialog by tapping "Got it" or alternate text.
- */
-async function dismissChromeAdPrivacyIfPresent(device) {
-  const dismissTexts = ['Got it', 'No thanks', 'Skip', 'Continue'];
-  for (const text of dismissTexts) {
-    try {
-      const element = await AppwrightSelectors.getElementByText(
-        device,
-        text,
-        false,
-      );
-      await AppwrightGestures.tap(element);
-      return;
-    } catch {
-      // This text not found, try next
-    }
-  }
-}
-
-/**
- * Dismiss "Chrome notifications make things easier" modal by tapping "No thanks".
- */
-async function dismissChromeNotificationsIfPresent(device) {
-  const element = await AppwrightSelectors.getElementByText(
-    device,
-    'No thanks',
-    false,
-  );
-  await AppwrightGestures.tap(element);
-}
-
-export async function launchMobileBrowser(device) {
-  const isAndroid = AppwrightSelectors.isAndroid(device);
-  if (isAndroid) {
-    setupChromeDisableFre();
-    clearChromeData();
-    await device.activateApp(CHROME_PACKAGE);
-    MobileBrowserScreen.device = device;
-    // Dismiss first-run / sign-in prompts if present (short timeout so we don't hang)
-    try {
-      await withTimeout(
-        MobileBrowserScreen.tapOnboardingChromeWithoutAccount(),
-        CHROME_DISMISS_TIMEOUT_MS,
-        'tapOnboardingChromeWithoutAccount',
-      );
-    } catch {
-      // No onboarding dialog or timed out
-    }
-    try {
-      await withTimeout(
-        MobileBrowserScreen.tapChromeNoThanksButton(),
-        CHROME_DISMISS_TIMEOUT_MS,
-        'tapChromeNoThanksButton',
-      );
-    } catch {
-      // No "No thanks" dialog or timed out
-    }
-    try {
-      await withTimeout(
-        dismissChromeAdPrivacyIfPresent(device),
-        CHROME_DISMISS_TIMEOUT_MS,
-        'dismissChromeAdPrivacy',
-      );
-    } catch {
-      // No Enhanced ad privacy dialog or timed out — continue
-    }
-    try {
-      await withTimeout(
-        dismissChromeNotificationsIfPresent(device),
-        CHROME_DISMISS_TIMEOUT_MS,
-        'dismissChromeNotifications',
-      );
-    } catch {
-      // No "Chrome notifications" modal or timed out — continue
-    }
-    await new Promise((r) => setTimeout(r, CHROME_UI_SETTLE_MS));
-  } else {
-    await device.activateApp('com.apple.mobilesafari');
-  }
-}
-
-/**
- * Switch back to the mobile browser without clearing or re-launching.
- * Use after confirming connection in the mobile app so the existing dapp tab stays as-is.
- */
-export async function switchToMobileBrowser(device) {
-  const isAndroid = AppwrightSelectors.isAndroid(device);
-  await device.activateApp(
-    isAndroid ? CHROME_PACKAGE : 'com.apple.mobilesafari',
-  );
-  MobileBrowserScreen.device = device;
-}
-
-export async function navigateToDappAndroid(device, url, dappName) {
-  MobileBrowserScreen.device = device;
-
-  try {
-    await MobileBrowserScreen.tapSearchBox();
-  } catch {
-    // NTP search box not present — tap URL bar directly
-  }
-  await MobileBrowserScreen.tapUrlBar();
-  await AppwrightGestures.typeText(await MobileBrowserScreen.chromeUrlBar, url);
-  await MobileBrowserScreen.tapSelectDappUrl();
-}
-
-export async function navigateToDappIOS(device, url, dappName) {
-  MobileBrowserScreen.device = device;
-  const element = await AppwrightSelectors.getElementByNameiOS(
-    device,
-    'TabBarItemTitle',
-  );
-  await AppwrightGestures.typeText(element, `${url}\n`);
-}
-
-export async function navigateToDapp(device, url, dappName) {
-  if (AppwrightSelectors.isAndroid(device)) {
-    return navigateToDappAndroid(device, url, dappName);
-  }
-  if (AppwrightSelectors.isIOS(device)) {
-    return navigateToDappIOS(device, url, dappName);
-  }
-  throw new Error('Unsupported platform');
-}
-
-export async function refreshMobileBrowser(device) {
-  if (AppwrightSelectors.isIOS(device)) {
-    throw new Error('Not implemented');
-  }
-  if (AppwrightSelectors.isAndroid(device)) {
-    await MobileBrowserScreen.tapChromeMenuButton();
-    return MobileBrowserScreen.tapChromeRefreshButton();
-  }
-  throw new Error('Unsupported platform');
-}
diff --git a/tests/helpers/analytics/expectations/swap-action.analytics.ts b/tests/helpers/analytics/expectations/swap-action.analytics.ts
index 36769f1eee2..0518d37800a 100644
--- a/tests/helpers/analytics/expectations/swap-action.analytics.ts
+++ b/tests/helpers/analytics/expectations/swap-action.analytics.ts
@@ -102,7 +102,11 @@ const completedProperties: Record<
  *
  * Note: these expectations are run against events captured during the first swap only.
  * The `validate` callback handles the Input Changed events which require advanced checks
- * (count = 12, specific `input` values like chain_source, token_destination, slippage).
+ * (count = 11 without custom slippage; chain_source, token_destination).
+ *
+ * Slippage `INPUT_CHANGED` assertion is disabled: swap-action smoke no longer opens the
+ * slippage modal until https://github.com/MetaMask/metamask-mobile/issues/29615 is fixed,
+ * so that event is not emitted and the count is 11 instead of 12.
  */
 export const swapActionExpectations: AnalyticsExpectations = {
   eventNames: expectedEventNames,
@@ -126,7 +130,8 @@ export const swapActionExpectations: AnalyticsExpectations = {
   validate: async ({ events }) => {
     const inputChanged = filterEvents(events, INPUT_CHANGED);
 
-    await Assertions.checkIfArrayHasLength(inputChanged, 12);
+    // 11 while custom slippage is skipped (bug #29615); was 12 with slippage modal.
+    await Assertions.checkIfArrayHasLength(inputChanged, 11);
 
     for (const event of inputChanged) {
       await Assertions.checkIfValueIsDefined(event.properties.input);
@@ -145,10 +150,11 @@ export const swapActionExpectations: AnalyticsExpectations = {
         `Expected input=token_destination in Input Changed events. Found: ${inputs.join(', ')}`,
       );
     }
-    if (!inputs.includes('slippage')) {
-      throw new Error(
-        `Expected input=slippage in Input Changed events. Found: ${inputs.join(', ')}`,
-      );
-    }
+    // Re-enable when swap-action smoke sets custom slippage again (bug #29615).
+    // if (!inputs.includes('slippage')) {
+    //   throw new Error(
+    //     `Expected input=slippage in Input Changed events. Found: ${inputs.join(', ')}`,
+    //   );
+    // }
   },
 };
diff --git a/tests/helpers/swap/swap-mocks.ts b/tests/helpers/swap/swap-mocks.ts
index 30caa82c330..2cd14fa55ca 100644
--- a/tests/helpers/swap/swap-mocks.ts
+++ b/tests/helpers/swap/swap-mocks.ts
@@ -6,6 +6,7 @@ import {
   setupMockRequest,
   setupSSEMockRequest,
 } from '../../api-mocking/helpers/mockHelpers';
+import { getDecodedProxiedURL } from '../../smoke/notifications/utils/helpers';
 import {
   GET_QUOTE_ETH_USDC_RESPONSE,
   GET_QUOTE_ETH_USDC_RESPONSE_CUSTOM_SLIPPAGE,
@@ -30,6 +31,9 @@ const WETH_MAINNET = '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
 const GOOGLON_MAINNET = '0xba47214edd2bb43099611b208f75e4b42fdcfedc';
 const MUSD_MAINNET = '0xaca92e438df0b2401ff60da7e4337b687a2435da';
 
+/** SocialService leaderboard response shape (empty list is valid for E2E). */
+const SOCIAL_LEADERBOARD_EMPTY_RESPONSE = { traders: [] };
+
 /**
  * Mock spot prices so balance display (balance * price) does not show NaN.
  * Shared by swap and bridge E2E tests.
@@ -77,10 +81,64 @@ export async function setupSpotPricesMock(mockServer: Mockttp): Promise<void> {
   });
 }
 
+/**
+ * Social leaderboard + compliance batch — used by swap `testSpecificMock` and
+ * bridge/trending specs that do not use swap-mocks’ full mock bundle.
+ */
+export async function setupSwapSocialAndComplianceMocks(
+  mockServer: Mockttp,
+): Promise<void> {
+  await setupMockRequest(
+    mockServer,
+    {
+      requestMethod: 'GET',
+      url: /social\.api\.cx\.metamask\.io\/api\/v1\/leaderboard/,
+      response: SOCIAL_LEADERBOARD_EMPTY_RESPONSE,
+      responseCode: 200,
+    },
+    1001,
+  );
+
+  await mockServer
+    .forPost('/proxy')
+    .matching((request) => {
+      try {
+        const decodedUrl = getDecodedProxiedURL(request.url);
+        return /compliance\.(dev-api|api|uat-api)\.cx\.metamask\.io\/v1\/wallet\/batch/.test(
+          decodedUrl,
+        );
+      } 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 })),
+      };
+    });
+}
+
 export const testSpecificMock: TestSpecificMock = async (
   mockServer: Mockttp,
 ) => {
   await setupSpotPricesMock(mockServer);
+  await setupSwapSocialAndComplianceMocks(mockServer);
 
   // Catch-all for getQuoteStream with no slippage param (initial render before
   // useInitialSlippage fires). Registered first so specific mocks below at
@@ -206,7 +264,10 @@ export const testSpecificMock: TestSpecificMock = async (
 
   await interceptProxyUrl(
     mockServer,
-    (url) => url.includes('getQuote') && url.includes('insufficientBal=false'),
+    (url) =>
+      url.includes('getQuote') &&
+      !url.includes('getQuoteStream') &&
+      url.includes('insufficientBal=false'),
     (url) => url.replace('insufficientBal=false', 'insufficientBal=true'),
   );
 };
diff --git a/tests/helpers/swap/swap-unified-ui.ts b/tests/helpers/swap/swap-unified-ui.ts
index 5cd6c4cbfcd..f78e5f31d52 100644
--- a/tests/helpers/swap/swap-unified-ui.ts
+++ b/tests/helpers/swap/swap-unified-ui.ts
@@ -1,9 +1,12 @@
 import QuoteView from '../../page-objects/swaps/QuoteView';
 import SlippageModal from '../../page-objects/swaps/SlippageModal';
 import { Assertions } from '../../framework';
+import { createLogger } from '../../framework/logger';
 import ActivitiesView from '../../page-objects/Transactions/ActivitiesView';
 import { ActivitiesViewSelectorsText } from '../../../app/components/Views/ActivityView/ActivitiesView.testIds';
 
+const logger = createLogger({ name: 'SwapUnifiedUI' });
+
 interface SwapOptions {
   /** Custom slippage percentage (e.g., "2.5" for 2.5%) */
   slippage?: string;
@@ -30,9 +33,11 @@ export async function submitSwapUnifiedUI(
   await QuoteView.tapDestinationToken();
   await QuoteView.tapToken(chainId, destTokenSymbol);
 
+  const getQuoteStarted = Date.now();
   await Assertions.expectElementToBeVisible(QuoteView.networkFeeLabel, {
     timeout: 60000,
   });
+  logger.debug(`⏳ Quote visible after ${Date.now() - getQuoteStarted}ms`);
 
   // Dismiss the keypad so quote details (slippage, confirm) are not obscured
   await QuoteView.dismissKeypad();
diff --git a/tests/helpers/tenderly/tenderly.js b/tests/helpers/tenderly/tenderly.js
deleted file mode 100644
index db5ca8a501a..00000000000
--- a/tests/helpers/tenderly/tenderly.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import axios from 'axios';
-
-export default class Tenderly {
-  static async addFunds(rpcURL, account, amount = '0xDE0B6B3A764000000') {
-    const data = {
-      jsonrpc: '2.0',
-      method: 'tenderly_setBalance',
-      params: [[account], amount],
-      id: '1234',
-    };
-
-    const response = await axios.post(rpcURL, data, {
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    });
-
-    if (response.data.error) {
-      // eslint-disable-next-line no-console
-      console.log(
-        `ERROR: Failed to add funds to Tenderly VirtualTestNet\n${response.data.error}`,
-      );
-      return null;
-    }
-  }
-}
diff --git a/tests/locators/Trending/TrendingView.selectors.ts b/tests/locators/Trending/TrendingView.selectors.ts
index d791bd86578..e4f991632ae 100644
--- a/tests/locators/Trending/TrendingView.selectors.ts
+++ b/tests/locators/Trending/TrendingView.selectors.ts
@@ -5,7 +5,7 @@ export const TrendingViewSelectorsIDs = {
   SEARCH_BUTTON: 'explore-view-search-button',
   BROWSER_BUTTON: 'trending-view-browser-button',
   SEARCH_INPUT: 'explore-view-search-input',
-  SEARCH_TEXT_FIELD: 'textfieldsearch',
+  SEARCH_TEXT_INPUT: 'explore-view-search-text-input',
   SEARCH_CANCEL_BUTTON: 'explore-search-cancel-button',
   TOKEN_ROW_ITEM_PREFIX: 'trending-token-row-item-',
   PERPS_ROW_ITEM_PREFIX: 'perps-market-tile-card-',
@@ -20,7 +20,7 @@ export const TrendingViewSelectorsIDs = {
 } as const;
 
 export const TrendingViewSelectorsText = {
-  // Section titles — must match `strings('trending.*')` in sections.config.tsx (see en.json)
+  // Section titles - must match the actual localized strings from sections.config.tsx
   SECTION_PREDICTIONS: 'Predictions',
   SECTION_TOKENS: 'Trending',
   SECTION_STOCKS: 'Stocks',
diff --git a/tests/page-objects/MMConnect/DappConnectionModal.ts b/tests/page-objects/MMConnect/DappConnectionModal.ts
index 1a12895191f..1252e45e3de 100644
--- a/tests/page-objects/MMConnect/DappConnectionModal.ts
+++ b/tests/page-objects/MMConnect/DappConnectionModal.ts
@@ -8,6 +8,7 @@ import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
 import UnifiedGestures from '../../framework/UnifiedGestures';
 import { getDriver } from '../../framework/PlaywrightUtilities';
 import { ConnectAccountBottomSheetSelectorsIDs } from '../../../app/components/Views/AccountConnect/ConnectAccountBottomSheet.testIds';
+import { ConnectedAccountsSelectorsIDs } from '../../../app/components/Views/AccountConnect/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 { sleep } from '../../framework';
@@ -33,10 +34,16 @@ class DappConnectionModal {
 
   get editAccountsButton(): EncapsulatedElementType {
     return encapsulated({
-      appium: () =>
-        PlaywrightMatchers.getElementByXPath(
-          '//android.view.ViewGroup[@content-desc="Edit accounts"]',
-        ),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementByXPath(
+            '//android.view.ViewGroup[@content-desc="Edit accounts"]',
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementById(
+            ConnectedAccountsSelectorsIDs.ACCOUNT_LIST_BOTTOM_SHEET,
+          ),
+      },
     });
   }
 
@@ -130,10 +137,10 @@ class DappConnectionModal {
           direction: 'down',
           percent: 1.0,
         });
-        const element = await asPlaywrightElement(
+        const networkButton = await asPlaywrightElement(
           this.getNetworkButton(networkName),
         );
-        await element.click();
+        await networkButton.click();
       },
     });
   }
diff --git a/tests/page-objects/MMConnect/UniswapDapp.ts b/tests/page-objects/MMConnect/UniswapDapp.ts
new file mode 100644
index 00000000000..c585d87c295
--- /dev/null
+++ b/tests/page-objects/MMConnect/UniswapDapp.ts
@@ -0,0 +1,248 @@
+import {
+  asPlaywrightElement,
+  encapsulated,
+  encapsulatedAction,
+  EncapsulatedElementType,
+  PlatformDetector,
+  PlaywrightAssertions,
+  PlaywrightGestures,
+  PlaywrightMatchers,
+  sleep,
+  UnifiedGestures,
+} from '../../framework';
+
+class UniswapDapp {
+  private getByXPath(xpath: string): EncapsulatedElementType {
+    return encapsulated({
+      appium: () => PlaywrightMatchers.getLazyElementByXPath(xpath),
+    });
+  }
+
+  get connectButton(): EncapsulatedElementType {
+    return encapsulated({
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getLazyElementByXPath(
+            '//*[@data-testid="navbar-connect-wallet"]',
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementById('Connect', { exact: true }),
+      },
+    });
+  }
+
+  get walletConnect(): EncapsulatedElementType {
+    return encapsulated({
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementByXPath(
+            '//*[contains(normalize-space(.), "WalletConnect")]',
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementByXPath(
+            '//XCUIElementTypeStaticText[@name="WalletConnect"]',
+          ),
+      },
+    });
+  }
+
+  get metaMaskWalletOption(): EncapsulatedElementType {
+    return encapsulated({
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getLazyElementByXPath(
+            '//android.widget.Button[@text="MetaMask MetaMask"]',
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementById('MetaMask MetaMask', {
+            exact: true,
+          }),
+      },
+    });
+  }
+
+  get metaMaskDeeplinkButton(): EncapsulatedElementType {
+    return encapsulated({
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getLazyElementByXPath(
+            '//android.widget.TextView[@text="MetaMask"]',
+          ),
+        ios: () =>
+          PlaywrightMatchers.getLazyElementByXPath(
+            '//XCUIElementTypeOther[@name="textfield"]',
+          ),
+      },
+    });
+  }
+
+  get uniswapDialog(): EncapsulatedElementType {
+    return this.getByXPath('//android.app.AlertDialog');
+  }
+
+  get uniswapIcon(): EncapsulatedElementType {
+    return encapsulated({
+      appium: () => PlaywrightMatchers.getElementById('account-icon'),
+    });
+  }
+
+  get solanaPopup(): EncapsulatedElementType {
+    return encapsulated({
+      appium: () =>
+        PlaywrightMatchers.getElementByText('Use Solana on Uniswap'),
+    });
+  }
+
+  get SolanaPopup(): EncapsulatedElementType {
+    return this.solanaPopup;
+  }
+
+  async waitForConnectButtonVisible(timeoutMs = 20000): Promise<void> {
+    await this.waitForElementVisible(
+      this.connectButton,
+      timeoutMs,
+      'UniswapDapp: connect button not visible',
+    );
+  }
+
+  async waitForWalletConnectVisible(timeoutMs = 15000): Promise<void> {
+    await this.waitForElementVisible(
+      this.walletConnect,
+      timeoutMs,
+      'UniswapDapp: WalletConnect option not visible',
+    );
+  }
+
+  async tapConnect(): Promise<void> {
+    await PlaywrightGestures.waitAndTap(
+      await asPlaywrightElement(this.connectButton),
+      {
+        delay: 3000, // 3 seconds - DOM might not be ready yet
+      },
+    );
+  }
+
+  async tapOnWalletConnect(): Promise<void> {
+    await PlaywrightGestures.waitAndTap(
+      await asPlaywrightElement(this.walletConnect),
+      {
+        delay: 3000, // 3 seconds - DOM might not be ready yet
+      },
+    );
+  }
+
+  async connectWithMetaMask(): Promise<void> {
+    await this.waitForConnectButtonVisible();
+    await this.tapConnect();
+    await this.waitForWalletConnectVisible();
+    await this.tapOnWalletConnect();
+  }
+
+  async connectIOS(timeoutMs = 20000): Promise<void> {
+    await this.waitForConnectButtonVisible(timeoutMs);
+    await this.tapConnect();
+  }
+
+  async selectWalletConnectOption(): Promise<void> {
+    await this.tapOnWalletConnect();
+  }
+
+  async tapOnMetaMaskWalletOption(): Promise<void> {
+    await UnifiedGestures.waitAndTap(this.metaMaskWalletOption, {
+      description: 'tap MetaMask wallet option',
+    });
+  }
+
+  async tapOnMetaMaskDeeplinkButton(): Promise<void> {
+    await encapsulatedAction({
+      appium: async () => {
+        await sleep(2000);
+        await PlaywrightGestures.waitAndTap(
+          await asPlaywrightElement(this.metaMaskDeeplinkButton),
+        );
+      },
+    });
+  }
+
+  async tapOnMetaMaskWalletOptionAndOpenDeeplink(): Promise<void> {
+    await this.tapOnMetaMaskWalletOption();
+    if (PlatformDetector.isAndroid()) {
+      await this.tapOnMetaMaskDeeplinkButton();
+    }
+  }
+
+  async isUniswapDisplayed(timeoutMs = 30000): Promise<void> {
+    await encapsulatedAction({
+      appium: async () => {
+        if (PlatformDetector.isAndroid()) {
+          const dialogVisible = await this.isElementVisible(
+            this.uniswapDialog,
+            timeoutMs,
+          );
+
+          if (dialogVisible) {
+            return;
+          }
+
+          const iconVisible = await this.isElementVisible(
+            this.uniswapIcon,
+            timeoutMs,
+          );
+
+          if (!iconVisible) {
+            throw new Error(
+              'Neither Uniswap dialog nor account icon is visible in Android context',
+            );
+          }
+
+          return;
+        }
+
+        await this.waitForElementVisible(
+          this.solanaPopup,
+          timeoutMs,
+          'UniswapDapp: Solana popup not visible',
+        );
+      },
+    });
+  }
+
+  private async waitForElementVisible(
+    targetElement: EncapsulatedElementType,
+    timeoutMs: number,
+    timeoutMsg: string,
+  ): Promise<void> {
+    await encapsulatedAction({
+      appium: async () => {
+        await PlaywrightAssertions.expectConditionWithRetry(
+          async () => {
+            const resolvedElement = await asPlaywrightElement(targetElement);
+            await resolvedElement.waitForDisplayed({
+              timeout: timeoutMs,
+              timeoutMsg,
+            });
+          },
+          {
+            maxRetries: 5,
+            description: timeoutMsg,
+          },
+        );
+      },
+    });
+  }
+
+  private async isElementVisible(
+    targetElement: EncapsulatedElementType,
+    timeoutMs: number,
+  ): Promise<boolean> {
+    try {
+      const resolvedElement = await asPlaywrightElement(targetElement);
+      await resolvedElement.waitForDisplayed({ timeout: timeoutMs });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
+
+export default new UniswapDapp();
diff --git a/tests/page-objects/Predict/PredictDetailsPage.ts b/tests/page-objects/Predict/PredictDetailsPage.ts
index 77019731e33..a7a69f24796 100644
--- a/tests/page-objects/Predict/PredictDetailsPage.ts
+++ b/tests/page-objects/Predict/PredictDetailsPage.ts
@@ -14,6 +14,13 @@ import {
   PredictMarketDetailsSelectorsIDs,
   PredictMarketDetailsSelectorsText,
 } from '../../../app/components/UI/Predict/Predict.testIds';
+import { PREDICT_PICK_ITEM_TEST_IDS } from '../../../app/components/UI/Predict/components/PredictPicks/PredictPickItem.testIds';
+import {
+  PREDICT_GAME_DETAILS_FOOTER,
+  PREDICT_GAME_DETAILS_FOOTER_TEST_IDS,
+} from '../../../app/components/UI/Predict/components/PredictGameDetailsFooter/PredictGameDetailsFooter.testIds';
+import { PREDICT_ACTION_BUTTONS_TEST_IDS } from '../../../app/components/UI/Predict/components/PredictActionButtons/PredictActionButtons.testIds';
+import { PREDICT_BET_BUTTONS_TEST_IDS } from '../../../app/components/UI/Predict/components/PredictActionButtons/PredictBetButtons.testIds';
 
 class PredictDetailsPage {
   get container(): EncapsulatedElementType {
@@ -208,6 +215,14 @@ class PredictDetailsPage {
     });
   }
 
+  get gameBetYesButton(): EncapsulatedElementType {
+    const testID = `${PREDICT_GAME_DETAILS_FOOTER}${PREDICT_GAME_DETAILS_FOOTER_TEST_IDS.ACTION_BUTTONS}${PREDICT_ACTION_BUTTONS_TEST_IDS.PREDICT_BET_BUTTON}${PREDICT_BET_BUTTONS_TEST_IDS.PREDICT_BET_BUTTON_YES}`;
+    return encapsulated({
+      detox: () => Matchers.getElementByID(testID),
+      appium: () => PlaywrightMatchers.getElementById(testID, { exact: true }),
+    });
+  }
+
   async waitForScreenToDisplay(): Promise<void> {
     await Assertions.expectElementToBeVisible(this.container, {
       description: 'Predict market details screen',
@@ -246,12 +261,32 @@ class PredictDetailsPage {
     });
   }
 
+  getGameCashOutButton(positionId: string): EncapsulatedElementType {
+    const testID = `${PREDICT_PICK_ITEM_TEST_IDS.PREDICT_PICKS_CASH_OUT_BUTTON}-${positionId}`;
+    return encapsulated({
+      detox: () => Matchers.getElementByID(testID),
+      appium: () => PlaywrightMatchers.getElementById(testID, { exact: true }),
+    });
+  }
+
+  async tapGameCashOutButton(positionId: string): Promise<void> {
+    await UnifiedGestures.waitAndTap(this.getGameCashOutButton(positionId), {
+      description: 'Game details cash out button',
+    });
+  }
+
   async tapOpenPositionValue(): Promise<void> {
     await UnifiedGestures.waitAndTap(this.getOpenPositionValueButton(), {
       description: 'Celtics outcome button',
     });
   }
 
+  async tapGameBetYesButton(): Promise<void> {
+    await UnifiedGestures.waitAndTap(this.gameBetYesButton, {
+      description: 'Game bet yes button',
+    });
+  }
+
   async tapPositionAmount(amount: string): Promise<void> {
     const digits = amount.split('');
 
diff --git a/tests/page-objects/Settings/SecurityAndPrivacy/ChangePasswordView.ts b/tests/page-objects/Settings/SecurityAndPrivacy/ChangePasswordView.ts
index a8b10f192a2..288761b2b30 100644
--- a/tests/page-objects/Settings/SecurityAndPrivacy/ChangePasswordView.ts
+++ b/tests/page-objects/Settings/SecurityAndPrivacy/ChangePasswordView.ts
@@ -1,4 +1,3 @@
-import { RESET_PASSWORD_CONFIRM_INPUT_BOX_ID } from '../../../../wdio/screen-objects/testIDs/Screens/ChangePasswordScreensIDs.testIds';
 import { ChoosePasswordSelectorsIDs } from '../../../../app/components/Views/ChoosePassword/ChoosePassword.testIds';
 import { ChangePasswordViewSelectorsText } from '../../../selectors/Settings/SecurityAndPrivacy/ChangePasswordView.selectors';
 import Matchers from '../../../framework/Matchers';
@@ -18,7 +17,9 @@ class ChangePasswordView {
   }
 
   get confirmPasswordInput(): DetoxElement {
-    return Matchers.getElementByID(RESET_PASSWORD_CONFIRM_INPUT_BOX_ID);
+    return Matchers.getElementByID(
+      ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID,
+    );
   }
 
   get iUnderstandCheckBox(): DetoxElement {
diff --git a/tests/page-objects/Settings/SecurityAndPrivacy/SecurityAndPrivacyView.ts b/tests/page-objects/Settings/SecurityAndPrivacy/SecurityAndPrivacyView.ts
index a0f549bee4b..d6eb0a01aa7 100644
--- a/tests/page-objects/Settings/SecurityAndPrivacy/SecurityAndPrivacyView.ts
+++ b/tests/page-objects/Settings/SecurityAndPrivacy/SecurityAndPrivacyView.ts
@@ -1,4 +1,3 @@
-import { SECURITY_PRIVACY_DELETE_WALLET_BUTTON } from '../../../../wdio/screen-objects/testIDs/Screens/SecurityPrivacy.testIds';
 import {
   SecurityPrivacyViewSelectorsIDs,
   SecurityPrivacyViewSelectorsText,
@@ -32,8 +31,12 @@ class SecurityAndPrivacy {
 
   get deleteWalletButton(): DetoxElement {
     return device.getPlatform() === 'ios'
-      ? Matchers.getElementByID(SECURITY_PRIVACY_DELETE_WALLET_BUTTON)
-      : Matchers.getElementByLabel(SECURITY_PRIVACY_DELETE_WALLET_BUTTON);
+      ? Matchers.getElementByID(
+          SecurityPrivacyViewSelectorsIDs.DELETE_WALLET_BUTTON,
+        )
+      : Matchers.getElementByLabel(
+          SecurityPrivacyViewSelectorsIDs.DELETE_WALLET_BUTTON,
+        );
   }
 
   get metaMetricsToggle(): DetoxElement {
diff --git a/tests/page-objects/Trending/TrendingView.ts b/tests/page-objects/Trending/TrendingView.ts
index 4382a539329..efea04d3541 100644
--- a/tests/page-objects/Trending/TrendingView.ts
+++ b/tests/page-objects/Trending/TrendingView.ts
@@ -23,22 +23,14 @@ class TrendingView {
     return Matchers.getElementByID(TrendingViewSelectorsIDs.BROWSER_BUTTON);
   }
 
-  /**
-   * Native target for typing — DS `TextFieldSearch` applies `testID` on the `TextField`
-   * pressable (`textfieldsearch`), not on the outer `Box` (`explore-view-search-input`).
-   * iOS: that id is used directly. Android: `replaceText` must hit `EditText`, so we match
-   * `android.widget.EditText` under the same ancestor (see LoginView passwordInput).
-   */
-  get searchInput(): DetoxElement {
-    return Matchers.getEditTextWithAncestorTestId(
-      TrendingViewSelectorsIDs.SEARCH_TEXT_FIELD,
-    );
-  }
-
   get searchInputContainer(): DetoxElement {
     return Matchers.getElementByID(TrendingViewSelectorsIDs.SEARCH_INPUT);
   }
 
+  get searchInput(): DetoxElement {
+    return Matchers.getElementByID(TrendingViewSelectorsIDs.SEARCH_TEXT_INPUT);
+  }
+
   get searchCancelButton(): DetoxElement {
     return Matchers.getElementByID(
       TrendingViewSelectorsIDs.SEARCH_CANCEL_BUTTON,
@@ -155,7 +147,6 @@ class TrendingView {
   private getSectionId(sectionTitle: string): string {
     const sectionIdMap: Record<string, string> = {
       Trending: 'tokens',
-      'Trending tokens': 'tokens',
       Stocks: 'stocks',
       Sites: 'sites',
       Predictions: 'predictions',
diff --git a/tests/page-objects/swaps/QuoteView.ts b/tests/page-objects/swaps/QuoteView.ts
index fd4b3db9270..a4abba1b82e 100644
--- a/tests/page-objects/swaps/QuoteView.ts
+++ b/tests/page-objects/swaps/QuoteView.ts
@@ -15,7 +15,7 @@ import {
   PlatformDetector,
   PlaywrightElement,
 } from '../../framework';
-import { getAssetTestId } from '../../../wdio/screen-objects/testIDs/Screens/WalletView.testIds';
+import { getAssetTestId } from '../../selectors/Wallet/WalletView.selectors';
 import {
   QuoteViewSelectorIDs,
   QuoteViewSelectorText,
diff --git a/tests/page-objects/wallet/NetworkManager.ts b/tests/page-objects/wallet/NetworkManager.ts
index d9a943128e2..f62e9c5bb2f 100644
--- a/tests/page-objects/wallet/NetworkManager.ts
+++ b/tests/page-objects/wallet/NetworkManager.ts
@@ -8,7 +8,10 @@ import {
   NetworkManagerSelectorText,
 } from '../../../app/components/UI/NetworkMultiSelector/NetworkManager.testIds';
 import TestHelpers from '../../helpers';
-import { WalletViewSelectorsIDs } from '../../../app/components/Views/Wallet/WalletView.testIds';
+import {
+  WalletViewSelectorsIDs,
+  WalletViewSelectorsText,
+} from '../../../app/components/Views/Wallet/WalletView.testIds';
 
 class NetworkManager {
   /**
@@ -192,6 +195,45 @@ class NetworkManager {
     await this.waitForNetworkManagerToLoad();
   }
 
+  /**
+   * Navigate to the TokensFullView (via the homepage Tokens section header)
+   * so that the network filter control bar becomes accessible.
+   */
+  async navigateToTokensFullView(): Promise<void> {
+    const tokensSectionHeader = Matchers.getElementByText(
+      WalletViewSelectorsText.TOKENS_SECTION,
+    );
+    await Gestures.waitAndTap(tokensSectionHeader, {
+      checkStability: true,
+      elemDescription: 'Tokens Section Header (navigate to full view)',
+    });
+  }
+
+  /**
+   * Navigate back from TokensFullView to the homepage.
+   */
+  async navigateBackFromTokensFullView(): Promise<void> {
+    const backButton = Matchers.getElementByID(
+      WalletViewSelectorsIDs.BACK_BUTTON,
+    );
+    await Gestures.waitAndTap(backButton, {
+      elemDescription: 'Back button (return from TokensFullView)',
+    });
+  }
+
+  /**
+   * Open the network manager from the redesigned homepage.
+   * The TOKEN_NETWORK_FILTER control only exists in TokensFullView,
+   * so this navigates there first, then opens the network manager sheet.
+   */
+  async openNetworkManagerFromHomepage(): Promise<void> {
+    await this.navigateToTokensFullView();
+    await Gestures.waitAndTap(this.openNetworkManagerButton, {
+      elemDescription: 'Open Network Manager Button (from TokensFullView)',
+    });
+    await this.waitForNetworkManagerToLoad();
+  }
+
   /**
    * Check if the network manager is currently visible
    */
diff --git a/tests/page-objects/wallet/WalletView.ts b/tests/page-objects/wallet/WalletView.ts
index 609abbbacf3..88698d2804f 100644
--- a/tests/page-objects/wallet/WalletView.ts
+++ b/tests/page-objects/wallet/WalletView.ts
@@ -3,6 +3,7 @@ import {
   WalletViewSelectorsText,
 } from '../../../app/components/Views/Wallet/WalletView.testIds';
 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 {
   PredictTabViewSelectorsIDs,
@@ -339,6 +340,10 @@ class WalletView {
     );
   }
 
+  get cashGetMusdContainer(): DetoxElement {
+    return Matchers.getElementByID(CashGetMusdEmptyStateSelectors.CONTAINER);
+  }
+
   get getMusdButton(): DetoxElement {
     return Matchers.getElementByText('Get mUSD');
   }
diff --git a/tests/performance/README.md b/tests/performance/README.md
index 4e5a6ae53ae..4190b2967a1 100644
--- a/tests/performance/README.md
+++ b/tests/performance/README.md
@@ -218,7 +218,22 @@ npx playwright test --grep "@PerformanceLogin.*@PerformanceLaunch" --project and
 
 ## Test Tags
 
-Tests are tagged with area-specific tags defined in `tests/tags.performance.js`. These tags allow for selective test execution based on which areas of the app are affected by code changes.
+Tags are defined in `tests/tags.performance.js` and embedded in `test.describe()` names. They are runner-agnostic — any runner with `--grep` support can filter by them.
+
+### Test Type Tags
+
+These tags control which Playwright config picks up a test:
+
+| Tag            | Description                                                            | Config that filters for it                                                                 |
+| -------------- | ---------------------------------------------------------------------- | ------------------------------------------------------------------------------------------ |
+| `@Performance` | Test measures performance (uses `TimerHelper`, quality gates enforced) | `playwright.config.ts` (`grep: /@Performance/`)                                            |
+| `@System`      | Test verifies functionality (no quality gates or metrics)              | `playwright.system.config.ts` / `playwright.system-emulator.config.ts` (`grep: /@System/`) |
+
+Most existing tests are tagged with **both** `@Performance @System` — they measure perf and also serve as system smoke tests. A test can use just one tag if it should only run in one suite.
+
+### Area Tags
+
+These tags categorize tests by feature area and can be used with `--grep` for ad-hoc filtering:
 
 | Tag                        | Description                                                   |
 | -------------------------- | ------------------------------------------------------------- |
@@ -232,18 +247,41 @@ Tests are tagged with area-specific tags defined in `tests/tags.performance.js`.
 | `@PerformancePredict`      | Predict market performance (market list, details, deposits)   |
 | `@PerformancePreps`        | Perpetuals trading performance (positions, add funds, orders) |
 
-Tags are imported into test files from `tests/tags.performance.js`:
+### Tagging Convention
+
+Import type tags and area tags from `tests/tags.performance.js`:
 
 ```typescript
-import { PerformanceLogin, PerformanceSwaps } from '../../tags.performance.js';
+import {
+  Performance,
+  System,
+  PerformanceLogin,
+  PerformanceSwaps,
+} from '../../tags.performance.js';
 
-perfTest.describe(`${PerformanceLogin} ${PerformanceSwaps}`, () => {
-  perfTest(
-    'Swap flow performance',
-    async ({ currentDeviceDetails, driver, performanceTracker }, testInfo) => {
-      // test implementation
-    },
-  );
+// Both perf and system test (most common):
+perfTest.describe(
+  `${Performance} ${System} ${PerformanceLogin} ${PerformanceSwaps}`,
+  () => {
+    perfTest(
+      'Swap flow performance',
+      async (
+        { currentDeviceDetails, driver, performanceTracker },
+        testInfo,
+      ) => {
+        // test implementation with TimerHelper and thresholds
+      },
+    );
+  },
+);
+
+// System-only test (functional verification, no perf measurement):
+test.describe(`${System} ${PerformanceLogin}`, () => {
+  test('Verify wallet loads after login', async ({ driver }) => {
+    // No TimerHelper — pure functional check
+    await loginToAppPlaywright();
+    await WalletView.waitForAccountName('Account 1');
+  });
 });
 ```
 
diff --git a/tests/performance/login/asset-balances.spec.ts b/tests/performance/login/asset-balances.spec.ts
index 40f65f13d5a..e1266b2b634 100644
--- a/tests/performance/login/asset-balances.spec.ts
+++ b/tests/performance/login/asset-balances.spec.ts
@@ -6,12 +6,14 @@ import WalletView from '../../page-objects/wallet/WalletView';
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 
 import {
+  Performance,
+  System,
   PerformanceLogin,
   PerformanceAssetLoading,
 } from '../../tags.performance.js';
 
 /* Scenario: Aggregated Balance Loading Time, SRP 1 + SRP 2 + SRP 3 */
-test.describe(`${PerformanceLogin} ${PerformanceAssetLoading}`, () => {
+test.describe(`${Performance} ${System} ${PerformanceLogin} ${PerformanceAssetLoading}`, () => {
   test(
     'Aggregated Balance Loading Time, SRP 1 + SRP 2 + SRP 3',
     { tag: '@assets-dev-team' },
diff --git a/tests/performance/login/asset-view.spec.ts b/tests/performance/login/asset-view.spec.ts
index 9d1eb1dffe6..588245772d5 100644
--- a/tests/performance/login/asset-view.spec.ts
+++ b/tests/performance/login/asset-view.spec.ts
@@ -5,45 +5,52 @@ import { asPlaywrightElement, PlaywrightAssertions } from '../../framework';
 import WalletView from '../../page-objects/wallet/WalletView';
 import TokenOverview from '../../page-objects/wallet/TokenOverview';
 import {
+  Performance,
   PerformanceLogin,
   PerformanceAssetLoading,
 } from '../../tags.performance.js';
 
 /* Scenario 8: Asset View, SRP 1 + SRP 2 + SRP 3 */
-perfTest.describe(`${PerformanceLogin} ${PerformanceAssetLoading}`, () => {
-  perfTest(
-    'Asset View, SRP 1 + SRP 2 + SRP 3',
-    { tag: '@assets-dev-team' },
-    async ({ currentDeviceDetails, driver, performanceTracker }, testInfo) => {
-      await loginToAppPlaywright();
+perfTest.describe(
+  `${Performance} ${PerformanceLogin} ${PerformanceAssetLoading}`,
+  () => {
+    perfTest(
+      'Asset View, SRP 1 + SRP 2 + SRP 3',
+      { tag: '@assets-dev-team' },
+      async (
+        { currentDeviceDetails, driver, performanceTracker },
+        testInfo,
+      ) => {
+        await loginToAppPlaywright();
 
-      const assetViewScreen = new TimerHelper(
-        'Time since the user clicks on the asset view button until the user sees the token overview screen',
-        { ios: 600, android: 4500 },
-        currentDeviceDetails.platform,
-      );
+        const assetViewScreen = new TimerHelper(
+          'Time since the user clicks on the asset view button until the user sees the token overview screen',
+          { ios: 600, android: 4500 },
+          currentDeviceDetails.platform,
+        );
 
-      await WalletView.tapOnTokensSection();
-      await WalletView.tapOnToken('USDC');
+        await WalletView.tapOnTokensSection();
+        await WalletView.tapOnToken('USDC');
 
-      await assetViewScreen.measure(async () => {
-        await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(TokenOverview.container),
-        );
-        await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(TokenOverview.sendButton),
-        );
-        // Replicating the logic of the old spec to wait for the todays change to be visible isTodaysChangeVisible method in the TokenOverview wdio screen object
-        await PlaywrightAssertions.expectElementToBeVisibleWithSettle(
-          asPlaywrightElement(TokenOverview.todaysChange),
-          {
-            timeout: 10000,
-            settleMs: 500,
-          },
-        );
-      });
+        await assetViewScreen.measure(async () => {
+          await PlaywrightAssertions.expectElementToBeVisible(
+            asPlaywrightElement(TokenOverview.container),
+          );
+          await PlaywrightAssertions.expectElementToBeVisible(
+            asPlaywrightElement(TokenOverview.sendButton),
+          );
+          // Replicating the logic of the old spec to wait for the todays change to be visible isTodaysChangeVisible method in the TokenOverview wdio screen object
+          await PlaywrightAssertions.expectElementToBeVisibleWithSettle(
+            asPlaywrightElement(TokenOverview.todaysChange),
+            {
+              timeout: 10000,
+              settleMs: 500,
+            },
+          );
+        });
 
-      performanceTracker.addTimer(assetViewScreen);
-    },
-  );
-});
+        performanceTracker.addTimer(assetViewScreen);
+      },
+    );
+  },
+);
diff --git a/tests/performance/login/cross-chain-swap-flow.spec.ts b/tests/performance/login/cross-chain-swap-flow.spec.ts
index edd434c2a84..8800844fe0f 100644
--- a/tests/performance/login/cross-chain-swap-flow.spec.ts
+++ b/tests/performance/login/cross-chain-swap-flow.spec.ts
@@ -1,12 +1,18 @@
 import { test } from '../../framework/fixture';
 import TimerHelper from '../../framework/TimerHelper.js';
-import { PerformanceLogin, PerformanceSwaps } from '../../tags.performance.js';
+import {
+  Performance,
+  System,
+  PerformanceLogin,
+  PerformanceSwaps,
+} from '../../tags.performance.js';
 import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
 import WalletView from '../../page-objects/wallet/WalletView.js';
 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(`${PerformanceLogin} ${PerformanceSwaps}`, () => {
+test.describe(`${Performance} ${System} ${PerformanceLogin} ${PerformanceSwaps}`, () => {
   test(
     'Cross-chain swap flow - ETH to SOL - 50+ accounts, SRP 1 + SRP 2 + SRP 3',
     { tag: '@swap-bridge-dev-team' },
@@ -34,6 +40,12 @@ test.describe(`${PerformanceLogin} ${PerformanceSwaps}`, () => {
       await timer2.measure(() => QuoteView.isQuoteDisplayed());
 
       performanceTracker.addTimers(timer1, timer2);
+
+      if (process.env.SUBMIT_SWAP === 'true') {
+        await QuoteView.dismissKeypad();
+        await QuoteView.tapConfirmSwap();
+        await checkSwapActivity('ETH', 'SOL');
+      }
     },
   );
 });
diff --git a/tests/performance/login/eth-swap-flow.spec.ts b/tests/performance/login/eth-swap-flow.spec.ts
index 1e1db2e94af..3d268832d74 100644
--- a/tests/performance/login/eth-swap-flow.spec.ts
+++ b/tests/performance/login/eth-swap-flow.spec.ts
@@ -1,12 +1,18 @@
 import { test } from '../../framework/fixture';
 import TimerHelper from '../../framework/TimerHelper';
-import { PerformanceLogin, PerformanceSwaps } from '../../tags.performance.js';
+import {
+  Performance,
+  System,
+  PerformanceLogin,
+  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';
+import { checkSwapActivity } from '../../helpers/swap/swap-unified-ui';
 
 /* Scenario 6: Swap flow - ETH to LINK, SRP 1 + SRP 2 + SRP 3 */
-test.describe(`${PerformanceLogin} ${PerformanceSwaps}`, () => {
+test.describe(`${Performance} ${System} ${PerformanceLogin} ${PerformanceSwaps}`, () => {
   test(
     'Swap flow - ETH to LINK, SRP 1 + SRP 2 + SRP 3',
     { tag: '@swap-bridge-dev-team' },
@@ -33,6 +39,12 @@ test.describe(`${PerformanceLogin} ${PerformanceSwaps}`, () => {
       await swapTimer.measure(() => QuoteView.isQuoteDisplayed());
 
       performanceTracker.addTimers(swapLoadTimer, swapTimer);
+
+      if (process.env.SUBMIT_SWAP === 'true') {
+        await QuoteView.dismissKeypad();
+        await QuoteView.tapConfirmSwap();
+        await checkSwapActivity('ETH', 'USDC');
+      }
     },
   );
 });
diff --git a/tests/performance/login/import-multiple-srps.spec.ts b/tests/performance/login/import-multiple-srps.spec.ts
index ff1b94c7a2d..24942bd68ae 100644
--- a/tests/performance/login/import-multiple-srps.spec.ts
+++ b/tests/performance/login/import-multiple-srps.spec.ts
@@ -7,95 +7,100 @@ import AddAccountBottomSheet from '../../page-objects/wallet/AddAccountBottomShe
 import AccountListBottomSheet from '../../page-objects/wallet/AccountListBottomSheet';
 import WalletView from '../../page-objects/wallet/WalletView';
 import {
+  Performance,
+  System,
   PerformanceAccountList,
   PerformanceLogin,
 } from '../../tags.performance.js';
 import PlaywrightGestures from '../../framework/PlaywrightGestures';
 /* Scenario 4: Import SRP with +50 accounts, SRP 1, SRP 2, SRP 3 */
-perfTest.describe(`${PerformanceLogin} ${PerformanceAccountList}`, () => {
-  perfTest.setTimeout(30 * 60 * 1000);
+perfTest.describe(
+  `${Performance} ${System} ${PerformanceLogin} ${PerformanceAccountList}`,
+  () => {
+    perfTest.setTimeout(30 * 60 * 1000);
 
-  perfTest(
-    'Import SRP with +50 accounts, SRP 1, SRP 2, SRP 3',
-    { tag: '@accounts-team' },
-    async ({ currentDeviceDetails, driver, performanceTracker }) => {
-      const importedSrp = process.env.TEST_SRP_2;
+    perfTest(
+      'Import SRP with +50 accounts, SRP 1, SRP 2, SRP 3',
+      { tag: '@accounts-team' },
+      async ({ currentDeviceDetails, driver, performanceTracker }) => {
+        const importedSrp = process.env.TEST_SRP_2;
 
-      if (!importedSrp) {
-        throw new Error(
-          'TEST_SRP_2 environment variable is required for this performance test.',
-        );
-      }
-
-      await loginToAppPlaywright();
+        if (!importedSrp) {
+          throw new Error(
+            'TEST_SRP_2 environment variable is required for this performance test.',
+          );
+        }
 
-      const accountListTimer = new TimerHelper(
-        'Time since the user clicks on "Account list" button until the account list is visible',
-        { ios: 2500, android: 3000 },
-        currentDeviceDetails.platform,
-      );
-      const addAccountTimer = new TimerHelper(
-        'Time since the user clicks on "Add account" button until the next modal is visible',
-        { ios: 1000, android: 1700 },
-        currentDeviceDetails.platform,
-      );
-      const importSrpTimer = new TimerHelper(
-        'Time since the user clicks on "Import SRP" button until SRP field is displayed',
-        { ios: 1700, android: 1700 },
-        currentDeviceDetails.platform,
-      );
-      const walletReadyTimer = new TimerHelper(
-        'Time since the user clicks on "Continue" button on SRP screen until Wallet main screen is visible',
-        { ios: 5000, android: 2000 },
-        currentDeviceDetails.platform,
-      );
+        await loginToAppPlaywright();
 
-      await WalletView.tapIdenticon();
-      await accountListTimer.measure(async () => {
-        await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(AccountListBottomSheet.accountList),
-          {
-            description: 'Account list should be visible',
-          },
+        const accountListTimer = new TimerHelper(
+          'Time since the user clicks on "Account list" button until the account list is visible',
+          { ios: 2500, android: 3000 },
+          currentDeviceDetails.platform,
         );
-      });
-
-      await AccountListBottomSheet.waitForAccountSyncToComplete();
-      await AccountListBottomSheet.tapAddAccountButton();
-      await addAccountTimer.measure(async () => {
-        await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(AddAccountBottomSheet.importSrpButton),
-          {
-            description: 'Add account bottom sheet should be visible',
-          },
+        const addAccountTimer = new TimerHelper(
+          'Time since the user clicks on "Add account" button until the next modal is visible',
+          { ios: 1000, android: 1700 },
+          currentDeviceDetails.platform,
+        );
+        const importSrpTimer = new TimerHelper(
+          'Time since the user clicks on "Import SRP" button until SRP field is displayed',
+          { ios: 1700, android: 1700 },
+          currentDeviceDetails.platform,
+        );
+        const walletReadyTimer = new TimerHelper(
+          'Time since the user clicks on "Continue" button on SRP screen until Wallet main screen is visible',
+          { ios: 5000, android: 2000 },
+          currentDeviceDetails.platform,
         );
-      });
 
-      await AddAccountBottomSheet.tapImportSrp();
-      await importSrpTimer.measure(async () => {
-        await ImportWalletView.isScreenTitleVisible(false);
-      });
+        await WalletView.tapIdenticon();
+        await accountListTimer.measure(async () => {
+          await PlaywrightAssertions.expectElementToBeVisible(
+            asPlaywrightElement(AccountListBottomSheet.accountList),
+            {
+              description: 'Account list should be visible',
+            },
+          );
+        });
 
-      await ImportWalletView.typeSecretRecoveryPhrase(importedSrp, false);
-      await PlaywrightGestures.hideKeyboard();
-      await ImportWalletView.tapContinueButton(false);
+        await AccountListBottomSheet.waitForAccountSyncToComplete();
+        await AccountListBottomSheet.tapAddAccountButton();
+        await addAccountTimer.measure(async () => {
+          await PlaywrightAssertions.expectElementToBeVisible(
+            asPlaywrightElement(AddAccountBottomSheet.importSrpButton),
+            {
+              description: 'Add account bottom sheet should be visible',
+            },
+          );
+        });
 
-      await walletReadyTimer.measure(async () => {
-        await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(WalletView.accountIcon),
-          {
-            description:
-              'Wallet main screen should be visible after importing SRP',
-          },
-        );
-      });
+        await AddAccountBottomSheet.tapImportSrp();
+        await importSrpTimer.measure(async () => {
+          await ImportWalletView.isScreenTitleVisible(false);
+        });
+
+        await ImportWalletView.typeSecretRecoveryPhrase(importedSrp, false);
+        await PlaywrightGestures.hideKeyboard();
+        await ImportWalletView.tapContinueButton(false);
 
-      performanceTracker.addTimers(
-        accountListTimer,
-        addAccountTimer,
-        importSrpTimer,
-        walletReadyTimer,
-      );
-    },
-  );
-});
+        await walletReadyTimer.measure(async () => {
+          await PlaywrightAssertions.expectElementToBeVisible(
+            asPlaywrightElement(WalletView.accountIcon),
+            {
+              description:
+                'Wallet main screen should be visible after importing SRP',
+            },
+          );
+        });
+
+        performanceTracker.addTimers(
+          accountListTimer,
+          addAccountTimer,
+          importSrpTimer,
+          walletReadyTimer,
+        );
+      },
+    );
+  },
+);
diff --git a/tests/performance/login/launch-times/cold-start-to-login.spec.ts b/tests/performance/login/launch-times/cold-start-to-login.spec.ts
index 3630db824a9..08c59502c1d 100644
--- a/tests/performance/login/launch-times/cold-start-to-login.spec.ts
+++ b/tests/performance/login/launch-times/cold-start-to-login.spec.ts
@@ -9,6 +9,7 @@ import { loginToAppPlaywright } from '../../../flows/wallet.flow';
 import LoginView from '../../../page-objects/wallet/LoginView';
 import WalletView from '../../../page-objects/wallet/WalletView';
 import {
+  Performance,
   PerformanceLogin,
   PerformanceLaunch,
 } from '../../../tags.performance.js';
@@ -25,43 +26,50 @@ import {
  * The test measures:
  * 1. Time to relaunch the app and display the login screen
  */
-perfTest.describe(`${PerformanceLogin} ${PerformanceLaunch}`, () => {
-  perfTest(
-    'Cold Start: Measure ColdStart To Login Screen',
-    { tag: '@metamask-mobile-platform' },
-    async ({ currentDeviceDetails, driver, performanceTracker }, testInfo) => {
-      await loginToAppPlaywright();
-      await PlaywrightAssertions.expectElementToBeVisible(
-        asPlaywrightElement(WalletView.accountIcon),
-        {
-          timeout: 15000,
-          description: 'Wallet account icon should be visible before relaunch',
-        },
-      );
-      await WalletView.waitForBalanceToStabilize();
-      await PlaywrightGestures.terminateApp(currentDeviceDetails);
-
-      const timer1 = new TimerHelper(
-        'Time since the the app is launched, until login screen appears',
-        { ios: 3000, android: 4000 },
-        currentDeviceDetails.platform,
-      );
-
-      await PlaywrightGestures.activateApp(currentDeviceDetails);
-      await timer1.measure(async () => {
+perfTest.describe(
+  `${Performance} ${PerformanceLogin} ${PerformanceLaunch}`,
+  () => {
+    perfTest(
+      'Cold Start: Measure ColdStart To Login Screen',
+      { tag: '@metamask-mobile-platform' },
+      async (
+        { currentDeviceDetails, driver, performanceTracker },
+        testInfo,
+      ) => {
+        await loginToAppPlaywright();
         await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(LoginView.container),
+          asPlaywrightElement(WalletView.accountIcon),
           {
-            description: 'Login title should be visible',
+            timeout: 15000,
+            description:
+              'Wallet account icon should be visible before relaunch',
           },
         );
-      });
+        await WalletView.waitForBalanceToStabilize();
+        await PlaywrightGestures.terminateApp(currentDeviceDetails);
+
+        const timer1 = new TimerHelper(
+          'Time since the the app is launched, until login screen appears',
+          { ios: 3000, android: 4000 },
+          currentDeviceDetails.platform,
+        );
+
+        await PlaywrightGestures.activateApp(currentDeviceDetails);
+        await timer1.measure(async () => {
+          await PlaywrightAssertions.expectElementToBeVisible(
+            asPlaywrightElement(LoginView.container),
+            {
+              description: 'Login title should be visible',
+            },
+          );
+        });
 
-      performanceTracker.addTimers(timer1);
+        performanceTracker.addTimers(timer1);
 
-      console.log('Cold Start to Login Screen Performance Test completed');
-      console.log(`Cold Start to Login Screen: ${timer1.getDuration()}ms`);
-      console.log(`Total Time: ${timer1.getDuration() ?? 0}ms`);
-    },
-  );
-});
+        console.log('Cold Start to Login Screen Performance Test completed');
+        console.log(`Cold Start to Login Screen: ${timer1.getDuration()}ms`);
+        console.log(`Total Time: ${timer1.getDuration() ?? 0}ms`);
+      },
+    );
+  },
+);
diff --git a/tests/performance/login/launch-times/warm-start-login-to-wallet.spec.ts b/tests/performance/login/launch-times/warm-start-login-to-wallet.spec.ts
index bd5deae3b07..a0a610340dc 100644
--- a/tests/performance/login/launch-times/warm-start-login-to-wallet.spec.ts
+++ b/tests/performance/login/launch-times/warm-start-login-to-wallet.spec.ts
@@ -10,6 +10,7 @@ import { getPasswordForScenario } from '../../../framework/utils/TestConstants.j
 import LoginView from '../../../page-objects/wallet/LoginView';
 import WalletView from '../../../page-objects/wallet/WalletView';
 import {
+  Performance,
   PerformanceLogin,
   PerformanceLaunch,
 } from '../../../tags.performance.js';
@@ -26,53 +27,59 @@ import {
  * The test measures:
  * 1. Time to tap Unlock and display the wallet screen again
  */
-perfTest.describe(`${PerformanceLogin} ${PerformanceLaunch}`, () => {
-  perfTest(
-    'Measure Warm Start: Login To Wallet Screen',
-    { tag: '@metamask-mobile-platform' },
-    async ({ currentDeviceDetails, driver, performanceTracker }, testInfo) => {
-      await loginToAppPlaywright();
-      await PlaywrightAssertions.expectElementToBeVisible(
-        asPlaywrightElement(WalletView.totalBalance),
-        {
-          description:
-            'Wallet account icon should be visible before warm start',
-        },
-      );
-
-      await PlaywrightGestures.backgroundApp(35);
-      await PlaywrightGestures.activateApp(currentDeviceDetails);
-      await PlaywrightAssertions.expectElementToBeVisible(
-        asPlaywrightElement(LoginView.passwordInput),
-        {
-          description: 'Login title should be visible',
-        },
-      );
-      const loginPassword = getPasswordForScenario('login');
-      await LoginView.enterPassword(loginPassword);
-
-      const timer1 = new TimerHelper(
-        'Time since the user clicks on unlock button, until the app unlocks',
-        { ios: 2500, android: 2500 },
-        currentDeviceDetails.platform,
-      );
+perfTest.describe(
+  `${Performance} ${PerformanceLogin} ${PerformanceLaunch}`,
+  () => {
+    perfTest(
+      'Measure Warm Start: Login To Wallet Screen',
+      { tag: '@metamask-mobile-platform' },
+      async (
+        { currentDeviceDetails, driver, performanceTracker },
+        testInfo,
+      ) => {
+        await loginToAppPlaywright();
+        await PlaywrightAssertions.expectElementToBeVisible(
+          asPlaywrightElement(WalletView.totalBalance),
+          {
+            description:
+              'Wallet account icon should be visible before warm start',
+          },
+        );
 
-      await LoginView.tapLoginButton();
-      await timer1.measure(async () => {
+        await PlaywrightGestures.backgroundApp(35);
+        await PlaywrightGestures.activateApp(currentDeviceDetails);
         await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(WalletView.container),
+          asPlaywrightElement(LoginView.passwordInput),
           {
-            description: 'Wallet balance should be visible',
+            description: 'Login title should be visible',
           },
         );
-        // await WalletView.waitForBalanceToStabilize();
-      });
+        const loginPassword = getPasswordForScenario('login');
+        await LoginView.enterPassword(loginPassword);
+
+        const timer1 = new TimerHelper(
+          'Time since the user clicks on unlock button, until the app unlocks',
+          { ios: 2500, android: 2500 },
+          currentDeviceDetails.platform,
+        );
+
+        await LoginView.tapLoginButton();
+        await timer1.measure(async () => {
+          await PlaywrightAssertions.expectElementToBeVisible(
+            asPlaywrightElement(WalletView.container),
+            {
+              description: 'Wallet balance should be visible',
+            },
+          );
+          // await WalletView.waitForBalanceToStabilize();
+        });
 
-      performanceTracker.addTimers(timer1);
+        performanceTracker.addTimers(timer1);
 
-      console.log('Warm Start Login to Wallet Performance Test completed');
-      console.log(`Warm Start Login to Wallet: ${timer1.getDuration()}ms`);
-      console.log(`Total Time: ${timer1.getDuration() ?? 0}ms`);
-    },
-  );
-});
+        console.log('Warm Start Login to Wallet Performance Test completed');
+        console.log(`Warm Start Login to Wallet: ${timer1.getDuration()}ms`);
+        console.log(`Total Time: ${timer1.getDuration() ?? 0}ms`);
+      },
+    );
+  },
+);
diff --git a/tests/performance/login/launch-times/warm-start-to-login.spec.ts b/tests/performance/login/launch-times/warm-start-to-login.spec.ts
index e9189ed8cb9..b8f09a0a95f 100644
--- a/tests/performance/login/launch-times/warm-start-to-login.spec.ts
+++ b/tests/performance/login/launch-times/warm-start-to-login.spec.ts
@@ -9,6 +9,7 @@ import { loginToAppPlaywright } from '../../../flows/wallet.flow';
 import LoginView from '../../../page-objects/wallet/LoginView';
 import WalletView from '../../../page-objects/wallet/WalletView';
 import {
+  Performance,
   PerformanceLogin,
   PerformanceLaunch,
 } from '../../../tags.performance.js';
@@ -25,43 +26,49 @@ import {
  * The test measures:
  * 1. Time to foreground the app and display the login screen
  */
-perfTest.describe(`${PerformanceLogin} ${PerformanceLaunch}`, () => {
-  perfTest(
-    'Measure Warm Start: Warm Start to Login Screen',
-    { tag: '@metamask-mobile-platform' },
-    async ({ currentDeviceDetails, driver, performanceTracker }, testInfo) => {
-      await loginToAppPlaywright();
-      await PlaywrightAssertions.expectElementToBeVisible(
-        asPlaywrightElement(WalletView.accountIcon),
-        {
-          description:
-            'Wallet account icon should be visible before warm start',
-        },
-      );
-
-      const timer1 = new TimerHelper(
-        'Time since the user open the app again and the login screen appears',
-        { ios: 2500, android: 3000 },
-        currentDeviceDetails.platform,
-      );
-
-      await PlaywrightGestures.backgroundApp(35);
-      await PlaywrightGestures.activateApp(currentDeviceDetails);
-
-      await timer1.measure(async () => {
+perfTest.describe(
+  `${Performance} ${PerformanceLogin} ${PerformanceLaunch}`,
+  () => {
+    perfTest(
+      'Measure Warm Start: Warm Start to Login Screen',
+      { tag: '@metamask-mobile-platform' },
+      async (
+        { currentDeviceDetails, driver, performanceTracker },
+        testInfo,
+      ) => {
+        await loginToAppPlaywright();
         await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(LoginView.container),
+          asPlaywrightElement(WalletView.accountIcon),
           {
-            description: 'Login title should be visible',
+            description:
+              'Wallet account icon should be visible before warm start',
           },
         );
-      });
 
-      performanceTracker.addTimers(timer1);
+        const timer1 = new TimerHelper(
+          'Time since the user open the app again and the login screen appears',
+          { ios: 2500, android: 3000 },
+          currentDeviceDetails.platform,
+        );
+
+        await PlaywrightGestures.backgroundApp(35);
+        await PlaywrightGestures.activateApp(currentDeviceDetails);
+
+        await timer1.measure(async () => {
+          await PlaywrightAssertions.expectElementToBeVisible(
+            asPlaywrightElement(LoginView.container),
+            {
+              description: 'Login title should be visible',
+            },
+          );
+        });
+
+        performanceTracker.addTimers(timer1);
 
-      console.log('Warm Start to Login Screen Performance Test completed');
-      console.log(`Warm Start to Login Screen: ${timer1.getDuration()}ms`);
-      console.log(`Total Time: ${timer1.getDuration() ?? 0}ms`);
-    },
-  );
-});
+        console.log('Warm Start to Login Screen Performance Test completed');
+        console.log(`Warm Start to Login Screen: ${timer1.getDuration()}ms`);
+        console.log(`Total Time: ${timer1.getDuration() ?? 0}ms`);
+      },
+    );
+  },
+);
diff --git a/tests/performance/login/perps-add-funds.spec.ts b/tests/performance/login/perps-add-funds.spec.ts
index d85c6d22195..90076f244f8 100644
--- a/tests/performance/login/perps-add-funds.spec.ts
+++ b/tests/performance/login/perps-add-funds.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '../../framework/fixture';
 import TimerHelper from '../../framework/TimerHelper';
-import { PerformancePreps } from '../../tags.performance.js';
+import { Performance, PerformancePreps } from '../../tags.performance.js';
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import TabBarComponent from '../../page-objects/wallet/TabBarComponent';
 import PerpsOnboarding from '../../page-objects/Perps/PerpsOnboarding';
@@ -10,7 +10,7 @@ import PlaywrightAssertions from '../../framework/PlaywrightAssertions';
 import { asPlaywrightElement } from '../../framework/EncapsulatedElement';
 
 /* Scenario 5: Perps add funds */
-test.describe(PerformancePreps, () => {
+test.describe(`${Performance} ${PerformancePreps}`, () => {
   test(
     'Perps add funds',
     { tag: '@mm-perps-engineering-team' },
diff --git a/tests/performance/login/perps-position-management.spec.ts b/tests/performance/login/perps-position-management.spec.ts
index e04159d5b39..2e0622a0893 100644
--- a/tests/performance/login/perps-position-management.spec.ts
+++ b/tests/performance/login/perps-position-management.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '../../framework/fixture';
 
 import TimerHelper from '../../framework/TimerHelper';
-import { PerformancePreps } from '../../tags.performance.js';
+import { Performance, PerformancePreps } from '../../tags.performance.js';
 import {
   loginToAppPlaywright,
   selectAccountByDevice,
@@ -21,7 +21,7 @@ import PlaywrightAssertions from '../../framework/PlaywrightAssertions';
 import { asPlaywrightElement } from '../../framework/EncapsulatedElement';
 
 /* Scenario 5: Perps onboarding + add funds 10 USD ARB.USDC + Open Position + Close Position */
-test.describe(PerformancePreps, () => {
+test.describe(`${Performance} ${PerformancePreps}`, () => {
   test(
     'Perps open position and close it',
     { tag: '@mm-perps-engineering-team' },
diff --git a/tests/performance/login/predict/predict-available-balance.spec.ts b/tests/performance/login/predict/predict-available-balance.spec.ts
index 0e44e0a7da0..3d23de4dbac 100644
--- a/tests/performance/login/predict/predict-available-balance.spec.ts
+++ b/tests/performance/login/predict/predict-available-balance.spec.ts
@@ -5,7 +5,7 @@ import { asPlaywrightElement, PlaywrightAssertions } from '../../../framework';
 import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
 import WalletActionsBottomSheet from '../../../page-objects/wallet/WalletActionsBottomSheet';
 import PredictMarketList from '../../../page-objects/Predict/PredictMarketList';
-import { PerformancePredict } from '../../../tags.performance.js';
+import { Performance, PerformancePredict } from '../../../tags.performance.js';
 
 /*
  * Scenario: Predict Available Balance Performance Test
@@ -21,7 +21,7 @@ import { PerformancePredict } from '../../../tags.performance.js';
  * 1. Time to navigate to Predict tab
  * 2. Time to verify available balance info is displayed
  */
-perfTest.describe(PerformancePredict, () => {
+perfTest.describe(`${Performance} ${PerformancePredict}`, () => {
   perfTest(
     'Predict Available Balance - Complete Flow Performance',
     { tag: '@team-predict' },
diff --git a/tests/performance/login/predict/predict-deposit.spec.ts b/tests/performance/login/predict/predict-deposit.spec.ts
index cbb84b92072..64720f868d1 100644
--- a/tests/performance/login/predict/predict-deposit.spec.ts
+++ b/tests/performance/login/predict/predict-deposit.spec.ts
@@ -6,7 +6,7 @@ import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
 import WalletActionsBottomSheet from '../../../page-objects/wallet/WalletActionsBottomSheet';
 import TransactionPayConfirmation from '../../../page-objects/Confirmation/TransactionPayConfirmation';
 import PredictMarketList from '../../../page-objects/Predict/PredictMarketList';
-import { PerformancePredict } from '../../../tags.performance.js';
+import { Performance, PerformancePredict } from '../../../tags.performance.js';
 
 /*
  * Scenario: Predict Deposit Performance Test
@@ -24,7 +24,7 @@ import { PerformancePredict } from '../../../tags.performance.js';
  * 4. Time to proceed to confirmation screen
  * 5. Time to verify deposit info (fees, amount) appears
  */
-perfTest.describe(PerformancePredict, () => {
+perfTest.describe(`${Performance} ${PerformancePredict}`, () => {
   perfTest(
     'Predict Deposit - Complete Flow Performance',
     { tag: '@team-predict' },
diff --git a/tests/performance/login/predict/predict-market-details.spec.ts b/tests/performance/login/predict/predict-market-details.spec.ts
index 4d4cdfa951b..7d28502496d 100644
--- a/tests/performance/login/predict/predict-market-details.spec.ts
+++ b/tests/performance/login/predict/predict-market-details.spec.ts
@@ -6,7 +6,7 @@ import TabBarComponent from '../../../page-objects/wallet/TabBarComponent';
 import WalletActionsBottomSheet from '../../../page-objects/wallet/WalletActionsBottomSheet';
 import PredictMarketList from '../../../page-objects/Predict/PredictMarketList';
 import PredictDetailsPage from '../../../page-objects/Predict/PredictDetailsPage';
-import { PerformancePredict } from '../../../tags.performance.js';
+import { Performance, PerformancePredict } from '../../../tags.performance.js';
 
 /*
  * Scenario: Predict Market Details Performance Test
@@ -23,7 +23,7 @@ import { PerformancePredict } from '../../../tags.performance.js';
  * 3. Time to open About tab content
  * 4. Time to open Outcomes tab content when available
  */
-perfTest.describe(PerformancePredict, () => {
+perfTest.describe(`${Performance} ${PerformancePredict}`, () => {
   perfTest.setTimeout(10 * 60 * 1000);
 
   perfTest(
diff --git a/tests/performance/login/uniswap-interaction.spec.js b/tests/performance/login/uniswap-interaction.spec.js
deleted file mode 100644
index 03e5d22bb15..00000000000
--- a/tests/performance/login/uniswap-interaction.spec.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import { test } from '../../framework/fixtures/performance/index.ts';
-import TimerHelper from '../../framework/TimerHelper.ts';
-
-import { login } from '../../framework/utils/Flows.js';
-import {
-  switchToMobileBrowser,
-  navigateToDapp,
-  launchMobileBrowser,
-} from '../../framework/utils/MobileBrowser.js';
-import WalletMainScreen from '../../../wdio/screen-objects/WalletMainScreen.js';
-import UniswapDapp from '../../../wdio/screen-objects/UniswapDapp.js';
-import AndroidScreenHelpers from '../../../wdio/screen-objects/Native/Android.js';
-import DappConnectionModal from '../../../wdio/screen-objects/Modals/DappConnectionModal.js';
-import AccountListComponent from '../../../wdio/screen-objects/AccountListComponent.js';
-import AppwrightHelpers from '../../framework/AppwrightHelpers.ts';
-import { unlockIfLockScreenVisible } from '../mm-connect/utils.js';
-import { PerformanceLogin } from '../../tags.performance.js';
-import AppwrightSelectors from '../../framework/AppwrightSelectors.ts';
-
-const UNISWAP_URL = 'https://app.uniswap.org';
-const UNISWAP_DAPP_NAME = 'Uniswap';
-
-// TODO(MMQA-1616): Re-enable after migrating this spec to tests/framework/fixture.
-
-test.describe(`${PerformanceLogin}`, () => {
-  test.setTimeout(240000);
-
-  test.skip(
-    'Connect to Uniswap dapp, edit accounts, choose another account, and skip Solana popup',
-    { tag: '@metamask-mobile-platform' },
-    async ({ device, performanceTracker }, testInfo) => {
-      WalletMainScreen.device = device;
-      UniswapDapp.device = device;
-      AndroidScreenHelpers.device = device;
-      DappConnectionModal.device = device;
-      AccountListComponent.device = device;
-
-      const metamaskTimer = new TimerHelper(
-        'Time since the user selects Metamask until Metamask app is opened',
-        { ios: 15000, android: 20000 },
-        device,
-      );
-
-      const connectTimer = new TimerHelper(
-        'Time since the user taps Connect in MetaMask until Uniswap is displayed',
-        { ios: 15000, android: 20000 },
-        device,
-      );
-      await login(device);
-      // 1. Login and navigate to Uniswap in the mobile browser
-      await AppwrightHelpers.withNativeAction(device, async () => {
-        await launchMobileBrowser(device);
-        await navigateToDapp(device, UNISWAP_URL, UNISWAP_DAPP_NAME);
-      });
-
-      // Wait for Uniswap to fully load before interacting
-      await new Promise((resolve) => setTimeout(resolve, 5000));
-
-      // 2. Tap Connect on Uniswap and select MetaMask from the wallet picker
-      if (AppwrightSelectors.isAndroid(device)) {
-        await AppwrightHelpers.withWebAction(
-          device,
-          async () => {
-            await UniswapDapp.connectWithMetaMask();
-          },
-          UNISWAP_URL,
-        );
-      } else {
-        await AppwrightHelpers.withNativeAction(device, async () => {
-          await UniswapDapp.connectIOS();
-          await new Promise((resolve) => setTimeout(resolve, 3000));
-          await UniswapDapp.selectWalletConnectOption();
-        });
-      }
-
-      // 3. Click MetaMask in native wallet picker.
-      await AppwrightHelpers.withNativeAction(device, async () => {
-        await UniswapDapp.tapOnMetaMaskWalletOptionAndOpenDeeplink();
-      });
-      metamaskTimer.start();
-      // 4. Handle MetaMask connection modal in native context:
-      //    - unlock if lock screen is shown
-      //    - edit account selection to pick a different account
-      //    - tap Connect (timer starts here)
-      await AppwrightHelpers.withNativeAction(device, async () => {
-        await unlockIfLockScreenVisible(device);
-        metamaskTimer.stop();
-        await DappConnectionModal.tapEditAccountsButton();
-        await DappConnectionModal.tapUpdateAccountsButton();
-
-        await DappConnectionModal.tapConnectButton();
-      });
-      connectTimer.start();
-      await switchToMobileBrowser(device);
-      await AppwrightHelpers.withNativeAction(device, async () => {
-        if (AppwrightSelectors.isAndroid(device)) {
-          // with the current framework we are limited with autoaccept alerts and on ios it clicks it before we can make the assertion
-          await UniswapDapp.isUniswapDisplayed();
-        }
-      });
-      connectTimer.stop();
-
-      performanceTracker.addTimers(metamaskTimer, connectTimer);
-    },
-  );
-});
diff --git a/tests/performance/login/uniswap-interaction.spec.ts b/tests/performance/login/uniswap-interaction.spec.ts
new file mode 100644
index 00000000000..abbdf3f6563
--- /dev/null
+++ b/tests/performance/login/uniswap-interaction.spec.ts
@@ -0,0 +1,94 @@
+import { test as perfTest } from '../../framework/fixture';
+import TimerHelper from '../../framework/TimerHelper';
+import UniswapDapp from '../../page-objects/MMConnect/UniswapDapp';
+import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal';
+import { unlockIfLockScreenVisible } from '../mm-connect/utils';
+import { PerformanceLogin } from '../../tags.performance.js';
+import { loginToAppPlaywright } from '../../flows/wallet.flow';
+import PlaywrightContextHelpers from '../../framework/PlaywrightContextHelpers';
+import {
+  launchMobileBrowser,
+  navigateToDapp,
+  switchToMobileBrowser,
+} from '../../flows/native-browser.flow';
+
+const UNISWAP_URL = 'https://app.uniswap.org';
+
+perfTest.describe(`${PerformanceLogin}`, () => {
+  perfTest.setTimeout(10 * 60 * 1000);
+
+  perfTest(
+    'Connect to Uniswap dapp, edit accounts, choose another account, and skip Solana popup',
+    { tag: '@metamask-mobile-platform' },
+    async ({ currentDeviceDetails, driver: _driver, performanceTracker }) => {
+      const { platform } = currentDeviceDetails;
+
+      const metamaskTimer = new TimerHelper(
+        'Time since the user selects Metamask until Metamask app is opened',
+        { ios: 15000, android: 20000 },
+        platform,
+      );
+
+      const connectTimer = new TimerHelper(
+        'Time since the user taps Connect in MetaMask until Uniswap is displayed',
+        { ios: 15000, android: 20000 },
+        platform,
+      );
+      await loginToAppPlaywright();
+
+      await PlaywrightContextHelpers.withNativeAction(async () => {
+        await launchMobileBrowser();
+        await navigateToDapp(UNISWAP_URL);
+      });
+
+      // Wait for Uniswap to fully load before interacting
+      await new Promise((resolve) => setTimeout(resolve, 5000));
+
+      if (platform === 'android') {
+        await PlaywrightContextHelpers.withWebAction(async () => {
+          await UniswapDapp.connectWithMetaMask();
+        }, UNISWAP_URL);
+      } else {
+        await PlaywrightContextHelpers.withNativeAction(async () => {
+          await UniswapDapp.connectIOS();
+          await UniswapDapp.selectWalletConnectOption();
+        });
+      }
+
+      // Android comes from a webAction so needs to be in native context
+      if (platform === 'android') {
+        await PlaywrightContextHelpers.withNativeAction(async () => {
+          await UniswapDapp.tapOnMetaMaskWalletOptionAndOpenDeeplink();
+        });
+      } else {
+        // iOS comes from a nativeAction so no need to change context
+        await UniswapDapp.tapOnMetaMaskWalletOptionAndOpenDeeplink();
+      }
+
+      metamaskTimer.start();
+
+      // Still on Native Context
+      await unlockIfLockScreenVisible();
+      metamaskTimer.stop();
+      await DappConnectionModal.tapEditAccountsButton();
+      await DappConnectionModal.tapUpdateAccountsButton();
+
+      await DappConnectionModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
+
+      connectTimer.start();
+
+      await switchToMobileBrowser();
+
+      if (platform === 'android') {
+        await UniswapDapp.isUniswapDisplayed();
+      }
+
+      connectTimer.stop();
+
+      performanceTracker.addTimers(metamaskTimer, connectTimer);
+    },
+  );
+});
diff --git a/tests/performance/mm-connect/connection-evm-account.spec.ts b/tests/performance/mm-connect/connection-evm-account.spec.ts
index 960106682a0..c7747a5abd4 100644
--- a/tests/performance/mm-connect/connection-evm-account.spec.ts
+++ b/tests/performance/mm-connect/connection-evm-account.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import WalletView from '../../page-objects/wallet/WalletView';
@@ -38,151 +39,153 @@ const playgroundServer = new DappServer({
   dappVariant: DappVariants.BROWSER_PLAYGROUND,
 });
 
-test.beforeAll(async () => {
-  playgroundServer.setServerPort(DAPP_PORT);
-  await playgroundServer.start();
-  await waitForDappServerReady(DAPP_PORT);
-  setupAdbReverse(DAPP_PORT);
-});
-
-test.afterAll(async () => {
-  cleanupAdbReverse(DAPP_PORT);
-  await playgroundServer.stop();
-});
-
-// Test steps (in order):
-//
-// 1. LOGIN AND NAVIGATE TO DAPP
-//    - Login to app, ensure account groups finished loading
-//    - Launch mobile browser and navigate to the playground dapp
-//
-// 2. CONNECT VIA LEGACY EVM (WITH ACCOUNT 3 ADDED)
-//    - Tap Connect (Legacy)
-//    - In MetaMask: tap Edit Accounts, add Account 3, tap Update, tap Connect (cooldown 2s)
-//      Account 3 must be authorized so MetaMask can switch to it later
-//    - Assert: connected true, chainId '0x1', active account is Account 1
-//      (0x19a7Ad8256ab119655f1D758348501d598fC1C94)
-//
-// 3. SWITCH TO ACCOUNT 3 IN METAMASK
-//    - In MetaMask: tap identicon → select Account 3 from the account list
-//    - Assert: dapp reflects Account 3 as the active account
-//      (0xE2bEca5CaDC60b61368987728b4229822e6CDa83)
-//
-// 4. REFRESH BROWSER AND VERIFY ACCOUNT PERSISTS
-//    - Refresh mobile browser (native action)
-//    - Assert: connected true, chainId '0x1', active account is still Account 3
-//      (0xE2bEca5CaDC60b61368987728b4229822e6CDa83)
-//
-// 5. PERSONAL SIGN TO VERIFY WALLET-SIDE ACCOUNT
-//    - Tap personal sign
-//    - In MetaMask: tap Cancel (cooldown 2s)
-//      Canceling verifies Account 3 appears as the signer in the modal (wallet-side check)
-//    - Assert: response value 'rejected'
-//
-// 6. CLEANUP
-//    - Tap disconnect to reset dapp state
-
-test('@metamask/connect-evm - Account switching and wallet-side verification', async ({
-  currentDeviceDetails,
-  driver,
-}) => {
-  const platform = currentDeviceDetails.platform;
-  const useBrowserStackLocal =
-    process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
-  const DAPP_URL = useBrowserStackLocal
-    ? `http://bs-local.com:${DAPP_PORT}`
-    : getDappUrlForBrowser(platform);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await loginToAppPlaywright();
-    await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
-    await launchMobileBrowser();
-    await navigateToDapp(DAPP_URL);
-  });
-  await sleep(5000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapConnectLegacy();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await unlockIfLockScreenVisible();
-    await DappConnectionModal.tapEditAccountsButton();
-    await DappConnectionModal.tapAccountButton('Account 3');
-    await DappConnectionModal.tapUpdateAccountsButton();
-    await DappConnectionModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
-    });
+test.describe(Performance, () => {
+  test.beforeAll(async () => {
+    playgroundServer.setServerPort(DAPP_PORT);
+    await playgroundServer.start();
+    await waitForDappServerReady(DAPP_PORT);
+    setupAdbReverse(DAPP_PORT);
   });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+  test.afterAll(async () => {
+    cleanupAdbReverse(DAPP_PORT);
+    await playgroundServer.stop();
+  });
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertChainIdValue('0x1');
-    await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_ADDRESS);
-  }, DAPP_URL);
+  // Test steps (in order):
+  //
+  // 1. LOGIN AND NAVIGATE TO DAPP
+  //    - Login to app, ensure account groups finished loading
+  //    - Launch mobile browser and navigate to the playground dapp
+  //
+  // 2. CONNECT VIA LEGACY EVM (WITH ACCOUNT 3 ADDED)
+  //    - Tap Connect (Legacy)
+  //    - In MetaMask: tap Edit Accounts, add Account 3, tap Update, tap Connect (cooldown 2s)
+  //      Account 3 must be authorized so MetaMask can switch to it later
+  //    - Assert: connected true, chainId '0x1', active account is Account 1
+  //      (0x19a7Ad8256ab119655f1D758348501d598fC1C94)
+  //
+  // 3. SWITCH TO ACCOUNT 3 IN METAMASK
+  //    - In MetaMask: tap identicon → select Account 3 from the account list
+  //    - Assert: dapp reflects Account 3 as the active account
+  //      (0xE2bEca5CaDC60b61368987728b4229822e6CDa83)
+  //
+  // 4. REFRESH BROWSER AND VERIFY ACCOUNT PERSISTS
+  //    - Refresh mobile browser (native action)
+  //    - Assert: connected true, chainId '0x1', active account is still Account 3
+  //      (0xE2bEca5CaDC60b61368987728b4229822e6CDa83)
+  //
+  // 5. PERSONAL SIGN TO VERIFY WALLET-SIDE ACCOUNT
+  //    - Tap personal sign
+  //    - In MetaMask: tap Cancel (cooldown 2s)
+  //      Canceling verifies Account 3 appears as the signer in the modal (wallet-side check)
+  //    - Assert: response value 'rejected'
+  //
+  // 6. CLEANUP
+  //    - Tap disconnect to reset dapp state
+
+  test('@metamask/connect-evm - Account switching and wallet-side verification', async ({
+    currentDeviceDetails,
+    driver,
+  }) => {
+    const platform = currentDeviceDetails.platform;
+    const useBrowserStackLocal =
+      process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
+    const DAPP_URL = useBrowserStackLocal
+      ? `http://bs-local.com:${DAPP_PORT}`
+      : getDappUrlForBrowser(platform);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await loginToAppPlaywright();
+      await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
+      await launchMobileBrowser();
+      await navigateToDapp(DAPP_URL);
+    });
+    await sleep(5000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapConnectLegacy();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await unlockIfLockScreenVisible();
+      await DappConnectionModal.tapEditAccountsButton();
+      await DappConnectionModal.tapAccountButton('Account 3');
+      await DappConnectionModal.tapUpdateAccountsButton();
+      await DappConnectionModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
+    });
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    // Wait here to make sure UI is visible before attempted interaction
     await sleep(1000);
-    // We're only using Android for now
-    await PlaywrightUtilities.launchApp({
-      packageName: APP_PACKAGE_IDS.ANDROID,
-    });
-    await unlockIfLockScreenVisible();
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-    // Change selected account to Account 3 in MetaMask
-    await WalletView.tapIdenticon();
-    await AccountListBottomSheet.tapAccountByName('Account 3');
-  });
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertChainIdValue('0x1');
+      await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_ADDRESS);
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      // Wait here to make sure UI is visible before attempted interaction
+      await sleep(1000);
+      // We're only using Android for now
+      await PlaywrightUtilities.launchApp({
+        packageName: APP_PACKAGE_IDS.ANDROID,
+      });
+      await unlockIfLockScreenVisible();
+
+      // Change selected account to Account 3 in MetaMask
+      await WalletView.tapIdenticon();
+      await AccountListBottomSheet.tapAccountByName('Account 3');
+    });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    // Verify account changed to Account 3
-    await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_3_ADDRESS);
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      // Verify account changed to Account 3
+      await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_3_ADDRESS);
+    }, DAPP_URL);
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await refreshMobileBrowser();
-  });
-  await sleep(2000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertChainIdValue('0x1');
-    await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_3_ADDRESS);
-    await BrowserPlaygroundDapp.tapPersonalSign();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.tapCancelButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await refreshMobileBrowser();
+    });
+    await sleep(2000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertChainIdValue('0x1');
+      await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_3_ADDRESS);
+      await BrowserPlaygroundDapp.tapPersonalSign();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.tapCancelButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertResponseValue('rejected');
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertResponseValue('rejected');
+    }, DAPP_URL);
 
-  //
-  // Reset dapp state
-  //
+    //
+    // Reset dapp state
+    //
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-  }, DAPP_URL);
-});
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+    }, DAPP_URL);
+  });
+}); // end describe
diff --git a/tests/performance/mm-connect/connection-evm-rejection.spec.ts b/tests/performance/mm-connect/connection-evm-rejection.spec.ts
index eab3bcae747..22a6014a1df 100644
--- a/tests/performance/mm-connect/connection-evm-rejection.spec.ts
+++ b/tests/performance/mm-connect/connection-evm-rejection.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp';
@@ -32,197 +33,199 @@ const playgroundServer = new DappServer({
   dappVariant: DappVariants.BROWSER_PLAYGROUND,
 });
 
-test.beforeAll(async () => {
-  playgroundServer.setServerPort(DAPP_PORT);
-  await playgroundServer.start();
-  await waitForDappServerReady(DAPP_PORT);
-  setupAdbReverse(DAPP_PORT);
-});
-
-test.afterAll(async () => {
-  cleanupAdbReverse(DAPP_PORT);
-  await playgroundServer.stop();
-});
-
-// Test steps (in order):
-//
-// 1. LOGIN AND NAVIGATE TO DAPP
-//    - Login to app, ensure account groups finished loading
-//    - Launch mobile browser and navigate to the playground dapp
-//
-// 2. CONNECT VIA LEGACY EVM
-//    - Tap Connect (Legacy)
-//    - In MetaMask: tap Connect (cooldown 2s)
-//    - Assert: connected true, chainId '0x1', active account is Account 1
-//      (0x19a7Ad8256ab119655f1D758348501d598fC1C94)
-//
-// 3. INITIAL REJECTION
-//    - Tap personal sign
-//    - In MetaMask: tap Cancel (cooldown 2s)
-//    - Assert: response value 'rejected'
-//
-// 4. DISCONNECT AND RECONNECT — FIRST CYCLE
-//    - Disconnect, assert connected false, tap Connect (Legacy)
-//    - In MetaMask: tap Connect (cooldown 2s)
-//    - Assert: connected true, chainId '0x1', active account is Account 1
-//    - Tap personal sign; tap Cancel in MetaMask (cooldown 2s)
-//    - Assert: response value 'rejected'
-//
-// 5. DISCONNECT AND RECONNECT — SECOND CYCLE
-//    - Disconnect (no connected false assertion), tap Connect (Legacy)
-//    - In MetaMask: tap Connect (cooldown 2s)
-//    - Assert: connected true, chainId '0x1', active account is Account 1
-//    - Tap personal sign; tap Cancel in MetaMask (cooldown 2s)
-//    - Assert: response value 'rejected'
-//
-// 6. CLEANUP
-//    - Tap disconnect to reset dapp state
-
-test('@metamask/connect-evm - Rejection response value verification', async ({
-  currentDeviceDetails,
-  driver,
-}) => {
-  const platform = currentDeviceDetails.platform;
-  const useBrowserStackLocal =
-    process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
-  const DAPP_URL = useBrowserStackLocal
-    ? `http://bs-local.com:${DAPP_PORT}`
-    : getDappUrlForBrowser(platform);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await loginToAppPlaywright();
-    await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
-    await launchMobileBrowser();
-    await navigateToDapp(DAPP_URL);
-  });
-  await sleep(5000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapConnectLegacy();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await unlockIfLockScreenVisible();
-    await DappConnectionModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
-    });
+test.describe(Performance, () => {
+  test.beforeAll(async () => {
+    playgroundServer.setServerPort(DAPP_PORT);
+    await playgroundServer.start();
+    await waitForDappServerReady(DAPP_PORT);
+    setupAdbReverse(DAPP_PORT);
   });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertChainIdValue('0x1');
-    await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_ADDRESS);
-    await BrowserPlaygroundDapp.tapPersonalSign();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.tapCancelButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
-    });
+  test.afterAll(async () => {
+    cleanupAdbReverse(DAPP_PORT);
+    await playgroundServer.stop();
   });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertResponseValue('rejected');
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-    await BrowserPlaygroundDapp.assertConnected(false);
-    await BrowserPlaygroundDapp.tapConnectLegacy();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await DappConnectionModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+  // Test steps (in order):
+  //
+  // 1. LOGIN AND NAVIGATE TO DAPP
+  //    - Login to app, ensure account groups finished loading
+  //    - Launch mobile browser and navigate to the playground dapp
+  //
+  // 2. CONNECT VIA LEGACY EVM
+  //    - Tap Connect (Legacy)
+  //    - In MetaMask: tap Connect (cooldown 2s)
+  //    - Assert: connected true, chainId '0x1', active account is Account 1
+  //      (0x19a7Ad8256ab119655f1D758348501d598fC1C94)
+  //
+  // 3. INITIAL REJECTION
+  //    - Tap personal sign
+  //    - In MetaMask: tap Cancel (cooldown 2s)
+  //    - Assert: response value 'rejected'
+  //
+  // 4. DISCONNECT AND RECONNECT — FIRST CYCLE
+  //    - Disconnect, assert connected false, tap Connect (Legacy)
+  //    - In MetaMask: tap Connect (cooldown 2s)
+  //    - Assert: connected true, chainId '0x1', active account is Account 1
+  //    - Tap personal sign; tap Cancel in MetaMask (cooldown 2s)
+  //    - Assert: response value 'rejected'
+  //
+  // 5. DISCONNECT AND RECONNECT — SECOND CYCLE
+  //    - Disconnect (no connected false assertion), tap Connect (Legacy)
+  //    - In MetaMask: tap Connect (cooldown 2s)
+  //    - Assert: connected true, chainId '0x1', active account is Account 1
+  //    - Tap personal sign; tap Cancel in MetaMask (cooldown 2s)
+  //    - Assert: response value 'rejected'
+  //
+  // 6. CLEANUP
+  //    - Tap disconnect to reset dapp state
+
+  test('@metamask/connect-evm - Rejection response value verification', async ({
+    currentDeviceDetails,
+    driver,
+  }) => {
+    const platform = currentDeviceDetails.platform;
+    const useBrowserStackLocal =
+      process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
+    const DAPP_URL = useBrowserStackLocal
+      ? `http://bs-local.com:${DAPP_PORT}`
+      : getDappUrlForBrowser(platform);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await loginToAppPlaywright();
+      await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
+      await launchMobileBrowser();
+      await navigateToDapp(DAPP_URL);
     });
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertChainIdValue('0x1');
-    await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_ADDRESS);
-    await BrowserPlaygroundDapp.tapPersonalSign();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.tapCancelButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await sleep(5000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapConnectLegacy();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await unlockIfLockScreenVisible();
+      await DappConnectionModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertChainIdValue('0x1');
+      await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_ADDRESS);
+      await BrowserPlaygroundDapp.tapPersonalSign();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.tapCancelButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
+    });
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertResponseValue('rejected');
-  }, DAPP_URL);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertResponseValue('rejected');
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+      await BrowserPlaygroundDapp.assertConnected(false);
+      await BrowserPlaygroundDapp.tapConnectLegacy();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await DappConnectionModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
+    });
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-    await BrowserPlaygroundDapp.tapConnectLegacy();
-  }, DAPP_URL);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertChainIdValue('0x1');
+      await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_ADDRESS);
+      await BrowserPlaygroundDapp.tapPersonalSign();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.tapCancelButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
+    });
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await DappConnectionModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertResponseValue('rejected');
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+      await BrowserPlaygroundDapp.tapConnectLegacy();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await DappConnectionModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertChainIdValue('0x1');
-    await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_ADDRESS);
-    await BrowserPlaygroundDapp.tapPersonalSign();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.tapCancelButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertChainIdValue('0x1');
+      await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_ADDRESS);
+      await BrowserPlaygroundDapp.tapPersonalSign();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.tapCancelButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertResponseValue('rejected');
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertResponseValue('rejected');
+    }, DAPP_URL);
 
-  //
-  // Reset dapp state
-  //
+    //
+    // Reset dapp state
+    //
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-  }, DAPP_URL);
-});
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+    }, DAPP_URL);
+  });
+}); // end describe
diff --git a/tests/performance/mm-connect/connection-evm-session-timeout.spec.ts b/tests/performance/mm-connect/connection-evm-session-timeout.spec.ts
index 52c8d803ecc..b66b9169904 100644
--- a/tests/performance/mm-connect/connection-evm-session-timeout.spec.ts
+++ b/tests/performance/mm-connect/connection-evm-session-timeout.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp';
@@ -35,158 +36,160 @@ const playgroundServer = new DappServer({
   dappVariant: DappVariants.BROWSER_PLAYGROUND,
 });
 
-test.beforeAll(async () => {
-  playgroundServer.setServerPort(DAPP_PORT);
-  await playgroundServer.start();
-  await waitForDappServerReady(DAPP_PORT);
-  setupAdbReverse(DAPP_PORT);
-});
-
-test.afterAll(async () => {
-  cleanupAdbReverse(DAPP_PORT);
-  await playgroundServer.stop();
-});
-
-// Test steps (in order):
-//
-// 1. LOGIN AND NAVIGATE TO DAPP
-//    - Login to app, ensure account groups finished loading
-//    - Launch mobile browser and navigate to the playground dapp
-//
-// 2. CONNECT VIA LEGACY EVM
-//    - Tap Connect (Legacy)
-//    - In MetaMask: tap Connect (cooldown 2s)
-//    - Assert: connected true, chainId '0x1'
-//
-// 3. INCOMPLETE SESSION — NOT INTERACTING WITH MODAL
-//    - Tap disconnect, then tap Connect (Legacy) again
-//    - In MetaMask: open approval modal but purposely do NOT interact (sleep 2s)
-//    - Switch to browser (sleep 2s), refresh mobile browser, wait 2s
-//    - Assert: connected false (incomplete session started timing out)
-//    - Sleep 10s to let session fully time out
-//    - Assert: still connected false
-//
-// 4. RECONNECT AFTER SESSION TIMEOUT
-//    - Tap Connect (Legacy)
-//    - In MetaMask: tap Connect (cooldown 2s)
-//    - Assert: connected true, chainId '0x1'
-//
-// 5. READ-ONLY METHOD WITH APP TERMINATED
-//    - Terminate the MetaMask app (PlaywrightGestures.terminateApp)
-//    - Tap getBalance in the dapp; sleep 10s for RPC response
-//    - Assert: response value contains 'Balance:' prefix
-//      (confirms read-only calls go directly to the RPC endpoint, not the wallet)
-//
-// 6. CLEANUP
-//    - Tap disconnect to reset dapp state
-
-// This test is currently being skipped as the mobile app displays a double prompt.
-test.skip('@metamask/connect-evm - Incomplete session timeout and read-only methods', async ({
-  currentDeviceDetails,
-  driver,
-}) => {
-  const platform = currentDeviceDetails.platform;
-  const useBrowserStackLocal =
-    process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
-  const DAPP_URL = useBrowserStackLocal
-    ? `http://bs-local.com:${DAPP_PORT}`
-    : getDappUrlForBrowser(platform);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await loginToAppPlaywright();
-    await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
-    await launchMobileBrowser();
-    await navigateToDapp(DAPP_URL);
+test.describe(Performance, () => {
+  test.beforeAll(async () => {
+    playgroundServer.setServerPort(DAPP_PORT);
+    await playgroundServer.start();
+    await waitForDappServerReady(DAPP_PORT);
+    setupAdbReverse(DAPP_PORT);
   });
-  await sleep(5000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapConnectLegacy();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await unlockIfLockScreenVisible();
-    await DappConnectionModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
-    });
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertChainIdValue('0x1');
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-    await BrowserPlaygroundDapp.tapConnectLegacy();
-  }, DAPP_URL);
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    // Purposely not interacting with the approval but we still spend some time
-    // on the app
-    await sleep(2000);
-  });
-
-  await sleep(2000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await refreshMobileBrowser();
+  test.afterAll(async () => {
+    cleanupAdbReverse(DAPP_PORT);
+    await playgroundServer.stop();
   });
-  await sleep(2000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertConnected(false);
-  }, DAPP_URL);
+  // Test steps (in order):
+  //
+  // 1. LOGIN AND NAVIGATE TO DAPP
+  //    - Login to app, ensure account groups finished loading
+  //    - Launch mobile browser and navigate to the playground dapp
+  //
+  // 2. CONNECT VIA LEGACY EVM
+  //    - Tap Connect (Legacy)
+  //    - In MetaMask: tap Connect (cooldown 2s)
+  //    - Assert: connected true, chainId '0x1'
+  //
+  // 3. INCOMPLETE SESSION — NOT INTERACTING WITH MODAL
+  //    - Tap disconnect, then tap Connect (Legacy) again
+  //    - In MetaMask: open approval modal but purposely do NOT interact (sleep 2s)
+  //    - Switch to browser (sleep 2s), refresh mobile browser, wait 2s
+  //    - Assert: connected false (incomplete session started timing out)
+  //    - Sleep 10s to let session fully time out
+  //    - Assert: still connected false
+  //
+  // 4. RECONNECT AFTER SESSION TIMEOUT
+  //    - Tap Connect (Legacy)
+  //    - In MetaMask: tap Connect (cooldown 2s)
+  //    - Assert: connected true, chainId '0x1'
+  //
+  // 5. READ-ONLY METHOD WITH APP TERMINATED
+  //    - Terminate the MetaMask app (PlaywrightGestures.terminateApp)
+  //    - Tap getBalance in the dapp; sleep 10s for RPC response
+  //    - Assert: response value contains 'Balance:' prefix
+  //      (confirms read-only calls go directly to the RPC endpoint, not the wallet)
+  //
+  // 6. CLEANUP
+  //    - Tap disconnect to reset dapp state
+
+  // This test is currently being skipped as the mobile app displays a double prompt.
+  test.skip('@metamask/connect-evm - Incomplete session timeout and read-only methods', async ({
+    currentDeviceDetails,
+    driver,
+  }) => {
+    const platform = currentDeviceDetails.platform;
+    const useBrowserStackLocal =
+      process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
+    const DAPP_URL = useBrowserStackLocal
+      ? `http://bs-local.com:${DAPP_PORT}`
+      : getDappUrlForBrowser(platform);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await loginToAppPlaywright();
+      await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
+      await launchMobileBrowser();
+      await navigateToDapp(DAPP_URL);
+    });
+    await sleep(5000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapConnectLegacy();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await unlockIfLockScreenVisible();
+      await DappConnectionModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
+    });
 
-  await sleep(10000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertChainIdValue('0x1');
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+      await BrowserPlaygroundDapp.tapConnectLegacy();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      // Purposely not interacting with the approval but we still spend some time
+      // on the app
+      await sleep(2000);
+    });
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertConnected(false);
-    await BrowserPlaygroundDapp.tapConnectLegacy();
-  }, DAPP_URL);
+    await sleep(2000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await DappConnectionModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await refreshMobileBrowser();
     });
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(2000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertChainIdValue('0x1');
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertConnected(false);
+    }, DAPP_URL);
 
-  //
-  // Read-only method should hit rpc endpoint instead of wallet
-  //
-  await PlaywrightGestures.terminateApp(currentDeviceDetails);
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapGetBalance();
     await sleep(10000);
-    // Balance response should contain "Balance:" prefix
-    await BrowserPlaygroundDapp.assertResponseValue('Balance:');
-  }, DAPP_URL);
 
-  //
-  // Reset dapp state
-  //
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertConnected(false);
+      await BrowserPlaygroundDapp.tapConnectLegacy();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await DappConnectionModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
+    });
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-  }, DAPP_URL);
-});
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertChainIdValue('0x1');
+    }, DAPP_URL);
+
+    //
+    // Read-only method should hit rpc endpoint instead of wallet
+    //
+    await PlaywrightGestures.terminateApp(currentDeviceDetails);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapGetBalance();
+      await sleep(10000);
+      // Balance response should contain "Balance:" prefix
+      await BrowserPlaygroundDapp.assertResponseValue('Balance:');
+    }, DAPP_URL);
+
+    //
+    // Reset dapp state
+    //
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+    }, DAPP_URL);
+  });
+}); // end describe
diff --git a/tests/performance/mm-connect/connection-evm-sign.spec.ts b/tests/performance/mm-connect/connection-evm-sign.spec.ts
index 2f5a098e558..81d98dd8c23 100644
--- a/tests/performance/mm-connect/connection-evm-sign.spec.ts
+++ b/tests/performance/mm-connect/connection-evm-sign.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp';
@@ -33,197 +34,199 @@ const playgroundServer = new DappServer({
   dappVariant: DappVariants.BROWSER_PLAYGROUND,
 });
 
-test.beforeAll(async () => {
-  playgroundServer.setServerPort(DAPP_PORT);
-  await playgroundServer.start();
-  await waitForDappServerReady(DAPP_PORT);
-  setupAdbReverse(DAPP_PORT);
-});
-
-test.afterAll(async () => {
-  cleanupAdbReverse(DAPP_PORT);
-  await playgroundServer.stop();
-});
+test.describe(Performance, () => {
+  test.beforeAll(async () => {
+    playgroundServer.setServerPort(DAPP_PORT);
+    await playgroundServer.start();
+    await waitForDappServerReady(DAPP_PORT);
+    setupAdbReverse(DAPP_PORT);
+  });
 
-// Test steps (in order):
-//
-// 1. LOGIN AND NAVIGATE TO DAPP
-//    - Login to app, ensure account groups finished loading
-//    - Launch mobile browser and navigate to the playground dapp
-//
-// 2. CONNECT VIA LEGACY EVM (WITH ACCOUNT 3)
-//    - Tap Connect (Legacy)
-//    - In MetaMask: tap Edit Accounts, add Account 3, tap Update, tap Connect (cooldown 2s)
-//    - Assert: connected true, chainId '0x1', active account is Account 1
-//      (0x19a7Ad8256ab119655f1D758348501d598fC1C94)
-//
-// 3. SIGN MESSAGE ON ETHEREUM — CONFIRM
-//    - Tap personal sign
-//    - In MetaMask: tap Confirm (cooldown 2s)
-//    - Assert: response value matches Account 1 signature hash
-//      (0x361c13288b4ab02d50974efddf9e4e7ca651b81c298b614be908c4754abb1dd8
-//       328224645a1a8d0fab561c4b855c7bdcebea15db5ae8d1778a1ea791dbd05c2a1b)
-//
-// 4. SEND TRANSACTION ON ETHEREUM — CANCEL
-//    - Tap send transaction
-//    - In MetaMask: assert network text 'Ethereum', tap Cancel (cooldown 2s)
-//    - Assert: response value 'denied'
-//
-// 5. SWITCH TO POLYGON AND SEND TRANSACTION — CANCEL
-//    - Assert response 'denied', tap switch to Polygon
-//    - In MetaMask: assert network text 'Polygon', tap Confirm chain switch (cooldown 2s)
-//    - Assert: chainId '0x89'
-//    - Tap send transaction
-//    - In MetaMask: assert network text 'Polygon', tap Cancel (cooldown 2s)
-//
-// 6. SWITCH TO MAINNET AND SEND TRANSACTION — CANCEL
-//    - Tap switch to Mainnet, assert chainId '0x1'
-//    - Tap send transaction
-//    - In MetaMask: assert network text 'Ethereum', tap Cancel (cooldown 2s)
-//
-// 7. CLEANUP
-//    - Tap disconnect to reset dapp state
-
-test('@metamask/connect-evm - Sign and transaction cancel flows', async ({
-  currentDeviceDetails,
-  driver,
-}) => {
-  const platform = currentDeviceDetails.platform;
-  const useBrowserStackLocal =
-    process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
-  const DAPP_URL = useBrowserStackLocal
-    ? `http://bs-local.com:${DAPP_PORT}`
-    : getDappUrlForBrowser(platform);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await loginToAppPlaywright();
-    await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
-    await launchMobileBrowser();
-    await navigateToDapp(DAPP_URL);
+  test.afterAll(async () => {
+    cleanupAdbReverse(DAPP_PORT);
+    await playgroundServer.stop();
   });
-  await sleep(5000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapConnectLegacy();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await unlockIfLockScreenVisible();
-    await DappConnectionModal.tapEditAccountsButton();
-    await DappConnectionModal.tapAccountButton('Account 3');
-    await DappConnectionModal.tapUpdateAccountsButton();
-    await DappConnectionModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+
+  // Test steps (in order):
+  //
+  // 1. LOGIN AND NAVIGATE TO DAPP
+  //    - Login to app, ensure account groups finished loading
+  //    - Launch mobile browser and navigate to the playground dapp
+  //
+  // 2. CONNECT VIA LEGACY EVM (WITH ACCOUNT 3)
+  //    - Tap Connect (Legacy)
+  //    - In MetaMask: tap Edit Accounts, add Account 3, tap Update, tap Connect (cooldown 2s)
+  //    - Assert: connected true, chainId '0x1', active account is Account 1
+  //      (0x19a7Ad8256ab119655f1D758348501d598fC1C94)
+  //
+  // 3. SIGN MESSAGE ON ETHEREUM — CONFIRM
+  //    - Tap personal sign
+  //    - In MetaMask: tap Confirm (cooldown 2s)
+  //    - Assert: response value matches Account 1 signature hash
+  //      (0x361c13288b4ab02d50974efddf9e4e7ca651b81c298b614be908c4754abb1dd8
+  //       328224645a1a8d0fab561c4b855c7bdcebea15db5ae8d1778a1ea791dbd05c2a1b)
+  //
+  // 4. SEND TRANSACTION ON ETHEREUM — CANCEL
+  //    - Tap send transaction
+  //    - In MetaMask: assert network text 'Ethereum', tap Cancel (cooldown 2s)
+  //    - Assert: response value 'denied'
+  //
+  // 5. SWITCH TO POLYGON AND SEND TRANSACTION — CANCEL
+  //    - Assert response 'denied', tap switch to Polygon
+  //    - In MetaMask: assert network text 'Polygon', tap Confirm chain switch (cooldown 2s)
+  //    - Assert: chainId '0x89'
+  //    - Tap send transaction
+  //    - In MetaMask: assert network text 'Polygon', tap Cancel (cooldown 2s)
+  //
+  // 6. SWITCH TO MAINNET AND SEND TRANSACTION — CANCEL
+  //    - Tap switch to Mainnet, assert chainId '0x1'
+  //    - Tap send transaction
+  //    - In MetaMask: assert network text 'Ethereum', tap Cancel (cooldown 2s)
+  //
+  // 7. CLEANUP
+  //    - Tap disconnect to reset dapp state
+
+  test('@metamask/connect-evm - Sign and transaction cancel flows', async ({
+    currentDeviceDetails,
+    driver,
+  }) => {
+    const platform = currentDeviceDetails.platform;
+    const useBrowserStackLocal =
+      process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
+    const DAPP_URL = useBrowserStackLocal
+      ? `http://bs-local.com:${DAPP_PORT}`
+      : getDappUrlForBrowser(platform);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await loginToAppPlaywright();
+      await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
+      await launchMobileBrowser();
+      await navigateToDapp(DAPP_URL);
+    });
+    await sleep(5000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapConnectLegacy();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await unlockIfLockScreenVisible();
+      await DappConnectionModal.tapEditAccountsButton();
+      await DappConnectionModal.tapAccountButton('Account 3');
+      await DappConnectionModal.tapUpdateAccountsButton();
+      await DappConnectionModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertChainIdValue('0x1');
-    await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_ADDRESS);
-    await BrowserPlaygroundDapp.tapPersonalSign();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.tapConfirmButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertChainIdValue('0x1');
+      await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_ADDRESS);
+      await BrowserPlaygroundDapp.tapPersonalSign();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.tapConfirmButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertResponseValue(
-      // Account 1 signed the message
-      '0x361c13288b4ab02d50974efddf9e4e7ca651b81c298b614be908c4754abb1dd8328224645a1a8d0fab561c4b855c7bdcebea15db5ae8d1778a1ea791dbd05c2a1b',
-    );
-    await BrowserPlaygroundDapp.tapSendTransaction();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.assertNetworkText('Ethereum');
-    await SignModal.tapCancelButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertResponseValue(
+        // Account 1 signed the message
+        '0x361c13288b4ab02d50974efddf9e4e7ca651b81c298b614be908c4754abb1dd8328224645a1a8d0fab561c4b855c7bdcebea15db5ae8d1778a1ea791dbd05c2a1b',
+      );
+      await BrowserPlaygroundDapp.tapSendTransaction();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.assertNetworkText('Ethereum');
+      await SignModal.tapCancelButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    // Note: Error message may differ slightly in browser playground
-    await BrowserPlaygroundDapp.assertResponseValue('denied');
-    await BrowserPlaygroundDapp.tapSwitchToPolygon();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SwitchChainModal.assertNetworkText('Polygon');
-    await SwitchChainModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      // Note: Error message may differ slightly in browser playground
+      await BrowserPlaygroundDapp.assertResponseValue('denied');
+      await BrowserPlaygroundDapp.tapSwitchToPolygon();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SwitchChainModal.assertNetworkText('Polygon');
+      await SwitchChainModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertChainIdValue('0x89');
-    await BrowserPlaygroundDapp.tapSendTransaction();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.assertNetworkText('Polygon');
-    await SignModal.tapCancelButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertChainIdValue('0x89');
+      await BrowserPlaygroundDapp.tapSendTransaction();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.assertNetworkText('Polygon');
+      await SignModal.tapCancelButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapSwitchToMainnet();
-    await BrowserPlaygroundDapp.assertChainIdValue('0x1');
-    await BrowserPlaygroundDapp.tapSendTransaction();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.assertNetworkText('Ethereum');
-    await SignModal.tapCancelButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapSwitchToMainnet();
+      await BrowserPlaygroundDapp.assertChainIdValue('0x1');
+      await BrowserPlaygroundDapp.tapSendTransaction();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.assertNetworkText('Ethereum');
+      await SignModal.tapCancelButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  //
-  // Reset dapp state
-  //
+    //
+    // Reset dapp state
+    //
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-  }, DAPP_URL);
-});
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+    }, DAPP_URL);
+  });
+}); // end describe
diff --git a/tests/performance/mm-connect/connection-multichain.spec.ts b/tests/performance/mm-connect/connection-multichain.spec.ts
index cc3971c759a..86869e11af0 100644
--- a/tests/performance/mm-connect/connection-multichain.spec.ts
+++ b/tests/performance/mm-connect/connection-multichain.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 import TimerHelper from '../../framework/TimerHelper';
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp';
@@ -35,76 +36,80 @@ const playgroundServer = new DappServer({
   dappVariant: DappVariants.BROWSER_PLAYGROUND,
 });
 
-// Start local playground server before all tests
-test.beforeAll(async () => {
-  playgroundServer.setServerPort(DAPP_PORT);
-  await playgroundServer.start();
-  await waitForDappServerReady(DAPP_PORT);
-  setupAdbReverse(DAPP_PORT);
-});
+test.describe(Performance, () => {
+  // Start local playground server before all tests
+  test.beforeAll(async () => {
+    playgroundServer.setServerPort(DAPP_PORT);
+    await playgroundServer.start();
+    await waitForDappServerReady(DAPP_PORT);
+    setupAdbReverse(DAPP_PORT);
+  });
 
-// Stop local playground server after all tests
-test.afterAll(async () => {
-  cleanupAdbReverse(DAPP_PORT);
-  await playgroundServer.stop();
-});
+  // Stop local playground server after all tests
+  test.afterAll(async () => {
+    cleanupAdbReverse(DAPP_PORT);
+    await playgroundServer.stop();
+  });
 
-test('@metamask/connect-multichain - Connect via Multichain API to Local Browser Playground', async ({
-  currentDeviceDetails,
-  driver,
-}) => {
-  const useBrowserStackLocal =
-    process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
-  const DAPP_URL = useBrowserStackLocal
-    ? `http://bs-local.com:${DAPP_PORT}`
-    : getDappUrlForBrowser(currentDeviceDetails.platform);
+  test('@metamask/connect-multichain - Connect via Multichain API to Local Browser Playground', async ({
+    currentDeviceDetails,
+    driver,
+  }) => {
+    const useBrowserStackLocal =
+      process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
+    const DAPP_URL = useBrowserStackLocal
+      ? `http://bs-local.com:${DAPP_PORT}`
+      : getDappUrlForBrowser(currentDeviceDetails.platform);
 
-  //
-  // Login and navigate to dapp
-  //
+    //
+    // Login and navigate to dapp
+    //
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await loginToAppPlaywright();
-    await launchMobileBrowser();
-    await navigateToDapp(DAPP_URL);
-  });
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await loginToAppPlaywright();
+      await launchMobileBrowser();
+      await navigateToDapp(DAPP_URL);
+    });
 
-  //
-  // Connect via Multichain API
-  //
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.waitForConnectButtonVisible(15000);
-    await BrowserPlaygroundDapp.tapConnect();
-  }, DAPP_URL);
+    //
+    // Connect via Multichain API
+    //
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.waitForConnectButtonVisible(15000);
+      await BrowserPlaygroundDapp.tapConnect();
+    }, DAPP_URL);
 
-  // Handle connection approval in MetaMask
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await unlockIfLockScreenVisible();
-    await DappConnectionModal.tapConnectButton();
-  });
+    // Handle connection approval in MetaMask
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await unlockIfLockScreenVisible();
+      await DappConnectionModal.tapConnectButton();
+    });
 
-  // Switch back to browser
-  await switchToMobileBrowser();
-  await sleep(500);
+    // Switch back to browser
+    await switchToMobileBrowser();
+    await sleep(500);
 
-  //
-  // Verify connection
-  //
+    //
+    // Verify connection
+    //
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertMultichainConnected(true);
-    await PlaywrightGestures.scrollIntoView(
-      await asPlaywrightElement(BrowserPlaygroundDapp.getScopeCard('eip155:1')),
-    );
-    await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertMultichainConnected(true);
+      await PlaywrightGestures.scrollIntoView(
+        await asPlaywrightElement(
+          BrowserPlaygroundDapp.getScopeCard('eip155:1'),
+        ),
+      );
+      await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
+    }, DAPP_URL);
 
-  //
-  // Cleanup - disconnect
-  //
+    //
+    // Cleanup - disconnect
+    //
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-  }, DAPP_URL);
-});
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+    }, DAPP_URL);
+  });
+}); // end describe
diff --git a/tests/performance/mm-connect/connection-multiclient-resilience.spec.ts b/tests/performance/mm-connect/connection-multiclient-resilience.spec.ts
index 502b8e73f21..53ef06eafd5 100644
--- a/tests/performance/mm-connect/connection-multiclient-resilience.spec.ts
+++ b/tests/performance/mm-connect/connection-multiclient-resilience.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp';
@@ -47,248 +48,250 @@ const playgroundServer = new DappServer({
   dappVariant: DappVariants.BROWSER_PLAYGROUND,
 });
 
-// Start local playground server before all tests
-test.beforeAll(async () => {
-  // Set port and start the server directly (bypassing Detox-specific utilities)
-  playgroundServer.setServerPort(DAPP_PORT);
-  await playgroundServer.start();
-  await waitForDappServerReady(DAPP_PORT);
+test.describe(Performance, () => {
+  // Start local playground server before all tests
+  test.beforeAll(async () => {
+    // Set port and start the server directly (bypassing Detox-specific utilities)
+    playgroundServer.setServerPort(DAPP_PORT);
+    await playgroundServer.start();
+    await waitForDappServerReady(DAPP_PORT);
 
-  // Set up adb reverse for Android emulator access
-  setupAdbReverse(DAPP_PORT);
-});
-
-// Stop local playground server after all tests
-test.afterAll(async () => {
-  cleanupAdbReverse(DAPP_PORT);
-  await playgroundServer.stop();
-});
+    // Set up adb reverse for Android emulator access
+    setupAdbReverse(DAPP_PORT);
+  });
 
-// Test steps (in order):
-//
-// 1. DISCONNECT SOLANA, VERIFY EVM PERSISTS
-//    - Tap Solana disconnect
-//    - Assert: solana scope gone, Solana disconnected
-//    - Assert: eip155:1 scope still visible, legacy EVM connected, wagmi connected
-//    - Wagmi personal sign -> confirm -> assert signature starts with 0x
-//
-// 2. RECONNECT SOLANA, VERIFY EVM PERSISTS
-//    - Tap Solana connect -> approve in MetaMask
-//    - Assert: Solana scope visible, Solana connected with account 1
-//    - Solana sign message -> confirm -> assert correct signed result
-//    - Assert: eip155:1 scope still visible, legacy EVM connected, wagmi connected
-//    - Wagmi personal sign -> confirm -> assert signature starts with 0x
-//
-// 3. CONCURRENT CONNECT: PENDING APPROVAL + KILL APP RESILIENCE
-//    - Disconnect both Solana and wagmi, then tap Solana connect (initiates approval)
-//    - In MetaMask: terminate app without accepting approval, relaunch and log in
-//    - Tap wagmi connect -> approve in MetaMask
-//    - Assert: eip155:1 connected, legacy EVM connected, wagmi connected
-//    - Assert: Solana connected (the pending Solana session from step 7 was fulfilled)
-//
-// 4. CLEANUP
-//    - Tap Solana disconnect and legacy EVM disconnect
-test('@metamask/connect-multichain (multiple clients) - Disconnect, reconnect, and resilience via Multichain API', async ({
-  currentDeviceDetails,
-  driver,
-}) => {
-  const platform = currentDeviceDetails.platform;
-  const useBrowserStackLocal =
-    process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
-  const DAPP_URL = useBrowserStackLocal
-    ? `http://bs-local.com:${DAPP_PORT}`
-    : getDappUrlForBrowser(platform);
+  // Stop local playground server after all tests
+  test.afterAll(async () => {
+    cleanupAdbReverse(DAPP_PORT);
+    await playgroundServer.stop();
+  });
 
+  // Test steps (in order):
+  //
+  // 1. DISCONNECT SOLANA, VERIFY EVM PERSISTS
+  //    - Tap Solana disconnect
+  //    - Assert: solana scope gone, Solana disconnected
+  //    - Assert: eip155:1 scope still visible, legacy EVM connected, wagmi connected
+  //    - Wagmi personal sign -> confirm -> assert signature starts with 0x
   //
-  // Login and navigate to dapp
-  // (relies on connection state established by the preceding multiclient test)
+  // 2. RECONNECT SOLANA, VERIFY EVM PERSISTS
+  //    - Tap Solana connect -> approve in MetaMask
+  //    - Assert: Solana scope visible, Solana connected with account 1
+  //    - Solana sign message -> confirm -> assert correct signed result
+  //    - Assert: eip155:1 scope still visible, legacy EVM connected, wagmi connected
+  //    - Wagmi personal sign -> confirm -> assert signature starts with 0x
   //
+  // 3. CONCURRENT CONNECT: PENDING APPROVAL + KILL APP RESILIENCE
+  //    - Disconnect both Solana and wagmi, then tap Solana connect (initiates approval)
+  //    - In MetaMask: terminate app without accepting approval, relaunch and log in
+  //    - Tap wagmi connect -> approve in MetaMask
+  //    - Assert: eip155:1 connected, legacy EVM connected, wagmi connected
+  //    - Assert: Solana connected (the pending Solana session from step 7 was fulfilled)
+  //
+  // 4. CLEANUP
+  //    - Tap Solana disconnect and legacy EVM disconnect
+  test('@metamask/connect-multichain (multiple clients) - Disconnect, reconnect, and resilience via Multichain API', async ({
+    currentDeviceDetails,
+    driver,
+  }) => {
+    const platform = currentDeviceDetails.platform;
+    const useBrowserStackLocal =
+      process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
+    const DAPP_URL = useBrowserStackLocal
+      ? `http://bs-local.com:${DAPP_PORT}`
+      : getDappUrlForBrowser(platform);
+
+    //
+    // Login and navigate to dapp
+    // (relies on connection state established by the preceding multiclient test)
+    //
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await loginToAppPlaywright();
+      await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
+      await launchMobileBrowser();
+      await navigateToDapp(DAPP_URL);
+    });
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await loginToAppPlaywright();
-    await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
-    await launchMobileBrowser();
-    await navigateToDapp(DAPP_URL);
-  });
+    await sleep(1000);
 
-  await sleep(1000);
-
-  // Tap the Connect button (multichain API - default scopes)
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    // Note: the Solana wallet standard provider itself has an issue where it does not
-    // listen for wallet_sessionChanged events, so we need to use the Solana's connect button
-    // as the entrypoint for now.
-    await BrowserPlaygroundDapp.tapSolanaConnect();
-  }, DAPP_URL);
-
-  // Handle connection approval in MetaMask
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await unlockIfLockScreenVisible();
-    await DappConnectionModal.tapConnectButton();
-  });
+    // Tap the Connect button (multichain API - default scopes)
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      // Note: the Solana wallet standard provider itself has an issue where it does not
+      // listen for wallet_sessionChanged events, so we need to use the Solana's connect button
+      // as the entrypoint for now.
+      await BrowserPlaygroundDapp.tapSolanaConnect();
+    }, DAPP_URL);
+
+    // Handle connection approval in MetaMask
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await unlockIfLockScreenVisible();
+      await DappConnectionModal.tapConnectButton();
+    });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  //
-  // Step 1: Disconnect Solana, verify EVM persists
-  //
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    // Disconnect Solana
-    await BrowserPlaygroundDapp.tapSolanaDisconnect();
-
-    await BrowserPlaygroundDapp.assertScopeCardNotVisible(
-      SOLANA_MAINNET_CAIP_CHAIN_ID,
-    );
-    await BrowserPlaygroundDapp.assertSolanaConnected(false);
-
-    // Make sure EVM is still connected
-    await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertWagmiConnected(true);
-    // Verify wagmi personal sign works when wagmi is connected
-    await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello MetaMask');
-    await PlaywrightGestures.hideKeyboard();
-    await BrowserPlaygroundDapp.tapWagmiSignMessage();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.tapConfirmButton();
-  });
+    //
+    // Step 1: Disconnect Solana, verify EVM persists
+    //
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      // Disconnect Solana
+      await BrowserPlaygroundDapp.tapSolanaDisconnect();
+
+      await BrowserPlaygroundDapp.assertScopeCardNotVisible(
+        SOLANA_MAINNET_CAIP_CHAIN_ID,
+      );
+      await BrowserPlaygroundDapp.assertSolanaConnected(false);
+
+      // Make sure EVM is still connected
+      await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertWagmiConnected(true);
+      // Verify wagmi personal sign works when wagmi is connected
+      await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello MetaMask');
+      await PlaywrightGestures.hideKeyboard();
+      await BrowserPlaygroundDapp.tapWagmiSignMessage();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.tapConfirmButton();
+    });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiSignatureResult('0x');
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiSignatureResult('0x');
 
-    // Reconnect Solana
-    await BrowserPlaygroundDapp.tapSolanaConnect();
-  }, DAPP_URL);
+      // Reconnect Solana
+      await BrowserPlaygroundDapp.tapSolanaConnect();
+    }, DAPP_URL);
 
-  // Reconnecting Solana takes a bit of time to trigger the deeplink, so we need to wait for it to complete
-  await sleep(3500);
+    // Reconnecting Solana takes a bit of time to trigger the deeplink, so we need to wait for it to complete
+    await sleep(3500);
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    // Reconnecting Solana takes a bit of time, so we need to wait for it to complete
-    await DappConnectionModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 4000,
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      // Reconnecting Solana takes a bit of time, so we need to wait for it to complete
+      await DappConnectionModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 4000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertScopeCardVisible(
-      SOLANA_MAINNET_CAIP_CHAIN_ID,
-    );
-    await BrowserPlaygroundDapp.assertSolanaConnected(true);
-    await BrowserPlaygroundDapp.assertSolanaActiveAccount(
-      ACCOUNT_1_SOLANA_ADDRESS,
-    );
-    // Verify solana sign works when solana is connected
-    await PlaywrightGestures.scrollIntoView(
-      await asPlaywrightElement(BrowserPlaygroundDapp.solanaCard),
-      { scrollParams: { direction: 'down' } },
-    );
-    await BrowserPlaygroundDapp.tapSolanaSignMessage();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SnapSignModal.tapConfirmButton();
-  });
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertSolanaSignedMessageResult(
-      ACCOUNT_1_SOLANA_SIGNED_MESSAGE_RESULT,
-    );
-
-    // Make sure EVM is still connected
-    await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertWagmiConnected(true);
-    // Verify wagmi personal sign works when wagmi is connected
-    await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello MetaMask');
-    await PlaywrightGestures.hideKeyboard();
-    await BrowserPlaygroundDapp.tapWagmiSignMessage();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.tapConfirmButton();
-  });
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertScopeCardVisible(
+        SOLANA_MAINNET_CAIP_CHAIN_ID,
+      );
+      await BrowserPlaygroundDapp.assertSolanaConnected(true);
+      await BrowserPlaygroundDapp.assertSolanaActiveAccount(
+        ACCOUNT_1_SOLANA_ADDRESS,
+      );
+      // Verify solana sign works when solana is connected
+      await PlaywrightGestures.scrollIntoView(
+        await asPlaywrightElement(BrowserPlaygroundDapp.solanaCard),
+        { scrollParams: { direction: 'down' } },
+      );
+      await BrowserPlaygroundDapp.tapSolanaSignMessage();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SnapSignModal.tapConfirmButton();
+    });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiSignatureResult('0x');
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertSolanaSignedMessageResult(
+        ACCOUNT_1_SOLANA_SIGNED_MESSAGE_RESULT,
+      );
+
+      // Make sure EVM is still connected
+      await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertWagmiConnected(true);
+      // Verify wagmi personal sign works when wagmi is connected
+      await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello MetaMask');
+      await PlaywrightGestures.hideKeyboard();
+      await BrowserPlaygroundDapp.tapWagmiSignMessage();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.tapConfirmButton();
+    });
 
-    // Setup for concurrent connect test
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-    await BrowserPlaygroundDapp.tapSolanaDisconnect();
-    await BrowserPlaygroundDapp.tapWagmiDisconnect();
-    await BrowserPlaygroundDapp.tapSolanaConnect();
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiSignatureResult('0x');
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      // Setup for concurrent connect test
 
-    // Purposely terminate the app without accepting the approval
-    await PlaywrightGestures.terminateApp(currentDeviceDetails);
-    await PlaywrightGestures.activateApp(currentDeviceDetails);
-    await loginToAppPlaywright();
-    await sleep(1000);
-  });
+      await BrowserPlaygroundDapp.tapSolanaDisconnect();
+      await BrowserPlaygroundDapp.tapWagmiDisconnect();
+      await BrowserPlaygroundDapp.tapSolanaConnect();
+    }, DAPP_URL);
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapConnectWagmi();
-  }, DAPP_URL);
+      // Purposely terminate the app without accepting the approval
+      await PlaywrightGestures.terminateApp(currentDeviceDetails);
+      await PlaywrightGestures.activateApp(currentDeviceDetails);
+      await loginToAppPlaywright();
+      await sleep(1000);
+    });
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await DappConnectionModal.tapConnectButton();
-  });
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapConnectWagmi();
+    }, DAPP_URL);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertWagmiConnected(true);
-    // Currently this is only possible if the solana connection attempt (the first one that initiated) was successful.
-    await BrowserPlaygroundDapp.assertSolanaConnected(true);
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await DappConnectionModal.tapConnectButton();
+    });
 
-  //
-  // Cleanup - disconnect
-  //
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    // Note: the Solana wallet standard provider itself has an issue where it does not
-    // listen for wallet_sessionChanged events, so we need to use the Solana's disconnect button
-    // to ensure the solana react hook state is reset correctly.
-    await BrowserPlaygroundDapp.tapSolanaDisconnect();
-    await BrowserPlaygroundDapp.tapDisconnect();
-  }, DAPP_URL);
-});
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertWagmiConnected(true);
+      // Currently this is only possible if the solana connection attempt (the first one that initiated) was successful.
+      await BrowserPlaygroundDapp.assertSolanaConnected(true);
+    }, DAPP_URL);
+
+    //
+    // Cleanup - disconnect
+    //
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      // Note: the Solana wallet standard provider itself has an issue where it does not
+      // listen for wallet_sessionChanged events, so we need to use the Solana's disconnect button
+      // to ensure the solana react hook state is reset correctly.
+      await BrowserPlaygroundDapp.tapSolanaDisconnect();
+      await BrowserPlaygroundDapp.tapDisconnect();
+    }, DAPP_URL);
+  });
+}); // end describe
diff --git a/tests/performance/mm-connect/connection-multiclient.spec.ts b/tests/performance/mm-connect/connection-multiclient.spec.ts
index 626a2e23856..178d712e1b6 100644
--- a/tests/performance/mm-connect/connection-multiclient.spec.ts
+++ b/tests/performance/mm-connect/connection-multiclient.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp';
@@ -47,273 +48,279 @@ const playgroundServer = new DappServer({
   dappVariant: DappVariants.BROWSER_PLAYGROUND,
 });
 
-// Start local playground server before all tests
-test.beforeAll(async () => {
-  // Set port and start the server directly (bypassing Detox-specific utilities)
-  playgroundServer.setServerPort(DAPP_PORT);
-  await playgroundServer.start();
-  await waitForDappServerReady(DAPP_PORT);
+test.describe(Performance, () => {
+  // Start local playground server before all tests
+  test.beforeAll(async () => {
+    // Set port and start the server directly (bypassing Detox-specific utilities)
+    playgroundServer.setServerPort(DAPP_PORT);
+    await playgroundServer.start();
+    await waitForDappServerReady(DAPP_PORT);
 
-  // Set up adb reverse for Android emulator access
-  setupAdbReverse(DAPP_PORT);
-});
-
-// Stop local playground server after all tests
-test.afterAll(async () => {
-  cleanupAdbReverse(DAPP_PORT);
-  await playgroundServer.stop();
-});
+    // Set up adb reverse for Android emulator access
+    setupAdbReverse(DAPP_PORT);
+  });
 
-// Test steps (in order):
-//
-// 1. Login and navigate to the local browser playground dapp
-//
-// 2. INITIAL MULTICHAIN CONNECTION
-//    - Tap Solana connect (used as multichain entrypoint due to wallet_sessionChanged limitation)
-//    - Approve connection in MetaMask
-//    - Assert: multichain connected, eip155:1 scope visible, solana mainnet scope visible
-//    - Assert: legacy EVM connected (chainId 0x1, account 1), wagmi connected (chainId 1, account 1)
-//    - Wagmi personal sign -> confirm -> assert signature starts with 0x
-//    - Assert: Solana connected with account 1
-//    - Solana sign message -> confirm via SnapSignModal -> assert correct signed result
-//    - Legacy EVM personal sign -> confirm -> assert correct signature
-//
-// 3. DISCONNECT EVM, VERIFY SOLANA PERSISTS
-//    - Tap wagmi disconnect
-//    - Assert: multichain still connected, eip155:1 scope gone, solana scope still visible
-//    - Assert: legacy EVM disconnected, wagmi disconnected, Solana still connected
-//
-// 4. RECONNECT EVM, VERIFY SOLANA PERSISTS
-//    - Tap wagmi connect -> approve in MetaMask
-//    - Assert: eip155:1 scope visible, legacy EVM connected, wagmi connected
-//    - Wagmi personal sign -> confirm -> assert signature starts with 0x
-//    - Assert: Solana scope still visible, Solana still connected
-//    - Solana sign message -> confirm -> assert correct signed result
-test('@metamask/connect-multichain (multiple clients) - Connect multiple clients via Multichain API to Local Browser Playground', async ({
-  currentDeviceDetails,
-}) => {
-  // Get platform-specific URL
-  const platform = currentDeviceDetails.platform;
-  const useBrowserStackLocal =
-    process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
-  const DAPP_URL = useBrowserStackLocal
-    ? `http://bs-local.com:${DAPP_PORT}`
-    : getDappUrlForBrowser(platform);
+  // Stop local playground server after all tests
+  test.afterAll(async () => {
+    cleanupAdbReverse(DAPP_PORT);
+    await playgroundServer.stop();
+  });
 
+  // Test steps (in order):
   //
-  // Login and navigate to dapp
+  // 1. Login and navigate to the local browser playground dapp
   //
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await loginToAppPlaywright();
-    await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
-    await launchMobileBrowser();
-    await navigateToDapp(DAPP_URL);
-  });
-
-  await sleep(1000);
-
+  // 2. INITIAL MULTICHAIN CONNECTION
+  //    - Tap Solana connect (used as multichain entrypoint due to wallet_sessionChanged limitation)
+  //    - Approve connection in MetaMask
+  //    - Assert: multichain connected, eip155:1 scope visible, solana mainnet scope visible
+  //    - Assert: legacy EVM connected (chainId 0x1, account 1), wagmi connected (chainId 1, account 1)
+  //    - Wagmi personal sign -> confirm -> assert signature starts with 0x
+  //    - Assert: Solana connected with account 1
+  //    - Solana sign message -> confirm via SnapSignModal -> assert correct signed result
+  //    - Legacy EVM personal sign -> confirm -> assert correct signature
   //
-  // Connect via Multichain API
+  // 3. DISCONNECT EVM, VERIFY SOLANA PERSISTS
+  //    - Tap wagmi disconnect
+  //    - Assert: multichain still connected, eip155:1 scope gone, solana scope still visible
+  //    - Assert: legacy EVM disconnected, wagmi disconnected, Solana still connected
   //
-
-  // Tap the Connect button (multichain API - default scopes)
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    // Note: the Solana wallet standard provider itself has an issue where it does not
-    // listen for wallet_sessionChanged events, so we need to use the Solana's connect button
-    // as the entrypoint for now.
-    await BrowserPlaygroundDapp.tapSolanaConnect();
-  }, DAPP_URL);
-
-  // Handle connection approval in MetaMask
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await unlockIfLockScreenVisible();
-    await DappConnectionModal.tapConnectButton();
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertMultichainConnected(true);
-    await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
-    await BrowserPlaygroundDapp.assertScopeCardVisible(
-      SOLANA_MAINNET_CAIP_CHAIN_ID,
-    );
-
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertChainIdValue('0x1');
-    await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_EVM_ADDRESS);
-
-    await BrowserPlaygroundDapp.assertWagmiConnected(true);
-    await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
-    await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_EVM_ADDRESS);
-    // Verify wagmi personal sign works when wagmi is connected
-    await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello MetaMask');
-    await PlaywrightGestures.hideKeyboard();
-    await BrowserPlaygroundDapp.tapWagmiSignMessage();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.tapConfirmButton();
+  // 4. RECONNECT EVM, VERIFY SOLANA PERSISTS
+  //    - Tap wagmi connect -> approve in MetaMask
+  //    - Assert: eip155:1 scope visible, legacy EVM connected, wagmi connected
+  //    - Wagmi personal sign -> confirm -> assert signature starts with 0x
+  //    - Assert: Solana scope still visible, Solana still connected
+  //    - Solana sign message -> confirm -> assert correct signed result
+  test('@metamask/connect-multichain (multiple clients) - Connect multiple clients via Multichain API to Local Browser Playground', async ({
+    currentDeviceDetails,
+  }) => {
+    // Get platform-specific URL
+    const platform = currentDeviceDetails.platform;
+    const useBrowserStackLocal =
+      process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
+    const DAPP_URL = useBrowserStackLocal
+      ? `http://bs-local.com:${DAPP_PORT}`
+      : getDappUrlForBrowser(platform);
+
+    //
+    // Login and navigate to dapp
+    //
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await loginToAppPlaywright();
+      await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
+      await launchMobileBrowser();
+      await navigateToDapp(DAPP_URL);
+    });
+
+    await sleep(1000);
+
+    //
+    // Connect via Multichain API
+    //
+
+    // Tap the Connect button (multichain API - default scopes)
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      // Note: the Solana wallet standard provider itself has an issue where it does not
+      // listen for wallet_sessionChanged events, so we need to use the Solana's connect button
+      // as the entrypoint for now.
+      await BrowserPlaygroundDapp.tapSolanaConnect();
+    }, DAPP_URL);
+
+    // Handle connection approval in MetaMask
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await unlockIfLockScreenVisible();
+      await DappConnectionModal.tapConnectButton();
+    });
+
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertMultichainConnected(true);
+      await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
+      await BrowserPlaygroundDapp.assertScopeCardVisible(
+        SOLANA_MAINNET_CAIP_CHAIN_ID,
+      );
+
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertChainIdValue('0x1');
+      await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_EVM_ADDRESS);
+
+      await BrowserPlaygroundDapp.assertWagmiConnected(true);
+      await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
+      await BrowserPlaygroundDapp.assertWagmiActiveAccount(
+        ACCOUNT_1_EVM_ADDRESS,
+      );
+      // Verify wagmi personal sign works when wagmi is connected
+      await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello MetaMask');
+      await PlaywrightGestures.hideKeyboard();
+      await BrowserPlaygroundDapp.tapWagmiSignMessage();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.tapConfirmButton();
+    });
+
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiSignatureResult('0x');
+
+      await BrowserPlaygroundDapp.assertSolanaConnected(true);
+      await BrowserPlaygroundDapp.assertSolanaActiveAccount(
+        ACCOUNT_1_SOLANA_ADDRESS,
+      );
+      // Verify solana sign works when solana is connected
+      await PlaywrightGestures.scrollIntoView(
+        await asPlaywrightElement(BrowserPlaygroundDapp.solanaCard),
+      );
+      await BrowserPlaygroundDapp.tapSolanaSignMessage();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SnapSignModal.tapConfirmButton();
+    });
+
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertSolanaSignedMessageResult(
+        ACCOUNT_1_SOLANA_SIGNED_MESSAGE_RESULT,
+      );
+
+      await PlaywrightGestures.scrollIntoView(
+        await asPlaywrightElement(BrowserPlaygroundDapp.legacyEvmCard),
+        { scrollParams: { direction: 'down' } },
+      );
+      // Test EVM sign (legacy personal sign) when EVM is connected
+      await BrowserPlaygroundDapp.tapPersonalSign();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.tapConfirmButton();
+    });
+
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertResponseValue(
+        '0x361c13288b4ab02d50974efddf9e4e7ca651b81c298b614be908c4754abb1dd8328224645a1a8d0fab561c4b855c7bdcebea15db5ae8d1778a1ea791dbd05c2a1b',
+      );
+
+      // Disconnect EVM
+      await PlaywrightGestures.scrollIntoView(
+        await asPlaywrightElement(BrowserPlaygroundDapp.wagmiDisconnectButton),
+      );
+      await BrowserPlaygroundDapp.tapWagmiDisconnect();
+
+      await PlaywrightGestures.scrollIntoView(
+        await asPlaywrightElement(BrowserPlaygroundDapp.connectedScopesSection),
+        { scrollParams: { direction: 'down' } },
+      );
+      await BrowserPlaygroundDapp.assertMultichainConnected(true);
+      await BrowserPlaygroundDapp.assertScopeCardNotVisible('eip155:1');
+      await BrowserPlaygroundDapp.assertScopeCardVisible(
+        SOLANA_MAINNET_CAIP_CHAIN_ID,
+      );
+
+      await BrowserPlaygroundDapp.assertConnected(false);
+      await BrowserPlaygroundDapp.assertWagmiConnected(false);
+      await BrowserPlaygroundDapp.assertSolanaConnected(true);
+
+      // Reconnect EVM
+      await PlaywrightGestures.scrollIntoView(
+        await asPlaywrightElement(BrowserPlaygroundDapp.connectWagmiButton),
+        { scrollParams: { direction: 'down' } },
+      );
+      await BrowserPlaygroundDapp.tapConnectWagmi();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await DappConnectionModal.tapConnectButton({ shouldCooldown: true });
+    });
+
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await PlaywrightGestures.scrollIntoView(
+        await asPlaywrightElement(BrowserPlaygroundDapp.wagmiCard),
+        { scrollParams: { direction: 'up' } },
+      );
+
+      await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
+
+      await BrowserPlaygroundDapp.assertConnected(true);
+      await BrowserPlaygroundDapp.assertChainIdValue('0x1');
+      await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_EVM_ADDRESS);
+
+      await BrowserPlaygroundDapp.assertWagmiConnected(true);
+      await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
+      await BrowserPlaygroundDapp.assertWagmiActiveAccount(
+        ACCOUNT_1_EVM_ADDRESS,
+      );
+      // Verify wagmi personal sign works when wagmi is connected
+      await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello MetaMask');
+      await PlaywrightGestures.hideKeyboard();
+      await BrowserPlaygroundDapp.tapWagmiSignMessage();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.tapConfirmButton();
+    });
+
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiSignatureResult('0x');
+
+      // Make sure solana is still connected
+      await BrowserPlaygroundDapp.assertScopeCardVisible(
+        SOLANA_MAINNET_CAIP_CHAIN_ID,
+      );
+      await BrowserPlaygroundDapp.assertSolanaConnected(true);
+      await BrowserPlaygroundDapp.assertSolanaActiveAccount(
+        ACCOUNT_1_SOLANA_ADDRESS,
+      );
+      // Verify solana sign works when solana is connected
+      await BrowserPlaygroundDapp.tapSolanaSignMessage();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SnapSignModal.tapConfirmButton();
+    });
+
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await PlaywrightGestures.scrollIntoView(
+        await asPlaywrightElement(
+          BrowserPlaygroundDapp.solanaSignedMessageResult,
+        ),
+      );
+      await BrowserPlaygroundDapp.assertSolanaSignedMessageResult(
+        ACCOUNT_1_SOLANA_SIGNED_MESSAGE_RESULT,
+      );
+    }, DAPP_URL);
   });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiSignatureResult('0x');
-
-    await BrowserPlaygroundDapp.assertSolanaConnected(true);
-    await BrowserPlaygroundDapp.assertSolanaActiveAccount(
-      ACCOUNT_1_SOLANA_ADDRESS,
-    );
-    // Verify solana sign works when solana is connected
-    await PlaywrightGestures.scrollIntoView(
-      await asPlaywrightElement(BrowserPlaygroundDapp.solanaCard),
-    );
-    await BrowserPlaygroundDapp.tapSolanaSignMessage();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SnapSignModal.tapConfirmButton();
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertSolanaSignedMessageResult(
-      ACCOUNT_1_SOLANA_SIGNED_MESSAGE_RESULT,
-    );
-
-    await PlaywrightGestures.scrollIntoView(
-      await asPlaywrightElement(BrowserPlaygroundDapp.legacyEvmCard),
-      { scrollParams: { direction: 'down' } },
-    );
-    // Test EVM sign (legacy personal sign) when EVM is connected
-    await BrowserPlaygroundDapp.tapPersonalSign();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.tapConfirmButton();
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertResponseValue(
-      '0x361c13288b4ab02d50974efddf9e4e7ca651b81c298b614be908c4754abb1dd8328224645a1a8d0fab561c4b855c7bdcebea15db5ae8d1778a1ea791dbd05c2a1b',
-    );
-
-    // Disconnect EVM
-    await PlaywrightGestures.scrollIntoView(
-      await asPlaywrightElement(BrowserPlaygroundDapp.wagmiDisconnectButton),
-    );
-    await BrowserPlaygroundDapp.tapWagmiDisconnect();
-
-    await PlaywrightGestures.scrollIntoView(
-      await asPlaywrightElement(BrowserPlaygroundDapp.connectedScopesSection),
-      { scrollParams: { direction: 'down' } },
-    );
-    await BrowserPlaygroundDapp.assertMultichainConnected(true);
-    await BrowserPlaygroundDapp.assertScopeCardNotVisible('eip155:1');
-    await BrowserPlaygroundDapp.assertScopeCardVisible(
-      SOLANA_MAINNET_CAIP_CHAIN_ID,
-    );
-
-    await BrowserPlaygroundDapp.assertConnected(false);
-    await BrowserPlaygroundDapp.assertWagmiConnected(false);
-    await BrowserPlaygroundDapp.assertSolanaConnected(true);
-
-    // Reconnect EVM
-    await PlaywrightGestures.scrollIntoView(
-      await asPlaywrightElement(BrowserPlaygroundDapp.connectWagmiButton),
-      { scrollParams: { direction: 'down' } },
-    );
-    await BrowserPlaygroundDapp.tapConnectWagmi();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await DappConnectionModal.tapConnectButton({ shouldCooldown: true });
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await PlaywrightGestures.scrollIntoView(
-      await asPlaywrightElement(BrowserPlaygroundDapp.wagmiCard),
-      { scrollParams: { direction: 'up' } },
-    );
-
-    await BrowserPlaygroundDapp.assertScopeCardVisible('eip155:1');
-
-    await BrowserPlaygroundDapp.assertConnected(true);
-    await BrowserPlaygroundDapp.assertChainIdValue('0x1');
-    await BrowserPlaygroundDapp.assertActiveAccount(ACCOUNT_1_EVM_ADDRESS);
-
-    await BrowserPlaygroundDapp.assertWagmiConnected(true);
-    await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
-    await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_EVM_ADDRESS);
-    // Verify wagmi personal sign works when wagmi is connected
-    await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello MetaMask');
-    await PlaywrightGestures.hideKeyboard();
-    await BrowserPlaygroundDapp.tapWagmiSignMessage();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.tapConfirmButton();
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiSignatureResult('0x');
-
-    // Make sure solana is still connected
-    await BrowserPlaygroundDapp.assertScopeCardVisible(
-      SOLANA_MAINNET_CAIP_CHAIN_ID,
-    );
-    await BrowserPlaygroundDapp.assertSolanaConnected(true);
-    await BrowserPlaygroundDapp.assertSolanaActiveAccount(
-      ACCOUNT_1_SOLANA_ADDRESS,
-    );
-    // Verify solana sign works when solana is connected
-    await BrowserPlaygroundDapp.tapSolanaSignMessage();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SnapSignModal.tapConfirmButton();
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await PlaywrightGestures.scrollIntoView(
-      await asPlaywrightElement(
-        BrowserPlaygroundDapp.solanaSignedMessageResult,
-      ),
-    );
-    await BrowserPlaygroundDapp.assertSolanaSignedMessageResult(
-      ACCOUNT_1_SOLANA_SIGNED_MESSAGE_RESULT,
-    );
-  }, DAPP_URL);
-});
+}); // end describe
diff --git a/tests/performance/mm-connect/connection-wagmi-chains.spec.ts b/tests/performance/mm-connect/connection-wagmi-chains.spec.ts
index ea88ce63c57..3ac86fe3e59 100644
--- a/tests/performance/mm-connect/connection-wagmi-chains.spec.ts
+++ b/tests/performance/mm-connect/connection-wagmi-chains.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import WalletView from '../../page-objects/wallet/WalletView';
@@ -45,236 +46,238 @@ const playgroundServer = new DappServer({
   dappVariant: DappVariants.BROWSER_PLAYGROUND,
 });
 
-// Start local playground server before all tests
-test.beforeAll(async () => {
-  playgroundServer.setServerPort(DAPP_PORT);
-  await playgroundServer.start();
-  await waitForDappServerReady(DAPP_PORT);
-  setupAdbReverse(DAPP_PORT);
-});
-
-// Stop local playground server after all tests
-test.afterAll(async () => {
-  cleanupAdbReverse(DAPP_PORT);
-  await playgroundServer.stop();
-});
+test.describe(Performance, () => {
+  // Start local playground server before all tests
+  test.beforeAll(async () => {
+    playgroundServer.setServerPort(DAPP_PORT);
+    await playgroundServer.start();
+    await waitForDappServerReady(DAPP_PORT);
+    setupAdbReverse(DAPP_PORT);
+  });
 
-// Test steps (in order):
-//
-// 1. LOGIN AND NAVIGATE TO DAPP
-//    - Login to app, ensure account groups finished loading
-//    - Launch mobile browser and navigate to the playground dapp
-//
-// 2. CONNECT VIA WAGMI
-//    - Tap Connect (Wagmi)
-//    - In MetaMask: add Account 3, unselect OP Mainnet from networks, tap Connect
-//    - Assert: wagmi connected, chainId 1, active account is Account 1
-//
-// 3. SWITCH TO SEPOLIA AND SIGN
-//    - Switch chain to Sepolia (11155111), assert chainId 11155111
-//    - Type 'Hello Sepolia' and tap sign
-//    - In MetaMask: cancel sign request on Sepolia network
-//
-// 4. SWITCH TO OP MAINNET (requires approval) AND CHANGE ACCOUNT
-//    - Tap switch chain to OP Mainnet (10)
-//    - In MetaMask: approve chain switch modal showing 'OP'
-//    - Assert: chainId 10
-//    - Type 'Hello OP' and tap sign; cancel in MetaMask
-//    - In MetaMask: navigate to account list and select Account 3
-//
-// 5. VERIFY ACCOUNT CHANGE AND ADD CELO CHAIN
-//    - Assert: wagmi active account is now Account 3
-//    - Tap switch chain to Celo (42220) — triggers add chain flow
-//    - In MetaMask: assert chain shows '42220' and 'Celo', confirm add chain
-//    - Assert: chainId 42220
-//    - Type 'Hello Celo' and tap sign; cancel in MetaMask
-//
-// 6. CLEANUP
-//    - Tap disconnect to clean up
-test('@metamask/connect-evm (wagmi) - Chain switching via Wagmi', async ({
-  currentDeviceDetails,
-  driver,
-}) => {
-  const platform = currentDeviceDetails.platform;
-  const useBrowserStackLocal =
-    process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
-  const DAPP_URL = useBrowserStackLocal
-    ? `http://bs-local.com:${DAPP_PORT}`
-    : getDappUrlForBrowser(platform);
+  // Stop local playground server after all tests
+  test.afterAll(async () => {
+    cleanupAdbReverse(DAPP_PORT);
+    await playgroundServer.stop();
+  });
 
+  // Test steps (in order):
   //
-  // Login and navigate to dapp
+  // 1. LOGIN AND NAVIGATE TO DAPP
+  //    - Login to app, ensure account groups finished loading
+  //    - Launch mobile browser and navigate to the playground dapp
   //
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await loginToAppPlaywright();
-    await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
-    await launchMobileBrowser();
-    await navigateToDapp(DAPP_URL);
-  });
-
-  await sleep(5000);
-
+  // 2. CONNECT VIA WAGMI
+  //    - Tap Connect (Wagmi)
+  //    - In MetaMask: add Account 3, unselect OP Mainnet from networks, tap Connect
+  //    - Assert: wagmi connected, chainId 1, active account is Account 1
   //
-  // Connect via WAGMI
+  // 3. SWITCH TO SEPOLIA AND SIGN
+  //    - Switch chain to Sepolia (11155111), assert chainId 11155111
+  //    - Type 'Hello Sepolia' and tap sign
+  //    - In MetaMask: cancel sign request on Sepolia network
   //
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapConnectWagmi();
-  }, DAPP_URL);
-
-  // Handle connection approval in MetaMask
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await unlockIfLockScreenVisible();
-    await DappConnectionModal.tapEditAccountsButton();
-    // Select account 3 in addition to Account 1
-    await DappConnectionModal.tapAccountButton('Account 3');
-    await DappConnectionModal.tapUpdateAccountsButton();
-    await DappConnectionModal.tapPermissionsTabButton();
-    // Unselect OP Mainnet
-    await DappConnectionModal.tapEditNetworksButton();
-    await DappConnectionModal.tapNetworkButton('OP');
-    await DappConnectionModal.tapUpdateNetworksButton();
-    await DappConnectionModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
-    });
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
+  // 4. SWITCH TO OP MAINNET (requires approval) AND CHANGE ACCOUNT
+  //    - Tap switch chain to OP Mainnet (10)
+  //    - In MetaMask: approve chain switch modal showing 'OP'
+  //    - Assert: chainId 10
+  //    - Type 'Hello OP' and tap sign; cancel in MetaMask
+  //    - In MetaMask: navigate to account list and select Account 3
   //
-  // Verify connection and switch to Sepolia
+  // 5. VERIFY ACCOUNT CHANGE AND ADD CELO CHAIN
+  //    - Assert: wagmi active account is now Account 3
+  //    - Tap switch chain to Celo (42220) — triggers add chain flow
+  //    - In MetaMask: assert chain shows '42220' and 'Celo', confirm add chain
+  //    - Assert: chainId 42220
+  //    - Type 'Hello Celo' and tap sign; cancel in MetaMask
   //
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiConnected(true);
-    await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
-    await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_ADDRESS);
-    // Switch to Sepolia
-    await BrowserPlaygroundDapp.tapWagmiSwitchChain(11155111);
-    await BrowserPlaygroundDapp.assertWagmiChainIdValue('11155111');
-    // Sign a message on Sepolia
-    await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello Sepolia');
-    await PlaywrightGestures.hideKeyboard();
-    await BrowserPlaygroundDapp.tapWagmiSignMessage({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+  // 6. CLEANUP
+  //    - Tap disconnect to clean up
+  test('@metamask/connect-evm (wagmi) - Chain switching via Wagmi', async ({
+    currentDeviceDetails,
+    driver,
+  }) => {
+    const platform = currentDeviceDetails.platform;
+    const useBrowserStackLocal =
+      process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
+    const DAPP_URL = useBrowserStackLocal
+      ? `http://bs-local.com:${DAPP_PORT}`
+      : getDappUrlForBrowser(platform);
+
+    //
+    // Login and navigate to dapp
+    //
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await loginToAppPlaywright();
+      await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
+      await launchMobileBrowser();
+      await navigateToDapp(DAPP_URL);
     });
-  }, DAPP_URL);
-
-  // Cancel sign request
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.assertNetworkText('Sepolia');
-    await SignModal.tapCancelButton();
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
 
-  //
-  // Switch to OP Mainnet (requires approval since unselected earlier)
-  //
+    await sleep(5000);
+
+    //
+    // Connect via WAGMI
+    //
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapConnectWagmi();
+    }, DAPP_URL);
+
+    // Handle connection approval in MetaMask
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await unlockIfLockScreenVisible();
+      await DappConnectionModal.tapEditAccountsButton();
+      // Select account 3 in addition to Account 1
+      await DappConnectionModal.tapAccountButton('Account 3');
+      await DappConnectionModal.tapUpdateAccountsButton();
+      await DappConnectionModal.tapPermissionsTabButton();
+      // Unselect OP Mainnet
+      await DappConnectionModal.tapEditNetworksButton();
+      await DappConnectionModal.tapNetworkButton('OP');
+      await DappConnectionModal.tapUpdateNetworksButton();
+      await DappConnectionModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
+    });
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapWagmiSwitchChain(10); // OP Mainnet
-  }, DAPP_URL);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SwitchChainModal.assertNetworkText('OP');
-    await SwitchChainModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    //
+    // Verify connection and switch to Sepolia
+    //
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiConnected(true);
+      await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
+      await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_ADDRESS);
+      // Switch to Sepolia
+      await BrowserPlaygroundDapp.tapWagmiSwitchChain(11155111);
+      await BrowserPlaygroundDapp.assertWagmiChainIdValue('11155111');
+      // Sign a message on Sepolia
+      await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello Sepolia');
+      await PlaywrightGestures.hideKeyboard();
+      await BrowserPlaygroundDapp.tapWagmiSignMessage({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
+    }, DAPP_URL);
+
+    // Cancel sign request
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.assertNetworkText('Sepolia');
+      await SignModal.tapCancelButton();
     });
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiChainIdValue('10');
-    await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello OP');
-    await PlaywrightGestures.hideKeyboard();
-    await BrowserPlaygroundDapp.tapWagmiSignMessage();
-  }, DAPP_URL);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.assertNetworkText('OP');
-    await SignModal.tapCancelButton();
+    //
+    // Switch to OP Mainnet (requires approval since unselected earlier)
+    //
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapWagmiSwitchChain(10); // OP Mainnet
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SwitchChainModal.assertNetworkText('OP');
+      await SwitchChainModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
+    });
 
-    // Wait here to make sure UI is visible before attempted interaction
+    await sleep(1000);
+    await switchToMobileBrowser();
     await sleep(1000);
 
-    // Change selected account to Account 3 in MetaMask
-    await WalletView.tapIdenticon();
-    await AccountListBottomSheet.tapAccountByName('Account 3');
-    // Forcefully waiting for accounts to be synced
-    await sleep(2500);
-  });
-
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiChainIdValue('10');
+      await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello OP');
+      await PlaywrightGestures.hideKeyboard();
+      await BrowserPlaygroundDapp.tapWagmiSignMessage();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.assertNetworkText('OP');
+      await SignModal.tapCancelButton();
+
+      // Wait here to make sure UI is visible before attempted interaction
+      await sleep(1000);
+
+      // Change selected account to Account 3 in MetaMask
+      await WalletView.tapIdenticon();
+      await AccountListBottomSheet.tapAccountByName('Account 3');
+      // Forcefully waiting for accounts to be synced
+      await sleep(2500);
+    });
 
-  //
-  // Verify account change and add CELO chain
-  //
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_3_ADDRESS);
-    // Try to switch to Celo (will trigger add chain)
-    await BrowserPlaygroundDapp.tapWagmiSwitchChain(42220);
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await AddChainModal.assertText('42220');
-    await AddChainModal.assertText('Celo');
-    await AddChainModal.tapConfirmButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    //
+    // Verify account change and add CELO chain
+    //
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_3_ADDRESS);
+      // Try to switch to Celo (will trigger add chain)
+      await BrowserPlaygroundDapp.tapWagmiSwitchChain(42220);
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await AddChainModal.assertText('42220');
+      await AddChainModal.assertText('Celo');
+      await AddChainModal.tapConfirmButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiChainIdValue('42220');
-    await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello Celo');
-    await PlaywrightGestures.hideKeyboard();
-    await BrowserPlaygroundDapp.tapWagmiSignMessage({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
-    });
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.assertNetworkText('Celo');
-    await SignModal.tapCancelButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiChainIdValue('42220');
+      await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello Celo');
+      await PlaywrightGestures.hideKeyboard();
+      await BrowserPlaygroundDapp.tapWagmiSignMessage({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.assertNetworkText('Celo');
+      await SignModal.tapCancelButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  //
-  // Reset dapp state
-  //
+    //
+    // Reset dapp state
+    //
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-  }, DAPP_URL);
-});
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+    }, DAPP_URL);
+  });
+}); // end describe
diff --git a/tests/performance/mm-connect/connection-wagmi.spec.ts b/tests/performance/mm-connect/connection-wagmi.spec.ts
index 3f3d410e455..0d32aeea7b3 100644
--- a/tests/performance/mm-connect/connection-wagmi.spec.ts
+++ b/tests/performance/mm-connect/connection-wagmi.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import BrowserPlaygroundDapp from '../../page-objects/MMConnect/BrowserPlaygroundDapp';
@@ -41,235 +42,237 @@ const playgroundServer = new DappServer({
   dappVariant: DappVariants.BROWSER_PLAYGROUND,
 });
 
-// Start local playground server before all tests
-test.beforeAll(async () => {
-  playgroundServer.setServerPort(DAPP_PORT);
-  await playgroundServer.start();
-  await waitForDappServerReady(DAPP_PORT);
-  setupAdbReverse(DAPP_PORT);
-});
-
-// Stop local playground server after all tests
-test.afterAll(async () => {
-  cleanupAdbReverse(DAPP_PORT);
-  await playgroundServer.stop();
-});
+test.describe(Performance, () => {
+  // Start local playground server before all tests
+  test.beforeAll(async () => {
+    playgroundServer.setServerPort(DAPP_PORT);
+    await playgroundServer.start();
+    await waitForDappServerReady(DAPP_PORT);
+    setupAdbReverse(DAPP_PORT);
+  });
 
-// Test steps (in order):
-//
-// 1. LOGIN AND NAVIGATE TO DAPP
-//    - Login to app, ensure account groups finished loading
-//    - Launch mobile browser and navigate to the playground dapp
-//
-// 2. CONNECT VIA WAGMI
-//    - Tap Connect (Wagmi)
-//    - In MetaMask: approve connection
-//    - Assert: wagmi connected, chainId 1, active account is Account 1
-//
-// 3. SIGN MESSAGE ON ETHEREUM
-//    - Type 'Hello MetaMask' and tap sign
-//    - In MetaMask: confirm sign request on Ethereum network
-//    - Assert: signature result starts with '0x'
-//
-// 4. REFRESH BROWSER RECONNECT
-//    - Refresh mobile browser
-//    - Assert: wagmi still connected, chainId 1, active account is Account 1
-//    - Type 'After refresh' and tap sign; cancel in MetaMask
-//
-// 5. DISCONNECT AND RECONNECT
-//    - Tap disconnect, assert wagmi disconnected
-//    - Tap Connect (Wagmi), approve in MetaMask
-//    - Assert: wagmi connected, chainId 1, active account is Account 1
-//
-// 6. INCOMPLETE SESSION TIMEOUT
-//    - Disconnect, then tap Connect (Wagmi)
-//    - In MetaMask: open approval but do NOT interact
-//    - Refresh mobile browser, wait 10s for session to time out
-//    - Assert: wagmi disconnected
-//    - Tap Connect (Wagmi) again, approve in MetaMask
-//    - Assert: wagmi connected, chainId 1, active account is Account 1
-//
-// 7. RESET DAPP STATE
-//    - Tap disconnect to clean up
-
-// This test is currently failing. See 250.
-test.skip('@metamask/connect-evm (wagmi) - Session stability via Wagmi', async ({
-  currentDeviceDetails,
-  driver,
-}) => {
-  const platform = currentDeviceDetails.platform;
-  const useBrowserStackLocal =
-    process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
-  const DAPP_URL = useBrowserStackLocal
-    ? `http://bs-local.com:${DAPP_PORT}`
-    : getDappUrlForBrowser(platform);
+  // Stop local playground server after all tests
+  test.afterAll(async () => {
+    cleanupAdbReverse(DAPP_PORT);
+    await playgroundServer.stop();
+  });
 
+  // Test steps (in order):
   //
-  // Login and navigate to dapp
+  // 1. LOGIN AND NAVIGATE TO DAPP
+  //    - Login to app, ensure account groups finished loading
+  //    - Launch mobile browser and navigate to the playground dapp
   //
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await loginToAppPlaywright();
-    await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
-    await launchMobileBrowser();
-    await navigateToDapp(DAPP_URL);
-  });
-
-  await sleep(5000);
-
+  // 2. CONNECT VIA WAGMI
+  //    - Tap Connect (Wagmi)
+  //    - In MetaMask: approve connection
+  //    - Assert: wagmi connected, chainId 1, active account is Account 1
+  //
+  // 3. SIGN MESSAGE ON ETHEREUM
+  //    - Type 'Hello MetaMask' and tap sign
+  //    - In MetaMask: confirm sign request on Ethereum network
+  //    - Assert: signature result starts with '0x'
+  //
+  // 4. REFRESH BROWSER RECONNECT
+  //    - Refresh mobile browser
+  //    - Assert: wagmi still connected, chainId 1, active account is Account 1
+  //    - Type 'After refresh' and tap sign; cancel in MetaMask
   //
-  // Connect via WAGMI
+  // 5. DISCONNECT AND RECONNECT
+  //    - Tap disconnect, assert wagmi disconnected
+  //    - Tap Connect (Wagmi), approve in MetaMask
+  //    - Assert: wagmi connected, chainId 1, active account is Account 1
   //
+  // 6. INCOMPLETE SESSION TIMEOUT
+  //    - Disconnect, then tap Connect (Wagmi)
+  //    - In MetaMask: open approval but do NOT interact
+  //    - Refresh mobile browser, wait 10s for session to time out
+  //    - Assert: wagmi disconnected
+  //    - Tap Connect (Wagmi) again, approve in MetaMask
+  //    - Assert: wagmi connected, chainId 1, active account is Account 1
+  //
+  // 7. RESET DAPP STATE
+  //    - Tap disconnect to clean up
+
+  // This test is currently failing. See 250.
+  test.skip('@metamask/connect-evm (wagmi) - Session stability via Wagmi', async ({
+    currentDeviceDetails,
+    driver,
+  }) => {
+    const platform = currentDeviceDetails.platform;
+    const useBrowserStackLocal =
+      process.env.BROWSERSTACK_LOCAL?.toLowerCase() === 'true';
+    const DAPP_URL = useBrowserStackLocal
+      ? `http://bs-local.com:${DAPP_PORT}`
+      : getDappUrlForBrowser(platform);
+
+    //
+    // Login and navigate to dapp
+    //
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await loginToAppPlaywright();
+      await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
+      await launchMobileBrowser();
+      await navigateToDapp(DAPP_URL);
+    });
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapConnectWagmi();
-  }, DAPP_URL);
+    await sleep(5000);
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await unlockIfLockScreenVisible();
-    await DappConnectionModal.tapConnectButton();
-  });
+    //
+    // Connect via WAGMI
+    //
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapConnectWagmi();
+    }, DAPP_URL);
 
-  //
-  // Verify connection and sign message on Ethereum
-  //
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await unlockIfLockScreenVisible();
+      await DappConnectionModal.tapConnectButton();
+    });
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiConnected(true);
-    await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
-    await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_ADDRESS);
-    await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello MetaMask');
-    await PlaywrightGestures.hideKeyboard();
-    await BrowserPlaygroundDapp.tapWagmiSignMessage();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.assertNetworkText('Ethereum');
-    await SignModal.tapConfirmButton();
-  });
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
+
+    //
+    // Verify connection and sign message on Ethereum
+    //
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiConnected(true);
+      await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
+      await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_ADDRESS);
+      await BrowserPlaygroundDapp.typeWagmiSignMessage('Hello MetaMask');
+      await PlaywrightGestures.hideKeyboard();
+      await BrowserPlaygroundDapp.tapWagmiSignMessage();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.assertNetworkText('Ethereum');
+      await SignModal.tapConfirmButton();
+    });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiSignatureResult('0x');
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiSignatureResult('0x');
+    }, DAPP_URL);
 
-  //
-  // Resume from refresh
-  //
+    //
+    // Resume from refresh
+    //
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await refreshMobileBrowser();
-  });
-  await sleep(2000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiConnected(true);
-    // Note: Chain may reset to 1 after refresh
-    await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
-    await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_ADDRESS);
-    await BrowserPlaygroundDapp.typeWagmiSignMessage('After refresh');
-    await PlaywrightGestures.hideKeyboard();
-    await BrowserPlaygroundDapp.tapWagmiSignMessage();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await SignModal.tapCancelButton();
-  });
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await refreshMobileBrowser();
+    });
+    await sleep(2000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiConnected(true);
+      // Note: Chain may reset to 1 after refresh
+      await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
+      await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_ADDRESS);
+      await BrowserPlaygroundDapp.typeWagmiSignMessage('After refresh');
+      await PlaywrightGestures.hideKeyboard();
+      await BrowserPlaygroundDapp.tapWagmiSignMessage();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await SignModal.tapCancelButton();
+    });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  //
-  // Terminate and connect
-  //
+    //
+    // Terminate and connect
+    //
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-    await BrowserPlaygroundDapp.assertWagmiConnected(false);
-    await BrowserPlaygroundDapp.tapConnectWagmi();
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+      await BrowserPlaygroundDapp.assertWagmiConnected(false);
+      await BrowserPlaygroundDapp.tapConnectWagmi();
+    }, DAPP_URL);
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    await DappConnectionModal.tapConnectButton();
-  });
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      await DappConnectionModal.tapConnectButton();
+    });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiConnected(true);
-    await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
-    await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_ADDRESS);
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiConnected(true);
+      await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
+      await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_ADDRESS);
+    }, DAPP_URL);
 
-  //
-  // Wait for incomplete session timeout on refresh and reconnect after
-  //
+    //
+    // Wait for incomplete session timeout on refresh and reconnect after
+    //
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-    await BrowserPlaygroundDapp.tapConnectWagmi();
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+      await BrowserPlaygroundDapp.tapConnectWagmi();
+    }, DAPP_URL);
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    // Purposely not interacting with the approval
-  });
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      // Purposely not interacting with the approval
+    });
 
-  await sleep(2000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(2000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await refreshMobileBrowser();
-  });
-  await sleep(2000);
-
-  // After timeout, should be disconnected
-  await sleep(10000);
-
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiConnected(false);
-    await BrowserPlaygroundDapp.tapConnectWagmi();
-  }, DAPP_URL);
-
-  await PlaywrightContextHelpers.withNativeAction(async () => {
-    await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
-    // TODO: We're having a double connect prompt. After approving the
-    // connection, a second prompt with empty accounts is shown.
-    await DappConnectionModal.tapConnectButton({
-      shouldCooldown: true,
-      timeToCooldown: 2000,
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await refreshMobileBrowser();
+    });
+    await sleep(2000);
+
+    // After timeout, should be disconnected
+    await sleep(10000);
+
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiConnected(false);
+      await BrowserPlaygroundDapp.tapConnectWagmi();
+    }, DAPP_URL);
+
+    await PlaywrightContextHelpers.withNativeAction(async () => {
+      await AndroidScreenHelpers.tapOpenDeeplinkWithMetaMask();
+      // TODO: We're having a double connect prompt. After approving the
+      // connection, a second prompt with empty accounts is shown.
+      await DappConnectionModal.tapConnectButton({
+        shouldCooldown: true,
+        timeToCooldown: 2000,
+      });
     });
-  });
 
-  await sleep(1000);
-  await switchToMobileBrowser();
-  await sleep(1000);
+    await sleep(1000);
+    await switchToMobileBrowser();
+    await sleep(1000);
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.assertWagmiConnected(true);
-    await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
-    await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_ADDRESS);
-  }, DAPP_URL);
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.assertWagmiConnected(true);
+      await BrowserPlaygroundDapp.assertWagmiChainIdValue('1');
+      await BrowserPlaygroundDapp.assertWagmiActiveAccount(ACCOUNT_1_ADDRESS);
+    }, DAPP_URL);
 
-  //
-  // Reset dapp state
-  //
+    //
+    // Reset dapp state
+    //
 
-  await PlaywrightContextHelpers.withWebAction(async () => {
-    await BrowserPlaygroundDapp.tapDisconnect();
-  }, DAPP_URL);
-});
+    await PlaywrightContextHelpers.withWebAction(async () => {
+      await BrowserPlaygroundDapp.tapDisconnect();
+    }, DAPP_URL);
+  });
+}); // end describe
diff --git a/tests/performance/mm-connect/legacy-evm-rn-connect.spec.ts b/tests/performance/mm-connect/legacy-evm-rn-connect.spec.ts
index 55c04a0bd22..2561487efb2 100644
--- a/tests/performance/mm-connect/legacy-evm-rn-connect.spec.ts
+++ b/tests/performance/mm-connect/legacy-evm-rn-connect.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import RNPlaygroundDapp from '../../page-objects/MMConnect/RNPlaygroundDapp';
@@ -17,160 +18,162 @@ async function returnToPlayground() {
   await RNPlaygroundDapp.ensureInPlayground();
 }
 
-test('@metamask/connect-legacy-evm-rn - Connect via Legacy EVM, sign, send transaction, and switch chains', async ({
-  currentDeviceDetails,
-  driver,
-}) => {
-  // When running on BrowserStack we skip the test if the RN playground is not installed
-  test.skip(
-    currentDeviceDetails.isBrowserstack &&
-      !process.env.BROWSERSTACK_RN_PLAYGROUND_URL,
-    'Skipped: BROWSERSTACK_RN_PLAYGROUND_URL is not set',
-  );
-
-  // handle local installs of the RN playground
-  if (!currentDeviceDetails.isBrowserstack) {
-    ensurePlaygroundInstalled(currentDeviceDetails);
-  }
-
-  //
-  // 1. Login to MetaMask wallet
-  //
-  await loginToAppPlaywright();
-
-  //
-  // 2. Switch to the RN playground and connect via Legacy EVM
-  //
-  await RNPlaygroundDapp.switchToPlayground();
-  await RNPlaygroundDapp.waitForPlaygroundReady();
-
-  await RNPlaygroundDapp.tapConnectLegacy();
-  await sleep(3000);
-
-  await unlockIfLockScreenVisible();
-  await sleep(5000);
-  await DappConnectionModal.tapConnectButton({
-    shouldCooldown: true,
-    timeToCooldown: 3000,
-  });
-
-  //
-  // 3. Verify accountsChanged — Legacy EVM card visible with accounts
-  //
-
-  await returnToPlayground();
-  await sleep(2000);
-
-  await RNPlaygroundDapp.scrollToElement(RNPlaygroundDapp.appTitle, {
-    scrollParams: { direction: 'down' },
-  });
-  await RNPlaygroundDapp.scrollToElement(RNPlaygroundDapp.legacyEvmCard);
-  await RNPlaygroundDapp.assertLegacyEvmConnected();
-  await RNPlaygroundDapp.assertLegacyEvmHasAccounts();
-  await RNPlaygroundDapp.assertLegacyEvmActiveAccount();
-
-  const initialChainId = await RNPlaygroundDapp.getLegacyEvmChainId();
-  console.log(`Initial chain ID: ${initialChainId}`);
-
-  //
-  // 4. personal_sign — request, approve, verify result
-  //
-  await RNPlaygroundDapp.scrollToElement(
-    RNPlaygroundDapp.legacyEvmBtnPersonalSign,
-  );
-  await RNPlaygroundDapp.tapLegacyEvmButton(
-    RNPlaygroundDapp.legacyEvmBtnPersonalSign,
-  );
-  await sleep(3000);
-
-  await unlockIfLockScreenVisible();
-  await sleep(1000);
-  await SignModal.tapConfirmButton({
-    shouldCooldown: true,
-    timeToCooldown: 3000,
-  });
-
-  await returnToPlayground();
-  await sleep(1000);
-
-  // Verify signature was returned (hex string starting with 0x)
-  await RNPlaygroundDapp.scrollToElement(
-    RNPlaygroundDapp.legacyEvmResponseText,
-  );
-  const signResponse = await RNPlaygroundDapp.getLegacyEvmResponseText();
-  console.log(`personal_sign response: ${signResponse}`);
-  console.log(`personal_sign contains 0x: ${signResponse.includes('0x')}`);
-
-  //
-  // 5. eth_sendTransaction — request, cancel (to avoid spending funds)
-  //
-  await RNPlaygroundDapp.scrollToElement(
-    RNPlaygroundDapp.legacyEvmBtnSendTransaction,
-  );
-  await RNPlaygroundDapp.tapLegacyEvmButton(
-    RNPlaygroundDapp.legacyEvmBtnSendTransaction,
-  );
-  await sleep(3000);
-
-  await unlockIfLockScreenVisible();
-  await sleep(1000);
-
-  // Cancel the transaction to avoid spending real funds
-  await SignModal.tapCancelButton({
-    shouldCooldown: true,
-    timeToCooldown: 3000,
-  });
-
-  await returnToPlayground();
-  await sleep(1000);
-
-  // The dapp should show an error (user rejected) in the response
-
-  await RNPlaygroundDapp.scrollToElement(
-    RNPlaygroundDapp.legacyEvmResponseText,
-    {
+test.describe(Performance, () => {
+  test('@metamask/connect-legacy-evm-rn - Connect via Legacy EVM, sign, send transaction, and switch chains', async ({
+    currentDeviceDetails,
+    driver,
+  }) => {
+    // When running on BrowserStack we skip the test if the RN playground is not installed
+    test.skip(
+      currentDeviceDetails.isBrowserstack &&
+        !process.env.BROWSERSTACK_RN_PLAYGROUND_URL,
+      'Skipped: BROWSERSTACK_RN_PLAYGROUND_URL is not set',
+    );
+
+    // handle local installs of the RN playground
+    if (!currentDeviceDetails.isBrowserstack) {
+      ensurePlaygroundInstalled(currentDeviceDetails);
+    }
+
+    //
+    // 1. Login to MetaMask wallet
+    //
+    await loginToAppPlaywright();
+
+    //
+    // 2. Switch to the RN playground and connect via Legacy EVM
+    //
+    await RNPlaygroundDapp.switchToPlayground();
+    await RNPlaygroundDapp.waitForPlaygroundReady();
+
+    await RNPlaygroundDapp.tapConnectLegacy();
+    await sleep(3000);
+
+    await unlockIfLockScreenVisible();
+    await sleep(5000);
+    await DappConnectionModal.tapConnectButton({
+      shouldCooldown: true,
+      timeToCooldown: 3000,
+    });
+
+    //
+    // 3. Verify accountsChanged — Legacy EVM card visible with accounts
+    //
+
+    await returnToPlayground();
+    await sleep(2000);
+
+    await RNPlaygroundDapp.scrollToElement(RNPlaygroundDapp.appTitle, {
       scrollParams: { direction: 'down' },
-      percent: 0.5,
-    },
-  );
-
-  const txResponse = await RNPlaygroundDapp.getLegacyEvmResponseText();
-  console.log(`eth_sendTransaction (cancelled) response: ${txResponse}`);
-  console.log(
-    `eth_sendTransaction contains denied: ${txResponse.toLowerCase().includes('denied')}`,
-  );
-
-  //
-  // 6. Chain switching from the dapp — wallet_switchEthereumChain
-  //    Switch to Polygon from the dapp, verify the chain ID updates.
-  //
-
-  await RNPlaygroundDapp.scrollToElement(
-    RNPlaygroundDapp.legacyEvmBtnSwitchPolygon,
-  );
-  await RNPlaygroundDapp.tapLegacyEvmButton(
-    RNPlaygroundDapp.legacyEvmBtnSwitchPolygon,
-  );
-  await sleep(3000);
-
-  // The switch opens MetaMask with a network approval dialog.
-  // The SwitchChainApproval dialog uses "connect-button" as its confirm testID.
-  await unlockIfLockScreenVisible();
-  await sleep(1000);
-  await DappConnectionModal.tapConnectButton({
-    shouldCooldown: true,
-    timeToCooldown: 3000,
+    });
+    await RNPlaygroundDapp.scrollToElement(RNPlaygroundDapp.legacyEvmCard);
+    await RNPlaygroundDapp.assertLegacyEvmConnected();
+    await RNPlaygroundDapp.assertLegacyEvmHasAccounts();
+    await RNPlaygroundDapp.assertLegacyEvmActiveAccount();
+
+    const initialChainId = await RNPlaygroundDapp.getLegacyEvmChainId();
+    console.log(`Initial chain ID: ${initialChainId}`);
+
+    //
+    // 4. personal_sign — request, approve, verify result
+    //
+    await RNPlaygroundDapp.scrollToElement(
+      RNPlaygroundDapp.legacyEvmBtnPersonalSign,
+    );
+    await RNPlaygroundDapp.tapLegacyEvmButton(
+      RNPlaygroundDapp.legacyEvmBtnPersonalSign,
+    );
+    await sleep(3000);
+
+    await unlockIfLockScreenVisible();
+    await sleep(1000);
+    await SignModal.tapConfirmButton({
+      shouldCooldown: true,
+      timeToCooldown: 3000,
+    });
+
+    await returnToPlayground();
+    await sleep(1000);
+
+    // Verify signature was returned (hex string starting with 0x)
+    await RNPlaygroundDapp.scrollToElement(
+      RNPlaygroundDapp.legacyEvmResponseText,
+    );
+    const signResponse = await RNPlaygroundDapp.getLegacyEvmResponseText();
+    console.log(`personal_sign response: ${signResponse}`);
+    console.log(`personal_sign contains 0x: ${signResponse.includes('0x')}`);
+
+    //
+    // 5. eth_sendTransaction — request, cancel (to avoid spending funds)
+    //
+    await RNPlaygroundDapp.scrollToElement(
+      RNPlaygroundDapp.legacyEvmBtnSendTransaction,
+    );
+    await RNPlaygroundDapp.tapLegacyEvmButton(
+      RNPlaygroundDapp.legacyEvmBtnSendTransaction,
+    );
+    await sleep(3000);
+
+    await unlockIfLockScreenVisible();
+    await sleep(1000);
+
+    // Cancel the transaction to avoid spending real funds
+    await SignModal.tapCancelButton({
+      shouldCooldown: true,
+      timeToCooldown: 3000,
+    });
+
+    await returnToPlayground();
+    await sleep(1000);
+
+    // The dapp should show an error (user rejected) in the response
+
+    await RNPlaygroundDapp.scrollToElement(
+      RNPlaygroundDapp.legacyEvmResponseText,
+      {
+        scrollParams: { direction: 'down' },
+        percent: 0.5,
+      },
+    );
+
+    const txResponse = await RNPlaygroundDapp.getLegacyEvmResponseText();
+    console.log(`eth_sendTransaction (cancelled) response: ${txResponse}`);
+    console.log(
+      `eth_sendTransaction contains denied: ${txResponse.toLowerCase().includes('denied')}`,
+    );
+
+    //
+    // 6. Chain switching from the dapp — wallet_switchEthereumChain
+    //    Switch to Polygon from the dapp, verify the chain ID updates.
+    //
+
+    await RNPlaygroundDapp.scrollToElement(
+      RNPlaygroundDapp.legacyEvmBtnSwitchPolygon,
+    );
+    await RNPlaygroundDapp.tapLegacyEvmButton(
+      RNPlaygroundDapp.legacyEvmBtnSwitchPolygon,
+    );
+    await sleep(3000);
+
+    // The switch opens MetaMask with a network approval dialog.
+    // The SwitchChainApproval dialog uses "connect-button" as its confirm testID.
+    await unlockIfLockScreenVisible();
+    await sleep(1000);
+    await DappConnectionModal.tapConnectButton({
+      shouldCooldown: true,
+      timeToCooldown: 3000,
+    });
+
+    await returnToPlayground();
+    await sleep(2000);
+
+    // Verify chain ID updated to Polygon (0x89)
+    await RNPlaygroundDapp.scrollToElement(
+      RNPlaygroundDapp.legacyEvmChainIdValue,
+      { scrollParams: { direction: 'down' } },
+    );
+    const polygonChainId = await RNPlaygroundDapp.getLegacyEvmChainId();
+    console.log(`Chain ID after dapp switch to Polygon: ${polygonChainId}`);
+    console.log(`Chain ID contains 0x89: ${polygonChainId.includes('0x89')}`);
   });
-
-  await returnToPlayground();
-  await sleep(2000);
-
-  // Verify chain ID updated to Polygon (0x89)
-  await RNPlaygroundDapp.scrollToElement(
-    RNPlaygroundDapp.legacyEvmChainIdValue,
-    { scrollParams: { direction: 'down' } },
-  );
-  const polygonChainId = await RNPlaygroundDapp.getLegacyEvmChainId();
-  console.log(`Chain ID after dapp switch to Polygon: ${polygonChainId}`);
-  console.log(`Chain ID contains 0x89: ${polygonChainId.includes('0x89')}`);
-});
+}); // end describe
diff --git a/tests/performance/mm-connect/multichain-rn-evm.spec.ts b/tests/performance/mm-connect/multichain-rn-evm.spec.ts
index 6576f35939f..250be3e0f8d 100644
--- a/tests/performance/mm-connect/multichain-rn-evm.spec.ts
+++ b/tests/performance/mm-connect/multichain-rn-evm.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import RNPlaygroundDapp from '../../page-objects/MMConnect/RNPlaygroundDapp';
@@ -77,145 +78,153 @@ async function returnToPlayground() {
 //    - Assert session is disconnected
 //    - Switch to MetaMask and unlock if needed to confirm no active session
 
-test('@metamask/connect-multichain-rn-evm - Connect across 3 EVM chains, invoke read/write methods, and disconnect', async ({
-  currentDeviceDetails,
-  driver,
-}) => {
-  // When running on BrowserStack we skip the test if the RN playground is not installed
-  test.skip(
-    currentDeviceDetails.isBrowserstack &&
-      !process.env.BROWSERSTACK_RN_PLAYGROUND_URL,
-    'Skipped: BROWSERSTACK_RN_PLAYGROUND_URL is not set',
-  );
-
-  // handle local installs of the RN playground
-  if (!currentDeviceDetails.isBrowserstack) {
-    ensurePlaygroundInstalled(currentDeviceDetails);
-  }
-
-  //
-  // 1. Login to MetaMask wallet
-  //
-  await loginToAppPlaywright();
-  await PlaywrightAssertions.expectElementToBeVisible(
-    await asPlaywrightElement(WalletView.container),
-    { timeout: 15000 },
-  );
-
-  await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
-
-  //
-  // 2. Switch to the RN playground and select networks
-  //
-  await RNPlaygroundDapp.switchToPlayground();
-  await RNPlaygroundDapp.waitForPlaygroundReady();
-
-  // Ethereum (eip155:1) is selected by default; add two more EVM networks
-  await RNPlaygroundDapp.tapNetworkCheckbox(CHAINS.LINEA);
-  await RNPlaygroundDapp.tapNetworkCheckbox(CHAINS.POLYGON);
-
-  //
-  // 3. Connect via Multichain API
-  //
-  await RNPlaygroundDapp.tapConnect();
-  await sleep(3000);
-
-  await unlockIfLockScreenVisible();
-  await sleep(5000);
-  await DappConnectionModal.tapConnectButton({
-    shouldCooldown: true,
-    timeToCooldown: 3000,
-  });
-
-  //
-  // 4. Return to playground, verify EVM connections, and invoke read requests
-  //
-  await returnToPlayground();
-  await RNPlaygroundDapp.assertConnected();
-
-  for (const chain of EVM_CHAINS) {
-    await RNPlaygroundDapp.scrollToElement(
-      RNPlaygroundDapp.getInvokeButton(chain),
-      {
-        percent: 0.5,
-      },
+test.describe(Performance, () => {
+  test('@metamask/connect-multichain-rn-evm - Connect across 3 EVM chains, invoke read/write methods, and disconnect', async ({
+    currentDeviceDetails,
+    driver,
+  }) => {
+    // When running on BrowserStack we skip the test if the RN playground is not installed
+    test.skip(
+      currentDeviceDetails.isBrowserstack &&
+        !process.env.BROWSERSTACK_RN_PLAYGROUND_URL,
+      'Skipped: BROWSERSTACK_RN_PLAYGROUND_URL is not set',
     );
-    await RNPlaygroundDapp.tapInvoke(chain);
-    await sleep(5000);
 
-    await RNPlaygroundDapp.scrollToElement(
-      RNPlaygroundDapp.getResultCode(chain, 'eth_blockNumber'),
-      {
-        percent: 0.5,
-      },
-    );
-    await RNPlaygroundDapp.assertResultCodeContains(
-      chain,
-      'eth_blockNumber',
-      '0x',
+    // handle local installs of the RN playground
+    if (!currentDeviceDetails.isBrowserstack) {
+      ensurePlaygroundInstalled(currentDeviceDetails);
+    }
+
+    //
+    // 1. Login to MetaMask wallet
+    //
+    await loginToAppPlaywright();
+    await PlaywrightAssertions.expectElementToBeVisible(
+      await asPlaywrightElement(WalletView.container),
+      { timeout: 15000 },
     );
 
-    // Test the write request
-    await RNPlaygroundDapp.selectMethod(chain, 'personal_sign', 10, 2, 'down');
+    await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
 
-    await RNPlaygroundDapp.scrollToElement(
-      RNPlaygroundDapp.getInvokeButton(chain),
-      {
-        percent: 0.5,
-      },
-    );
-    await RNPlaygroundDapp.tapInvoke(chain);
+    //
+    // 2. Switch to the RN playground and select networks
+    //
+    await RNPlaygroundDapp.switchToPlayground();
+    await RNPlaygroundDapp.waitForPlaygroundReady();
+
+    // Ethereum (eip155:1) is selected by default; add two more EVM networks
+    await RNPlaygroundDapp.tapNetworkCheckbox(CHAINS.LINEA);
+    await RNPlaygroundDapp.tapNetworkCheckbox(CHAINS.POLYGON);
+
+    //
+    // 3. Connect via Multichain API
+    //
+    await RNPlaygroundDapp.tapConnect();
     await sleep(3000);
 
-    // Handle MetaMask sign approval
     await unlockIfLockScreenVisible();
-    await sleep(1000);
-
-    // Verify request was routed to the correct network
-    const networkName = NETWORK_DISPLAY_NAMES[chain];
-    if (networkName) {
-      try {
-        await SignModal.assertNetworkText(networkName);
-      } catch {
-        // Network label may not appear for all signing modals; continue
-      }
-    }
-
-    await SignModal.tapConfirmButton({
+    await sleep(5000);
+    await DappConnectionModal.tapConnectButton({
       shouldCooldown: true,
       timeToCooldown: 3000,
     });
+
+    //
+    // 4. Return to playground, verify EVM connections, and invoke read requests
+    //
     await returnToPlayground();
+    await RNPlaygroundDapp.assertConnected();
+
+    for (const chain of EVM_CHAINS) {
+      await RNPlaygroundDapp.scrollToElement(
+        RNPlaygroundDapp.getInvokeButton(chain),
+        {
+          percent: 0.5,
+        },
+      );
+      await RNPlaygroundDapp.tapInvoke(chain);
+      await sleep(5000);
+
+      await RNPlaygroundDapp.scrollToElement(
+        RNPlaygroundDapp.getResultCode(chain, 'eth_blockNumber'),
+        {
+          percent: 0.5,
+        },
+      );
+      await RNPlaygroundDapp.assertResultCodeContains(
+        chain,
+        'eth_blockNumber',
+        '0x',
+      );
+
+      // Test the write request
+      await RNPlaygroundDapp.selectMethod(
+        chain,
+        'personal_sign',
+        10,
+        2,
+        'down',
+      );
+
+      await RNPlaygroundDapp.scrollToElement(
+        RNPlaygroundDapp.getInvokeButton(chain),
+        {
+          percent: 0.5,
+        },
+      );
+      await RNPlaygroundDapp.tapInvoke(chain);
+      await sleep(3000);
+
+      // Handle MetaMask sign approval
+      await unlockIfLockScreenVisible();
+      await sleep(1000);
+
+      // Verify request was routed to the correct network
+      const networkName = NETWORK_DISPLAY_NAMES[chain];
+      if (networkName) {
+        try {
+          await SignModal.assertNetworkText(networkName);
+        } catch {
+          // Network label may not appear for all signing modals; continue
+        }
+      }
 
-    // Verify a signature was returned (hex string starting with 0x)
-    await RNPlaygroundDapp.scrollToElement(
-      RNPlaygroundDapp.getResultCode(chain, 'personal_sign'),
-      {
-        percent: 0.5,
-        scrollParams: { direction: 'up' },
-      },
-    );
-    await RNPlaygroundDapp.assertResultCodeContains(
-      chain,
-      'personal_sign',
-      '0x',
-    );
-  }
-
-  // Eager swipe up as the disconnect button sits at the top of the Dapp
-  await PlaywrightGestures.swipe({
-    scrollParams: { direction: 'down' },
-    duration: 100,
-    from: { x: 100, y: 300 },
-    to: { x: 100, y: 1700 },
-    percent: 0.5,
-  });
+      await SignModal.tapConfirmButton({
+        shouldCooldown: true,
+        timeToCooldown: 3000,
+      });
+      await returnToPlayground();
+
+      // Verify a signature was returned (hex string starting with 0x)
+      await RNPlaygroundDapp.scrollToElement(
+        RNPlaygroundDapp.getResultCode(chain, 'personal_sign'),
+        {
+          percent: 0.5,
+          scrollParams: { direction: 'up' },
+        },
+      );
+      await RNPlaygroundDapp.assertResultCodeContains(
+        chain,
+        'personal_sign',
+        '0x',
+      );
+    }
 
-  // Scroll back to the top where the disconnect button lives
-  await RNPlaygroundDapp.scrollToElement(RNPlaygroundDapp.disconnectButton, {
-    scrollParams: { direction: 'down' },
-    percent: 0.5,
+    // Eager swipe up as the disconnect button sits at the top of the Dapp
+    await PlaywrightGestures.swipe({
+      scrollParams: { direction: 'down' },
+      duration: 100,
+      from: { x: 100, y: 300 },
+      to: { x: 100, y: 1700 },
+      percent: 0.5,
+    });
+
+    // Scroll back to the top where the disconnect button lives
+    await RNPlaygroundDapp.scrollToElement(RNPlaygroundDapp.disconnectButton, {
+      scrollParams: { direction: 'down' },
+      percent: 0.5,
+    });
+    await RNPlaygroundDapp.tapDisconnect();
+    await RNPlaygroundDapp.assertDisconnected();
   });
-  await RNPlaygroundDapp.tapDisconnect();
-  await RNPlaygroundDapp.assertDisconnected();
-});
+}); // end describe
diff --git a/tests/performance/mm-connect/multichain-rn-solana.spec.ts b/tests/performance/mm-connect/multichain-rn-solana.spec.ts
index 7b7f48be8a2..3db661cff79 100644
--- a/tests/performance/mm-connect/multichain-rn-solana.spec.ts
+++ b/tests/performance/mm-connect/multichain-rn-solana.spec.ts
@@ -1,4 +1,5 @@
 import { test } from '../../framework/fixture';
+import { Performance } from '../../tags.performance.js';
 
 import { loginToAppPlaywright } from '../../flows/wallet.flow';
 import RNPlaygroundDapp from '../../page-objects/MMConnect/RNPlaygroundDapp';
@@ -65,122 +66,124 @@ async function returnToPlayground() {
 //    - Assert session is disconnected
 //    - Switch to MetaMask and unlock if needed to confirm no active session
 
-test('@metamask/connect-multichain-rn-solana - Connect with Solana, invoke signMessage, and disconnect', async ({
-  currentDeviceDetails,
-  driver,
-}) => {
-  // When running on BrowserStack we skip the test if the RN playground is not installed
-  test.skip(
-    currentDeviceDetails.isBrowserstack &&
-      !process.env.BROWSERSTACK_RN_PLAYGROUND_URL,
-    'Skipped: BROWSERSTACK_RN_PLAYGROUND_URL is not set',
-  );
-
-  // handle local installs of the RN playground
-  if (!currentDeviceDetails.isBrowserstack) {
-    ensurePlaygroundInstalled(currentDeviceDetails);
-  }
-
-  //
-  // 1. Login to MetaMask wallet
-  //
-  await loginToAppPlaywright();
-  await PlaywrightAssertions.expectElementToBeVisible(
-    await asPlaywrightElement(WalletView.container),
-    { timeout: 15000 },
-  );
-
-  await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
-
-  //
-  // 2. Switch to the RN playground and select networks
-  //
-  await RNPlaygroundDapp.switchToPlayground();
-  await RNPlaygroundDapp.waitForPlaygroundReady();
-
-  // Ethereum (eip155:1) is selected by default; add three more networks
-  await RNPlaygroundDapp.tapNetworkCheckbox(CHAINS.LINEA);
-  await RNPlaygroundDapp.tapNetworkCheckbox(CHAINS.POLYGON);
-  await RNPlaygroundDapp.tapNetworkCheckbox(CHAINS.SOLANA);
-
-  //
-  // 3. Connect via Multichain API
-  //
-  await RNPlaygroundDapp.tapConnect();
-  await sleep(3000);
-
-  await unlockIfLockScreenVisible();
-  await sleep(5000);
-  await DappConnectionModal.tapConnectButton({
-    shouldCooldown: true,
-    timeToCooldown: 3000,
-  });
-
-  //
-  // 4. Return to playground and verify Solana connection is active
-  //
-  await returnToPlayground();
-
-  await RNPlaygroundDapp.assertConnected();
-
-  await RNPlaygroundDapp.scrollToElement(RNPlaygroundDapp.appTitle, {
-    scrollParams: { direction: 'down' },
-    percent: 0.5,
-  });
-
-  await RNPlaygroundDapp.scrollToElement(
-    RNPlaygroundDapp.getScopeCard(CHAINS.SOLANA),
-    {
+test.describe(Performance, () => {
+  test('@metamask/connect-multichain-rn-solana - Connect with Solana, invoke signMessage, and disconnect', async ({
+    currentDeviceDetails,
+    driver,
+  }) => {
+    // When running on BrowserStack we skip the test if the RN playground is not installed
+    test.skip(
+      currentDeviceDetails.isBrowserstack &&
+        !process.env.BROWSERSTACK_RN_PLAYGROUND_URL,
+      'Skipped: BROWSERSTACK_RN_PLAYGROUND_URL is not set',
+    );
+
+    // handle local installs of the RN playground
+    if (!currentDeviceDetails.isBrowserstack) {
+      ensurePlaygroundInstalled(currentDeviceDetails);
+    }
+
+    //
+    // 1. Login to MetaMask wallet
+    //
+    await loginToAppPlaywright();
+    await PlaywrightAssertions.expectElementToBeVisible(
+      await asPlaywrightElement(WalletView.container),
+      { timeout: 15000 },
+    );
+
+    await ensureAccountGroupsFinishedLoading(currentDeviceDetails);
+
+    //
+    // 2. Switch to the RN playground and select networks
+    //
+    await RNPlaygroundDapp.switchToPlayground();
+    await RNPlaygroundDapp.waitForPlaygroundReady();
+
+    // Ethereum (eip155:1) is selected by default; add three more networks
+    await RNPlaygroundDapp.tapNetworkCheckbox(CHAINS.LINEA);
+    await RNPlaygroundDapp.tapNetworkCheckbox(CHAINS.POLYGON);
+    await RNPlaygroundDapp.tapNetworkCheckbox(CHAINS.SOLANA);
+
+    //
+    // 3. Connect via Multichain API
+    //
+    await RNPlaygroundDapp.tapConnect();
+    await sleep(3000);
+
+    await unlockIfLockScreenVisible();
+    await sleep(5000);
+    await DappConnectionModal.tapConnectButton({
+      shouldCooldown: true,
+      timeToCooldown: 3000,
+    });
+
+    //
+    // 4. Return to playground and verify Solana connection is active
+    //
+    await returnToPlayground();
+
+    await RNPlaygroundDapp.assertConnected();
+
+    await RNPlaygroundDapp.scrollToElement(RNPlaygroundDapp.appTitle, {
+      scrollParams: { direction: 'down' },
       percent: 0.5,
-    },
-  );
-  await RNPlaygroundDapp.assertScopeCardVisible(CHAINS.SOLANA);
-
-  //
-  // 5. Solana write request — signMessage
-  //
-  await RNPlaygroundDapp.scrollToElement(
-    RNPlaygroundDapp.getMethodSelect(CHAINS.SOLANA),
-    {
-      percent: 0.5,
-    },
-  );
-  await RNPlaygroundDapp.selectMethod(CHAINS.SOLANA, 'signMessage');
-
-  await RNPlaygroundDapp.scrollToElement(
-    RNPlaygroundDapp.getInvokeButton(CHAINS.SOLANA),
-    {
-      percent: 0.5,
-    },
-  );
-  await RNPlaygroundDapp.tapInvoke(CHAINS.SOLANA);
-  await sleep(3000);
-
-  await unlockIfLockScreenVisible();
-  await sleep(1000);
-  await SnapSignModal.tapConfirmButton({
-    shouldCooldown: true,
-    timeToCooldown: 3000,
-  });
-  await returnToPlayground();
-
-  await RNPlaygroundDapp.scrollToElement(
-    RNPlaygroundDapp.getResultCode(CHAINS.SOLANA, 'signMessage'),
-    {
+    });
+
+    await RNPlaygroundDapp.scrollToElement(
+      RNPlaygroundDapp.getScopeCard(CHAINS.SOLANA),
+      {
+        percent: 0.5,
+      },
+    );
+    await RNPlaygroundDapp.assertScopeCardVisible(CHAINS.SOLANA);
+
+    //
+    // 5. Solana write request — signMessage
+    //
+    await RNPlaygroundDapp.scrollToElement(
+      RNPlaygroundDapp.getMethodSelect(CHAINS.SOLANA),
+      {
+        percent: 0.5,
+      },
+    );
+    await RNPlaygroundDapp.selectMethod(CHAINS.SOLANA, 'signMessage');
+
+    await RNPlaygroundDapp.scrollToElement(
+      RNPlaygroundDapp.getInvokeButton(CHAINS.SOLANA),
+      {
+        percent: 0.5,
+      },
+    );
+    await RNPlaygroundDapp.tapInvoke(CHAINS.SOLANA);
+    await sleep(3000);
+
+    await unlockIfLockScreenVisible();
+    await sleep(1000);
+    await SnapSignModal.tapConfirmButton({
+      shouldCooldown: true,
+      timeToCooldown: 3000,
+    });
+    await returnToPlayground();
+
+    await RNPlaygroundDapp.scrollToElement(
+      RNPlaygroundDapp.getResultCode(CHAINS.SOLANA, 'signMessage'),
+      {
+        percent: 0.5,
+      },
+    );
+    await RNPlaygroundDapp.waitForResult(CHAINS.SOLANA, 'signMessage');
+
+    //
+    // 6. Disconnect (wallet_revokeSession) and verify session termination
+    //
+
+    // Scroll back to the top where the disconnect button lives
+    await RNPlaygroundDapp.scrollToElement(RNPlaygroundDapp.disconnectButton, {
+      scrollParams: { direction: 'down' },
       percent: 0.5,
-    },
-  );
-  await RNPlaygroundDapp.waitForResult(CHAINS.SOLANA, 'signMessage');
-
-  //
-  // 6. Disconnect (wallet_revokeSession) and verify session termination
-  //
-
-  // Scroll back to the top where the disconnect button lives
-  await RNPlaygroundDapp.scrollToElement(RNPlaygroundDapp.disconnectButton, {
-    scrollParams: { direction: 'down' },
-    percent: 0.5,
+    });
+    await RNPlaygroundDapp.tapDisconnect();
+    await RNPlaygroundDapp.assertDisconnected();
   });
-  await RNPlaygroundDapp.tapDisconnect();
-  await RNPlaygroundDapp.assertDisconnected();
-});
+}); // end describe
diff --git a/tests/performance/onboarding/import-wallet.spec.ts b/tests/performance/onboarding/import-wallet.spec.ts
index 13c05aacd0c..7ffd6b10762 100644
--- a/tests/performance/onboarding/import-wallet.spec.ts
+++ b/tests/performance/onboarding/import-wallet.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '../../framework/fixture';
 import TimerHelper from '../../framework/TimerHelper';
 import { getPasswordForScenario } from '../../framework/utils/TestConstants.js';
-import { PerformanceOnboarding } from '../../tags.performance.js';
+import { Performance, PerformanceOnboarding } from '../../tags.performance.js';
 import OnboardingView from '../../page-objects/Onboarding/OnboardingView';
 import {
   asPlaywrightElement,
@@ -21,7 +21,7 @@ import { fetchProductionFeatureFlags } from '../feature-flag-helper';
 const testEnvironment = process.env.E2E_PERFORMANCE_BUILD_VARIANT || '';
 
 /* Scenario 4: Imported wallet with +50 accounts */
-test.describe(PerformanceOnboarding, () => {
+test.describe(`${Performance} ${PerformanceOnboarding}`, () => {
   test.setTimeout(240000);
   test(
     'Onboarding Import SRP with +50 accounts, SRP 3',
diff --git a/tests/performance/onboarding/imported-wallet-account-creation.spec.ts b/tests/performance/onboarding/imported-wallet-account-creation.spec.ts
index 686d434b373..c0d00d04aef 100644
--- a/tests/performance/onboarding/imported-wallet-account-creation.spec.ts
+++ b/tests/performance/onboarding/imported-wallet-account-creation.spec.ts
@@ -1,5 +1,6 @@
 import { test } from '../../framework/fixture';
 import {
+  Performance,
   PerformanceOnboarding,
   PerformanceAccountList,
 } from '../../tags.performance.js';
@@ -10,7 +11,7 @@ import TimerHelper from '../../framework/TimerHelper';
 import { onboardingFlowImportSRPPlaywright } from '../../flows/wallet.flow';
 
 /* Scenario 1: Imported wallet with 50+ accounts + account creation */
-test.describe(`${PerformanceOnboarding} ${PerformanceAccountList}`, () => {
+test.describe(`${Performance} ${PerformanceOnboarding} ${PerformanceAccountList}`, () => {
   test.skip(
     'Account creation with 50+ accounts, SRP 1 + SRP 2 + SRP 3',
     { tag: '@metamask-onboarding-team' },
diff --git a/tests/performance/onboarding/launch-times/cold-start-after-wallet-import.spec.ts b/tests/performance/onboarding/launch-times/cold-start-after-wallet-import.spec.ts
index bc87a9bbbfd..c6bcb582327 100644
--- a/tests/performance/onboarding/launch-times/cold-start-after-wallet-import.spec.ts
+++ b/tests/performance/onboarding/launch-times/cold-start-after-wallet-import.spec.ts
@@ -1,5 +1,6 @@
 import { test } from '../../../framework/fixture';
 import {
+  Performance,
   PerformanceOnboarding,
   PerformanceLaunch,
 } from '../../../tags.performance.js';
@@ -14,7 +15,7 @@ import {
 import TimerHelper from '../../../framework/TimerHelper';
 import WalletView from '../../../page-objects/wallet/WalletView';
 
-test.describe(`${PerformanceOnboarding} ${PerformanceLaunch}`, () => {
+test.describe(`${Performance} ${PerformanceOnboarding} ${PerformanceLaunch}`, () => {
   test(
     'Cold Start after importing a wallet',
     { tag: '@metamask-mobile-platform' },
diff --git a/tests/performance/onboarding/launch-times/cold-start-to-onboarding.spec.ts b/tests/performance/onboarding/launch-times/cold-start-to-onboarding.spec.ts
index 11a741806d0..14f9a750018 100644
--- a/tests/performance/onboarding/launch-times/cold-start-to-onboarding.spec.ts
+++ b/tests/performance/onboarding/launch-times/cold-start-to-onboarding.spec.ts
@@ -1,6 +1,7 @@
 import { test } from '../../../framework/fixture';
 import TimerHelper from '../../../framework/TimerHelper.js';
 import {
+  Performance,
   PerformanceOnboarding,
   PerformanceLaunch,
 } from '../../../tags.performance.js';
@@ -8,7 +9,7 @@ import PlaywrightAssertions from '../../../framework/PlaywrightAssertions';
 import OnboardingView from '../../../page-objects/Onboarding/OnboardingView';
 import { asPlaywrightElement } from '../../../framework/EncapsulatedElement';
 
-test.describe(`${PerformanceOnboarding} ${PerformanceLaunch}`, () => {
+test.describe(`${Performance} ${PerformanceOnboarding} ${PerformanceLaunch}`, () => {
   test(
     'Measure Cold Start To Onboarding Screen',
     { tag: '@metamask-mobile-platform' },
diff --git a/tests/performance/onboarding/new-wallet-account-creation.spec.ts b/tests/performance/onboarding/new-wallet-account-creation.spec.ts
index c2181fe7718..1651c43953b 100644
--- a/tests/performance/onboarding/new-wallet-account-creation.spec.ts
+++ b/tests/performance/onboarding/new-wallet-account-creation.spec.ts
@@ -2,6 +2,8 @@ import { test } from '../../framework/fixture';
 import TimerHelper from '../../framework/TimerHelper';
 import { getPasswordForScenario } from '../../framework/utils/TestConstants.js';
 import {
+  Performance,
+  System,
   PerformanceOnboarding,
   PerformanceAccountList,
 } from '../../tags.performance.js';
@@ -25,7 +27,7 @@ import PredictModalView from '../../page-objects/Predict/PredictModalView.js';
 const testEnvironment = process.env.E2E_PERFORMANCE_BUILD_VARIANT || '';
 
 /* Scenario 2: Account creation after fresh install */
-test.describe(`${PerformanceOnboarding} ${PerformanceAccountList}`, () => {
+test.describe(`${Performance} ${System} ${PerformanceOnboarding} ${PerformanceAccountList}`, () => {
   test(
     'Account creation after fresh install',
     { 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 762e5dcd47f..7a884cb78aa 100644
--- a/tests/performance/onboarding/seedless-apple-onboarding.spec.ts
+++ b/tests/performance/onboarding/seedless-apple-onboarding.spec.ts
@@ -3,7 +3,11 @@ import TimerHelper from '../../framework/TimerHelper';
 import { asPlaywrightElement, PlaywrightAssertions } from '../../framework';
 import { getPasswordForScenario } from '../../framework/utils/TestConstants.js';
 import { dismisspredictionsModalPlaywright } from '../../flows/wallet.flow';
-import { PerformanceOnboarding } from '../../tags.performance.js';
+import {
+  Performance,
+  System,
+  PerformanceOnboarding,
+} from '../../tags.performance.js';
 import OnboardingView from '../../page-objects/Onboarding/OnboardingView';
 import OnboardingSheet from '../../page-objects/Onboarding/OnboardingSheet';
 import SocialLoginView from '../../page-objects/Onboarding/SocialLoginView';
@@ -28,7 +32,7 @@ const waitForFirstSuccessful = async <T>(promises: Promise<T>[]): Promise<T> =>
   });
 
 /* Seedless Onboarding: Apple Login */
-test.describe(PerformanceOnboarding, () => {
+test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
   test.setTimeout(240000);
 
   test(
diff --git a/tests/performance/onboarding/seedless-google-onboarding.spec.ts b/tests/performance/onboarding/seedless-google-onboarding.spec.ts
index 809471d5faf..18086dd9f4b 100644
--- a/tests/performance/onboarding/seedless-google-onboarding.spec.ts
+++ b/tests/performance/onboarding/seedless-google-onboarding.spec.ts
@@ -3,7 +3,11 @@ import TimerHelper from '../../framework/TimerHelper';
 import { asPlaywrightElement, PlaywrightAssertions } from '../../framework';
 import { getPasswordForScenario } from '../../framework/utils/TestConstants.js';
 import { dismisspredictionsModalPlaywright } from '../../flows/wallet.flow';
-import { PerformanceOnboarding } from '../../tags.performance.js';
+import {
+  Performance,
+  System,
+  PerformanceOnboarding,
+} from '../../tags.performance.js';
 import OnboardingView from '../../page-objects/Onboarding/OnboardingView';
 import OnboardingSheet from '../../page-objects/Onboarding/OnboardingSheet';
 import SocialLoginView from '../../page-objects/Onboarding/SocialLoginView';
@@ -28,7 +32,7 @@ const waitForFirstSuccessful = async <T>(promises: Promise<T>[]): Promise<T> =>
   });
 
 /* Seedless Onboarding: Google Login */
-test.describe(PerformanceOnboarding, () => {
+test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
   test.setTimeout(240000);
 
   test(
diff --git a/tests/playwright.config.ts b/tests/playwright.config.ts
index d69cbd58723..180221ba3d5 100644
--- a/tests/playwright.config.ts
+++ b/tests/playwright.config.ts
@@ -5,6 +5,7 @@ export default defineConfig({
   testDir: './',
   fullyParallel: false,
   timeout: 7 * 60 * 1000, //7 minutes until we introduce fixtures
+  grep: /@Performance/,
   reporter: [
     [
       'html',
diff --git a/tests/playwright.system-emulator.config.ts b/tests/playwright.system-emulator.config.ts
new file mode 100644
index 00000000000..0a07e60f663
--- /dev/null
+++ b/tests/playwright.system-emulator.config.ts
@@ -0,0 +1,127 @@
+import dotenv from 'dotenv';
+dotenv.config({ path: '.e2e.env' });
+
+import { Platform, ProviderName } from './framework/types';
+import { defineConfig } from './framework/config';
+
+// Activate system test mode — disables quality gates, Sentry, and perf reporting
+process.env.SYSTEM_TEST_MODE = 'true';
+
+// ---------- Default build paths (match Detox / standard build output) ----------
+const DEFAULT_ANDROID_APK =
+  'android/app/build/outputs/apk/prod/debug/app-prod-debug.apk';
+const DEFAULT_IOS_APP =
+  'ios/build/Build/Products/Release-iphonesimulator/MetaMask.app';
+
+/**
+ * System test config for local emulators / simulators.
+ *
+ * Same test specs and SYSTEM_TEST_MODE as playwright.system.config.ts (BrowserStack),
+ * but runs on a local Android emulator or iOS simulator via Appium.
+ *
+ * All environment variables have sensible defaults so you can run system tests
+ * right after a standard debug build (`yarn build:android:main:e2e` / `yarn build:ios:main:e2e`).
+ *
+ * Environment variables (all optional — defaults shown):
+ * - ANDROID_APK_PATH — Path to APK for login tests (default: prod debug APK)
+ * - ANDROID_CLEAN_APK_PATH — Path to clean APK for onboarding (default: same as ANDROID_APK_PATH)
+ * - IOS_APP_PATH — Path to .app for login tests (default: Release-iphonesimulator/MetaMask.app)
+ * - IOS_CLEAN_APP_PATH — Path to clean .app for onboarding (default: same as IOS_APP_PATH)
+ * - ANDROID_AVD_NAME — AVD name (default: 'Pixel_5_Pro_API_34')
+ * - IOS_SIMULATOR_NAME — Simulator name (default: 'iPhone 15 Pro')
+ *
+ * Usage:
+ * yarn run-system-tests:android-login-emu
+ * ANDROID_APK_PATH=/path/to/app.apk yarn run-system-tests:android-login-emu
+ * yarn run-system-tests:ios-login-sim
+ */
+export default defineConfig({
+  testDir: './',
+  fullyParallel: false,
+  timeout: 7 * 60 * 1000,
+  retries: 1,
+  grep: /@System/,
+  reporter: [
+    [
+      'html',
+      { open: 'never', outputFolder: './test-reports/system-test-report' },
+    ],
+    ['list'],
+  ],
+  use: {
+    trace: 'on-first-retry',
+  },
+
+  projects: [
+    {
+      name: 'system-android-login-emu',
+      testMatch: '**/performance/login/**/*.spec.ts',
+      use: {
+        platform: Platform.ANDROID,
+        device: {
+          provider: ProviderName.EMULATOR,
+          name: process.env.ANDROID_AVD_NAME || 'Pixel_5_Pro_API_34',
+        },
+        app: {
+          packageName: 'io.metamask',
+          launchableActivity: 'io.metamask.MainActivity',
+          buildPath: process.env.ANDROID_APK_PATH || DEFAULT_ANDROID_APK,
+        },
+      },
+    },
+    {
+      name: 'system-android-onboarding-emu',
+      testMatch: '**/performance/onboarding/**/*.spec.ts',
+      testIgnore: '**/performance/onboarding/seedless-*.spec.ts',
+      use: {
+        platform: Platform.ANDROID,
+        device: {
+          provider: ProviderName.EMULATOR,
+          name: process.env.ANDROID_AVD_NAME || 'Pixel_5_Pro_API_34',
+        },
+        app: {
+          packageName: 'io.metamask',
+          launchableActivity: 'io.metamask.MainActivity',
+          buildPath:
+            process.env.ANDROID_CLEAN_APK_PATH ||
+            process.env.ANDROID_APK_PATH ||
+            DEFAULT_ANDROID_APK,
+        },
+      },
+    },
+    {
+      name: 'system-ios-login-sim',
+      testMatch: '**/performance/login/**/*.spec.ts',
+      use: {
+        platform: Platform.IOS,
+        device: {
+          provider: ProviderName.SIMULATOR,
+          name: process.env.IOS_SIMULATOR_NAME || 'iPhone 15 Pro',
+        },
+        app: {
+          appId: 'io.metamask.MetaMask',
+          buildPath: process.env.IOS_APP_PATH || DEFAULT_IOS_APP,
+        },
+      },
+    },
+    {
+      name: 'system-ios-onboarding-sim',
+      testMatch: '**/performance/onboarding/**/*.spec.ts',
+      testIgnore: '**/performance/onboarding/seedless-*.spec.ts',
+      use: {
+        platform: Platform.IOS,
+        device: {
+          provider: ProviderName.SIMULATOR,
+          name: process.env.IOS_SIMULATOR_NAME || 'iPhone 15 Pro',
+        },
+        app: {
+          appId: 'io.metamask.MetaMask',
+          buildPath:
+            process.env.IOS_CLEAN_APP_PATH ||
+            process.env.IOS_APP_PATH ||
+            DEFAULT_IOS_APP,
+        },
+      },
+    },
+  ],
+});
diff --git a/tests/playwright.system.config.ts b/tests/playwright.system.config.ts
index 9068705b705..55ae90be3fa 100644
--- a/tests/playwright.system.config.ts
+++ b/tests/playwright.system.config.ts
@@ -11,6 +11,7 @@ export default defineConfig({
   fullyParallel: false,
   timeout: 7 * 60 * 1000,
   retries: 1,
+  grep: /@System/,
   reporter: [
     [
       'html',
diff --git a/tests/regression/multichain/permissions/accounts/permission-system-removing-imported-account.failing.ts b/tests/regression/multichain/permissions/accounts/permission-system-removing-imported-account.failing.ts
index 3ca13e340b3..c45f37455c4 100644
--- a/tests/regression/multichain/permissions/accounts/permission-system-removing-imported-account.failing.ts
+++ b/tests/regression/multichain/permissions/accounts/permission-system-removing-imported-account.failing.ts
@@ -12,7 +12,7 @@ import ConnectedAccountsModal from '../../../../page-objects/Browser/ConnectedAc
 import NetworkListModal from '../../../../page-objects/Network/NetworkListModal';
 import NetworkEducationModal from '../../../../page-objects/Network/NetworkEducationModal';
 
-import Accounts from '../../../../../wdio/helpers/Accounts';
+import Accounts from '../../../../utils/Accounts';
 import { importWalletWithRecoveryPhrase } from '../../../../flows/wallet.flow';
 import { navigateToBrowserView } from '../../../../flows/browser.flow';
 import AddAccountBottomSheet from '../../../../page-objects/wallet/AddAccountBottomSheet';
diff --git a/tests/regression/wallet/deeplinks.failing.ts b/tests/regression/wallet/deeplinks.failing.ts
index 3a79b152e71..1e08bfec800 100644
--- a/tests/regression/wallet/deeplinks.failing.ts
+++ b/tests/regression/wallet/deeplinks.failing.ts
@@ -12,7 +12,7 @@ import SecurityAndPrivacy from '../../page-objects/Settings/SecurityAndPrivacy/S
 import CommonView from '../../page-objects/CommonView';
 import WalletView from '../../page-objects/wallet/WalletView';
 import { importWalletWithRecoveryPhrase } from '../../flows/wallet.flow';
-import Accounts from '../../../wdio/helpers/Accounts';
+import Accounts from '../../utils/Accounts';
 import TabBarComponent from '../../page-objects/wallet/TabBarComponent';
 import Assertions from '../../framework/Assertions';
 import { PopularNetworksList } from '../../resources/networks.e2e';
diff --git a/tests/resources/blacklistURLs.json b/tests/resources/blacklistURLs.json
index 506999428f0..6241cb3c04c 100644
--- a/tests/resources/blacklistURLs.json
+++ b/tests/resources/blacklistURLs.json
@@ -6,7 +6,6 @@
     ".*api.etherscan.io/.*",
     ".*static.metafi.codefi.network/.*",
     ".*static.cx.metamask.io/.*",
-    ".*rpc.tenderly.co/.*",
     ".*api-goerli.etherscan.io/.*",
     ".*gateway.pinata.cloud/.*",
     ".*stale.*",
@@ -22,8 +21,6 @@
     ".*exp.host/--/api/v2/development-sessions/.*",
     ".*mainnet.infura.io/v3/.*",
     ".*staking.api.cx.metamask.io/v1/pooled-staking/eligibility.*",
-    ".*token.api.cx.metamask.io/tokens/1\\?.*",
-    ".*mainnet.era.zksync.io/.*",
-    ".*api.avax.network/ext/bc/C/rpc.*"
+    ".*token.api.cx.metamask.io/tokens/1\\?.*"
   ]
 }
diff --git a/tests/resources/networks.e2e.js b/tests/resources/networks.e2e.js
index 745b0f0c691..3994bec42d3 100644
--- a/tests/resources/networks.e2e.js
+++ b/tests/resources/networks.e2e.js
@@ -192,7 +192,7 @@ const CustomNetworks = {
       rpcUrl: 'https://sei-mainnet.infura.io',
       nickname: 'Sei Testnet',
       ticker: 'SEI',
-      BlockExplorerUrl: 'https://seitrace.com/',
+      BlockExplorerUrl: 'https://seiscan.io/',
     },
   },
 };
diff --git a/tests/scripts/update-e2e-fixture.sh b/tests/scripts/update-e2e-fixture.sh
index 3904efa161f..3a0a3f5f96d 100755
--- a/tests/scripts/update-e2e-fixture.sh
+++ b/tests/scripts/update-e2e-fixture.sh
@@ -10,7 +10,7 @@ TARGET_FILE="tests/framework/fixtures/json/default-fixture.json"
 if [ ! -f "$REPORT_FILE" ]; then
   echo "Error: $REPORT_FILE not found."
   echo "Run the fixture validation test first:"
-  echo "  yarn detox test tests/regression/fixtures/fixture-validation.spec.ts -c <config>"
+  echo "  yarn detox test tests/smoke/fixtures/fixture-validation.spec.ts -c <config>"
   exit 1
 fi
 
diff --git a/tests/smoke/assets/defi/view-defi-details.spec.ts b/tests/smoke/assets/defi/view-defi-details.spec.ts
deleted file mode 100644
index feb2aa83f2d..00000000000
--- a/tests/smoke/assets/defi/view-defi-details.spec.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { SmokeNetworkAbstractions } from '../../../tags';
-import WalletView from '../../../page-objects/wallet/WalletView';
-import Assertions from '../../../framework/Assertions';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { Mockttp } from 'mockttp';
-import { setupMockRequest } from '../../../api-mocking/helpers/mockHelpers';
-import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { remoteFeatureFlagHomepageSectionsV1Enabled } from '../../../api-mocking/mock-responses/feature-flags-mocks';
-import { defiPositionsWithData } from '../../../api-mocking/mock-responses/defi-api-mocks';
-import DefiView from '../../../page-objects/wallet/DefiView';
-import DefiPositionView from '../../../page-objects/wallet/DefiPositionView';
-
-describe(SmokeNetworkAbstractions('View DeFi details'), () => {
-  it('open the Aave V3 position details', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().withPopularNetworks().build(),
-        restartDevice: true,
-        testSpecificMock: async (mockServer: Mockttp) => {
-          await setupRemoteFeatureFlagsMock(mockServer, {
-            ...remoteFeatureFlagHomepageSectionsV1Enabled(),
-          });
-
-          const { urlEndpoint, response } = defiPositionsWithData;
-          await setupMockRequest(mockServer, {
-            requestMethod: 'GET',
-            url: urlEndpoint,
-            response,
-            responseCode: 200,
-          });
-        },
-        languageAndLocale: {
-          language: 'en',
-          locale: 'en_US',
-        },
-      },
-      async () => {
-        await loginToApp();
-        // await Assertions.expectElementToBeVisible(WalletView.defiPositionsNew);
-
-        await WalletView.scrollAndTapDefiSection();
-        await Assertions.expectTextDisplayed('Aave V3');
-        await Assertions.expectTextDisplayed('$14.74');
-        await Assertions.expectTextDisplayed('WETH +1 other');
-        await Assertions.expectTextDisplayed('Uniswap V3');
-        await Assertions.expectTextDisplayed('$8.48');
-        await Assertions.expectTextDisplayed('WETH +1 other');
-        await Assertions.expectTextDisplayed('Uniswap V2');
-        await Assertions.expectTextDisplayed('$4.24');
-        await Assertions.expectTextDisplayed('USDC +1 other');
-        await Assertions.expectTextDisplayed('Aave V2');
-        await Assertions.expectTextDisplayed('$0.33');
-        await Assertions.expectTextDisplayed('USDC +1 other');
-        await DefiView.checkContainerIsDisplayed();
-        await Assertions.expectTextDisplayed('Aave V3');
-        await Assertions.expectTextDisplayed('$14.74');
-        await Assertions.expectTextDisplayed('WETH +1 other');
-        await Assertions.expectTextDisplayed('Uniswap V3');
-        await Assertions.expectTextDisplayed('$8.48');
-        await Assertions.expectTextDisplayed('WETH +1 other');
-        await Assertions.expectTextDisplayed('Uniswap V2');
-        await Assertions.expectTextDisplayed('$4.24');
-        await Assertions.expectTextDisplayed('USDC +1 other');
-        await Assertions.expectTextDisplayed('Aave V2');
-        await Assertions.expectTextDisplayed('$0.33');
-        await Assertions.expectTextDisplayed('USDC +1 other');
-        await DefiView.tapPosition('Aave V3');
-        await DefiPositionView.checkContainersIsDisplayed();
-        await Assertions.expectTextDisplayed('Supplied');
-        await Assertions.expectTextDisplayed('USDT');
-        await Assertions.expectTextDisplayed('WETH');
-        await Assertions.expectTextDisplayed('$14.74');
-        await Assertions.expectTextDisplayed('$0.30');
-      },
-    );
-  });
-});
diff --git a/tests/smoke/assets/market-insights/view-market-insights.spec.ts b/tests/smoke/assets/market-insights/view-market-insights.spec.ts
deleted file mode 100644
index 745d6ea63ee..00000000000
--- a/tests/smoke/assets/market-insights/view-market-insights.spec.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-import { SmokeNetworkAbstractions } from '../../../tags';
-import WalletView from '../../../page-objects/wallet/WalletView';
-import TokenOverview from '../../../page-objects/wallet/TokenOverview';
-import MarketInsightsEntryCard from '../../../page-objects/wallet/MarketInsightsEntryCard';
-import MarketInsightsView from '../../../page-objects/wallet/MarketInsightsView';
-import QuoteView from '../../../page-objects/swaps/QuoteView';
-import Assertions from '../../../framework/Assertions';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { Mockttp } from 'mockttp';
-import { setupMockRequest } from '../../../api-mocking/helpers/mockHelpers';
-import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { remoteFeatureFlagMarketInsightsEnabled } from '../../../api-mocking/mock-responses/feature-flags-mocks';
-import {
-  marketInsightsWithData,
-  marketInsightsNoData,
-} from '../../../api-mocking/mock-responses/market-insights-api-mocks';
-
-const TOKEN = 'Ethereum';
-
-const mockWithData = async (mockServer: Mockttp) => {
-  await setupRemoteFeatureFlagsMock(mockServer, {
-    ...remoteFeatureFlagMarketInsightsEnabled(),
-  });
-  const { urlEndpoint, response, responseCode } = marketInsightsWithData;
-  await setupMockRequest(mockServer, {
-    requestMethod: 'GET',
-    url: urlEndpoint,
-    response,
-    responseCode,
-  });
-};
-
-const navigateToMarketInsightsView = async () => {
-  await loginToApp();
-  await WalletView.waitForTokenToBeReady(TOKEN);
-  await WalletView.tapOnToken(TOKEN);
-  await Assertions.expectElementToBeVisible(TokenOverview.container, {
-    description: 'Asset details screen is visible after tapping Ethereum',
-  });
-  await MarketInsightsEntryCard.expectEntryCardVisible();
-  await MarketInsightsEntryCard.tapEntryCard();
-  await MarketInsightsView.expectViewVisible();
-};
-
-describe(
-  SmokeNetworkAbstractions('View Market Insights on Asset Details'),
-  () => {
-    it('displays market insights content and navigates to swap', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          restartDevice: true,
-          testSpecificMock: mockWithData,
-          languageAndLocale: { language: 'en', locale: 'en_US' },
-        },
-        async () => {
-          await navigateToMarketInsightsView();
-
-          await Assertions.expectTextDisplayed(
-            'Ethereum shows strong momentum amid institutional demand',
-            { description: 'Market Insights headline is displayed' },
-          );
-
-          await Assertions.expectTextDisplayed(
-            'Ethereum continues to attract institutional interest with increasing on-chain activity and a healthy DeFi ecosystem.',
-            { description: 'Market Insights summary is displayed' },
-          );
-
-          await Assertions.expectTextDisplayed('Institutional Adoption', {
-            description: 'Market Insights first trend title is displayed',
-          });
-
-          await Assertions.expectTextDisplayed('DeFi Activity Surge', {
-            description: 'Market Insights second trend title is displayed',
-          });
-
-          await MarketInsightsView.expectSwapButtonVisible();
-
-          await MarketInsightsView.tapSwapButton();
-          await QuoteView.isVisible();
-        },
-      );
-    });
-
-    it('does not display entry card when API returns no data', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          restartDevice: true,
-          testSpecificMock: async (mockServer: Mockttp) => {
-            await setupRemoteFeatureFlagsMock(mockServer, {
-              ...remoteFeatureFlagMarketInsightsEnabled(),
-            });
-            const { urlEndpoint, response, responseCode } =
-              marketInsightsNoData;
-            await setupMockRequest(mockServer, {
-              requestMethod: 'GET',
-              url: urlEndpoint,
-              response,
-              responseCode,
-            });
-          },
-          languageAndLocale: { language: 'en', locale: 'en_US' },
-        },
-        async () => {
-          await loginToApp();
-          await WalletView.waitForTokenToBeReady(TOKEN);
-          await WalletView.tapOnToken(TOKEN);
-          await Assertions.expectElementToBeVisible(TokenOverview.container, {
-            description:
-              'Asset details screen is visible after tapping Ethereum',
-          });
-          await MarketInsightsEntryCard.expectEntryCardNotVisible();
-        },
-      );
-    });
-
-    it('does not display entry card when feature flag is disabled', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          restartDevice: true,
-          testSpecificMock: async (mockServer: Mockttp) => {
-            await setupRemoteFeatureFlagsMock(mockServer, {
-              ...remoteFeatureFlagMarketInsightsEnabled(false),
-            });
-            const { urlEndpoint, response, responseCode } =
-              marketInsightsWithData;
-            await setupMockRequest(mockServer, {
-              requestMethod: 'GET',
-              url: urlEndpoint,
-              response,
-              responseCode,
-            });
-          },
-          languageAndLocale: { language: 'en', locale: 'en_US' },
-        },
-        async () => {
-          await loginToApp();
-          await WalletView.waitForTokenToBeReady(TOKEN);
-          await WalletView.tapOnToken(TOKEN);
-          await Assertions.expectElementToBeVisible(TokenOverview.container, {
-            description:
-              'Asset details screen is visible after tapping Ethereum',
-          });
-          await MarketInsightsEntryCard.expectEntryCardNotVisible();
-        },
-      );
-    });
-
-    it('shows sources bottom sheet when tapping a trend item', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          restartDevice: true,
-          testSpecificMock: mockWithData,
-          languageAndLocale: { language: 'en', locale: 'en_US' },
-        },
-        async () => {
-          await navigateToMarketInsightsView();
-          await MarketInsightsView.tapTrendItem(0);
-          await Assertions.expectTextDisplayed(
-            'Spot Ethereum ETFs See Record Weekly Inflows',
-            { description: 'Trend sources bottom sheet shows article title' },
-          );
-        },
-      );
-    });
-
-    it('can tap thumbs up feedback button', async () => {
-      await withFixtures(
-        {
-          fixture: new FixtureBuilder().build(),
-          restartDevice: true,
-          testSpecificMock: mockWithData,
-          languageAndLocale: { language: 'en', locale: 'en_US' },
-        },
-        async () => {
-          await navigateToMarketInsightsView();
-          await MarketInsightsView.scrollToThumbsUp();
-          await MarketInsightsView.tapThumbsUpButton();
-          // Note: Toast verification skipped due to Detox/Reanimated compatibility issues.
-          // The toast appears correctly (verified manually) but Detox cannot detect it.
-          // This test verifies the thumbs up button is tappable.
-          await MarketInsightsView.expectThumbsUpButtonVisible();
-        },
-      );
-    });
-  },
-);
diff --git a/tests/smoke/confirmations/send/metricsValidationHelper.ts b/tests/smoke/confirmations/send/metricsValidationHelper.ts
index 8599d847f31..50449175f98 100644
--- a/tests/smoke/confirmations/send/metricsValidationHelper.ts
+++ b/tests/smoke/confirmations/send/metricsValidationHelper.ts
@@ -1,7 +1,10 @@
 import { Mockttp } from 'mockttp';
 import { AnvilManager } from '../../../seeder/anvil-manager';
 import { LocalNode } from '../../../framework';
-import { getEventsPayloads } from '../../../helpers/analytics/helpers';
+import {
+  EventPayload,
+  getEventsPayloads,
+} from '../../../helpers/analytics/helpers';
 
 /**
  * Validates the transaction hash in the Transaction Finalized Event.
@@ -35,10 +38,20 @@ export const validateTransactionHashInTransactionFinalizedEvent = async (
     );
   }
 
-  const events = await getEventsPayloads(mockServer);
-  const transactionFinalizedEvent = events.find(
-    (event) => event.event === 'Transaction Finalized',
-  );
+  // The transaction finalized event may not be sent immediately, so we safely retry up to 5 times.
+  const MAX_ATTEMPTS = 5;
+  const delay = 1000;
+  let transactionFinalizedEvent: EventPayload | undefined;
+  for (let i = 0; i < MAX_ATTEMPTS; i++) {
+    const events = await getEventsPayloads(mockServer);
+    transactionFinalizedEvent = events.find(
+      (event) => event.event === 'Transaction Finalized',
+    );
+    if (transactionFinalizedEvent) {
+      break;
+    }
+    await new Promise((resolve) => setTimeout(resolve, delay));
+  }
 
   if (!transactionFinalizedEvent) {
     throw new Error(
diff --git a/tests/smoke/confirmations/send/send-btc-token.spec.ts b/tests/smoke/confirmations/send/send-btc-token.spec.ts
index a54820eea77..0a27181f113 100644
--- a/tests/smoke/confirmations/send/send-btc-token.spec.ts
+++ b/tests/smoke/confirmations/send/send-btc-token.spec.ts
@@ -1,52 +1,10 @@
-import TokenOverview from '../../../page-objects/wallet/TokenOverview';
-import WalletView from '../../../page-objects/wallet/WalletView';
+/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
 import { SmokeConfirmations } from '../../../tags';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { loginToApp } from '../../../flows/wallet.flow';
-import Assertions from '../../../framework/Assertions';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper';
-
-const TOKEN = 'Bitcoin';
 
 describe(SmokeConfirmations('Send Bitcoin'), () => {
-  it('hides send button for zero balance token', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        testSpecificMock: async (mockServer: Mockttp) => {
-          await setupRemoteFeatureFlagsMock(
-            mockServer,
-            {
-              homepageRedesignV1: { enabled: false, minimumVersion: '0.0.0' },
-              homepageSectionsV1: { enabled: false, minimumVersion: '0.0.0' },
-            },
-            1000,
-          );
-        },
-      },
-      async () => {
-        await loginToApp();
-        // Making the assertion before disabling synchronization so that flags
-        // are properly fetched and this mocked flag is set
-        await Assertions.expectElementToNotBeVisible(
-          WalletView.balanceEmptyStateContainer,
-          {
-            description: 'Balance empty state container should not be visible',
-            timeout: 30000,
-          },
-        );
-        await device.disableSynchronization();
-        await WalletView.tapOnToken(TOKEN, 0);
-        // Token details V2 layout hides Send and shows Receive for zero-balance tokens
-        await Assertions.expectElementToBeVisible(TokenOverview.receiveButton, {
-          description:
-            'Receive button should be visible for zero-balance token',
-          timeout: 15000,
-        });
-      },
-    );
+  // 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-erc20-token.spec.ts b/tests/smoke/confirmations/send/send-erc20-token.spec.ts
index 55bad325fd6..9a8197f9e66 100644
--- a/tests/smoke/confirmations/send/send-erc20-token.spec.ts
+++ b/tests/smoke/confirmations/send/send-erc20-token.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
 import FixtureBuilder, {
   DEFAULT_FIXTURE_ACCOUNT_CHECKSUM,
 } from '../../../framework/fixtures/FixtureBuilder';
@@ -272,134 +273,6 @@ async function setupAccountsApiMocks(mockServer: Mockttp): Promise<void> {
 }
 
 describe(SmokeConfirmations('Send ERC20 asset'), () => {
-  it('should send USDC amount 5 to 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;
-
-          return new FixtureBuilder()
-            .withNetworkController({
-              chainId: '0x539',
-              rpcUrl: `http://localhost:${rpcPort ?? AnvilPort()}`,
-              type: 'custom',
-              nickname: 'Local RPC',
-              ticker: 'ETH',
-            })
-            .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();
-        },
-        testSpecificMock: setupAccountsApiMocks,
-        restartDevice: true,
-      },
-      async () => {
-        await loginToApp();
-        await device.disableSynchronization();
-
-        // send 5 USDC
-        await WalletView.tapWalletSendButton();
-        await SendView.selectERC20Token();
-        await SendView.pressAmountFiveButton();
-        await SendView.pressContinueButton();
-        await SendView.inputRecipientAddress(RECIPIENT);
-        await SendView.pressReviewButton();
-        await FooterActions.tapCancelButton();
-      },
-    );
-  });
-
-  it('should send USDC amount 50% to an address', async () => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: ({ localNodes }) => {
-          const node = localNodes?.[0] as unknown as { getPort?: () => number };
-          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',
-            })
-            .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();
-        },
-        testSpecificMock: setupAccountsApiMocks,
-        restartDevice: true,
-      },
-      async () => {
-        await loginToApp();
-        await device.disableSynchronization();
-
-        // send 50% USDC
-        await WalletView.tapWalletSendButton();
-        await SendView.selectERC20Token();
-        await SendView.pressFiftyPercentButton();
-        await SendView.pressContinueButton();
-        await SendView.inputRecipientAddress(RECIPIENT);
-        await SendView.pressReviewButton();
-        await FooterActions.tapCancelButton();
-      },
-    );
-  });
-
   it('should send USDC send maxto an address', async () => {
     await withFixtures(
       {
diff --git a/tests/smoke/confirmations/send/send-native-token.spec.ts b/tests/smoke/confirmations/send/send-native-token.spec.ts
index dd13e0c3646..50fc71b09e3 100644
--- a/tests/smoke/confirmations/send/send-native-token.spec.ts
+++ b/tests/smoke/confirmations/send/send-native-token.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
 import FixtureBuilder, {
   DEFAULT_FIXTURE_ACCOUNT,
 } from '../../../framework/fixtures/FixtureBuilder';
@@ -18,8 +19,9 @@ import { validateTransactionHashInTransactionFinalizedEvent } from './metricsVal
 
 const RECIPIENT = '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb';
 
-describe(SmokeConfirmations('Send native asset'), () => {
-  it('should send ETH to an address', async () => {
+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: [
@@ -83,10 +85,10 @@ describe(SmokeConfirmations('Send native asset'), () => {
       }) => {
         await loginToApp();
         await device.disableSynchronization();
-        // send 5 ETH
+        // send Max ETH
         await WalletView.tapWalletSendButton();
         await SendView.selectEthereumToken();
-        await SendView.pressAmountFiveButton();
+        await SendView.pressAmountMaxButton();
         await SendView.pressContinueButton();
         await SendView.inputRecipientAddress(RECIPIENT);
         await SendView.pressReviewButton();
@@ -100,30 +102,6 @@ describe(SmokeConfirmations('Send native asset'), () => {
           localNodes,
           mockServer,
         );
-
-        // send 50% ETH
-        await TabBarComponent.tapWallet();
-        await WalletView.tapWalletSendButton();
-        await SendView.selectEthereumToken();
-        await SendView.pressFiftyPercentButton();
-        await SendView.pressContinueButton();
-        await SendView.inputRecipientAddress(RECIPIENT);
-        await SendView.pressReviewButton();
-        await FooterActions.tapConfirmButton();
-        await TabBarComponent.tapActivity();
-        await Assertions.expectTextDisplayed('Confirmed');
-
-        // send Max ETH
-        await TabBarComponent.tapWallet();
-        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');
       },
     );
   });
diff --git a/tests/smoke/confirmations/send/send-solana-token.spec.ts b/tests/smoke/confirmations/send/send-solana-token.spec.ts
index 752dd88d742..a82c031d744 100644
--- a/tests/smoke/confirmations/send/send-solana-token.spec.ts
+++ b/tests/smoke/confirmations/send/send-solana-token.spec.ts
@@ -1,63 +1,12 @@
-import TokenOverview from '../../../page-objects/wallet/TokenOverview';
-import WalletView from '../../../page-objects/wallet/WalletView';
-import { SmokeConfirmations } from '../../../tags';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { Assertions } from '../../../framework';
-import { Mockttp } from 'mockttp';
-import { setupMockRequest } from '../../../api-mocking/helpers/mockHelpers';
+/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
 
-// const RECIPIENT = '4Nd1mZyJY5ZqzR3n8bQF7h5L2Q9gY1yTtM6nQhc7P1Dp';
+import { SmokeConfirmations } from '../../../tags';
 
 describe(SmokeConfirmations('Send SOL token'), () => {
-  it('should send solana to an address', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-        testSpecificMock: async (mockServer: Mockttp) => {
-          await setupMockRequest(mockServer, {
-            requestMethod: 'GET',
-            url: 'https://digest.api.cx.metamask.io/api/v1/asset-summary?asset=solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
-            response: {
-              id: 'mock-id',
-              assetId: 'Solana',
-              assetSymbol: 'SOL',
-              digest: {
-                version: '1.0',
-                asset: 'SOL',
-                generatedAt: '2026-04-08T07:01:42.371Z',
-                headline: 'SOL trades near $85 amid ecosystem developments',
-                summary:
-                  'Solana SOL token is trading near $85 with a $48 billion market cap.',
-                trends: [],
-                social: [],
-                sources: [],
-              },
-              generatedAt: '2026-04-08T07:01:42.392Z',
-              processingTime: 1000,
-              success: true,
-              error: null,
-              createdAt: '2026-04-08T07:01:42.401Z',
-              updatedAt: '2026-04-08T07:01:42.401Z',
-            },
-            responseCode: 200,
-          });
-        },
-      },
-      async () => {
-        await loginToApp();
-        await device.disableSynchronization();
-        await WalletView.tapOnToken('Solana');
-        await TokenOverview.tapSendButton();
+  // Moved to cv tests (send.non-evm.view.test.tsx)
 
-        // Since we're not yet mockign Solana and there's residual balance that
-        // can be flaky when loading we're only checking that we're on the
-        // correct screen and sending the correct token.
-        await Assertions.expectTextDisplayed('Send');
-        await Assertions.expectTextDisplayed('SOL');
-      },
-    );
+  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
index 1666af66124..e1dc4a23482 100644
--- a/tests/smoke/confirmations/send/send-tron-token.spec.ts
+++ b/tests/smoke/confirmations/send/send-tron-token.spec.ts
@@ -1,26 +1,11 @@
-import SendView from '../../../page-objects/Send/RedesignedSendView';
-import TokenOverview from '../../../page-objects/wallet/TokenOverview';
-import WalletView from '../../../page-objects/wallet/WalletView';
+/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
 import { SmokeConfirmations } from '../../../tags';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import { loginToApp } from '../../../flows/wallet.flow';
 
 describe(SmokeConfirmations('Send TRX token'), () => {
+  // Moved to cv tests (send.non-evm.view.test.tsx)
+
   it.skip('shows insufficient funds', async () => {
-    await withFixtures(
-      {
-        fixture: new FixtureBuilder().build(),
-        restartDevice: true,
-      },
-      async () => {
-        await loginToApp();
-        await device.disableSynchronization();
-        await WalletView.tapOnToken('Tron');
-        await TokenOverview.tapSendButton();
-        await SendView.enterZeroAmount();
-        await SendView.checkInsufficientFundsError();
-      },
-    );
+    // 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/signatures/alert-system.spec.ts b/tests/smoke/confirmations/signatures/alert-system.spec.ts
deleted file mode 100644
index de78b5db952..00000000000
--- a/tests/smoke/confirmations/signatures/alert-system.spec.ts
+++ /dev/null
@@ -1,265 +0,0 @@
-import Assertions from '../../../framework/Assertions';
-import Browser from '../../../page-objects/Browser/BrowserView';
-import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder';
-import RequestTypes from '../../../page-objects/Browser/Confirmations/RequestTypes';
-import AlertSystem from '../../../page-objects/Browser/Confirmations/AlertSystem';
-import TestDApp from '../../../page-objects/Browser/TestDApp';
-import { loginToApp } from '../../../flows/wallet.flow';
-import { navigateToBrowserView } from '../../../flows/browser.flow';
-import { SmokeConfirmations } from '../../../tags';
-import { withFixtures } from '../../../framework/fixtures/FixtureHelper';
-import FooterActions from '../../../page-objects/Browser/Confirmations/FooterActions';
-import {
-  buildPermissions,
-  getTestDappLocalUrl,
-} from '../../../framework/fixtures/FixtureUtils';
-import { DappVariants } from '../../../framework/Constants';
-import { Mockttp } from 'mockttp';
-import {
-  setupMockRequest,
-  setupMockPostRequest,
-} from '../../../api-mocking/helpers/mockHelpers';
-import {
-  SECURITY_ALERTS_BENIGN_RESPONSE,
-  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';
-
-const typedSignRequestBody = {
-  method: 'eth_signTypedData',
-  params: [
-    [
-      { type: 'string', name: 'Message', value: 'Hi, Alice!' },
-      { type: 'uint32', name: 'A number', value: '1337' },
-    ],
-    '0x76cf1CdD1fcC252442b50D6e97207228aA4aefC3',
-  ],
-};
-
-describe(SmokeConfirmations('Alert System - Signature'), () => {
-  const runTest = async (
-    testSpecificMock: (mockServer: Mockttp) => Promise<void>,
-    alertAssertion: () => Promise<void>,
-  ) => {
-    await withFixtures(
-      {
-        dapps: [
-          {
-            dappVariant: DappVariants.TEST_DAPP,
-          },
-        ],
-        fixture: new FixtureBuilder()
-          .withSepoliaNetwork()
-          .withPermissionControllerConnectedToTestDapp(
-            buildPermissions(['0xaa36a7']),
-          )
-          .build(),
-        restartDevice: true,
-        testSpecificMock,
-      },
-      async () => {
-        await loginToApp();
-        await navigateToBrowserView();
-        await Browser.navigateToTestDApp();
-        await TestDApp.tapTypedSignButton();
-        await Assertions.expectElementToBeVisible(
-          RequestTypes.TypedSignRequest,
-        );
-        await alertAssertion();
-      },
-    );
-  };
-
-  describe('Security Alert API', () => {
-    it('should sign typed message', async () => {
-      const testSpecificMock = async (mockServer: Mockttp) => {
-        await setupRemoteFeatureFlagsMock(
-          mockServer,
-          Object.assign({}, ...confirmationFeatureFlags),
-        );
-
-        await setupMockPostRequest(
-          mockServer,
-          securityAlertsUrl('0xaa36a7'),
-          { ...typedSignRequestBody, origin: getTestDappLocalUrl() },
-          SECURITY_ALERTS_BENIGN_RESPONSE,
-          {
-            statusCode: 201,
-            ignoreFields: [
-              'id',
-              'jsonrpc',
-              'toNative',
-              'networkClientId',
-              'traceContext',
-            ],
-          },
-        );
-      };
-
-      await runTest(testSpecificMock, async () => {
-        await Assertions.expectElementToNotBeVisible(
-          AlertSystem.securityAlertBanner,
-        );
-      });
-    });
-
-    it('should show security alert for malicious request, acknowledge and confirm the signature', async () => {
-      const testSpecificMock = async (mockServer: Mockttp) => {
-        await setupRemoteFeatureFlagsMock(
-          mockServer,
-          Object.assign({}, ...confirmationFeatureFlags),
-        );
-
-        await setupMockPostRequest(
-          mockServer,
-          'https://security-alerts.api.cx.metamask.io/validate/0xaa36a7',
-          { ...typedSignRequestBody, origin: getTestDappLocalUrl() },
-          {
-            block: 20733277,
-            result_type: 'Malicious',
-            reason: 'malicious_domain',
-            description: `You're interacting with a malicious domain. If you approve this request, you might lose your assets.`,
-            features: [],
-          },
-          {
-            ignoreFields: [
-              'id',
-              'jsonrpc',
-              'toNative',
-              'networkClientId',
-              'traceContext',
-            ],
-          },
-        );
-      };
-
-      await runTest(testSpecificMock, async () => {
-        await Assertions.expectElementToBeVisible(
-          AlertSystem.securityAlertBanner,
-        );
-        await Assertions.expectElementToBeVisible(
-          AlertSystem.securityAlertResponseMaliciousBanner,
-        );
-        // Confirm request
-        await FooterActions.tapConfirmButton();
-        await Assertions.expectElementToBeVisible(
-          AlertSystem.confirmAlertModal,
-        );
-        // Acknowledge and confirm alert
-        await AlertSystem.tapConfirmAlertCheckbox();
-        await AlertSystem.tapConfirmAlertButton();
-        await Assertions.expectElementToNotBeVisible(
-          RequestTypes.TypedSignRequest,
-        );
-      });
-    });
-
-    it('should show security alert for error when validating request fails', async () => {
-      const testSpecificMock = async (mockServer: Mockttp) => {
-        await setupRemoteFeatureFlagsMock(
-          mockServer,
-          Object.assign({}, ...confirmationFeatureFlags),
-        );
-
-        await setupMockRequest(mockServer, {
-          requestMethod: 'GET',
-          url: 'https://static.cx.metamask.io/api/v1/confirmations/ppom/ppom_version.json',
-          response: {
-            message: 'Internal Server Error',
-          },
-          responseCode: 500,
-        });
-
-        await setupMockPostRequest(
-          mockServer,
-          'https://security-alerts.api.cx.metamask.io/validate/0xaa36a7',
-          { ...typedSignRequestBody, origin: getTestDappLocalUrl() },
-          {
-            error: 'Internal Server Error',
-            message: 'An unexpected error occurred on the server.',
-          },
-          {
-            statusCode: 500,
-            ignoreFields: [
-              'id',
-              'jsonrpc',
-              'toNative',
-              'networkClientId',
-              'traceContext',
-            ],
-          },
-        );
-      };
-
-      await runTest(testSpecificMock, async () => {
-        await Assertions.expectElementToBeVisible(
-          AlertSystem.securityAlertBanner,
-        );
-        await Assertions.expectElementToBeVisible(
-          AlertSystem.securityAlertResponseFailedBanner,
-        );
-      });
-    });
-  });
-
-  describe('Inline Alert', () => {
-    it('should show mismatch field alert, click the alert, acknowledge and confirm the signature', async () => {
-      const testSpecificMock = async (mockServer: Mockttp) => {
-        await setupRemoteFeatureFlagsMock(
-          mockServer,
-          Object.assign({}, ...confirmationFeatureFlags),
-        );
-      };
-
-      await withFixtures(
-        {
-          dapps: [
-            {
-              dappVariant: DappVariants.TEST_DAPP,
-            },
-          ],
-          fixture: new FixtureBuilder()
-            .withSepoliaNetwork()
-            .withPermissionControllerConnectedToTestDapp(
-              buildPermissions(['0xaa36a7']),
-            )
-            .withPreferencesController({
-              securityAlertsEnabled: true,
-            })
-            .build(),
-          restartDevice: true,
-          testSpecificMock,
-        },
-        async () => {
-          await loginToApp();
-          await navigateToBrowserView();
-          await Browser.navigateToTestDApp();
-          await TestDApp.tapSIWEBadDomainButton();
-          await Assertions.expectElementToBeVisible(
-            RequestTypes.PersonalSignRequest,
-          );
-          await Assertions.expectElementToBeVisible(AlertSystem.inlineAlert);
-          // Open alert modal and acknowledge the alert
-          await AlertSystem.tapInlineAlert();
-          await Assertions.expectElementToBeVisible(
-            AlertSystem.alertMismatchTitle,
-          );
-          await AlertSystem.tapAcknowledgeAlertModal();
-          await AlertSystem.tapAcknowledgeAlertModalButton();
-          // Confirm request
-          await FooterActions.tapConfirmButton();
-          await Assertions.expectElementToBeVisible(
-            AlertSystem.confirmAlertModal,
-          );
-          // Acknowledge and confirm alert
-          await AlertSystem.tapConfirmAlertCheckbox();
-          await AlertSystem.tapConfirmAlertButton();
-          await Assertions.expectElementToNotBeVisible(
-            RequestTypes.PersonalSignRequest,
-          );
-        },
-      );
-    });
-  });
-});
diff --git a/tests/smoke/confirmations/transactions/7702/batch-transaction.spec.ts b/tests/smoke/confirmations/transactions/7702/batch-transaction.spec.ts
index 693796babfc..427e723676a 100644
--- a/tests/smoke/confirmations/transactions/7702/batch-transaction.spec.ts
+++ b/tests/smoke/confirmations/transactions/7702/batch-transaction.spec.ts
@@ -6,6 +6,7 @@ import ConfirmationUITypes from '../../../../page-objects/Browser/Confirmations/
 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';
@@ -46,9 +47,11 @@ const localNodeOptions = [
 ];
 
 async function changeNetworkFromNetworkListModal() {
-  await WalletView.tapTokenNetworkFilter();
+  await NetworkManager.navigateToTokensFullView();
+  await NetworkManager.openNetworkManager();
   await NetworkListModal.tapOnCustomTab();
   await NetworkListModal.changeNetworkTo(LOCAL_CHAIN_NAME);
+  await NetworkManager.navigateBackFromTokensFullView();
 }
 
 async function checkConfirmationPage() {
@@ -95,10 +98,7 @@ describe(SmokeConfirmations('7702 - smart account'), () => {
     });
     await setupRemoteFeatureFlagsMock(
       mockServer,
-      Object.assign({}, ...confirmationFeatureFlags, {
-        homepageRedesignV1: { enabled: false, minimumVersion: '0.0.0' },
-        homepageSectionsV1: { enabled: false, minimumVersion: '0.0.0' },
-      }),
+      Object.assign({}, ...confirmationFeatureFlags),
     );
   };
   beforeAll(async () => {
diff --git a/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts b/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts
index 8b421943a85..e2505bb7cbf 100644
--- a/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts
+++ b/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702-sponsored.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
 import FixtureBuilder, {
   DEFAULT_FIXTURE_ACCOUNT,
 } from '../../../framework/fixtures/FixtureBuilder';
@@ -34,7 +35,11 @@ import { RelayStatus } from '../../../../app/util/transactions/transaction-relay
 const TRANSACTION_UUID_MOCK = '1234-5678';
 const SENDER_ADDRESS_MOCK = '0x76cf1cdd1fcc252442b50d6e97207228aa4aefc3';
 const RECIPIENT_ADDRESS_MOCK = '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb';
-const SENTINEL_URL = 'https://tx-sentinel-localhost.api.cx.metamask.io';
+/** 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',
@@ -50,10 +55,39 @@ const SIMULATION_ENABLED_NETWORKS_WITH_RELAY = {
     1337: {
       ...SIMULATION_ENABLED_NETWORKS_MOCK.response[1337],
       relayTransactions: true,
+      sendBundle: true,
+    },
+    1: {
+      network: 'ethereum-mainnet',
+      confirmations: true,
+      relayTransactions: true,
+      sendBundle: true,
     },
   },
 };
 
+const SIMULATION_SPONSORED_REQUEST_BODY = {
+  jsonrpc: '2.0',
+  method: 'infura_simulateTransactions',
+  params: [
+    {
+      transactions: [SEND_ETH_TRANSACTION_MOCK],
+      suggestFees: {
+        withFeeTransfer: true,
+        withTransfer: true,
+        with7702: true,
+      },
+    },
+  ],
+};
+
+const SIMULATION_SPONSORED_IGNORE_FIELDS = [
+  'params.0.blockOverrides',
+  'id',
+  'params.0.transactions',
+  'params.0.suggestFees',
+];
+
 const SIMULATION_RESPONSE = {
   jsonrpc: '2.0',
   result: {
@@ -97,24 +131,22 @@ const setupCommonMocks = async (mockServer: Mockttp) => {
     1000,
   );
 
-  // Mock infura_simulateTransactions
+  await setupMockRequest(mockServer, {
+    requestMethod: 'GET',
+    url: `${LOCALHOST_SENTINEL_URL}/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,
-    SENTINEL_URL,
-    {
-      jsonrpc: '2.0',
-      method: 'infura_simulateTransactions',
-      params: [
-        {
-          transactions: [SEND_ETH_TRANSACTION_MOCK],
-          suggestFees: { withFeeTransfer: true, withTransfer: true },
-        },
-      ],
-    },
+    LOCALHOST_SENTINEL_URL,
+    SIMULATION_SPONSORED_REQUEST_BODY,
     SIMULATION_RESPONSE,
     {
       statusCode: 200,
-      ignoreFields: ['id', 'params'],
+      ignoreFields: SIMULATION_SPONSORED_IGNORE_FIELDS,
       priority: 1000,
     },
   );
@@ -183,8 +215,17 @@ const performSendTransaction = async () => {
   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, {
@@ -196,7 +237,8 @@ const performSendTransaction = async () => {
   await TabBarComponent.tapActivity();
 };
 
-describe(
+// Skipping due to https://consensys.slack.com/archives/C02U025CVU4/p1778589879443169
+describe.skip(
   SmokeConfirmations('Send native asset using EIP-7702 - Success Case'),
   () => {
     beforeAll(async () => {
@@ -215,7 +257,7 @@ describe(
             // Mock eth_sendRelayTransaction
             await setupMockPostRequest(
               mockServer,
-              SENTINEL_URL,
+              LOCALHOST_SENTINEL_URL,
               {
                 jsonrpc: '2.0',
                 method: 'eth_sendRelayTransaction',
@@ -231,7 +273,7 @@ describe(
             // Status check mock
             await setupMockRequest(mockServer, {
               requestMethod: 'GET',
-              url: `${SENTINEL_URL}/smart-transactions/${TRANSACTION_UUID_MOCK}`,
+              url: `${LOCALHOST_SENTINEL_URL}/smart-transactions/${TRANSACTION_UUID_MOCK}`,
               response: {
                 transactions: [
                   {
@@ -255,13 +297,15 @@ describe(
   },
 );
 
-describe(
+// Skipping due to https://consensys.slack.com/archives/C02U025CVU4/p1778589879443169
+describe.skip(
   SmokeConfirmations('Send native asset using EIP-7702 - Failure Case'),
   () => {
     beforeAll(async () => {
       jest.setTimeout(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(
         {
diff --git a/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts b/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts
index 2ab4fe6485b..6d193e839c6 100644
--- a/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts
+++ b/tests/smoke/confirmations/transactions/gas-fee-tokens-eip-7702.spec.ts
@@ -141,7 +141,8 @@ const SIMULATION_GAS_STATION_MOCK = {
   },
 };
 
-describe(
+// Skipping due to https://consensys.slack.com/archives/C02U025CVU4/p1778589879443169
+describe.skip(
   SmokeConfirmations('Send native asset Gas Station using EIP-7702'),
   () => {
     beforeAll(async () => {
diff --git a/tests/smoke/confirmations/transactions/per-dapp-selected-network.spec.ts b/tests/smoke/confirmations/transactions/per-dapp-selected-network.spec.ts
index 756528f1b21..d458bafd955 100644
--- a/tests/smoke/confirmations/transactions/per-dapp-selected-network.spec.ts
+++ b/tests/smoke/confirmations/transactions/per-dapp-selected-network.spec.ts
@@ -9,8 +9,8 @@ import ConfirmationFooterActions from '../../../page-objects/Browser/Confirmatio
 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 WalletView from '../../../page-objects/wallet/WalletView';
 import { SmokeConfirmations } from '../../../tags.js';
 import Assertions from '../../../framework/Assertions';
 import { loginToApp } from '../../../flows/wallet.flow';
@@ -21,24 +21,24 @@ import { confirmationFeatureFlags } from '../../../api-mocking/mock-responses/fe
 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 WalletView.tapTokenNetworkFilter();
+  await NetworkManager.navigateToTokensFullView();
+  await NetworkManager.openNetworkManager();
   await NetworkListModal.changeNetworkTo(networkName);
+  await NetworkManager.navigateBackFromTokensFullView();
 }
 
-describe(SmokeConfirmations('Dapp Network Switching'), () => {
+describe.skip(SmokeConfirmations('Dapp Network Switching'), () => {
   const testSpecificMock = async (mockServer: Mockttp) => {
     await setupRemoteFeatureFlagsMock(
       mockServer,
-      Object.assign({}, ...confirmationFeatureFlags, {
-        homepageRedesignV1: { enabled: false, minimumVersion: '0.0.0' },
-        homepageSectionsV1: { enabled: false, minimumVersion: '0.0.0' },
-      }),
+      Object.assign({}, ...confirmationFeatureFlags),
     );
   };
 
@@ -137,11 +137,13 @@ describe(SmokeConfirmations('Dapp Network Switching'), () => {
 
         // Change the network to Localhost in app (custom network)
         await TabBarComponent.tapWallet();
-        await WalletView.tapTokenNetworkFilter();
+        await NetworkManager.navigateToTokensFullView();
+        await NetworkManager.openNetworkManager();
         await NetworkListModal.tapOnCustomTab();
         await NetworkListModal.selectNetworkInCustomTab(LOCAL_CHAIN_NAME);
 
-        // Check activity tab (already on wallet from helper, just navigate)
+        await NetworkManager.navigateBackFromTokensFullView();
+
         await TabBarComponent.tapActivity();
         await Assertions.expectTextDisplayed('Confirmed');
       },
diff --git a/tests/regression/fixtures/fixture-validation.spec.ts b/tests/smoke/fixtures/fixture-validation.spec.ts
similarity index 100%
rename from tests/regression/fixtures/fixture-validation.spec.ts
rename to tests/smoke/fixtures/fixture-validation.spec.ts
diff --git a/tests/smoke/networks/network-manager.spec.ts b/tests/smoke/networks/network-manager.spec.ts
index 1013e787bc4..9e9c9793dfd 100644
--- a/tests/smoke/networks/network-manager.spec.ts
+++ b/tests/smoke/networks/network-manager.spec.ts
@@ -5,19 +5,8 @@ import { withFixtures } from '../../framework/fixtures/FixtureHelper';
 import NetworkManager from '../../page-objects/wallet/NetworkManager';
 import { NetworkToCaipChainId } from '../../../app/components/UI/NetworkMultiSelector/NetworkMultiSelector.constants';
 import Assertions from '../../framework/Assertions';
-import { Mockttp } from 'mockttp';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { remoteFeatureFlagHomepageSectionsV1Enabled } from '../../api-mocking/mock-responses/feature-flags-mocks';
-import WalletView from '../../page-objects/wallet/WalletView';
-import TokensFullView from '../../page-objects/wallet/HomeSections';
 
 describe(SmokeNetworkAbstractions('Network Manager'), () => {
-  const testSpecificMock = async (mockServer: Mockttp) => {
-    await setupRemoteFeatureFlagsMock(mockServer, {
-      ...remoteFeatureFlagHomepageSectionsV1Enabled(),
-    });
-  };
-
   beforeAll(async () => {
     jest.setTimeout(170000);
   });
@@ -25,21 +14,13 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
   it('should reflect the correct enabled networks state in the network manager', async () => {
     await withFixtures(
       {
-        fixture: new FixtureBuilder().build(),
+        fixture: new FixtureBuilder().withPopularNetworks().build(),
         restartDevice: true,
-        testSpecificMock,
       },
       async () => {
         await loginToApp();
 
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          description: 'Wallet homepage should be visible',
-        });
-
-        await WalletView.tapOnNewTokensSection();
-        await TokensFullView.waitForVisible();
-
-        await NetworkManager.openNetworkManager();
+        await NetworkManager.openNetworkManagerFromHomepage();
 
         await Assertions.expectElementToBeVisible(
           NetworkManager.popularNetworksContainer,
@@ -47,10 +28,11 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
         // Default fixture starts with Polygon as the active chain, so a single
         // network is selected rather than "all networks"
         await Assertions.expectElementToBeVisible(
-          NetworkManager.selectAllPopularNetworksNotSelected,
+          NetworkManager.selectAllPopularNetworksSelected,
         );
 
-        // Verify individual networks reflect their selected/not-selected state
+        // Verify individual popular networks are in the "not selected" state
+        // (since "Select All" is selected, individual rows show as not-selected)
         const popularNetworks = [
           NetworkToCaipChainId.ETHEREUM,
           NetworkToCaipChainId.LINEA,
@@ -67,28 +49,16 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
   it('should reflect the enabled networks state in the network manager, when all popular networks are selected', async () => {
     await withFixtures(
       {
-        fixture: new FixtureBuilder().build(),
+        fixture: new FixtureBuilder().withPopularNetworks().build(),
         restartDevice: true,
-        testSpecificMock,
       },
       async () => {
         await loginToApp();
+        await NetworkManager.openNetworkManagerFromHomepage();
+        // verify popular networks container is visible
+        await NetworkManager.checkPopularNetworksContainerIsVisible();
 
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          description: 'Wallet homepage should be visible',
-        });
-
-        await WalletView.tapOnNewTokensSection();
-        await TokensFullView.waitForVisible();
-
-        await NetworkManager.openNetworkManager();
-
-        // Default fixture starts with Polygon selected — tap "Select All" to
-        // move into the all-networks-selected state. This dismisses the sheet.
-        await NetworkManager.tapSelectAllPopularNetworks();
-
-        // Re-open to verify the all-selected state persisted
-        await NetworkManager.openNetworkManager();
+        // verify all popular networks are selected
         await NetworkManager.checkAllPopularNetworksIsSelected();
       },
     );
@@ -99,33 +69,25 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
       {
         fixture: new FixtureBuilder().build(),
         restartDevice: true,
-        testSpecificMock,
       },
       async () => {
         await loginToApp();
+        // Navigate to TokensFullView then open network manager
+        await NetworkManager.openNetworkManagerFromHomepage();
 
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          description: 'Wallet homepage should be visible',
-        });
-
-        await WalletView.tapOnNewTokensSection();
-        await TokensFullView.waitForVisible();
-
-        // Default fixture starts with Polygon selected (known bug with
-        // homepageSectionsV1 flag). Select Ethereum and verify the control bar.
-        await NetworkManager.openNetworkManager();
+        // Select Ethereum — sheet closes, lands back on TokensFullView
         await NetworkManager.tapNetwork(NetworkToCaipChainId.ETHEREUM);
         await NetworkManager.checkBaseControlBarText(
           NetworkToCaipChainId.ETHEREUM,
         );
 
-        // Re-open and verify Ethereum is marked as selected
+        // Re-open network manager (already in TokensFullView)
         await NetworkManager.openNetworkManager();
         await NetworkManager.checkNetworkIsSelected(
           NetworkToCaipChainId.ETHEREUM,
         );
 
-        // Switch to Linea and verify the control bar updates
+        // Select Linea and check if Ethereum is deselected
         await NetworkManager.tapNetwork(NetworkToCaipChainId.LINEA);
         await NetworkManager.checkBaseControlBarText(
           NetworkToCaipChainId.LINEA,
@@ -145,32 +107,24 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
       {
         fixture: new FixtureBuilder().build(),
         restartDevice: true,
-        testSpecificMock,
       },
       async () => {
         await loginToApp();
-
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          description: 'Wallet homepage should be visible',
-        });
-
-        await WalletView.tapOnNewTokensSection();
-        await TokensFullView.waitForVisible();
-
-        await NetworkManager.openNetworkManager();
+        // Navigate to TokensFullView then open network manager
+        await NetworkManager.openNetworkManagerFromHomepage();
+        await NetworkManager.checkPopularNetworksContainerIsVisible();
 
         // Tap custom networks tab and check custom networks container is visible
         await NetworkManager.tapCustomNetworksTab();
         await NetworkManager.checkCustomNetworksContainerIsVisible();
 
-        // Tap localhost network and check base control bar text
+        // Tap localhost network — sheet closes, lands back on TokensFullView
         await NetworkManager.tapNetwork(NetworkToCaipChainId.LOCALHOST);
         await NetworkManager.checkBaseControlBarText(
           NetworkToCaipChainId.LOCALHOST,
         );
 
-        // Re-open and verify network manager defaults back to custom tab
-        // since the last selected network was a custom network
+        // Re-open network manager (already in TokensFullView)
         await NetworkManager.openNetworkManager();
         await NetworkManager.checkCustomNetworksContainerIsVisible();
       },
@@ -182,19 +136,10 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
       {
         fixture: new FixtureBuilder().build(),
         restartDevice: true,
-        testSpecificMock,
       },
       async () => {
         await loginToApp();
-
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          description: 'Wallet homepage should be visible',
-        });
-
-        await WalletView.tapOnNewTokensSection();
-        await TokensFullView.waitForVisible();
-
-        await NetworkManager.openNetworkManager();
+        await NetworkManager.openNetworkManagerFromHomepage();
         await NetworkManager.checkPopularNetworksContainerIsVisible();
       },
     );
diff --git a/tests/smoke/networks/network-manager2.spec.ts b/tests/smoke/networks/network-manager2.spec.ts
index 7d53ece2e3b..767a4db7ac6 100644
--- a/tests/smoke/networks/network-manager2.spec.ts
+++ b/tests/smoke/networks/network-manager2.spec.ts
@@ -15,19 +15,9 @@ import ConnectBottomSheet from '../../page-objects/Browser/ConnectBottomSheet';
 import { CustomNetworks } from '../../resources/networks.e2e';
 import { Mockttp } from 'mockttp';
 import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
-import { remoteFeatureFlagHomepageSectionsV1Enabled } from '../../api-mocking/mock-responses/feature-flags-mocks';
-import WalletView from '../../page-objects/wallet/WalletView';
-import TokensFullView from '../../page-objects/wallet/HomeSections';
 
 const POLYGON = CustomNetworks.Tenderly.Polygon.providerConfig.nickname;
 
-const testSpecificMock = async (mockServer: Mockttp) => {
-  await setupRemoteFeatureFlagsMock(mockServer, {
-    carouselBanners: false,
-    ...remoteFeatureFlagHomepageSectionsV1Enabled(),
-  });
-};
-
 describe(SmokeNetworkAbstractions('Network Manager'), () => {
   beforeAll(async () => {
     jest.setTimeout(170000);
@@ -43,8 +33,6 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
     const solanaTestMock = async (mockServer: Mockttp) => {
       await setupRemoteFeatureFlagsMock(mockServer, {
         carouselBanners: false,
-        homepageRedesignV1: { enabled: false, minimumVersion: '0.0.0' },
-        homepageSectionsV1: { enabled: false, minimumVersion: '0.0.0' },
       });
     };
 
@@ -89,11 +77,13 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
       async () => {
         await loginToApp();
 
-        // Open network manager directly (old homepage flow, no TokensFullView)
-        await NetworkManager.openNetworkManager();
+        // Navigate to TokensFullView, then open network manager
+        await NetworkManager.openNetworkManagerFromHomepage();
+        await NetworkManager.waitForNetworkManagerToLoad();
+        await NetworkManager.checkPopularNetworksContainerIsVisible();
         await NetworkManager.checkTabIsSelected('Popular');
 
-        // Select Solana network
+        // Select Solana network — sheet closes, lands on TokensFullView
         await NetworkManager.tapNetwork(NetworkToCaipChainId.SOLANA);
 
         // Verify SOL is visible in the Solana-filtered view
@@ -134,23 +124,17 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
           ])
           .build(),
         restartDevice: true,
-        testSpecificMock,
       },
       async () => {
         await loginToApp();
 
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          description: 'Wallet homepage should be visible',
-        });
-
-        await WalletView.tapOnNewTokensSection();
-        await TokensFullView.waitForVisible();
-
-        // Open network manager and verify initial state
-        await NetworkManager.openNetworkManager();
+        // Navigate to TokensFullView, then open network manager
+        await NetworkManager.openNetworkManagerFromHomepage();
+        await NetworkManager.waitForNetworkManagerToLoad();
+        await NetworkManager.checkPopularNetworksContainerIsVisible();
         await NetworkManager.checkTabIsSelected('Popular');
 
-        // Select Ethereum network
+        // Select Ethereum network — sheet closes, lands on TokensFullView
         await NetworkManager.tapNetwork(NetworkToCaipChainId.ETHEREUM);
         await NetworkManager.checkBaseControlBarText(
           NetworkToCaipChainId.ETHEREUM,
@@ -195,29 +179,34 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
               name: 'LineaETH',
             },
           ])
+          .withTokens(
+            [
+              {
+                address: '0x0000000000000000000000000000000000000000',
+                symbol: 'SepoliaETH',
+                decimals: 18,
+                name: 'SepoliaETH',
+              },
+            ],
+            '0xaa36a7', // Sepolia chain ID
+          )
           .build(),
         restartDevice: true,
-        testSpecificMock,
       },
       async () => {
         await loginToApp();
 
-        await Assertions.expectElementToBeVisible(WalletView.container, {
-          description: 'Wallet homepage should be visible',
-        });
-
-        await WalletView.tapOnNewTokensSection();
-        await TokensFullView.waitForVisible();
-
-        // Open network manager and verify initial state
-        await NetworkManager.openNetworkManager();
+        // Navigate to TokensFullView, then open network manager
+        await NetworkManager.openNetworkManagerFromHomepage();
+        await NetworkManager.waitForNetworkManagerToLoad();
+        await NetworkManager.checkPopularNetworksContainerIsVisible();
 
         // Switch to custom networks tab
         await NetworkManager.tapCustomNetworksTab();
         await NetworkManager.checkCustomNetworksContainerIsVisible();
         await NetworkManager.checkTabIsSelected('Custom');
 
-        // Select a custom network (Linea Sepolia)
+        // Select a custom network (Linea Sepolia) — sheet closes, lands on TokensFullView
         await NetworkManager.tapNetwork(NetworkToCaipChainId.ETHEREUM_SEPOLIA);
 
         await NetworkManager.checkBaseControlBarText(
@@ -243,8 +232,6 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
     const dappTestMock = async (mockServer: Mockttp) => {
       await setupRemoteFeatureFlagsMock(mockServer, {
         carouselBanners: false,
-        homepageRedesignV1: { enabled: false, minimumVersion: '0.0.0' },
-        homepageSectionsV1: { enabled: false, minimumVersion: '0.0.0' },
       });
     };
 
@@ -269,17 +256,21 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
       async () => {
         await loginToApp();
 
-        // Step 1: Open the network manager from the wallet homepage directly
-        // (homepageSectionsV1 is disabled for this test — old tab bar is active)
-        await NetworkManager.openNetworkManager();
+        // Step 1: Navigate to TokensFullView, then select Ethereum
+        await NetworkManager.openNetworkManagerFromHomepage();
+        await NetworkManager.waitForNetworkManagerToLoad();
+        await NetworkManager.checkPopularNetworksContainerIsVisible();
         await NetworkManager.checkTabIsSelected('Popular');
 
-        // Select Ethereum as the active network
+        // Select Ethereum as the active network — sheet closes, lands on TokensFullView
         await NetworkManager.tapNetwork(NetworkToCaipChainId.ETHEREUM);
         await NetworkManager.checkBaseControlBarText(
           NetworkToCaipChainId.ETHEREUM,
         );
 
+        // Go back to homepage before navigating to browser
+        await NetworkManager.navigateBackFromTokensFullView();
+
         // Step 2: Navigate to dapp and request network addition
         await navigateToBrowserView();
         await Browser.navigateToTestDApp();
@@ -311,7 +302,8 @@ describe(SmokeNetworkAbstractions('Network Manager'), () => {
         await Browser.tapCloseBrowserButton();
         await TabBarComponent.tapWallet();
 
-        // Verify Ethereum is still the active network (preservation)
+        // Navigate to TokensFullView to verify Ethereum is still the active network
+        await NetworkManager.navigateToTokensFullView();
         await NetworkManager.checkBaseControlBarText(
           NetworkToCaipChainId.ETHEREUM,
         );
diff --git a/tests/smoke/notifications/enable-notifications-after-onboarding.spec.ts b/tests/smoke/notifications/enable-notifications-after-onboarding.spec.ts
index c22adc3a597..3768833f73b 100644
--- a/tests/smoke/notifications/enable-notifications-after-onboarding.spec.ts
+++ b/tests/smoke/notifications/enable-notifications-after-onboarding.spec.ts
@@ -17,6 +17,7 @@ describe(SmokeNetworkAbstractions('Notification Onboarding'), () => {
     jest.setTimeout(170000);
   });
 
+  // TODO: Update the test so if does a full e2e (define what should do). Keep this test to have something tested on e2e.
   it('should enable notifications and view feature announcements and wallet notifications', async () => {
     // Notification mocks are now enabled by default inside the fixture helper
     // since they're turned on by default
diff --git a/tests/smoke/notifications/notification-settings-flow.spec.ts b/tests/smoke/notifications/notification-settings-flow.spec.ts
index 9b26bb9af16..b4dba61cb06 100644
--- a/tests/smoke/notifications/notification-settings-flow.spec.ts
+++ b/tests/smoke/notifications/notification-settings-flow.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable jest/no-disabled-tests -- E2E skipped; covered by component view tests */
 import { SmokeNetworkAbstractions } from '../../tags';
 import Assertions from '../../framework/Assertions';
 import { withFixtures } from '../../framework/fixtures/FixtureHelper';
@@ -15,7 +16,7 @@ describe(SmokeNetworkAbstractions('Notification Onboarding'), () => {
     jest.setTimeout(170000);
   });
 
-  it('should enable notifications and toggle feature announcements and account notifications', async () => {
+  it.skip('should enable notifications and toggle feature announcements and account notifications', async () => {
     await withFixtures(
       {
         fixture: new FixtureBuilder().withDefaultFixture().build(),
diff --git a/tests/smoke/predict/predict-cash-out.spec.ts b/tests/smoke/predict/predict-cash-out.spec.ts
index 38255d43cef..f6bf9afb02b 100644
--- a/tests/smoke/predict/predict-cash-out.spec.ts
+++ b/tests/smoke/predict/predict-cash-out.spec.ts
@@ -24,6 +24,7 @@ import TabBarComponent from '../../page-objects/wallet/TabBarComponent';
 import ActivitiesView from '../../page-objects/Transactions/ActivitiesView';
 import PredictActivityDetails from '../../page-objects/Transactions/predictionsActivityDetails';
 import { predictCashOutFlowAnalyticsExpectations } from '../../helpers/analytics/expectations/predict-cash-out.analytics';
+import { SPURS_PELICANS_POSITION_ID } from '../../api-mocking/mock-responses/polymarket/polymarket-constants';
 
 /*
 Test Scenario: Cash out on open position - Spurs vs. Pelicans
@@ -44,11 +45,6 @@ const PredictionMarketFeature = async (mockServer: Mockttp) => {
     ...remoteFeatureFlagHomepageSectionsV1Enabled(),
     ...remoteFeatureFlagPredictEnabled(true),
     carouselBanners: false,
-    exploreSectionsOrder: {
-      home: ['predictions', 'tokens', 'perps', 'stocks', 'sites'],
-      quickActions: ['tokens', 'perps', 'stocks', 'predictions', 'sites'],
-      search: ['tokens', 'perps', 'stocks', 'predictions', 'sites'],
-    },
   });
   await POLYMARKET_COMPLETE_MOCKS(mockServer);
   await POLYMARKET_POSITIONS_WITH_WINNINGS_MOCKS(mockServer, false); // do not include winnings. Claim Button is animated and problematic for e2e
@@ -73,7 +69,9 @@ describe(SmokePredictions('Predictions'), () => {
         await Assertions.expectElementToBeVisible(PredictDetailsPage.container);
         await POLYMARKET_POST_CASH_OUT_MOCKS(mockServer);
 
-        await PredictDetailsPage.tapCashOutButton();
+        await PredictDetailsPage.tapGameCashOutButton(
+          SPURS_PELICANS_POSITION_ID,
+        );
         await Assertions.expectElementToBeVisible(PredictCashOutPage.container);
 
         await Assertions.expectElementToBeVisible(
diff --git a/tests/smoke/predict/predict-geo-restriction.spec.ts b/tests/smoke/predict/predict-geo-restriction.spec.ts
index b00afbcc956..f690dd9d455 100644
--- a/tests/smoke/predict/predict-geo-restriction.spec.ts
+++ b/tests/smoke/predict/predict-geo-restriction.spec.ts
@@ -22,6 +22,9 @@ import {
   POLYMARKET_GEO_BLOCKED_MOCKS,
 } from '../../api-mocking/mock-responses/polymarket/polymarket-mocks';
 import PredictAddFunds from '../../page-objects/Predict/PredictAddFunds';
+import { getEventsPayloads } from '../../helpers/analytics/helpers';
+import SoftAssert from '../../framework/SoftAssert';
+import { SPURS_PELICANS_POSITION_ID } from '../../api-mocking/mock-responses/polymarket/polymarket-constants';
 import {
   geoBlockedPredictActionExpectations,
   geoBlockedCashoutExpectations,
@@ -34,11 +37,6 @@ const setupGeoBlockedBase = async (mockServer: Mockttp) => {
     ...remoteFeatureFlagPredictEnabled(true),
     ...remoteFeatureFlagHomepageSectionsV1Enabled(),
     carouselBanners: false,
-    exploreSectionsOrder: {
-      home: ['predictions', 'tokens', 'perps', 'stocks', 'sites'],
-      quickActions: ['tokens', 'perps', 'stocks', 'predictions', 'sites'],
-      search: ['tokens', 'perps', 'stocks', 'predictions', 'sites'],
-    },
   });
   await POLYMARKET_MARKET_FEEDS_MOCKS(mockServer);
   await POLYMARKET_GEO_BLOCKED_MOCKS(mockServer);
@@ -124,7 +122,9 @@ describe(
           await WalletView.scrollAndTapPredictionsPosition(
             'Spurs vs. Pelicans',
           );
-          await PredictDetailsPage.tapCashOutButton();
+          await PredictDetailsPage.tapGameCashOutButton(
+            SPURS_PELICANS_POSITION_ID,
+          );
 
           await PredictUnavailableView.expectVisible();
           await PredictUnavailableView.tapGotIt();
diff --git a/tests/smoke/predict/predict-open-position.spec.ts b/tests/smoke/predict/predict-open-position.spec.ts
index dc6a9ff2248..1295e6c45c1 100644
--- a/tests/smoke/predict/predict-open-position.spec.ts
+++ b/tests/smoke/predict/predict-open-position.spec.ts
@@ -45,18 +45,12 @@ const PredictionMarketFeature = async (mockServer: Mockttp) => {
     ...remoteFeatureFlagPredictEnabled(true),
     ...remoteFeatureFlagHomepageSectionsV1Enabled(),
     carouselBanners: false,
-    exploreSectionsOrder: {
-      home: ['predictions', 'tokens', 'perps', 'stocks', 'sites'],
-      quickActions: ['tokens', 'perps', 'stocks', 'predictions', 'sites'],
-      search: ['tokens', 'perps', 'stocks', 'predictions', 'sites'],
-    },
   });
   await POLYMARKET_COMPLETE_MOCKS(mockServer);
   await POLYMARKET_POSITIONS_WITH_WINNINGS_MOCKS(mockServer, false); // do not include winnings. Claim Button is animated and problematic for e2e
 };
 
-// Disabling because of https://consensys.slack.com/archives/C02U025CVU4/p1777884336901849
-describe.skip(SmokePredictions('Predictions'), () => {
+describe(SmokePredictions('Predictions'), () => {
   it('opens position on Celtics vs. Nets market', async () => {
     await withFixtures(
       {
@@ -84,7 +78,7 @@ describe.skip(SmokePredictions('Predictions'), () => {
           positionDetails.category,
           positionDetails.marketIndex,
         );
-        await PredictDetailsPage.tapOpenPositionValue();
+        await PredictDetailsPage.tapGameBetYesButton();
 
         await POLYMARKET_POST_OPEN_POSITION_MOCKS(mockServer);
 
@@ -95,18 +89,6 @@ describe.skip(SmokePredictions('Predictions'), () => {
 
         await PredictDetailsPage.tapOpenPosition();
 
-        await Assertions.expectElementToBeVisible(
-          PredictDetailsPage.positionsTab,
-          {
-            description:
-              'Position tab should appear after opening a new position',
-          },
-        );
-
-        await Assertions.expectTextDisplayed(positionDetails.name, {
-          description: 'Position card for Celtics vs. Nets should appear',
-        });
-
         await PredictDetailsPage.tapBackButton();
         await Assertions.expectTextDisplayed(positionDetails.newBalance, {
           description: `USDC balance should display ${positionDetails.newBalance} after opening position`,
diff --git a/tests/smoke/predict/predict-withdraw.spec.ts b/tests/smoke/predict/predict-withdraw.spec.ts
index 56054ee6fe9..b719073a4a4 100644
--- a/tests/smoke/predict/predict-withdraw.spec.ts
+++ b/tests/smoke/predict/predict-withdraw.spec.ts
@@ -37,11 +37,6 @@ const PredictionMarketFeature = async (mockServer: Mockttp) => {
     ...remoteFeatureFlagHomepageSectionsV1Enabled(),
     ...Object.assign({}, ...confirmationFeatureFlags),
     carouselBanners: false,
-    exploreSectionsOrder: {
-      home: ['predictions', 'tokens', 'perps', 'stocks', 'sites'],
-      quickActions: ['tokens', 'perps', 'stocks', 'predictions', 'sites'],
-      search: ['tokens', 'perps', 'stocks', 'predictions', 'sites'],
-    },
   }); // we need to mock the confirmations redesign Feature flag
   await POLYMARKET_USDC_BALANCE_MOCKS(mockServer); // Sets up all RPC mocks needed for withdraw flow
   // Keep this smoke test on the legacy Safe withdraw path.
diff --git a/tests/smoke/snaps/test-snap-bip-44.spec.ts b/tests/smoke/snaps/test-snap-bip-44.spec.ts
index b26dacc7849..f29091216f7 100644
--- a/tests/smoke/snaps/test-snap-bip-44.spec.ts
+++ b/tests/smoke/snaps/test-snap-bip-44.spec.ts
@@ -8,7 +8,7 @@ import Assertions from '../../framework/Assertions';
 
 jest.setTimeout(150_000);
 
-describe(SmokeSnaps('BIP-44 Snap Tests'), () => {
+describe.skip(SmokeSnaps('BIP-44 Snap Tests'), () => {
   it('can connect to BIP-44 snap', async () => {
     await withFixtures(
       {
diff --git a/tests/smoke/snaps/test-snap-get-entropy.spec.ts b/tests/smoke/snaps/test-snap-get-entropy.spec.ts
index fdf912a825c..edfe4ef259f 100644
--- a/tests/smoke/snaps/test-snap-get-entropy.spec.ts
+++ b/tests/smoke/snaps/test-snap-get-entropy.spec.ts
@@ -29,7 +29,7 @@ async function withIosDetoxSyncDisabledForAccountActivityWs<T>(
   }
 }
 
-describe(SmokeSnaps('Get Entropy Snap Tests'), () => {
+describe.skip(SmokeSnaps('Get Entropy Snap Tests'), () => {
   it('connects to the Get Entropy Snap', async () => {
     await withFixtures(
       {
diff --git a/tests/smoke/stake/stake-action-smoke.spec.ts b/tests/smoke/stake/stake-action-smoke.spec.ts
index b0fe488ccf0..90dfd41c37d 100644
--- a/tests/smoke/stake/stake-action-smoke.spec.ts
+++ b/tests/smoke/stake/stake-action-smoke.spec.ts
@@ -9,6 +9,7 @@ import FixtureBuilder, {
 } from '../../framework/fixtures/FixtureBuilder';
 import WalletView from '../../page-objects/wallet/WalletView';
 import NetworkListModal from '../../page-objects/Network/NetworkListModal';
+import NetworkManager from '../../page-objects/wallet/NetworkManager';
 import { SmokeStake } from '../../tags';
 import Assertions from '../../framework/Assertions';
 import StakeView from '../../page-objects/Stake/StakeView';
@@ -16,7 +17,6 @@ import { AnvilPort } from '../../framework/fixtures/FixtureUtils';
 import { AnvilManager } from '../../seeder/anvil-manager';
 import { Mockttp } from 'mockttp';
 import { setupMockRequest } from '../../api-mocking/helpers/mockHelpers';
-import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
 
 describe(SmokeStake('Stake from Actions'), (): void => {
   const FIRST_ROW: number = 0;
@@ -61,11 +61,6 @@ describe(SmokeStake('Stake from Actions'), (): void => {
         ],
         restartDevice: true,
         testSpecificMock: async (mockServer: Mockttp) => {
-          await setupRemoteFeatureFlagsMock(mockServer, {
-            homepageRedesignV1: { enabled: false, minimumVersion: '0.0.0' },
-            homepageSectionsV1: { enabled: false, minimumVersion: '0.0.0' },
-          });
-
           // Mock Accounts API V4 (flat array) so the app reports correct ETH balance.
           // Without this, the default mock returns 0 balance and the Earn button
           // is hidden (StakeButton returns null when balanceFiatNumber < 0.01).
@@ -175,11 +170,12 @@ describe(SmokeStake('Stake from Actions'), (): void => {
         // Go back to Home tab
         await TabBarComponent.tapHome();
 
-        // Open network picker and select Localhost
-        await WalletView.tapTokenNetworkFilter();
+        // Navigate to TokensFullView and filter by Localhost
+        await NetworkManager.navigateToTokensFullView();
+        await NetworkManager.openNetworkManager();
         await NetworkListModal.changeNetworkTo('Localhost');
 
-        // Verify staked asset in wallet
+        // Verify staked asset in wallet (now in TokensFullView)
         await Assertions.expectTextDisplayed('Staked Ethereum');
         await Assertions.expectTextDisplayed('1 ETH');
         await Assertions.expectTextDisplayed('$4,291.85');
diff --git a/tests/smoke/swap/bridge-action-smoke.spec.ts b/tests/smoke/swap/bridge-action-smoke.spec.ts
index a70b00d452b..f1e93701c27 100644
--- a/tests/smoke/swap/bridge-action-smoke.spec.ts
+++ b/tests/smoke/swap/bridge-action-smoke.spec.ts
@@ -26,7 +26,11 @@ describe(SmokeSwap('Bridge functionality'), () => {
     const sourceSymbol: string = 'ETH';
     const chainId = '0x1';
     const destChainId = '0x2105';
-    const FIRST_ROW: number = 0;
+
+    // Row 0 is a stale STX-shaped entry; the confirmed bridge tx is on row 1.
+    // TODO: stop merging SmartTransactionsController state into
+    // selectLocalTransactions / selectSortedTransactions, then assert row 0.
+    const BRIDGE_ROW: number = 1;
 
     await withFixtures(
       {
@@ -103,7 +107,7 @@ describe(SmokeSwap('Bridge functionality'), () => {
         );
 
         await Assertions.expectElementToHaveText(
-          ActivitiesView.transactionStatus(FIRST_ROW),
+          ActivitiesView.transactionStatus(BRIDGE_ROW),
           ActivitiesViewSelectorsText.CONFIRM_TEXT,
           {
             timeout: 120000,
diff --git a/tests/smoke/swap/swap-action-smoke.spec.ts b/tests/smoke/swap/swap-action-smoke.spec.ts
index 67a6268bf29..f25e4ccfdf6 100644
--- a/tests/smoke/swap/swap-action-smoke.spec.ts
+++ b/tests/smoke/swap/swap-action-smoke.spec.ts
@@ -59,7 +59,8 @@ describe(SmokeSwap('Swap from Actions'), (): void => {
 
         // Submit first swap: ETH->ERC20 (USDC) with custom slippage
         await submitSwapUnifiedUI('1', 'ETH', 'USDC', '0x1', {
-          slippage: '3.5',
+          // slippage: '3.5',
+          // comment out until bug #29615 is fixed
         });
         await checkSwapActivity('ETH', 'USDC');
 
diff --git a/tests/smoke/swap/swap-deeplink-smoke.spec.ts b/tests/smoke/swap/swap-deeplink-smoke.spec.ts
index 763e422a696..c9ebf45c86a 100644
--- a/tests/smoke/swap/swap-deeplink-smoke.spec.ts
+++ b/tests/smoke/swap/swap-deeplink-smoke.spec.ts
@@ -11,6 +11,7 @@ import Assertions from '../../framework/Assertions';
 import { asDetoxElement } from '../../framework';
 import QuoteView from '../../page-objects/swaps/QuoteView';
 import { testSpecificMock } from '../../helpers/swap/swap-mocks';
+import TestHelpers from '../../helpers';
 import WalletView from '../../page-objects/wallet/WalletView';
 
 // Deep link URLs for testing unified swap/bridge experience
@@ -62,7 +63,10 @@ describe(
         async () => {
           await loginToApp();
           await device.sendToHome();
+          // intentional: Detox iOS 16+ sendToHome briefly opens Settings; wait before launchApp({ url }).
+          if (device.getPlatform() === 'ios') await TestHelpers.delay(1000);
           await device.launchApp({
+            newInstance: false,
             url: SWAP_DEEPLINK_FULL,
           });
 
@@ -121,7 +125,10 @@ describe(
         async () => {
           await loginToApp();
           await device.sendToHome();
+          // intentional: Detox iOS 16+ sendToHome briefly opens Settings; wait before launchApp({ url }).
+          if (device.getPlatform() === 'ios') await TestHelpers.delay(1000);
           await device.launchApp({
+            newInstance: false,
             url: SWAP_DEEPLINK_BASE,
           });
 
@@ -175,7 +182,10 @@ describe(
         async () => {
           await loginToApp();
           await device.sendToHome();
+          // intentional: Detox iOS 16+ sendToHome briefly opens Settings; wait before launchApp({ url }).
+          if (device.getPlatform() === 'ios') await TestHelpers.delay(1000);
           await device.launchApp({
+            newInstance: false,
             url: invalidDeeplink,
           });
 
diff --git a/tests/smoke/swap/swap-trending-tokens.spec.ts b/tests/smoke/swap/swap-trending-tokens.spec.ts
index 2908f2a8871..b7b625287bd 100644
--- a/tests/smoke/swap/swap-trending-tokens.spec.ts
+++ b/tests/smoke/swap/swap-trending-tokens.spec.ts
@@ -11,6 +11,7 @@ import TokenOverview from '../../page-objects/wallet/TokenOverview';
 import FixtureBuilder from '../../framework/fixtures/FixtureBuilder';
 import { prepareSwapsTestEnvironment } from '../../helpers/swap/prepareSwapsTestEnvironment';
 import { testSpecificMock } from '../../helpers/swap/bridge-mocks';
+import { setupSwapSocialAndComplianceMocks } from '../../helpers/swap/swap-mocks';
 import { GET_QUOTE_ETH_USDC_RESPONSE } from '../../helpers/swap/constants';
 import { getDecodedProxiedURL } from '../notifications/utils/helpers';
 import { SmokeSwap } from '../../tags';
@@ -77,6 +78,8 @@ const setupSwapsTrendingTokensMock = async (mockServer: Mockttp) => {
     },
     1001,
   );
+
+  await setupSwapSocialAndComplianceMocks(mockServer);
 };
 
 const setupTrendingTokensMock = async (mockServer: Mockttp) => {
diff --git a/tests/smoke/trending/trending-search.spec.ts b/tests/smoke/trending/trending-search.spec.ts
index 74135a77087..ee33fede077 100644
--- a/tests/smoke/trending/trending-search.spec.ts
+++ b/tests/smoke/trending/trending-search.spec.ts
@@ -49,10 +49,13 @@ describe(SmokeWalletPlatform('Trending Search Smoke Test'), () => {
         // 4. Tap Search Button to enter interactive mode
         await TrendingView.tapSearchButton();
 
-        // 5. Verify Search Input is visible and focused
-        await Assertions.expectElementToBeVisible(TrendingView.searchInput, {
-          description: 'Search input should be visible',
-        });
+        // 5. Verify search row is visible
+        await Assertions.expectElementToBeVisible(
+          TrendingView.searchInputContainer,
+          {
+            description: 'Search input should be visible',
+          },
+        );
 
         // 6. Type a query
         await TrendingView.typeSearchQuery('test');
diff --git a/tests/smoke/wallet/helpers/musd-fixture.ts b/tests/smoke/wallet/helpers/musd-fixture.ts
index 6141e1c3605..a1cb9f112a7 100644
--- a/tests/smoke/wallet/helpers/musd-fixture.ts
+++ b/tests/smoke/wallet/helpers/musd-fixture.ts
@@ -64,6 +64,7 @@ export async function createMusdFixture(
   ];
 
   return new FixtureBuilder()
+    .withPopularNetworks()
     .withNetworkController({
       chainId: CHAIN_IDS.MAINNET,
       rpcUrl: `http://localhost:${rpcPort}`,
@@ -71,7 +72,6 @@ export async function createMusdFixture(
       nickname: 'Ethereum Mainnet',
       ticker: 'ETH',
     })
-    .withNetworkEnabledMap({ eip155: { [CHAIN_IDS.MAINNET]: true } })
     .withMetaMetricsOptIn()
     .withTokensForAllPopularNetworks(baseTokens)
     .withTokenRates(
diff --git a/tests/smoke/wallet/incoming-transactions.spec.ts b/tests/smoke/wallet/incoming-transactions.spec.ts
index 6fc378af2b5..28bd9f8eb6a 100644
--- a/tests/smoke/wallet/incoming-transactions.spec.ts
+++ b/tests/smoke/wallet/incoming-transactions.spec.ts
@@ -20,8 +20,8 @@ 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 { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper';
 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 = {
@@ -104,16 +104,15 @@ function mockAccountsApi(
   transactions: Record<string, unknown>[] = [],
 ): MockApiEndpoint {
   return {
-    urlEndpoint: new RegExp(
-      `^https://accounts\\.api\\.cx\\.metamask\\.io/v1/accounts/${DEFAULT_FIXTURE_ACCOUNT}/transactions\\?.*sortDirection=DESC`,
-    ),
+    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: 2,
+        count: transactions.length || 2,
         hasNextPage: false,
       },
     },
@@ -125,17 +124,17 @@ function createAccountsTestSpecificMock(
   transactions: Record<string, unknown>[] = [],
 ): TestSpecificMock {
   return async (mockServer: Mockttp) => {
-    await setupRemoteFeatureFlagsMock(mockServer, {
-      homepageRedesignV1: { enabled: false, minimumVersion: '0.0.0' },
-      homepageSectionsV1: { enabled: false, minimumVersion: '0.0.0' },
-    });
     const mock = mockAccountsApi(transactions);
-    await setupMockRequest(mockServer, {
-      requestMethod: 'GET',
-      url: mock.urlEndpoint,
-      response: mock.response,
-      responseCode: mock.responseCode,
-    });
+    await setupMockRequest(
+      mockServer,
+      {
+        requestMethod: 'GET',
+        url: mock.urlEndpoint,
+        response: mock.response,
+        responseCode: mock.responseCode,
+      },
+      1000,
+    );
   };
 }
 
@@ -188,10 +187,17 @@ describe(SmokeWalletPlatform('Incoming Transactions'), () => {
       {
         fixture,
         restartDevice: true,
-        testSpecificMock: createAccountsTestSpecificMock(),
+        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');
@@ -249,6 +255,11 @@ describe(SmokeWalletPlatform('Incoming Transactions'), () => {
       },
       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');
@@ -256,7 +267,7 @@ describe(SmokeWalletPlatform('Incoming Transactions'), () => {
     );
   });
 
-  it('displays nothing if privacyMode is enabled', async () => {
+  it.skip('displays nothing if privacyMode is enabled', async () => {
     const fixture = new FixtureBuilder()
       .withAccountTreeController(
         EVM_ONLY_ACCOUNT_TREE as unknown as Partial<AccountTreeControllerState>,
@@ -274,6 +285,11 @@ describe(SmokeWalletPlatform('Incoming Transactions'), () => {
       },
       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');
diff --git a/tests/smoke/wallet/musd-conversion-happy-path.spec.ts b/tests/smoke/wallet/musd-conversion-happy-path.spec.ts
index 8be43612e22..2c601717318 100644
--- a/tests/smoke/wallet/musd-conversion-happy-path.spec.ts
+++ b/tests/smoke/wallet/musd-conversion-happy-path.spec.ts
@@ -76,10 +76,10 @@ describe(SmokeWalletPlatform('mUSD Conversion Happy Path'), () => {
 
         // Verify mUSD CTA is visible and tap Get mUSD
         await Assertions.expectElementToBeVisible(
-          WalletView.musdConversionCta,
+          WalletView.cashGetMusdContainer,
           {
             timeout: 30000,
-            description: 'mUSD conversion CTA should be visible',
+            description: 'Cash section Get mUSD container should be visible',
           },
         );
         await WalletView.tapGetMusdButton();
diff --git a/tests/tags.performance.js b/tests/tags.performance.js
index b6afd002229..11898a85efa 100644
--- a/tests/tags.performance.js
+++ b/tests/tags.performance.js
@@ -5,20 +5,36 @@
  * Use these tags to categorize and filter performance tests.
  *
  * Usage in tests:
- *   import { PerformanceLogin, PerformanceSwaps } from '../../tags.js';
+ *   import { Performance, System, PerformanceLogin, PerformanceSwaps } from '../../tags.performance.js';
  *
- *   test.describe(PerformanceLogin, () => {
- *     test('My login test', async ({ device }) => { ... });
- *   });
+ *   // Both perf and system test (most common):
+ *   test.describe(`${Performance} ${System} ${PerformanceLogin} ${PerformanceSwaps}`, () => { ... });
  *
- * Or with multiple tags:
- *   test.describe(`${PerformanceLogin} ${PerformanceSwaps}`, () => { ... });
+ *   // System-only test (functional verification, no perf measurement):
+ *   test.describe(`${System} ${PerformanceLogin}`, () => { ... });
+ *
+ *   // Perf-only test (not run in system test suite):
+ *   test.describe(`${Performance} ${PerformanceLaunch}`, () => { ... });
  *
  * Running tests with tags:
- *   yarn playwright test --grep "@PerformanceLogin"
+ *   yarn playwright test --grep "@Performance"          # All performance tests
+ *   yarn playwright test --grep "@System"               # All system tests
+ *   yarn playwright test --grep "@PerformanceLogin"     # By area
  *   yarn playwright test --grep "@PerformanceSwaps|@PerformanceOnboarding"
  */
 
+// ---------- Test type tags ----------
+// Runner-agnostic tags that control which config/runner picks up a test.
+// Used in test.describe() names and filtered via --grep / config grep.
+
+/** Tag for performance tests (measured with TimerHelper, quality gates enforced). */
+export const Performance = '@Performance';
+
+/** Tag for system tests (functional verification, no quality gates or metrics). */
+export const System = '@System';
+
+// ---------- Area tags ----------
+
 export const PerformanceAccountList = '@PerformanceAccountList';
 export const PerformanceOnboarding = '@PerformanceOnboarding';
 export const PerformanceLogin = '@PerformanceLogin';
diff --git a/tests/utils/Accounts.ts b/tests/utils/Accounts.ts
new file mode 100644
index 00000000000..6542de2dd3f
--- /dev/null
+++ b/tests/utils/Accounts.ts
@@ -0,0 +1,59 @@
+// This is an incorrect BIP39 SRP. It uses words not in the BIP39 wordlist.
+const INCORRECT_SECRET_RECOVERY_PHRASE =
+  'gain lemon refuse sunny identify diesel hand endless first involve wink size';
+const CORRECT_PASSWORD = '12345678';
+const SHORT_PASSWORD = '1234567';
+const INCORRECT_PASSWORD = '12345679';
+
+interface ValidAccount {
+  seedPhrase: string;
+  address: string;
+  password: string;
+}
+
+interface InvalidAccount {
+  seedPhrase: string;
+  password: string;
+}
+
+interface AccountPrivateKey {
+  keys: string;
+}
+
+class Accounts {
+  static getValidAccount(): ValidAccount {
+    return {
+      // A correct BIP39 SRP that can be used for testing. Requires the var to be set in the environment.
+      seedPhrase: process.env.MM_TEST_ACCOUNT_SRP ?? 'undefined SRP env var',
+      // Ethereum address for 1st account derived on the seed that can be used for testing. Requires the var to be set in the environment.
+      address:
+        process.env.MM_TEST_ACCOUNT_ADDRESS ?? 'undefined address env var',
+      password: CORRECT_PASSWORD,
+    };
+  }
+
+  static getInvalidAccount(): InvalidAccount {
+    return {
+      seedPhrase: INCORRECT_SECRET_RECOVERY_PHRASE,
+      password: INCORRECT_PASSWORD,
+    };
+  }
+
+  static getAccountPrivateKey(): AccountPrivateKey {
+    return {
+      keys:
+        process.env.MM_TEST_ACCOUNT_PRIVATE_KEY ??
+        'undefined Private key env var',
+    };
+  }
+
+  static getShortPasswordAccount(): ValidAccount {
+    return {
+      ...Accounts.getValidAccount(),
+      password: SHORT_PASSWORD,
+    };
+  }
+}
+
+export default Accounts;
+export type { ValidAccount, InvalidAccount, AccountPrivateKey };
diff --git a/tests/websocket/server.ts b/tests/websocket/server.ts
index 1cfe10c20d0..1c6068daf4c 100644
--- a/tests/websocket/server.ts
+++ b/tests/websocket/server.ts
@@ -2,6 +2,7 @@
 import { WebSocket, WebSocketServer } from 'ws';
 import { createLogger, LogLevel } from '../framework/logger.ts';
 import { Resource, ServerStatus } from '../framework/types.ts';
+import PortManager, { ResourceType } from '../framework/PortManager.ts';
 
 const logger = createLogger({
   name: 'WebSocketServer',
@@ -20,6 +21,8 @@ const logger = createLogger({
 class LocalWebSocketServer implements Resource {
   private readonly name: string;
 
+  private readonly resourceType?: ResourceType;
+
   private port = 0;
 
   private server: WebSocketServer | null = null;
@@ -28,8 +31,17 @@ class LocalWebSocketServer implements Resource {
 
   private status: ServerStatus = ServerStatus.STOPPED;
 
-  constructor(name: string) {
+  /**
+   * @param name - Human-readable label used in log messages.
+   * @param resourceType - Optional ResourceType whose PortManager allocation
+   * should be released when the server stops. Pass this only for servers
+   * that are registered as single-instance resources in PortManager (e.g.
+   * ResourceType.ACCOUNT_ACTIVITY_WS). Leave undefined for servers that
+   * manage their own port lifecycle externally.
+   */
+  constructor(name: string, resourceType?: ResourceType) {
     this.name = name;
+    this.resourceType = resourceType;
   }
 
   setServerPort(port: number): void {
@@ -93,6 +105,10 @@ class LocalWebSocketServer implements Resource {
     if (!this.server) {
       logger.debug(`[${this.name}] WebSocket server is not running`);
       this.status = ServerStatus.STOPPED;
+      // Ensure stale single-resource allocations do not carry over after timeout paths.
+      if (this.resourceType) {
+        PortManager.getInstance().releasePort(this.resourceType);
+      }
       return;
     }
 
@@ -134,21 +150,27 @@ class LocalWebSocketServer implements Resource {
 
     this.websocketConnections = [];
 
-    await new Promise<void>((resolve, reject) => {
-      this.server?.close((err) => {
-        if (err) {
-          logger.warn(`[${this.name}] Error closing WebSocket server:`, err);
-          reject(err);
-        } else {
-          logger.info(
-            `[${this.name}] WebSocket server stopped on ws://localhost:${this.port}`,
-          );
-          resolve();
-        }
+    try {
+      await new Promise<void>((resolve, reject) => {
+        this.server?.close((err) => {
+          if (err) {
+            logger.warn(`[${this.name}] Error closing WebSocket server:`, err);
+            reject(err);
+          } else {
+            logger.info(
+              `[${this.name}] WebSocket server stopped on ws://localhost:${this.port}`,
+            );
+            resolve();
+          }
+        });
       });
-    });
-    this.server = null;
-    this.status = ServerStatus.STOPPED;
+    } finally {
+      this.server = null;
+      this.status = ServerStatus.STOPPED;
+      if (this.resourceType) {
+        PortManager.getInstance().releasePort(this.resourceType);
+      }
+    }
   }
 
   /**
diff --git a/wdio/helpers/Accounts.js b/wdio/helpers/Accounts.js
deleted file mode 100644
index 5d35bb8720e..00000000000
--- a/wdio/helpers/Accounts.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// This is an incorrect BIP39 SRP. It uses words not in the BIP39 wordlist.
-const INCORRECT_SECRET_RECOVERY_PHRASE =
-  'gain lemon refuse sunny identify diesel hand endless first involve wink size';
-const CORRECT_PASSWORD = `12345678`;
-const SHORT_PASSWORD = `1234567`;
-const INCORRECT_PASSWORD = `12345679`;
-
-class Accounts {
-  static getValidAccount() {
-    return {
-      // A correct BIP39 SRP that can be used for testing. Requires the var to be set in the environment.
-      seedPhrase: process.env.MM_TEST_ACCOUNT_SRP || 'undefined SRP env var',
-      // Ethereum address for 1st account of derived on the seed that can be used for testing. Requires the var to be set in the environment.
-      address:
-        process.env.MM_TEST_ACCOUNT_ADDRESS || 'undefined address env var',
-      password: CORRECT_PASSWORD,
-    };
-  }
-
-  static getInvalidAccount() {
-    return {
-      seedPhrase: INCORRECT_SECRET_RECOVERY_PHRASE,
-      password: INCORRECT_PASSWORD,
-    };
-  }
-
-  static getAccountPrivateKey() {
-    return {
-      keys:
-        process.env.MM_TEST_ACCOUNT_PRIVATE_KEY ||
-        'undefined Private key env var',
-    };
-  }
-
-  static getShortPasswordAccount() {
-    const account = Accounts.getValidAccount();
-    account.password = SHORT_PASSWORD;
-    return account;
-  }
-}
-
-export default Accounts;
-
diff --git a/wdio/helpers/Gestures.js b/wdio/helpers/Gestures.js
deleted file mode 100644
index 8a9eb87a39c..00000000000
--- a/wdio/helpers/Gestures.js
+++ /dev/null
@@ -1,408 +0,0 @@
-import Selectors from './Selectors';
-
-/**
- * To make a Gesture methods more robust for multiple devices and also
- * multiple screen sizes the advice is to work with percentages instead of
- * actual coordinates. The percentages will calculate the position on the
- * screen based on the SCREEN_SIZE which will be determined once if needed
- * multiple times.
- */
-let SCREEN_SIZE;
-
-/**
- * The values in the below object are percentages of the screen
- */
-const SWIPE_DIRECTION = {
-  down: {
-    start: {
-      x: 50,
-      y: 15,
-    },
-    end: {
-      x: 50,
-      y: 85,
-    },
-  },
-  left: {
-    start: {
-      x: 95,
-      y: 50,
-    },
-    end: {
-      x: 5,
-      y: 50,
-    },
-  },
-  right: {
-    start: {
-      x: 5,
-      y: 50,
-    },
-    end: {
-      x: 95,
-      y: 50,
-    },
-  },
-  up: {
-    start: {
-      x: 50,
-      y: 85,
-    },
-    end: {
-      x: 50,
-      y: 15,
-    },
-  },
-};
-
-const Actions = {
-  PRESS: 'press',
-  LONGPRESS: 'longPress',
-  TAP: 'tap',
-  MOVETO: 'moveTo',
-  WAIT: 'wait',
-  RELEASE: 'release',
-};
-
-class Gestures {
-  static async waitAndTap(element) {
-    const elem = await element;
-    await elem.waitForDisplayed({ timeout: 25000 });
-    await elem.click();
-  }
-
-  static async tap(element, tapType = 'TAP') {
-    const elem = await element;
-    switch (tapType) {
-      case 'TAP':
-        await elem.click();
-        break;
-      case 'LONGPRESS':
-        await driver.performActions([{
-          type: 'pointer',
-          id: 'finger1',
-          parameters: { pointerType: 'touch' },
-          actions: [
-            { type: 'pointerDown', duration: 0 },
-            { type: 'pause', duration: 1000 },
-            { type: 'pointerUp', duration: 0 }
-          ]
-        }]);
-        break;
-      case 'RELEASE':
-        await driver.performActions([{
-          type: 'pointer',
-          id: 'finger1',
-          parameters: { pointerType: 'touch' },
-          actions: [
-            { type: 'pointerUp', duration: 0 }
-          ]
-        }]);
-        break;
-      case 'WAIT':
-        await driver.pause(1000);
-        break;
-      case 'MOVETO':
-        const location = await elem.getLocation();
-        await driver.performActions([{
-          type: 'pointer',
-          id: 'finger1',
-          parameters: { pointerType: 'touch' },
-          actions: [
-            { type: 'pointerMove', duration: 0, x: location.x, y: location.y }
-          ]
-        }]);
-        break;
-      default:
-        throw new Error('Tap type not found');
-    }
-  }
-
-  static async tapTextByXpath(text, tapType = 'TAP') {
-    const elem = await Selectors.getXpathElementByText(text);
-    await elem.waitForDisplayed();
-    switch (tapType) {
-      case 'TAP':
-        await elem.click();
-        break;
-      case 'LONGPRESS':
-        await driver.performActions([{
-          type: 'pointer',
-          id: 'finger1',
-          parameters: { pointerType: 'touch' },
-          actions: [
-            { type: 'pointerDown', duration: 0 },
-            { type: 'pause', duration: 1000 },
-            { type: 'pointerUp', duration: 0 }
-          ]
-        }]);
-        break;
-      case 'RELEASE':
-        await driver.performActions([{
-          type: 'pointer',
-          id: 'finger1',
-          parameters: { pointerType: 'touch' },
-          actions: [
-            { type: 'pointerUp', duration: 0 }
-          ]
-        }]);
-        break;
-      default:
-        throw new Error('Tap type not found');
-    }
-  }
-
-  static async tapByTextContaining(text, tapType = 'TAP') {
-    const elem = await Selectors.getXpathElementByTextContains(text);
-    await elem.waitForDisplayed();
-    switch (tapType) {
-      case 'TAP':
-        await elem.click();
-        break;
-      case 'LONGPRESS':
-        await driver.performActions([{
-          type: 'pointer',
-          id: 'finger1',
-          parameters: { pointerType: 'touch' },
-          actions: [
-            { type: 'pointerDown', duration: 0 },
-            { type: 'pause', duration: 1000 },
-            { type: 'pointerUp', duration: 0 }
-          ]
-        }]);
-        break;
-      case 'RELEASE':
-        await driver.performActions([{
-          type: 'pointer',
-          id: 'finger1',
-          parameters: { pointerType: 'touch' },
-          actions: [
-            { type: 'pointerUp', duration: 0 }
-          ]
-        }]);
-        break;
-      default:
-        throw new Error('Tap type not found');
-    }
-  }
-
-  static async tapByCoordinatesPercentage(
-    xAxisPercent,
-    yAxisPercentage,
-    tapCount = 1,
-  ) {
-    const { width, height } = await driver.getWindowSize();
-    const widthPoint = (width * xAxisPercent) / 100;
-    const heightPoint = (height * yAxisPercentage) / 100;
-    await driver.touchPerform([
-      {
-        action: 'tap',
-        options: {
-          x: widthPoint,
-          y: heightPoint,
-          count: tapCount,
-        },
-      },
-    ]);
-  }
-
-  static async longPress(element, waitTime) {
-    const elem = await element;
-    await elem.waitForDisplayed();
-    await driver.performActions([{
-      type: 'pointer',
-      id: 'finger1',
-      parameters: { pointerType: 'touch' },
-      actions: [
-        { type: 'pointerDown', duration: 0 },
-        { type: 'pause', duration: waitTime },
-        { type: 'pointerUp', duration: 0 }
-      ]
-    }]);
-  }
-
-  static async typeText(element, text) {
-    const elem = await element;
-    await elem.waitForDisplayed();
-    await elem.click();
-    await elem.clearValue();
-    await elem.setValue(text, +'\n');
-  }
-
-  static async setValueWithoutTap(element, text) {
-    //Some instances typeText above does not work because of tap
-    const elem = await element;
-    await elem.waitForDisplayed();
-    await elem.clearValue();
-    await elem.setValue(text, +'\n');
-  }
-
-  /**
-   * Check if an element is visible and if not wipe up a portion of the screen to
-   * check if it visible after x amount of scrolls
-   */
-  static async checkIfDisplayedWithSwipeUp(element, maxScrolls, amount = 0) {
-    // If the element is not displayed and we haven't scrolled the max amount of scrolls
-    // then scroll and execute the method again
-    const elem = await element;
-    if (!(await elem.isDisplayed()) && amount <= maxScrolls) {
-      await this.swipeUp(0.85);
-      await this.checkIfDisplayedWithSwipeUp(element, maxScrolls, amount + 1);
-    } else if (amount > maxScrolls) {
-      // If the element is still not visible after the max amount of scroll let it fail
-      throw new Error(
-        `The element '${element}' could not be found or is not visible.`,
-      );
-    } // The element was found, proceed with the next action
-  }
-  /**
-   * Swipe down based on a percentage
-   */
-
-  static async swipeDown(percentage = 1) {
-    await this.swipeOnPercentage(
-      this.calculateXY(SWIPE_DIRECTION.down.start, percentage),
-      this.calculateXY(SWIPE_DIRECTION.down.end, percentage),
-    );
-  }
-  /**
-   * Swipe Up based on a percentage
-   */
-
-  static async swipeUp(percentage = 1) {
-    await this.swipeOnPercentage(
-      this.calculateXY(SWIPE_DIRECTION.up.start, percentage),
-      this.calculateXY(SWIPE_DIRECTION.up.end, percentage),
-    );
-  }
-  /**
-   * Swipe left based on a percentage
-   */
-
-  static async swipeLeft(percentageX = 1, percentageY = 1) {
-    await this.swipeOnPercentage(
-      this.calculateXY(SWIPE_DIRECTION.left.start, percentageX),
-      this.calculateXY(SWIPE_DIRECTION.left.end, percentageY),
-    );
-  }
-  /**
-   * Swipe right based on a percentage
-   */
-
-  static async swipeRight(percentage = 1) {
-    await this.swipeOnPercentage(
-      this.calculateXY(SWIPE_DIRECTION.right.start, percentage),
-      this.calculateXY(SWIPE_DIRECTION.right.end, percentage),
-    );
-  }
-  /**
-   * Swipe from coordinates (from) to the new coordinates (to). The given coordinates are
-   * percentages of the screen.
-   */
-
-  static async swipeOnPercentage(from, to) {
-    // Get the screen size and store it so it can be re-used.
-    // This will save a lot of webdriver calls if this methods is used multiple times.
-    SCREEN_SIZE = SCREEN_SIZE || (await driver.getWindowSize()); // Get the start position on the screen for the swipe
-
-    const pressOptions = this.getDeviceScreenCoordinates(SCREEN_SIZE, from); // Get the move to position on the screen for the swipe
-
-    const moveToScreenCoordinates = this.getDeviceScreenCoordinates(
-      SCREEN_SIZE,
-      to,
-    );
-    await this.swipe(pressOptions, moveToScreenCoordinates);
-  }
-  /**
-   * Swipe from coordinates (from) to the new coordinates (to). The given coordinates are in pixels.
-   */
-
-  static async improvedSwipe() {
-    // TODO
-    const startPercentage = 98;
-    const endPercentage = 0;
-    const anchorPercentage = 50;
-
-    const { width, height } = await driver.getWindowSize();
-    const anchor = (height * anchorPercentage) / 100;
-    const startPoint = (width * startPercentage) / 100;
-    const endPoint = (width * endPercentage) / 100;
-    await driver.touchPerform([
-      {
-        action: 'press',
-        options: {
-          x: startPoint,
-          y: anchor,
-        },
-      },
-      {
-        action: 'wait',
-        options: {
-          ms: 100,
-        },
-      },
-      {
-        action: 'moveTo',
-        options: {
-          x: endPoint,
-          y: anchor,
-        },
-      },
-      {
-        action: 'release',
-        options: {},
-      },
-    ]);
-  }
-
-  static async swipe(from, to) {
-    // TODO
-    await driver.performActions([
-      {
-        // a. Create the event
-        type: 'pointer',
-        id: 'finger1',
-        parameters: { pointerType: 'touch' },
-        actions: [
-          // b. Move finger into start position
-          { type: 'pointerMove', duration: 0, x: from.x, y: from.y },
-          // c. Finger comes down into contact with screen
-          { type: 'pointerDown', button: 0 },
-          // d. Pause for a little bit
-          { type: 'pause', duration: 100 },
-          // e. Finger moves to end position
-          //    We move our finger from the center of the element to the
-          //    starting position of the element.
-          //    Play with the duration to make the swipe go slower / faster
-          { type: 'pointerMove', duration: 1000, x: to.x, y: to.y },
-          // f. Finger gets up, off the screen
-          { type: 'pointerUp', button: 0 },
-        ],
-      },
-    ]);
-    // Add a pause, just to make sure the swipe is done
-    await driver.pause(1000);
-  }
-  /**
-   * Get the screen coordinates based on a device his screen size
-   */
-
-  static getDeviceScreenCoordinates(screenSize, coordinates) {
-    return {
-      x: Math.round(screenSize.width * (coordinates.x / 100)),
-      y: Math.round(screenSize.height * (coordinates.y / 100)),
-    };
-  }
-  /**
-   * Calculate the x y coordinates based on a percentage
-   */
-
-  static calculateXY({ x, y }, percentage) {
-    return {
-      x: x * percentage,
-      y: y * percentage,
-    };
-  }
-}
-
-export default Gestures;
diff --git a/wdio/helpers/Selectors.js b/wdio/helpers/Selectors.js
deleted file mode 100644
index 5dc793d19e3..00000000000
--- a/wdio/helpers/Selectors.js
+++ /dev/null
@@ -1,64 +0,0 @@
-class Selectors {
-
-  static async getElementByPlatform(id, isNested = false) {
-    if (!isNested) {
-      return $(`~${id}`);
-    }
-
-    const platform = await driver.getPlatform();
-    if (platform === 'Android') {
-      return $(`~${id}`);
-    } else if (platform === 'iOS') {
-      /**
-       * Use class chains for iOS
-       * Ref.: https://webdriver.io/docs/selectors#ios-uiautomation
-       * Too many levels of nesting cause test ids not to be rendered
-       * Ref.: https://github.com/appium/appium/issues/14825
-       */
-      return $(`-ios class chain:${id}`);
-    }
-  }
-
-  static async getXpathByContentDesc(id) {
-    return driver.$$(`//*[@content-desc='${id}']`);
-  }
-
-  static async getXpathElementByText(text) {
-    const platform = await driver.getPlatform();
-    if (platform === 'iOS') {
-      return await $(`//*[@name='${text}']`);
-    }
-
-    if (platform === 'Android') {
-      return await $(`//*[@text='${text}']`);
-    }
-  }
-
-  static async getXpathElementByTextContains(text) {
-    const platform = await driver.getPlatform();
-    if (platform === 'iOS') {
-      return await $(`//*[contains(@name, '${text}')]`);
-    }
-
-    if (platform === 'Android') {
-      return await $(`//*[contains(@text, '${text}')]`);
-    }
-  }
-
-  static async getXpathElementByResourceId(id) {
-    const platform = await driver.getPlatform();
-    if (platform === 'iOS') {
-      return await $(`~${id}`);
-    }
-
-    if (platform === 'Android') {
-      return await $(`//*[@resource-id='${id}']`);
-    }
-  }
-
-  static async getElementByCss(css) {
-    return await $(css);
-  }
-}
-
-export default Selectors;
diff --git a/wdio/screen-objects/AccountListComponent.js b/wdio/screen-objects/AccountListComponent.js
deleted file mode 100644
index 7a1ea1b7000..00000000000
--- a/wdio/screen-objects/AccountListComponent.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import Gestures from '../helpers/Gestures';
-import Selectors from '../helpers/Selectors';
-import {
-  AccountListBottomSheetSelectorsIDs,
-} from '../../app/components/Views/AccountSelector/AccountListBottomSheet.testIds';
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { expect } from 'appwright';
-
-class AccountListComponent {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get accountListContainer() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AccountListBottomSheetSelectorsIDs.ACCOUNT_LIST_ID);
-    } else {
-      return AppwrightSelectors.getElementByText(this._device, 'Accounts');
-    }
-  }
-
-  get addAccountButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AccountListBottomSheetSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AccountListBottomSheetSelectorsIDs.CREATE_ACCOUNT);
-    }
-  }
-
-  get addWalletButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'account-list-add-account-button');
-  }
-
-  async tapCreateAccountButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.addAccountButton);
-    } else {
-      await AppwrightGestures.scrollIntoView(this.device, this.addAccountButton, {scrollParams: {direction: 'down'}});
-      await AppwrightGestures.tap(await this.addAccountButton);
-    }
-  }
-
-  async tapOnAddWalletButton() {
-    await AppwrightGestures.tap(await this.addWalletButton); // Use static tap method with retry logic
-  }
-
-  async isComponentDisplayed() {
-    if (!this._device) {
-      await this.accountListContainer.waitForDisplayed();
-    } else {
-      const element = await this.accountListContainer;
-      await expect(element).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async isComponentNotDisplayed() {
-    const element = await this.accountListContainer;
-    await element.waitForExist({ reverse: true });
-  }
-
-  async isAccountDisplayed(name, timeout = 10000) {
-    const element = await AppwrightSelectors.getElementByCatchAll(this.device, name);
-    await expect(element).toBeVisible({ timeout });
-  }
-
-  async tapOnAccountByName(name) {
-    const account = await AppwrightSelectors.getElementByText(this.device, name);
-    await AppwrightGestures.scrollIntoView(this.device, account); // Use inherited method with retry logic
-    await AppwrightGestures.tap(account); // Tap after scrolling into view
-  }
-
-  async waitForSyncingToComplete(timeout = 60000) {
-    console.log('⏳ waitForSyncingToComplete: Starting...');
-    const startTime = Date.now();
-    const pollInterval = 500;
-    const initialWaitTimeout = 5000; // 5 seconds to wait for syncing/discovering to appear
-
-    const getElapsed = () => ((Date.now() - startTime) / 1000).toFixed(1);
-
-    const syncingElement = await AppwrightSelectors.getElementByCatchAll(this.device, 'Syncing');
-    const discoveringElement = await AppwrightSelectors.getElementByCatchAll(this.device, 'Discovering');
-
-    // Step 1: Wait up to 5 seconds for "Syncing" or "Discovering" to appear
-    console.log('⏳ Step 1: Waiting up to 5s for "Syncing" or "Discovering" to appear...');
-    let syncingDetected = false;
-    while (Date.now() - startTime < initialWaitTimeout) {
-      const isSyncing = await syncingElement.isVisible({ timeout: 200 }).catch(() => false);
-      const isDiscovering = await discoveringElement.isVisible({ timeout: 200 }).catch(() => false);
-
-      if (isSyncing || isDiscovering) {
-        syncingDetected = true;
-        console.log(`✅ Step 1: Loading detected after ${getElapsed()}s (Syncing: ${isSyncing}, Discovering: ${isDiscovering})`);
-        break;
-      }
-      await new Promise((resolve) => setTimeout(resolve, pollInterval));
-    }
-
-    // If nothing appeared after 5 seconds, we're done
-    if (!syncingDetected) {
-      console.log(`✅ waitForSyncingToComplete: No syncing detected after 5s, finishing after ${getElapsed()}s`);
-      return;
-    }
-
-    // Step 2: Wait for "Syncing" to disappear
-    console.log('⏳ Step 2: Waiting for "Syncing" to disappear...');
-    while (Date.now() - startTime < timeout) {
-      const isSyncing = await syncingElement.isVisible({ timeout: 200 }).catch(() => false);
-      if (!isSyncing) {
-        console.log(`✅ Step 2: "Syncing" disappeared after ${getElapsed()}s`);
-        break;
-      }
-      await new Promise((resolve) => setTimeout(resolve, pollInterval));
-    }
-
-    // Step 3: Wait 1 second delay
-    console.log('⏳ Step 3: Waiting 1 second...');
-    await new Promise((resolve) => setTimeout(resolve, 1000));
-
-    // Step 4: Wait for "Discovering" to disappear
-    console.log('⏳ Step 4: Waiting for "Discovering" to disappear...');
-    while (Date.now() - startTime < timeout) {
-      const isDiscovering = await discoveringElement.isVisible({ timeout: 200 }).catch(() => false);
-      if (!isDiscovering) {
-        console.log(`✅ Step 4: "Discovering" disappeared after ${getElapsed()}s`);
-        break;
-      }
-      await new Promise((resolve) => setTimeout(resolve, pollInterval));
-    }
-
-    console.log(`✅ waitForSyncingToComplete: Completed after ${getElapsed()}s`);
-  }
-}
-
-export default new AccountListComponent();
diff --git a/wdio/screen-objects/ActivityScreen.js b/wdio/screen-objects/ActivityScreen.js
deleted file mode 100644
index f35ed04e315..00000000000
--- a/wdio/screen-objects/ActivityScreen.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Selectors from '../helpers/Selectors';
-
-class ActivityScreen {
-
-  async isTransactionDisplayed(text) {
-    await expect(Selectors.getXpathElementByText(text)).toBeDisplayed();
-  }
-}
-
-export default new ActivityScreen();
diff --git a/wdio/screen-objects/AddContact.js b/wdio/screen-objects/AddContact.js
deleted file mode 100644
index b6a12d58075..00000000000
--- a/wdio/screen-objects/AddContact.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import Gestures from '../helpers/Gestures';
-import Selectors from '../helpers/Selectors';
-import {
-  ADD_CONTACT_ADD_BUTTON,
-  ADD_CONTACT_ADDRESS_INPUT,
-  ADD_CONTACT_DELETE_BUTTON,
-  ADD_CONTACT_NAME_INPUT,
-  ADD_CONTACTS_CONTAINER_ID,
-} from './testIDs/Screens/AddContact.testIds';
-import { AddContactViewSelectorsIDs } from '../../app/components/Views/Settings/Contacts/AddContactView.testIds';
-
-class AddContacts {
-  get container() {
-    return Selectors.getElementByPlatform(ADD_CONTACTS_CONTAINER_ID);
-  }
-
-  get contactInputField() {
-    return Selectors.getElementByPlatform(ADD_CONTACT_NAME_INPUT);
-  }
-
-  get addressInputField() {
-    return Selectors.getElementByPlatform(ADD_CONTACT_ADDRESS_INPUT);
-  }
-
-  get addContactButton() {
-    return Selectors.getElementByPlatform(ADD_CONTACT_ADD_BUTTON);
-  }
-
-  get deleteButton() {
-    return Selectors.getElementByPlatform(ADD_CONTACT_DELETE_BUTTON);
-  }
-
-  get editButton() {
-    return Selectors.getElementByPlatform(AddContactViewSelectorsIDs.EDIT_BUTTON);
-  }
-
-  async waitForDisplay() {
-    const element = await this.container;
-    await element.waitForDisplayed();
-  }
-
-  async tapAddContactButton() {
-    await Gestures.waitAndTap(this.addContactButton);
-    await Gestures.waitAndTap(this.addContactButton);
-  }
-
-  async waitForAddContactButton() {
-    const element = await this.addContactButton;
-    await element.waitForDisplayed();
-  }
-
-  async fillContactNameField(name) {
-    await Gestures.typeText(this.contactInputField, name);
-    await driver.hideKeyboard();
-  }
-
-  async fillAddressField(address) {
-    await Gestures.typeText(this.addressInputField, address);
-    await driver.hideKeyboard();
-  }
-
-  async tapEditButton() {
-    await Gestures.waitAndTap(this.editButton);
-  }
-
-  async tapDeleteButton() {
-    await Gestures.waitAndTap(this.deleteButton);
-  }
-}
-
-export default new AddContacts();
diff --git a/wdio/screen-objects/AddCustomImportTokensScreen.js b/wdio/screen-objects/AddCustomImportTokensScreen.js
deleted file mode 100644
index 69f340e4e2f..00000000000
--- a/wdio/screen-objects/AddCustomImportTokensScreen.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import Gestures from '../helpers/Gestures';
-import Selectors from '../helpers/Selectors';
-import {
-  ImportTokenViewSelectorsIDs,
-  ImportTokenViewSelectorsText
-} from '../../app/components/Views/AddAsset/ImportTokenView.testIds';
-
-class AddCustomImportToken {
-  get customTokenAddressField() {
-    return Selectors.getElementByPlatform(ImportTokenViewSelectorsIDs.ADDRESS_INPUT);
-  }
-
-  get importButton() {
-    return Selectors.getXpathElementByText(ImportTokenViewSelectorsText.IMPORT_BUTTON);
-  }
-
-  get symbolField() {
-    return Selectors.getElementByPlatform(ImportTokenViewSelectorsIDs.SYMBOL_INPUT);
-  }
-
-  async typeCustomTokenAddress(text) {
-    await Gestures.typeText(this.customTokenAddressField, text);
-  }
-
-  async tapImportButton() {
-    await Gestures.waitAndTap(this.importButton);
-  }
-
-  async tapTokenSymbolField() {
-    await Gestures.waitAndTap(this.symbolField);
-  }
-
-  async waitForImportButtonEnabled() {
-    const importButton = await this.importButton;
-    await importButton.waitForEnabled();
-  }
-
-  async isTokenSymbolFieldNotNull() {
-    await expect(this.symbolField).not.toHaveText('GNO');
-  }
-}
-
-export default new AddCustomImportToken();
diff --git a/wdio/screen-objects/AmountScreen.js b/wdio/screen-objects/AmountScreen.js
deleted file mode 100644
index d53df428626..00000000000
--- a/wdio/screen-objects/AmountScreen.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import Gestures from '../helpers/Gestures';
-import Selectors from '../helpers/Selectors';
-import { expect as appwrightExpect } from 'appwright';
-import {
-  AMOUNT_ERROR,
-  AMOUNT_SCREEN,
-  NEXT_BUTTON,
-  TRANSACTION_AMOUNT_INPUT,
-} from './testIDs/Screens/AmountScreen.testIds';
-import { splitAmountIntoDigits } from '../utils/splitAmountIntoDigits';
-
-class AmountScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get amountInputField() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(TRANSACTION_AMOUNT_INPUT);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TRANSACTION_AMOUNT_INPUT);
-    }
-  }
-
-  get amountScreen() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(AMOUNT_SCREEN);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AMOUNT_SCREEN);
-    }
-  }
-
-  get amountError() {
-    return Selectors.getElementByPlatform(AMOUNT_ERROR);
-  }
-
-  get nextButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(NEXT_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByCatchAll(this._device, 'Continue');
-    }
-  }
-
-  async tapNumberKey(digit) {
-    console.log(`tapNumberKey called with digit: "${digit}"`);
-
-    try {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        console.log(`Android: Looking for button with content-desc='${digit}'`);
-        const numberKey = await AppwrightSelectors.getElementByXpath(this._device, `//android.widget.Button[@content-desc='${digit}']`)
-        console.log(`Android: Found element, checking visibility`);
-        await appwrightExpect(numberKey).toBeVisible({ timeout: 30000 });
-        console.log(`Android: Element visible, tapping`);
-        await AppwrightGestures.tap(numberKey);
-        console.log(`Android: Successfully tapped digit: ${digit}`);
-      }
-      else {
-        console.log(`iOS: Looking for button with name="${digit}"`);
-        const numberKey = await AppwrightSelectors.getElementByXpath(this._device, `//XCUIElementTypeButton[@name="${digit}"]`);
-        console.log(`iOS: Found element, checking visibility`);
-        await appwrightExpect(numberKey).toBeVisible({ timeout: 30000 });
-        console.log('iOS: Tapping number key:', digit);
-        await AppwrightGestures.tap(numberKey);
-        console.log(`iOS: Successfully tapped digit: ${digit}`);
-      }
-    } catch (error) {
-      console.error(`Error in tapNumberKey for digit "${digit}":`, error);
-      throw error;
-    }
-  }
-
-  async enterAmount(text) {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.amountInputField);
-      await Gestures.typeText(this.amountInputField, text);
-    } else {
-        console.log('Direct input failed, falling back to digit tapping');
-        // Fallback to digit tapping if direct input fails
-        const digits = splitAmountIntoDigits(text);
-        for (const digit of digits) {
-          console.log('Tapping digit:', digit);
-          await this.tapNumberKey(digit);
-        }
-      }
-  }
-
-
-  async isTokenCorrect(token) {
-    expect(this.confirmAmount).toHaveText(token);
-  }
-
-  async waitForAmountErrorMessage() {
-    const amountError = await this.amountError;
-    await amountError.waitForDisplayed();
-  }
-
-  async waitNextButtonEnabled() {
-    const nextButton = await this.nextButton;
-    await nextButton.waitForEnabled();
-  }
-
-  async tapOnNextButton() {
-    await AppwrightGestures.tap(await this.nextButton);
-  }
-
-  async isVisible() {
-    if (!this._device) {
-      const element = await this.amountScreen;
-      await element.waitForDisplayed();
-    } else {
-      const element = await AppwrightSelectors.getElementByCatchAll(this._device, '25%');
-      await appwrightExpect(element).toBeVisible();
-    }
-  }
-}
-
-export default new AmountScreen();
diff --git a/wdio/screen-objects/BridgeScreen.js b/wdio/screen-objects/BridgeScreen.js
deleted file mode 100644
index e9b545cde6e..00000000000
--- a/wdio/screen-objects/BridgeScreen.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import { SWAP_SCREEN_DESTINATION_TOKEN_INPUT_ID, SWAP_SCREEN_QUOTE_DISPLAYED_ID, SWAP_SCREEN_SOURCE_TOKEN_INPUT_ID } from './testIDs/Screens/SwapScreen.testIds';
-import { expect as appwrightExpect } from 'appwright';
-import { PerpsWithdrawViewSelectorsIDs } from '../../app/components/UI/Perps/Perps.testIds';
-import { QuoteViewSelectorText } from '../../tests/selectors/Bridge/QuoteView.selectors';
-import Selectors from '../helpers/Selectors.js';
-import { LoginViewSelectors } from '../../app/components/Views/Login/LoginView.testIds';
-import AmountScreen from './AmountScreen';
-
-class BridgeScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-  get sourceTokenInput() {
-    return AppwrightSelectors.getElementByID(this._device, SWAP_SCREEN_SOURCE_TOKEN_INPUT_ID);
-  }
-
-  get destTokenInput() {
-    return AppwrightSelectors.getElementByID(this._device, SWAP_SCREEN_DESTINATION_TOKEN_INPUT_ID);
-  }
-
-  get quoteDisplayed() {
-    return AppwrightSelectors.getElementByID(this._device, SWAP_SCREEN_QUOTE_DISPLAYED_ID);
-  }
-  get destinationTokenArea(){
-    return AppwrightSelectors.getElementByID(this._device, PerpsWithdrawViewSelectorsIDs.DEST_TOKEN_AREA);
-  }
-
-  getNetworkButton(networkName) {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        LoginViewSelectors.PASSWORD_INPUT,
-      );
-    } else {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        return AppwrightSelectors.getElementByCatchAll(this._device, networkName);
-      } else {
-        return AppwrightSelectors.getElementByXpath(this._device, `//XCUIElementTypeButton[@name="${networkName}"]`);
-      }
-    }
-  }
-
-  async isQuoteDisplayed() {
-      const mmFee = await AppwrightSelectors.getElementByCatchAll(this._device, "Includes 0.875% MetaMask fee");
-      await appwrightExpect(mmFee).toBeVisible({ timeout: 30000 });
-
-
-  }
-
-  async enterSourceTokenAmount(amount) {
-    // Tap each digit on the numeric keypad
-    const digits = amount.split('');
-    AmountScreen.device = this._device;
-    await AppwrightGestures.tap(this.sourceTokenInput);
-    for (const digit of digits) {
-      const digitButton = await AppwrightSelectors.getElementByText(this._device, digit, true);
-      await appwrightExpect(digitButton).toBeVisible({ timeout: 10000 });
-      await AmountScreen.tapNumberKey(digit);
-    }
-  }
-
-  async selectNetworkAndTokenTo(network, token) {
-    const destinationToken = await this.destinationTokenArea;
-    await AppwrightGestures.tap(destinationToken);
-    const networkButton = await this.getNetworkButton(network);
-    if (network !== 'Ethereum'){
-      await AppwrightGestures.tap(networkButton);
-    }
-    let tokenNetworkId;
-    if (network == 'Ethereum'){
-      tokenNetworkId = `0x1`;
-    }
-    else if (network == 'Polygon'){
-      tokenNetworkId = `0x89`;
-    }
-    else if (network == 'Solana'){
-      tokenNetworkId = `solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp`;
-    }
-    const tokenButton = AppwrightSelectors.isAndroid(this._device) ? await AppwrightSelectors.getElementByID(this._device, `asset-${tokenNetworkId}-${token}`) : await AppwrightSelectors.getElementByNameiOS(this._device, `asset-${tokenNetworkId}-${token}`);
-    await appwrightExpect(tokenButton).toBeVisible({ timeout: 30000 });
-    await AppwrightGestures.tap(tokenButton);
-  }
-
-  async enterDestinationTokenAmount(amount) {
-    const element = await this.destTokenInput;
-    await AppwrightGestures.typeText(element, amount);
-  }
-
-  async isVisible() {
-    const element = await this.sourceTokenInput;
-    await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-  }
-}
-
-export default new BridgeScreen();
diff --git a/wdio/screen-objects/BrowserObject/AddFavoriteScreen.js b/wdio/screen-objects/BrowserObject/AddFavoriteScreen.js
deleted file mode 100644
index 7ad3c674643..00000000000
--- a/wdio/screen-objects/BrowserObject/AddFavoriteScreen.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import { AddBookmarkViewSelectorsIDs } from '../../../app/components/Views/AddBookmark/AddBookmarkView.testIds';
-
-class AddFavoriteScreen {
-  get screen() {
-    return Selectors.getElementByPlatform(AddBookmarkViewSelectorsIDs.CONTAINER);
-  }
-
-  get titleEditText() {
-    return Selectors.getElementByPlatform(AddBookmarkViewSelectorsIDs.BOOKMARK_TITLE);
-  }
-
-  get urlEditText() {
-    return Selectors.getElementByPlatform(AddBookmarkViewSelectorsIDs.URL_TEXT);
-  }
-
-  get addButton() {
-    return Selectors.getXpathElementByText('Add');
-  }
-
-  get cancelButton() {
-    return Selectors.getXpathElementByText('Cancel');
-  }
-
-  async isScreenDisplayed() {
-    await expect(await this.screen).toBeDisplayed();
-  }
-
-  async titleEditTextContains(expectedTitle) {
-    await expect(this.titleEditText).toHaveText(expectedTitle);
-  }
-
-  async editTitleEditText(title) {
-    await Gestures.typeText(this.titleEditText, title);
-  }
-
-  async urlEditTextContains(expectedUrl) {
-    await expect(this.urlEditText).toHaveText(expectedUrl);
-  }
-
-  async editUrlEditText(title) {
-    await Gestures.typeText(this.urlEditText, title);
-  }
-
-  async tapCancelButton() {
-    await Gestures.waitAndTap(this.cancelButton);
-  }
-
-  async tapAddButton() {
-    await Gestures.waitAndTap(this.addButton);
-  }
-}
-
-export default new AddFavoriteScreen();
diff --git a/wdio/screen-objects/BrowserObject/AddressBarScreen.js b/wdio/screen-objects/BrowserObject/AddressBarScreen.js
deleted file mode 100644
index 9cb293f3c6d..00000000000
--- a/wdio/screen-objects/BrowserObject/AddressBarScreen.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-
-import {
-
-  HOME_SUGGESTION,
-  UNISWAP_SUGGESTION,
-
-} from '../testIDs/BrowserScreen/AddressBar.testIds';
-
-import { BrowserURLBarSelectorsIDs } from '../../../app/components/UI/BrowserUrlBar/BrowserURLBar.testIds';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-
-class AddressBarScreen {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get urlCancelButton() {
-    return Selectors.getXpathElementByResourceId(BrowserURLBarSelectorsIDs.CANCEL_BUTTON_ON_BROWSER_ID);
-  }
-
-  get urlModalInput() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(BrowserURLBarSelectorsIDs.URL_INPUT);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, BrowserURLBarSelectorsIDs.URL_INPUT);
-    }
-  }
-
-  get uniswapSuggestionsButton() {
-    return Selectors.getXpathElementByText(UNISWAP_SUGGESTION);
-  }
-
-  get homeSuggestionsButton() {
-    return Selectors.getXpathElementByText(HOME_SUGGESTION);
-  }
-
-  get urlClearIcon() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(BrowserURLBarSelectorsIDs.URL_CLEAR_ICON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, BrowserURLBarSelectorsIDs.URL_CLEAR_ICON);
-    }
-  }
-
-  async isAddressInputViewDisplayed() {
-    await expect(await this.urlModalInput).toBeDisplayed();
-  }
-
-  async isAddressInputViewNotDisplayed() {
-    await expect(await this.urlModalInput).not.toBeDisplayed();
-  }
-
-  async submitUrlWebsite() {
-    if (!this._device) {
-      await driver.pressKeyCode(66);
-    } else {
-      const driver = await this._device.webDriverClient;
-      await driver.pressKeyCode(66);
-    }
-  }
-
-  async isUrlValueContains(text) {
-    await expect(this.urlModalInput).toHaveTextContaining(text);
-  }
-
-  async isUrlInputEmpty() {
-    await expect(this.urlModalInput).toHaveText('Search or Type URL');
-  }
-
-  async tapClearButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.urlClearIcon);
-    } else {
-      const urlClearIcon = await this.urlClearIcon;
-      await urlClearIcon.tap();
-    }
-  }
-
-  async editUrlInput(text) {
-    if (!this._device) {
-      await Gestures.typeText(this.urlModalInput, text);
-    } else {
-      const urlModalInput = await this.urlModalInput;
-      await urlModalInput.fill(text);
-    }
-  }
-
-  async tapUrlCancelButton() {
-    await Gestures.waitAndTap(this.urlCancelButton);
-    const element = await this.urlCancelButton;
-    await element.waitForExist({ reverse: true });
-  }
-
-  async isUniswapSuggestionDisplayed() {
-    await expect(await this.uniswapSuggestionsButton).toBeDisplayed();
-  }
-
-  async tapUniswapSuggestionButton() {
-    await Gestures.waitAndTap(this.uniswapSuggestionsButton);
-  }
-
-  async tapHomeSuggestionButton() {
-    await Gestures.waitAndTap(this.homeSuggestionsButton);
-  }
-}
-
-export default new AddressBarScreen();
diff --git a/wdio/screen-objects/BrowserObject/BrowserScreen.js b/wdio/screen-objects/BrowserObject/BrowserScreen.js
deleted file mode 100644
index 884a23d7f85..00000000000
--- a/wdio/screen-objects/BrowserObject/BrowserScreen.js
+++ /dev/null
@@ -1,146 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-import  {
-  BrowserViewSelectorsIDs,
-} from '../../../app/components/Views/BrowserTab/BrowserView.testIds';
-import { expect } from 'appwright';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-
-
-class BrowserScreen {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get container() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(BrowserViewSelectorsIDs.BROWSER_SCREEN_ID);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, BrowserViewSelectorsIDs.BROWSER_SCREEN_ID);
-    }
-  }
-
-  get urlBarTitle() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(BrowserViewSelectorsIDs.URL_INPUT);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, BrowserViewSelectorsIDs.URL_INPUT);
-    }
-  }
-
-  get accountIconButton() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.ACCOUNT_BUTTON);
-  }
-
-  get optionButton() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.OPTIONS_BUTTON);
-  }
-
-  get tabsButton() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.TABS_BUTTON);
-  }
-
-  get tabsButtonTextElement() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.TABS_NUMBER);
-  }
-
-  get homeButton() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.HOME_BUTTON);
-  }
-
-  get backButton() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.BACK_BUTTON);
-  }
-
-  get forwardButton() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.FORWARD_BUTTON);
-  }
-
-  get searchButton() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.SEARCH_BUTTON);
-  }
-
-  get networkAvatarIcon() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.AVATAR_IMAGE);
-  }
-
-  async isScreenContentDisplayed() {
-    if (!this._device) {
-      const screen = await this.container;
-      await screen.waitForDisplayed();
-    } else {
-      const screen = await this.container;
-      await expect(screen).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async tapUrlBar() {
-    if (!this._device) {
-      await driver.pause(500);
-      const urlBarTitle = await this.urlBarTitle;
-      await urlBarTitle.waitForEnabled();
-      await Gestures.waitAndTap(this.urlBarTitle);
-    } else {
-      const urlBarTitle = await this.urlBarTitle;
-      await urlBarTitle.tap();
-    }
-  }
-
-  async tapAccountButton() {
-    await Gestures.waitAndTap(this.accountIconButton);
-  }
-
-  async tapOptionButton() {
-    const element = await this.optionButton;
-    await element.waitForEnabled();
-    await Gestures.waitAndTap(this.optionButton);
-  }
-
-  async numberOfTapsEqualsTo(expectedNumber) {
-    const textFromElement = await this.tabsButtonTextElement;
-    const actualNumber = parseInt(await textFromElement.getText());
-    await expect(await expectedNumber).toEqual(actualNumber);
-  }
-
-  async tapTabsButton() {
-    const element = await this.tabsButton;
-    await element.waitForEnabled();
-    await Gestures.waitAndTap(this.tabsButton);
-  }
-
-  async tapHomeButton() {
-    const element = await this.homeButton;
-    await element.waitForEnabled();
-    await Gestures.waitAndTap(this.homeButton);
-  }
-
-  async tapBackButton() {
-    const element = await this.backButton;
-    await element.waitForEnabled();
-    await Gestures.waitAndTap(this.backButton);
-  }
-
-  async tapForwardButton() {
-    await Gestures.waitAndTap(this.forwardButton);
-  }
-
-  async tapSearchButton() {
-    await Gestures.waitAndTap(this.searchButton);
-  }
-
-  async tapNetworkAvatarIcon() {
-    await Gestures.waitAndTap(this.networkAvatarIcon);
-  }
-
-  async waitForBackButtonEnabled() {
-    const element = await this.backButton;
-    await element.waitForEnabled();
-    await driver.pause(2000);
-  }
-}
-
-export default new BrowserScreen();
diff --git a/wdio/screen-objects/BrowserObject/ExternalWebsitesScreen.js b/wdio/screen-objects/BrowserObject/ExternalWebsitesScreen.js
deleted file mode 100644
index 4340e9a2aa3..00000000000
--- a/wdio/screen-objects/BrowserObject/ExternalWebsitesScreen.js
+++ /dev/null
@@ -1,190 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-
-import {
-  BRUNO_MAIN_ID,
-  ERROR_PAGE_MESSAGE,
-  ERROR_PAGE_RETURN_BUTTON,
-  ERROR_PAGE_TITLE,
-  ETHEREUM_PHISHING_DETECTION_BACK_BUTTON,
-  HOME_FAVORITE_BUTTON,
-  HOME_FAVORITES_CARDS_URL,
-  HOME_FAVORITES_UNISWAP_CARD_TITLE,
-  NO_FAVORITES_MESSAGE,
-  REDDIT_ICON,
-  UNISWAP_CONNECT_BUTTON,
-  UNISWAP_METAMASK_WALLET_BUTTON,
-  UNISWAP_WALLET_PROFILE_ICON,
-} from '../testIDs/BrowserScreen/ExternalWebsites.testIds';
-
-class ExternalWebsitesScreen {
-  get homeFavoriteButton() {
-    return Selectors.getXpathElementByText(HOME_FAVORITE_BUTTON);
-  }
-
-  get homeNoFavoritesMessageText() {
-    //return Selectors.getElementByCss(NO_FAVORITES_MESSAGE);
-    return Selectors.getXpathElementByText(NO_FAVORITES_MESSAGE);
-  }
-
-  get ethereumPhishingDetectionBackButton() {
-    return Selectors.getXpathElementByText(
-      ETHEREUM_PHISHING_DETECTION_BACK_BUTTON,
-    );
-  }
-
-  get bruno() {
-    return Selectors.getXpathElementByResourceId(BRUNO_MAIN_ID);
-  }
-
-  get errorPageTitle() {
-    return Selectors.getElementByPlatform(ERROR_PAGE_TITLE);
-  }
-
-  get errorPageMessage() {
-    return Selectors.getElementByPlatform(ERROR_PAGE_MESSAGE);
-  }
-
-  get wrongReturnButton() {
-    return Selectors.getElementByPlatform(ERROR_PAGE_RETURN_BUTTON);
-  }
-
-  get redditIcon() {
-    return Selectors.getElementByPlatform(REDDIT_ICON);
-  }
-
-  get uniswapConnectButton() {
-    return Selectors.getXpathElementByText(UNISWAP_CONNECT_BUTTON);
-  }
-
-  get uniswapMetamaskWalletButton() {
-    return Selectors.getXpathElementByText(UNISWAP_METAMASK_WALLET_BUTTON);
-  }
-
-  get uniswapWalletProfileIconButton() {
-    return Selectors.getElementByCss(UNISWAP_WALLET_PROFILE_ICON);
-  }
-
-  get homeFavoriteUniswapCardTitle() {
-    return Selectors.getXpathElementByText(HOME_FAVORITES_UNISWAP_CARD_TITLE);
-  }
-
-  get homeFavoriteUniswapCardUrl() {
-    return Selectors.getXpathElementByText(HOME_FAVORITES_CARDS_URL);
-  }
-
-  get testDappConnectButton() {
-    return Selectors.getXpathElementByText('CONNECT');
-  }
-
-  get testDappTitle() {
-    return Selectors.getXpathElementByText('E2E Test Dapp');
-  }
-
-  get testDappTransferTokens() {
-    return Selectors.getXpathElementByText('TRANSFER TOKENS');
-  }
-
-  get testDappApproveTokens() {
-    return Selectors.getXpathElementByText('APPROVE TOKENS');
-  }
-
-  get testDappTransferNft() {
-    return Selectors.getXpathElementByText('TRANSFER FROM');
-  }
-
-  async tapHomeFavoritesButton() {
-    const element = await this.homeFavoriteButton;
-    await element.waitForEnabled();
-    await Gestures.waitAndTap(this.homeFavoriteButton);
-  }
-
-  async isHomeNoFavoritesMessageDisplayed() {
-    await expect(await this.homeNoFavoritesMessageText).toBeDisplayed();
-  }
-
-  async isEthereumFishingDetectionWebsiteTitleDisplayed() {
-    await expect(
-      await this.ethereumPhishingDetectionBackButton,
-    ).toBeDisplayed();
-  }
-
-  async tapEthereumFishingDetectionWebsiteBackButton() {
-    await Gestures.waitAndTap(this.ethereumPhishingDetectionBackButton);
-  }
-
-  async isBrunoWebsiteDisplayed() {
-    await expect(await this.bruno).toBeDisplayed();
-  }
-
-  async isErrorPageTitle(title) {
-    await expect(this.errorPageTitle).toHaveText(title);
-  }
-
-  async isErrorPageMessage(message) {
-    await expect(this.errorPageMessage).toHaveText(message);
-  }
-
-  async tapWrongReturnButton() {
-    await Gestures.waitAndTap(this.wrongReturnButton);
-  }
-
-  async isRedditIconDisplayed() {
-    await expect(await this.redditIcon).toBeDisplayed();
-  }
-
-  async tapUniswapConnectButton() {
-    await Gestures.waitAndTap(this.uniswapConnectButton);
-  }
-
-  async isTestDappDisplayed() {
-    await expect(await this.testDappTitle).toBeDisplayed();
-  }
-
-  async tapDappConnectButton() {
-    await Gestures.swipeUp(0.5);
-    const element = await this.testDappConnectButton;
-    await element.waitForEnabled();
-    await Gestures.waitAndTap(this.testDappConnectButton);
-  }
-
-  async tapDappTransferTokens() {
-    const element = await this.testDappTransferTokens;
-    await element.waitForEnabled();
-    await Gestures.waitAndTap(this.testDappTransferTokens);
-  }
-
-  async tapDappTransferNft() {
-    const element = await this.testDappTransferNft;
-    await element.waitForEnabled();
-    await Gestures.waitAndTap(this.testDappTransferNft);
-  }
-
-  async tapDappApproveTokens() {
-    const element = await this.testDappApproveTokens;
-    await element.waitForEnabled();
-    await Gestures.waitAndTap(this.testDappApproveTokens);
-  }
-
-  async tapUniswapMetaMaskWalletButton() {
-    await Gestures.tapTextByXpath('MetaMask');
-  }
-
-  async isUniswapProfileIconDisplayed() {
-    await expect(await this.uniswapWalletProfileIconButton).toBeDisplayed();
-  }
-
-  async isHomeFavoriteUniswapTitle() {
-    await expect(await this.homeFavoriteUniswapCardTitle).toBeDisplayed();
-  }
-
-  async isHomeFavoriteUniswapUrl() {
-    await expect(await this.homeFavoriteUniswapCardUrl).toBeDisplayed();
-  }
-
-  async isHomeFavoriteButtonDisplayed() {
-    await expect(await this.homeFavoriteButton).toBeDisplayed();
-  }
-}
-
-export default new ExternalWebsitesScreen();
diff --git a/wdio/screen-objects/BrowserObject/MultiTabScreen.js b/wdio/screen-objects/BrowserObject/MultiTabScreen.js
deleted file mode 100644
index 976e5686de1..00000000000
--- a/wdio/screen-objects/BrowserObject/MultiTabScreen.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-import { BrowserViewSelectorsIDs } from '../../../app/components/Views/BrowserTab/BrowserView.testIds';
-
-class MultiTabScreen {
-  get closeAllButton() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.CLOSE_ALL_TABS);
-  }
-
-  get addButton() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.ADD_NEW_TAB);
-  }
-
-  get doneButton() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.DONE_BUTTON);
-  }
-
-  get noTabsMessage() {
-    return Selectors.getElementByPlatform(BrowserViewSelectorsIDs.NO_TABS_MESSAGE);
-  }
-
-  async isTabsViewDisplayed() {
-    await expect(await this.addButton).toBeDisplayed();
-  }
-
-  async tapCloseAllButton() {
-    await Gestures.waitAndTap(this.closeAllButton);
-  }
-
-  async tapAddButton() {
-    const element = await this.addButton;
-    await element.waitForEnabled();
-    await Gestures.waitAndTap(this.addButton);
-    await element.waitForExist({ reverse: true });
-  }
-
-  async tapDoneButton() {
-    await Gestures.waitAndTap(this.doneButton);
-  }
-
-  async isNoTabsMessageDisplayed() {
-    await expect(await this.noTabsMessage).toBeDisplayed();
-  }
-}
-
-export default new MultiTabScreen();
diff --git a/wdio/screen-objects/BrowserObject/OptionMenuModal.js b/wdio/screen-objects/BrowserObject/OptionMenuModal.js
deleted file mode 100644
index c2367fe4d2f..00000000000
--- a/wdio/screen-objects/BrowserObject/OptionMenuModal.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-import {
-  ADD_FAVORITES_OPTION,
-  MENU_ID,
-  NEW_TAB_OPTION,
-  OPEN_IN_BROWSER_OPTION,
-  RELOAD_OPTION,
-  SHARE_OPTION,
-  SWITCH_NETWORK_OPTION,
-} from '../testIDs/BrowserScreen/OptionMenu.testIds';
-
-class OptionMenuModal {
-  get container() {
-    return Selectors.getElementByPlatform(MENU_ID);
-  }
-
-  get addFavoriteOption() {
-    return Selectors.getElementByPlatform(ADD_FAVORITES_OPTION);
-  }
-
-  get newTabOption() {
-    return Selectors.getElementByPlatform(NEW_TAB_OPTION);
-  }
-
-  get reloadOption() {
-    return Selectors.getElementByPlatform(RELOAD_OPTION);
-  }
-
-  get shareOption() {
-    return Selectors.getElementByPlatform(SHARE_OPTION);
-  }
-
-  get openBrowserOption() {
-    return Selectors.getElementByPlatform(OPEN_IN_BROWSER_OPTION);
-  }
-
-  get switchNetworkOption() {
-    return Selectors.getElementByPlatform(SWITCH_NETWORK_OPTION);
-  }
-
-  async isModalDisplayed() {
-    await expect(await this.container).toBeDisplayed();
-  }
-
-  async isModalNotDisplayed() {
-    const container = await this.container;
-    await container.waitForExist({ reverse: true });
-  }
-
-  async tapAddFavoriteOption() {
-    await Gestures.waitAndTap(this.addFavoriteOption);
-  }
-
-  async isAddFavoriteOptionDisplayed() {
-    await expect(await this.addFavoriteOption).toBeDisplayed();
-  }
-
-  async tapNewTabOption() {
-    await Gestures.waitAndTap(this.newTabOption);
-    const element = await this.newTabOption;
-    await element.waitForExist({ reverse: true });
-  }
-
-  async isNewTabOptionDisplayed() {
-    await expect(await this.newTabOption).toBeDisplayed();
-  }
-
-  async tapReloadOption() {
-    await Gestures.waitAndTap(this.reloadOption);
-  }
-
-  async isReloadOptionDisplayed() {
-    await expect(await this.reloadOption).toBeDisplayed();
-  }
-
-  async tapShareOption() {
-    await Gestures.waitAndTap(this.shareOption);
-  }
-
-  async isShareOptionDisplayed() {
-    await expect(await this.shareOption).toBeDisplayed();
-  }
-
-  async isOpenBrowserOptionDisplayed() {
-    await expect(await this.openBrowserOption).toBeDisplayed();
-  }
-
-  async tapSwitchOption() {
-    await Gestures.waitAndTap(this.switchNetworkOption);
-  }
-
-  async isSwitchOptionDisplayed() {
-    await expect(await this.switchNetworkOption).toBeDisplayed();
-  }
-}
-
-export default new OptionMenuModal();
diff --git a/wdio/screen-objects/BrowserPlaygroundDapp.js b/wdio/screen-objects/BrowserPlaygroundDapp.js
deleted file mode 100644
index c87251697bf..00000000000
--- a/wdio/screen-objects/BrowserPlaygroundDapp.js
+++ /dev/null
@@ -1,613 +0,0 @@
-// Migrated to tests/page-objects/MMConnect/BrowserPlaygroundDapp.ts
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { expect } from 'appwright';
-
-/**
- * Page Object for @metamask/browser-playground test dapp
- *
- * This page object uses data-testid selectors from @metamask/playground-ui.
- * The test IDs follow the pattern defined in playground-ui/src/testIds/index.ts
- *
- * Note: Browser Playground uses data-testid attributes, not id attributes.
- * XPath selectors must use: //*[@data-testid="..."]
- */
-class BrowserPlaygroundDapp {
-  constructor() {
-    this._device = null;
-  }
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  // ============================================================
-  // HELPER: Get element by data-testid
-  // ============================================================
-
-  /**
-   * Helper to create XPath selector for data-testid attribute
-   * @param {string} testId - The data-testid value
-   * @returns {Promise<import('appwright').AppwrightLocator>} - Element locator
-   */
-  _getByTestId(testId) {
-    if (!this._device) return null;
-    return AppwrightSelectors.getElementByXpath(
-      this._device,
-      `//*[@data-testid="${testId}"]`,
-    );
-  }
-
-  // ============================================================
-  // APP-LEVEL SELECTORS
-  // ============================================================
-
-  get connectLegacyButton() {
-    return this._getByTestId('app-btn-connect-legacy');
-  }
-
-  get disconnectButton() {
-    return this._getByTestId('app-btn-disconnect');
-  }
-
-  get errorSection() {
-    return this._getByTestId('app-section-error');
-  }
-
-  // ============================================================
-  // LEGACY EVM CARD SELECTORS
-  // ============================================================
-
-  get legacyEvmCard() {
-    return this._getByTestId('legacy-evm-card');
-  }
-
-  get chainIdValue() {
-    return this._getByTestId('legacy-evm-chain-id-value');
-  }
-
-  get accountsValue() {
-    return this._getByTestId('legacy-evm-accounts-value');
-  }
-
-  get activeAccount() {
-    return this._getByTestId('legacy-evm-active-account');
-  }
-
-  get responseText() {
-    return this._getByTestId('legacy-evm-response-text');
-  }
-
-  get personalSignButton() {
-    return this._getByTestId('legacy-evm-btn-personal-sign');
-  }
-
-  get signTypedDataV4Button() {
-    return this._getByTestId('legacy-evm-btn-sign-typed-data-v4');
-  }
-
-  get sendTransactionButton() {
-    return this._getByTestId('legacy-evm-btn-send-transaction');
-  }
-
-  get switchToMainnetButton() {
-    return this._getByTestId('legacy-evm-btn-switch-mainnet');
-  }
-
-  get switchToPolygonButton() {
-    return this._getByTestId('legacy-evm-btn-switch-polygon');
-  }
-
-  get switchToGoerliButton() {
-    return this._getByTestId('legacy-evm-btn-switch-goerli');
-  }
-
-  get getBalanceButton() {
-    return this._getByTestId('legacy-evm-btn-get-balance');
-  }
-
-  get blockNumberButton() {
-    return this._getByTestId('legacy-evm-btn-block-number');
-  }
-
-  get gasPriceButton() {
-    return this._getByTestId('legacy-evm-btn-gas-price');
-  }
-
-  // ============================================================
-  // WAGMI CARD SELECTORS
-  // ============================================================
-
-  get connectWagmiButton() {
-    return this._getByTestId('app-btn-connect-wagmi');
-  }
-
-  get wagmiDisconnectButton() {
-    return this._getByTestId('wagmi-btn-disconnect');
-  }
-
-  get wagmiCard() {
-    return this._getByTestId('wagmi-card');
-  }
-
-  get wagmiChainIdValue() {
-    return this._getByTestId('wagmi-chain-id-value');
-  }
-
-  get wagmiAccountValue() {
-    return this._getByTestId('wagmi-account-value');
-  }
-
-  get wagmiActiveAccount() {
-    return this._getByTestId('wagmi-active-account');
-  }
-
-  get wagmiBalanceValue() {
-    return this._getByTestId('wagmi-balance-value');
-  }
-
-  get wagmiSignMessageInput() {
-    return this._getByTestId('wagmi-input-message');
-  }
-
-  get wagmiSignMessageButton() {
-    return this._getByTestId('wagmi-btn-sign-message');
-  }
-
-  get wagmiSignatureResult() {
-    return this._getByTestId('wagmi-signature-result');
-  }
-
-  get wagmiSendTxToAddressInput() {
-    return this._getByTestId('wagmi-input-to-address');
-  }
-
-  get wagmiSendTxAmountInput() {
-    return this._getByTestId('wagmi-input-amount');
-  }
-
-  get wagmiSendTransactionButton() {
-    return this._getByTestId('wagmi-btn-send-transaction');
-  }
-
-  get wagmiTxHashResult() {
-    return this._getByTestId('wagmi-tx-hash-result');
-  }
-
-  /**
-   * Get the switch chain button for a specific chain ID
-   * @param {number} chainId - The chain ID
-   */
-  getWagmiSwitchChainButton(chainId) {
-    return this._getByTestId(`wagmi-btn-switch-chain-${chainId}`);
-  }
-
-  // ============================================================
-  // SOLANA CARD SELECTORS
-  // ============================================================
-
-  get solanaCard() {
-    return this._getByTestId('solana-card');
-  }
-
-  get solanaConnectButton() {
-    return this._getByTestId('app-btn-connect-solana');
-  }
-
-  get solanaDisconnectButton() {
-    return this._getByTestId('solana-btn-disconnect');
-  }
-
-  get solanaAddressContainer() {
-    return this._getByTestId('solana-address-container');
-  }
-
-  get solanaSignMessageButton() {
-    return this._getByTestId('solana-btn-sign-message');
-  }
-
-  get solanaSignedMessageResult() {
-    return this._getByTestId('solana-signed-message-result');
-  }
-
-  // ============================================================
-  // MULTICHAIN / SCOPE CARD SELECTORS
-  // ============================================================
-
-  get connectButton() {
-    return this._getByTestId('app-btn-connect');
-  }
-
-  get connectedScopesSection() {
-    return this._getByTestId('app-section-scopes');
-  }
-
-  /**
-   * Get the scope card for a specific scope (e.g., 'eip155-1')
-   * @param {string} scope - The CAIP-2 scope with colons replaced by dashes
-   */
-  getScopeCard(scope) {
-    // The scope card ID uses dashes instead of colons (e.g., 'eip155-1' not 'eip155:1')
-    const escapedScope = scope.toLowerCase().replace(/:/g, '-');
-    return this._getByTestId(`scope-card-${escapedScope}`);
-  }
-
-  // ============================================================
-  // ACTIONS
-  // ============================================================
-
-  async tapConnectLegacy() {
-    if (!this._device) return;
-    const element = await this.connectLegacyButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapDisconnect() {
-    if (!this._device) return;
-    const element = await this.disconnectButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapPersonalSign() {
-    if (!this._device) return;
-    const element = await this.personalSignButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapSignTypedDataV4() {
-    if (!this._device) return;
-    const element = await this.signTypedDataV4Button;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapSendTransaction() {
-    if (!this._device) return;
-    const element = await this.sendTransactionButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapSwitchToMainnet() {
-    if (!this._device) return;
-    const element = await this.switchToMainnetButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapSwitchToPolygon() {
-    if (!this._device) return;
-    const element = await this.switchToPolygonButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapSwitchToGoerli() {
-    if (!this._device) return;
-    const element = await this.switchToGoerliButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapGetBalance() {
-    if (!this._device) return;
-    const element = await this.getBalanceButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  // ============================================================
-  // WAGMI ACTIONS
-  // ============================================================
-
-  async tapConnectWagmi() {
-    if (!this._device) return;
-    const element = await this.connectWagmiButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapWagmiDisconnect() {
-    if (!this._device) return;
-    const element = await this.wagmiDisconnectButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapWagmiSignMessage() {
-    if (!this._device) return;
-    const element = await this.wagmiSignMessageButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapWagmiSendTransaction() {
-    if (!this._device) return;
-    const element = await this.wagmiSendTransactionButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapWagmiSwitchChain(chainId) {
-    if (!this._device) return;
-    const element = await this.getWagmiSwitchChainButton(chainId);
-    await AppwrightGestures.tap(element);
-  }
-
-  async typeWagmiSignMessage(message) {
-    if (!this._device) return;
-    const element = await this.wagmiSignMessageInput;
-    await AppwrightGestures.typeText(element, message);
-  }
-
-  // ============================================================
-  // SOLANA ACTIONS
-  // ============================================================
-
-  async tapSolanaConnect() {
-    if (!this._device) return;
-    const element = await this.solanaConnectButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapSolanaDisconnect() {
-    if (!this._device) return;
-    const element = await this.solanaDisconnectButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapSolanaSignMessage() {
-    if (!this._device) return;
-    const element = await this.solanaSignMessageButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  // ============================================================
-  // MULTICHAIN ACTIONS
-  // ============================================================
-
-  /**
-   * Wait for the Multichain Connect button to be visible (dapp ready).
-   * Use before tapConnect() to avoid tapping before the dapp has loaded and reduce idle time that can cause auto-lock.
-   * @param {number} timeoutMs - Max time to wait (default 15s)
-   */
-  async waitForConnectButtonVisible(timeoutMs = 15000) {
-    if (!this._device) return;
-    const connectButton = await this.connectButton;
-    await expect(connectButton).toBeVisible({ timeout: timeoutMs });
-  }
-
-  async tapConnect() {
-    if (!this._device) return;
-    const element = await this.connectButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  // ============================================================
-  // ASSERTIONS
-  // ============================================================
-
-  /**
-   * Assert that the dapp is connected by checking for the active account element
-   * @param {boolean} isConnected - Expected connection state
-   */
-  async assertConnected(isConnected = true) {
-    if (!this._device) return;
-
-    if (isConnected) {
-      // When connected, the legacy EVM card with active account should be visible
-      const activeAccountElement = await this.activeAccount;
-      await expect(activeAccountElement).toBeVisible({ timeout: 10000 });
-    } else {
-      // When disconnected, the connect button should be visible
-      const connectButton = await this.connectLegacyButton;
-      await expect(connectButton).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  /**
-   * Assert the connected chain ID value
-   * @param {string} expectedChainId - Expected chain ID (e.g., '0x1', '0x89')
-   */
-  async assertChainIdValue(expectedChainId) {
-    if (!this._device) return;
-    const chainElement = await this.chainIdValue;
-    const text = await chainElement.getText();
-    expect(text).toContain(expectedChainId);
-  }
-
-  /**
-   * Assert the response text contains expected value
-   * @param {string} expectedValue - Expected value in response
-   */
-  async assertResponseValue(expectedValue) {
-    if (!this._device) return;
-    const responseElement = await this.responseText;
-    const text = await responseElement.getText();
-    expect(text).toContain(expectedValue);
-  }
-
-  /**
-   * Assert the active account address
-   * @param {string} expectedAccount - Expected account address
-   */
-  async assertActiveAccount(expectedAccount) {
-    if (!this._device) return;
-    const accountElement = await this.activeAccount;
-    const text = await accountElement.getText();
-    expect(text.toLowerCase()).toContain(expectedAccount.toLowerCase());
-  }
-
-  /**
-   * Assert the number of connected accounts
-   * @param {number} expectedCount - Expected account count
-   */
-  async assertAccountsCount(expectedCount) {
-    if (!this._device) return;
-    const accountsElement = await this.accountsValue;
-    const text = await accountsElement.getText();
-    expect(text).toContain(`${expectedCount} available`);
-  }
-
-  /**
-   * Check if dapp is connected (returns boolean, doesn't throw)
-   * @returns {Promise<boolean>}
-   */
-  async isConnected() {
-    if (!this._device) return false;
-    try {
-      const activeAccountElement = await this.activeAccount;
-      await expect(activeAccountElement).toBeVisible({ timeout: 5000 });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  // ============================================================
-  // WAGMI ASSERTIONS
-  // ============================================================
-
-  /**
-   * Assert Wagmi is connected by checking for the wagmi card
-   * @param {boolean} isConnected - Expected connection state
-   */
-  async assertWagmiConnected(isConnected = true) {
-    if (!this._device) return;
-
-    if (isConnected) {
-      const wagmiCardElement = await this.wagmiActiveAccount;
-      await expect(wagmiCardElement).toBeVisible({ timeout: 10000 });
-    } else {
-      const connectButton = await this.connectWagmiButton;
-      await expect(connectButton).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  /**
-   * Assert Wagmi chain ID value
-   * @param {string|number} expectedChainId - Expected chain ID (e.g., 1, '1', or '0x1')
-   */
-  async assertWagmiChainIdValue(expectedChainId) {
-    if (!this._device) return;
-    const chainElement = await this.wagmiChainIdValue;
-    const text = await chainElement.getText();
-    expect(text).toContain(String(expectedChainId));
-  }
-
-  /**
-   * Assert Wagmi active account address
-   * @param {string} expectedAccount - Expected account address
-   */
-  async assertWagmiActiveAccount(expectedAccount) {
-    if (!this._device) return;
-    const accountElement = await this.wagmiActiveAccount;
-    const text = await accountElement.getText();
-    expect(text.toLowerCase()).toContain(expectedAccount.toLowerCase());
-  }
-
-  /**
-   * Assert Wagmi signature result contains expected value
-   * @param {string} expectedValue - Expected signature or part of it
-   */
-  async assertWagmiSignatureResult(expectedValue) {
-    if (!this._device) return;
-    const signatureElement = await this.wagmiSignatureResult;
-    const text = await signatureElement.getText();
-    expect(text).toContain(expectedValue);
-  }
-
-  /**
-   * Check if Wagmi is connected (returns boolean, doesn't throw)
-   * @returns {Promise<boolean>}
-   */
-  async isWagmiConnected() {
-    if (!this._device) return false;
-    try {
-      const wagmiCardElement = await this.wagmiActiveAccount;
-      await expect(wagmiCardElement).toBeVisible({ timeout: 5000 });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  // ============================================================
-  // SOLANA ASSERTIONS
-  // ============================================================
-
-  /**
-   * Assert Solana is connected by checking for the solana address container
-   * @param {boolean} isConnected - Expected connection state
-   */
-  async assertSolanaConnected(isConnected = true) {
-    if (!this._device) return;
-
-    if (isConnected) {
-      const solanaCard = await this.solanaCard;
-      await expect(solanaCard).toBeVisible({ timeout: 10000 });
-    } else {
-      const solanaConnectButton = await this.solanaConnectButton;
-      await expect(solanaConnectButton).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  /**
-   * Assert Solana active account address
-   * @param {string} expectedAccount - Expected account address
-   */
-    async assertSolanaActiveAccount(expectedAddress) {
-      if (!this._device) return;
-      const addressElement = await this.solanaAddressContainer;
-      const text = await addressElement.getText();
-      expect(text.toLowerCase()).toContain(expectedAddress);
-    }
-
-  /**
-   * Assert Solana signed message result contains expected value
-   * @param {string} expectedValue - Expected signature or part of the signed message result
-   */
-  async assertSolanaSignedMessageResult(expectedValue) {
-    if (!this._device) return;
-    const resultElement = await this.solanaSignedMessageResult;
-    await expect(resultElement).toBeVisible({ timeout: 10000 });
-    const text = await resultElement.getText();
-    expect(text).toContain(expectedValue);
-  }
-
-  // ============================================================
-  // MULTICHAIN ASSERTIONS
-  // ============================================================
-
-  /**
-   * Assert multichain is connected by checking for scope cards
-   * @param {boolean} isConnected - Expected connection state
-   */
-  async assertMultichainConnected(isConnected = true) {
-    if (!this._device) return;
-
-    if (isConnected) {
-      const scopesSection = await this.connectedScopesSection;
-      await expect(scopesSection).toBeVisible({ timeout: 10000 });
-    } else {
-      const connectButton = await this.connectButton;
-      await expect(connectButton).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  /**
-   * Assert a specific scope card is visible
-   * @param {string} scope - The CAIP-2 scope (e.g., 'eip155:1')
-   */
-  async assertScopeCardVisible(scope) {
-    if (!this._device) return;
-    const scopeCard = await this.getScopeCard(scope);
-    await expect(scopeCard).toBeVisible({ timeout: 10000 });
-  }
-
-  /**
-   * Assert a specific scope card is notvisible
-   * @param {string} scope - The CAIP-2 scope (e.g., 'eip155:1')
-   */
-  async assertScopeCardNotVisible(scope) {
-    if (!this._device) return;
-    const scopeCard = await this.getScopeCard(scope);
-    await expect(scopeCard).not.toBeVisible({ timeout: 10000 });
-  }
-}
-
-export default new BrowserPlaygroundDapp();
diff --git a/wdio/screen-objects/ChangePasswordScreens.js b/wdio/screen-objects/ChangePasswordScreens.js
deleted file mode 100644
index fd9bbddcc55..00000000000
--- a/wdio/screen-objects/ChangePasswordScreens.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import Gestures from '../helpers/Gestures';
-import Selectors from '../helpers/Selectors';
-import { I_UNDERSTAND_BUTTON_ID } from './testIDs/Screens/WalletSetupScreen.testIds';
-import { ManualBackUpStepsSelectorsIDs } from '../../app/components/Views/ManualBackupStep1/ManualBackUpSteps.testIds';
-
-class ChangePasswordScreens {
-  get passwordInput() {
-    return Selectors.getElementByPlatform(ManualBackUpStepsSelectorsIDs.CONFIRM_PASSWORD_INPUT);
-  }
-
-  get confirmButton() {
-    return Selectors.getElementByPlatform(ManualBackUpStepsSelectorsIDs.SUBMIT_BUTTON);
-  }
-
-  get termsAndConditionCheckBox() {
-    return Selectors.getXpathElementByResourceId(I_UNDERSTAND_BUTTON_ID);
-  }
-
-  async typePassword(text) {
-    const elem = await this.passwordInput;
-    await elem.waitForDisplayed();
-    await Gestures.typeText(elem, text);
-  }
-
-  async tapConfirmButton() {
-    // await Gestures.tap(this.buttonCONFIRM);
-    await driver.hideKeyboard();
-    await Gestures.waitAndTap(this.confirmButton);
-    await Gestures.waitAndTap(this.confirmButton);
-  }
-
-  async tapUnderstandTerms() {
-    await Gestures.waitAndTap(this.termsAndConditionCheckBox);
-  }
-}
-
-export default new ChangePasswordScreens();
diff --git a/wdio/screen-objects/CommonScreen.js b/wdio/screen-objects/CommonScreen.js
deleted file mode 100644
index 209ffaaf0bd..00000000000
--- a/wdio/screen-objects/CommonScreen.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import Selectors from '../helpers/Selectors';
-import Gestures from '../helpers/Gestures';
-import {
-  ToastSelectorsIDs,
-  ToastSelectorsText,
-} from '../../app/component-library/components/Toast/ToastModal.testIds';
-import { CommonSelectorsIDs } from '../../app/util/Common.testIds';
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-
-class CommonScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get toast() {
-    return Selectors.getXpathElementByResourceId(ToastSelectorsIDs.CONTAINER);
-  }
-
-  get androidProgressBar() {
-    return Selectors.getElementByCss(CommonSelectorsIDs.ANDROID_PROGRESS_BAR);
-  }
-
-  get TokenNotificationTitle() {
-    return Selectors.getElementByPlatform(ToastSelectorsIDs.NOTIFICATION_TITLE);
-  }
-
-  get toastCloseButton() {
-    return Selectors.getXpathElementByText(ToastSelectorsText.CLOSE_BUTTON);
-  }
-
-  async waitForToastToDisplay() {
-    const element = await this.toast;
-    await element.waitForExist();
-  }
-
-  async tapToastCloseButton() {
-    await Gestures.waitAndTap(this.toastCloseButton);
-  }
-
-  async waitForToastToDisappear() {
-    const element = await this.toast;
-    await element.waitForExist({ reverse: true });
-  }
-
-  async waitForProgressBarToDisplay() {
-    const element = await this.androidProgressBar;
-    await element.waitForExist();
-    await element.waitForExist({ reverse: true });
-  }
-
-  async isTextDisplayed(text) {
-    await expect(Selectors.getXpathElementByText(text)).toBeDisplayed();
-  }
-
-  async isTextElementNotDisplayed(text) {
-    await expect(Selectors.getXpathElementByText(text)).not.toBeDisplayed();
-  }
-
-  async tapOnText(text) {
-    // Taps only specified text
-    await Gestures.tapTextByXpath(text);
-  }
-
-  async tapTextContains(text) {
-    // Taps text that contains the string
-    await Gestures.tapByTextContaining(text);
-  }
-
-  async longTapOnText(text) {
-    // Taps only specified text
-    await Gestures.tapTextByXpath(text, 'LONGPRESS');
-  }
-
-  async checkNoNotification() {
-    const notification = await this.TokenNotificationTitle;
-    await notification.waitForExist({ reverse: true });
-  }
-
-
-  async tapOnAsset(asset) {
-    if (!this._device) {
-      await Gestures.getElementByResourceId(`asset-${asset}`);
-    } else {
-      console.log('tapOnAsset ->', this._device);
-      const assetElement = await AppwrightSelectors.getElementByID(this._device, `asset-${asset}`);
-      await assetElement.tap();
-    }
-  }
-}
-
-export default new CommonScreen();
diff --git a/wdio/screen-objects/ConfirmationScreen.js b/wdio/screen-objects/ConfirmationScreen.js
deleted file mode 100644
index 58f765a9106..00000000000
--- a/wdio/screen-objects/ConfirmationScreen.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import { ConfirmationRowComponentIDs,ConfirmationFooterSelectorIDs } from '../../app/components/Views/confirmations/ConfirmationView.testIds';
-import { expect as appwrightExpect } from 'appwright';
-
-class ConfirmationScreen {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get accountSendTo() {
-    return AppwrightSelectors.getElementByID(this._device, ConfirmationRowComponentIDs.FROM_TO);
-  }
-
-  get network() {
-    return AppwrightSelectors.getElementByID(this._device, ConfirmationRowComponentIDs.GAS_FEES_DETAILS);
-  }
-
-  get advancedSettings() {
-    return AppwrightSelectors.getElementByID(this._device, 'info-section');
-  }
-
-  get confirmButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'confirm-button');
-  }
-
-  async isAccountSendToVisible() {
-    const accountSendTo = await this.accountSendTo;
-    await appwrightExpect(accountSendTo).toBeVisible();
-  }
-
-  async isNetworkDisplayed() {
-    const network = await this.network;
-    await appwrightExpect(network).toBeVisible();
-  }
-
-  async isAdvancedSettingsDisplayed() {
-    const advancedSettings = await this.advancedSettings;
-    await appwrightExpect(advancedSettings).toBeVisible();
-  }
-
-  async isConfirmButtonClickable() {
-    const confirmButton = await this.confirmButton;
-    await AppwrightSelectors.isElementClickable(confirmButton);
-  }
-
-  async tapOnConfirmButton() {
-    const confirmButton = await this.confirmButton;
-    console.log('confirmButton', confirmButton);
-    //await confirmButton.tap();
-  }
-
-  async isVisible(network, timeout = 10000) {
-    const titleElement = await AppwrightSelectors.getElementByCatchAll(this._device, network === 'Solana' ? 'Transaction request' : 'Review');
-    await appwrightExpect(titleElement).toBeVisible({ timeout });
-  }
-}
-
-export default new ConfirmationScreen();
diff --git a/wdio/screen-objects/Contacts.js b/wdio/screen-objects/Contacts.js
deleted file mode 100644
index 8baacd7501a..00000000000
--- a/wdio/screen-objects/Contacts.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Gestures from '../helpers/Gestures';
-import Selectors from '../helpers/Selectors';
-import {
-  CONTACT_ADD_BUTTON,
-  CONTACTS_CONTAINER_ID,
-} from './testIDs/Screens/Contacts.testids';
-
-class Contacts {
-  get container() {
-    return Selectors.getElementByPlatform(CONTACTS_CONTAINER_ID);
-  }
-
-  get addContactButton() {
-    return Selectors.getElementByPlatform(CONTACT_ADD_BUTTON);
-  }
-
-  async waitForDisplayed() {
-    const screen = await this.container;
-    await screen.waitForDisplayed();
-  }
-
-  async tapAddContactButton() {
-    await Gestures.waitAndTap(this.addContactButton);
-  }
-
-  async tapOnText(text) {
-    await Gestures.tapTextByXpath(text);
-  }
-}
-
-export default new Contacts();
diff --git a/wdio/screen-objects/DrawerViewScreen.js b/wdio/screen-objects/DrawerViewScreen.js
deleted file mode 100644
index b0f36f831c0..00000000000
--- a/wdio/screen-objects/DrawerViewScreen.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import Gestures from '../helpers/Gestures';
-import Selectors from '../helpers/Selectors';
-import {
-  DRAWER_VIEW_BROWSER_TEXT_ID,
-  DRAWER_VIEW_LOCK_TEXT_ID,
-  DRAWER_VIEW_WALLET_TEXT_ID,
-} from './testIDs/Screens/DrawerView.testIds';
-
-class DrawerViewScreen {
-  get lockNavBarItem() {
-    return Selectors.getElementByPlatform(DRAWER_VIEW_LOCK_TEXT_ID);
-  }
-
-  get browserButton() {
-    return Selectors.getElementByPlatform(DRAWER_VIEW_BROWSER_TEXT_ID);
-  }
-
-  get walletButton() {
-    return Selectors.getElementByPlatform(DRAWER_VIEW_WALLET_TEXT_ID);
-  }
-
-  async tapNavBarItemLock() {
-    await Gestures.waitAndTap(this.lockNavBarItem);
-  }
-
-  async tapYesOnDeviceAlert() {
-    await driver.acceptAlert();
-  }
-
-  async tapBrowserButton() {
-    await Gestures.waitAndTap(this.browserButton);
-  }
-
-  async tapWalletButton() {
-    await Gestures.waitAndTap(this.walletButton);
-  }
-}
-
-export default new DrawerViewScreen();
diff --git a/wdio/screen-objects/ImportAccountScreen.js b/wdio/screen-objects/ImportAccountScreen.js
deleted file mode 100644
index 5ff06e72838..00000000000
--- a/wdio/screen-objects/ImportAccountScreen.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* eslint-disable no-undef */
-import Gestures from '../helpers/Gestures';
-import Selectors from '../helpers/Selectors';
-import { ImportAccountFromPrivateKeyIDs } from '../../app/components/Views/ImportPrivateKey/ImportAccountFromPrivateKey.testIds';
-
-class ImportAccountScreen {
-  get importAccountContainer() {
-    return Selectors.getXpathElementByResourceId(ImportAccountFromPrivateKeyIDs.CONTAINER);
-  }
-
-  get closeButton() {
-    return Selectors.getElementByPlatform(ImportAccountFromPrivateKeyIDs.CLOSE_BUTTON);
-  }
-
-  get privateKeyInputBox() {
-    return Selectors.getXpathElementByResourceId(ImportAccountFromPrivateKeyIDs.PRIVATE_KEY_INPUT_BOX);
-  }
-
-  async typePrivateKeyAndDismissKeyboard(privateKey) {
-    await Gestures.typeText(this.privateKeyInputBox, privateKey);
-  }
-
-  async tapImportButton() {
-    await Gestures.tapTextByXpath('Import Account'); // TO DISMISS KEYBOARD
-    await Gestures.tapTextByXpath('IMPORT'); // NEARLY IMPOSSIBLE TO TAP BY ID. HAVE TO USE TEXT
-  }
-  async isAlertTextVisible(text) {
-    // This needs to be in a helpers file. It is also used in
-    // the ImportAccountScreen class
-    const message = await driver.getAlertText();
-    try {
-      expect(message.includes(text.trim())).toBe(true);
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.log(`Not able to get device alert text: `);
-    }
-  }
-
-  async tapCloseButton() {
-    await Gestures.waitAndTap(this.closeButton);
-  }
-  async isVisible() {
-    await expect(this.importAccountContainer).toBeDisplayed();
-  }
-}
-
-export default new ImportAccountScreen();
diff --git a/wdio/screen-objects/ImportSuccessScreen.js b/wdio/screen-objects/ImportSuccessScreen.js
deleted file mode 100644
index 10d155d93f5..00000000000
--- a/wdio/screen-objects/ImportSuccessScreen.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import Gestures from '../helpers/Gestures';
-import Selectors from '../helpers/Selectors';
-import { SuccessImportAccountIDs } from '../../app/components/Views/ImportPrivateKeySuccess/SuccessImportAccount.testIds';
-
-class ImportAccountScreen {
-  get container() {
-    return Selectors.getXpathElementByResourceId(SuccessImportAccountIDs.CONTAINER);
-  }
-
-  get closeButton() {
-    return Selectors.getXpathElementByResourceId(SuccessImportAccountIDs.CLOSE_BUTTON);
-  }
-
-  async tapCloseButton() {
-    await Gestures.waitAndTap(this.closeButton);
-  }
-
-  async isVisible() {
-    const importSuccessScreen = await this.container;
-    await importSuccessScreen.waitForDisplayed();
-  }
-}
-
-export default new ImportAccountScreen();
diff --git a/wdio/screen-objects/LoginScreen.js b/wdio/screen-objects/LoginScreen.js
deleted file mode 100644
index e01ad9d1e77..00000000000
--- a/wdio/screen-objects/LoginScreen.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import Gestures from '../helpers/Gestures';
-import Selectors from '../helpers/Selectors';
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { LoginViewSelectors } from '../../app/components/Views/Login/LoginView.testIds';
-import { expect as appwrightExpect } from 'appwright';
-
-class LoginScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get loginScreen() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(LoginViewSelectors.CONTAINER);
-    }
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      LoginViewSelectors.CONTAINER,
-    );
-  }
-
-  get welcomeBackText() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(LoginViewSelectors.CONTAINER);
-    } else {
-      return AppwrightSelectors.getElementByText(this._device, 'Welcome Back!');
-    }
-  }
-
-  get resetWalletButton() {
-    return Selectors.getXpathElementByResourceId(
-      LoginViewSelectors.RESET_WALLET,
-    );
-  }
-
-  get passwordInput() {
-    // Always return the same selector for backward compatibility
-    // The actual element resolution will be handled in async methods
-    return Selectors.getXpathElementByResourceId(
-      LoginViewSelectors.PASSWORD_INPUT,
-    );
-  }
-
-  // Migrated to LoginView.ts (tests/page-objects/wallet/LoginView.ts)
-  get getPasswordInputElement() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        LoginViewSelectors.PASSWORD_INPUT,
-      );
-    }
-     if (AppwrightSelectors.isAndroid(this._device)) {
-      return AppwrightSelectors.getElementByCatchAll(
-        this._device,
-        LoginViewSelectors.PASSWORD_INPUT,
-      );
-    }
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      LoginViewSelectors.PASSWORD_INPUT,
-    );
-  }
-
-  // Migrated to LoginView.ts (tests/page-objects/wallet/LoginView.ts)
-  get unlockButton() {
-    // TODO: update the component to have a testID property and use that instead of text
-    if (!this._device) {
-      return Selectors.getXpathElementByText('Unlock');
-    } else {
-      return AppwrightSelectors.getElementByText(this._device, 'Unlock');
-    }
-  }
-
-  // Migrated to LoginView.ts (tests/page-objects/wallet/LoginView.ts)
-  get title() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(LoginViewSelectors.TITLE_ID);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device,'log-in-button');
-    }
-  }
-
-  get rememberMeToggle() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(LoginViewSelectors.REMEMBER_ME_SWITCH);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, LoginViewSelectors.REMEMBER_ME_SWITCH);
-    }
-  }
-
-  async isLoginScreenVisible() {
-
-    if (!this._device) {
-      const element = await this.title;
-      await element.waitForDisplayed();
-    } else {
-      const element = await this.title;
-      await appwrightExpect(element).toBeVisible();
-
-    }
-  }
-
-  // Migrated to LoginView.ts (tests/page-objects/wallet/LoginView.ts)
-  async waitForScreenToDisplay() {
-    if (!this._device) {
-      const element = await this.title;
-      await element.waitForDisplayed({ interval: 100 });
-    } else {
-      const element = await this.title;
-      await appwrightExpect(element).toBeVisible();
-
-    }
-  }
-
-  async tapResetWalletButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.resetWalletButton);
-    } else {
-      await AppwrightGestures.tap(await this.resetWalletButton);
-    }
-  }
-
-  // Migrated to LoginView.ts (tests/page-objects/wallet/LoginView.ts)
-  async typePassword(password) {
-    //await this.isLoginScreenVisible();
-    if (!this._device) {
-      await Gestures.typeText(this.passwordInput, password);
-    } else {
-      const element = await this.getPasswordInputElement;
-      await AppwrightGestures.typeText(element, password);
-      await AppwrightGestures.hideKeyboard(this._device);
-
-    }
-  }
-
-  // Migrated to LoginView.ts (tests/page-objects/wallet/LoginView.ts)
-  async tapUnlockButton() {
-    if (!this._device) {
-      const element = await this.unlockButton;
-      await element.click();
-    } else {
-      // expectScreenChange: tap on Unlock navigates away, so element will disappear
-      await AppwrightGestures.tap(await this.unlockButton, { expectScreenChange: true });
-    }
-  }
-
-  async tapTitle() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.title);
-    } else {
-      await AppwrightGestures.tap(await this.title);
-    }
-  }
-
-  async tapRememberMeToggle() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.rememberMeToggle);
-    } else {
-      await AppwrightGestures.tap(await this.rememberMeToggle);
-    }
-  }
-}
-
-export default new LoginScreen();
diff --git a/wdio/screen-objects/MobileBrowser.js b/wdio/screen-objects/MobileBrowser.js
deleted file mode 100644
index f36a7efa7ad..00000000000
--- a/wdio/screen-objects/MobileBrowser.js
+++ /dev/null
@@ -1,151 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-
-class MobileBrowserScreen {
-    constructor() {}
-
-    get device() {
-        return this._device;
-    }
-
-    set device(device) {
-        this._device = device;
-
-    }
-
-    get chromeHomePageSearchBox() {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(this._device, 'com.android.chrome:id/search_box_text');
-        }
-        // TODO: Add iOS selector
-    }
-
-    get chromeUrlBar() {
-        if (!this._device) {
-            return;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(this._device, 'com.android.chrome:id/url_bar');
-        }
-    }
-
-    get onboardingChromeWithoutAccount() {
-        if (!this._device) {
-            return;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(this._device, 'com.android.chrome:id/signin_fre_dismiss_button');
-        }
-    }
-
-    get chromeNoThanksButton() {
-        if (!this._device) {
-            return;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(this._device, 'com.android.chrome:id/negative_button');
-        }
-    }
-
-    get chromeMenuButton() {
-        if (!this._device) {
-            return;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(this._device, 'com.android.chrome:id/menu_button');
-        }
-    }
-
-    get chromeRefreshButton() {
-        if (!this._device) {
-            return;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(this._device, 'com.android.chrome:id/button_five');
-        }
-    }
-
-    get chromeUrlEntry() {
-        if (!this._device) {
-            return;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(this._device, 'com.android.chrome:id/line_2');
-        }
-    }
-
-    async tapSelectDappUrl() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.chromeUrlEntry;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapSearchBox() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.chromeHomePageSearchBox;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapUrlBar() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.chromeUrlBar;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapOnboardingChromeWithoutAccount() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.onboardingChromeWithoutAccount;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapChromeNoThanksButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.chromeNoThanksButton;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapChromeMenuButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.chromeMenuButton;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapChromeRefreshButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.chromeRefreshButton;
-        await AppwrightGestures.tap(element)
-    }
-}
-
-export default new MobileBrowserScreen();
diff --git a/wdio/screen-objects/Modals/AccountApprovalModal.js b/wdio/screen-objects/Modals/AccountApprovalModal.js
deleted file mode 100644
index a99349ec594..00000000000
--- a/wdio/screen-objects/Modals/AccountApprovalModal.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import { ConnectAccountBottomSheetSelectorsIDs } from '../../../app/components/Views/AccountConnect/ConnectAccountBottomSheet.testIds';
-
-class AccountApprovalModal {
-  get modalContainer() {
-    return Selectors.getXpathElementByResourceId(
-      ConnectAccountBottomSheetSelectorsIDs.CONTAINER,
-    );
-  }
-
-  get connectButton() {
-    return Selectors.getElementByPlatform(ConnectAccountBottomSheetSelectorsIDs.CONNECT_BUTTON);
-  }
-
-  get connectMultipleAccountsButton() {
-    return Selectors.getElementByPlatform(ConnectAccountBottomSheetSelectorsIDs.SELECT_MULTI_BUTTON);
-  }
-
-  get selectAllButton() {
-    return Selectors.getElementByPlatform(ConnectAccountBottomSheetSelectorsIDs.SELECT_ALL_BUTTON);
-  }
-
-  get amountInputField() {
-    return Selectors.getXpathElementByText('Enter a number here');
-  }
-
-  get nextButton() {
-    return Selectors.getXpathElementByText('Next');
-  }
-
-  async tapConnectMultipleAccountsButton() {
-    await Gestures.waitAndTap(this.connectMultipleAccountsButton);
-    const element = await this.connectMultipleAccountsButton;
-    await element.waitForExist({ reverse: true });
-  }
-
-  async tapConnectButtonByText() {
-    await Gestures.tapTextByXpath('Connect'); // needed for browser specific tests
-  }
-
-  async tapConfirmButtonByText() {
-    await Gestures.tapTextByXpath('Confirm'); // needed for browser specific tests
-  }
-
-  async tapUseDefaultApproveByText() {
-    await Gestures.tapTextByXpath('Use default'); // needed for browser specific tests
-  }
-
-  async setTokenAmount(amount) {
-    await Gestures.typeText(this.amountInputField, amount);
-  }
-
-  async tapNextButtonByText() {
-    await Gestures.waitAndTap(this.nextButton);
-  }
-
-  async tapApproveButtonByText() {
-    await Gestures.tapTextByXpath('Approve'); // needed for browser specific tests
-  }
-
-  async isVisible() {
-    const modalContainer = await this.modalContainer;
-    await modalContainer.waitForDisplayed();
-  }
-
-  async waitForDisappear() {
-    const element = await this.modalContainer;
-    await element.waitForExist({ reverse: true });
-  }
-
-  async tapSelectAllButton() {
-    const selectAllButton = await this.selectAllButton;
-    await selectAllButton.waitForDisplayed();
-    let text = await selectAllButton.getText();
-    while (text === 'Select all') {
-      await selectAllButton.click();
-      await driver.pause(2000);
-      text = await selectAllButton.getText();
-    }
-  }
-}
-
-export default new AccountApprovalModal();
diff --git a/wdio/screen-objects/Modals/AddAccountModal.js b/wdio/screen-objects/Modals/AddAccountModal.js
deleted file mode 100644
index f19ee206954..00000000000
--- a/wdio/screen-objects/Modals/AddAccountModal.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import { AddAccountBottomSheetSelectorsIDs } from '../../../app/components/Views/AddAccountActions/AddAccountBottomSheet.testIds';
-import Gestures from '../../helpers/Gestures';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-
-class AddAccountModal {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get importSrpButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AddAccountBottomSheetSelectorsIDs.IMPORT_SRP_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AddAccountBottomSheetSelectorsIDs.IMPORT_SRP_BUTTON);
-    }
-  }
-
-  get newAccountButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AddAccountBottomSheetSelectorsIDs.NEW_ACCOUNT_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AddAccountBottomSheetSelectorsIDs.NEW_ACCOUNT_BUTTON);
-    }
-  }
-
-  get importAccountButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AddAccountBottomSheetSelectorsIDs.IMPORT_ACCOUNT_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AddAccountBottomSheetSelectorsIDs.IMPORT_ACCOUNT_BUTTON);
-    }
-  }
-
-  get createSolanaAccountButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AddAccountBottomSheetSelectorsIDs.ADD_SOLANA_ACCOUNT_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AddAccountBottomSheetSelectorsIDs.ADD_SOLANA_ACCOUNT_BUTTON);
-    }
-  }
-
-  get createEthereumAccountButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AddAccountBottomSheetSelectorsIDs.ADD_ETHEREUM_ACCOUNT_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AddAccountBottomSheetSelectorsIDs.ADD_ETHEREUM_ACCOUNT_BUTTON);
-    }
-  }
-
-  async tapNewAccountButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.newAccountButton);
-      const newAccountButton = await this.newAccountButton;
-      await newAccountButton.waitForExist({ reverse: true });
-    } else {
-      await AppwrightGestures.tap(await this.newAccountButton); // Use static tap method with retry logic
-    }
-  }
-
-  async tapImportAccountButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.importAccountButton);
-    } else {
-      await AppwrightGestures.tap(await this.importAccountButton); // Use static tap method with retry logic
-    }
-  }
-
-  async tapImportSrpButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.importSrpButton);
-    } else {
-      await AppwrightGestures.tap(await this.importSrpButton); // Use static tap method with retry logic
-    }
-  }
-
-  async tapCreateSolanaAccountButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.createSolanaAccountButton);
-    } else {
-      await AppwrightGestures.tap(await this.createSolanaAccountButton); // Use static tap method with retry logic
-    }
-  }
-
-  async tapCreateEthereumAccountButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.createEthereumAccountButton);
-    } else {
-      await AppwrightGestures.tap(await this.createEthereumAccountButton); // Use static tap method with retry logic
-    }
-  }
-
-  async isVisible() {
-    const element = await this.importSrpButton;
-    await appwrightExpect(element).toBeVisible({ timeout: 20000 });
-  }
-}
-
-export default new AddAccountModal();
diff --git a/wdio/screen-objects/Modals/AddChainModal.js b/wdio/screen-objects/Modals/AddChainModal.js
deleted file mode 100644
index 3fc49fc1150..00000000000
--- a/wdio/screen-objects/Modals/AddChainModal.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Migrated to tests/page-objects/MMConnect/AddChainModal.ts
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect } from 'appwright';
-
-class AddChainModal {
-    constructor() {}
-
-    get device() {
-        return this._device;
-    }
-
-    set device(device) {
-        this._device = device;
-    }
-
-    getText(value) {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByXpath(this._device, `//android.widget.TextView[@text="${value}"]`);
-        }
-    }
-
-    get confirmButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(this._device, 'approve-network-approve-button');
-        }
-    }
-
-    async tapConfirmButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.confirmButton;
-        await AppwrightGestures.tap(element)
-    }
-
-
-    async assertText(value) {
-        if (!this._device) {
-            return;
-        }
-
-        const text = await this.getText(value);
-        await expect(text).toBeVisible();
-    }
-}
-
-export default new AddChainModal();
diff --git a/wdio/screen-objects/Modals/AddNewHdAccountComponent.js b/wdio/screen-objects/Modals/AddNewHdAccountComponent.js
deleted file mode 100644
index 9b60bed58b5..00000000000
--- a/wdio/screen-objects/Modals/AddNewHdAccountComponent.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import Gestures from '../../helpers/Gestures.js';
-import { AddNewAccountIds } from '../../../app/components/Views/AddNewAccount/AddHdAccount.testIds';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import { expect as appwrightExpect } from 'appwright';
-
-class AddNewHdAccountComponent {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get container() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AddNewAccountIds.CONTAINER);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AddNewAccountIds.CONTAINER);
-    }
-  }
-
-  get srpSelector() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AddNewAccountIds.SRP_SELECTOR);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AddNewAccountIds.SRP_SELECTOR);
-    }
-  }
-
-  get cancelButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AddNewAccountIds.CANCEL);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AddNewAccountIds.CANCEL);
-    }
-  }
-
-  get confirmButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AddNewAccountIds.CONFIRM);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AddNewAccountIds.CONFIRM);
-    }
-  }
-
-  get nameInput() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AddNewAccountIds.NAME_INPUT);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, AddNewAccountIds.NAME_INPUT);
-    }
-  }
-
-  async isSrpSelectorVisible() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(AddNewAccountIds.SRP_SELECTOR).isDisplayed();
-    } else {
-      const srpSelector = await this.srpSelector;
-      await appwrightExpect(srpSelector).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async tapSrpSelector() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.srpSelector);
-    } else {
-      await this.srpSelector.tap();
-    }
-  }
-
-  async tapCancel() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.cancelButton);
-    } else {
-      await this.cancelButton.tap();
-    }
-  }
-
-  async tapConfirm() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.confirmButton, {
-        elemDescription: 'Confirm button on Add New HD Account screen',
-      });
-    } else {
-      const confirmButton = await this.confirmButton;
-      await confirmButton.tap();
-    }
-  }
-}
-
-export default new AddNewHdAccountComponent();
diff --git a/wdio/screen-objects/Modals/AddressBookModal.js b/wdio/screen-objects/Modals/AddressBookModal.js
deleted file mode 100644
index 1fbd22f20d2..00000000000
--- a/wdio/screen-objects/Modals/AddressBookModal.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-import {
-  ADDRESS_ALIAS_SAVE_BUTTON_ID,
-  ADDRESS_ALIAS_TITLE_ID,
-  ENTER_ALIAS_INPUT_BOX_ID
-} from '../testIDs/Screens/AddressBook.testids';
-import { AddAddressModalSelectorsIDs } from '../../../app/components/UI/AddToAddressBookWrapper/AddAddressModal.testIds';
-
-class AddressBookModal {
-  get container() {
-    return Selectors.getElementByPlatform(AddAddressModalSelectorsIDs.CONTAINER);
-  }
-
-  get addressInputField() {
-    return Selectors.getElementByPlatform(ENTER_ALIAS_INPUT_BOX_ID);
-  }
-
-  get saveButton() {
-    return Selectors.getElementByPlatform(ADDRESS_ALIAS_SAVE_BUTTON_ID);
-  }
-
-  get cancelButton() {
-    return Selectors.getElementByPlatform(ADDRESS_ALIAS_SAVE_BUTTON_ID);
-  }
-
-  get title() {
-    return Selectors.getElementByPlatform(ADDRESS_ALIAS_TITLE_ID);
-  }
-
-  async waitForDisplayed() {
-    const container = await this.container;
-    await container.waitForDisplayed();
-  }
-
-  async fillAddressAliasField(text) {
-    await Gestures.typeText(this.addressInputField, text);
-  }
-
-  async isCancelButtonEnabled() {
-    expect(this.cancelButton).toBeEnabled();
-  }
-
-  async isSaveButtonEnabled() {
-    expect(this.saveButton).toBeEnabled();
-  }
-
-  async tapOnSaveButton() {
-    await Gestures.waitAndTap(this.saveButton);
-  }
-
-  async tapTitle() {
-    await Gestures.waitAndTap(this.title);
-  }
-
-  async isContactNameVisible(contact) {
-    expect(await Selectors.getXpathElementByText(contact)).toBeDisplayed();
-  }
-
-  async isDeletedContactNameNotVisible(contact) {
-    expect(await Selectors.getXpathElementByText(contact)).not.toBeDisplayed();
-  }
-}
-
-export default new AddressBookModal();
diff --git a/wdio/screen-objects/Modals/AndroidNativeModals.js b/wdio/screen-objects/Modals/AndroidNativeModals.js
deleted file mode 100644
index ccb70e0b4db..00000000000
--- a/wdio/screen-objects/Modals/AndroidNativeModals.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import { ANDROID_SHARE_MODAL } from '../testIDs/Components/AndroidNativeModals.testIds';
-
-class AndroidNativeModals {
-  get shareModal() {
-    return Selectors.getXpathElementByResourceId(ANDROID_SHARE_MODAL);
-  }
-
-  async isShareModalDisabled() {
-    await expect(this.shareModal).toBeDisplayed();
-  }
-}
-
-export default new AndroidNativeModals();
diff --git a/wdio/screen-objects/Modals/ConnectedAccountsModal.js b/wdio/screen-objects/Modals/ConnectedAccountsModal.js
deleted file mode 100644
index 80985ed1a72..00000000000
--- a/wdio/screen-objects/Modals/ConnectedAccountsModal.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-import { ConnectedAccountsSelectorsIDs } from '../../../app/components/Views/AccountConnect/ConnectedAccountModal.testIds';
-
-class ConnectedAccountsModal {
-  get connectedModalContainer() {
-    return Selectors.getElementByPlatform(ConnectedAccountsSelectorsIDs.CONTAINER);
-  }
-
-  get disconnectAllButton() {
-    return Selectors.getElementByPlatform(
-      ConnectedAccountsSelectorsIDs.DISCONNECT_ALL_BUTTON,
-    );
-  }
-
-  async isVisible() {
-    await expect(this.connectedModalContainer).toBeDisplayed();
-  }
-
-  async isNotVisible() {
-    await expect(this.connectedModalContainer).not.toBeDisplayed();
-  }
-
-  async tapDisconnectAllButton() {
-    await Gestures.waitAndTap(this.disconnectAllButton);
-    const element = await this.disconnectAllButton;
-    await element.waitForExist({ reverse: true });
-  }
-}
-export default new ConnectedAccountsModal();
diff --git a/wdio/screen-objects/Modals/DappConnectionModal.js b/wdio/screen-objects/Modals/DappConnectionModal.js
deleted file mode 100644
index cd1ac7e277a..00000000000
--- a/wdio/screen-objects/Modals/DappConnectionModal.js
+++ /dev/null
@@ -1,168 +0,0 @@
-// Migrated to tests/page-objects/MMConnect/DappConnectionModal.ts
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-
-class DappConnectionModal {
-    constructor() {}
-
-    get device() {
-        return this._device;
-    }
-
-    set device(device) {
-        this._device = device;
-    }
-
-    get connectButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        return AppwrightSelectors.getElementByID(this._device, 'connect-button');
-    }
-
-    get updateAccountsButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        return AppwrightSelectors.getElementByID(this._device, 'multiconnect-connect-button');
-    }
-
-    get editAccountsButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByXpath(this._device, '//android.view.ViewGroup[@content-desc="Edit accounts"]');
-        } else {
-            return AppwrightSelectors.getElementByID(this._device, 'account-list-bottom-sheet');
-        }
-    }
-
-    get permissionsTabButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByXpath(this._device, '//android.view.ViewGroup[@content-desc="Permissions"]');
-        }
-    }
-
-    get editNetworksButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByXpath(this._device, '(//android.widget.TextView[@text="Edit"])[2]');
-        }
-    }
-
-    get updateNetworksButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByXpath(this._device, '//android.widget.Button[@content-desc="Update"]');
-        }
-    }
-
-    // TODO: Might be able to use the AccountListComponent instead of this
-    getAccountButton(accountName) {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByXpath(this._device, `//android.widget.TextView[@resource-id="multichain-account-cell-address" and @text="${accountName}"]`);
-        }
-    }
-
-    getNetworkButton(networkName) {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByXpath(this._device, `//android.widget.TextView[@resource-id="cellbase-avatar-title" and @text="${networkName}"]`);
-        }
-    }
-
-    async tapConnectButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.connectButton;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapEditAccountsButton() {
-        if (!this._device) {
-            return;
-        }
-        const element = await this.editAccountsButton;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapAccountButton(accountName) {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.getAccountButton(accountName);
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapUpdateAccountsButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.updateAccountsButton;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapPermissionsTabButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.permissionsTabButton;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapEditNetworksButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.editNetworksButton;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapNetworkButton(networkName) {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.getNetworkButton(networkName);
-        await AppwrightGestures.scrollIntoView(this.device, element);
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapUpdateNetworksButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.updateNetworksButton;
-        await AppwrightGestures.tap(element)
-    }
-}
-
-export default new DappConnectionModal();
diff --git a/wdio/screen-objects/Modals/DeleteContactModal.js b/wdio/screen-objects/Modals/DeleteContactModal.js
deleted file mode 100644
index 7a8a16f781d..00000000000
--- a/wdio/screen-objects/Modals/DeleteContactModal.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import {
-  DELETE_CONTACT_MODAL_CANCEL_BUTTON,
-  DELETE_CONTACT_MODAL_DELETE_BUTTON,
-  DELETE_CONTACT_MODAL_TITLE,
-} from '../testIDs/Components/DeleteContactModal.testIds';
-import Gestures from '../../helpers/Gestures';
-
-class DeleteContactModal {
-  get title() {
-    return Selectors.getXpathElementByText(DELETE_CONTACT_MODAL_TITLE);
-  }
-
-  get deleteButton() {
-    return Selectors.getXpathElementByText(DELETE_CONTACT_MODAL_DELETE_BUTTON);
-  }
-
-  get cancelButton() {
-    return Selectors.getXpathElementByText(DELETE_CONTACT_MODAL_CANCEL_BUTTON);
-  }
-
-  async waitForTitle() {
-    const title = await this.title;
-    await title.waitForDisplayed();
-  }
-
-  async tapDeleteButton() {
-    await Gestures.waitAndTap(this.deleteButton);
-  }
-
-  async tapCancelButton() {
-    await Gestures.waitAndTap(this.cancelButton);
-  }
-}
-
-export default new DeleteContactModal();
diff --git a/wdio/screen-objects/Modals/DeleteWalletModal.js b/wdio/screen-objects/Modals/DeleteWalletModal.js
deleted file mode 100644
index 08021773c72..00000000000
--- a/wdio/screen-objects/Modals/DeleteWalletModal.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-import {
-  DELETE_MODAL_UNDERSTAND_CONTINUE_ID,
-  DELETE_MODAL_DELETE_INPUT_ID,
-  DELETE_MODAL_DELETE_MY_WALLET_PERMANENTLY,
-} from '../testIDs/Components/DeleteWalletModal.testIds';
-
-class DeleteWalletModal {
-  get iUnderstandContinueButton() {
-    return Selectors.getElementByPlatform(DELETE_MODAL_UNDERSTAND_CONTINUE_ID);
-  }
-
-  get deleteInput() {
-    return Selectors.getElementByPlatform(DELETE_MODAL_DELETE_INPUT_ID);
-  }
-
-  get deleteMyWalletButton() {
-    return Selectors.getElementByPlatform(
-      DELETE_MODAL_DELETE_MY_WALLET_PERMANENTLY,
-    );
-  }
-
-  async tapIUnderstandContinue(text) {
-    await Gestures.waitAndTap(this.iUnderstandContinueButton);
-  }
-
-  async typeTextDelete(deleteText) {
-    await Gestures.typeText(this.deleteInput, deleteText, false);
-  }
-
-  async tapDeleteMyWallet() {
-    await Gestures.waitAndTap(this.deleteMyWalletButton);
-  }
-}
-
-export default new DeleteWalletModal();
diff --git a/wdio/screen-objects/Modals/ExperienceEnhancerModal.js b/wdio/screen-objects/Modals/ExperienceEnhancerModal.js
deleted file mode 100644
index e0e38a7b3df..00000000000
--- a/wdio/screen-objects/Modals/ExperienceEnhancerModal.js
+++ /dev/null
@@ -1,35 +0,0 @@
-
-import { ExperienceEnhancerBottomSheetSelectorsIDs } from '../../../app/components/Views/ExperienceEnhancerModal/ExperienceEnhancerModal.testIds';
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-
-
-class ExperienceEnhancerModal {
-  get container() {
-    return Selectors.getXpathElementByResourceId(
-      ExperienceEnhancerBottomSheetSelectorsIDs.BOTTOM_SHEET,
-    );
-  }
-
-  get noThanks() {
-    return Selectors.getXpathElementByResourceId(
-      ExperienceEnhancerBottomSheetSelectorsIDs.CANCEL_BUTTON,
-    );
-  }
-
-  async waitForDisplay() {
-    const element = await this.container;
-    await element.waitForDisplayed();
-  }
-
-  async waitForDisappear() {
-    const element = await this.container;
-    await element.waitForExist({ reverse: true });
-  }
-
-  async tapNoThanks() {
-    await Gestures.waitAndTap(this.noThanks);
-  }
-}
-
-export default new ExperienceEnhancerModal();
diff --git a/wdio/screen-objects/Modals/MultichainAccountEducationModal.js b/wdio/screen-objects/Modals/MultichainAccountEducationModal.js
deleted file mode 100644
index e0d29a0a127..00000000000
--- a/wdio/screen-objects/Modals/MultichainAccountEducationModal.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from "../../../tests/framework/AppwrightGestures";
-import { expect } from 'appwright';
-import { MULTICHAIN_ACCOUNTS_INTRO_MODAL_TEST_IDS } from '../../../app/components/Views/MultichainAccounts/IntroModal/testIds';
-
-class MultichainAccountEducationModal {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get closeButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        MULTICHAIN_ACCOUNTS_INTRO_MODAL_TEST_IDS.CLOSE_BUTTON,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(
-        this._device,
-        MULTICHAIN_ACCOUNTS_INTRO_MODAL_TEST_IDS.CLOSE_BUTTON,
-      );
-    }
-  }
-
-  async isVisible(timeout = 10000) {
-    await expect(await this.closeButton).toBeVisible({ timeout });
-  }
-
-  async tapGotItButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.closeButton);
-    } else {
-      await AppwrightGestures.tap(await this.closeButton);
-    }
-  }
-}
-
-export default new MultichainAccountEducationModal();
diff --git a/wdio/screen-objects/Modals/NetworkApprovalModal.js b/wdio/screen-objects/Modals/NetworkApprovalModal.js
deleted file mode 100644
index afe6c007005..00000000000
--- a/wdio/screen-objects/Modals/NetworkApprovalModal.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import {
-  APPROVE_NETWORK_APPROVE_BUTTON,
-  APPROVE_NETWORK_MODAL,
-  NEW_NETWORK_ADDED_CLOSE_BUTTON,
-  NEW_NETWORK_ADDED_SWITCH_TO_NETWORK_BUTTON,
-} from '../testIDs/Screens/NetworksScreen.testids';
-
-class NetworkApprovalModal {
-  get ApproveNetworkModal() {
-    return Selectors.getElementByPlatform(APPROVE_NETWORK_MODAL);
-  }
-
-  get ApproveNetworkApproveButton() {
-    return Selectors.getElementByPlatform(APPROVE_NETWORK_APPROVE_BUTTON);
-  }
-
-  get closeNetworkButton() {
-    return Selectors.getElementByPlatform(NEW_NETWORK_ADDED_CLOSE_BUTTON);
-  }
-
-  get SwitchToNetworkButton() {
-    return Selectors.getElementByPlatform(
-      NEW_NETWORK_ADDED_SWITCH_TO_NETWORK_BUTTON,
-    );
-  }
-
-  async isApproveNetworkModal() {
-    const element = await this.ApproveNetworkModal;
-    await element.waitForDisplayed();
-  }
-
-  async isApproveNetworkButton() {
-    const element = await this.ApproveNetworkApproveButton;
-    await element.waitForDisplayed();
-  }
-
-  async isCloseNetworkButton() {
-    const element = await this.closeNetworkButton;
-    await element.waitForDisplayed();
-  }
-
-  async tapApproveButton() {
-    await Gestures.waitAndTap(this.ApproveNetworkApproveButton);
-  }
-
-  async tapSwitchToNetwork() {
-    await Gestures.waitAndTap(this.SwitchToNetworkButton);
-  }
-
-  async isSwitchToNetworkButtonDisplayed() {
-    const element = await this.SwitchToNetworkButton;
-    await element.waitForDisplayed();
-  }
-}
-
-export default new NetworkApprovalModal();
diff --git a/wdio/screen-objects/Modals/NetworkEducationModal.js b/wdio/screen-objects/Modals/NetworkEducationModal.js
deleted file mode 100644
index 1a0f6f9562b..00000000000
--- a/wdio/screen-objects/Modals/NetworkEducationModal.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import {
-  NETWORK_EDUCATION_MODAL_CONTAINER_ID,
-  NETWORK_EDUCATION_MODAL_NETWORK_NAME_ID,
-} from '../testIDs/Components/NetworkEducationModalTestIds';
-import { NETWORK_EDUCATION_MODAL_CLOSE_BUTTON } from "../testIDs/Screens/NetworksScreen.testids";
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-
-class NetworkEducationModal {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get container() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(NETWORK_EDUCATION_MODAL_CONTAINER_ID);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, NETWORK_EDUCATION_MODAL_CONTAINER_ID);
-    }
-  }
-
-  get networkEducationCloseButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(
-        NETWORK_EDUCATION_MODAL_CLOSE_BUTTON,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, NETWORK_EDUCATION_MODAL_CLOSE_BUTTON);
-    }
-  }
-
-  get networkEducationNetworkName() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        NETWORK_EDUCATION_MODAL_NETWORK_NAME_ID,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, NETWORK_EDUCATION_MODAL_NETWORK_NAME_ID);
-    }
-  }
-
-  async waitForDisplayed() {
-    const screen = await this.container;
-    await screen.waitForDisplayed();
-  }
-
-  async tapGotItButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.networkEducationCloseButton);
-    } else {
-      const closeButton = await this.networkEducationCloseButton;
-      await closeButton.tap();
-    }
-  }
-
-  async waitForDisappear() {
-    const element = await this.container;
-    await element.waitForExist({ reverse: true });
-  }
-
-  async isNetworkEducationNetworkName(name) {
-    if (!this._device) {
-      await expect(this.networkEducationNetworkName).toHaveText(name);
-    } else {
-      await this.networkEducationNetworkName.toHaveText(name);
-    }
-  }
-}
-
-export default new NetworkEducationModal();
diff --git a/wdio/screen-objects/Modals/NetworkListModal.js b/wdio/screen-objects/Modals/NetworkListModal.js
deleted file mode 100644
index 925cd129b18..00000000000
--- a/wdio/screen-objects/Modals/NetworkListModal.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-
-import { NETWORK_TEST_SWITCH_ID } from '../testIDs/Components/NetworkListModal.TestIds';
-import { ADD_NETWORK_BUTTON } from '../testIDs/Screens/NetworksScreen.testids';
-import { CellComponentSelectorsIDs } from '../../../app/component-library/components/Cells/Cell/CellComponent.testIds';
-import { NetworkListModalSelectorsText } from "../../../app/components/Views/NetworkSelector/NetworkListModal.testIds";
-
-class NetworkListModal {
-  get title() {
-    return Selectors.getXpathElementByText(NetworkListModalSelectorsText.SELECT_NETWORK);
-  }
-
-  get addNetworkButton() {
-    return Selectors.getElementByPlatform(ADD_NETWORK_BUTTON);
-  }
-
-  get testNetworkSwitch() {
-    return Selectors.getXpathElementByResourceId(NETWORK_TEST_SWITCH_ID);
-  }
-
-  get networksButton() {
-    return Selectors.getXpathByContentDesc(CellComponentSelectorsIDs.SELECT);
-  }
-
-  async changeNetwork(networkName) {
-    await Gestures.tapTextByXpath(networkName);
-  }
-
-  async waitForDisplayed() {
-    const scroll = await this.title;
-    await scroll.waitForDisplayed();
-  }
-
-  async waitForDisappear() {
-    const scroll = await this.title;
-    await scroll.waitForDisplayed({ reverse: true });
-  }
-
-  async tapAddNetworkButton() {
-    await Gestures.waitAndTap(this.addNetworkButton);
-  }
-
-  async tapTestNetworkSwitch() {
-    await Gestures.waitAndTap(this.testNetworkSwitch);
-  }
-
-  async isTestNetworkToggle(value) {
-    await expect(this.testNetworkSwitch).toHaveTextContaining(value);
-  }
-
-  async isNetworksDisplayed(value) {
-    await expect(this.networksButton).toBeElementsArrayOfSize(value);
-  }
-}
-
-export default new NetworkListModal();
diff --git a/wdio/screen-objects/Modals/NotificationModal.js b/wdio/screen-objects/Modals/NotificationModal.js
deleted file mode 100644
index ee7f985a084..00000000000
--- a/wdio/screen-objects/Modals/NotificationModal.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import { ToastSelectorsIDs } from '../../../app/component-library/components/Toast/ToastModal.testIds';
-
-class NotificationModal {
-  get title() {
-    return Selectors.getElementByPlatform(ToastSelectorsIDs.NOTIFICATION_TITLE);
-  }
-
-  async waitForDisplay() {
-    const element = await this.title;
-    await element.waitForDisplayed();
-  }
-
-  async waitForDisappear() {
-    const element = await this.title;
-    await element.waitForExist({ reverse: true });
-  }
-}
-
-export default new NotificationModal();
diff --git a/wdio/screen-objects/Modals/PerpsGTMModal.js b/wdio/screen-objects/Modals/PerpsGTMModal.js
deleted file mode 100644
index 46c02dc36fa..00000000000
--- a/wdio/screen-objects/Modals/PerpsGTMModal.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from "../../../tests/framework/AppwrightGestures";
-import { expect } from 'appwright';
-import { PerpsGTMModalSelectorsIDs } from '../../../app/components/UI/Perps/Perps.testIds';
-
-class PerpsGTMModal {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get notNowButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        PerpsGTMModalSelectorsIDs.PERPS_NOT_NOW_BUTTON,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(
-        this._device,
-        PerpsGTMModalSelectorsIDs.PERPS_NOT_NOW_BUTTON,
-      );
-    }
-  }
-
-  get getStartedButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        PerpsGTMModalSelectorsIDs.PERPS_TRY_NOW_BUTTON,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(
-        this._device,
-        PerpsGTMModalSelectorsIDs.PERPS_TRY_NOW_BUTTON,
-      );
-    }
-  }
-  get container() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(PerpsGTMModalSelectorsIDs.PERPS_GTM_MODAL);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, PerpsGTMModalSelectorsIDs.PERPS_GTM_MODAL);
-    }
-  }
-
-
-
-  async tapNotNowButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.notNowButton);
-    } else {
-      await AppwrightGestures.tap(await this.notNowButton);
-    }
-  }
-
-  async tapGetStartedButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.getStartedButton);
-    } else {
-      await AppwrightGestures.tap(await this.getStartedButton);
-    }
-  }
-}
-
-export default new PerpsGTMModal();
diff --git a/wdio/screen-objects/Modals/RewardsGTMModal.js b/wdio/screen-objects/Modals/RewardsGTMModal.js
deleted file mode 100644
index b25db2ff411..00000000000
--- a/wdio/screen-objects/Modals/RewardsGTMModal.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from "../../../tests/framework/AppwrightGestures";
-import { expect as appwrightExpect } from 'appwright';
-
-class RewardsGTMModal {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get notNowButton() {
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      'rewards-view-skip-button',
-    );
-  }
-
-  get container() {
-    return AppwrightSelectors.getElementByCatchAll(this._device, 'Rewards are here');
-  }
-
-  async isVisible() {
-    const modal = await this.container;
-    appwrightExpect(await modal).toBeVisible();
-  }
-
-  async tapNotNowButton() {
-    await AppwrightGestures.tap(await this.notNowButton);
-  }
-}
-
-export default new RewardsGTMModal();
diff --git a/wdio/screen-objects/Modals/SignModal.js b/wdio/screen-objects/Modals/SignModal.js
deleted file mode 100644
index ae6a1b24e29..00000000000
--- a/wdio/screen-objects/Modals/SignModal.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Migrated to tests/page-objects/MMConnect/SignModal.ts
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect } from 'appwright';
-
-class SignModal {
-    constructor() {}
-
-    get device() {
-        return this._device;
-    }
-
-    set device(device) {
-        this._device = device;
-    }
-
-    get confirmButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(this._device, 'confirm-button');
-        }
-    }
-
-    get cancelButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(this._device, 'cancel-button');
-        }
-    }
-
-    getNetworkText(network) {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByXpath(this._device, `(//android.widget.TextView[@text="${network}"])[1]`);
-        }
-    }
-
-    async tapConfirmButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.confirmButton;
-        await AppwrightGestures.tap(element)
-    }
-
-    async tapCancelButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.cancelButton;
-        await AppwrightGestures.tap(element)
-    }
-
-    async assertNetworkText(network) {
-        if (!this._device) {
-            return;
-        }
-
-        const networkText = await this.getNetworkText(network);
-        await expect(networkText).toBeVisible();
-    }
-}
-
-export default new SignModal();
diff --git a/wdio/screen-objects/Modals/SkipAccountSecurityModal.js b/wdio/screen-objects/Modals/SkipAccountSecurityModal.js
deleted file mode 100644
index b14ce50f5fa..00000000000
--- a/wdio/screen-objects/Modals/SkipAccountSecurityModal.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import { ChoosePasswordSelectorsIDs } from '../../../app/components/Views/ChoosePassword/ChoosePassword.testIds';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import { SkipAccountSecurityModalSelectorsIDs } from '../../../app/components/UI/SkipAccountSecurityModal/SkipAccountSecurityModal.testIds';
-import { expect as appwrightExpect } from 'appwright';
-
-class SkipAccountSecurityModal {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-  get skipBackupText() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        SkipAccountSecurityModalSelectorsIDs.ANDROID_SKIP_BACKUP_BUTTON_ID,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, SkipAccountSecurityModalSelectorsIDs.ANDROID_SKIP_BACKUP_BUTTON_ID);
-    }
-  }
-
-  async proceedWithoutWalletSecure() {
-    if (!this._device) {
-    const setTimeout = 2000;
-    await driver.pause(setTimeout);
-    await Gestures.waitAndTap(this.skipBackupText);
-    await Gestures.tapTextByXpath('Skip');
-    } else {
-      const button = await this.skipBackupText;
-      await button.tap();
-      const skipButton = await AppwrightSelectors.getElementByID(this._device, 'Skip-button');
-      await skipButton.tap();
-    }
-  }
-
-  async isVisible() {
-    const element = await this.skipBackupText;
-    await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-  }
-}
-
-export default new SkipAccountSecurityModal();
diff --git a/wdio/screen-objects/Modals/SnapSignModal.js b/wdio/screen-objects/Modals/SnapSignModal.js
deleted file mode 100644
index f64de778656..00000000000
--- a/wdio/screen-objects/Modals/SnapSignModal.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Migrated to tests/page-objects/MMConnect/SnapSignModal.ts
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect } from 'appwright';
-
-/**
- * Modal for Snap-rendered confirmation dialogs (e.g. Solana signing).
- *
- * Snap UIs use SnapUIFooterButton with testIDs following the pattern
- * "${name}-snap-footer-button". This modal locates the confirm/submit
- * button via XPath, excluding cancel and default buttons.
- */
-class SnapSignModal {
-    constructor() {}
-
-    get device() {
-        return this._device;
-    }
-
-    set device(device) {
-        this._device = device;
-    }
-
-    get confirmButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        const xpath =
-            '//*[contains(@resource-id,"snap-footer-button") ' +
-            'and not(contains(@resource-id,"cancel")) ' +
-            'and not(contains(@resource-id,"default-snap-footer-button"))]';
-        return AppwrightSelectors.getElementByXpath(this._device, xpath);
-    }
-
-    get cancelButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        const xpath =
-            '//*[contains(@resource-id,"cancel") ' +
-            'and contains(@resource-id,"snap-footer-button")]';
-        return AppwrightSelectors.getElementByXpath(this._device, xpath);
-    }
-
-    async tapConfirmButton({ timeout = 5000 } = {}) {
-        if (!this._device) {
-            return;
-        }
-
-        const snapBtn = await this.confirmButton;
-        await expect(snapBtn).toBeVisible({ timeout });
-        await AppwrightGestures.tap(snapBtn);
-    }
-
-    async tapCancelButton({ timeout = 5000 } = {}) {
-        if (!this._device) {
-            return;
-        }
-
-        const snapBtn = await this.cancelButton;
-        await expect(snapBtn).toBeVisible({ timeout });
-        await AppwrightGestures.tap(snapBtn);
-    }
-}
-
-export default new SnapSignModal();
diff --git a/wdio/screen-objects/Modals/SwitchChainModal.js b/wdio/screen-objects/Modals/SwitchChainModal.js
deleted file mode 100644
index 0273bcbe87a..00000000000
--- a/wdio/screen-objects/Modals/SwitchChainModal.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Migrated to tests/page-objects/MMConnect/SwitchChainModal.ts
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect } from 'appwright';
-
-class SwitchChainModal {
-    constructor() {}
-
-    get device() {
-        return this._device;
-    }
-
-    set device(device) {
-        this._device = device;
-    }
-
-    getNetworkText(network) {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByXpath(this._device, `//android.widget.TextView[@text="Requesting for ${network}"]`);
-        }
-    }
-
-    get connectButton() {
-        if (!this._device) {
-            return null;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(this._device, 'connect-button');
-        }
-    }
-
-    async tapConnectButton() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.connectButton;
-        await AppwrightGestures.tap(element)
-    }
-
-
-    async assertNetworkText(network) {
-        if (!this._device) {
-            return;
-        }
-
-        const networkText = await this.getNetworkText(network);
-        await expect(networkText).toBeVisible();
-    }
-}
-
-export default new SwitchChainModal();
diff --git a/wdio/screen-objects/Modals/TabBarModal.js b/wdio/screen-objects/Modals/TabBarModal.js
deleted file mode 100644
index 6016ea1915f..00000000000
--- a/wdio/screen-objects/Modals/TabBarModal.js
+++ /dev/null
@@ -1,137 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { TabBarSelectorIDs } from '../../../app/components/Nav/Main/TabBar.testIds';
-import Gestures from '../../helpers/Gestures';
-import BrowserScreen from '../BrowserObject/BrowserScreen';
-import WalletActionModal from './WalletActionModal';
-import { expect as appwrightExpect } from 'appwright';
-
-class TabBarModal {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get walletButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TabBarSelectorIDs.WALLET);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TabBarSelectorIDs.WALLET);
-    }
-  }
-
-  get browserButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TabBarSelectorIDs.BROWSER);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TabBarSelectorIDs.BROWSER);
-    }
-  }
-
-  get actionButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TabBarSelectorIDs.ACTIONS);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TabBarSelectorIDs.ACTIONS);
-    }
-  }
-
-  get tradeButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TabBarSelectorIDs.TRADE);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TabBarSelectorIDs.TRADE);
-    }
-  }
-
-  get settingsButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TabBarSelectorIDs.SETTING);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TabBarSelectorIDs.SETTING);
-    }
-  }
-
-  get activityButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TabBarSelectorIDs.ACTIVITY);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TabBarSelectorIDs.ACTIVITY);
-    }
-  }
-
-  async tapWalletButton() {
-    if (!this._device) {
-      const walletButton = await this.walletButton;
-      await walletButton.waitForDisplayed();
-
-      const browserScreen = await BrowserScreen.container;
-      let isBrowserDisplayed = true;
-
-      while (isBrowserDisplayed) {
-        await walletButton.click();
-        await driver.pause(3000);
-        isBrowserDisplayed = await browserScreen.isExisting();
-      }
-    } else {
-      const walletIcon = await this.walletButton;
-      await appwrightExpect(walletIcon).toBeVisible();
-
-      // Use static tap method with retry logic
-      await AppwrightGestures.tap(walletIcon);
-    }
-  }
-
-  async tapBrowserButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.browserButton);
-    } else {
-      await AppwrightGestures.tap(await this.browserButton); // Use static tap method with retry logic
-    }
-  }
-
-  async tapActionButton() {
-    if (!this._device) {
-      const actionButton = await this.actionButton;
-      await actionButton.waitForEnabled();
-      await driver.pause(3000);
-      await Gestures.longPress(actionButton, 500);
-    } else {
-      await AppwrightGestures.tap(await this.actionButton);
-      await WalletActionModal.checkModalVisibility();
-    }
-  }
-
-  async tapTradeButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.tradeButton);
-    } else {
-      await AppwrightGestures.tap(await this.tradeButton);
-    }
-  }
-
-  async tapSettingButton() {
-    if (!this._device) {
-      await driver.pause(10000);
-      await Gestures.waitAndTap(this.settingsButton);
-    } else {
-      await AppwrightGestures.tap(await this.settingsButton); // Use static tap method with retry logic
-    }
-  }
-
-  async tapActivityButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.activityButton);
-    } else {
-      await AppwrightGestures.tap(await this.activityButton); // Use static tap method with retry logic
-    }
-  }
-}
-
-export default new TabBarModal();
diff --git a/wdio/screen-objects/Modals/TermOfUseScreen.js b/wdio/screen-objects/Modals/TermOfUseScreen.js
deleted file mode 100644
index 98119169e9f..00000000000
--- a/wdio/screen-objects/Modals/TermOfUseScreen.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import { TermsOfUseModalSelectorsIDs } from '../../../app/util/termsOfUse/TermsOfUseModal.testIds';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-
-class TermOfUseScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get container() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TermsOfUseModalSelectorsIDs.CONTAINER);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TermsOfUseModalSelectorsIDs.CONTAINER);
-    }
-  }
-
-  get checkbox() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TermsOfUseModalSelectorsIDs.CHECKBOX);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TermsOfUseModalSelectorsIDs.CHECKBOX);
-    }
-  }
-
-  get scrollEndArrowButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TermsOfUseModalSelectorsIDs.SCROLL_ARROW_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TermsOfUseModalSelectorsIDs.SCROLL_ARROW_BUTTON);
-    }
-  }
-
-  get acceptButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TermsOfUseModalSelectorsIDs.ACCEPT_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TermsOfUseModalSelectorsIDs.ACCEPT_BUTTON);
-    }
-  }
-
-  get webview() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TermsOfUseModalSelectorsIDs.WEBVIEW);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TermsOfUseModalSelectorsIDs.WEBVIEW);
-    }
-  }
-
-  async isDisplayed() {
-    if (!this._device) {
-      const container = await this.container;
-      await container.waitForDisplayed();
-    } else {
-      await appwrightExpect(await this.container).toBeVisible();
-    }
-  }
-
-  async textIsDisplayed() {
-    const termsText = await Selectors.getXpathElementByTextContains(
-      'Last Updated',
-    );
-    await termsText.waitForDisplayed();
-  }
-
-  async isNotDisplayed() {
-    const container = await this.container;
-    await container.waitForExist({ reverse: true });
-  }
-
-  async tapAgreeCheckBox() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.checkbox);
-    } else {
-      const cb = await AppwrightSelectors.getElementByID(this._device, TermsOfUseModalSelectorsIDs.CHECKBOX);
-      await AppwrightGestures.tap(cb); // Use static tap method with retry logic
-    }
-  }
-
-  async tapScrollEndButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.scrollEndArrowButton);
-    } else {
-      const button = await AppwrightSelectors.getElementByID(this._device, TermsOfUseModalSelectorsIDs.SCROLL_ARROW_BUTTON);
-      await AppwrightGestures.tap(button); // Use static tap method with retry logic
-    }
-  }
-
-  async acceptIsEnabled() {
-    const element = await this.acceptButton;
-    return element.isEnabled();
-  }
-
-  async isCheckBoxChecked() {
-    const element = await this.checkbox;
-    return element.isEnabled();
-  }
-
-  async tapAcceptButton() {
-    if (!this._device) {
-      await Gestures.tap(this.acceptButton);
-    } else {
-      const button = await AppwrightSelectors.getElementByID(this._device, TermsOfUseModalSelectorsIDs.ACCEPT_BUTTON);
-      await AppwrightGestures.tap(button); // Use static tap method with retry logic
-    }
-  }
-}
-
-export default new TermOfUseScreen();
diff --git a/wdio/screen-objects/Modals/WalletAccountModal.js b/wdio/screen-objects/Modals/WalletAccountModal.js
deleted file mode 100644
index 4090111bc8b..00000000000
--- a/wdio/screen-objects/Modals/WalletAccountModal.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import { WalletViewSelectorsIDs } from '../../../app/components/Views/Wallet/WalletView.testIds';
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import { expect as appwrightExpect } from 'appwright';
-
-class WalletAccountModal {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get accountNameLabelText() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(WalletViewSelectorsIDs.ACCOUNT_NAME_LABEL_TEXT);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, WalletViewSelectorsIDs.ACCOUNT_NAME_LABEL_TEXT);
-    }
-  }
-
-  get accountNameLabelInput() {
-    return Selectors.getElementByPlatform(WalletViewSelectorsIDs.ACCOUNT_NAME_LABEL_INPUT);
-  }
-
-  get walletAccountOverview() {
-    return Selectors.getXpathElementByResourceId(WalletViewSelectorsIDs.ACCOUNT_OVERVIEW);
-  }
-
-  async longPressAccountNameLabel() {
-    await Gestures.longPress(this.accountNameLabelText, 1000);
-  }
-
-  async editAccountNameLabel(text) {
-    await Gestures.typeText(this.accountNameLabelInput, text);
-  }
-
-  async isAccountNameLabelEditable() {
-    await expect(this.accountNameLabelInput).toBeDisplayed();
-  }
-
-  async isAccountNameLabelVisible(expectedName) {
-    if (!this._device) {
-      await expect(this.accountNameLabelText).toHaveText(expectedName);
-    } else {
-      const element = await AppwrightSelectors.getElementByText(this._device, expectedName);
-      await appwrightExpect(element).toBeVisible();
-    }
-  }
-
-  async isAccountNameLabelEqualTo(expected) {
-    if (!this._device) {
-      await expect(this.accountNameLabelText).toHaveText(expected);
-    } else {
-      const element = await this.accountNameLabelText;
-      const text = await element.getText();
-      await appwrightExpect(text).toBe(expected);
-    }
-  }
-
-  async isAccountInputLabelEqualTo(expected) {
-    const textFromElement = await this.accountNameLabelInput;
-    const accountName = await textFromElement.getText();
-    await expect(accountName).toContain(expected);
-  }
-
-  async isAccountOverview() {
-    await expect(await this.walletAccountOverview).toBeDisplayed();
-  }
-}
-
-export default new WalletAccountModal();
diff --git a/wdio/screen-objects/Modals/WalletActionModal.js b/wdio/screen-objects/Modals/WalletActionModal.js
deleted file mode 100644
index fbd1a0fcd61..00000000000
--- a/wdio/screen-objects/Modals/WalletActionModal.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { WalletActionsBottomSheetSelectorsIDs } from '../../../app/components/Views/WalletActions/WalletActionsBottomSheet.testIds';
-import { expect as appwrightExpect } from 'appwright';
-
-class WalletActionModal {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get sendButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(WalletActionsBottomSheetSelectorsIDs.SEND_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, 'wallet-send-button');
-    }
-  }
-
-  get receiveButton() {
-    return Selectors.getElementByPlatform(WalletActionsBottomSheetSelectorsIDs.RECEIVE_BUTTON);
-  }
-
-  get swapButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(WalletActionsBottomSheetSelectorsIDs.SWAP_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, WalletActionsBottomSheetSelectorsIDs.SWAP_BUTTON);
-    }
-  }
-
-  get bridgeButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(WalletActionsBottomSheetSelectorsIDs.BRIDGE_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, WalletActionsBottomSheetSelectorsIDs.BRIDGE_BUTTON);
-    }
-  }
-
-  get perpsButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(WalletActionsBottomSheetSelectorsIDs.PERPS_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByCatchAll(this._device, 'Trade perps contracts');
-    }
-  }
-
-  get predictButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(WalletActionsBottomSheetSelectorsIDs.PREDICT_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByCatchAll(this._device, 'Trade on real-world events');
-    }
-  }
-
-
-  async isSendButtonVisible() {
-    if (!this._device) {
-      await expect(this.sendButton).toBeDisplayed();
-    } else {
-      const element = await this.sendButton;
-      await appwrightExpect(element).toBeVisible({ timeout: 30000 });
-    }
-  }
-  async tapSendButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.sendButton);
-    } else {
-      await AppwrightGestures.tap(await this.sendButton);
-    }
-  }
-
-  async tapReceiveButton() {
-    await Gestures.waitAndTap(this.receiveButton);
-  }
-
-  async tapSwapButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.swapButton);
-    } else {
-      await AppwrightGestures.tap(await this.swapButton);
-    }
-  }
-
-  async tapBridgeButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.bridgeButton);
-    } else {
-      await AppwrightGestures.tap(await this.bridgeButton);
-    }
-  }
-
-  async tapPerpsButton() {
-    const element = await this.perpsButton;
-    await appwrightExpect(element).toBeVisible();
-    await AppwrightGestures.tap(element, { expectScreenChange: true });
-  }
-
-  async tapPredictButton() {
-    const element = await this.predictButton;
-    await appwrightExpect(element).toBeVisible();
-    await AppwrightGestures.tap(element, { expectScreenChange: true });
-  }
-
-  async checkModalVisibility() {
-    const element = await this.perpsButton;
-    await appwrightExpect(element).toBeVisible();
-  }
-}
-
-export default new WalletActionModal();
diff --git a/wdio/screen-objects/Modals/WhatsNewModal.js b/wdio/screen-objects/Modals/WhatsNewModal.js
deleted file mode 100644
index beb51870e14..00000000000
--- a/wdio/screen-objects/Modals/WhatsNewModal.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-import { WhatsNewModalSelectorsIDs } from '../../../app/components/UI/WhatsNewModal/WhatsNewModal.testIds';
-
-class WhatsNewModal {
-  get container() {
-    return Selectors.getXpathElementByResourceId(WhatsNewModalSelectorsIDs.CONTAINER);
-  }
-
-  get closeButton() {
-    return Selectors.getXpathElementByResourceId(WhatsNewModalSelectorsIDs.CLOSE_BUTTON);
-  }
-
-  async waitForDisplay() {
-    const element = await this.container;
-    await element.waitForDisplayed();
-  }
-
-  async waitForDisappear() {
-    const element = await this.container;
-    await element.waitForExist({ reverse: true });
-  }
-
-  async tapCloseButton() {
-    await Gestures.waitAndTap(this.closeButton);
-  }
-}
-
-export default new WhatsNewModal();
diff --git a/wdio/screen-objects/Native/Android.js b/wdio/screen-objects/Native/Android.js
deleted file mode 100644
index 6f47b2da261..00000000000
--- a/wdio/screen-objects/Native/Android.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Migrated to tests/page-objects/MMConnect/AndroidScreenHelpers.ts
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { AppwrightLocator, Device } from 'appwright';
-
-class AndroidScreenHelpers {
-    constructor() {}
-
-    get device() {
-        return this._device;
-    }
-
-    set device(device) {
-        this._device = device;
-    }
-
-
-    get openDeeplinkWithMetaMask() {
-        if (!this._device) {
-            return;
-        }
-
-        if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByXpath(this._device, '//android.widget.TextView[@text="MetaMask"]');
-        }
-    }
-
-    async tapOpenDeeplinkWithMetaMask() {
-        if (!this._device) {
-            return;
-        }
-
-        const element = await this.openDeeplinkWithMetaMask;
-        await AppwrightGestures.tap(element)
-    }
-}
-
-export default new AndroidScreenHelpers();
diff --git a/wdio/screen-objects/NetworksScreen.js b/wdio/screen-objects/NetworksScreen.js
deleted file mode 100644
index eb8b40c5309..00000000000
--- a/wdio/screen-objects/NetworksScreen.js
+++ /dev/null
@@ -1,465 +0,0 @@
-import Selectors from '../helpers/Selectors';
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import Gestures from '../helpers/Gestures';
-import { expect as appwrightExpect } from 'appwright';
-import {
-  ADD_NETWORK_BUTTON,
-  BLOCK_EXPLORER_FIELD,
-  INPUT_CHAIN_ID_FIELD,
-  INPUT_RPC_URL_FIELD,
-  NAV_ANDROID_BACK_BUTTON,
-  NETWORKS_SYMBOL_INPUT_FIELD,
-  REMOVE_NETWORK_BUTTON,
-} from './testIDs/Screens/NetworksScreen.testids';
-import { NetworksViewSelectorsIDs } from '../../app/components/Views/Settings/NetworksSettings/NetworksView.testIds';
-
-class NetworksScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get container() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(NetworksViewSelectorsIDs.NETWORK_CONTAINER);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, NetworksViewSelectorsIDs.NETWORK_CONTAINER);
-    }
-  }
-
-  get getPopularNetworksTab() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform('POPULAR');
-    } else {
-      return AppwrightSelectors.getElementByText(this._device, 'POPULAR');
-    }
-  }
-
-  get getCustomNetworks() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform('CUSTOM NETWORKS');
-    } else {
-      return AppwrightSelectors.getElementByText(this._device, 'CUSTOM NETWORKS');
-    }
-  }
-
-  get addNetworkButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(ADD_NETWORK_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, ADD_NETWORK_BUTTON);
-    }
-  }
-
-  get addCustomNetworkButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(NetworksViewSelectorsIDs.ADD_CUSTOM_NETWORK_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, NetworksViewSelectorsIDs.ADD_CUSTOM_NETWORK_BUTTON);
-    }
-  }
-
-  get networkNameInputField() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(NetworksViewSelectorsIDs.NETWORK_NAME_INPUT);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, NetworksViewSelectorsIDs.NETWORK_NAME_INPUT);
-    }
-  }
-
-  get rpcURLInputField() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(INPUT_RPC_URL_FIELD);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, INPUT_RPC_URL_FIELD);
-    }
-  }
-
-  get inputChainIdField() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(INPUT_CHAIN_ID_FIELD);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, INPUT_CHAIN_ID_FIELD);
-    }
-  }
-
-  get inputNetworkSymbolField() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(NETWORKS_SYMBOL_INPUT_FIELD);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, NETWORKS_SYMBOL_INPUT_FIELD);
-    }
-  }
-
-  get blockExplorerInputField() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(BLOCK_EXPLORER_FIELD);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, BLOCK_EXPLORER_FIELD);
-    }
-  }
-
-  get removeNetworkButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(REMOVE_NETWORK_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, REMOVE_NETWORK_BUTTON);
-    }
-  }
-
-  get networkScreenBackButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(NetworksViewSelectorsIDs.BACK_ARROW_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, NetworksViewSelectorsIDs.BACK_ARROW_BUTTON);
-    }
-  }
-
-  get settingsPageAndroidBackButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(NAV_ANDROID_BACK_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, NAV_ANDROID_BACK_BUTTON);
-    }
-  }
-
-  get saveNetworkButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(ADD_NETWORK_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, ADD_NETWORK_BUTTON);
-    }
-  }
-
-  get closeNetworkScreen() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(NetworksViewSelectorsIDs.CLOSE_ICON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, NetworksViewSelectorsIDs.CLOSE_ICON);
-    }
-  }
-
-  async waitForDisplayed() {
-    const element = await this.container;
-    if (!this._device) {
-      await element.waitForDisplayed();
-    } else {
-      await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async isPopularNetworksTabVisible() {
-    const element = await this.getPopularNetworksTab;
-    if (!this._device) {
-      await element.waitForDisplayed();
-    } else {
-      await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async isCustomNetworksTabVisible() {
-    const element = await this.getCustomNetworks;
-    if (!this._device) {
-      await element.waitForDisplayed();
-    } else {
-      await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async selectNetwork(network) {
-    if (!this._device) {
-      await Gestures.tapTextByXpath(network);
-    } else {
-      const networkElement = await AppwrightSelectors.getElementByCatchAll(this._device, network);
-      await networkElement.tap();
-    }
-  }
-
-  async tapAndHoldNetwork(network) {
-    if (!this._device) {
-      await Gestures.tapTextByXpath(network);
-    } else {
-      const networkElement = await AppwrightSelectors.getElementByText(this._device, network);
-      await networkElement.tap();
-    }
-  }
-
-  async tapAddNetworkButton() {
-    if (!this._device) {
-      const element = await this.addNetworkButton;
-      await Gestures.waitAndTap(element);
-    } else {
-      await AppwrightGestures.tap(await this.addNetworkButton); // Use static tap method with retry logic
-    }
-  }
-
-  async tapPopularNetworksTab() {
-    if (!this._device) {
-      const element = await this.getPopularNetworksTab;
-      await Gestures.waitAndTap(element);
-    } else {
-      await AppwrightGestures.tap(await this.getPopularNetworksTab); // Use static tap method with retry logic
-    }
-  }
-
-  async tapCustomNetworksTab() {
-    if (!this._device) {
-      const element = await this.getCustomNetworks;
-      await Gestures.waitAndTap(element);
-    } else {
-      await AppwrightGestures.tap(await this.getCustomNetworks); // Use static tap method with retry logic
-    }
-  }
-
-  async isNetworkNameVisible() {
-    if (!this._device) {
-      await expect(this.networkNameInputField).toBeDisplayed();
-    } else {
-      await appwrightExpect(this.networkNameInputField).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async typeIntoNetworkName(text) {
-    const element = await this.networkNameInputField;
-    if (!this._device) {
-      await Gestures.typeText(element, text);
-    } else {
-      await AppwrightGestures.typeText(element, text);
-    }
-  }
-
-  async isRPCUrlFieldVisible() {
-    if (!this._device) {
-      await expect(this.rpcURLInputField).toBeDisplayed();
-    } else {
-      await appwrightExpect(this.rpcURLInputField).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async typeIntoRPCURLField(text) {
-    const element = await this.rpcURLInputField;
-    if (!this._device) {
-      await Gestures.typeText(element, text);
-    } else {
-      await AppwrightGestures.typeText(element, text);
-    }
-  }
-
-  async isChainIDInputVisible() {
-    if (!this._device) {
-      await expect(this.inputChainIdField).toBeDisplayed();
-    } else {
-      await appwrightExpect(this.inputChainIdField).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async typeIntoCHAINIDInputField(text) {
-    if (!this._device) {
-      await driver.touchPerform([{ action: 'tap', options: { x: 399, y: 400 } }]);
-      await Gestures.typeText(this.inputChainIdField, text);
-    } else {
-      await this._device.tap({ x: 399, y: 400 });
-      const element = await this.inputChainIdField;
-      await AppwrightGestures.typeText(element, text);
-    }
-  }
-
-  async isNetworkSymbolFieldVisible() {
-    if (!this._device) {
-      await expect(this.inputNetworkSymbolField).toBeDisplayed();
-    } else {
-      await appwrightExpect(this.inputNetworkSymbolField).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async typeIntoNetworkSymbol(text) {
-    const element = await this.inputNetworkSymbolField;
-    if (!this._device) {
-      await Gestures.typeText(element, text);
-    } else {
-      await AppwrightGestures.typeText(element, text);
-    }
-  }
-
-  async isBlockExplorerUrlVisible() {
-    if (!this._device) {
-      await expect(this.blockExplorerInputField).toBeDisplayed();
-    } else {
-      await appwrightExpect(this.blockExplorerInputField).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async addButtonNetworkIsdisabled() {
-    if (!this._device) {
-      await expect(this.addNetworkButton).toHaveAttrContaining(
-        'clickable',
-        'false',
-      );
-    } else {
-      const element = await this.addNetworkButton;
-      await appwrightExpect(element).toHaveAttribute('clickable', 'false');
-    }
-  }
-
-  async tapCustomAddButton() {
-    if (!this._device) {
-      const element = await this.addCustomNetworkButton;
-      await Gestures.waitAndTap(element);
-    } else {
-      await AppwrightGestures.tap(await this.addCustomNetworkButton); // Use static tap method with retry logic
-    }
-  }
-
-  async isDeleteNetworkButtonVisible() {
-    if (!this._device) {
-      await expect(this.removeNetworkButton).toBeDisplayed();
-    } else {
-      await appwrightExpect(this.removeNetworkButton).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async tapDeleteNetworkButton() {
-    if (!this._device) {
-      const element = await this.removeNetworkButton;
-      await Gestures.waitAndTap(element);
-    } else {
-      await AppwrightGestures.tap(await this.removeNetworkButton); // Use static tap method with retry logic
-    }
-  }
-
-  async tapSaveNetworkButton() {
-    if (!this._device) {
-      const element = await this.saveNetworkButton;
-      await Gestures.tap(element);
-    } else {
-      await AppwrightGestures.tap(await this.saveNetworkButton); // Use static tap method with retry logic
-    }
-  }
-
-  async isSaveNetworkButtonVisible() {
-    if (!this._device) {
-      await expect(this.saveNetworkButton).toBeDisplayed();
-    } else {
-      await appwrightExpect(this.saveNetworkButton).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async tapRemoveNetworkButton(text) {
-    if (!this._device) {
-      await Gestures.tapTextByXpath(text);
-    } else {
-      const element = await AppwrightSelectors.getElementByText(this._device, text);
-      await element.tap();
-    }
-  }
-
-  async isButtonTextVisibleByXpath(text) {
-    if (!this._device) {
-      expect(await Selectors.getXpathElementByText(text)).toBeDisplayed();
-    } else {
-      const element = await AppwrightSelectors.getElementByText(this._device, text);
-      await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async isNetworkRemoved(network) {
-    if (!this._device) {
-      const element = await Selectors.getXpathElementByText(network);
-      await element.waitForExist({ reverse: true });
-    } else {
-      const element = await AppwrightSelectors.getElementByText(this._device, network);
-      await appwrightExpect(element).not.toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async tapOnNetwork(network) {
-    if (!this._device) {
-      await Gestures.tapTextByXpath(network);
-    } else {
-      const element = await AppwrightSelectors.getElementByText(this._device, network);
-      await element.tap();
-    }
-  }
-
-  async isNetworkVisible(network) {
-    if (!this._device) {
-      const networkElement = await Selectors.getXpathElementByText(network);
-      await networkElement.waitForDisplayed();
-    } else {
-      const networkElement = await AppwrightSelectors.getElementByText(this._device, network);
-      await appwrightExpect(networkElement).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async isNetworkNotVisible(text) {
-    if (!this._device) {
-      const networkElement = await Selectors.getXpathElementByText(text);
-      await networkElement.waitForExist({ reverse: true });
-    } else {
-      const networkElement = await AppwrightSelectors.getElementByText(this._device, text);
-      await appwrightExpect(networkElement).not.toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async tapOptionInSettings(text) {
-    if (!this._device) {
-      await Gestures.tapTextByXpath(text);
-    } else {
-      const element = await AppwrightSelectors.getElementByText(this._device, text);
-      await element.tap();
-    }
-  }
-
-  async isNetworknameDisplayed(network) {
-    if (!this._device) {
-      expect(await Selectors.getXpathElementByText(network)).toBeDisplayed();
-    } else {
-      const element = await AppwrightSelectors.getElementByText(this._device, network);
-      await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-    }
-  }
-
-  async tapBackButtonInNewScreen() {
-    if (!this._device) {
-      const element = await this.networkScreenBackButton;
-      await Gestures.waitAndTap(element);
-    } else {
-      await AppwrightGestures.tap(await this.networkScreenBackButton); // Use static tap method with retry logic
-    }
-  }
-
-  async tapBackButtonInSettingsScreen() {
-    if (!this._device) {
-      const element = await this.settingsPageAndroidBackButton;
-      await Gestures.waitAndTap(element);
-    } else {
-      await AppwrightGestures.tap(await this.settingsPageAndroidBackButton); // Use static tap method with retry logic
-    }
-  }
-
-  async tapCloseNetworkScreen() {
-    if (!this._device) {
-      const element = await this.closeNetworkScreen;
-      await Gestures.waitAndTap(element);
-    } else {
-      await AppwrightGestures.tap(await this.closeNetworkScreen); // Use static tap method with retry logic
-    }
-  }
-
-  async tapBackButton() {
-    if (!this._device) {
-      const element = await this.networkScreenBackButton;
-      await Gestures.waitAndTap(element);
-    } else {
-      await AppwrightGestures.tap(await this.networkScreenBackButton); // Use static tap method with retry logic
-    }
-  }
-}
-
-export default new NetworksScreen();
diff --git a/wdio/screen-objects/Onboarding/CreateNewWalletScreen.js b/wdio/screen-objects/Onboarding/CreateNewWalletScreen.js
deleted file mode 100644
index 5c08dc75f80..00000000000
--- a/wdio/screen-objects/Onboarding/CreateNewWalletScreen.js
+++ /dev/null
@@ -1,197 +0,0 @@
-import {
-  CONFIRM_PASSWORD_INPUT_FIRST_FIELD,
-  CREATE_PASSWORD_INPUT_FIRST_FIELD,
-  I_UNDERSTAND_BUTTON_ID,
-  PROTECT_YOUR_WALLET_CONTAINER_ID,
-  REMIND_LATER_BUTTON_ID,
-  SUBMIT_BUTTON,
-  WALLET_SETUP_SCREEN_DESCRIPTION_ID,
-} from "../testIDs/Screens/WalletSetupScreen.testIds";
-import Gestures from "../../helpers/Gestures";
-import Selectors from "../../helpers/Selectors";
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect } from "appwright";
-import { ChoosePasswordSelectorsIDs } from "../../../app/components/Views/ChoosePassword/ChoosePassword.testIds";
-import { iosPasswordInputXpath } from './iosPasswordInputXpath.js';
-
-class CreateNewWalletScreen {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get description() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        WALLET_SETUP_SCREEN_DESCRIPTION_ID,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(
-        this._device,
-        WALLET_SETUP_SCREEN_DESCRIPTION_ID,
-      );
-    }
-  }
-
-  get secureWalletScreen() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        PROTECT_YOUR_WALLET_CONTAINER_ID,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(
-        this._device,
-        PROTECT_YOUR_WALLET_CONTAINER_ID,
-      );
-    }
-  }
-
-  get remindMeLaterButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(REMIND_LATER_BUTTON_ID);
-    } else {
-      return AppwrightSelectors.getElementByID(
-        this._device,
-        REMIND_LATER_BUTTON_ID,
-      );
-    }
-  }
-
-  get newWalletPasswordField() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        CREATE_PASSWORD_INPUT_FIRST_FIELD,
-      );
-    } else {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        return AppwrightSelectors.getElementByXpath(
-          this._device,
-          `//android.widget.EditText[contains(@resource-id,'${CREATE_PASSWORD_INPUT_FIRST_FIELD}') or ancestor::*[contains(@resource-id,'${CREATE_PASSWORD_INPUT_FIRST_FIELD}')]]`,
-        );
-      } else {
-        return AppwrightSelectors.getElementByXpath(
-          this._device,
-          iosPasswordInputXpath(CREATE_PASSWORD_INPUT_FIRST_FIELD, 1),
-        );
-      }
-    }
-  }
-
-  get newWalletPasswordConfirm() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        CONFIRM_PASSWORD_INPUT_FIRST_FIELD,
-      );
-    } else {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        return AppwrightSelectors.getElementByXpath(
-          this._device,
-          `//android.widget.EditText[contains(@resource-id,'${CONFIRM_PASSWORD_INPUT_FIRST_FIELD}') or ancestor::*[contains(@resource-id,'${CONFIRM_PASSWORD_INPUT_FIRST_FIELD}')]]`,
-        );
-      } else {
-        return AppwrightSelectors.getElementByXpath(
-          this._device,
-          iosPasswordInputXpath(CONFIRM_PASSWORD_INPUT_FIRST_FIELD, 2),
-        );
-      }
-    }
-  }
-
-  get termsAndConditionCheckBox() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(I_UNDERSTAND_BUTTON_ID);
-    } else {
-      return AppwrightSelectors.getElementByID(
-        this._device,
-        ChoosePasswordSelectorsIDs.I_UNDERSTAND_CHECKBOX_ID,
-      );
-    }
-  }
-
-  get newWalletSubmitButton() {
-    if (!this._device) {
-      return Selectors.getXpathByContentDesc(SUBMIT_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, SUBMIT_BUTTON);
-    }
-  }
-
-  async inputPasswordInFirstField(firstPassword) {
-    if (!this._device) {
-      await Gestures.typeText(this.newWalletPasswordField, firstPassword);
-    } else {
-      const field = await this.newWalletPasswordField;
-      await AppwrightGestures.typeText(field, firstPassword, {
-        tapBeforeFill: AppwrightSelectors.isAndroid(this._device),
-        maxRetries: 2,
-        retryDelay: 500,
-      });
-    }
-  }
-
-  async inputConfirmPasswordField(secondPassword) {
-    if (!this._device) {
-      await Gestures.typeText(this.newWalletPasswordConfirm, secondPassword);
-      await driver.hideKeyboard();
-      await Gestures.waitAndTap(this.termsAndConditionCheckBox);
-      // await Gestures.waitAndTap(this.screenTitle);
-      await driver.pause(2500);
-      // await Gestures.tap('Create password');
-    } else {
-      const field = await this.newWalletPasswordConfirm;
-      await AppwrightGestures.typeText(field, secondPassword, {
-        tapBeforeFill: AppwrightSelectors.isAndroid(this._device),
-        maxRetries: 2,
-        retryDelay: 500,
-      });
-    }
-  }
-
-  async inputConfirmResetPasswordField(secondPassword) {
-    await Gestures.typeText(this.newWalletPasswordConfirm, secondPassword);
-    await driver.hideKeyboard();
-  }
-
-  async tapSubmitButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.newWalletSubmitButton);
-    } else {
-      const button = await this.newWalletSubmitButton;
-      await button.tap();
-    }
-  }
-
-  async tapRemindMeLater() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.remindMeLaterButton);
-    } else {
-      const button = await this.remindMeLaterButton;
-      await button.tap();
-    }
-  }
-
-  async isAccountCreated() {
-    await driver.pause(5000);
-    await expect(this.secureWalletScreen).toBeDisplayed();
-  }
-
-  async isNewAccountScreenFieldsVisible() {
-    if (!this._device) {
-      await expect(this.newWalletPasswordField).toBeVisible();
-    } else {
-      const element = await this.newWalletPasswordField;
-      await expect(element).toBeVisible();
-    }
-  }
-
-  async isNotVisible() {
-    const secureWalletScreen = await this.secureWalletScreen;
-    await secureWalletScreen.waitForExist({ reverse: true });
-  }
-}
-
-export default new CreateNewWalletScreen();
diff --git a/wdio/screen-objects/Onboarding/CreatePasswordScreen.js b/wdio/screen-objects/Onboarding/CreatePasswordScreen.js
deleted file mode 100644
index bb957fc79d6..00000000000
--- a/wdio/screen-objects/Onboarding/CreatePasswordScreen.js
+++ /dev/null
@@ -1,140 +0,0 @@
-
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import { ChoosePasswordSelectorsIDs } from '../../../app/components/Views/ChoosePassword/ChoosePassword.testIds';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { CONFIRM_PASSWORD_INPUT_FIRST_FIELD, CREATE_PASSWORD_INPUT_FIRST_FIELD } from '../testIDs/Screens/WalletSetupScreen.testIds';
-import { iosPasswordInputXpath } from './iosPasswordInputXpath.js';
-import { expect as appwrightExpect } from 'appwright';
-
-class CreatePasswordScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get container() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(ChoosePasswordSelectorsIDs.CONTAINER_ID);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, ChoosePasswordSelectorsIDs.CONTAINER_ID);
-    }
-  }
-
-  get newPasswordInput() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        ChoosePasswordSelectorsIDs.NEW_PASSWORD_INPUT_ID,
-      );
-    } else {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        // EditText may carry testID itself, or sit under the Pressable — cover both.
-        return AppwrightSelectors.getElementByXpath(
-          this._device,
-          `//android.widget.EditText[contains(@resource-id,'${CREATE_PASSWORD_INPUT_FIRST_FIELD}') or ancestor::*[contains(@resource-id,'${CREATE_PASSWORD_INPUT_FIRST_FIELD}')]]`,
-        );
-      } else {
-        return AppwrightSelectors.getElementByXpath(
-          this._device,
-          iosPasswordInputXpath(CREATE_PASSWORD_INPUT_FIRST_FIELD, 1),
-        );
-      }
-    }
-  }
-
-  get confirmPasswordInput() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        ChoosePasswordSelectorsIDs.CONFIRM_PASSWORD_INPUT_ID,
-      );
-    } else {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        return AppwrightSelectors.getElementByXpath(
-          this._device,
-          `//android.widget.EditText[contains(@resource-id,'${CONFIRM_PASSWORD_INPUT_FIRST_FIELD}') or ancestor::*[contains(@resource-id,'${CONFIRM_PASSWORD_INPUT_FIRST_FIELD}')]]`,
-        );
-      } else {
-        return AppwrightSelectors.getElementByXpath(
-          this._device,
-          iosPasswordInputXpath(CONFIRM_PASSWORD_INPUT_FIRST_FIELD, 2),
-        );
-      }
-    }
-  }
-
-  get iUnderstandCheckbox() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        ChoosePasswordSelectorsIDs.I_UNDERSTAND_CHECKBOX_ID,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, ChoosePasswordSelectorsIDs.I_UNDERSTAND_CHECKBOX_ID);
-    }
-  }
-
-  get submitButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        ChoosePasswordSelectorsIDs.SUBMIT_BUTTON_ID,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, ChoosePasswordSelectorsIDs.SUBMIT_BUTTON_ID);
-    }
-  }
-
-  async enterPassword(password) {
-    if (!this._device) {
-      await Gestures.setValueWithoutTap(this.newPasswordInput, password);
-    } else {
-      const element = await this.newPasswordInput;
-      await AppwrightGestures.typeText(element, password, {
-        tapBeforeFill: AppwrightSelectors.isAndroid(this._device),
-        maxRetries: 2,
-        retryDelay: 500,
-      });
-    }
-  }
-
-  async reEnterPassword(password) {
-    if (!this._device) {
-      await Gestures.setValueWithoutTap(this.confirmPasswordInput, password);
-    } else {
-      const element = await this.confirmPasswordInput;
-      await AppwrightGestures.typeText(element, password, {
-        tapBeforeFill: AppwrightSelectors.isAndroid(this._device),
-        maxRetries: 2,
-        retryDelay: 500,
-      });
-    }
-  }
-
-  async tapIUnderstandCheckBox() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.iUnderstandCheckbox);
-    } else {
-        await AppwrightGestures.hideKeyboard(this._device);
-        await AppwrightGestures.tap(await this.iUnderstandCheckbox);
-    }
-  }
-
-  async tapCreatePasswordButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.submitButton);
-    } else {
-      await AppwrightGestures.tap(await this.submitButton);
-    }
-  }
-
-  async isVisible() {
-    const element = await this.newPasswordInput;
-    await appwrightExpect(element).toBeVisible({ timeout: 30000 });
-  }
-}
-
-export default new CreatePasswordScreen();
diff --git a/wdio/screen-objects/Onboarding/ImportFromSeedScreen.js b/wdio/screen-objects/Onboarding/ImportFromSeedScreen.js
deleted file mode 100644
index 3b48c8be026..00000000000
--- a/wdio/screen-objects/Onboarding/ImportFromSeedScreen.js
+++ /dev/null
@@ -1,166 +0,0 @@
-import Selectors from '../../helpers/Selectors';
-import Gestures from '../../helpers/Gestures';
-import { ImportFromSeedSelectorsIDs } from '../../../app/components/Views/ImportFromSecretRecoveryPhrase/ImportFromSeed.testIds';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import { expect as appwrightExpect } from 'appwright';
-
-class ImportFromSeedScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get screenTitle() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        ImportFromSeedSelectorsIDs.SCREEN_TITLE_ID,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, ImportFromSeedSelectorsIDs.SCREEN_TITLE_ID);
-    }
-  }
-
-  get seedPhraseInput() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        ImportFromSeedSelectorsIDs.SEED_PHRASE_INPUT_ID,
-      );
-    } else {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        return AppwrightSelectors.getElementByID(this._device, ImportFromSeedSelectorsIDs.SEED_PHRASE_INPUT_ID);
-      } else {
-        return AppwrightSelectors.getElementByXpath(this._device, '//XCUIElementTypeOther[@name="textfield"]');
-      }
-    }
-  }
-
-  get continueButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(ImportFromSeedSelectorsIDs.CONTINUE_BUTTON_ID);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, ImportFromSeedSelectorsIDs.CONTINUE_BUTTON_ID);
-    }
-  }
-
-
-  async inputOfIndex(srpIndex, onboarding = true) {
-    if (onboarding) {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        return `import-from-seed-screen-seed-phrase-input-id_${String(srpIndex)}`;
-      } else {
-        return `//XCUIElementTypeOther[@name="textfield" and @label="${String(srpIndex)}."]`;
-
-      }
-    }
-    else {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        return `seed-phrase-input_${String(srpIndex)}`;
-      } else {
-        return `//*[@label="${srpIndex+1}."]`;
-      }
-    }
-   }
-
-
-  async isScreenTitleVisible(onboarding = true) {
-    if (!this._device) {
-      await expect(this.screenTitle).toBeDisplayed();
-    } else {
-      if (onboarding) {
-        const element = await this.screenTitle;
-        await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-      } else {
-        const element = await AppwrightSelectors.getElementByText(this.device, 'Import a wallet');
-        await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-      }
-    }
-  }
-
-  async typeSecretRecoveryPhrase(phrase, onboarding = true) {
-    const phraseArray = phrase.split(' ');
-    if (!this._device) {
-      await Gestures.setValueWithoutTap(this.seedPhraseInput, phrase);
-    } else {
-      if (onboarding) {
-        const firstWord = phraseArray[0];
-        const lastWord = phraseArray[phraseArray.length - 1];
-        const form = await this.seedPhraseInput
-
-        await AppwrightGestures.typeText(form, `${firstWord} `);
-        for (let i = 1; i < phraseArray.length - 1; i++) {
-          let index = i;
-          if (AppwrightSelectors.isIOS(this._device)) { // SRP fields on iOS starts from 1
-            index = i + 1;
-          }
-
-          const wordElement = await this.inputOfIndex(index);
-          let input;
-          if (AppwrightSelectors.isAndroid(this._device))
-            input = await AppwrightSelectors.getElementByID(this.device, wordElement);
-          else
-            input = await AppwrightSelectors.getElementByXpath(this.device, wordElement);
-          await AppwrightGestures.typeText(input, `${phraseArray[i]} `);
-          await AppwrightGestures.tap(input);
-        }
-        const wordElement = await this.inputOfIndex(AppwrightSelectors.isAndroid(this._device) ? phraseArray.length - 1 : phraseArray.length);
-        const lastInput = AppwrightSelectors.isAndroid(this._device) ? await AppwrightSelectors.getElementByID(this.device, wordElement) : await AppwrightSelectors.getElementByXpath(this.device, wordElement);
-        await AppwrightGestures.typeText(lastInput, lastWord);
-      } else {
-        const firstWordImput = AppwrightSelectors.isAndroid(this._device) ? await AppwrightSelectors.getElementByID(this.device, 'seed-phrase-input') : await AppwrightSelectors.getElementByID(this.device, 'textfield');
-        await AppwrightGestures.typeText(firstWordImput, `${phraseArray[0]} `);
-        for (let i = 1; i < phraseArray.length; i++) {
-          const wordElement = await this.inputOfIndex(i, false);
-          const input = AppwrightSelectors.isAndroid(this._device) ? await AppwrightSelectors.getElementByID(this.device, wordElement) : await AppwrightSelectors.getElementByXpath(this.device, wordElement);
-          await AppwrightGestures.typeText(input, `${phraseArray[i]} `);
-          await AppwrightGestures.tap(input);
-        }
-      }
-    }
-  }
-
-  async tapContinueButton(onboarding = true) {
-    if (onboarding) {
-      if (!this._device) {
-        await Gestures.waitAndTap(this.continueButton);
-      } else {
-        await AppwrightGestures.hideKeyboard(this.device);
-        await AppwrightGestures.tap(await this.continueButton); // Use static tap method with retry logic
-      }
-    } else {
-      if (!this._device) {
-        await Gestures.waitAndTap(this.continueButton);
-      } else {
-        const isIOS = await AppwrightSelectors.isIOS(this.device);
-        if (isIOS) {
-          const element = await AppwrightSelectors.getElementByID(this.device, 'import-button');
-          await AppwrightGestures.tap(element); // Use static tap method with retry logic
-        } else {
-          const element = await AppwrightSelectors.getElementByText(this.device, 'Continue');
-          await AppwrightGestures.tap(element); // Use static tap method with retry logic
-        }
-      }
-    }
-  }
-
-  async tapImportScreenTitleToDismissKeyboard(onboarding = true) {
-    if (onboarding) {
-      if (!this._device) {
-          await Gestures.waitAndTap(this.screenTitle);
-      } else {
-        await AppwrightGestures.tap(await this.screenTitle); // Use static tap method with retry logic
-      }
-    } else if (!this._device)
-        await Gestures.waitAndTap(this.screenTitle);
-    else {
-      await AppwrightGestures.hideKeyboard(this.device);
-    }
-  }
-}
-
-export default new ImportFromSeedScreen();
diff --git a/wdio/screen-objects/Onboarding/MetaMetricsScreen.js b/wdio/screen-objects/Onboarding/MetaMetricsScreen.js
deleted file mode 100644
index e46f88ee95c..00000000000
--- a/wdio/screen-objects/Onboarding/MetaMetricsScreen.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import {
-  OPTIN_METRICS_CONTINUE_BUTTON_ID,
-  OPTIN_METRICS_NO_THANKS_BUTTON_ID,
-  OPTIN_METRICS_TITLE_ID,
-} from '../testIDs/Screens/OptinMetricsScreen.testIds';
-import Selectors from '../../helpers/Selectors';
-import { MetaMetricsOptInSelectorsIDs } from '../../../app/components/UI/OptinMetrics/MetaMetricsOptIn.testIds';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-
-class MetaMetricsScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get screenTitle() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_TITLE_ID);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_TITLE_ID);
-    }
-  }
-
-  get iAgreeButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_CONTINUE_BUTTON_ID,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_CONTINUE_BUTTON_ID);
-    }
-  }
-
-  get continueButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_CONTINUE_BUTTON_ID);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_CONTINUE_BUTTON_ID);
-    }
-  }
-
-  async isScreenTitleVisible() {
-    if (!this._device) {
-      await expect(this.screenTitle).toBeDisplayed();
-    } else {
-      const element = await this.screenTitle;
-      await appwrightExpect(element).toBeVisible({ timeout: 30000 }); // Some devices take longer to transition to this screen
-    }
-  }
-
-  async tapContinueButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.continueButton);
-    } else {
-      const element = await this.continueButton;
-      await appwrightExpect(element).toBeVisible({ timeout: 30000 });
-      await element.tap();
-    }
-  }
-
-  async tapIAgreeButton() {
-    if (!this._device) {
-      const element = await this.iAgreeButton;
-      await element.waitForDisplayed();
-      await Gestures.swipeUp(0.5);
-      await Gestures.swipeUp(0.5);
-      await element.waitForEnabled();
-      await Gestures.waitAndTap(this.iAgreeButton);
-    } else {
-      await AppwrightGestures.tap(await this.iAgreeButton);
-    }
-  }
-
-  async tapNoThanksButton() {
-    if (!this._device) {
-      await Gestures.swipeUp(0.5);
-      const element = await this.iAgreeButton;
-      await element.waitForEnabled();
-      await Gestures.waitAndTap(this.noThanksButton);
-    } else {
-      await this.noThanksButton.tap();
-    }
-  }
-}
-
-export default new MetaMetricsScreen();
diff --git a/wdio/screen-objects/Onboarding/OnboardingCarousel.js b/wdio/screen-objects/Onboarding/OnboardingCarousel.js
deleted file mode 100644
index 2efbeb75cf7..00000000000
--- a/wdio/screen-objects/Onboarding/OnboardingCarousel.js
+++ /dev/null
@@ -1,176 +0,0 @@
-import {
-  WELCOME_SCREEN_CAROUSEL_CONTAINER_ID,
-  WELCOME_SCREEN_CAROUSEL_TITLE_ID,
-} from '../testIDs/Screens/WelcomeScreen.testIds';
-import { SPLASH_SCREEN_METAMASK_ANIMATION_ID } from '../testIDs/Components/MetaMaskAnimation.testIds';
-import { OnboardingCarouselSelectorIDs } from '../../../tests/selectors/Onboarding/OnboardingCarousel.selectors'
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-
-class WelcomeScreen {
-  constructor() {
-    this.CAROUSEL_RECTANGLES = null;
-  }
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get splashScreenMetamaskAnimationId() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        SPLASH_SCREEN_METAMASK_ANIMATION_ID,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, SPLASH_SCREEN_METAMASK_ANIMATION_ID);
-    }
-  }
-
-  get getStartedButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        OnboardingCarouselSelectorIDs.GET_STARTED_BUTTON_ID,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, OnboardingCarouselSelectorIDs.GET_STARTED_BUTTON_ID);
-    }
-  }
-
-  get screen() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        OnboardingCarouselSelectorIDs.CONTAINER_ID,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, OnboardingCarouselSelectorIDs.CONTAINER_ID);
-    }
-  }
-
-  async getLaunchDuration() {
-    if (!this._device) {
-      return await Selectors.getXpathElementByResourceId(
-        OnboardingCarouselSelectorIDs.APP_START_TIME_ID,
-      );
-    } else {
-      return await AppwrightSelectors.getElementByID(this._device, OnboardingCarouselSelectorIDs.APP_START_TIME_ID);
-    }
-  }
-
-  async isGetLaunchDurationDisplayed() {
-    const element = await this.getLaunchDuration();
-    await expect(element).toBeDisplayed();
-  }
-
-  async waitForSplashAnimationToDisplay() {
-    const elem = await this.splashScreenMetamaskAnimationId;
-    const getStartedElem = await this.getStartedButton;
-    try {
-      await elem.waitForExist();
-    } catch (error) {
-      console.log(
-        `Splash screen animation element '${this.splashScreenMetamaskAnimationId}' not found`,
-      );
-      await getStartedElem.waitForExist();
-    }
-  }
-
-  async waitForSplashAnimationToComplete() {
-    const elem = await this.splashScreenMetamaskAnimationId;
-    await elem.waitForExist();
-    await elem.waitForExist({ reverse: true });
-  }
-
-  async isScreenDisplayed() {
-    if (!this._device) {
-      expect(this.screen).toBeDisplayed();
-    } else {
-      const element = await this.screen;
-      await appwrightExpect(element).toBeVisible();
-    }
-  }
-
-  async isGetStartedButtonDisplayed() {
-    if (!this._device) {
-      expect(this.getStartedButton).toBeDisplayed();
-    } else {
-      const element = await this.getStartedButton;
-      await appwrightExpect(element).toBeVisible();
-    }
-  }
-
-  async waitForSplashAnimationToNotExit() {
-    const elem = await this.splashScreenMetamaskAnimationId;
-    await elem.waitForExist({ reverse: true });
-  }
-
-  async verifyCarouselTitle(key) {
-    const elem = Selectors.getElementByPlatform(
-      WELCOME_SCREEN_CAROUSEL_TITLE_ID(key),
-      true,
-    );
-    await expect(elem).toBeDisplayed();
-  }
-
-  async swipeNextSlide() {
-    const carouselRectangles = await this.getCarouselRect();
-    const y = Math.round(carouselRectangles.y + carouselRectangles.height / 2);
-    await Gestures.swipe(
-      {
-        x: Math.round(
-          carouselRectangles.width - carouselRectangles.width * 0.1,
-        ),
-        y,
-      },
-      {
-        x: Math.round(carouselRectangles.x + carouselRectangles.width * 0.1),
-        y,
-      },
-    );
-  }
-
-  async getCarouselRect() {
-    // Get the rectangles of the carousel and store it in a global that will be used for a next call.
-    // We dont want ask for the rectangles of the carousel if we already know them.
-    // This will save unneeded webdriver calls.
-    const element = await this.screen;
-    this.CAROUSEL_RECTANGLES =
-      this.CAROUSEL_RECTANGLES ||
-      (await driver.getElementRect(element.elementId));
-
-    return this.CAROUSEL_RECTANGLES;
-  }
-
-  async clickGetStartedButton() {
-    if (!this._device) {
-      const element = await this.screen;
-      let screenExist = await element.isExisting();
-
-      await Gestures.waitAndTap(this.getStartedButton);
-      await driver.pause(7000);
-      screenExist = await element.isExisting();
-    } else {
-      const button = await AppwrightSelectors.getElementByID(this._device, OnboardingCarouselSelectorIDs.GET_STARTED_BUTTON_ID);
-      await AppwrightGestures.tap(button); // Use static tap method with retry logic
-    }
-  }
-
-  async waitForScreenToDisplay() {
-    if (!this._device) {
-      const element = await this.screen;
-      await element.waitForDisplayed({ interval: 500 });
-    } else {
-      const element = await this.screen;
-      await appwrightExpect(element).toBeVisible();
-    }
-  }
-}
-
-export default new WelcomeScreen();
diff --git a/wdio/screen-objects/Onboarding/OnboardingScreen.js b/wdio/screen-objects/Onboarding/OnboardingScreen.js
deleted file mode 100644
index 5209a37cf7c..00000000000
--- a/wdio/screen-objects/Onboarding/OnboardingScreen.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-import { OnboardingSelectorIDs } from '../../../app/components/Views/Onboarding/Onboarding.testIds';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-
-class OnBoardingScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get createNewWalletButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        OnboardingSelectorIDs.NEW_WALLET_BUTTON,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, OnboardingSelectorIDs.NEW_WALLET_BUTTON);
-    }
-  }
-
-  get existingWalletButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(
-        OnboardingSelectorIDs.EXISTING_WALLET_BUTTON,
-      );
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, OnboardingSelectorIDs.EXISTING_WALLET_BUTTON);
-    }
-  }
-
-  async tapHaveAnExistingWallet() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.existingWalletButton);
-    } else {
-      await AppwrightGestures.tap(await this.existingWalletButton);
-    }
-  }
-
-  async tapCreateNewWalletButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.createNewWalletButton);
-    } else {
-      await AppwrightGestures.tap(await this.createNewWalletButton);
-    }
-  }
-
-  async isScreenTitleVisible() {
-    if (!this._device) {
-      await expect(this.createNewWalletButton).toBeDisplayed();
-    } else {
-      const element = await this.createNewWalletButton;
-      await appwrightExpect(element).toBeVisible({ timeout: 30000 });
-    }
-  }
-}
-
-export default new OnBoardingScreen();
diff --git a/wdio/screen-objects/Onboarding/OnboardingSheet.js b/wdio/screen-objects/Onboarding/OnboardingSheet.js
deleted file mode 100644
index f5de94b5282..00000000000
--- a/wdio/screen-objects/Onboarding/OnboardingSheet.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import Gestures from '../../helpers/Gestures';
-import Selectors from '../../helpers/Selectors';
-import { OnboardingSheetSelectorIDs } from '../../../app/components/Views/OnboardingSheet/OnboardingSheet.testIds';
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-
-class OnboardingSheet {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get container() {
-    return Selectors.getXpathElementByResourceId(OnboardingSheetSelectorIDs.CONTAINER_ID);
-  }
-
-  get googleLoginButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(OnboardingSheetSelectorIDs.GOOGLE_LOGIN_BUTTON);
-    }
-    return AppwrightSelectors.getElementByID(this._device, OnboardingSheetSelectorIDs.GOOGLE_LOGIN_BUTTON);
-  }
-
-  get appleLoginButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(OnboardingSheetSelectorIDs.APPLE_LOGIN_BUTTON);
-    }
-    return AppwrightSelectors.getElementByID(this._device, OnboardingSheetSelectorIDs.APPLE_LOGIN_BUTTON);
-  }
-
-  get importSeedButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(OnboardingSheetSelectorIDs.IMPORT_SEED_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, OnboardingSheetSelectorIDs.IMPORT_SEED_BUTTON);
-    }
-  }
-
-  get notNowButton() {
-    return AppwrightSelectors.getElementByCatchAll(this._device, 'Not now');
-  }
-
-  async tapGoogleLoginButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.googleLoginButton);
-    } else {
-      await AppwrightGestures.tap(await this.googleLoginButton);
-    }
-  }
-
-  async tapAppleLoginButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.appleLoginButton);
-    } else {
-      await AppwrightGestures.tap(await this.appleLoginButton);
-    }
-  }
-
-  async tapImportSeedButton() {
-    if (!this.device) {
-      await Gestures.waitAndTap(this.importSeedButton);
-    } else {
-      await AppwrightGestures.tap(await this.importSeedButton);
-    }
-  }
-
-  async isVisible() {
-    const element = await this.importSeedButton;
-    await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-  }
-
-  async tapNotNow() {
-    const notNowByButton = await this.notNowButton;
-    await notNowByButton.isVisible({ timeout: 2000 });
-    await notNowByButton.tap();
-  }
-}
-
-export default new OnboardingSheet();
diff --git a/wdio/screen-objects/Onboarding/SocialLoginScreen.js b/wdio/screen-objects/Onboarding/SocialLoginScreen.js
deleted file mode 100644
index 53d30e8a1d1..00000000000
--- a/wdio/screen-objects/Onboarding/SocialLoginScreen.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import AppwrightSelectors from '../../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-import { OnboardingSelectorIDs } from '../../../app/components/Views/Onboarding/Onboarding.testIds';
-import { AccountStatusSelectorIDs } from '../../../app/components/Views/AccountStatus/AccountStatus.testIds';
-
-class SocialLoginScreen {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get iosNewUserTitle() {
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      OnboardingSelectorIDs.SOCIAL_LOGIN_IOS_NEW_USER_TITLE,
-    );
-  }
-
-  get iosNewUserButton() {
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      OnboardingSelectorIDs.SOCIAL_LOGIN_IOS_NEW_USER_BUTTON,
-    );
-  }
-
-  get iosExistingUserTitle() {
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      OnboardingSelectorIDs.SOCIAL_LOGIN_IOS_EXISTING_USER_TITLE,
-    );
-  }
-
-  get iosExistingUserButton() {
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      OnboardingSelectorIDs.SOCIAL_LOGIN_IOS_EXISTING_USER_BUTTON,
-    );
-  }
-
-  get accountFoundContainer() {
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      AccountStatusSelectorIDs.ACCOUNT_FOUND_CONTAINER,
-    );
-  }
-
-  get accountFoundLoginButton() {
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      AccountStatusSelectorIDs.ACCOUNT_FOUND_LOGIN_BUTTON,
-    );
-  }
-
-  get accountNotFoundContainer() {
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      AccountStatusSelectorIDs.ACCOUNT_NOT_FOUND_CONTAINER,
-    );
-  }
-
-  get accountNotFoundCreateButton() {
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      AccountStatusSelectorIDs.ACCOUNT_NOT_FOUND_CREATE_BUTTON,
-    );
-  }
-
-  async isIosNewUserScreenVisible() {
-    const element = await this.iosNewUserTitle;
-    await appwrightExpect(element).toBeVisible({ timeout: 30000 });
-  }
-
-  async tapIosNewUserSetPinButton() {
-    await AppwrightGestures.tap(await this.iosNewUserButton);
-  }
-
-  async isIosExistingUserScreenVisible() {
-    const element = await this.iosExistingUserTitle;
-    await appwrightExpect(element).toBeVisible({ timeout: 30000 });
-  }
-
-  async tapIosExistingUserSecureWalletButton() {
-    await AppwrightGestures.tap(await this.iosExistingUserButton);
-  }
-
-  async isAccountFoundScreenVisible() {
-    const element = await this.accountFoundContainer;
-    await appwrightExpect(element).toBeVisible({ timeout: 30000 });
-  }
-
-  async tapAccountFoundLoginButton() {
-    await AppwrightGestures.tap(await this.accountFoundLoginButton);
-  }
-
-  async isAccountNotFoundScreenVisible() {
-    const element = await this.accountNotFoundContainer;
-    await appwrightExpect(element).toBeVisible({ timeout: 30000 });
-  }
-
-  async tapAccountNotFoundCreateButton() {
-    await AppwrightGestures.tap(await this.accountNotFoundCreateButton);
-  }
-}
-
-export default new SocialLoginScreen();
diff --git a/wdio/screen-objects/Onboarding/iosPasswordInputXpath.js b/wdio/screen-objects/Onboarding/iosPasswordInputXpath.js
deleted file mode 100644
index 93c60047b94..00000000000
--- a/wdio/screen-objects/Onboarding/iosPasswordInputXpath.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- *
- * @param {string} testId e.g. create-password-first-input-field
- * @param {1|2} textfieldIndex legacy RN (//XCUIElementTypeOther[@name="textfield"])[n]
- */
-export function iosPasswordInputXpath(testId, textfieldIndex) {
-  return [
-    `(//XCUIElementTypeSecureTextField[contains(@name,'${testId}') or contains(@label,'${testId}')])[1]`,
-    `(//XCUIElementTypeTextField[contains(@name,'${testId}') or contains(@label,'${testId}')])[1]`,
-    `(//*[(self::XCUIElementTypeSecureTextField or self::XCUIElementTypeTextField or (self::XCUIElementTypeOther and @name="textfield")) and (@name="${testId}" or @label="${testId}")])[1]`,
-    `(//XCUIElementTypeOther[@name="textfield"])[${textfieldIndex}]`,
-  ].join(' | ');
-}
diff --git a/wdio/screen-objects/OnboardingSucessScreen.js b/wdio/screen-objects/OnboardingSucessScreen.js
deleted file mode 100644
index fb6ec9ea997..00000000000
--- a/wdio/screen-objects/OnboardingSucessScreen.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { OnboardingSuccessSelectorIDs } from '../../app/components/Views/OnboardingSuccess/OnboardingSuccess.testIds';
-import Selectors from '../helpers/Selectors';
-import Gestures from '../helpers/Gestures';
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import { expect as appwrightExpect } from 'appwright';
-
-
-class OnboardingSuccessView {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-  get doneButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(OnboardingSuccessSelectorIDs.DONE_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, OnboardingSuccessSelectorIDs.DONE_BUTTON);
-    }
-  }
-
-  async isVisible() {
-    const element = await this.doneButton;
-    await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-  }
-
-  async tapDone() {
-    if (!this.device) {
-      await Gestures.waitAndTap(this.doneButton);
-    } else {
-      const button = await this.doneButton;
-      await button.tap();
-    }
-  }
-}
-
-export default new OnboardingSuccessView();
diff --git a/wdio/screen-objects/PerpsClosePositionView.js b/wdio/screen-objects/PerpsClosePositionView.js
deleted file mode 100644
index 497fb6040b5..00000000000
--- a/wdio/screen-objects/PerpsClosePositionView.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-
-class PerpsClosePositionView {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get confirmButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'close-position-confirm-button');
-  }
-
-  async tapConfirmButton() {
-    await AppwrightGestures.tap(await this.confirmButton);
-  }
-}
-
-export default new PerpsClosePositionView();
-
-
diff --git a/wdio/screen-objects/PerpsDepositScreen.js b/wdio/screen-objects/PerpsDepositScreen.js
deleted file mode 100644
index 2c46b4cef41..00000000000
--- a/wdio/screen-objects/PerpsDepositScreen.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import AmountScreen from './AmountScreen';
-import { expect as appwrightExpect } from 'appwright';
-
-class PerpsDepositScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get continueButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'deposit-keyboard-done-button')
-  }
-
-  get cancelButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'cancel-button');
-  }
-
-  get amountInput() {
-    return AppwrightSelectors.getElementByID(this._device, 'custom-amount-input');
-  }
-
-  get backButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'Add funds-navbar-back-button');
-  }
-
-  get payWithButton() {
-    return AppwrightSelectors.getElementByCatchAll(
-      this._device,
-      'Pay with',
-    );
-  }
-
-  get addFundsButton() {
-    return AppwrightSelectors.getElementByText(this._device, 'Add funds');
-  }
-
-  get totalText() {
-    return AppwrightSelectors.getElementByText(this._device, 'Total');
-  }
-
-  async isAmountInputVisible() {
-    const input = await this.amountInput;
-    await appwrightExpect(input).toBeVisible();
-  }
-
-  async selectPayTokenByText(token) {
-    const tokenButton = await AppwrightSelectors.getElementByCatchAll(this._device, token);
-    await AppwrightGestures.tap(tokenButton); // Use static tap method with retry logic
-  }
-
-  async fillUsdAmount(amount) {
-    AmountScreen.device = this._device;
-    await AmountScreen.enterAmount(amount);
-    await AmountScreen.tapOnNextButton();
-  }
-
-  async tapPayWith() {
-    await AppwrightGestures.tap(await this.payWithButton); // Use static tap method with retry logic
-  }
-
-  async tapContinue() {
-    await AppwrightGestures.tap(await this.continueButton); // Use static tap method with retry logic
-  }
-
-  async tapCancel() {
-    await AppwrightGestures.tap(await this.cancelButton); // Use static tap method with retry logic
-  }
-
-  async tapBackButton() {
-    await AppwrightGestures.tap(await this.backButton); // Use static tap method with retry logic
-  }
-
-  async checkTransactionFeeIsVisible() {
-    const transactionFee = await AppwrightSelectors.getElementByID(this._device, 'bridge-fee-row');
-    await appwrightExpect(transactionFee).toBeVisible();
-  }
-
-  async isAddFundsVisible() {
-    const addFunds = await this.addFundsButton;
-    await appwrightExpect(addFunds).toBeVisible();
-  }
-
-  async isTotalVisible() {
-    const total = await AppwrightSelectors.getElementByText(this._device, 'Total');
-    await appwrightExpect(total).toBeVisible();
-  }
-}
-
-export default new PerpsDepositScreen();
-
-
diff --git a/wdio/screen-objects/PerpsMarketDetailsView.js b/wdio/screen-objects/PerpsMarketDetailsView.js
deleted file mode 100644
index 72eda6d3ec2..00000000000
--- a/wdio/screen-objects/PerpsMarketDetailsView.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-
-class PerpsMarketDetailsView {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get longButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-market-details-long-button');
-  }
-
-  get shortButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-market-details-short-button');
-  }
-
-  async tapLongButton() {
-    await AppwrightGestures.tap(await this.longButton);
-  }
-
-  async tapShortButton() {
-    await AppwrightGestures.tap(await this.shortButton);
-  }
-}
-
-export default new PerpsMarketDetailsView();
-
diff --git a/wdio/screen-objects/PerpsMarketListView.js b/wdio/screen-objects/PerpsMarketListView.js
deleted file mode 100644
index e0d9d3c0d01..00000000000
--- a/wdio/screen-objects/PerpsMarketListView.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-
-class PerpsMarketListView {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get backButtonMarketList() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-market-list-back-button');
-  }
-
-  get listHeader() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-home');
-  }
-
-  async isHeaderVisible() {
-    const header = await this.listHeader;
-    await appwrightExpect(header).toBeVisible({ timeout: 20000 });
-  }
-
-  async tapBackButtonMarketList() {
-    await AppwrightGestures.tap(await this.backButtonMarketList); // Use static tap method with retry logic
-  }
-
-  async selectMarket(symbol) {
-    // ID format from Perps.selectors.ts: `perps-market-row-item-${symbol}`
-    const marketRow = await AppwrightSelectors.getElementByID(this._device, `perps-market-row-item-${symbol}`);
-    await AppwrightGestures.tap(marketRow);
-  }
-}
-
-export default new PerpsMarketListView();
diff --git a/wdio/screen-objects/PerpsOrderView.js b/wdio/screen-objects/PerpsOrderView.js
deleted file mode 100644
index 3b6713f1db2..00000000000
--- a/wdio/screen-objects/PerpsOrderView.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import AmountScreen from './AmountScreen';
-import { expect as appwrightExpect } from 'appwright';
-import { splitAmountIntoDigits } from '../utils/splitAmountIntoDigits';
-import PerpsPositionDetailsView from './PerpsPositionDetailsView';
-
-class PerpsOrderView {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get placeOrderButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-order-view-place-order-button');
-  }
-
-  get keypad() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-order-view-keypad');
-  }
-
-  get leverageButton() {
-    return AppwrightSelectors.getElementByText(this._device, 'Leverage');
-  }
-
-  async leverageOption(leverage) {
-    return AppwrightSelectors.getElementByText(this._device, `${leverage}x`);
-  }
-
-  async confirmLeverageButton(leverage) {
-    return AppwrightSelectors.getElementByText(this._device, `Set ${leverage}x`);
-  }
-
-  async tapPlaceOrder() {
-    await AppwrightGestures.tap(await this.placeOrderButton);
-  }
-
-  // Reuse logic from AmountScreen.js for Keypad interaction
-  async tapNumberKey(digit) {
-    AmountScreen.device = this._device;
-    await AmountScreen.tapNumberKey(digit);
-  }
-
-  async enterAmount(text) {
-    // Since PerpsOrderView likely only supports keypad input for amount in the UI flow being tested
-    const digits = splitAmountIntoDigits(text);
-    for (const digit of digits) {
-      console.log('Tapping digit:', digit);
-      await this.tapNumberKey(digit);
-    }
-  }
-
-  async setLeverage(leverage) {
-    await AppwrightGestures.tap(await this.leverageButton);
-    await AppwrightGestures.tap(await this.leverageOption(leverage));
-    await AppwrightGestures.tap(await this.confirmLeverageButton(leverage));
-  }
-
-  async checkOrderScreenVisible() {
-    const orderScreen = await this.placeOrderButton;
-    await appwrightExpect(orderScreen).toBeVisible();
-  }
-}
-
-export default new PerpsOrderView();
diff --git a/wdio/screen-objects/PerpsPositionDetailsView.js b/wdio/screen-objects/PerpsPositionDetailsView.js
deleted file mode 100644
index e6179696401..00000000000
--- a/wdio/screen-objects/PerpsPositionDetailsView.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import Utilities from '../../tests/framework/Utilities';
-import { expect } from 'appwright';
-
-class PerpsPositionDetailsView {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get closePositionButton() {
-     return AppwrightSelectors.getElementByID(this._device, 'perps-market-details-close-button');
-  }
-
-  get positionOpenButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'position-open-button');
-  }
-
-  get confirmClosePositionButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'close-position-confirm-button');
-  }
-
-  get marketDetailsHeader() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-market-header');
-  }
-
-  async tapClosePositionButton() {
-    await AppwrightGestures.tap(await this.closePositionButton);
-    await AppwrightGestures.tap(await this.confirmClosePositionButton);
-  }
-
-  async isPositionOpen(timeout = 5000) {
-    const closePositionButton = await this.closePositionButton;
-    return await closePositionButton.isVisible({ timeout });
-  }
-
-  async closePositionWithRetry() {
-    await Utilities.executeWithRetry(async () => {
-      if (await this.isPositionOpen()) {
-        await this.tapClosePositionButton();
-        const closePositionButton = await this.closePositionButton;
-        await AppwrightSelectors.waitForElementToDisappear(
-          closePositionButton,
-          'Close Position Button',
-          5000,
-        );
-      }
-    }, {
-      description: 'close position',
-      elemDescription: 'Close Position Button',
-    });
-  }
-
-  async isContainerDisplayed() {
-    const container = await this.marketDetailsHeader;
-    await expect(container).toBeVisible({ timeout: 20000 });
-  }
-}
-
-export default new PerpsPositionDetailsView();
-
-
diff --git a/wdio/screen-objects/PerpsPositionsView.js b/wdio/screen-objects/PerpsPositionsView.js
deleted file mode 100644
index caa09c4fbc7..00000000000
--- a/wdio/screen-objects/PerpsPositionsView.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-
-class PerpsPositionsView {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get positionItem() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-positions-item');
-  }
-
-  async tapPositionItem() {
-    await AppwrightGestures.tap(await this.positionItem);
-  }
-}
-
-export default new PerpsPositionsView();
-
diff --git a/wdio/screen-objects/PerpsTabView.js b/wdio/screen-objects/PerpsTabView.js
deleted file mode 100644
index 9f5992bda5f..00000000000
--- a/wdio/screen-objects/PerpsTabView.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-
-class PerpsTabView {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get perpsTabButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'undefined-tab-1');
-  }
-
-  get addFundsButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-add-funds-button');
-  }
-
-  get onboardingButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-start-trading-button');
-  }
-
-  get startTradingButton() {
-    return AppwrightSelectors.getElementByText(this._device, 'Start trading');
-  }
-
-  async tapPerpsTab() {
-    await AppwrightGestures.tap(await this.perpsTabButton); // Use static tap method with retry logic
-  }
-
-  async tapStartTradingButton() {
-    await AppwrightGestures.tap(await this.startTradingButton); // Use static tap method with retry logic
-  }
-
-  async tapAddFunds() {
-    await AppwrightGestures.tap(await this.addFundsButton); // Use static tap method with retry logic
-  }
-
-  async tapOnboardingButton() {
-    const button = await this.onboardingButton;
-    await appwrightExpect(button).toBeVisible({ timeout: 5000 });
-    await AppwrightGestures.tap(button); // Use static tap method with retry logic
-  }
-}
-
-export default new PerpsTabView();
-
-
diff --git a/wdio/screen-objects/PerpsTutorialScreen.js b/wdio/screen-objects/PerpsTutorialScreen.js
deleted file mode 100644
index 6eeffef46fe..00000000000
--- a/wdio/screen-objects/PerpsTutorialScreen.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import { expect } from 'appwright';
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-
-class PerpsTutorialScreen {
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get continueButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-tutorial-continue-button');
-  }
-
-  get skipButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'perps-tutorial-skip-button');
-  }
-
-  get title() {
-    return AppwrightSelectors.getElementByCatchAll(this._device, 'What are perps?');
-  }
-
-  // Legacy alias for backward compatibility
-  get addFundsButton() {
-    return AppwrightSelectors.getElementByCatchAll(this._device, 'Add funds');
-  }
-
-  get skipButtonTutorial() {
-    return this.skipButton;
-  }
-
-  async tapContinue() {
-    await AppwrightGestures.tap(await this.continueButton);
-  }
-
-  // Legacy alias for backward compatibility
-  async tapAddFunds() {
-    await AppwrightGestures.tap(await this.addFundsButton);
-  }
-
-  async tapSkip() {
-    await AppwrightGestures.tap(await this.skipButton);
-  }
-
-  async expectFirstScreenVisible() {
-    const title = await this.title;
-    expect(await title).toBeVisible();
-  }
-
-  async flowTapContinueTutorial(times = 1) {
-    for (let i = 0; i < times; i++) {
-      await AppwrightGestures.tap(await this.continueButton);
-    }
-  }
-
-  async isContainerDisplayed() {
-    const container = await this.title;
-    expect(await container).toBeVisible({ timeout: 20000 });
-  }
-}
-
-export default new PerpsTutorialScreen();
diff --git a/wdio/screen-objects/PredictConfirmationScreen.js b/wdio/screen-objects/PredictConfirmationScreen.js
deleted file mode 100644
index aaf1fb2e582..00000000000
--- a/wdio/screen-objects/PredictConfirmationScreen.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-
-class PredictConfirmationScreen {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get confirmButton() {
-    return AppwrightSelectors.getElementByCatchAll(
-      this._device,
-      'Confirm',
-    );
-  }
-
-  get cancelButton() {
-    return AppwrightSelectors.getElementByCatchAll(
-      this._device,
-      'Cancel',
-    );
-  }
-
-  get depositAmountLabel() {
-    return AppwrightSelectors.getElementByCatchAll(
-      this._device,
-      'Amount',
-    );
-  }
-
-  get feesLabel() {
-    return AppwrightSelectors.getElementByCatchAll(
-      this._device,
-      'fee',
-    );
-  }
-
-  async isVisible() {
-    const confirmButton = await this.confirmButton;
-    await appwrightExpect(confirmButton).toBeVisible();
-  }
-
-  async isMetaMaskFeeDisplayed() {
-    const metaMaskFeeElement = await AppwrightSelectors.getElementByID(
-      this._device,
-      'metamask-fee-row',
-    );
-    await appwrightExpect(metaMaskFeeElement).toBeVisible();
-    const text = await metaMaskFeeElement.getText();
-    await appwrightExpect(text).toContain('MetaMask fee');
-  }
-
-  async verifyDepositAmount(amount) {
-    const amountText = await AppwrightSelectors.getElementByCatchAll(
-      this._device,
-      `$${amount}`,
-    );
-    await appwrightExpect(amountText).toBeVisible();
-  }
-
-  async verifyFeesDisplayed() {
-    const feesLabel = await this.feesLabel;
-    await appwrightExpect(feesLabel).toBeVisible();
-  }
-
-  async tapConfirm() {
-    await AppwrightGestures.tap(await this.confirmButton);
-  }
-
-  async tapCancel() {
-    await AppwrightGestures.tap(await this.cancelButton);
-  }
-}
-
-export default new PredictConfirmationScreen();
diff --git a/wdio/screen-objects/PredictDepositScreen.js b/wdio/screen-objects/PredictDepositScreen.js
deleted file mode 100644
index 17a0c8a92d4..00000000000
--- a/wdio/screen-objects/PredictDepositScreen.js
+++ /dev/null
@@ -1,147 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-
-class PredictDepositScreen {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get continueButton() {
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      'deposit-keyboard-done-button',
-    );
-  }
-
-  get cancelButton() {
-    return AppwrightSelectors.getElementByID(this._device, 'cancel-button');
-  }
-
-  get amountInput() {
-    return AppwrightSelectors.getElementByID(
-      this._device,
-      'custom-amount-input',
-    );
-  }
-
-  get payWithButton() {
-    return AppwrightSelectors.getElementByCatchAll(this._device, 'Pay with');
-  }
-
-  async isAmountInputVisible() {
-    const input = await this.amountInput;
-    await input.isVisible({ timeout: 15000 });
-  }
-
-  async isSelectPaymentVisible() {
-    const selectPaymentButton = await AppwrightSelectors.getElementByCatchAll(
-      this._device,
-      'Select payment method',
-    );
-    await selectPaymentButton.isVisible({ timeout: 15000 });
-  }
-
-  async selectPayTokenByText(networkId, token) {
-    const networkButton = await AppwrightSelectors.getElementByID(
-      this._device,
-      `asset-${networkId}-${token}`,
-    );
-    await AppwrightGestures.tap(networkButton);
-  }
-
-  async searchToken(tokenName) {
-    let searchField;
-    if (AppwrightSelectors.isIOS(this._device)) {
-      // iOS: Use placeholder text to find the search field
-      searchField = await AppwrightSelectors.getElementByCatchAll(
-        this._device,
-        'Search token',
-      );
-    } else {
-      // Android: Use testID
-      searchField = await AppwrightSelectors.getElementByID(
-        this._device,
-        'textfieldsearch',
-      );
-    }
-    await searchField.fill(tokenName);
-  }
-
-  async tapEthereumFilter() {
-    // Dismiss keyboard before tapping filter
-    await AppwrightGestures.hideKeyboard(this._device);
-    const ethereumFilter = await AppwrightSelectors.getElementByCatchAll(
-      this._device,
-      'Ethereum',
-    );
-    // Wait for keyboard to be fully dismissed and element to be visible
-    await appwrightExpect(ethereumFilter).toBeVisible({ timeout: 15000 });
-    if (AppwrightSelectors.isIOS(this._device)) {
-      // iOS: Use double tap for more reliable interaction
-      await ethereumFilter.tap();
-      await ethereumFilter.tap();
-    } else {
-      await ethereumFilter.tap();
-    }
-  }
-
-  async tapFirstUsdc(tokenName) {
-    const usdcElement = await AppwrightSelectors.getElementByText(
-      this._device,
-      tokenName,
-    );
-    await AppwrightGestures.tap(usdcElement);
-  }
-
-  async fillUsdAmount(amount) {
-    // Tap on the amount display to activate it
-    await AppwrightGestures.tap(await this.amountInput);
-
-    // Type the amount using the keypad with platform-specific selectors
-    const amountString = String(amount);
-    for (const digit of amountString) {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        // Android: Use content-desc for number buttons, text for decimal point
-        const xpath =
-          digit === '.'
-            ? `//android.view.View[@text="."]`
-            : `//android.widget.Button[@content-desc='${digit}']`;
-        const keypadButton = await AppwrightSelectors.getElementByXpath(
-          this._device,
-          xpath,
-        );
-        await appwrightExpect(keypadButton).toBeVisible({ timeout: 15000 });
-        await AppwrightGestures.tap(keypadButton);
-      } else {
-        // iOS: Use XCUIElementTypeButton with name attribute
-        const keypadButton = await AppwrightSelectors.getElementByXpath(
-          this._device,
-          `//XCUIElementTypeButton[@name="${digit}"]`,
-        );
-        await appwrightExpect(keypadButton).toBeVisible({ timeout: 15000 });
-        await AppwrightGestures.tap(keypadButton);
-      }
-    }
-  }
-
-  async tapPayWith() {
-    await AppwrightGestures.tap(await this.payWithButton);
-  }
-
-  async tapContinue() {
-    await AppwrightGestures.tap(await this.continueButton);
-  }
-
-  async tapCancel() {
-    await AppwrightGestures.tap(await this.cancelButton);
-  }
-}
-
-export default new PredictDepositScreen();
-
-
diff --git a/wdio/screen-objects/PredictDetailsScreen.js b/wdio/screen-objects/PredictDetailsScreen.js
deleted file mode 100644
index 6753efe0805..00000000000
--- a/wdio/screen-objects/PredictDetailsScreen.js
+++ /dev/null
@@ -1,189 +0,0 @@
-import Selectors from '../helpers/Selectors';
-import Gestures from '../helpers/Gestures';
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import {
-  PredictMarketDetailsSelectorsIDs,
-  PredictMarketDetailsSelectorsText,
-} from '../../app/components/UI/Predict/Predict.testIds';
-import { expect as appwrightExpect } from 'appwright';
-
-const TAB_BAR_TAB_ID_PREFIX = 'predict-market-details-tab-bar-tab';
-
-class PredictDetailsScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get container() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(PredictMarketDetailsSelectorsIDs.SCREEN);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, PredictMarketDetailsSelectorsIDs.SCREEN);
-    }
-  }
-
-  get backButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(PredictMarketDetailsSelectorsIDs.BACK_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, PredictMarketDetailsSelectorsIDs.BACK_BUTTON);
-    }
-  }
-
-  get aboutTab() {
-    if (!this._device) {
-      return Selectors.getXpathElementByText(PredictMarketDetailsSelectorsText.ABOUT_TAB_TEXT);
-    }
-    // Tab bar tab ID varies (tab-0, tab-1, tab-2); find by ID prefix + text
-    const text = PredictMarketDetailsSelectorsText.ABOUT_TAB_TEXT;
-    const xpath = AppwrightSelectors.isAndroid(this._device)
-      ? `//*[contains(@resource-id,'${TAB_BAR_TAB_ID_PREFIX}') and (@text='${text}' or @content-desc='${text}')]`
-      : `//*[contains(@name,'${TAB_BAR_TAB_ID_PREFIX}') and (@label='${text}' or contains(@label,'${text}'))]`;
-    return AppwrightSelectors.getElementByXpath(this._device, xpath);
-  }
-
-  get positionsTab() {
-    if (!this._device) {
-      return Selectors.getXpathElementByText(PredictMarketDetailsSelectorsText.POSITIONS_TAB_TEXT);
-    }
-    const text = PredictMarketDetailsSelectorsText.POSITIONS_TAB_TEXT;
-    const xpath = AppwrightSelectors.isAndroid(this._device)
-      ? `//*[contains(@resource-id,'${TAB_BAR_TAB_ID_PREFIX}') and (@text='${text}' or @content-desc='${text}')]`
-      : `//*[contains(@name,'${TAB_BAR_TAB_ID_PREFIX}') and (@label='${text}' or contains(@label,'${text}'))]`;
-    return AppwrightSelectors.getElementByXpath(this._device, xpath);
-  }
-
-  get outcomesTab() {
-    if (!this._device) {
-      return Selectors.getXpathElementByText(PredictMarketDetailsSelectorsText.OUTCOMES_TAB_TEXT);
-    }
-    const text = PredictMarketDetailsSelectorsText.OUTCOMES_TAB_TEXT;
-    const xpath = AppwrightSelectors.isAndroid(this._device)
-      ? `//*[contains(@resource-id,'${TAB_BAR_TAB_ID_PREFIX}') and (@text='${text}' or @content-desc='${text}')]`
-      : `//*[contains(@name,'${TAB_BAR_TAB_ID_PREFIX}') and (@label='${text}' or contains(@label,'${text}'))]`;
-    return AppwrightSelectors.getElementByXpath(this._device, xpath);
-  }
-
-  get aboutTabContent() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(PredictMarketDetailsSelectorsIDs.ABOUT_TAB);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, PredictMarketDetailsSelectorsIDs.ABOUT_TAB);
-    }
-  }
-
-  get outcomesTabContent() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(PredictMarketDetailsSelectorsIDs.OUTCOMES_TAB);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, PredictMarketDetailsSelectorsIDs.OUTCOMES_TAB);
-    }
-  }
-
-  async isVisible() {
-    if (!this._device) {
-      const container = await this.container;
-      await container.waitForDisplayed();
-    } else {
-      const container = await this.container;
-      await appwrightExpect(container).toBeVisible();
-    }
-  }
-
-  async tapBackButton() {
-    if (!this._device) {
-      const backButton = await this.backButton;
-      await Gestures.waitAndTap(backButton);
-    } else {
-      await AppwrightGestures.tap(await this.backButton);
-    }
-  }
-
-  async tapAboutTab() {
-    if (!this._device) {
-      const aboutTab = await this.aboutTab;
-      await Gestures.waitAndTap(aboutTab);
-    } else {
-      await AppwrightGestures.tap(await this.aboutTab);
-    }
-  }
-
-  async tapPositionsTab() {
-    if (!this._device) {
-      const positionsTab = await this.positionsTab;
-      await Gestures.waitAndTap(positionsTab);
-    } else {
-      await AppwrightGestures.tap(await this.positionsTab);
-    }
-  }
-
-  /**
-   * Returns true if the Outcomes tab is visible (market has multiple outcomes).
-   * Yes/No-only markets do not show the Outcomes tab.
-   */
-  async hasOutcomesTab() {
-    if (!this._device) {
-      try {
-        const outcomesTab = await this.outcomesTab;
-        await outcomesTab.waitForDisplayed({ timeout: 2000 });
-        return true;
-      } catch {
-        return false;
-      }
-    }
-    try {
-      const outcomesTab = await this.outcomesTab;
-      await appwrightExpect(outcomesTab).toBeVisible({ timeout: 2000 });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  async tapOutcomesTab() {
-    if (!this._device) {
-      const outcomesTab = await this.outcomesTab;
-      await Gestures.waitAndTap(outcomesTab);
-    } else {
-      await AppwrightGestures.tap(await this.outcomesTab);
-    }
-  }
-
-  async isAboutTabContentDisplayed() {
-    if (!this._device) {
-      const aboutTabContent = await this.aboutTabContent;
-      await aboutTabContent.waitForDisplayed();
-    } else {
-      const aboutTabContent = await this.aboutTabContent;
-      await appwrightExpect(aboutTabContent).toBeVisible();
-    }
-  }
-
-  async isOutcomesTabContentDisplayed() {
-    if (!this._device) {
-      const outcomesTabContent = await this.outcomesTabContent;
-      await outcomesTabContent.waitForDisplayed();
-    } else {
-      const outcomesTabContent = await this.outcomesTabContent;
-      await appwrightExpect(outcomesTabContent).toBeVisible();
-    }
-  }
-
-  async verifyVolumeTextDisplayed() {
-    if (!this._device) {
-      const volumeText = await Selectors.getXpathElementByText('Volume');
-      await volumeText.waitForDisplayed();
-    } else {
-      const volumeText = await AppwrightSelectors.getElementByText(this._device, 'Volume');
-      await appwrightExpect(volumeText).toBeVisible();
-    }
-  }
-}
-
-export default new PredictDetailsScreen();
diff --git a/wdio/screen-objects/PredictMarketListScreen.js b/wdio/screen-objects/PredictMarketListScreen.js
deleted file mode 100644
index 4a3ae4834d3..00000000000
--- a/wdio/screen-objects/PredictMarketListScreen.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import Selectors from '../helpers/Selectors';
-import Gestures from '../helpers/Gestures';
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { PredictMarketListSelectorsIDs, getPredictMarketListSelector, PredictBalanceSelectorsIDs } from '../../app/components/UI/Predict/Predict.testIds';
-import { expect as appwrightExpect } from 'appwright';
-
-class PredictMarketListScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get container() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(PredictMarketListSelectorsIDs.CONTAINER);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, PredictMarketListSelectorsIDs.CONTAINER);
-    }
-  }
-
-  get categoryTabs() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(PredictMarketListSelectorsIDs.CATEGORY_TABS);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, PredictMarketListSelectorsIDs.CATEGORY_TABS);
-    }
-  }
-
-  get emptyState() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(PredictMarketListSelectorsIDs.EMPTY_STATE);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, PredictMarketListSelectorsIDs.EMPTY_STATE);
-    }
-  }
-
-  getMarketCard(category = 'trending', cardIndex = 1) {
-    const marketCardId = getPredictMarketListSelector.marketCardByCategory(category, cardIndex);
-    if (!this._device) {
-      return Selectors.getElementByPlatform(marketCardId);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, marketCardId);
-    }
-  }
-
-  async isContainerDisplayed() {
-    if (!this._device) {
-      const container = await this.container;
-      await container.waitForDisplayed();
-    } else {
-      const container = await this.container;
-      await appwrightExpect(container).toBeVisible();
-    }
-  }
-
-  async tapMarketCard(category = 'trending', cardIndex = 1) {
-    if (!this._device) {
-      const marketCard = await this.getMarketCard(category, cardIndex);
-      await Gestures.waitAndTap(marketCard);
-    } else {
-      const marketCard = await this.getMarketCard(category, cardIndex);
-      await AppwrightGestures.tap(marketCard);
-    }
-  }
-
-  async tapCategoryTab(category) {
-    const categoryLabels = {
-      trending: 'Trending',
-      new: 'New',
-      sports: 'Sports',
-      crypto: 'Crypto',
-      politics: 'Politics',
-    };
-
-    if (!this._device) {
-      const tabElement = await Selectors.getXpathElementByText(categoryLabels[category]);
-      await Gestures.waitAndTap(tabElement);
-    } else {
-      const tabElement = await AppwrightSelectors.getElementByText(this._device, categoryLabels[category]);
-      await AppwrightGestures.tap(tabElement);
-    }
-  }
-
-  async tapAddFundsButton() {
-    if (!this._device) {
-      const addFundsButton = await Selectors.getXpathElementByText('Add funds');
-      await Gestures.waitAndTap(addFundsButton);
-    } else {
-      const addFundsButton = await AppwrightSelectors.getElementByCatchAll(
-        this._device,
-        'Add funds',
-      );
-      await AppwrightGestures.tap(addFundsButton);
-    }
-  }
-
-  get balanceCard() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(PredictBalanceSelectorsIDs.BALANCE_CARD);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, PredictBalanceSelectorsIDs.BALANCE_CARD);
-    }
-  }
-
-  async isBalanceCardDisplayed() {
-    if (!this._device) {
-      const balanceCard = await this.balanceCard;
-      await balanceCard.waitForDisplayed();
-    } else {
-      const balanceCard = await this.balanceCard;
-      await appwrightExpect(balanceCard).toBeVisible();
-    }
-  }
-
-  async getAvailableBalanceText() {
-    if (!this._device) {
-      const balanceText = await Selectors.getXpathElementByText('Available balance');
-      await balanceText.waitForDisplayed();
-      return balanceText;
-    } else {
-      const balanceText = await AppwrightSelectors.getElementByCatchAll(
-        this._device,
-        'Available balance',
-      );
-      await appwrightExpect(balanceText).toBeVisible();
-      return balanceText;
-    }
-  }
-
-  async isAvailableBalanceDisplayed() {
-    if (!this._device) {
-      const balanceText = await Selectors.getXpathElementByText('Available balance');
-      await balanceText.waitForDisplayed();
-    } else {
-      const balanceText = await AppwrightSelectors.getElementByCatchAll(
-        this._device,
-        'Available balance',
-      );
-      await appwrightExpect(balanceText).toBeVisible();
-    }
-  }
-}
-
-export default new PredictMarketListScreen();
-
diff --git a/wdio/screen-objects/RNPlaygroundDapp.js b/wdio/screen-objects/RNPlaygroundDapp.js
deleted file mode 100644
index 998da73ccdd..00000000000
--- a/wdio/screen-objects/RNPlaygroundDapp.js
+++ /dev/null
@@ -1,379 +0,0 @@
-// Migrated to tests/page-objects/MMConnect/RNPlaygroundDapp.ts
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { PLAYGROUND_PACKAGE_ID } from '../../tests/framework/Constants.ts';
-import { expect } from 'appwright';
-
-/**
- * Replicates the escapeTestId function from @metamask/playground-ui
- * so generated test IDs match those set in the React Native playground.
- */
-function escapeTestId(value) {
-  return value
-    .toLowerCase()
-    .replace(/:/g, '-')
-    .replace(/\s+/g, '-')
-    .replace(/_/g, '-')
-    .replace(/[^a-z0-9-]/g, '');
-}
-
-/**
- * Page Object for the React Native playground app (@metamask/react-native-playground).
- *
- * This is a standalone native APK installed alongside the MetaMask wallet.
- * Elements are accessed via testID (resource-id on Android) using getElementByID,
- * NOT via data-testid/XPath like the browser playground.
- */
-class RNPlaygroundDapp {
-  constructor() {
-    this._device = null;
-  }
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  _getByTestId(testId) {
-    if (!this._device) return null;
-    return AppwrightSelectors.getElementByID(this._device, testId);
-  }
-
-  // ============================================================
-  // APP-LEVEL SELECTORS
-  // ============================================================
-
-  get appContainer() {
-    return this._getByTestId('app-container');
-  }
-
-  get appTitle() {
-    return this._getByTestId('app-title');
-  }
-
-  get connectButton() {
-    return this._getByTestId('app-btn-connect');
-  }
-
-  get disconnectButton() {
-    return this._getByTestId('app-btn-disconnect');
-  }
-
-  get scopesSection() {
-    return this._getByTestId('app-section-scopes');
-  }
-
-  get errorSection() {
-    return this._getByTestId('app-section-error');
-  }
-
-  get connectLegacyButton() {
-    return this._getByTestId('app-btn-connect-legacy');
-  }
-
-  // ============================================================
-  // LEGACY EVM CARD SELECTORS
-  // ============================================================
-
-  get legacyEvmCard() {
-    return this._getByTestId('legacy-evm-card');
-  }
-
-  get legacyEvmChainIdValue() {
-    return this._getByTestId('legacy-evm-chain-id-value');
-  }
-
-  get legacyEvmAccountsValue() {
-    return this._getByTestId('legacy-evm-accounts-value');
-  }
-
-  get legacyEvmActiveAccount() {
-    return this._getByTestId('legacy-evm-active-account');
-  }
-
-  get legacyEvmResponseText() {
-    return this._getByTestId('legacy-evm-response-text');
-  }
-
-  get legacyEvmBtnPersonalSign() {
-    return this._getByTestId('legacy-evm-btn-personal-sign');
-  }
-
-  get legacyEvmBtnSendTransaction() {
-    return this._getByTestId('legacy-evm-btn-send-transaction');
-  }
-
-  get legacyEvmBtnSwitchPolygon() {
-    return this._getByTestId('legacy-evm-btn-switch-polygon');
-  }
-
-  // ============================================================
-  // NETWORK CHECKBOX SELECTORS
-  // ============================================================
-
-  getNetworkCheckbox(caipChainId) {
-    return this._getByTestId(
-      `dynamic-inputs-checkbox-${escapeTestId(caipChainId)}`,
-    );
-  }
-
-  // ============================================================
-  // SCOPE CARD SELECTORS
-  // ============================================================
-
-  getScopeCard(scope) {
-    return this._getByTestId(`scope-card-${escapeTestId(scope)}`);
-  }
-
-  getScopeNetworkName(scope) {
-    return this._getByTestId(
-      `scope-card-network-name-${escapeTestId(scope)}`,
-    );
-  }
-
-  getMethodSelect(scope) {
-    return this._getByTestId(
-      `scope-card-method-select-${escapeTestId(scope)}`,
-    );
-  }
-
-  getInvokeButton(scope) {
-    return this._getByTestId(
-      `scope-card-invoke-btn-${escapeTestId(scope)}`,
-    );
-  }
-
-  getResultCode(scope, method, index = 0) {
-    const escapedScope = escapeTestId(scope);
-    const escapedMethod = escapeTestId(method);
-    return this._getByTestId(
-      `scope-card-result-code-${escapedScope}-${escapedMethod}-${index}`,
-    );
-  }
-
-  getResultStatus(scope, method, index = 0) {
-    const escapedScope = escapeTestId(scope);
-    const escapedMethod = escapeTestId(method);
-    return this._getByTestId(
-      `scope-card-result-status-${escapedScope}-${escapedMethod}-${index}`,
-    );
-  }
-
-  // ============================================================
-  // APP SWITCHING
-  // ============================================================
-
-  async switchToPlayground() {
-    if (!this._device) return;
-    await this._device.activateApp(PLAYGROUND_PACKAGE_ID);
-    await new Promise((r) => setTimeout(r, 1000));
-  }
-
-  async waitForPlaygroundReady(timeoutMs = 15000) {
-    if (!this._device) return;
-    const container = await this.appContainer;
-    await expect(container).toBeVisible({ timeout: timeoutMs });
-  }
-
-  /**
-   * Ensure we are in the playground. If the app-container is not visible
-   * (e.g. MetaMask is still in the foreground), switch to the playground
-   * via activateApp and wait for it.
-   * Uses app-container rather than app-title because the title can be
-   * scrolled out of the React Native render tree while app-container
-   * sits outside the ScrollView and is always present.
-   */
-  async ensureInPlayground() {
-    if (!this._device) return;
-    try {
-      const container = await this.appContainer;
-      await expect(container).toBeVisible({ timeout: 3000 });
-    } catch {
-      await this.switchToPlayground();
-      await this.waitForPlaygroundReady();
-    }
-  }
-
-  // ============================================================
-  // ACTIONS
-  // ============================================================
-
-  async tapNetworkCheckbox(caipChainId) {
-    if (!this._device) return;
-    const elem = await this.getNetworkCheckbox(caipChainId);
-    await AppwrightGestures.tap(elem);
-  }
-
-  async tapConnect() {
-    if (!this._device) return;
-    const elem = await this.connectButton;
-    await AppwrightGestures.tap(elem);
-  }
-
-  async tapConnectLegacy() {
-    if (!this._device) return;
-    const elem = await this.connectLegacyButton;
-    await AppwrightGestures.tap(elem);
-  }
-
-  async tapLegacyEvmButton(buttonPromise) {
-    if (!this._device) return;
-    const elem = await buttonPromise;
-    await AppwrightGestures.tap(elem);
-  }
-
-  async tapDisconnect() {
-    if (!this._device) return;
-    const elem = await this.disconnectButton;
-    await AppwrightGestures.tap(elem);
-  }
-
-  /**
-   * Select a method from the Picker dropdown on a scope card.
-   * Taps the picker to open the native dropdown, scrolls within the dropdown
-   * if needed to find the option, then taps it.
-   */
-  async selectMethod(scope, methodName, maxScrollAttempts = 10) {
-    if (!this._device) return;
-    const picker = await this.getMethodSelect(scope);
-    await AppwrightGestures.tap(picker);
-    await new Promise((r) => setTimeout(r, 500));
-
-    const webDriverClient = this._device.webDriverClient;
-
-    for (let attempt = 0; attempt < maxScrollAttempts; attempt++) {
-      try {
-        const option = await AppwrightSelectors.getElementByText(
-          this._device,
-          methodName,
-          true,
-        );
-        const isVisible = await option.isVisible({ timeout: 1500 });
-        if (isVisible) {
-          await AppwrightGestures.tap(option);
-          await new Promise((r) => setTimeout(r, 500));
-          return;
-        }
-      } catch {
-        // Option not found or not visible yet
-      }
-
-      // Swipe down inside the dropdown to scroll content up, revealing
-      // items near the top of the list (e.g. personal_sign).
-      await webDriverClient.executeScript('mobile: swipeGesture', [
-        {
-          left: 100,
-          top: 400,
-          width: 600,
-          height: 600,
-          direction: 'down',
-          percent: 0.3,
-        },
-      ]);
-      await new Promise((r) => setTimeout(r, 300));
-    }
-
-    throw new Error(
-      `Method "${methodName}" not found in picker after ${maxScrollAttempts} scroll attempts`,
-    );
-  }
-
-  async tapInvoke(scope) {
-    if (!this._device) return;
-    const elem = await this.getInvokeButton(scope);
-    await AppwrightGestures.tap(elem);
-  }
-
-  /**
-   * Scroll until the given element promise becomes visible.
-   * @param {Promise<AppwrightLocator>} elemPromise
-   * @param {object} options - Passed to AppwrightGestures.scrollIntoView
-   */
-  async scrollToElement(elemPromise, options = {}) {
-    if (!this._device) return;
-    await AppwrightGestures.scrollIntoView(this._device, elemPromise, options);
-  }
-
-  // ============================================================
-  // ASSERTIONS
-  // ============================================================
-
-  async assertConnected() {
-    if (!this._device) return;
-    const scopes = await this.scopesSection;
-    await expect(scopes).toBeVisible({ timeout: 15000 });
-  }
-
-  async assertDisconnected() {
-    if (!this._device) return;
-    const btn = await this.connectButton;
-    await expect(btn).toBeVisible({ timeout: 15000 });
-  }
-
-  async assertScopeCardVisible(scope, timeoutMs = 10000) {
-    if (!this._device) return;
-    const card = await this.getScopeCard(scope);
-    await expect(card).toBeVisible({ timeout: timeoutMs });
-  }
-
-  /**
-   * Wait for a result code element to appear for a given scope/method.
-   */
-  async waitForResult(scope, method, index = 0, timeoutMs = 15000) {
-    if (!this._device) return;
-    const code = await this.getResultCode(scope, method, index);
-    await expect(code).toBeVisible({ timeout: timeoutMs });
-  }
-
-  async assertLegacyEvmConnected(timeoutMs = 15000) {
-    if (!this._device) return;
-    const card = await this.legacyEvmCard;
-    await expect(card).toBeVisible({ timeout: timeoutMs });
-  }
-
-  async assertLegacyEvmHasAccounts(timeoutMs = 10000) {
-    if (!this._device) return;
-    const accounts = await this.legacyEvmAccountsValue;
-    await expect(accounts).toBeVisible({ timeout: timeoutMs });
-  }
-
-  async assertLegacyEvmActiveAccount(timeoutMs = 10000) {
-    if (!this._device) return;
-    const activeAcct = await this.legacyEvmActiveAccount;
-    await expect(activeAcct).toBeVisible({ timeout: timeoutMs });
-  }
-
-  async getLegacyEvmChainId() {
-    if (!this._device) return null;
-    const chainIdElem = await this.legacyEvmChainIdValue;
-    return await chainIdElem.getText();
-  }
-
-  async getLegacyEvmResponseText() {
-    if (!this._device) return null;
-    const resp = await this.legacyEvmResponseText;
-    return await resp.getText();
-  }
-
-  /**
-   * Assert the result code text contains the expected substring.
-   */
-  async assertResultCodeContains(
-    scope,
-    method,
-    expectedText,
-    index = 0,
-    timeoutMs = 15000,
-  ) {
-    if (!this._device) return;
-    const code = await this.getResultCode(scope, method, index);
-    await expect(code).toBeVisible({ timeout: timeoutMs });
-    const text = await code.getText();
-    expect(text).toContain(expectedText);
-  }
-}
-
-export default new RNPlaygroundDapp();
diff --git a/wdio/screen-objects/RequestTokenScreen.js b/wdio/screen-objects/RequestTokenScreen.js
deleted file mode 100644
index e9f9a47aed6..00000000000
--- a/wdio/screen-objects/RequestTokenScreen.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import Selectors from '../helpers/Selectors';
-import Gestures from '../helpers/Gestures';
-import { RequestPaymentViewSelectors } from '../../app/components/UI/ReceiveRequest/RequestPaymentView.testIds';
-
-class RequestTokenScreen {
-  get requestAmount() {
-    return Selectors.getElementByPlatform(RequestPaymentViewSelectors.REQUEST_AMOUNT_INPUT_BOX_ID);
-  }
-
-  get requestSearchInput() {
-    return Selectors.getElementByPlatform(RequestPaymentViewSelectors.TOKEN_SEARCH_INPUT_BOX);
-  }
-
-  get requestSearchBackButton() {
-    return Selectors.getElementByPlatform(RequestPaymentViewSelectors.BACK_BUTTON_ID);
-  }
-
-  get requestSearchScreen() {
-    return Selectors.getElementByPlatform(RequestPaymentViewSelectors.REQUEST_PAYMENT_CONTAINER_ID);
-  }
-
-  async typeAmountInRequest(amount) {
-    await Gestures.setValueWithoutTap(this.requestAmount, amount);
-  }
-
-  async isTextElementDisplayed(text) {
-    await expect(Selectors.getXpathElementByText(text)).toBeDisplayed();
-  }
-
-  async isTextElementNotDisplayed(text) {
-    await expect(Selectors.getXpathElementByText(text)).not.toBeDisplayed();
-  }
-
-  async inputSearchRequestField(searchRequest) {
-    await Gestures.typeText(this.requestSearchInput, searchRequest);
-  }
-
-  async tapBackButtonOnSearch() {
-    await Gestures.tap(this.requestSearchBackButton);
-  }
-
-  async searchResultsIsVisible() {
-    expect(await this.requestSearchScreen).toBeDisplayed();
-  }
-}
-
-export default new RequestTokenScreen();
diff --git a/wdio/screen-objects/RevealSecretRecoveryPhraseScreen.js b/wdio/screen-objects/RevealSecretRecoveryPhraseScreen.js
deleted file mode 100644
index 17697e09058..00000000000
--- a/wdio/screen-objects/RevealSecretRecoveryPhraseScreen.js
+++ /dev/null
@@ -1,3 +0,0 @@
-class RevealSecretRecoveryPhraseScreen {}
-
-export default new RevealSecretRecoveryPhraseScreen();
diff --git a/wdio/screen-objects/SecurityAndPrivacyScreen.js b/wdio/screen-objects/SecurityAndPrivacyScreen.js
deleted file mode 100644
index adccd7e7ea1..00000000000
--- a/wdio/screen-objects/SecurityAndPrivacyScreen.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import Gestures from '../helpers/Gestures';
-import Selectors from '../helpers/Selectors';
-import {
-  SECURITY_PRIVACY_DELETE_WALLET_BUTTON,
-  SECURITY_PRIVACY_REMEMBER_ME_TOGGLE,
-  SECURITY_PRIVACY_VIEW_ID,
-} from './testIDs/Screens/SecurityPrivacy.testIds';
-
-class SecurityAndPrivacyScreen {
-  get rememberMeToggle() {
-    return Selectors.getElementByPlatform(SECURITY_PRIVACY_REMEMBER_ME_TOGGLE);
-  }
-
-  get container() {
-    return Selectors.getElementByPlatform(SECURITY_PRIVACY_VIEW_ID);
-  }
-
-  get deleteWalletButton() {
-    return Selectors.getElementByPlatform(
-      SECURITY_PRIVACY_DELETE_WALLET_BUTTON,
-    );
-  }
-
-  async tapChangePassword() {
-    await Gestures.swipe({ x: 200, y: 1000 }, { x: 200, y: 200 });
-    await Gestures.tapTextByXpath('Change password');
-  }
-
-  async isChangePasswordTextVisible(text) {
-    const changePasswordText = await Selectors.getXpathElementByText(text);
-    await expect(changePasswordText).toBeDisplayed();
-  }
-
-  async tapRememberToggle() {
-    const element = await this.rememberMeToggle;
-    while (!(await element.isDisplayed())) {
-      await Gestures.swipeUp();
-    }
-
-    await Gestures.waitAndTap(element);
-  }
-
-  async tapDeleteWalletButton() {
-    const element = await this.deleteWalletButton;
-    while (!(await element.isDisplayed())) {
-      await Gestures.swipeUp(0.75);
-    }
-
-    await Gestures.waitAndTap(element);
-  }
-
-  async tapToskipVideo() {
-    await this.isScreenDisplayed();
-    await driver.pause(1000);
-    await Gestures.tapByCoordinatesPercentage(12.3, 48);
-    await driver.pause(1000);
-    await Gestures.tapByCoordinatesPercentage(12.3, 48);
-  }
-
-  async isRememberMeToggle(value) {
-    await expect(this.rememberMeToggle).toHaveText(value);
-    await driver.pause(1000);
-  }
-
-  async isScreenDisplayed() {
-    const element = await this.container;
-    await element.waitForDisplayed({ interval: 1000 });
-  }
-}
-
-export default new SecurityAndPrivacyScreen();
diff --git a/wdio/screen-objects/SendLinkScreen.js b/wdio/screen-objects/SendLinkScreen.js
deleted file mode 100644
index 00ec8db3265..00000000000
--- a/wdio/screen-objects/SendLinkScreen.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Selectors from '../helpers/Selectors';
-import Gestures from '../helpers/Gestures';
-import { SendLinkViewSelectorsIDs } from '../../app/components/UI/ReceiveRequest/SendLinkView.testIds';
-
-class SendLinkScreen {
-  get requestCloseButton() {
-    return Selectors.getElementByPlatform(SendLinkViewSelectorsIDs.CLOSE_SEND_LINK_VIEW_BUTTON);
-  }
-
-  get closeRequestPaymentQRIcon() {
-    return Selectors.getElementByPlatform(SendLinkViewSelectorsIDs.CLOSE_QR_MODAL_BUTTON);
-  }
-
-  async closePaymentRequest() {
-    await Gestures.tap(this.requestCloseButton);
-  }
-
-  async closeQRPayment() {
-    await Gestures.tap(this.closeRequestPaymentQRIcon);
-  }
-}
-
-export default new SendLinkScreen();
diff --git a/wdio/screen-objects/SendSolanaScreen.js b/wdio/screen-objects/SendSolanaScreen.js
deleted file mode 100644
index 1c2b6d0ecf2..00000000000
--- a/wdio/screen-objects/SendSolanaScreen.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-import TimerHelper from '../../tests/framework/TimerHelper';
-import { SendActionViewSelectorsIDs } from '../../tests/selectors/SendFlow/SendActionView.selectors';
-
-class SendSolanaScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-
-  get addressField() {
-    if (AppwrightSelectors.isAndroid(this._device)) {
-      return AppwrightSelectors.getElementByID(this._device, SendActionViewSelectorsIDs.SOLANA_INPUT_ADDRESS_FIELD);
-    }
-    return AppwrightSelectors.getElementByID(this._device, 'textfield');
-  }
-
-  get amountField() {
-    if (AppwrightSelectors.isAndroid(this._device)) {
-      return AppwrightSelectors.getElementByID(this._device, SendActionViewSelectorsIDs.SOLANA_INPUT_AMOUNT_FIELD);
-    }
-    return AppwrightSelectors.getElementByXpath(this._device, '(//XCUIElementTypeOther[@name="textfield"])[2]');
-  }
-
-  get continueButton() {
-    return AppwrightSelectors.getElementByID(this._device, SendActionViewSelectorsIDs.CONTINUE_BUTTON);
-  }
-
-  get cancelButton() {
-    return AppwrightSelectors.getElementByID(this._device, SendActionViewSelectorsIDs.CANCEL_BUTTON);
-  }
-
-  async isAddressFieldVisible() {
-    const element = await this.addressField;
-    await appwrightExpect(element).toBeVisible();
-  }
-
-  async fillAddressField(address) {
-    const element = await this.addressField;
-    if (AppwrightSelectors.isIOS(this._device)) {
-      await AppwrightGestures.typeText(element, `${address}\n`);
-    } else{
-      await AppwrightGestures.typeText(element, `${address}`);
-    }
-  }
-
-  async fillAmountField(amount) {
-    const element = await this.amountField;
-    await AppwrightGestures.typeText(element, amount);
-    const continueButton = await this.continueButton;
-    await appwrightExpect(continueButton).toBeVisible({ timeout: 10000 });
-  }
-
-  async tapContinueButton() {
-    await this._device.waitForTimeout(5000); //workaroud for the button to become clickable
-    const continueButton = await this.continueButton;
-    await appwrightExpect(continueButton).toBeVisible({ timeout: 10000 });
-    const timer1 = new TimerHelper(
-      'Time since the user is on the send amount screen until the user gets the confirmation screen',
-    );
-    timer1.start();
-    await continueButton.tap();
-    return timer1;
-  }
-
-  async tapCancelButton() {
-    const element = await this.cancelButton;
-    await element.tap();
-  }
-}
-
-export default new SendSolanaScreen();
diff --git a/wdio/screen-objects/SettingsScreen.js b/wdio/screen-objects/SettingsScreen.js
deleted file mode 100644
index 5eb92320a6c..00000000000
--- a/wdio/screen-objects/SettingsScreen.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Selectors from '../helpers/Selectors';
-import { LOCK_SETTINGS } from './testIDs/Screens/Settings.testIds';
-import Gestures from '../helpers/Gestures';
-import { SettingsViewSelectorsIDs } from '../../app/components/Views/Settings/SettingsView.testIds';
-
-class SettingsScreen {
-  get lockOption() {
-    return Selectors.getElementByPlatform(LOCK_SETTINGS);
-  }
-
-  get generalSettings() {
-    return Selectors.getXpathElementByResourceId(
-      SettingsViewSelectorsIDs.GENERAL,
-    );
-  }
-
-  async waitForDisplay() {
-    const element = await this.generalSettings;
-    await element.waitForDisplayed();
-  }
-
-  async tapLockOption() {
-    const lockOption = await this.lockOption;
-    while (!(await lockOption.isDisplayed())) {
-      await Gestures.swipeUp();
-    }
-
-    await Gestures.waitAndTap(lockOption);
-  }
-}
-
-export default new SettingsScreen();
diff --git a/wdio/screen-objects/SolanaConfirmationScreen.js b/wdio/screen-objects/SolanaConfirmationScreen.js
deleted file mode 100644
index 00a04c0a284..00000000000
--- a/wdio/screen-objects/SolanaConfirmationScreen.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import { expect as appwrightExpect } from 'appwright';
-import { SendActionViewSelectorsIDs } from '../../tests/selectors/SendFlow/SendActionView.selectors';
-
-class SolanaConfirmationScreen {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get field() {
-    return AppwrightSelectors.getElementByID(this._device, 'snap-ui-info-row');
-  }
-
-  get confirmButton() {
-    return AppwrightSelectors.getElementByID(this._device, SendActionViewSelectorsIDs.SEND_TRANSACTION_BUTTON);
-  }
-
-  async isFieldVisible() {
-    const field = await this.field;
-    await appwrightExpect(field).toBeVisible();
-  }
-
-  async isConfirmButtonDisplayed() {
-    const confirmButton = await this.confirmButton;
-    await appwrightExpect(confirmButton).toBeVisible({ timeout: 10000 });
-  }
-}
-
-export default new SolanaConfirmationScreen();
diff --git a/wdio/screen-objects/SwapScreen.js b/wdio/screen-objects/SwapScreen.js
deleted file mode 100644
index f363a0947c4..00000000000
--- a/wdio/screen-objects/SwapScreen.js
+++ /dev/null
@@ -1,128 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { SWAP_SCREEN_DESTINATION_TOKEN_INPUT_ID, SWAP_SCREEN_QUOTE_DISPLAYED_ID, SWAP_SCREEN_SOURCE_TOKEN_INPUT_ID } from './testIDs/Screens/SwapScreen.testIds';
-import { expect as appwrightExpect } from 'appwright';
-import { PerpsWithdrawViewSelectorsIDs } from '../../app/components/UI/Perps/Perps.testIds';
-import { QuoteViewSelectorIDs,QuoteViewSelectorText } from '../../app/components/UI/Swaps/QuoteView.testIds';
-import { SwapsViewSelectorsIDs } from '../../app/components/UI/Swaps/SwapsView.testIds';
-import { splitAmountIntoDigits } from '../utils/splitAmountIntoDigits';
-
-class SwapScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-
-  }
-  get sourceTokenInput() {
-    return AppwrightSelectors.getElementByID(this._device, SWAP_SCREEN_SOURCE_TOKEN_INPUT_ID);
-  }
-
-  get destTokenInput() {
-    return AppwrightSelectors.getElementByID(this._device, SWAP_SCREEN_DESTINATION_TOKEN_INPUT_ID);
-  }
-
-  get quoteDisplayed() {
-    return AppwrightSelectors.getElementByID(this._device, SWAP_SCREEN_QUOTE_DISPLAYED_ID);
-  }
-  get destinationTokenArea(){
-    return AppwrightSelectors.getElementByID(this._device, PerpsWithdrawViewSelectorsIDs.DEST_TOKEN_AREA);
-
-  }
-  get seeAllDropDown(){
-    return AppwrightSelectors.getElementByText(this._device, "See all");
-
-  }
-
-  get getETHQuotesButton(){
-    return AppwrightSelectors.getElementByText(this._device, QuoteViewSelectorText.GET_QUOTES);
-  }
-
-  async isQuoteDisplayed(network) {
-    if (network == 'Ethereum'){ // legacy swap view only shows on etheruem network
-      const mmFee = await AppwrightSelectors.getElementByID(this._device, SwapsViewSelectorsIDs.QUOTE_SUMMARY);
-      await appwrightExpect(mmFee).toBeVisible({ timeout: 10000 });
-
-    }
-    else{
-      const element = await this.quoteDisplayed; // bridge swap view shows on
-      await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-      const mmFee = await AppwrightSelectors.getElementByCatchAll(this._device, QuoteViewSelectorText.FEE_DISCLAIMER);
-      await appwrightExpect(mmFee).toBeVisible({ timeout: 10000 });
-    }
-
-  }
-
-  async enterSourceTokenAmount(amount) {
-    // Split amount into digits
-    const digits = splitAmountIntoDigits(amount);
-    console.log('Amount digits:', digits);
-    digits.forEach(async digit => {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        if (digit != '.') {
-          const numberKey = await AppwrightSelectors.getElementByXpath(this._device, `//android.widget.Button[@content-desc='${digit}']`);
-          await numberKey.tap();
-        }
-        else {
-          const numberKey = await AppwrightSelectors.getElementByXpath(this._device, `//android.view.ViewGroup[@content-desc="."]`);
-          await numberKey.tap();
-        }
-      }
-      else {
-        const numberKey = await AppwrightSelectors.getElementByXpath(this._device, `//XCUIElementTypeButton[@name="${digit}"]`);
-        await numberKey.tap();
-      }
-    });
-  }
-
-  async selectNetworkAndTokenTo(network, token) {
-    let tokenButton;
-
-    if (network == 'Ethereum'){
-      const tokenDropDown = await AppwrightSelectors.getElementByID(this._device, QuoteViewSelectorIDs.DEST_TOKEN)
-      await tokenDropDown.tap();
-      if (AppwrightSelectors.isIOS(this._device)){
-        tokenButton = await AppwrightSelectors.getElementByText(this._device, `${token} ${token}`);
-        await tokenButton.tap();
-      }
-      else {
-        tokenButton = await AppwrightSelectors.getElementByCatchAll(this._device, token);
-        await tokenButton.tap();
-
-        }
-      }
-    else {
-      const destinationToken = await this.destinationTokenArea;
-      await destinationToken.tap();
-      const selectAllDropDown = await this.seeAllDropDown;
-      await selectAllDropDown.tap();
-      const networkName = await AppwrightSelectors.getElementByText(this._device, network);
-      await networkName.tap();
-      const tokenButton = await AppwrightSelectors.getElementByText(this._device, token);
-      await tokenButton.tap();
-    }
-
-  }
-
-  async tapGetQuotes(network){
-    if (network == 'Ethereum'){
-    const quotesButton = await this.getETHQuotesButton;
-    await appwrightExpect(quotesButton).toBeVisible({ timeout: 10000 });
-    await quotesButton.tap();
-    }
-  }
-
-  async enterDestinationTokenAmount(amount) {
-    await AppwrightGestures.typeText(await this.destTokenInput, amount);
-  }
-
-  async isVisible() {
-    const element = await this.sourceTokenInput;
-    await appwrightExpect(element).toBeVisible({ timeout: 10000 });
-  }
-}
-
-export default new SwapScreen();
diff --git a/wdio/screen-objects/TokenOverviewScreen.js b/wdio/screen-objects/TokenOverviewScreen.js
deleted file mode 100644
index 838cb9754fd..00000000000
--- a/wdio/screen-objects/TokenOverviewScreen.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import Selectors from '../helpers/Selectors';
-import Gestures from '../helpers/Gestures';
-import { TokenOverviewSelectorsIDs } from '../../app/components/UI/AssetOverview/TokenOverview.testIds';
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import { expect as expectAppwright } from 'appwright';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-class TokenOverviewScreen {
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get todaysChange() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(TokenOverviewSelectorsIDs.TODAYS_CHANGE);
-    } else {
-      return AppwrightSelectors.getElementByText(this._device, '%) Today');
-    }
-  }
-
-  get tokenAssetOverview() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(TokenOverviewSelectorsIDs.CONTAINER);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TokenOverviewSelectorsIDs.CONTAINER);
-    }
-  }
-
-  get sendButton() {
-    if (!this._device) {
-      return Selectors.getElementByPlatform(TokenOverviewSelectorsIDs.SEND_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TokenOverviewSelectorsIDs.SEND_BUTTON);
-    }
-  }
-
-  async isTokenOverviewVisible() {
-    if (!this._device) {
-      const element = await this.tokenAssetOverview;
-      await element.waitForDisplayed();
-    } else {
-      const element = await this.tokenAssetOverview;
-      expectAppwright(element).toBeVisible();
-    }
-  }
-
-  async isTodaysChangeVisible() {
-    if (!this._device) {
-      const element = await this.todaysChange;
-      await element.waitForDisplayed();
-    } else {
-      const element = await this.todaysChange;
-      expectAppwright(element).toBeVisible({ timeout: 10000 });
-      await new Promise(resolve => setTimeout(resolve, 500));
-    }
-  }
-
-  async tapSendButton() {
-    if (!this._device) {
-    await Gestures.swipeUp(0.5);
-    await driver.pause(1000);
-    await Gestures.waitAndTap(this.sendButton);
-    }
-    else {
-      await AppwrightGestures.tap(await this.sendButton);
-    }
-  }
-
-  async isSendButtonVisible() {
-    if (!this._device) {
-      const element = await this.sendButton;
-      await element.waitForDisplayed();
-    } else {
-      const element = await this.sendButton;
-      expectAppwright(await element).toBeVisible();
-    }
-  }
-}
-
-export default new TokenOverviewScreen();
diff --git a/wdio/screen-objects/TransactionConfirmScreen.js b/wdio/screen-objects/TransactionConfirmScreen.js
deleted file mode 100644
index 5ac7a346b84..00000000000
--- a/wdio/screen-objects/TransactionConfirmScreen.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import Selectors from '../helpers/Selectors';
-import {
-  CONFIRM_TXN_AMOUNT,
-  CONFIRM_TRANSACTION_BUTTON_ID,
-} from './testIDs/Screens/TransactionConfirm.testIds';
-import { ESTIMATED_FEE_TEST_ID } from './testIDs/Screens/TransactionSummaryScreen.testIds';
-import { MAX_PRIORITY_FEE_INPUT_TEST_ID } from './testIDs/Screens/EditGasFeeScreen.testids';
-import Gestures from '../helpers/Gestures';
-
-class TransactionConfirmScreen {
-  get confirmAmount() {
-    return Selectors.getElementByPlatform(CONFIRM_TXN_AMOUNT);
-  }
-
-  get estimatedGasFee() {
-    return Selectors.getElementByPlatform(ESTIMATED_FEE_TEST_ID);
-  }
-
-  get sendButton() {
-    return Selectors.getElementByPlatform(CONFIRM_TRANSACTION_BUTTON_ID);
-  }
-
-  get estimatedGasLink() {
-    return Selectors.getElementByPlatform(ESTIMATED_FEE_TEST_ID);
-  }
-
-  get suggestedGasOptions() {
-    return Selectors.getElementByPlatform(MAX_PRIORITY_FEE_INPUT_TEST_ID);
-  }
-
-  async isCorrectTokenConfirm(token) {
-    const confirmAmount = await this.confirmAmount;
-    await confirmAmount.waitForDisplayed();
-    expect(confirmAmount).toHaveTextContaining(token);
-  }
-
-  async isCorrectTokenAmountDisplayed(amount) {
-    const confirmAmount = await this.confirmAmount;
-    await confirmAmount.waitForDisplayed();
-    expect(confirmAmount).toHaveTextContaining(amount);
-  }
-
-  async isConfirmScreenVisible() {
-    const confirmAmount = await this.confirmAmount;
-    await confirmAmount.waitForDisplayed();
-  }
-
-  async waitEstimatedGasFeeToDisplay() {
-    const estimatedGasFee = await this.estimatedGasFee;
-    await estimatedGasFee.waitForDisplayed();
-  }
-
-  async tapSendButton() {
-    await Gestures.waitAndTap(this.sendButton);
-  }
-
-  async tapEstimatedGasLink() {
-    await Gestures.waitAndTap(this.estimatedGasLink);
-  }
-
-  async areSuggestedGasOptionsNotVisible() {
-    const suggestedGasOptions = await this.suggestedGasOptions;
-    await suggestedGasOptions.waitForExist({ reverse: true });
-  }
-
-  async tapSaveGasButton() {
-    await Gestures.tapTextByXpath('Save');
-  }
-}
-
-export default new TransactionConfirmScreen();
diff --git a/wdio/screen-objects/UniswapDapp.js b/wdio/screen-objects/UniswapDapp.js
deleted file mode 100644
index c2c15f6dbba..00000000000
--- a/wdio/screen-objects/UniswapDapp.js
+++ /dev/null
@@ -1,195 +0,0 @@
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { expect } from 'appwright';
-
-/**
- * Page Object for Uniswap (https://app.uniswap.org)
- *
- * Used in web context (Chrome/Safari) via AppwrightHelpers.withWebAction().
- * Selectors rely on visible text since Uniswap does not expose stable data-testid attributes.
- */
-class UniswapDapp {
-  constructor() {
-    this._device = null;
-  }
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  _getByText(text) {
-    if (!this._device) return null;
-    return AppwrightSelectors.getElementByText(this._device, text, false);
-  }
-
-  _getByTextContains(text) {
-    if (!this._device) return null;
-    return AppwrightSelectors.getElementByXpath(
-      this._device,
-      `//*[contains(normalize-space(.), "${text}")]`,
-    );
-  }
-
-  _getByTestId(testId) {
-    if (!this._device) return null;
-    return AppwrightSelectors.getElementByXpath(
-      this._device,
-      `//*[@data-testid="${testId}"]`,
-    );
-  }
-
-  // ============================================================
-  // SELECTORS
-  // ============================================================
-
-  get connectButton() {
-    if (AppwrightSelectors.isAndroid(this._device)) {
-      return this._getByTestId('navbar-connect-wallet');
-    } else 
-      return AppwrightSelectors.getElementByNameiOS(this._device, 'Connect');
-  }
-
-  get walletConnect() {
-    if (AppwrightSelectors.isAndroid(this._device)) {
-      return this._getByTextContains('WalletConnect');
-    } else {
-      return AppwrightSelectors.getElementByXpath(this._device, '//XCUIElementTypeStaticText[@name="WalletConnect"]');
-    }
-  }
-
-  get metaMaskWalletOption() {
-    if (AppwrightSelectors.isAndroid(this._device)) {
-      return AppwrightSelectors.getElementByXpath(
-        this._device,
-        '//android.widget.Button[@text="MetaMask MetaMask"]',
-      );
-    } else {
-      return AppwrightSelectors.getElementByXpath(this._device, '//XCUIElementTypeButton[@name="MetaMask MetaMask"]');
-    }
-  }
-
-  get metaMaskDeeplinkButton() {
-    if (AppwrightSelectors.isAndroid(this._device)) {
-      return AppwrightSelectors.getElementByXpath(
-        this._device,
-        '//android.widget.TextView[@text="MetaMask"]',
-      );
-    } else {
-      return AppwrightSelectors.getElementByXpath(this._device, '//XCUIElementTypeOther[@name="textfield"]');
-    }
-  }
-
-  get uniswapDialog() {
-    return AppwrightSelectors.getElementByXpath(
-      this._device,
-      '//android.app.AlertDialog',
-    );
-  }
-
-  get uniswapIcon() {
-    return AppwrightSelectors.getElementByID(this._device, 'account-icon');
-  }
-
-  get SolanaPopup() {
-    return AppwrightSelectors.getElementByText(this._device, 'Use Solana on Uniswap');
-  }
-
-  // ============================================================
-  // ACTIONS
-  // ============================================================
-
-  async waitForConnectButtonVisible(timeoutMs = 20000) {
-    if (!this._device) return;
-    const element = await this.connectButton;
-    await expect(element).toBeVisible({ timeout: timeoutMs });
-  }
-
-  async waitForWalletConnectVisible(timeoutMs = 15000) {
-    if (!this._device) return;
-    const element = await this.walletConnect;
-    await expect(element).toBeVisible({ timeout: timeoutMs });
-  }
-
-  async tapConnect() {
-    if (!this._device) return;
-    const element = await this.connectButton;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapOnWalletConnect() {
-    if (!this._device) return;
-    const element = await this.walletConnect;
-    await AppwrightGestures.tap(element);
-  }
-
-  async connectWithMetaMask() {
-    if (!this._device) return;
-    await this.waitForConnectButtonVisible();
-    await this.tapConnect();
-    await this.waitForWalletConnectVisible();
-    await this.tapOnWalletConnect();
-  }
-
-
-  async connectIOS(timeoutMs = 20000) {
-    if (!this._device) return;
-    await this.waitForConnectButtonVisible(timeoutMs);
-    await this.tapConnect();
-  }
-
-  async selectWalletConnectOption() {
-    if (!this._device) return;
-    const element = await this.walletConnect;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapOnMetaMaskWalletOption() {
-    if (!this._device) return;
-    const element = await this.metaMaskWalletOption;
-    await AppwrightGestures.tap(element);
-  }
-
-  async tapOnMetaMaskDeeplinkButton() {
-    if (!this._device) return;
-    const deeplinkButton = await this.metaMaskDeeplinkButton;
-    await new Promise((resolve) => setTimeout(resolve, 2000));
-    await AppwrightGestures.tap(deeplinkButton);
-  }
-
-  // Backward-compatible helper used by existing flows.
-  async tapOnMetaMaskWalletOptionAndOpenDeeplink() {
-    if (!this._device) return;
-    await this.tapOnMetaMaskWalletOption();
-    await this.tapOnMetaMaskDeeplinkButton();
-  }
-
-  async isUniswapDisplayed(timeoutMs = 30000) {
-    if (!this._device) return;
-    if (AppwrightSelectors.isAndroid(this._device)) {
-      const element = await this.uniswapDialog;
-      const icon = await this.uniswapIcon;
-      const dialogVisible = await element
-        .isVisible({ timeout: timeoutMs })
-        .catch(() => false);
-      if (dialogVisible) {
-        return;
-      }
-
-      const iconVisible = await icon.isVisible({ timeout: timeoutMs }).catch(() => false);
-      if (!iconVisible) {
-        throw new Error(
-          'Neither Uniswap dialog nor account icon is visible in Android context',
-        );
-      }
-    } else {
-      const element = await this.SolanaPopup;
-      await expect(element).toBeVisible({ timeout: timeoutMs });
-    }
-  }
-}
-
-export default new UniswapDapp();
diff --git a/wdio/screen-objects/WalletMainScreen.js b/wdio/screen-objects/WalletMainScreen.js
deleted file mode 100644
index c6bc3351d42..00000000000
--- a/wdio/screen-objects/WalletMainScreen.js
+++ /dev/null
@@ -1,467 +0,0 @@
-import Selectors from '../helpers/Selectors';
-import Gestures from '../helpers/Gestures.js';
-import { ProtectWalletModalSelectorsIDs } from '../../app/components/UI/ProtectYourWalletModal/ProtectWalletModal.testIds';
-import { AccountActionsBottomSheetSelectorsIDs } from '../../app/components/Views/AccountActions/AccountActionsBottomSheet.testIds';
-import { ToastSelectorsIDs } from '../../app/component-library/components/Toast/ToastModal.testIds';
-import { TabBarSelectorIDs } from '../../app/components/Nav/Main/TabBar.testIds';
-
-import { BACK_BUTTON_SIMPLE_WEBVIEW } from './testIDs/Components/SimpleWebView.testIds';
-import { WalletViewSelectorsIDs } from '../../app/components/Views/Wallet/WalletView.testIds';
-import AppwrightSelectors from '../../tests/framework/AppwrightSelectors';
-import AppwrightGestures from '../../tests/framework/AppwrightGestures';
-import { expect as appwrightExpect } from 'appwright';
-import TimerHelper from '../../tests/framework/TimerHelper';
-
-class WalletMainScreen {
-
-  get device() {
-    return this._device;
-  }
-
-  set device(device) {
-    this._device = device;
-  }
-
-  get ImportToken() {
-    return Selectors.getElementByPlatform(WalletViewSelectorsIDs.IMPORT_TOKEN_BUTTON);
-  }
-
-  get ImportNFT() {
-    return Selectors.getElementByPlatform(WalletViewSelectorsIDs.IMPORT_NFT_BUTTON);
-  }
-
-  get TokenNotificationTitle() {
-    return Selectors.getElementByPlatform(ToastSelectorsIDs.NOTIFICATION_TITLE);
-  }
-
-  get accountIcon() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(WalletViewSelectorsIDs.ACCOUNT_ICON);
-    } else {
-
-          if (AppwrightSelectors.isAndroid(this._device)) {
-            return AppwrightSelectors.getElementByID(
-              this._device,
-              WalletViewSelectorsIDs.ACCOUNT_ICON,
-            );
-          } else {
-            return AppwrightSelectors.getElementByCatchAll(this._device, WalletViewSelectorsIDs.ACCOUNT_ICON);
-          }
-        }
-
-
-
-  }
-
-  get swapButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(WalletViewSelectorsIDs.WALLET_SWAP_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, WalletViewSelectorsIDs.WALLET_SWAP_BUTTON);
-    }
-  }
-
-  get WalletScreenContainer() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(WalletViewSelectorsIDs.WALLET_CONTAINER);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, WalletViewSelectorsIDs.WALLET_CONTAINER);
-    }
-  }
-
-  get networkInNavBar() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(WalletViewSelectorsIDs.NAVBAR_NETWORK_BUTTON);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, 'tokens-network-filter');
-    }
-  }
-
-  get remindMeLaterNotification() {
-    return Selectors.getElementByPlatform(
-      ProtectWalletModalSelectorsIDs.REMIND_ME_LATER_BUTTON,
-    );
-  }
-
-  get backupAlertModal() {
-    return Selectors.getElementByPlatform(ProtectWalletModalSelectorsIDs.COLLAPSED_WALLET_MODAL);
-  }
-
-  get networkNavbarTitle() {
-    return Selectors.getXpathElementByResourceId(WalletViewSelectorsIDs.NAVBAR_NETWORK_TEXT);
-  }
-
-  get accountActionsButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(WalletViewSelectorsIDs.ACCOUNT_ACTIONS);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, WalletViewSelectorsIDs.ACCOUNT_ACTIONS);
-    }
-  }
-
-  get privateKeyActionButton() {
-    return Selectors.getElementByPlatform(AccountActionsBottomSheetSelectorsIDs.SHOW_PRIVATE_KEY);
-  }
-
-  get shareAddressActionButton() {
-    return Selectors.getElementByPlatform(AccountActionsBottomSheetSelectorsIDs.SHARE_ADDRESS);
-  }
-
-  get viewEtherscanActionButton() {
-    return Selectors.getElementByPlatform(AccountActionsBottomSheetSelectorsIDs.VIEW_ETHERSCAN);
-  }
-
-  get walletButton() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(TabBarSelectorIDs.WALLET);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, TabBarSelectorIDs.WALLET);
-
-    }
-  }
-
-  get goBackSimpleWebViewButton() {
-    return Selectors.getElementByPlatform(BACK_BUTTON_SIMPLE_WEBVIEW);
-  }
-
-  get networkModal() {
-    return Selectors.getXpathElementByText('Localhost 8545 now active.');
-  }
-
-  get totalBalanceText() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId(WalletViewSelectorsIDs.TOTAL_BALANCE_TEXT);
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, WalletViewSelectorsIDs.TOTAL_BALANCE_TEXT);
-    }
-  }
-
-  get balanceContainer() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId('balance-container');
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, 'balance-container');
-    }
-  }
-
-  get tokenBalancesLoadedMarker() {
-    if (!this._device) {
-      return Selectors.getXpathElementByResourceId('token-balances-loaded-marker');
-    } else {
-      return AppwrightSelectors.getElementByID(this._device, 'token-balances-loaded-marker');
-    }
-  }
-
-
-
-  async tapImportTokensButton() {
-    const importToken = await this.ImportToken;
-    await importToken.waitForDisplayed();
-
-    let displayed = true;
-    while (displayed) {
-      if (await importToken.isExisting()) {
-        await importToken.click();
-        await driver.pause(3000);
-      } else {
-        displayed = false;
-      }
-    }
-  }
-
-  async tapImportNFTButton() {
-    await Gestures.swipe({ x: 100, y: 500 }, { x: 100, y: 10 });
-    await Gestures.waitAndTap(this.ImportNFT);
-  }
-
-  async tapNFTTab() {
-    if (!this._device) {
-      await Gestures.tapTextByXpath('NFTs');
-    } else {
-      // For Appwright, tap by text
-      const nftTabText = AppwrightSelectors.getElementByText(this._device, 'NFTs');
-      await AppwrightGestures.tap(nftTabText);
-    }
-  }
-
-  async tapTokensTab() {
-    if (!this._device) {
-      await Gestures.tapTextByXpath('Tokens');
-    } else {
-      // For Appwright, tap by text
-      const tokensTabText = AppwrightSelectors.getElementByText(this._device, 'Tokens');
-      await AppwrightGestures.tap(tokensTabText);
-    }
-  }
-
-  async tapOnToken(token) {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.accountIcon);
-    } else {
-      if (AppwrightSelectors.isAndroid(this._device)) {
-        let tokenName = await AppwrightSelectors.getElementByID(this._device, `asset-${token}`); // for some reason by Id does not work sometimeselse {
-        await AppwrightGestures.tap(tokenName);
-      } else { // if ios, click on any token that is visible
-        const anyToken = await AppwrightSelectors.getElementByID(this._device, `asset-${token}`);
-        await AppwrightGestures.tap(anyToken);
-        await new Promise(resolve => setTimeout(resolve, 2000));
-      }
-    }
-
-
-  }
-
-  async isTokenVisible(token) {
-    const isAndroid = AppwrightSelectors.isAndroid(this._device);
-    if (isAndroid) {
-      const tokenName = await AppwrightSelectors.getElementByID(this._device, `asset-${token}`);
-      await tokenName.isVisible();
-    } else {
-      const tokenName = await AppwrightSelectors.getElementByID(this._device, `asset-${token}`);
-      await tokenName.isVisible();
-    }
-  }
-
-  async tapIdenticon() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.accountIcon);
-    } else {
-      await AppwrightGestures.tap(await this.accountIcon);
-    }
-  }
-
-  async checkActiveAccount(name, timeout = 10000) {
-    const startTime = Date.now();
-
-    while (Date.now() - startTime < timeout) {
-      try {
-        // Look for the account name text directly
-        const accountText = await AppwrightSelectors.getElementByText(this.device, name, true);
-        const isVisible = await accountText.isVisible({ timeout: 1000 });
-
-        if (isVisible) {
-          return; // Success - found the account name
-        }
-      } catch {
-        // Element not found yet, continue polling
-      }
-
-      // Wait 500ms before retrying
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-
-    throw new Error(`Expected account "${name}" to be visible after ${timeout}ms`);
-  }
-
-
-  async tapSwapButton() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.swapButton);
-    } else {
-      await AppwrightGestures.tap(await this.swapButton);
-    }
-  }
-
-  async tapNetworkNavBar() {
-
-    if (!this._device) {
-      await Gestures.waitAndTap(await this.networkInNavBar);
-    } else {
-      await AppwrightGestures.tap(await this.networkInNavBar);
-    }
-  }
-
-  async tapRemindMeLaterOnNotification() {
-    await Gestures.waitAndTap(await this.remindMeLaterNotification);
-  }
-
-  async backupAlertModalIsVisible() {
-    const element = await this.backupAlertModal;
-    return element.isDisplayed();
-  }
-
-  async isVisible() {
-    const container = await this.WalletScreenContainer;
-    await appwrightExpect(container).toBeVisible();
-  }
-
-  async clickOnMainScreen() { // to close account actions bottom sheet
-    if (!this._device) {
-      await Gestures.waitAndTap(this.WalletScreenContainer);
-    } else {
-      await this._device.tap({ x: 100, y: 100 });
-    }
-  }
-
-  async isNetworkNameCorrect(network) {
-    const networkName = await Selectors.getXpathElementByTextContains(network);
-    await networkName.waitForDisplayed();
-  }
-
-  async isTokenTextVisible(token) {
-    const tokenText = await Selectors.getXpathElementByTextContains(token);
-    await expect(tokenText).toBeDisplayed();
-    await tokenText.waitForExist({ reverse: true });
-  }
-
-  async isMainWalletViewVisible() {
-    if (!this._device) {
-      await this.walletButton.waitForDisplayed();
-    } else {
-      const element = await this.walletButton;
-      await appwrightExpect(element).toBeVisible({ timeout: 30000 });
-    }
-  }
-
-  async getTotalBalanceText() {
-    if (!this._device) {
-      return await this.totalBalanceText;
-    } else {
-      const balanceContainer = await AppwrightSelectors.getElementByID(this._device, 'total-balance-text');
-      const balanceContainerText = await balanceContainer.getText();
-
-      return balanceContainerText;
-    }
-  }
-
-  async isMenuButtonVisible() {
-    if (!this._device) {
-      return await this.balanceContainer.isVisible();
-    } else {
-      const menuButton = await AppwrightSelectors.getElementByID(this._device, WalletViewSelectorsIDs.WALLET_HAMBURGER_MENU_BUTTON);
-      const timer = new TimerHelper('Time for the menu button to be visible');
-      timer.start();
-      await appwrightExpect(menuButton).toBeVisible();
-      timer.stop();
-      return timer;
-    }
-  }
-
-  // Migrated to WalletView.ts (tests/page-objects/wallet/WalletView.ts)
-  async waitForBalanceToStabilize(options = {}) {
-    const {
-      maxWaitTime = 60000,
-      pollInterval = 100,
-      sameResultTimeout = 8000
-    } = options;
-
-    const startTime = Date.now();
-    const isIOS = AppwrightSelectors.isIOS(this._device);
-
-
-    // iOS: Element lookups are extremely slow (15-30s each via Appwright).
-    // Skip stability loop and just wait for a valid balance once.
-    if (isIOS) {
-      let previousBalance = '';
-      while (Date.now() - startTime < maxWaitTime) {
-        try {
-          const balanceElement = await AppwrightSelectors.getElementByID(this._device, 'total-balance-text');
-          const rawBalance = await balanceElement.getText();
-          const balance = (rawBalance || '').trim();
-          previousBalance = balance;
-
-          if (balance && balance !== '' && balance !== '$0.00') {
-            return balance;
-          }
-        } catch (error) {
-        }
-        await AppwrightGestures.wait(1000);
-      }
-      return previousBalance;
-    }
-
-    // Android: Fast element lookups, use stability polling
-    let balanceElement = await AppwrightSelectors.getElementByID(this._device, 'total-balance-text');
-    let previousBalance = '';
-    let sameResultStartTime = null;
-
-    while (true) {
-      const elapsedTime = Date.now() - startTime;
-
-      if (elapsedTime > maxWaitTime) {
-        return previousBalance;
-      }
-
-      let rawBalance;
-      try {
-        rawBalance = await balanceElement.getText();
-      } catch (error) {
-        balanceElement = await AppwrightSelectors.getElementByID(this._device, 'total-balance-text');
-        await AppwrightGestures.wait(pollInterval);
-        continue;
-      }
-
-      const currentBalance = (rawBalance || '').trim();
-
-      if (!currentBalance || currentBalance === '' || currentBalance === '$0.00') {
-        await AppwrightGestures.wait(pollInterval);
-        continue;
-      }
-
-      if (currentBalance === previousBalance) {
-        const timeSinceSameResult = Date.now() - sameResultStartTime;
-        if (timeSinceSameResult >= sameResultTimeout) {
-          return currentBalance;
-        }
-      } else {
-        sameResultStartTime = Date.now();
-        previousBalance = currentBalance;
-      }
-
-      await AppwrightGestures.wait(pollInterval);
-    }
-  }
-
-  async isSubmittedNotificationDisplayed() {
-    const element = await this.TokenNotificationTitle;
-    await element.waitForDisplayed();
-    await expect(element).toHaveText('Transaction submitted');
-    await element.waitForExist({ reverse: true });
-  }
-
-  async isCompleteNotificationDisplayed() {
-    const element = await this.TokenNotificationTitle;
-    await element.waitForDisplayed();
-    await expect(element).toHaveTextContaining('Transaction');
-    await expect(element).toHaveTextContaining('Complete!');
-    await element.waitForExist({ reverse: true });
-  }
-
-  async isNetworkNavbarTitle(text) {
-    await expect(this.networkNavbarTitle).toHaveText(text);
-  }
-
-  async tapAccountActions() {
-    if (!this._device) {
-      await Gestures.waitAndTap(this.accountActionsButton);
-    } else {
-      await AppwrightGestures.tap(await this.accountActionsButton);
-    }
-  }
-
-  async tapShowPrivateKey() {
-    await Gestures.waitAndTap(this.privateKeyActionButton);
-    await Gestures.waitAndTap(this.walletButton);
-  }
-
-  async tapShareAddress() {
-    await Gestures.waitAndTap(this.shareAddressActionButton);
-  }
-
-  async tapViewOnEtherscan() {
-    await Gestures.waitAndTap(this.viewEtherscanActionButton);
-    await Gestures.waitAndTap(this.goBackSimpleWebViewButton);
-  }
-
-  async waitForNetworkModalToDisappear() {
-    const element = await this.networkModal;
-    await element.waitForExist({ reverse: true });
-  }
-
-  async tapOnTokensSection() {
-    const tokensSection = await AppwrightSelectors.getElementByText(this._device, 'Tokens');
-    await AppwrightGestures.tap(tokensSection);
-  }
-}
-
-export default new WalletMainScreen();
diff --git a/wdio/screen-objects/testIDs/BrowserScreen/AddressBar.testIds.js b/wdio/screen-objects/testIDs/BrowserScreen/AddressBar.testIds.js
deleted file mode 100644
index 59ea9965d2c..00000000000
--- a/wdio/screen-objects/testIDs/BrowserScreen/AddressBar.testIds.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const UNISWAP_SUGGESTION = 'https://uniswap.exchange/';
-
-export const HOME_SUGGESTION = 'https://portfolio.metamask.io/explore?MetaMaskEntry=mobile/';
diff --git a/wdio/screen-objects/testIDs/BrowserScreen/ExternalWebsites.testIds.js b/wdio/screen-objects/testIDs/BrowserScreen/ExternalWebsites.testIds.js
deleted file mode 100644
index b3b77053123..00000000000
--- a/wdio/screen-objects/testIDs/BrowserScreen/ExternalWebsites.testIds.js
+++ /dev/null
@@ -1,26 +0,0 @@
-export const HOME_FAVORITE_BUTTON = 'Favorites';
-
-export const HOME_FAVORITES_UNISWAP_CARD_TITLE = 'My Uniswap';
-
-export const HOME_FAVORITES_CARDS_URL = 'https://uniswap.exchange';
-
-export const NO_FAVORITES_MESSAGE = 'You have no favorites yet';
-
-export const ETHEREUM_PHISHING_DETECTION_BACK_BUTTON = 'Back to safety';
-
-export const BRUNO_MAIN_ID = 'inner';
-
-export const ERROR_PAGE_TITLE = 'error-page-title';
-
-export const ERROR_PAGE_MESSAGE = 'error-page-message';
-
-export const ERROR_PAGE_RETURN_BUTTON = 'error-page-return-button';
-
-export const REDDIT_ICON = 'www.reddit';
-
-export const UNISWAP_CONNECT_BUTTON = 'Connect';
-
-export const UNISWAP_METAMASK_WALLET_BUTTON = 'MetaMask';
-
-export const UNISWAP_WALLET_PROFILE_ICON =
-  '//android.view.View[@resource-id="root"]/android.view.View[1]/android.view.View/android.widget.Button';
diff --git a/wdio/screen-objects/testIDs/BrowserScreen/OptionMenu.testIds.js b/wdio/screen-objects/testIDs/BrowserScreen/OptionMenu.testIds.js
deleted file mode 100644
index 523d0785c53..00000000000
--- a/wdio/screen-objects/testIDs/BrowserScreen/OptionMenu.testIds.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export const MENU_ID = 'browser-options-menu';
-
-export const ADD_FAVORITES_OPTION = 'browser-options-menu-add-favorites';
-
-export const OPEN_FAVORITES_OPTION = 'browser-options-menu-open-favorites';
-
-export const NEW_TAB_OPTION = 'browser-options-menu-new-tab';
-
-export const RELOAD_OPTION = 'browser-options-menu-reload';
-
-export const SHARE_OPTION = 'browser-options-menu-share';
-
-export const OPEN_IN_BROWSER_OPTION = 'browser-options-menu-open-in-browser';
-
-export const SWITCH_NETWORK_OPTION = 'browser-options-switch-browser';
diff --git a/wdio/screen-objects/testIDs/Components/AccountSelector.testIds.js b/wdio/screen-objects/testIDs/Components/AccountSelector.testIds.js
deleted file mode 100644
index 90ea046de1b..00000000000
--- a/wdio/screen-objects/testIDs/Components/AccountSelector.testIds.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const ACCOUNT_SELECTOR_NEXT_BUTTON = 'account-selector-next-button';
-export const ACCOUNT_SELECTOR_PREVIOUS_BUTTON = 'account-selector-previous-button';
-export const ACCOUNT_SELECTOR_FORGET_BUTTON = 'account-selector-forget-button';
diff --git a/wdio/screen-objects/testIDs/Components/AndroidNativeModals.testIds.js b/wdio/screen-objects/testIDs/Components/AndroidNativeModals.testIds.js
deleted file mode 100644
index a4eba6ca346..00000000000
--- a/wdio/screen-objects/testIDs/Components/AndroidNativeModals.testIds.js
+++ /dev/null
@@ -1 +0,0 @@
-export const ANDROID_SHARE_MODAL = 'android:id/profile_tabhost';
diff --git a/wdio/screen-objects/testIDs/Components/ConnectQRHardware.testIds.js b/wdio/screen-objects/testIDs/Components/ConnectQRHardware.testIds.js
deleted file mode 100644
index e41efc1d945..00000000000
--- a/wdio/screen-objects/testIDs/Components/ConnectQRHardware.testIds.js
+++ /dev/null
@@ -1 +0,0 @@
-export const QR_CONTINUE_BUTTON = 'qr-continue-button';
diff --git a/wdio/screen-objects/testIDs/Components/DeleteContactModal.testIds.js b/wdio/screen-objects/testIDs/Components/DeleteContactModal.testIds.js
deleted file mode 100644
index 7582806da3e..00000000000
--- a/wdio/screen-objects/testIDs/Components/DeleteContactModal.testIds.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const DELETE_CONTACT_MODAL_TITLE = 'Delete contact';
-export const DELETE_CONTACT_MODAL_DELETE_BUTTON = 'Delete';
-export const DELETE_CONTACT_MODAL_CANCEL_BUTTON = 'Cancel';
diff --git a/wdio/screen-objects/testIDs/Components/DeleteWalletModal.testIds.js b/wdio/screen-objects/testIDs/Components/DeleteWalletModal.testIds.js
deleted file mode 100644
index acfebf6a8af..00000000000
--- a/wdio/screen-objects/testIDs/Components/DeleteWalletModal.testIds.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const DELETE_MODAL_UNDERSTAND_CONTINUE_ID =
-  'delete-modal-understand-continue';
-export const DELETE_MODAL_DELETE_INPUT_ID = 'delete-wallet-inputbox';
-export const DELETE_MODAL_DELETE_MY_WALLET_PERMANENTLY =
-  'delete-my-wallet-button-on-permanetly-delete-modal';
diff --git a/wdio/screen-objects/testIDs/Components/MetaMaskAnimation.testIds.js b/wdio/screen-objects/testIDs/Components/MetaMaskAnimation.testIds.js
deleted file mode 100644
index f76d5e1d5b1..00000000000
--- a/wdio/screen-objects/testIDs/Components/MetaMaskAnimation.testIds.js
+++ /dev/null
@@ -1,3 +0,0 @@
- 
-export const SPLASH_SCREEN_METAMASK_ANIMATION_ID =
-  'splash-screen-metamask-animation-id';
diff --git a/wdio/screen-objects/testIDs/Components/NetworkEducationModalTestIds.js b/wdio/screen-objects/testIDs/Components/NetworkEducationModalTestIds.js
deleted file mode 100644
index 881a1a97186..00000000000
--- a/wdio/screen-objects/testIDs/Components/NetworkEducationModalTestIds.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const NETWORK_EDUCATION_MODAL_CONTAINER_ID = 'network-education-modal';
-export const NETWORK_EDUCATION_MODAL_CLOSE_BUTTON_ID =
-  'network-education-modal-close-button';
-export const NETWORK_EDUCATION_MODAL_NETWORK_NAME_ID =
-  'network-education-modal-network-name';
diff --git a/wdio/screen-objects/testIDs/Components/NetworkListModal.TestIds.js b/wdio/screen-objects/testIDs/Components/NetworkListModal.TestIds.js
deleted file mode 100644
index b9be476bcd8..00000000000
--- a/wdio/screen-objects/testIDs/Components/NetworkListModal.TestIds.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const NETWORK_SCROLL_ID = 'other-networks-scroll';
-export const NETWORK_TEST_SWITCH_ID = 'test-network-switch-id';
diff --git a/wdio/screen-objects/testIDs/Components/SimpleWebView.testIds.js b/wdio/screen-objects/testIDs/Components/SimpleWebView.testIds.js
deleted file mode 100644
index 4cdacab0151..00000000000
--- a/wdio/screen-objects/testIDs/Components/SimpleWebView.testIds.js
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-export const BACK_BUTTON_SIMPLE_WEBVIEW = 'back_button_simple_webview';
diff --git a/wdio/screen-objects/testIDs/Components/TermsAndConditions.testIds.js b/wdio/screen-objects/testIDs/Components/TermsAndConditions.testIds.js
deleted file mode 100644
index 0a97c96cda6..00000000000
--- a/wdio/screen-objects/testIDs/Components/TermsAndConditions.testIds.js
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-export const TERMS_AND_CONDITIONS_BUTTON_ID = 'terms-and-conditions-button-id';
diff --git a/wdio/screen-objects/testIDs/Components/Tokens.testIds.js b/wdio/screen-objects/testIDs/Components/Tokens.testIds.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/wdio/screen-objects/testIDs/Screens/AddContact.testIds.js b/wdio/screen-objects/testIDs/Screens/AddContact.testIds.js
deleted file mode 100644
index 856bc8d06fa..00000000000
--- a/wdio/screen-objects/testIDs/Screens/AddContact.testIds.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const ADD_CONTACTS_CONTAINER_ID = 'add-contacts-screen';
-export const ADD_CONTACT_NAME_INPUT = 'add-contact-name-input';
-export const ADD_CONTACT_ADDRESS_INPUT = 'add-contact-address-input';
-export const ADD_CONTACT_ADD_BUTTON = 'add-contact-add-contact-button';
-export const ADD_CONTACT_DELETE_BUTTON = 'add-contact-delete-contact-button';
diff --git a/wdio/screen-objects/testIDs/Screens/AddressBook.testids.js b/wdio/screen-objects/testIDs/Screens/AddressBook.testids.js
deleted file mode 100644
index e014d4f3e0d..00000000000
--- a/wdio/screen-objects/testIDs/Screens/AddressBook.testids.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const ENTER_ALIAS_INPUT_BOX_ID = 'address-alias-input';
-export const ADDRESS_ALIAS_SAVE_BUTTON_ID = 'address-alias-save-button'
-export const ADDRESS_ALIAS_TITLE_ID = 'address-alias-title'
diff --git a/wdio/screen-objects/testIDs/Screens/AmountScreen.testIds.js b/wdio/screen-objects/testIDs/Screens/AmountScreen.testIds.js
deleted file mode 100644
index ea2c65f0cdd..00000000000
--- a/wdio/screen-objects/testIDs/Screens/AmountScreen.testIds.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export const AMOUNT_SCREEN = 'amount-screen';
-
-export const FIAT_CONVERSION_WARNING_TEXT =
-  'amount-screen-fiat-conversion-warning-text';
-
-export const NEXT_BUTTON = 'txn-amount-next-button';
-
-export const TRANSACTION_AMOUNT_INPUT = 'txn-amount-input';
-
-export const TRANSACTION_AMOUNT_CONVERSION_VALUE =
-  'txn-amount-conversion-value';
-
-export const AMOUNT_ERROR = 'amount-error';
-
-export const CARET_DROP_DOWN = 'amount-screen-caret-drop-down';
-
-export const CURRENCY_SWITCH = 'amount-screen-currency-switch';
diff --git a/wdio/screen-objects/testIDs/Screens/ChangePasswordScreensIDs.testIds.ts b/wdio/screen-objects/testIDs/Screens/ChangePasswordScreensIDs.testIds.ts
deleted file mode 100644
index d7a43fa4f15..00000000000
--- a/wdio/screen-objects/testIDs/Screens/ChangePasswordScreensIDs.testIds.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const RESET_PASSWORD_ANDROID_TERM_CHECKBOX_ID = 'i-understand-text';
-export const RESET_PASSWORD_CONFIRM_INPUT_BOX_ID =
-  'create-password-second-input-field';
diff --git a/wdio/screen-objects/testIDs/Screens/Contacts.testids.js b/wdio/screen-objects/testIDs/Screens/Contacts.testids.js
deleted file mode 100644
index a54c00ddcca..00000000000
--- a/wdio/screen-objects/testIDs/Screens/Contacts.testids.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const CONTACT_ADD_BUTTON = 'contact-add-contact-button';
-export const CONTACTS_CONTAINER_ID = 'contacts-screen';
diff --git a/wdio/screen-objects/testIDs/Screens/DrawerView.testIds.js b/wdio/screen-objects/testIDs/Screens/DrawerView.testIds.js
deleted file mode 100644
index 85af4c40cbd..00000000000
--- a/wdio/screen-objects/testIDs/Screens/DrawerView.testIds.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const DRAWER_VIEW_LOCK_TEXT_ID = 'drawer-view-lock-text';
-
-export const DRAWER_VIEW_BROWSER_TEXT_ID = 'drawer-browser';
-
-export const DRAWER_VIEW_WALLET_TEXT_ID = 'drawer-wallet';
\ No newline at end of file
diff --git a/wdio/screen-objects/testIDs/Screens/EditGasFeeScreen.testids.js b/wdio/screen-objects/testIDs/Screens/EditGasFeeScreen.testids.js
deleted file mode 100644
index acb408bf045..00000000000
--- a/wdio/screen-objects/testIDs/Screens/EditGasFeeScreen.testids.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const EDIT_PRIORITY_SCREEN_TEST_ID = 'edit-priority-screen';
-export const MAX_PRIORITY_FEE_INPUT_TEST_ID = 'max-priority-fee-range-input';
diff --git a/wdio/screen-objects/testIDs/Screens/ImportFromSeedScreen.testIds.js b/wdio/screen-objects/testIDs/Screens/ImportFromSeedScreen.testIds.js
deleted file mode 100644
index 0ba0fb2997c..00000000000
--- a/wdio/screen-objects/testIDs/Screens/ImportFromSeedScreen.testIds.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export const IMPORT_FROM_SEED_SCREEN_TITLE_ID =
-  'import-from-seed-screen-title-id';
-export const IMPORT_FROM_SEED_SCREEN_SUBMIT_BUTTON_ID =
-  'import-from-seed-screen-submit-button-id';
-export const IMPORT_FROM_SEED_SCREEN_SUBMIT_TEXT = 'IMPORT';
-export const IMPORT_FROM_SEED_SCREEN_SEED_PHRASE_INPUT_ID =
-  'import-from-seed-screen-seed-phrase-input-id';
-export const IOS_IMPORT_FROM_SEED_SCREEN_SEED_PHRASE_INPUT_ID =
-  '(//XCUIElementTypeOther[@name="Enter your Secret Recovery Phrase"])[3]';
-export const IMPORT_FROM_SEED_SCREEN_NEW_PASSWORD_INPUT_ID =
-  '**/XCUIElementTypeOther[`label == "New Password"`][6]';
-export const IMPORT_FROM_SEED_SCREEN_CONFIRM_PASSWORD_INPUT_ID =
-  '**/XCUIElementTypeOther[`label == "Confirm password"`][5]';
-export const IMPORT_FROM_SEED_SCREEN_PASSWORD_STRENGTH_ID =
-  'import-from-seed-screen-seed-password-strength-id';
-export const IMPORT_FROM_SEED_SCREEN_CONFIRM_PASSWORD_CHECK_ICON_ID =
-  'import-from-seed-screen-seed-password-match-icon-id';
-export const IMPORT_FROM_SEED_SCREEN_CONFIRM_PASSWORD = 'Confirm password';
diff --git a/wdio/screen-objects/testIDs/Screens/NetworksScreen.testids.js b/wdio/screen-objects/testIDs/Screens/NetworksScreen.testids.js
deleted file mode 100644
index 7aec5d1bbab..00000000000
--- a/wdio/screen-objects/testIDs/Screens/NetworksScreen.testids.js
+++ /dev/null
@@ -1,23 +0,0 @@
-export const INPUT_CHAIN_ID_FIELD = 'input-chain-id';
-
-export const INPUT_RPC_URL_FIELD = 'input-rpc-url';
-
-export const ADD_NETWORK_BUTTON = 'add-network-button';
-
-export const NETWORKS_SYMBOL_INPUT_FIELD = 'input-network-symbol';
-
-export const NEW_NETWORK_ADDED_SWITCH_TO_NETWORK_BUTTON =
-  'switch-to-network-button';
-export const NEW_NETWORK_ADDED_CLOSE_BUTTON = 'close-network-button';
-
-export const APPROVE_NETWORK_APPROVE_BUTTON = 'approve-network-approve-button';
-
-export const APPROVE_NETWORK_MODAL = 'approve-network-modal';
-
-export const NETWORK_EDUCATION_MODAL_CLOSE_BUTTON =
-  'network-education-modal-close-button';
-
-export const BLOCK_EXPLORER_FIELD = 'block-explorer';
-
-export const REMOVE_NETWORK_BUTTON = 'remove-network-button';
-export const NAV_ANDROID_BACK_BUTTON = 'nav-android-back';
diff --git a/wdio/screen-objects/testIDs/Screens/OptinMetricsScreen.testIds.js b/wdio/screen-objects/testIDs/Screens/OptinMetricsScreen.testIds.js
deleted file mode 100644
index e44267d46ce..00000000000
--- a/wdio/screen-objects/testIDs/Screens/OptinMetricsScreen.testIds.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export const OPTIN_METRICS_TITLE_ID = 'optin-metrics-title-id';
-export const OPTIN_METRICS_NO_THANKS_BUTTON_ID =
-  'optin-metrics-no-thanks-button-id';
-export const OPTIN_METRICS_CONTINUE_BUTTON_ID =
-  'optin-metrics-continue-button-id';
-export const OPTIN_METRICS_PRIVACY_POLICY_DESCRIPTION_CONTENT_1_ID =
-  'optin-metrics-privacy-policy-description';
-export const METAMETRICS_OPT_IN_CONTAINER_ID = 'meta-metrics-container';
diff --git a/wdio/screen-objects/testIDs/Screens/SecurityPrivacy.testIds.ts b/wdio/screen-objects/testIDs/Screens/SecurityPrivacy.testIds.ts
deleted file mode 100644
index 9dc6c0685e7..00000000000
--- a/wdio/screen-objects/testIDs/Screens/SecurityPrivacy.testIds.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const SECURITY_PRIVACY_REMEMBER_ME_TOGGLE = 'turn-on-remember-me';
-
-export const SECURITY_PRIVACY_VIEW_ID = 'security-settings-scrollview';
-
-export const SECURITY_PRIVACY_DELETE_WALLET_BUTTON =
-  'security-settings-delete-wallet-buttons';
diff --git a/wdio/screen-objects/testIDs/Screens/Settings.testIds.js b/wdio/screen-objects/testIDs/Screens/Settings.testIds.js
deleted file mode 100644
index 2af2c3732fc..00000000000
--- a/wdio/screen-objects/testIDs/Screens/Settings.testIds.js
+++ /dev/null
@@ -1 +0,0 @@
-export const LOCK_SETTINGS = 'lock-settings';
diff --git a/wdio/screen-objects/testIDs/Screens/SwapScreen.testIds.js b/wdio/screen-objects/testIDs/Screens/SwapScreen.testIds.js
deleted file mode 100644
index 9715d05be4f..00000000000
--- a/wdio/screen-objects/testIDs/Screens/SwapScreen.testIds.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const SWAP_SCREEN_SOURCE_TOKEN_INPUT_ID = 'source-token-area-input';
-export const SWAP_SCREEN_DESTINATION_TOKEN_INPUT_ID = 'dest-token-area-input';
-export const SWAP_SCREEN_QUOTE_DISPLAYED_ID = 'bridge-view-scroll';
-export const SWAP_SCREEN_CONFIRM_BUTTON_ID = 'bridge-confirm-button';
-export const SWAP_SCREEN_BANNER_CLOSE_BUTTON_ICON_ID = 'banner-close-button-icon';
-export const SWAP_SCREEN_KEYPAD_DELETE_BUTTON_ID = 'keypad-delete-button';
-export const SWAP_SCREEN_SOURCE_TOKEN_AREA_ID = 'source-token-area';
\ No newline at end of file
diff --git a/wdio/screen-objects/testIDs/Screens/TransactionConfirm.testIds.js b/wdio/screen-objects/testIDs/Screens/TransactionConfirm.testIds.js
deleted file mode 100644
index d8326038db7..00000000000
--- a/wdio/screen-objects/testIDs/Screens/TransactionConfirm.testIds.js
+++ /dev/null
@@ -1,6 +0,0 @@
- 
-export const CONFIRM_TXN_AMOUNT = 'confirm-txn-amount';
-export const TRANSACTION_VIEW_CONTAINER_ID = 'txn-confirm-screen';
-export const CONFIRM_TRANSACTION_BUTTON_ID = 'txn-confirm-send-button';
-export const NAVBAR_TITLE_TEXT = 'navbar-title-text';
-export const TRANSACTION_ACCOUNT_BALANCE = 'account-balance';
diff --git a/wdio/screen-objects/testIDs/Screens/TransactionSummaryScreen.testIds.js b/wdio/screen-objects/testIDs/Screens/TransactionSummaryScreen.testIds.js
deleted file mode 100644
index d08310d5bb4..00000000000
--- a/wdio/screen-objects/testIDs/Screens/TransactionSummaryScreen.testIds.js
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-export const ESTIMATED_FEE_TEST_ID = 'estimated-fee';
diff --git a/wdio/screen-objects/testIDs/Screens/WalletSetupScreen.testIds.js b/wdio/screen-objects/testIDs/Screens/WalletSetupScreen.testIds.js
deleted file mode 100644
index 3fe96e5480b..00000000000
--- a/wdio/screen-objects/testIDs/Screens/WalletSetupScreen.testIds.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export const WALLET_SETUP_SCREEN_TITLE_ID = 'wallet-setup-screen-title-id';
-export const WALLET_SETUP_SCREEN_DESCRIPTION_ID =
-  'wallet-setup-screen-description-id';
-export const WALLET_SETUP_SCREEN_IMPORT_FROM_SEED_BUTTON_TEXT =
-  'Import using Secret Recovery Phrase';
-export const WALLET_SETUP_CREATE_NEW_WALLET_BUTTON_TEXT = 'Create a new wallet';
-export const CREATE_PASSWORD_INPUT_FIRST_FIELD =
-  'create-password-first-input-field';
-export const IOS_CREATE_PASSWORD_INPUT_FIRST_FIELD =
-  '(//XCUIElementTypeOther[@name="New Password"])[3]';
-export const CONFIRM_PASSWORD_INPUT_FIRST_FIELD =
-  'create-password-second-input-field';
-export const IOS_CONFIRM_PASSWORD_INPUT_FIRST_FIELD =
-  '(//XCUIElementTypeOther[@name="Confirm password"])[1]';
-export const I_UNDERSTAND_BUTTON_ID = 'password-understand-box';
-export const SUBMIT_BUTTON = 'submit-button';
-export const REMIND_LATER_BUTTON_ID = 'remind-me-later-button';
-export const PROTECT_YOUR_WALLET_CONTAINER_ID = 'protect-your-account-screen';
diff --git a/wdio/screen-objects/testIDs/Screens/WalletView.testIds.js b/wdio/screen-objects/testIDs/Screens/WalletView.testIds.js
deleted file mode 100644
index dd230e9c19a..00000000000
--- a/wdio/screen-objects/testIDs/Screens/WalletView.testIds.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export const getAssetTestId = (token) => `asset-${token}`;
-export const WALLET_VIEW_CONTAINER_ID = 'wallet-screen';
-export const WALLET_TOTAL_BALANCE_TEXT_ID = 'total-balance-text';
-export const WALLET_SEND_BUTTON_ID = 'wallet-send-button';
diff --git a/wdio/screen-objects/testIDs/Screens/WelcomeScreen.testIds.js b/wdio/screen-objects/testIDs/Screens/WelcomeScreen.testIds.js
deleted file mode 100644
index 53f8686b1da..00000000000
--- a/wdio/screen-objects/testIDs/Screens/WelcomeScreen.testIds.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const WELCOME_SCREEN_GET_STARTED_BUTTON_ID =
-  'welcome-screen-get-started-button-id';
-export const WELCOME_SCREEN_CAROUSEL_CONTAINER_ID =
-  'welcome-screen-carousel-container-id';
-export const WELCOME_SCREEN_CAROUSEL_TITLE_ID = (number) => {
-  switch (number) {
-    case 1:
-      return '**/XCUIElementTypeOther[`label == "Welcome to MetaMask Trusted by millions, MetaMask is a secure wallet making the world of web3 accessible to all."`]';
-    case 2:
-      return '**/XCUIElementTypeOther[`label == "Welcome to MetaMask Trusted by millions, MetaMask is a secure wallet making the world of web3 accessible to all. Manage your digital assets Store, spend and send digital assets like tokens, ethereum, unique collectibles."`]';
-    case 3:
-      return '**/XCUIElementTypeOther[`label == "Welcome to MetaMask Trusted by millions, MetaMask is a secure wallet making the world of web3 accessible to all. Manage your digital assets Store, spend and send digital assets like tokens, ethereum, unique collectibles. Your gateway to web3 Login with MetaMask and make transactions to invest, earn, play games, sell and more!"`]';
-  }
-};
diff --git a/wdio/utils/generateTestId.js b/wdio/utils/generateTestId.js
deleted file mode 100644
index a94995fc09c..00000000000
--- a/wdio/utils/generateTestId.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export default (Platform, id) => ({ testID: id });
-
diff --git a/wdio/utils/splitAmountIntoDigits.ts b/wdio/utils/splitAmountIntoDigits.ts
deleted file mode 100644
index 4d2595dc5d0..00000000000
--- a/wdio/utils/splitAmountIntoDigits.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export const splitAmountIntoDigits = (amount: number | string): (number | string)[] =>
-  amount
-    .toString()
-    .split('')
-    .map((char: string): number | string =>
-      /\d/.test(char) ? parseInt(char, 10) : char,
-    );
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 270fcaf260e..a7c205b18e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7741,26 +7741,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/account-api@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "@metamask/account-api@npm:1.0.3"
+"@metamask/account-api@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "@metamask/account-api@npm:1.0.4"
   dependencies:
-    "@metamask/keyring-api": "npm:^23.0.1"
+    "@metamask/keyring-api": "npm:^23.1.0"
     "@metamask/keyring-utils": "npm:^3.2.0"
     uuid: "npm:^9.0.1"
-  checksum: 10/297e75336fc9bed1197135328a80a184f03f97797f50d36b6dc84866c2de5e4e5b64eb882c43e267b46da5ea17b6888484ff5f3f9f6b80957198b92c70927b36
+  checksum: 10/54e9972a7b21917e2d1296d7e211d99a8c07f28391be89671d30acebaaa574ee3ae98e5ed90c8257e5c567f8604244029e844909ff3051c8c50878be5a6527d0
   languageName: node
   linkType: hard
 
-"@metamask/account-tree-controller@npm:^7.0.0, @metamask/account-tree-controller@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "@metamask/account-tree-controller@npm:7.1.0"
+"@metamask/account-tree-controller@npm:^7.1.0, @metamask/account-tree-controller@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "@metamask/account-tree-controller@npm:7.2.0"
   dependencies:
-    "@metamask/accounts-controller": "npm:^37.2.0"
+    "@metamask/accounts-controller": "npm:^38.0.0"
     "@metamask/base-controller": "npm:^9.1.0"
-    "@metamask/keyring-api": "npm:^21.6.0"
-    "@metamask/keyring-controller": "npm:^25.2.0"
-    "@metamask/messenger": "npm:^1.1.1"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-controller": "npm:^25.4.0"
+    "@metamask/messenger": "npm:^1.2.0"
     "@metamask/multichain-account-service": "npm:^8.0.1"
     "@metamask/profile-sync-controller": "npm:^28.0.2"
     "@metamask/snaps-controllers": "npm:^19.0.0"
@@ -7773,26 +7773,23 @@ __metadata:
   peerDependencies:
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/e27b60d874408480567f5e39f60354aed08f2a924f74088786525fa1183c05850e0cb81daa62fa76846384d2f2be999f8800214aca39732b6856f69edb709a5e
+  checksum: 10/2744caebe870f084a3961a6a3fb6a9e4649bb6c880c408f92d9b643c20a17f4c0fc252913a2995c0e1eb40f5b351f718d8134b84de84e7857a8bfb22f17885cf
   languageName: node
   linkType: hard
 
-"@metamask/accounts-controller@npm:^37.2.0":
-  version: 37.2.0
-  resolution: "@metamask/accounts-controller@npm:37.2.0"
+"@metamask/accounts-controller@npm:^38.0.0":
+  version: 38.0.0
+  resolution: "@metamask/accounts-controller@npm:38.0.0"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
-    "@metamask/base-controller": "npm:^9.0.1"
-    "@metamask/eth-snap-keyring": "npm:^19.0.0"
-    "@metamask/keyring-api": "npm:^21.6.0"
-    "@metamask/keyring-controller": "npm:^25.2.0"
-    "@metamask/keyring-internal-api": "npm:^10.0.0"
+    "@metamask/base-controller": "npm:^9.1.0"
+    "@metamask/eth-snap-keyring": "npm:^22.0.1"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-controller": "npm:^25.4.0"
+    "@metamask/keyring-internal-api": "npm:^11.0.1"
     "@metamask/keyring-utils": "npm:^3.1.0"
-    "@metamask/messenger": "npm:^1.0.0"
-    "@metamask/network-controller": "npm:^30.0.1"
-    "@metamask/snaps-controllers": "npm:^19.0.0"
-    "@metamask/snaps-sdk": "npm:^11.0.0"
-    "@metamask/snaps-utils": "npm:^12.1.2"
+    "@metamask/messenger": "npm:^1.2.0"
+    "@metamask/network-controller": "npm:^30.1.0"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.9.0"
     deepmerge: "npm:^4.2.2"
@@ -7803,7 +7800,7 @@ __metadata:
   peerDependencies:
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/01d07434687732e08a865f26b913e4bcff429e2aab32a851b53a95b068295c97ae7c178ae4915b9ea13cb2924cca1ff3dce9232add8c84202d56d6fdc2965ea9
+  checksum: 10/29a03bf38972dce690c11ce21a6d68870d3a18b9548647cd3969a097ba37f64c8dea3464bb0bbe56a633de24e30cdb80890dc2cbcc4e4ddbaef28b5dae242c68
   languageName: node
   linkType: hard
 
@@ -7819,15 +7816,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/ai-controllers@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "@metamask/ai-controllers@npm:0.6.0"
+"@metamask/ai-controllers@npm:0.6.3":
+  version: 0.6.3
+  resolution: "@metamask/ai-controllers@npm:0.6.3"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.9.0"
-  checksum: 10/80d5cc15d28afeea893bf0b58eea42af85a10574e7d8622e0aa0f28db4e7f9a21524b7bf5d7c2aabc482e19952f3f24e492b096b605e1f3aecf25118bbed4687
+  checksum: 10/678f024889a2fe691633df7b3cce529c8a87c0533096df9b238308736ce232f4a71f1a2f9a74cff16ef6cd635b551141517e8c53dedfc0a38a45d2771850b6b6
   languageName: node
   linkType: hard
 
@@ -7885,28 +7882,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/assets-controller@npm:^6.1.0, @metamask/assets-controller@npm:^6.2.0, @metamask/assets-controller@npm:^6.2.1":
-  version: 6.2.1
-  resolution: "@metamask/assets-controller@npm:6.2.1"
+"@metamask/assets-controller@npm:^6.2.1, @metamask/assets-controller@npm:^6.3.0":
+  version: 6.3.0
+  resolution: "@metamask/assets-controller@npm:6.3.0"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
     "@ethersproject/abi": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
     "@metamask/account-tree-controller": "npm:^7.1.0"
     "@metamask/accounts-controller": "npm:^37.2.0"
-    "@metamask/assets-controllers": "npm:^105.0.0"
+    "@metamask/assets-controllers": "npm:^105.1.0"
     "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/client-controller": "npm:^1.0.1"
     "@metamask/controller-utils": "npm:^11.20.0"
     "@metamask/core-backend": "npm:^6.2.1"
-    "@metamask/keyring-api": "npm:^23.0.1"
-    "@metamask/keyring-controller": "npm:^25.2.0"
-    "@metamask/keyring-internal-api": "npm:^10.1.1"
-    "@metamask/keyring-snap-client": "npm:^9.0.1"
-    "@metamask/messenger": "npm:^1.1.1"
-    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-controller": "npm:^25.3.0"
+    "@metamask/keyring-internal-api": "npm:^11.0.1"
+    "@metamask/keyring-snap-client": "npm:^9.0.2"
+    "@metamask/messenger": "npm:^1.2.0"
+    "@metamask/network-controller": "npm:^30.1.0"
     "@metamask/network-enablement-controller": "npm:^5.0.2"
-    "@metamask/permission-controller": "npm:^12.3.0"
+    "@metamask/permission-controller": "npm:^13.0.0"
     "@metamask/phishing-controller": "npm:^17.1.1"
     "@metamask/polling-controller": "npm:^16.0.4"
     "@metamask/preferences-controller": "npm:^23.1.0"
@@ -7918,13 +7915,13 @@ __metadata:
     bignumber.js: "npm:^9.1.2"
     lodash: "npm:^4.17.21"
     p-limit: "npm:^3.1.0"
-  checksum: 10/32645ec9dc88199a93d72498cf8a00a0b8fc5a34c889229a80d7ec972acbb20eafbfe978a5ee98619f003a8a671de75ca96ed8e283cffb2208b2fc0fd893ee71
+  checksum: 10/a1c2511ec5f954b78778684f116d09b177fa1a38458f83c8ac2b155b925724917c038a9b1dbc57b1e4092cb64df2464af39314d897139474c398bab88cd755f7
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@npm:^104.3.0":
-  version: 104.3.0
-  resolution: "@metamask/assets-controllers@npm:104.3.0"
+"@metamask/assets-controllers@npm:^105.0.0, @metamask/assets-controllers@npm:^105.1.0":
+  version: 105.1.0
+  resolution: "@metamask/assets-controllers@npm:105.1.0"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
     "@ethersproject/abi": "npm:^5.7.0"
@@ -7941,70 +7938,14 @@ __metadata:
     "@metamask/controller-utils": "npm:^11.20.0"
     "@metamask/core-backend": "npm:^6.2.1"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/keyring-api": "npm:^23.0.1"
-    "@metamask/keyring-controller": "npm:^25.2.0"
-    "@metamask/messenger": "npm:^1.1.1"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-controller": "npm:^25.3.0"
+    "@metamask/messenger": "npm:^1.2.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/multichain-account-service": "npm:^8.0.1"
-    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/network-controller": "npm:^30.1.0"
     "@metamask/network-enablement-controller": "npm:^5.0.2"
-    "@metamask/permission-controller": "npm:^12.3.0"
-    "@metamask/phishing-controller": "npm:^17.1.1"
-    "@metamask/polling-controller": "npm:^16.0.4"
-    "@metamask/preferences-controller": "npm:^23.1.0"
-    "@metamask/profile-sync-controller": "npm:^28.0.2"
-    "@metamask/rpc-errors": "npm:^7.0.2"
-    "@metamask/snaps-controllers": "npm:^19.0.0"
-    "@metamask/snaps-sdk": "npm:^11.0.0"
-    "@metamask/snaps-utils": "npm:^12.1.2"
-    "@metamask/storage-service": "npm:^1.0.1"
-    "@metamask/transaction-controller": "npm:^64.3.0"
-    "@metamask/utils": "npm:^11.9.0"
-    "@types/bn.js": "npm:^5.1.5"
-    "@types/uuid": "npm:^8.3.0"
-    async-mutex: "npm:^0.5.0"
-    bitcoin-address-validation: "npm:^2.2.3"
-    bn.js: "npm:^5.2.1"
-    immer: "npm:^9.0.6"
-    lodash: "npm:^4.17.21"
-    multiformats: "npm:^9.9.0"
-    reselect: "npm:^5.1.1"
-    single-call-balance-checker-abi: "npm:^1.0.0"
-    uuid: "npm:^8.3.2"
-  peerDependencies:
-    "@metamask/providers": ^22.0.0
-    webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/9dbab56816788a66ca1dacf1aa476455115c3f1bb53ac2b809c096dee0b43e3dd641a15ea6ec192dc088cfbeb0d84c2bddd4d19d4f0b732aa7c3e7befe64a1ea
-  languageName: node
-  linkType: hard
-
-"@metamask/assets-controllers@npm:^105.0.0":
-  version: 105.0.0
-  resolution: "@metamask/assets-controllers@npm:105.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.1.0"
-    "@metamask/accounts-controller": "npm:^37.2.0"
-    "@metamask/approval-controller": "npm:^9.0.1"
-    "@metamask/base-controller": "npm:^9.1.0"
-    "@metamask/contract-metadata": "npm:^2.4.0"
-    "@metamask/controller-utils": "npm:^11.20.0"
-    "@metamask/core-backend": "npm:^6.2.1"
-    "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/keyring-api": "npm:^23.0.1"
-    "@metamask/keyring-controller": "npm:^25.2.0"
-    "@metamask/messenger": "npm:^1.1.1"
-    "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/multichain-account-service": "npm:^8.0.1"
-    "@metamask/network-controller": "npm:^30.0.1"
-    "@metamask/network-enablement-controller": "npm:^5.0.2"
-    "@metamask/permission-controller": "npm:^12.3.0"
+    "@metamask/permission-controller": "npm:^13.0.0"
     "@metamask/phishing-controller": "npm:^17.1.1"
     "@metamask/polling-controller": "npm:^16.0.4"
     "@metamask/preferences-controller": "npm:^23.1.0"
@@ -8030,7 +7971,7 @@ __metadata:
   peerDependencies:
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/5b0d0b5e96f0e34bef7607574490db28cc5d844f5f57277c5b895626d13f842fceaa714c2a4b52400d0f4d333a1f1af95b5d4db34d81d2906a5d0c7bfa189727
+  checksum: 10/206289f0fe122f228c7669a3a11c54ffbc07739a359193b8f8a10e0223a6e58b49c3a435fae4e18ab78ad9d2a03a9cb1758ba5ec2c8b08c618ff28c4dafd5e02
   languageName: node
   linkType: hard
 
@@ -8129,39 +8070,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/bridge-controller@npm:^70.2.0":
-  version: 70.2.0
-  resolution: "@metamask/bridge-controller@npm:70.2.0"
-  dependencies:
-    "@ethersproject/address": "npm:^5.7.0"
-    "@ethersproject/bignumber": "npm:^5.7.0"
-    "@ethersproject/constants": "npm:^5.7.0"
-    "@ethersproject/contracts": "npm:^5.7.0"
-    "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/accounts-controller": "npm:^37.2.0"
-    "@metamask/assets-controller": "npm:^6.1.0"
-    "@metamask/assets-controllers": "npm:^104.3.0"
-    "@metamask/base-controller": "npm:^9.1.0"
-    "@metamask/controller-utils": "npm:^11.20.0"
-    "@metamask/gas-fee-controller": "npm:^26.1.1"
-    "@metamask/keyring-api": "npm:^23.0.1"
-    "@metamask/messenger": "npm:^1.1.1"
-    "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/multichain-network-controller": "npm:^3.0.6"
-    "@metamask/network-controller": "npm:^30.0.1"
-    "@metamask/polling-controller": "npm:^16.0.4"
-    "@metamask/profile-sync-controller": "npm:^28.0.2"
-    "@metamask/remote-feature-flag-controller": "npm:^4.2.0"
-    "@metamask/snaps-controllers": "npm:^19.0.0"
-    "@metamask/transaction-controller": "npm:^64.3.0"
-    "@metamask/utils": "npm:^11.9.0"
-    bignumber.js: "npm:^9.1.2"
-    reselect: "npm:^5.1.1"
-    uuid: "npm:^8.3.2"
-  checksum: 10/5e3ff900bbcdbe2bee0e143cfb06076fb0a27d1c582d88dff9eba57458207dc2c76a47b178403ae4c36ec8a48e5fb1ddbefc310f73a4baaf24b4528a488514b1
-  languageName: node
-  linkType: hard
-
 "@metamask/bridge-controller@npm:^71.0.0":
   version: 71.0.0
   resolution: "@metamask/bridge-controller@npm:71.0.0"
@@ -8195,7 +8103,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/bridge-status-controller@npm:71.1.0":
+"@metamask/bridge-status-controller@npm:71.1.0, @metamask/bridge-status-controller@npm:^71.1.0":
   version: 71.1.0
   resolution: "@metamask/bridge-status-controller@npm:71.1.0"
   dependencies:
@@ -8292,6 +8200,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/chomp-api-service@npm:3.0.0, @metamask/chomp-api-service@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@metamask/chomp-api-service@npm:3.0.0"
+  dependencies:
+    "@metamask/base-data-service": "npm:^0.1.1"
+    "@metamask/controller-utils": "npm:^11.20.0"
+    "@metamask/messenger": "npm:^1.2.0"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@metamask/utils": "npm:^11.9.0"
+    "@tanstack/query-core": "npm:^4.43.0"
+  checksum: 10/9d4a4c4eeaaef91535fe161c79b7bd95d3aff536b2c061d07b71276ba640ca8b6d235ac2c4695d3a70b429373cf42ded3c645603e8081753a8136f4e0aa84a44
+  languageName: node
+  linkType: hard
+
 "@metamask/client-controller@npm:^1.0.1":
   version: 1.0.1
   resolution: "@metamask/client-controller@npm:1.0.1"
@@ -8418,11 +8340,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/design-system-react-native@npm:^0.21.0":
-  version: 0.21.0
-  resolution: "@metamask/design-system-react-native@npm:0.21.0"
+"@metamask/design-system-react-native@npm:^0.23.0":
+  version: 0.23.0
+  resolution: "@metamask/design-system-react-native@npm:0.23.0"
   dependencies:
-    "@metamask/design-system-shared": "npm:^0.14.0"
+    "@metamask/design-system-shared": "npm:^0.16.0"
     fast-text-encoding: "npm:^1.0.6"
     react-native-jazzicon: "npm:^0.1.2"
   peerDependencies:
@@ -8435,18 +8357,18 @@ __metadata:
     react-native-gesture-handler: ">=2.25.0"
     react-native-reanimated: ">=3.17.0"
     react-native-safe-area-context: ">=5.0.0"
-  checksum: 10/de17b883386c30306991a3d3fff821c9677b6127d52ec72a3c743b19dc96b051b9e5ffe1f5d9646b873da6b9635d054647a5db86398d80fee3540878ba9e30be
+  checksum: 10/76c88e0cb8e263361eeb53b63c90dfc6718502012cc00cc76c18d2ec5e70520b63717ed66c03103c7846f8405934a15cb91e571e87eaa2255963c6657953a270
   languageName: node
   linkType: hard
 
-"@metamask/design-system-shared@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "@metamask/design-system-shared@npm:0.14.0"
+"@metamask/design-system-shared@npm:^0.16.0":
+  version: 0.16.0
+  resolution: "@metamask/design-system-shared@npm:0.16.0"
   dependencies:
     "@metamask/utils": "npm:^11.11.0"
   peerDependencies:
     react: ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: 10/4dcc955c86f69666013ec8f743532c26e13d9f39204568e07c41114e597d7bc31df834ef4148ce6619e2ea11f76055b9344b27e0fb068c6338a14ffa550fb2a3
+  checksum: 10/3311b3ac9c2e24eb39d6fac9df34e2c2d2390e189ca1a71e335ea7a49f8bc423e2bc4676ce26b1a37e78f27b6ec8178016930c288711f363ca18cdff0a0d44be
   languageName: node
   linkType: hard
 
@@ -8462,28 +8384,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/design-tokens@npm:^8.3.0":
-  version: 8.3.0
-  resolution: "@metamask/design-tokens@npm:8.3.0"
-  checksum: 10/b8fc870792f1d66986dce1e2c0d71f291f64a2da3e6c9d74de69b0f814b6479b922420c80bf59d03d9f22072b004c413029517619569ec5c21345a5aedd4c882
+"@metamask/design-tokens@npm:^8.4.0":
+  version: 8.4.0
+  resolution: "@metamask/design-tokens@npm:8.4.0"
+  checksum: 10/8127e4793e03e1ab547bba05f561bfe6455b5779c8a12043dc18395690eda4d43b51a8367d14ecf5b365d927946795ac8479c5a6a10d8a5def1192b89a7884a7
   languageName: node
   linkType: hard
 
-"@metamask/earn-controller@npm:^12.0.0":
-  version: 12.0.0
-  resolution: "@metamask/earn-controller@npm:12.0.0"
+"@metamask/earn-controller@npm:^12.1.0":
+  version: 12.1.0
+  resolution: "@metamask/earn-controller@npm:12.1.0"
   dependencies:
     "@ethersproject/bignumber": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/account-tree-controller": "npm:^7.0.0"
-    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/account-tree-controller": "npm:^7.2.0"
+    "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/controller-utils": "npm:^11.20.0"
-    "@metamask/keyring-api": "npm:^21.6.0"
-    "@metamask/messenger": "npm:^1.1.1"
-    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/messenger": "npm:^1.2.0"
+    "@metamask/network-controller": "npm:^30.1.0"
     "@metamask/stake-sdk": "npm:^3.2.1"
     reselect: "npm:^5.1.1"
-  checksum: 10/9579e17a686090bf887f761976c635b692cbdcc19a0afa1766b30e4c75a68ee4b9276a20137f105557dad13f083ef88d7011acb019746d617e4f76286f08d4b4
+  checksum: 10/db61ea9277181738597709903e88a8456abe2e8d262471236ad6e9dc03691f18959460ed736e89d5f91af78038087c2fe9b5595a9c2892d178d0bfa510c4940f
   languageName: node
   linkType: hard
 
@@ -8554,21 +8476,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-hd-keyring@npm:^13.0.0, @metamask/eth-hd-keyring@npm:^13.1.0":
-  version: 13.1.0
-  resolution: "@metamask/eth-hd-keyring@npm:13.1.0"
+"@metamask/eth-hd-keyring@npm:^14.1.1":
+  version: 14.1.1
+  resolution: "@metamask/eth-hd-keyring@npm:14.1.1"
   dependencies:
     "@ethereumjs/tx": "npm:^5.4.0"
     "@ethereumjs/util": "npm:^9.1.0"
     "@metamask/eth-sig-util": "npm:^8.2.0"
     "@metamask/key-tree": "npm:^10.0.2"
-    "@metamask/keyring-api": "npm:^21.3.0"
-    "@metamask/keyring-utils": "npm:^3.1.0"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-sdk": "npm:^2.0.2"
+    "@metamask/keyring-utils": "npm:^3.2.0"
     "@metamask/scure-bip39": "npm:^2.1.1"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^11.1.0"
-    ethereum-cryptography: "npm:^2.1.2"
-  checksum: 10/7d67c29c6387ffe871995e67e4802b9a6f6eb2f14b556e43690509b342ef66b72765477b27e4b669fe8a00606e219e00991f94da3a74fcedcf339ab765215ae6
+    "@metamask/utils": "npm:^11.11.0"
+    ethereum-cryptography: "npm:^2.2.1"
+  checksum: 10/f711742682a77990310272013523595822e29bfb61980828d1460ab8af888d7c344bb50f04d2611d801d63438e31532d3d66698c595b4fd3ad512b02056b7234
   languageName: node
   linkType: hard
 
@@ -8597,9 +8520,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-middleware@npm:^23.1.1, @metamask/eth-json-rpc-middleware@npm:^23.1.2":
-  version: 23.1.2
-  resolution: "@metamask/eth-json-rpc-middleware@npm:23.1.2"
+"@metamask/eth-json-rpc-middleware@npm:^23.1.2, @metamask/eth-json-rpc-middleware@npm:^23.1.3":
+  version: 23.1.3
+  resolution: "@metamask/eth-json-rpc-middleware@npm:23.1.3"
   dependencies:
     "@metamask/eth-block-tracker": "npm:^15.0.1"
     "@metamask/eth-json-rpc-provider": "npm:^6.0.1"
@@ -8612,7 +8535,7 @@ __metadata:
     klona: "npm:^2.0.6"
     pify: "npm:^5.0.0"
     safe-stable-stringify: "npm:^2.4.3"
-  checksum: 10/394cd692f76d28133f4956956e4c8e3b97f3b6c98f461e223c6a1f35b4a174d207bc9806bc834d7090501192a4055b08ecb4a114158c637fb8826ba34d274b81
+  checksum: 10/aee4866afa78cb21aed9daa1211ee9a3515cb9549d9b325d5904b8769fb54790296224b58ec3555eb34a7125d2fd5180d6cba915bb1ca8dc3f04bf75e502c6b0
   languageName: node
   linkType: hard
 
@@ -8654,9 +8577,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-ledger-bridge-keyring@npm:^11.4.0":
-  version: 11.4.0
-  resolution: "@metamask/eth-ledger-bridge-keyring@npm:11.4.0"
+"@metamask/eth-ledger-bridge-keyring@npm:^12.0.2":
+  version: 12.0.2
+  resolution: "@metamask/eth-ledger-bridge-keyring@npm:12.0.2"
   dependencies:
     "@ethereumjs/rlp": "npm:^5.0.2"
     "@ethereumjs/tx": "npm:^5.4.0"
@@ -8664,42 +8587,43 @@ __metadata:
     "@ledgerhq/hw-app-eth": "npm:^6.42.0"
     "@metamask/eth-sig-util": "npm:^8.2.0"
     "@metamask/hw-wallet-sdk": "npm:^0.8.0"
-    "@metamask/keyring-api": "npm:^22.0.0"
-    "@metamask/keyring-sdk": "npm:^1.2.0"
-    "@metamask/keyring-utils": "npm:^3.2.0"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-sdk": "npm:^2.0.2"
     hdkey: "npm:^2.1.0"
-  checksum: 10/a1a29685cb40c8e45480d1370f0977a40c7b9340d78d47bcdb710f5ad540e458887e03355ff6501acbe953a8b07b855df0826a8b59239dbcea74e26f49057471
+  checksum: 10/ae646d6c8824fcc4c9ce8832d9b239296222df97177f150ded7cc145c77c4030ed70c947456cb2037d756aa5e654e635e758e4b4c196f62a53e49dbf49f14761
   languageName: node
   linkType: hard
 
-"@metamask/eth-money-keyring@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@metamask/eth-money-keyring@npm:2.0.0"
+"@metamask/eth-money-keyring@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "@metamask/eth-money-keyring@npm:2.0.4"
   dependencies:
-    "@metamask/eth-hd-keyring": "npm:^13.1.0"
-    "@metamask/keyring-api": "npm:^22.0.0"
+    "@metamask/eth-hd-keyring": "npm:^14.1.1"
+    "@metamask/keyring-api": "npm:^23.1.0"
     "@metamask/keyring-utils": "npm:^3.2.0"
     "@metamask/superstruct": "npm:^3.1.0"
     async-mutex: "npm:^0.5.0"
-  checksum: 10/d94926d6100d9b3f177e7f3754505803df024eff4eeca4e593f6dfb1ddecf70cdcdc84e0389a68a234089ed28c797a81c2ac4cbfe691d29c4b2883eb62f3657a
+  checksum: 10/2e3941355be1750c433cf8106235df1b0785becc47c0c87dfabbe7ed43006fa5d303bca70a1d5a308c0d0b281b75468440ab5c8883d70e12fa3923a5ccba3dd1
   languageName: node
   linkType: hard
 
-"@metamask/eth-qr-keyring@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@metamask/eth-qr-keyring@npm:1.1.0"
+"@metamask/eth-qr-keyring@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@metamask/eth-qr-keyring@npm:2.0.2"
   dependencies:
     "@ethereumjs/rlp": "npm:^5.0.2"
     "@ethereumjs/tx": "npm:^5.4.0"
     "@ethereumjs/util": "npm:^9.1.0"
     "@keystonehq/bc-ur-registry-eth": "npm:^0.19.1"
     "@metamask/eth-sig-util": "npm:^8.2.0"
-    "@metamask/keyring-utils": "npm:^3.1.0"
-    "@metamask/utils": "npm:^11.1.0"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-sdk": "npm:^2.0.2"
+    "@metamask/keyring-utils": "npm:^3.2.0"
+    "@metamask/utils": "npm:^11.11.0"
     async-mutex: "npm:^0.5.0"
     hdkey: "npm:^2.1.0"
     uuid: "npm:^9.0.1"
-  checksum: 10/ec72d2dff1662b2332169969f730722b87af2f361b7f97bd59c4e23e539a05a3229b76e767ddc0a8126ac01eea9ca3e63591b854ba9dd1c39227d0faba6c594c
+  checksum: 10/50818fb7b33ae8e07e4250e744f01194d5436fbb877db2f7339544f19ee361696471e95e2c2a8814a09f1cb1c6447ad0e3b1a21f006e9feead3adcbc2529ac37
   languageName: node
   linkType: hard
 
@@ -8728,16 +8652,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-simple-keyring@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "@metamask/eth-simple-keyring@npm:11.0.0"
+"@metamask/eth-simple-keyring@npm:^12.0.2":
+  version: 12.0.2
+  resolution: "@metamask/eth-simple-keyring@npm:12.0.2"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
     "@metamask/eth-sig-util": "npm:^8.2.0"
-    "@metamask/utils": "npm:^11.1.0"
-    ethereum-cryptography: "npm:^2.1.2"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-sdk": "npm:^2.0.2"
+    "@metamask/utils": "npm:^11.11.0"
+    ethereum-cryptography: "npm:^2.2.1"
     randombytes: "npm:^2.1.0"
-  checksum: 10/fba27f2db11ad7ee3aceea6746e32f2875a692bd12a31a18ed63f6c637a9ecd990ed1b55423d6c010380a8539b39d627c72ffedbdc44b88512778426df71d26d
+  checksum: 10/ac8a3a5871fb1b7503ae8714beaad07102ad473522f1c65cf09786a3f3498564763d96a51569ed712702f3a62dfaada4c9342def4d48e2c5a1f0985b5cd49725
   languageName: node
   linkType: hard
 
@@ -8764,29 +8690,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-snap-keyring@npm:^20.0.0":
-  version: 20.0.0
-  resolution: "@metamask/eth-snap-keyring@npm:20.0.0"
+"@metamask/eth-snap-keyring@npm:^22.0.1":
+  version: 22.0.1
+  resolution: "@metamask/eth-snap-keyring@npm:22.0.1"
   dependencies:
     "@ethereumjs/tx": "npm:^5.4.0"
     "@metamask/eth-sig-util": "npm:^8.2.0"
-    "@metamask/keyring-api": "npm:^22.0.0"
-    "@metamask/keyring-internal-api": "npm:^10.0.1"
-    "@metamask/keyring-internal-snap-client": "npm:^9.0.1"
-    "@metamask/keyring-snap-sdk": "npm:^8.0.0"
+    "@metamask/keyring-internal-api": "npm:^11.0.1"
+    "@metamask/keyring-internal-snap-client": "npm:^10.0.3"
+    "@metamask/keyring-sdk": "npm:^2.0.2"
+    "@metamask/keyring-snap-sdk": "npm:^9.0.1"
     "@metamask/keyring-utils": "npm:^3.2.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/messenger": "npm:^1.1.1"
+    "@metamask/snaps-controllers": "npm:^19.0.1"
     "@metamask/snaps-sdk": "npm:^11.0.0"
-    "@metamask/snaps-utils": "npm:^12.1.2"
+    "@metamask/snaps-utils": "npm:^12.1.3"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^11.1.0"
+    "@metamask/utils": "npm:^11.11.0"
     "@types/uuid": "npm:^9.0.8"
     async-mutex: "npm:^0.5.0"
     uuid: "npm:^9.0.1"
   peerDependencies:
-    "@metamask/keyring-api": ^22.0.0
-  checksum: 10/6da8b4ef02c700e4e1a1ec4716489e48b559e9c88b7d72de1fb9a2d7f1850d21f638dda0be23878c709508e0be471a3e1d95661d6388121d123fff9cf75ceb9c
+    "@metamask/keyring-api": ^23.0.0
+  checksum: 10/138a17918ba3fae5788f8c80fe48df959055d8e0567ae62114ae7754f7a0b812bc9efe7f211c0ee0f303cc1d6b898b9049d4743d30f947e5075ac8f273168a1c
   languageName: node
   linkType: hard
 
@@ -8952,13 +8878,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/hw-wallet-sdk@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "@metamask/hw-wallet-sdk@npm:0.7.0"
-  checksum: 10/2381f6fd8d3c3f74153345a63148c0cabb150b764822bd336ec855cc2d63dada0b8866568a87e68a3266fd63c7c7dc5845e33975afd6fc88d32efe6258fe0633
-  languageName: node
-  linkType: hard
-
 "@metamask/hw-wallet-sdk@npm:^0.8.0":
   version: 0.8.0
   resolution: "@metamask/hw-wallet-sdk@npm:0.8.0"
@@ -8966,17 +8885,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.2, @metamask/json-rpc-engine@npm:^10.0.3, @metamask/json-rpc-engine@npm:^10.1.0, @metamask/json-rpc-engine@npm:^10.1.1, @metamask/json-rpc-engine@npm:^10.2.3, @metamask/json-rpc-engine@npm:^10.2.4":
-  version: 10.2.4
-  resolution: "@metamask/json-rpc-engine@npm:10.2.4"
+"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.2, @metamask/json-rpc-engine@npm:^10.0.3, @metamask/json-rpc-engine@npm:^10.1.0, @metamask/json-rpc-engine@npm:^10.1.1, @metamask/json-rpc-engine@npm:^10.2.3, @metamask/json-rpc-engine@npm:^10.2.4, @metamask/json-rpc-engine@npm:^10.3.0":
+  version: 10.3.0
+  resolution: "@metamask/json-rpc-engine@npm:10.3.0"
   dependencies:
+    "@metamask/messenger": "npm:^1.2.0"
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/safe-event-emitter": "npm:^3.0.0"
     "@metamask/utils": "npm:^11.9.0"
     "@types/deep-freeze-strict": "npm:^1.1.0"
     deep-freeze-strict: "npm:^1.1.1"
     klona: "npm:^2.0.6"
-  checksum: 10/b207dd2a9a44674c141c2e027c082974464a37beada98a27e80fe59c9bd44e2c2a992edf8a8d7e3ed461fa27ed372c95d4e27df18752b558c10bf540b7fe7bcd
+  checksum: 10/8d4da5d933e4be2a85783871b6f1282763cbb5bc559e3228da099c75517530e3ac42a040109f17a4d4ff768f1c8cbcc4358f5e06b820b893af29a13f95180bd6
   languageName: node
   linkType: hard
 
@@ -9018,70 +8938,66 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-api@npm:21.6.0":
-  version: 21.6.0
-  resolution: "@metamask/keyring-api@npm:21.6.0"
-  dependencies:
-    "@ethereumjs/tx": "npm:^5.4.0"
-    "@metamask/eth-sig-util": "npm:^8.2.0"
-    "@metamask/keyring-utils": "npm:^3.2.0"
-    "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^11.1.0"
-    "@types/uuid": "npm:^9.0.8"
-    async-mutex: "npm:^0.5.0"
-    bitcoin-address-validation: "npm:^2.2.3"
-    uuid: "npm:^9.0.1"
-  checksum: 10/ecd482ec83fbdb16da5f0c548db29931edd4718c57550547aed9f3532c8e60ec39a6894571c96a819e5f205e53ec149e6b52710194ac0610960aa51834f15dd8
-  languageName: node
-  linkType: hard
-
-"@metamask/keyring-api@npm:23.0.1":
-  version: 23.0.1
-  resolution: "@metamask/keyring-api@npm:23.0.1"
+"@metamask/keyring-api@npm:23.1.0, @metamask/keyring-api@npm:^23.0.1, @metamask/keyring-api@npm:^23.1.0":
+  version: 23.1.0
+  resolution: "@metamask/keyring-api@npm:23.1.0"
   dependencies:
     "@metamask/keyring-utils": "npm:^3.2.0"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.11.0"
     bitcoin-address-validation: "npm:^2.2.3"
-  checksum: 10/a74f302edda5035f999b714f16ee4934f757695bfd47414932efc34ba14d5e10d37c6632c49ee0cf19cb83729bf453bddb1367ccf1affeb7b92400b2bd6ca105
+  checksum: 10/ca7e1b49f8c30078ebd76f1f7e74c57846ac3e73ffdc2f7b446af6cb3c006cef75a13eec6a0aeae0bfefbb5549d576af410bb9df16196fcefe17ded64f8714f2
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@npm:^25.1.0, @metamask/keyring-controller@npm:^25.1.1, @metamask/keyring-controller@npm:^25.2.0":
-  version: 25.2.0
-  resolution: "@metamask/keyring-controller@npm:25.2.0"
+"@metamask/keyring-controller@npm:^25.1.0, @metamask/keyring-controller@npm:^25.1.1, @metamask/keyring-controller@npm:^25.2.0, @metamask/keyring-controller@npm:^25.3.0, @metamask/keyring-controller@npm:^25.4.0":
+  version: 25.4.0
+  resolution: "@metamask/keyring-controller@npm:25.4.0"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
-    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/browser-passworder": "npm:^6.0.0"
-    "@metamask/eth-hd-keyring": "npm:^13.0.0"
+    "@metamask/eth-hd-keyring": "npm:^14.1.1"
     "@metamask/eth-sig-util": "npm:^8.2.0"
-    "@metamask/eth-simple-keyring": "npm:^11.0.0"
-    "@metamask/keyring-api": "npm:^21.6.0"
-    "@metamask/keyring-internal-api": "npm:^10.0.0"
-    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/eth-simple-keyring": "npm:^12.0.2"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-internal-api": "npm:^11.0.1"
+    "@metamask/messenger": "npm:^1.2.0"
     "@metamask/utils": "npm:^11.9.0"
     async-mutex: "npm:^0.5.0"
     ethereumjs-wallet: "npm:^1.0.1"
     immer: "npm:^9.0.6"
     lodash: "npm:^4.17.21"
     ulid: "npm:^2.3.0"
-  checksum: 10/5f7938312d139621c7a185d55e385c336f96f9d39c42c6a52705af0042cec6157f8bfc850921f240c11e452fe8d433783b1e252304ecc20938b3f7ba92850d87
+  checksum: 10/d3d41b24a35d3ecc79077136b23397a54540710faf311281249460a2258a8a02b8fe0536c193e9155857aa2784e0da78e265e541cc024e890d3599349bddf05a
   languageName: node
   linkType: hard
 
-"@metamask/keyring-internal-api@npm:^10.0.0, @metamask/keyring-internal-api@npm:^10.0.1, @metamask/keyring-internal-api@npm:^10.1.1":
-  version: 10.1.1
-  resolution: "@metamask/keyring-internal-api@npm:10.1.1"
+"@metamask/keyring-internal-api@npm:^11.0.1":
+  version: 11.0.1
+  resolution: "@metamask/keyring-internal-api@npm:11.0.1"
   dependencies:
-    "@metamask/keyring-api": "npm:^23.0.1"
+    "@metamask/keyring-api": "npm:^23.1.0"
     "@metamask/keyring-utils": "npm:^3.2.0"
     "@metamask/superstruct": "npm:^3.1.0"
-  checksum: 10/056f1e957e07e0622a0d61abfb567f2020e94fb2bc68d3db599b2ec74fa222c874642a6eaef6ccfd1923619e1353ba819fdad729c989b9dc0df6c3127cc14a59
+  checksum: 10/d35a5b45887566f47e41c1109e9f4eca5108fd1b8402773d40a882c904de0f33cc70e0cc7d1e1a34397ae434646c597d9793c31dbedc83cdf64e41f8e719ccc4
+  languageName: node
+  linkType: hard
+
+"@metamask/keyring-internal-snap-client@npm:^10.0.3":
+  version: 10.0.3
+  resolution: "@metamask/keyring-internal-snap-client@npm:10.0.3"
+  dependencies:
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-internal-api": "npm:^11.0.1"
+    "@metamask/keyring-snap-client": "npm:^9.0.2"
+    "@metamask/keyring-utils": "npm:^3.2.0"
+    "@metamask/messenger": "npm:^1.1.1"
+  checksum: 10/30c00a2f39125e7f99bd6513096f23fa243f30cd7ce4e77aa96f52c66fa99c077dfba0544d2693e16c283a2a5610f6b844eaa39130d1f760390d6ca1f53f0507
   languageName: node
   linkType: hard
 
-"@metamask/keyring-internal-snap-client@npm:^9.0.0, @metamask/keyring-internal-snap-client@npm:^9.0.1":
+"@metamask/keyring-internal-snap-client@npm:^9.0.0":
   version: 9.0.1
   resolution: "@metamask/keyring-internal-snap-client@npm:9.0.1"
   dependencies:
@@ -9094,21 +9010,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-sdk@npm:^1.1.0, @metamask/keyring-sdk@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@metamask/keyring-sdk@npm:1.2.0"
+"@metamask/keyring-sdk@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@metamask/keyring-sdk@npm:2.0.2"
   dependencies:
     "@ethereumjs/tx": "npm:^5.4.0"
     "@metamask/eth-sig-util": "npm:^8.2.0"
-    "@metamask/keyring-api": "npm:^22.0.0"
+    "@metamask/keyring-api": "npm:^23.1.0"
     "@metamask/keyring-utils": "npm:^3.2.0"
     "@metamask/scure-bip39": "npm:^2.1.1"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^11.10.0"
+    "@metamask/utils": "npm:^11.11.0"
     async-mutex: "npm:^0.5.0"
-    ethereum-cryptography: "npm:^2.1.2"
+    ethereum-cryptography: "npm:^2.2.1"
     uuid: "npm:^9.0.1"
-  checksum: 10/ea5a406005a59ab453a2768a6787ec8070be3b2b2cc99970f5af975dc65728823725ad5139dc0deee7e91aed74ef9821388f4a295116190ec95ff547ad15a379
+  checksum: 10/2f456613df81580b032215ddf1c90fa9440442d631945329094a488743a71fdbbfe787c2c0809a315a1368ddbf9d3755faa936c54094cb32958fe8222f7e7a86
   languageName: node
   linkType: hard
 
@@ -9128,11 +9044,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-snap-client@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "@metamask/keyring-snap-client@npm:9.0.1"
+"@metamask/keyring-snap-client@npm:^9.0.2":
+  version: 9.0.2
+  resolution: "@metamask/keyring-snap-client@npm:9.0.2"
   dependencies:
-    "@metamask/keyring-api": "npm:^23.0.1"
+    "@metamask/keyring-api": "npm:^23.1.0"
     "@metamask/keyring-utils": "npm:^3.2.0"
     "@metamask/superstruct": "npm:^3.1.0"
     "@types/uuid": "npm:^9.0.8"
@@ -9140,7 +9056,7 @@ __metadata:
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
     "@metamask/providers": ^19.0.0
-  checksum: 10/1f6594bee7c3b49c41bb9597a1ddb25c941fe0182381cd03dd28af5da328a48ec15569e6421e961026eb7189161e63af174061a86ffbe6034ed6c7b24c7b0e1d
+  checksum: 10/f4de52be334d941fffafb6458260875706a09315d68856577a66dd36b069de00260632cfcd0fe9b56528382512dee2c226f61430aafb619869f1b1711d3ffffd
   languageName: node
   linkType: hard
 
@@ -9160,19 +9076,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-snap-sdk@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "@metamask/keyring-snap-sdk@npm:8.0.0"
+"@metamask/keyring-snap-sdk@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "@metamask/keyring-snap-sdk@npm:9.0.1"
   dependencies:
     "@metamask/keyring-utils": "npm:^3.2.0"
     "@metamask/snaps-sdk": "npm:^11.0.0"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^11.1.0"
+    "@metamask/utils": "npm:^11.11.0"
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
-    "@metamask/keyring-api": ^22.0.0
+    "@metamask/keyring-api": ^23.0.0
     "@metamask/providers": ^19.0.0
-  checksum: 10/271b4f84d214813c0312ffbbe3fb6201b66172210da4d06a155c3ddb359403ed1fa4c7afa424cd34fa9db04e3c876f30f69afb676bb7a905d392552d871ebd57
+  checksum: 10/02e33662cb82562a86b1ac1d0f5c36b94be3cd17ff31fd8aa6358ee5880a6b8f4fa84e02ea50971395d56a4aaa6be2c573c9862d8fafaf06266db200c14c9497
   languageName: node
   linkType: hard
 
@@ -9223,9 +9139,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/messenger@npm:^1.0.0, @metamask/messenger@npm:^1.1.0, @metamask/messenger@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "@metamask/messenger@npm:1.1.1"
+"@metamask/messenger@npm:^1.0.0, @metamask/messenger@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "@metamask/messenger@npm:1.2.0"
   dependencies:
     "@metamask/utils": "npm:^11.9.0"
     yargs: "npm:^17.7.2"
@@ -9233,7 +9149,7 @@ __metadata:
     typescript: ">=5.0.0"
   bin:
     messenger-generate-action-types: ./dist/generate-action-types/cli.mjs
-  checksum: 10/a959af95e9e117aa0f7ad1c280f7817fef2c0b575c76837b1a6c884c9c9ef1dd0faeaef0c2c0c2035f68c7638d1f87cd172956ee962dec97d8ab6176fa6964e3
+  checksum: 10/6818e4609d6162a436cc07955905f9e57ff6dbef841e9066a5fb9cc0538e981526fbcb5eef1fa1968d79212d57ddda2fce4dda5f87eb64d8d98f7db1216a6a98
   languageName: node
   linkType: hard
 
@@ -9291,18 +9207,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/money-account-controller@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "@metamask/money-account-controller@npm:0.1.0"
+"@metamask/money-account-controller@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "@metamask/money-account-controller@npm:0.2.0"
   dependencies:
-    "@metamask/accounts-controller": "npm:^37.2.0"
-    "@metamask/base-controller": "npm:^9.0.1"
-    "@metamask/eth-money-keyring": "npm:^2.0.0"
-    "@metamask/keyring-api": "npm:^21.6.0"
-    "@metamask/keyring-controller": "npm:^25.2.0"
-    "@metamask/messenger": "npm:^1.1.0"
+    "@metamask/accounts-controller": "npm:^38.0.0"
+    "@metamask/base-controller": "npm:^9.1.0"
+    "@metamask/eth-money-keyring": "npm:^2.0.4"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-controller": "npm:^25.4.0"
+    "@metamask/messenger": "npm:^1.2.0"
     async-mutex: "npm:^0.5.0"
-  checksum: 10/62d34c42ea388d621346277cfaf9038cd80b87dccfaade8b93d3cec087b9c77ec5ec71ff9f30c02a3f566ac71ec4e8234761cb775f11896a8cf85583b8e6ed06
+  checksum: 10/66d7c631f27713b5528da3cfa4721e38a5570f96e63bedaea2969925037588274e83c45292fed41b7f4631461b6761cbd725c7cf1649234208e71202b236007a
+  languageName: node
+  linkType: hard
+
+"@metamask/money-account-upgrade-controller@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "@metamask/money-account-upgrade-controller@npm:1.3.1"
+  dependencies:
+    "@metamask/base-controller": "npm:^9.1.0"
+    "@metamask/chomp-api-service": "npm:^3.0.0"
+    "@metamask/keyring-controller": "npm:^25.4.0"
+    "@metamask/messenger": "npm:^1.2.0"
+    "@metamask/network-controller": "npm:^30.1.0"
+    "@metamask/utils": "npm:^11.9.0"
+  checksum: 10/c89c07556f2c99ca72c3358d00bdde78bf9c3666794bf3847dcee2b4f312920037fcdb500b0bd22a1366cc3fb948d0ebec9dd0375cc633f728cdeedd7064bf99
   languageName: node
   linkType: hard
 
@@ -9362,35 +9292,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/multichain-network-controller@npm:^3.0.4, @metamask/multichain-network-controller@npm:^3.0.5, @metamask/multichain-network-controller@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "@metamask/multichain-network-controller@npm:3.0.6"
+"@metamask/multichain-network-controller@npm:^3.0.6, @metamask/multichain-network-controller@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@metamask/multichain-network-controller@npm:3.1.0"
   dependencies:
-    "@metamask/accounts-controller": "npm:^37.1.0"
-    "@metamask/base-controller": "npm:^9.0.1"
-    "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/keyring-api": "npm:^21.6.0"
-    "@metamask/keyring-internal-api": "npm:^10.0.0"
-    "@metamask/messenger": "npm:^1.0.0"
-    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/accounts-controller": "npm:^38.0.0"
+    "@metamask/base-controller": "npm:^9.1.0"
+    "@metamask/controller-utils": "npm:^11.20.0"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-internal-api": "npm:^11.0.1"
+    "@metamask/messenger": "npm:^1.2.0"
+    "@metamask/network-controller": "npm:^30.1.0"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.9.0"
     "@solana/addresses": "npm:^2.0.0"
     lodash: "npm:^4.17.21"
-  checksum: 10/c7e937851b8c944b30c3eafa7d2cfd8d62df9a0278583933912f3c5e1c971f072c5c7e0882677cfe251efd3885e2a0a547c404bd7c2efcf6757c6601431b42a3
+  checksum: 10/710e3ba48c442592409327e40cb58e3cd40269f33510c1f3b95ef3cbe1a91c2a8f82050656e2670947862017941475c6c82a201d5a218ea4ee741a4b3be1c0cd
   languageName: node
   linkType: hard
 
-"@metamask/multichain-transactions-controller@npm:^7.0.4":
-  version: 7.0.4
-  resolution: "@metamask/multichain-transactions-controller@npm:7.0.4"
+"@metamask/multichain-transactions-controller@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "@metamask/multichain-transactions-controller@npm:7.1.0"
   dependencies:
-    "@metamask/accounts-controller": "npm:^37.1.1"
-    "@metamask/base-controller": "npm:^9.0.1"
-    "@metamask/keyring-api": "npm:^21.6.0"
-    "@metamask/keyring-internal-api": "npm:^10.0.0"
-    "@metamask/keyring-snap-client": "npm:^8.2.0"
-    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/accounts-controller": "npm:^38.0.0"
+    "@metamask/base-controller": "npm:^9.1.0"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-internal-api": "npm:^11.0.1"
+    "@metamask/keyring-snap-client": "npm:^9.0.2"
+    "@metamask/messenger": "npm:^1.2.0"
     "@metamask/polling-controller": "npm:^16.0.4"
     "@metamask/snaps-controllers": "npm:^19.0.0"
     "@metamask/snaps-sdk": "npm:^11.0.0"
@@ -9399,7 +9329,7 @@ __metadata:
     "@types/uuid": "npm:^8.3.0"
     immer: "npm:^9.0.6"
     uuid: "npm:^8.3.2"
-  checksum: 10/e0a7ab0ddbe8f06dcf7673947c5251f908f8ba05127d724d8dba66f3456944b982b30714b198300c8dc906a5cdb00a6ecbe3928c6730bb029f61d3b308b4d669
+  checksum: 10/38e5be05c12e43cdab875f1f7c46fc8feaeacedff6bf0080dd90a7fa509b78c2f2168f8aca0f706c39725c76b735125c6b75649bc43d24010e5c63466d4c820b
   languageName: node
   linkType: hard
 
@@ -9414,20 +9344,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-controller@npm:^30.0.0, @metamask/network-controller@npm:^30.0.1":
-  version: 30.0.1
-  resolution: "@metamask/network-controller@npm:30.0.1"
+"@metamask/network-controller@npm:^30.0.0, @metamask/network-controller@npm:^30.0.1, @metamask/network-controller@npm:^30.1.0":
+  version: 30.1.0
+  resolution: "@metamask/network-controller@npm:30.1.0"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/connectivity-controller": "npm:^0.2.0"
-    "@metamask/controller-utils": "npm:^11.19.0"
+    "@metamask/controller-utils": "npm:^11.20.0"
     "@metamask/eth-block-tracker": "npm:^15.0.1"
     "@metamask/eth-json-rpc-infura": "npm:^10.3.0"
-    "@metamask/eth-json-rpc-middleware": "npm:^23.1.1"
+    "@metamask/eth-json-rpc-middleware": "npm:^23.1.3"
     "@metamask/eth-json-rpc-provider": "npm:^6.0.1"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/json-rpc-engine": "npm:^10.2.4"
-    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/messenger": "npm:^1.2.0"
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/swappable-obj-proxy": "npm:^2.3.0"
     "@metamask/utils": "npm:^11.9.0"
@@ -9438,43 +9368,25 @@ __metadata:
     reselect: "npm:^5.1.1"
     uri-js: "npm:^4.4.1"
     uuid: "npm:^8.3.2"
-  checksum: 10/8679db3ef1c1b39931c0b9133ff26eb55a4385e55e3519253cb51bed38b0ab46ea2e9112f689a7229f5cf0883135aef64d5719cb28870637d6a7c4f1e714d346
+  checksum: 10/b2947c3c34d8f2f326c3ed1504e1d194b5af77db1e07c4b25f8f8c4b1e9e16cd30ab54a8a8f716d731f989c8f1119e9aeefa30ed26d89928a9110c21ce3968d5
   languageName: node
   linkType: hard
 
-"@metamask/network-enablement-controller@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "@metamask/network-enablement-controller@npm:4.2.0"
-  dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/keyring-api": "npm:^21.5.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/multichain-network-controller": "npm:^3.0.4"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/slip44": "npm:^4.3.0"
-    "@metamask/transaction-controller": "npm:^62.20.0"
-    "@metamask/utils": "npm:^11.9.0"
-    reselect: "npm:^5.1.1"
-  checksum: 10/293efbfbf6b157e248ea1c7bf5fc70abfde4c47802ff2af25978b723ac3b7e657980566a2a3d1311a263209ea650cfa531482a087660dc6178c09e2491806341
-  languageName: node
-  linkType: hard
-
-"@metamask/network-enablement-controller@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "@metamask/network-enablement-controller@npm:5.0.2"
+"@metamask/network-enablement-controller@npm:^5.0.2, @metamask/network-enablement-controller@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "@metamask/network-enablement-controller@npm:5.1.0"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/controller-utils": "npm:^11.20.0"
-    "@metamask/keyring-api": "npm:^21.6.0"
-    "@metamask/messenger": "npm:^1.0.0"
-    "@metamask/multichain-network-controller": "npm:^3.0.6"
-    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/messenger": "npm:^1.2.0"
+    "@metamask/multichain-network-controller": "npm:^3.1.0"
+    "@metamask/network-controller": "npm:^30.1.0"
     "@metamask/slip44": "npm:^4.3.0"
-    "@metamask/transaction-controller": "npm:^64.0.0"
+    "@metamask/transaction-controller": "npm:^65.0.0"
     "@metamask/utils": "npm:^11.9.0"
     reselect: "npm:^5.1.1"
-  checksum: 10/cd208e9700cc620d5edbf34be10cbb820498985d2e0f186897c979a6a86e8af2b87a5d080f872c030e336867e826d169e4f23d66e1e00a0712a1bdfd09e566e1
+  checksum: 10/79362d20e1b01602cebaa1c642ab93d32dd0a143d8e52d484b22ddd97f249dde9965b1ad93a6a432c5607a30af09e8b3ed767548bc246816de36b802a26732c1
   languageName: node
   linkType: hard
 
@@ -9561,6 +9473,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/permission-controller@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "@metamask/permission-controller@npm:13.0.0"
+  dependencies:
+    "@metamask/approval-controller": "npm:^9.0.1"
+    "@metamask/base-controller": "npm:^9.1.0"
+    "@metamask/controller-utils": "npm:^11.20.0"
+    "@metamask/json-rpc-engine": "npm:^10.3.0"
+    "@metamask/messenger": "npm:^1.2.0"
+    "@metamask/rpc-errors": "npm:^7.0.2"
+    "@metamask/utils": "npm:^11.9.0"
+    "@types/deep-freeze-strict": "npm:^1.1.0"
+    deep-freeze-strict: "npm:^1.1.1"
+    immer: "npm:^9.0.6"
+    nanoid: "npm:^3.3.8"
+  checksum: 10/e4062076f7dd7da7acf890f66ee7df1a0309bbb9d9adb221f28eefb203318c2675707754b884a0d4f49892608a8771443a97e743c2c68f7c75f123ec7fafbf49
+  languageName: node
+  linkType: hard
+
 "@metamask/phishing-controller@npm:^17.1.1":
   version: 17.1.1
   resolution: "@metamask/phishing-controller@npm:17.1.1"
@@ -9984,25 +9915,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers@npm:^19.0.0":
-  version: 19.0.0
-  resolution: "@metamask/snaps-controllers@npm:19.0.0"
+"@metamask/snaps-controllers@npm:^19.0.0, @metamask/snaps-controllers@npm:^19.0.1":
+  version: 19.0.1
+  resolution: "@metamask/snaps-controllers@npm:19.0.1"
   dependencies:
-    "@metamask/approval-controller": "npm:^9.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/json-rpc-engine": "npm:^10.2.3"
+    "@metamask/approval-controller": "npm:^9.0.1"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/json-rpc-engine": "npm:^10.2.4"
     "@metamask/json-rpc-middleware-stream": "npm:^8.0.8"
     "@metamask/key-tree": "npm:^10.1.1"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/messenger": "npm:^1.1.0"
     "@metamask/object-multiplex": "npm:^2.1.0"
-    "@metamask/permission-controller": "npm:^12.2.1"
+    "@metamask/permission-controller": "npm:^12.3.0"
     "@metamask/post-message-stream": "npm:^10.0.0"
     "@metamask/rpc-errors": "npm:^7.0.3"
     "@metamask/snaps-registry": "npm:^4.0.0"
-    "@metamask/snaps-rpc-methods": "npm:^15.0.1"
+    "@metamask/snaps-rpc-methods": "npm:^15.0.2"
     "@metamask/snaps-sdk": "npm:^11.0.0"
-    "@metamask/snaps-utils": "npm:^12.1.2"
-    "@metamask/storage-service": "npm:^1.0.0"
+    "@metamask/snaps-utils": "npm:^12.1.3"
+    "@metamask/storage-service": "npm:^1.0.1"
     "@metamask/superstruct": "npm:^3.2.1"
     "@metamask/utils": "npm:^11.10.0"
     "@xstate/fsm": "npm:^2.0.0"
@@ -10023,7 +9954,7 @@ __metadata:
   peerDependenciesMeta:
     "@metamask/snaps-execution-environments":
       optional: true
-  checksum: 10/95d4522877aee8d320ace7de396255a827efab6b63ee81a4dfa34d595d65c3e429d586f6895aa70e170201b907b6bf3c7fb33f5bd683768873f92f58817792d3
+  checksum: 10/e7cee816b1af1e2c4cbd25a81afff779427e6d738c1fe283a1ca9b23f67c62b5a983d6ed35e91acf0b15016e6825074557f3376d322a518c1acfc36728d36509
   languageName: node
   linkType: hard
 
@@ -10100,7 +10031,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-rpc-methods@npm:^15.0.1, @metamask/snaps-rpc-methods@npm:^15.1.1":
+"@metamask/snaps-rpc-methods@npm:^15.0.2, @metamask/snaps-rpc-methods@npm:^15.1.1":
   version: 15.1.1
   resolution: "@metamask/snaps-rpc-methods@npm:15.1.1"
   dependencies:
@@ -10131,7 +10062,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^12.1.2, @metamask/snaps-utils@npm:^12.2.0":
+"@metamask/snaps-utils@npm:^12.1.2, @metamask/snaps-utils@npm:^12.1.3, @metamask/snaps-utils@npm:^12.2.0":
   version: 12.2.0
   resolution: "@metamask/snaps-utils@npm:12.2.0"
   dependencies:
@@ -10318,7 +10249,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^62.20.0, @metamask/transaction-controller@npm:^62.22.0":
+"@metamask/transaction-controller@npm:^62.22.0":
   version: 62.22.0
   resolution: "@metamask/transaction-controller@npm:62.22.0"
   dependencies:
@@ -10357,7 +10288,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^64.0.0, @metamask/transaction-controller@npm:^64.2.0, @metamask/transaction-controller@npm:^64.3.0":
+"@metamask/transaction-controller@npm:^64.0.0, @metamask/transaction-controller@npm:^64.2.0":
   version: 64.4.0
   resolution: "@metamask/transaction-controller@npm:64.4.0"
   dependencies:
@@ -10395,9 +10326,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^65.0.0":
-  version: 65.0.0
-  resolution: "@metamask/transaction-controller@npm:65.0.0"
+"@metamask/transaction-controller@npm:^65.0.0, @metamask/transaction-controller@npm:^65.1.0":
+  version: 65.1.0
+  resolution: "@metamask/transaction-controller@npm:65.1.0"
   dependencies:
     "@ethereumjs/common": "npm:^4.4.0"
     "@ethereumjs/tx": "npm:^5.4.0"
@@ -10406,15 +10337,15 @@ __metadata:
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
     "@ethersproject/wallet": "npm:^5.7.0"
-    "@metamask/accounts-controller": "npm:^37.2.0"
+    "@metamask/accounts-controller": "npm:^38.0.0"
     "@metamask/approval-controller": "npm:^9.0.1"
     "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/controller-utils": "npm:^11.20.0"
     "@metamask/core-backend": "npm:^6.2.1"
     "@metamask/gas-fee-controller": "npm:^26.1.1"
-    "@metamask/messenger": "npm:^1.1.1"
+    "@metamask/messenger": "npm:^1.2.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/network-controller": "npm:^30.1.0"
     "@metamask/nonce-tracker": "npm:^6.0.0"
     "@metamask/remote-feature-flag-controller": "npm:^4.2.0"
     "@metamask/rpc-errors": "npm:^7.0.2"
@@ -10429,27 +10360,27 @@ __metadata:
   peerDependencies:
     "@babel/runtime": ^7.0.0
     "@metamask/eth-block-tracker": ">=9"
-  checksum: 10/b8d330c5169068aafc59b757d97d9f2a3ab62d93ff9c03d93974be804aa886ef4277707e6f79be392b7cf3f4f7429e93681f1aac3ad17644aae35aa5e6deacaa
+  checksum: 10/109c4220bdbec0fc1434728cca165948e5231e397ea1836f3146be2b45145a208b496451a175b819ec9d8ae401b5e03a7ac0a13bf1d5c681392d0ad64bd1419f
   languageName: node
   linkType: hard
 
-"@metamask/transaction-pay-controller@npm:^20.0.0":
-  version: 20.0.0
-  resolution: "@metamask/transaction-pay-controller@npm:20.0.0"
+"@metamask/transaction-pay-controller@npm:^21.0.0":
+  version: 21.0.0
+  resolution: "@metamask/transaction-pay-controller@npm:21.0.0"
   dependencies:
     "@ethersproject/abi": "npm:^5.7.0"
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/assets-controller": "npm:^6.2.0"
-    "@metamask/assets-controllers": "npm:^104.3.0"
+    "@metamask/assets-controller": "npm:^6.3.0"
+    "@metamask/assets-controllers": "npm:^105.1.0"
     "@metamask/base-controller": "npm:^9.1.0"
-    "@metamask/bridge-controller": "npm:^70.2.0"
-    "@metamask/bridge-status-controller": "npm:^71.0.0"
+    "@metamask/bridge-controller": "npm:^71.0.0"
+    "@metamask/bridge-status-controller": "npm:^71.1.0"
     "@metamask/controller-utils": "npm:^11.20.0"
     "@metamask/gas-fee-controller": "npm:^26.1.1"
-    "@metamask/messenger": "npm:^1.1.1"
+    "@metamask/messenger": "npm:^1.2.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/network-controller": "npm:^30.1.0"
     "@metamask/ramps-controller": "npm:^13.2.0"
     "@metamask/remote-feature-flag-controller": "npm:^4.2.0"
     "@metamask/transaction-controller": "npm:^65.0.0"
@@ -10458,7 +10389,7 @@ __metadata:
     bn.js: "npm:^5.2.1"
     immer: "npm:^9.0.6"
     lodash: "npm:^4.17.21"
-  checksum: 10/c67e9e911711dda45973f053ef1c4dd3c825f72749263d694a6a01279f06bfbe958c9b1f82ea2c798fc555adae3ca5936c66a63c141e355d588f692752f17807
+  checksum: 10/090dc5efad84ceb2f956b30cec3544125080dc6f9ff5b6030f6446ceca59e9ea0c085309a780f9ffbaa75d3263c067e89fdc7f50ea3354f031ccb465c630ec48
   languageName: node
   linkType: hard
 
@@ -28142,16 +28073,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-jest@npm:^29.0.1":
-  version: 29.14.0
-  resolution: "eslint-plugin-jest@npm:29.14.0"
+"eslint-plugin-jest@npm:^29.0.1, eslint-plugin-jest@npm:^29.14.0":
+  version: 29.15.1
+  resolution: "eslint-plugin-jest@npm:29.15.1"
   dependencies:
     "@typescript-eslint/utils": "npm:^8.0.0"
   peerDependencies:
     "@typescript-eslint/eslint-plugin": ^8.0.0
     eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
     jest: "*"
-    typescript: ">=4.8.4 <6.0.0"
+    typescript: ">=4.8.4 <7.0.0"
   peerDependenciesMeta:
     "@typescript-eslint/eslint-plugin":
       optional: true
@@ -28159,7 +28090,7 @@ __metadata:
       optional: true
     typescript:
       optional: true
-  checksum: 10/657de023058e5ca55467ca4b04a5e70d12c4c5c19d56fa123fcb867c8e1bcb1b40dc66270e12206a8011794e15a86f75e7d3a7fb71bfc8648be58e1da7e7ffa5
+  checksum: 10/436ae3c695f0dfe443e19d0ad94ede6e78adfaf47ba89db7046ac77b0e82127ad12ac2ed50846ef9f360d6c1bd5f0d2841b7fe5ff6e246eb069b0e85197a42fd
   languageName: node
   linkType: hard
 
@@ -35716,11 +35647,11 @@ __metadata:
     "@ledgerhq/hw-app-eth": "npm:^6.42.0"
     "@ledgerhq/react-native-hw-transport-ble": "npm:^6.37.0"
     "@metamask/abi-utils": "npm:^3.0.0"
-    "@metamask/account-api": "npm:^1.0.0"
-    "@metamask/account-tree-controller": "npm:^7.1.0"
-    "@metamask/accounts-controller": "npm:^37.2.0"
+    "@metamask/account-api": "npm:^1.0.4"
+    "@metamask/account-tree-controller": "npm:^7.2.0"
+    "@metamask/accounts-controller": "npm:^38.0.0"
     "@metamask/address-book-controller": "npm:^7.1.0"
-    "@metamask/ai-controllers": "npm:^0.6.0"
+    "@metamask/ai-controllers": "npm:0.6.3"
     "@metamask/analytics-controller": "npm:^1.0.0"
     "@metamask/app-metadata-controller": "npm:^2.0.0"
     "@metamask/approval-controller": "npm:^9.0.0"
@@ -35736,6 +35667,7 @@ __metadata:
     "@metamask/browser-playground": "npm:0.3.0"
     "@metamask/build-utils": "npm:^3.0.0"
     "@metamask/chain-agnostic-permission": "npm:^1.5.0"
+    "@metamask/chomp-api-service": "npm:3.0.0"
     "@metamask/client-controller": "npm:^1.0.1"
     "@metamask/compliance-controller": "npm:2.0.0"
     "@metamask/connectivity-controller": "npm:^0.1.0"
@@ -35743,24 +35675,24 @@ __metadata:
     "@metamask/core-backend": "npm:^6.2.0"
     "@metamask/delegation-controller": "npm:^2.0.2"
     "@metamask/delegation-deployments": "npm:^1.0.0"
-    "@metamask/design-system-react-native": "npm:^0.21.0"
+    "@metamask/design-system-react-native": "npm:^0.23.0"
     "@metamask/design-system-twrnc-preset": "npm:^0.4.2"
-    "@metamask/design-tokens": "npm:^8.3.0"
-    "@metamask/earn-controller": "npm:^12.0.0"
+    "@metamask/design-tokens": "npm:^8.4.0"
+    "@metamask/earn-controller": "npm:^12.1.0"
     "@metamask/eip-5792-middleware": "npm:^2.0.0"
     "@metamask/eip1193-permission-middleware": "npm:^1.0.2"
     "@metamask/ens-resolver-snap": "npm:^1.2.0"
     "@metamask/eslint-config-typescript": "npm:^13.0.0"
     "@metamask/eslint-plugin-design-tokens": "npm:^1.0.0"
-    "@metamask/eth-hd-keyring": "npm:^13.0.0"
+    "@metamask/eth-hd-keyring": "npm:^14.1.1"
     "@metamask/eth-json-rpc-filters": "npm:^9.0.0"
     "@metamask/eth-json-rpc-middleware": "npm:^23.1.2"
-    "@metamask/eth-ledger-bridge-keyring": "npm:^11.4.0"
-    "@metamask/eth-money-keyring": "npm:^2.0.0"
-    "@metamask/eth-qr-keyring": "npm:^1.1.0"
+    "@metamask/eth-ledger-bridge-keyring": "npm:^12.0.2"
+    "@metamask/eth-money-keyring": "npm:^2.0.4"
+    "@metamask/eth-qr-keyring": "npm:^2.0.2"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/eth-sig-util": "npm:^8.0.0"
-    "@metamask/eth-snap-keyring": "npm:^20.0.0"
+    "@metamask/eth-snap-keyring": "npm:^22.0.1"
     "@metamask/etherscan-link": "npm:^2.0.0"
     "@metamask/ethjs-contract": "npm:^0.4.1"
     "@metamask/ethjs-query": "npm:^0.7.1"
@@ -35769,15 +35701,15 @@ __metadata:
     "@metamask/gas-fee-controller": "npm:^26.1.0"
     "@metamask/gator-permissions-controller": "npm:^4.0.0"
     "@metamask/geolocation-controller": "npm:^0.1.1"
-    "@metamask/hw-wallet-sdk": "npm:^0.7.0"
+    "@metamask/hw-wallet-sdk": "npm:^0.8.0"
     "@metamask/json-rpc-engine": "npm:^10.2.3"
     "@metamask/json-rpc-middleware-stream": "npm:^8.0.7"
     "@metamask/key-tree": "patch:@metamask/key-tree@npm%3A10.1.1#~/.yarn/patches/@metamask-key-tree-npm-10.1.1-0bfab435ac.patch"
-    "@metamask/keyring-api": "npm:^21.6.0"
-    "@metamask/keyring-controller": "npm:^25.2.0"
-    "@metamask/keyring-internal-api": "npm:^10.0.0"
-    "@metamask/keyring-sdk": "npm:^1.1.0"
-    "@metamask/keyring-snap-client": "npm:^8.2.1"
+    "@metamask/keyring-api": "npm:^23.1.0"
+    "@metamask/keyring-controller": "npm:^25.4.0"
+    "@metamask/keyring-internal-api": "npm:^11.0.1"
+    "@metamask/keyring-sdk": "npm:^2.0.2"
+    "@metamask/keyring-snap-client": "npm:^9.0.2"
     "@metamask/keyring-utils": "npm:^3.2.0"
     "@metamask/logging-controller": "npm:^8.0.0"
     "@metamask/message-signing-snap": "npm:^1.1.2"
@@ -35787,15 +35719,16 @@ __metadata:
     "@metamask/mobile-wallet-protocol-core": "npm:^0.4.0"
     "@metamask/mobile-wallet-protocol-wallet-client": "npm:^0.3.0"
     "@metamask/money-account-balance-service": "npm:^0.2.0"
-    "@metamask/money-account-controller": "npm:^0.1.0"
+    "@metamask/money-account-controller": "npm:^0.2.0"
+    "@metamask/money-account-upgrade-controller": "npm:^1.3.1"
     "@metamask/multichain-account-service": "npm:^8.0.1"
     "@metamask/multichain-api-client": "npm:^0.10.1"
     "@metamask/multichain-api-middleware": "npm:^2.0.0"
-    "@metamask/multichain-network-controller": "npm:^3.0.5"
-    "@metamask/multichain-transactions-controller": "npm:^7.0.4"
+    "@metamask/multichain-network-controller": "npm:^3.1.0"
+    "@metamask/multichain-transactions-controller": "npm:^7.1.0"
     "@metamask/native-utils": "npm:^0.8.0"
     "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/network-enablement-controller": "npm:^4.2.0"
+    "@metamask/network-enablement-controller": "npm:^5.1.0"
     "@metamask/notification-services-controller": "npm:^23.1.0"
     "@metamask/object-multiplex": "npm:^1.1.0"
     "@metamask/permission-controller": "npm:^12.2.1"
@@ -35839,8 +35772,8 @@ __metadata:
     "@metamask/test-dapp": "npm:9.5.0"
     "@metamask/test-dapp-multichain": "npm:^0.17.1"
     "@metamask/test-dapp-solana": "npm:^0.3.0"
-    "@metamask/transaction-controller": "npm:^65.0.0"
-    "@metamask/transaction-pay-controller": "npm:^20.0.0"
+    "@metamask/transaction-controller": "npm:^65.1.0"
+    "@metamask/transaction-pay-controller": "npm:^21.0.0"
     "@metamask/tron-wallet-snap": "npm:^1.25.3"
     "@metamask/utils": "npm:^11.11.0"
     "@myx-trade/sdk": "npm:^0.1.265"
@@ -35984,6 +35917,7 @@ __metadata:
     eslint-config-prettier: "npm:^8.1.0"
     eslint-import-resolver-typescript: "npm:^3.6.3"
     eslint-plugin-import-x: "npm:^0.5.1"
+    eslint-plugin-jest: "npm:^29.14.0"
     eslint-plugin-jsdoc: "npm:43.0.7"
     eslint-plugin-prettier: "npm:^3.3.1"
     eslint-plugin-promise: "npm:^7.2.1"